From 3ae32aad3faf434bf395a6b5e0c081d92a1f0bdd Mon Sep 17 00:00:00 2001
From: Thomas Hobson <git@hexf.me>
Date: Sat, 13 Mar 2021 20:57:21 +1300
Subject: [PATCH] api: fix errors from refactor + PISTON_ALIAS envvar

---
 api/src/executor/job.js    | 14 +++++++++-----
 api/src/executor/routes.js |  1 +
 api/src/ppman/routes.js    |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/api/src/executor/job.js b/api/src/executor/job.js
index 2a64a59..ba739c4 100644
--- a/api/src/executor/job.js
+++ b/api/src/executor/job.js
@@ -1,5 +1,5 @@
 const logger = require('logplease').create('executor/job');
-const uuidv4 = require('uuid/v4');
+const {v4: uuidv4} = require('uuid');
 const cp = require('child_process');
 const path = require('path');
 const config = require('../config');
@@ -17,7 +17,7 @@ let gid = 0;
 
 class Job {
 
-    constructor({ runtime, files, args, stdin, timeouts, main }) {
+    constructor({ runtime, files, args, stdin, timeouts, main, alias }) {
         this.uuid =  uuidv4();
         this.runtime = runtime;
         this.files = files;
@@ -25,6 +25,7 @@ class Job {
         this.stdin = stdin;
         this.timeouts = timeouts;
         this.main = main;
+        this.alias = alias;
 
         let file_list = this.files.map(f => f.name);
 
@@ -87,7 +88,10 @@ class Job {
             var stderr = '';
 
             const proc = cp.spawn(proc_call[0], proc_call.splice(1) ,{
-                env: this.runtime.env_vars,
+                env: { 
+                    ...this.runtime.env_vars,
+                    PISTON_ALIAS: this.alias
+                },
                 stdio: 'pipe',
                 cwd: this.dir,
                 uid: this.uid,
@@ -106,7 +110,7 @@ class Job {
                 } else {
                     stderr += data;
                 }
-            );
+            });
 
             proc.stdout.on('data', data => {
                 if (stdout.length > config.output_max_size) {
@@ -114,7 +118,7 @@ class Job {
                 } else {
                     stdout += data;
                 }
-            );
+            });
 
             const exit_cleanup = () => {
                 clear_timeout(kill_timeout);
diff --git a/api/src/executor/routes.js b/api/src/executor/routes.js
index edf959b..3cb4fe2 100644
--- a/api/src/executor/routes.js
+++ b/api/src/executor/routes.js
@@ -48,6 +48,7 @@ module.exports = {
 
         const job = new Job({
             runtime,
+            alias: req.body.language,
             files: req.body.files,
             args: req.body.args,
             stdin: req.body.stdin,
diff --git a/api/src/ppman/routes.js b/api/src/ppman/routes.js
index a957449..e371b7a 100644
--- a/api/src/ppman/routes.js
+++ b/api/src/ppman/routes.js
@@ -23,7 +23,7 @@ const get_package_list = async () => {
     });
 };
 
-const get_package async (lang, version) => {
+const get_package = async (lang, version) => {
     const packages = await get_package_list();
 
     const candidates = packages