merge

1 files changed, 34 insertions, 21 deletions

diff --git a/src/server/ApiManagers/UtilManager.ts b/src/server/ApiManagers/UtilManager.ts
index 79b904e8a..c1234be6c 100644
--- a/src/server/ApiManagers/UtilManager.ts
+++ b/src/server/ApiManagers/UtilManager.ts
@@ -1,50 +1,63 @@
-import ApiManager from "./ApiManager";
-import RouteManager, { Method } from "../RouteManager";
+import ApiManager, { Registration } from "./ApiManager";
+import { Method } from "../RouteManager";
 import { exec } from 'child_process';
 import { command_line } from "../ActionUtilities";
+import RouteSubscriber from "../RouteSubscriber";
 
 export default class UtilManager extends ApiManager {
 
-    public register(router: RouteManager): void {
+    protected initialize(register: Registration): void {
 
-        router.addSupervisedRoute({
+        register({
+            method: Method.GET,
+            subscription: new RouteSubscriber("environment").add("key"),
+            onValidation: ({ req, res }) => res.send(process.env[req.params.key])
+        });
+
+        register({
             method: Method.GET,
             subscription: "/pull",
-            onValidation: ({ res }) => {
-                exec('"C:\\Program Files\\Git\\git-bash.exe" -c "git pull"', err => {
-                    if (err) {
-                        res.send(err.message);
-                        return;
-                    }
-                    res.redirect("/");
+            onValidation: async ({ res }) => {
+                return new Promise<void>(resolve => {
+                    exec('"C:\\Program Files\\Git\\git-bash.exe" -c "git pull"', err => {
+                        if (err) {
+                            res.send(err.message);
+                            return;
+                        }
+                        res.redirect("/");
+                        resolve();
+                    });
                 });
             }
         });
 
-        router.addSupervisedRoute({
+        register({
             method: Method.GET,
             subscription: "/buxton",
-            onValidation: ({ res }) => {
+            onValidation: async ({ res }) => {
                 let cwd = '../scraping/buxton';
 
                 let onResolved = (stdout: string) => { console.log(stdout); res.redirect("/"); };
                 let onRejected = (err: any) => { console.error(err.message); res.send(err); };
                 let tryPython3 = () => command_line('python3 scraper.py', cwd).then(onResolved, onRejected);
 
-                command_line('python scraper.py', cwd).then(onResolved, tryPython3);
+                return command_line('python scraper.py', cwd).then(onResolved, tryPython3);
             },
         });
 
-        router.addSupervisedRoute({
+        register({
             method: Method.GET,
             subscription: "/version",
             onValidation: ({ res }) => {
-                exec('"C:\\Program Files\\Git\\bin\\git.exe" rev-parse HEAD', (err, stdout) => {
-                    if (err) {
-                        res.send(err.message);
-                        return;
-                    }
-                    res.send(stdout);
+                return new Promise<void>(resolve => {
+                    exec('"C:\\Program Files\\Git\\bin\\git.exe" rev-parse HEAD', (err, stdout) => {
+                        if (err) {
+                            res.send(err.message);
+                            return;
+                        }
+                        res.send(stdout);
+                    });
+                    resolve();
                 });
             }
         });