Block execution of main until after window connect

3 files changed, 4 insertions, 21 deletions

diff --git a/src/js/pre.js b/src/js/pre.js
index 35321f9..5735936 100644
--- a/src/js/pre.js
+++ b/src/js/pre.js
@@ -74,21 +74,11 @@ gnunet_prerun = function() {
       sync_callback();
     }
   }
+  addRunDependency('window-init');
 }
 if (typeof(Module) === "undefined") Module = { preRun: [] };
 Module.preRun.push(gnunet_prerun);
 
-var init_continuation;
-
-// Called by GNUNET_SERVICE_run and GNUNET_PROGRAM_run to perform
-// asynchronous setup tasks. Calls continuation when finished.
-worker_setup = function(continuation) {
-  if (init_continuation === 'now')
-    continuation();
-  else
-    init_continuation = continuation;
-};
-
 // a map of window index to port
 var windows = {};
 // next available index
@@ -116,10 +106,7 @@ function get_message(ev) {
     ev.target.postMessage({type: 'stdout', port: channel.port2},
                           [channel.port2]);
     FS.writeFile('/private_key', ev.data['private-key'], {encoding: 'binary'});
-    if (typeof (init_continuation) === 'undefined')
-      init_continuation = 'now';
-    else
-      init_continuation();
+    removeRunDependency('window-init');
   } else if ('connect' == ev.data.type) {
     SERVER.connect(ev.data.port);
   }
diff --git a/src/js/program.js b/src/js/program.js
index de5aa50..776f513 100644
--- a/src/js/program.js
+++ b/src/js/program.js
@@ -23,9 +23,7 @@ mergeInto(LibraryManager.library, {
       [binaryName, 'DEBUG', 0]);
     var cfgfile = 0; // const char *
     var cfg = 1; // opaque non-null pointer
-    worker_setup(function() {
-      Runtime.dynCall('viiii', task, [task_cls, argv, cfgfile, cfg]);
-    });
+    Runtime.dynCall('viiii', task, [task_cls, argv, cfgfile, cfg]);
     throw 'SimulateInfiniteLoop';
   }
 });
diff --git a/src/js/service.js b/src/js/service.js
index 1fc5f09..b1a92bf 100644
--- a/src/js/service.js
+++ b/src/js/service.js
@@ -23,9 +23,7 @@ mergeInto(LibraryManager.library, {
       [service_name, 'DEBUG', 0]);
     var server = 1; // opaque non-null pointer
     var cfg = 2; // same
-    worker_setup(function() {
-      Runtime.dynCall('viii', task, [task_cls, server, cfg]);
-    });
+    Runtime.dynCall('viii', task, [task_cls, server, cfg]);
     throw 'SimulateInfiniteLoop';
   }
 });