Very basic running/requiring support w/Stopify

- require() pauses the current computation, finds and loads the file with a new
  AsyncRun, then resumes with the result
- makeRequireAsync() returns a promise to deal with the delayed/async result
- Everything gets stopified, no control over stopifying some modules and not
  others, or some functions and not others

package.json

@@ -35,6 +35,7 @@
     "sha.js": "^2.4.8",
     "source-map": "^0.5.6",
     "stacktrace-js": "^1.3.1",
+    "stopify": "^0.5.4-elementaryJS",
     "strip-ansi": "^4.0.0",
     "tsify": "^4.0.1",
     "websocket": "^1.0.23",

src/runtime/global.arr.js

@@ -15,7 +15,7 @@ function numToString(n) {
   return String(n);
 }
 
-function timeNow( otherTime = undefined ) {
+function timeNow( otherTime ) {
   if ( otherTime === undefined ) {
     return process.hrtime();
   } else {

src/webworker/main.ts

@@ -8,10 +8,11 @@ const worker = setup.worker;
 const input = <HTMLInputElement>document.getElementById("program");
 const compile = document.getElementById("compile");
 const compileRun = document.getElementById("compileRun");
+const compileRunStopify = document.getElementById("compileRunStopify");
 
 const showBFS = <HTMLInputElement>document.getElementById("showBFS");
 
-var shouldRun = false;
+var runChoice = 'none';
 
 function compileProgram() {
   fs.writeFileSync("./projects/program.arr", input.value);
@@ -31,7 +32,11 @@ compile.onclick = compileProgram;
 
 compileRun.onclick = function() {
   compileProgram();
-  shouldRun = true;
+  runChoice = 'sync';
+};
+compileRunStopify.onclick = function() {
+  compileProgram();
+  runChoice = 'async';
 };
 
 worker.onmessage = function(e) {
@@ -72,17 +77,33 @@ worker.onmessage = function(e) {
         setup.workerError("Compilation failure");
       } else if (msgType == "compile-success") {
         console.log("Compilation succeeded!");
-        if (shouldRun) {
+        const start = window.performance.now();
+        function printTimes() {
+          const end = window.performance.now();
+          console.log("Running took: ", end - start);
+        }
+        if (runChoice === 'sync') {
+          runChoice = 'none';
           console.log("Running...");
-          runner.makeRequire("/compiled/project")("program.arr.js");
-          shouldRun = false;
+          const start = window.performance.now();
+          const result = runner.makeRequire("/compiled/project")("program.arr.js");
+          const end = window.performance.now();
+          console.log("Run complete with: ", result);
+          printTimes();
+        }
+        else if (runChoice === 'async') {
+          runChoice = 'none';
+          const entry = runner.makeRequireAsync("/compiled/project");
+          const resultP = entry("program.arr.js");
+          resultP.catch((e) => { console.log("Run failed with: ", e); printTimes(); });
+          resultP.then((r) => { console.log("Run complete with: " , r); printTimes(); });
         }
       } else {
         setup.workerLog(e.data);
       }
 
     }
   } catch(error) {
-    setup.workerLog(e.data);
+    setup.workerLog("Error occurred: ", error, e.data);
   }
 };

src/webworker/page.html

@@ -10,6 +10,7 @@
                     <div>
                         <button type="button" id="compile">Compile</button>
                         <button type="button" id="compileRun">Compile and Run</button>
+                        <button type="button" id="compileRunStopify">Compile and Run (w/Stopify)</button>
                     </div>
                     <div style="height: 100%; padding:5px">
                         <textarea style="width: 90%; height: auto; overflow-y: scroll; box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; display:block; resize:none; font-size:16px" rows="40" type="textarea" id="program"></textarea>

src/webworker/runner.ts

@@ -1,11 +1,72 @@
 const assert = require('assert');
 const browserFS = window['BrowserFS'].BFSRequire('fs');
 const path = window['BrowserFS'].BFSRequire('path');
+const stopify = require('stopify');
+window['stopify'] = stopify;
 
 const nodeModules = {
   'assert': assert
 };
 
+function makeRequireAsync(basePath : string) {
+  let cwd = basePath;
+  let currentRunner = null;
+
+  function requireAsyncMain(importPath : string) {
+    return new Promise(function (resolve, reject) {
+      if(importPath in nodeModules) {
+        return nodeModules[importPath];
+      }
+      const oldWd = cwd;
+      const nextPath = path.join(cwd, importPath);
+      cwd = path.parse(nextPath).dir;
+      if(!browserFS.existsSync(nextPath)) {
+        throw new Error("Path did not exist in requireSync: " + nextPath);
+      }
+      const contents = String(browserFS.readFileSync(nextPath));
+      const runner = stopify.stopifyLocally("(function() { " + String(contents) + "})()");
+      const module = {exports: false};
+      runner.g = { stopify, require: requireAsync, module };
+      runner.path = nextPath;
+      currentRunner = runner;
+      runner.run((result) => {
+        cwd = oldWd;
+        const toReturn = module.exports ? module.exports : result;
+        resolve(toReturn);
+      });
+    });
+  }
+
+  function requireAsync(importPath : string) {
+    if(importPath in nodeModules) {
+      return nodeModules[importPath];
+    }
+    const oldWd = cwd;
+    const nextPath = path.join(cwd, importPath);
+    cwd = path.parse(nextPath).dir;
+    if(!browserFS.existsSync(nextPath)) {
+      throw new Error("Path did not exist in requireSync: " + nextPath);
+    }
+    const contents = String(browserFS.readFileSync(nextPath));
+    const runner = stopify.stopifyLocally("(function() { " + String(contents) + "})()");
+    const module = {exports: false};
+    runner.g = { stopify, require: requireAsync, module, console };
+    runner.path = nextPath;
+    currentRunner.pauseImmediate(() => {
+      const oldRunner = currentRunner;
+      currentRunner = runner;
+      runner.run((result) => {
+        cwd = oldWd;
+        const toReturn = module.exports ? module.exports : result.value;
+        currentRunner = oldRunner;
+        oldRunner.continueImmediate({ type: 'normal', value: toReturn });
+      });
+    });
+  }
+
+  return requireAsyncMain;
+}
+
 function makeRequire(basePath : string) {
   var cwd = basePath;
   /*
@@ -40,5 +101,4 @@ function makeRequire(basePath : string) {
   return requireSync;
 }
 
-window['makeRequire'] = makeRequire;
-module.exports = { makeRequire };
+module.exports = { makeRequire, makeRequireAsync };