Merge pull request #494 from Brikaa/runtime-query-no-v3

Specify runtime in execution request, get rid of v3 middleware

Author: HexF

api/src/api/v2.js

@@ -51,6 +51,7 @@ function get_job(job_info, available_runtimes) {
     let {
         language,
         version,
+        runtime,
         args,
         stdin,
         files,
@@ -80,15 +81,20 @@ function get_job(job_info, available_runtimes) {
             }
         }
 
+        const has_runtime =
+            job_info.has_own_property('runtime') && job_info.runtime !== null;
+
         const rt = available_runtimes.find(
             rt =>
                 [...rt.aliases, rt.language].includes(language) &&
-                (version === rt.version || version === '*')
+                (version === rt.version || version === '*') &&
+                (!has_runtime || runtime === rt.runtime)
         );
 
         if (rt === undefined) {
+            const runtime_str = has_runtime ? `${runtime}-` : '';
             return reject({
-                message: `${language}-${version} runtime is unknown`,
+                message: `${runtime_str}${language}-${version} runtime is unknown`,
             });
         }
 

api/src/api/v3.js

@@ -87,9 +87,7 @@ expressWs(app);
     logger.debug('Registering Routes');
 
     const api_v2 = require('../api/v2');
-    const api_v3 = require('../api/v3');
     app.use('/api/v2', api_v2);
-    app.use('/api/v3', api_v3);
 
     app.use((req, res, next) => {
         return res.status(404).send({ message: 'Not Found' });