submit endpoint and testing

Signed-off-by: Tathagat Thapliyal <[email protected]>

Author: tathagat2006

package.json

@@ -44,7 +44,7 @@
     "apidoc": "apidoc -i src -o docs",
     "prestart": "npm run build && npm run apidoc",
     "start": "scripts/wait-for-it.sh ${AMQP_HOST}:${AMQP_PORT} -- node dist/run.js",
-    "test": "node_modules/.bin/mocha --timeout 12000 --exit --require ts-node/register test/utils/setup*.ts test/*.ts",
+    "test": "NODE_PATH=src node_modules/.bin/mocha --timeout 12000 --exit --require ts-node/register test/utils/setup*.ts test/*.ts",
     "cover": "nyc npm test",
     "seedlangs": "node dist/scripts/seed-defaultlangs.js",
     "precodecov": "npm run cover",
@@ -71,4 +71,4 @@
     "npm": ">=5",
     "yarn": "1"
   }
-}
+}

src/models/ApiKeys.ts

@@ -1,6 +1,6 @@
 import Sequelize from "sequelize";
 
-export type ApiKeyAttrs  = {
+export type ApiKeyAttrs = {
   id: number,
   key: string,
   whitelist_domains: string[] | undefined
@@ -32,9 +32,4 @@ export const define = (
   })
 }
 
-export const associate = ({ langs, submissions }) => {
-  submissions.belongsTo(langs, {
-    foreignKey: 'lang',
-    otherKey: 'lang_slug'
-  })
-};
+export const associate = () => { }

src/models/Submission.ts

@@ -8,14 +8,14 @@ export type Testcase = {
 }
 
 export type SubmissionAttributes = {
-  id?: number
+  id: number
   lang: string
   start_time: Date
-  end_time?: Date
+  end_time: Date
   mode: string
-  results?: Array<Testcase>
-  outputs?: Array<string>
-  callback?: string
+  results: Array<Testcase>
+  outputs: Array<string>
+  callback: string
 }
 
 export type SubmissionInstance = Sequelize.Instance<SubmissionAttributes> & SubmissionAttributes
@@ -30,7 +30,8 @@ export const define = (
       primaryKey: true
     },
     lang: {
-      type: Sequelize.STRING(10)
+      type: Sequelize.STRING(10),
+      allowNull: false
     },
     start_time: Sequelize.DATE,
     end_time: Sequelize.DATE,
@@ -42,14 +43,9 @@ export const define = (
     outputs: Sequelize.ARRAY(Sequelize.STRING),
     callback: Sequelize.STRING
   }, {
-    paranoid: true, // We do not want to lose any submission data
-    timestamps: false // Start and end times are already logged
-  })
+      paranoid: true, // We do not want to lose any submission data
+      timestamps: false // Start and end times are already logged
+    })
 }
 
-export const associate = ({ langs, submissions }) => {
-  submissions.belongsTo(langs, {
-    foreignKey: 'lang',
-    otherKey: 'lang_slug'
-  })
-};
+export const associate = () => { }

src/rabbitmq/jobqueue.ts

@@ -1,16 +1,19 @@
 import * as amqp from 'amqplib/callback_api'
-import {Channel, Connection} from 'amqplib/callback_api'
-import {EventEmitter} from 'events'
-import {RunResponse} from '../routes/api/run'
+import { Channel, Connection } from 'amqplib/callback_api'
+import { EventEmitter } from 'events'
 const debug = require('debug')('judge:api:jobqueue')
 import config = require('../../config')
 
 export interface SubmissionJob {
   id: number
   source: string,
   lang: string,
-  testcases: [{input: string, output: string}],
-  getstdout: boolean
+  timelimit: number,
+  testcases: [{
+    id: number,
+    stdin: string,
+    stodut: string
+  }],
 }
 
 export interface RunJob {
@@ -36,18 +39,18 @@ amqp.connect(`amqp://${config.AMQP.USER}:${config.AMQP.PASS}@${config.AMQP.HOST}
   (err, connection) => {
     if (err) throw err
 
-    connection.createChannel((err, channel) =>{
+    connection.createChannel((err, channel) => {
       if (err) throw err
 
-      channel.assertQueue(jobQ, {durable: true})
-      channel.assertQueue(successQ, {durable: true})
+      channel.assertQueue(jobQ, { durable: true })
+      channel.assertQueue(successQ, { durable: true })
       jobChannel = channel
       jobChannel.consume(successQ, (msg) => {
         debug(`SUCCESS:CONSUME: msg.content = ${msg.content.toString()}`)
 
         const payload = JSON.parse(msg.content.toString())
         const eventName = payload.testcases ? 'submit_result' : 'run_result'
-        
+
         successListener.emit(eventName, payload)
         jobChannel.ack(msg)
       })
@@ -60,7 +63,7 @@ amqp.connect(`amqp://${config.AMQP.USER}:${config.AMQP.PASS}@${config.AMQP.HOST}
  * @returns {boolean} true if job was put on queue successfully
  */
 function queueJob(job: JudgeJob) {
-  return jobChannel.sendToQueue(jobQ, Buffer.from(JSON.stringify(job)), {persistent: true})
+  return jobChannel.sendToQueue(jobQ, Buffer.from(JSON.stringify(job)), { persistent: true })
 }
 export {
   queueJob,

src/routes/api/index.ts

@@ -1,8 +1,8 @@
-import {NextFunction, Request, Response, Router} from 'express'
+import { NextFunction, Request, Response, Router } from 'express'
 import run from './run'
-import {route as submissions} from './submissions'
-import {route as langs} from './langs'
-import {checkValidApiKey} from '../../validators/ApiKeyValidators'
+import submit from './submit'
+import { route as langs } from './langs'
+import { checkValidApiKey } from '../../validators/ApiKeyValidators'
 import * as debug from 'debug'
 
 const log = debug('judge:api')
@@ -26,7 +26,7 @@ route.use((req: Request, res: Response, next: NextFunction) => {
 })
 
 route.use('/runs', run)
-route.use('/submissions', submissions)
+route.use('/submissions', submit)
 route.use('/langs', langs)
 
 export default route

src/routes/api/langs.ts

@@ -1,4 +1,4 @@
-import {Router} from 'express'
+import { Router } from 'express'
 import DB from 'models'
 
 const route: Router = Router()
@@ -13,10 +13,10 @@ const route: Router = Router()
  *
  */
 route.get('/', (req, res, next) => {
-  Langs.findAll()
+  DB.langs.findAll()
     .then((langs) => {
       res.status(200).json(langs)
     })
 })
 
-export {route}
+export { route }

src/routes/api/run/controller.ts

@@ -16,7 +16,7 @@ type RunPoolElement = {
   res: Response
 }
 
-const RunPool: {[x: number]: RunPoolElement} = {}
+const RunPool: { [x: number]: RunPoolElement } = {}
 
 class RunController {
   async RunPOST(req: Request, res: Response) {
@@ -50,14 +50,14 @@ class RunController {
     }
   }
 
-  async onSuccess(result: RunResponse)  {
+  async onSuccess(result: RunResponse) {
     const { url } = await upload(result)
 
     const job = await DB.submissions.findById(result.id)
     job.outputs = [url]
     await job.save()
 
-    switch(job.mode) {
+    switch (job.mode) {
       case 'callback':
         await axios.post(job.callback, result)
         break

src/routes/api/submissions.ts

@@ -0,0 +1,70 @@
+import { Request, Response } from 'express'
+import { SubmissionJob, queueJob } from 'rabbitmq/jobqueue'
+import DB from 'models'
+import axios from 'axios'
+
+type Testcase = {
+  id: number,
+  score: number,
+  time: string,
+  result: string
+}
+
+type SubmitResponse = {
+  id: number,
+  stderr: string,
+  testcases: Array<Testcase>
+}
+
+type RunPoolElement = {
+  res: Response
+}
+
+const RunPool: { [x: number]: RunPoolElement } = {}
+
+class SubmitController {
+  async SubmitPOST(req: Request, res: Response) {
+    const mode = req.body.mode || 'sync'
+    const job = await DB.submissions.create({
+      lang: req.body.lang,
+      start_time: new Date(),
+      mode,
+      callback: req.body.callback
+    })
+
+    await queueJob(<SubmissionJob>{
+      source: req.body.source,
+      lang: req.body.lang,
+      timelimit: req.body.timelimit,
+      testcases: req.body.testcases
+    })
+
+    if (['callback', 'poll'].includes(mode)) {
+      return res.json({
+        id: job.id
+      })
+    }
+
+    // if mode === 'sync'
+    RunPool[job.id] = {
+      res
+    }
+  }
+
+  async onSuccess(result: SubmitResponse) {
+    const job = await DB.submissions.findById(result.id)
+    job.results = result.testcases
+    await job.save()
+
+    switch (job.mode) {
+      case 'callback':
+        await axios.post(job.callback, result)
+        break
+      case 'sync':
+        RunPool[job.id].res.json(result)
+        break
+    }
+  }
+}
+
+export default new SubmitController()