[WIP] Multithreaded rendering

.travis.yml

@@ -51,10 +51,10 @@ matrix:
     - brew install glfw glew
     install:
     - npm install -g appdmg
-    - curl "https://nodejs.org/dist/v10.6.0/node-v10.6.0-darwin-x64.tar.gz" >node.tar.gz
+    - curl "https://nodejs.org/dist/v11.2.0/node-v11.2.0-darwin-x64.tar.gz" >node.tar.gz
     - tar -zxf node.tar.gz
     - rm node.tar.gz
-    - mv node-v10.6.0-darwin-x64 node
+    - mv node-v11.2.0-darwin-x64 node
     - export PATH="$(pwd)/node/bin:$PATH"
     - unset NVM_NODEJS_ORG_MIRROR
     - "./node/bin/npm install"

Dockerfile

@@ -8,10 +8,10 @@ ADD . /app
 WORKDIR /app
 
 RUN \
-  wget "https://nodejs.org/dist/v10.6.0/node-v10.6.0-linux-x64.tar.gz" -O node.tar.gz && \
+  wget "https://nodejs.org/dist/v11.2.0/node-v11.2.0-linux-x64.tar.gz" -O node.tar.gz && \
   tar -zxf node.tar.gz && \
   rm node.tar.gz && \
-  mv node-v10.6.0-linux-x64 node
+  mv node-v11.2.0-linux-x64 node
 RUN \
   export PATH="$PATH:$(pwd)/node/bin" && \
   npm install --unsafe-perm . && \

appveyor.yml

@@ -21,10 +21,10 @@ test_script:
 
 after_test:
   - ps: |
-      wget "https://nodejs.org/dist/v10.6.0/node-v10.6.0-win-x64.zip" -OutFile node.zip
+      wget "https://nodejs.org/dist/v11.2.0/node-v11.2.0-win-x64.zip" -OutFile node.zip
       7z x node.zip
       rm node.zip
-      mv node-v10.6.0-win-x64 node
+      mv node-v11.2.0-win-x64 node
       $env:Path = "$pwd\node;$env:Path";
       .\node\npm install
       .\node\npm run test:ci

exokit.cpp

@@ -36,7 +36,7 @@ void callFunction(const char *funcname, const int argc, Local<Value> argv[]) {
 
   if (result.IsEmpty()) {
     String::Utf8Value error(try_catch.Exception());
-    String::Utf8Value stacktrace(try_catch.StackTrace());
+    String::Utf8Value stacktrace(try_catch.StackTrace(localContext).ToLocalChecked());
     // LOGI("Error calling %s: %s:\n%s",funcname,*error,*stacktrace);
   } else {
     // LOGI("%s called",funcname);

main.cpp

@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <sstream>
 #include <string>
+#include <vector>
 #include <map>
 #include <thread>
 #include <v8.h>
@@ -97,9 +98,39 @@ const MLPrivilegeID privileges[] = {
   MLPrivilegeID_NormalNotificationsUsage,
 };
 
+int Start(int argc, char **argv) {
+  size_t argc2 = argc + 1;
+  std::vector<char *> argv2(argc2);
+
+  char argsString[4096];
+  int index = 0;
+  for (int i = 0; i < 1; i++) {
+    char *dstArg = argsString + index;
+    const char *srcArg = argv[i];
+    strncpy(dstArg, srcArg, sizeof(argsString) - index);
+    argv2[i] = dstArg;
+    index += strlen(srcArg) + 1;
+  }
+
+  const char *experimentalWorkerString = "--experimental-worker";
+  char *experimentalWorkerArg = argsString + i;
+  strncpy(experimentalWorkerArg, experimentalWorkerString, sizeof(argsString) - i);
+  index += strlen(experimentalWorkerString) + 1;
+
+  for (int i = 1; i < argc; i++) {
+    char *dstArg = argsString + index;
+    const char *srcArg = argv[i];
+    strncpy(dstArg, srcArg, sizeof(argsString) - index);
+    argv2[i + 1] = dstArg;
+    index += strlen(srcArg) + 1;
+  }
+
+  return node::Start(argc2.data(), argv2);
+}
+
 int main(int argc, char **argv) {
   if (argc > 1) {
-    return node::Start(argc, argv);
+    return Start(argc, argv);
   }
 
   registerDlibs(node::dlibs);
@@ -229,7 +260,7 @@ int main(int argc, char **argv) {
         }
       }
 
-      return node::Start(argc, argv);
+      return Start(argc, argv);
     } else {
       const char *jsString;
       if (access("/package/app/index.html", F_OK) != -1) {
@@ -258,7 +289,7 @@ int main(int argc, char **argv) {
       char *argv[] = {nodeArg, dotArg, jsArg};
       size_t argc = sizeof(argv) / sizeof(argv[0]);
 
-      return node::Start(argc, argv);
+      return Start(argc, argv);
     }
   } else { // child
     ML_LOG_TAG(Info, LOG_TAG, "---------------------exokit start 1");

package.json

@@ -56,7 +56,7 @@
     "history": "^4.7.2",
     "isolator": "0.0.9",
     "leapmotion": "0.0.4",
-    "libnode.a": "0.0.1",
+    "libnode.a": "0.0.2",
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
     "nan": "^2.10.0",
@@ -73,13 +73,11 @@
     "repl.history": "^0.1.4",
     "rimraf": "^2.6.2",
     "upng-js": "^2.1.0",
-    "vm-one": "0.0.22",
+    "vm-one": "0.0.31",
     "webgl-to-opengl": "0.0.12",
     "window-classlist": "0.0.4",
     "window-fetch": "0.0.9",
     "window-selector": "0.0.5",
-    "window-text-encoding": "0.0.2",
-    "window-worker": "0.0.98",
     "window-xhr": "0.0.20",
     "ws": "^6.0.0"
   },

src/DOM.js

@@ -7,10 +7,11 @@ const selector = require('window-selector');
 const url = require('url');
 const util = require('util');
 
-const bindings = require('./bindings');
+const nativeBindings = require('./native-bindings');
 const {defaultCanvasSize} = require('./constants');
 const {Event, EventTarget, MouseEvent, ErrorEvent} = require('./Event');
 const GlobalContext = require('./GlobalContext');
+const {_makeWindowVm} = require('./WindowVm');
 const symbols = require('./symbols');
 const urls = require('./urls').urls;
 const utils = require('./utils');
@@ -699,7 +700,7 @@ class Element extends Node {
     })
       .childNodes
       .map(childNode =>
-        GlobalContext._fromAST(childNode, this.ownerDocument.defaultView, this, this.ownerDocument, true)
+        utils._fromAST(childNode, this.ownerDocument.defaultView, this, this.ownerDocument, true)
       );
     switch (position) {
       case 'beforebegin': {
@@ -950,7 +951,7 @@ class Element extends Node {
       })
         .childNodes
         .map(childNode =>
-          GlobalContext._fromAST(childNode, this.ownerDocument.defaultView, this, this.ownerDocument, true)
+          utils._fromAST(childNode, this.ownerDocument.defaultView, this, this.ownerDocument, true)
         )
     );
     this.childNodes = newChildNodes;
@@ -962,7 +963,7 @@ class Element extends Node {
     this._emit('children', newChildNodes, oldChildNodes, null, null);
     this.ownerDocument._emit('domchange');
 
-    _promiseSerial(newChildNodes.map(childNode => () => GlobalContext._runHtml(childNode, this.ownerDocument.defaultView)))
+    _promiseSerial(newChildNodes.map(childNode => () => utils._runHtml(childNode, this.ownerDocument.defaultView)))
       .catch(err => {
         console.warn(err);
       });
@@ -1372,7 +1373,7 @@ class HTMLStyleElement extends HTMLLoadableElement {
         .then(() => css.parse(innerHTML).stylesheet)
         .then(stylesheet => {
           this.stylesheet = stylesheet;
-          GlobalContext.styleEpoch++;
+          this.ownerDocument.defaultView[styleEpochSymbol]++;
           this.dispatchEvent(new Event('load', {target: this}));
         })
         .catch(err => {
@@ -1438,7 +1439,7 @@ class HTMLLinkElement extends HTMLLoadableElement {
           .then(s => css.parse(s).stylesheet)
           .then(stylesheet => {
             this.stylesheet = stylesheet;
-            GlobalContext.styleEpoch++;
+            this.ownerDocument.defaultView[styleEpochSymbol]++;
 
             this.readyState = 'complete';
 
@@ -1816,6 +1817,9 @@ class HTMLIFrameElement extends HTMLSrcableElement {
 
     this.contentWindow = null;
     this.contentDocument = null;
+
+    // non-standard
+    this.vm = null;
     this.live = true;
     this.xrOffset = {
       position: new Float32Array(3),
@@ -1848,23 +1852,24 @@ class HTMLIFrameElement extends HTMLSrcableElement {
                 const options = parentWindow[symbols.optionsSymbol];
 
                 url = utils._makeNormalizeUrl(options.baseUrl)(url);
-                const contentWindow = GlobalContext._makeWindow({
+                /* const contentWindow = GlobalContext._makeWindowVm(htmlString, {
                   url,
                   baseUrl: url,
                   dataPath: options.dataPath,
-                }, parentWindow, parentWindow.top);
-                const contentDocument = GlobalContext._parseDocument(htmlString, contentWindow);
+                });
+                const contentDocument = utils._parseDocument(htmlString, contentWindow);
                 contentDocument.hidden = this.hidden;
                 contentDocument.xrOffset = this.xrOffset;
 
-                contentWindow.document = contentDocument;
-
-                this.contentWindow = contentWindow;
-                this.contentDocument = contentDocument;
+                contentWindow.document = contentDocument; */
 
-                contentWindow.on('destroy', e => {
-                  parentWindow.emit('destroy', e);
+                this.vm = _makeWindowVm(htmlString, {
+                  url,
+                  baseUrl: url,
+                  dataPath: options.dataPath,
                 });
+                this.contentWindow = {};
+                this.contentDocument = {};
 
                 this.readyState = 'complete';
 
@@ -2015,15 +2020,15 @@ class HTMLCanvasElement extends HTMLElement {
         this._context = null;
       }
       if (this._context === null) {
-        this._context = new GlobalContext.CanvasRenderingContext2D(this);
+        this._context = new GlobalContext.CanvasRenderingContext2D(this); // XXX latch lative
       }
     } else if (contextType === 'webgl' || contextType === 'webgl2' || contextType === 'xrpresent') {
       if (this._context && this._context.constructor && this._context.constructor.name !== 'WebGLRenderingContext' && this._context.constructor.name !== 'WebGL2RenderingContext') {
         this._context.destroy();
         this._context = null;
       }
       if (this._context === null) {
-        if (GlobalContext.args.webgl === '1') {
+        if (global.args.webgl === '1') {
           if (contextType === 'webgl' || contextType === 'xrpresent') {
             this._context = new WebGLRenderingContext(this);
           }
@@ -2065,7 +2070,7 @@ class HTMLTemplateElement extends HTMLElement {
   }
 
   get content() {
-    const content = new GlobalContext.DocumentFragment();
+    const content = new this.ownerDocument.defaultView.DocumentFragment();
     content.ownerDocument = this.ownerDocument;
     content.childNodes = new NodeList(this._childNodes);
     return content;
@@ -2210,7 +2215,7 @@ class HTMLImageElement extends HTMLSrcableElement {
     const [attrs = [], value = '', location = null] = arguments;
     super('IMG', attrs, value, location);
 
-    this.image = new bindings.nativeImage();
+    this.image = new nativeBindings.nativeImage();
 
     this.on('attribute', (name, value) => {
       if (name === 'src' && value) {
@@ -2335,7 +2340,7 @@ class HTMLAudioElement extends HTMLMediaElement {
     super('AUDIO', attrs, value);
 
     this.readyState = HTMLMediaElement.HAVE_NOTHING;
-    this.audio = new bindings.nativeAudio.Audio();
+    this.audio = new nativeBindings.nativeAudio.Audio();
 
     this.on('attribute', (name, value) => {
       if (name === 'src' && value) {
@@ -2451,7 +2456,7 @@ class HTMLVideoElement extends HTMLMediaElement {
 
         if (urls.has(value)) {
           const blob = urls.get(value);
-          if (blob instanceof Bindings.bindings.nativeVideo.VideoDevice) {
+          if (blob instanceof nativeBindings.nativeVideo.VideoDevice) {
             this.video = blob;
           }
         }
@@ -2552,7 +2557,7 @@ class HTMLVideoElement extends HTMLMediaElement {
     super('VIDEO', attrs, value);
 
     this.readyState = HTMLMediaElement.HAVE_NOTHING;
-    this.video = new bindings.nativeVideo.Video();
+    this.video = new nativeBindings.nativeVideo.Video();
 
     this.on('attribute', (name, value) => {
       if (name === 'src' && value) {