fix types

Author: jatinkatyal13

config.js

@@ -1,4 +1,5 @@
 exports = module.exports = {
+  MAX_OUTPUT_BUFFER: 65536,
   AMQP: {
     USER: process.env.AMQP_USER || 'codingblocks',
     PASS: process.env.AMQP_PASS || 'codingblocks',

src/taskmaster.ts

@@ -2,8 +2,7 @@ const nr = require('newrelic');
 import * as Raven from 'raven'
 import * as amqp from 'amqplib/callback_api'
 import {Connection} from 'amqplib/callback_api'
-import {RunJob, RunResult, SubmissionResult} from './types/job'
-import { executor } from './tasks'
+import { runExecutor, submissionExecutor } from './tasks'
 import config = require('../config.js')
 
 // =============== Setup Raven
@@ -26,17 +25,16 @@ amqp.connect(`amqp://${config.AMQP.USER}:${config.AMQP.PASS}@${config.AMQP.HOST}
     channel.assertQueue(jobQ);
     channel.consume(jobQ, async (msg) => {
       try {
-        const job: RunJob = JSON.parse(msg.content.toString())
-        const jobResult: RunResult|SubmissionResult = await executor(job)
+        const job = JSON.parse(msg.content.toString())
+        let jobResult
+        if (job.testcases) {
+          jobResult = await submissionExecutor(job)
+        } else {
+          jobResult = await runExecutor(job)
+        }
 
         // TODO
-        channel.sendToQueue(successQ, (new Buffer(JSON.stringify(<RunResult>{
-          id: job.id,
-          stderr: jobResult.stderr,
-          stdout: jobResult.stdout,
-          time: jobResult.time,
-          code: jobResult.code
-        }))))
+        channel.sendToQueue(successQ, (new Buffer(JSON.stringify(jobResult))))
         channel.ack(msg)
       } catch (err) {
         Raven.captureException(err);

src/tasks/index.ts

@@ -1,23 +1,23 @@
-import { RunJob, SubmissionJob, RunResult, SubmissionResult } from "types/job";
+import { RunJob, SubmissionJob, RunResult, SubmissionResult, Job, Result } from "types/job";
 import config = require('../../config.js')
 import {exec, mkdir, rm} from 'shelljs'
 import * as path from 'path'
 
 import RunScenario from './run'
 import SubmissionScenario from './submission'
+import { Scenario } from "types/scenario";
 
-export const executor = async (job: RunJob|SubmissionJob): Promise<RunResult|SubmissionResult> => {
+export const executor = <J, R>(scenario: Scenario) => async (job: Job & J): Promise<Result & R> => {
   // Create RUNBOX
   rm('-rf', config.RUNBOX.DIR)
   mkdir('-p', config.RUNBOX.DIR)
   const currentJobDir = path.join(config.RUNBOX.DIR, job.id.toString())
   mkdir('-p', currentJobDir)
 
   const LANG_CONFIG = config.LANGS[job.lang]
-  const scenario = job.hasOwnProperty('testcases') ? SubmissionScenario : RunScenario
 
   // Setup RUNBOX
-  await scenario.setup(currentJobDir, <RunJob&SubmissionJob>job) // TODO:
+  await scenario.setup(currentJobDir, job) // TODO:
 
   // Run worker
   exec(`docker run \\
@@ -33,9 +33,12 @@ export const executor = async (job: RunJob|SubmissionJob): Promise<RunResult|Sub
   `)
 
   // Get result
-  const result = await scenario.result(currentJobDir, job.id)
+  const result = <Result & R>(await scenario.result(currentJobDir, job.id))
 
   rm('-rf', currentJobDir)
 
   return result
 }
+
+export const runExecutor = executor<RunJob, RunResult>(RunScenario)
+export const submissionExecutor = executor<SubmissionJob, SubmissionResult>(SubmissionScenario)

src/tasks/run.ts

@@ -3,10 +3,7 @@ import {cat, exec, mkdir, rm, touch, head} from 'shelljs'
 import {RunJob, RunResult} from '../types/job'
 import * as path from 'path'
 import * as fs from 'fs'
-import { Scenario } from 'types/scenario.js'
-
-rm('-rf', config.RUNBOX.DIR)
-mkdir('-p', config.RUNBOX.DIR)
+import { Scenario } from 'types/scenario'
 
 class RunScenario implements Scenario {
   setup(currentJobDir: string, job: RunJob) {
@@ -20,7 +17,7 @@ class RunScenario implements Scenario {
 
   async result(currentJobDir: string, jobId: number): Promise<RunResult> {
     const stdout = exec(`
-      head -c 65536 ${path.join(currentJobDir, 'run.stdout')}
+      head -c ${config.MAX_OUTPUT_BUFFER} ${path.join(currentJobDir, 'run.stdout')}
     `)
 
     // Check for compile_stderr if can't find a stdout file ; stdout can be ''