dcp-client 5.1.10 → 5.1.11

package/lib/standaloneWorker.js

@@ -56,7 +56,6 @@ function StandaloneWorker(options = {})
   var connected = false
   var dieTimer
   var shutdown;
-  var connectTimer = false;
 
   Reference.call(this, debugging, () => `sa-worker@${this.serial}/${this.config.location}`);
   const defaultConfig = {
@@ -93,17 +92,7 @@ function StandaloneWorker(options = {})
   if (!readStream) {
     /* No supplied streams - reach out and connect over TCP/IP */
     let socket = readStream = writeStream = new (require('net')).Socket().unref();
-    let connecting = true;
-
     debugging() && console.debug('Connecting to evaluator on', this.config.location.hostname + ':' + this.config.location.port);
-    connectTimer = setBackoffInterval(function saWorker$$connect$backoff() {
-      if (!connecting)
-      {
-        connecting = true;
-        socket.connect(that.config.location.port, that.config.location.hostname, () => { connecting = false; });
-      }
-    }, this.config.tuning.connectBackoff);
-    connectTimer.unref();
 
     socket.setNoDelay(this.config.tuning.noDelay ?? true);
     socket.connect(this.config.location.port, this.config.location.hostname);
@@ -123,7 +112,6 @@ function StandaloneWorker(options = {})
     socket.on('end', sandboxDeath);
 
     socket.on('error', function saWorker$$socket$errorHandler(e) {
-      connecting = false;
       debugging() && console.debug(`Evaluator ${this.serial} - socket error:`,
                                    e.code === 'ECONNREFUSED' ? e.message : e);
       if (options.onsocketerror)
@@ -175,7 +163,6 @@ function StandaloneWorker(options = {})
 
   function beginSession () {
     connected = true
-    clearBackoffInterval(connectTimer);
 
     readStream.on ('error', shutdown);
     readStream.on ('end',   shutdown);
@@ -327,7 +314,6 @@ function StandaloneWorker(options = {})
 
   /* Shutdown the stream(s) which are connected to the evaluator */
   shutdown = (e) => {
-    clearBackoffInterval(connectTimer);
 
     if ((e instanceof Error) && isErrorReportable(e))
       console.error(e);
@@ -370,8 +356,6 @@ function StandaloneWorker(options = {})
       this.unref();
     }
 
-    clearBackoffInterval(connectTimer);
-
     /* If DIE: response doesn't arrive in a reasonable time -- clean up */
     dieTimer = setTimeout(shutdown, 7000);
     dieTimer.unref();

package/libexec/sandbox/bravojs-env.js

@@ -346,7 +346,7 @@ prepPyodide`);
   /* Report an error from the work function to the supervisor */
   function reportError (error, metrics)
   {
-    let err = new Error('initial state');
+    const err = new Error('initial state');
 
     for (let prop of [ 'message', 'name', 'code', 'stack', 'lineNumber', 'columnNumber' ])
     {

package/libexec/sandbox/fetch-factory.js

@@ -644,11 +644,9 @@ self.wrapScriptLoading({ scriptName: 'fetch-factory', ringTransition: true }, fu
           promise.resolve(ev.data);
           break;
         case 'fetchError': {
-          const err = new Error();
-          err.name = ev.error.name;
-          err.message = ev.error.message;
-          err.stack = ev.error.stack;
-          promise.reject(err);
+          // Don't need to reconstruct the error here because it is done in
+          // function reportError (error, metrics) is bravojs-env.js
+          promise.reject(ev.error);
           break;
         }
       }

package/libexec/sandbox/polyfills.js

@@ -155,7 +155,6 @@ self.wrapScriptLoading({ scriptName: 'polyfills' }, function accessLists$$fn(pro
        * @return {Promise<string>}
        */
       async text() {
-        debugger;
         // More optimized than using this.arrayBuffer()
         // that requires twice as much ram
         const decoder = new TextDecoder();

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "dcp-client",
-  "version": "5.1.10",
+  "version": "5.1.11",
   "dcp": {
-    "version": "2128884f53aa660dc56c4e8ba21e095f40518c32",
+    "version": "9f78dfbb5671e31a2a41670c694fd05a56962d65",
     "repository": "git@gitlab.com:Distributed-Compute-Protocol/dcp.git"
   },
   "description": "Core libraries for accessing DCP network",

package/build/etc/config.cache

@@ -1,3 +0,0 @@
-DCP_SRC="/home/yarn/git/dcp"
-DCP_INSTALL_FLAGS=" -d -d"
-DCP_BUILD="debug"