dcp-worker 3.2.26 → 3.2.28-0

package/.gitlab-ci.yml

@@ -27,4 +27,5 @@ tidelift:
     - chmod +x tidelift
     - echo "Running alignment and saving to Tidelift"
     - ./tidelift alignment save --wait
+  allow_failure: true
   cache: []

package/bin/dcp-evaluator-start

@@ -254,26 +254,34 @@ function main() {
     console.log('. cwd:', path.join(options.prefix));
     console.log('. run:', [evaluator].concat(files).concat(args).map(a => `"${a}"`).join(' '));
   }
-  const ran = require('child_process').spawnSync(evaluator, files.concat(args), {
+
+  const child = require('child_process').spawn(evaluator, files.concat(args), {
     cwd: path.join(options.prefix),
     windowsHide: true,
-    stdio: ['inherit', 'inherit', 'inherit']
+    stdio: ['inherit', 'inherit', 'inherit'],
   });
 
-  if (ran.signal && !options.stdio)
-    console.log(`Evaluator server caught signal ${ran.signal}`);
-  if (ran.error) {
-    delete ran.error.stack;
-    console.error(ran.error);
-  }
+  process.exitCode = 1;
+  child.on('error', (error) => {
+    delete error.stack;
+    console.error(error);
+    child.unref();
+  });
 
-  if (!ran.signal && !ran.error) {
+  child.on('close', (code, signal) => {
     if (!options.stdio)
-      console.log('Evaluator server process exited, status', ran.status);
-    process.exit(ran.status);
-  }
+    {
+      if (signal)
+        console.log(`Evaluator server caught signal ${signal}`);
+      else
+        console.log('Evaluator server process exited, status', code);
+    }
 
-  process.exit(1);
+    process.exit(code);
+  });
+
+  process.on('SIGINT',  () => process.kill(child.pid, 'SIGINT'));
+  process.on('SIGTERM', () => process.kill(child.pid, 'SIGTERM'));
 }
 
 /* Initialize dcp-client to use only local resources before launching the main function */

package/bin/dcp-worker

@@ -110,13 +110,14 @@ function parseCliArgs()
 
       leavePublicGroup: {
         type: 'boolean',
-        describe: 'Do not fetch slices from public compute group',
+        describe: 'Do not fetch slices from public compute group. Ignored if --publicGroupFallback is set',
         default: false,
       },
       publicGroupFallback: {
         describe: 'If set, worker will prefer private groups but fall back on the public group if no preferred work is available',
         type: 'boolean',
-        default: false,
+        default: 'false',
+        defaultDescription: false,
       },
 
       identityKey: {
@@ -231,8 +232,6 @@ async function main()
     port:     cliArgs.port
   };
 
-  verifyDefaultConfigIntegrity();
-
   process.on('SIGINT', handleSigDeath);
   process.on('SIGTERM', handleSigDeath);
   process.on('SIGQUIT', handleSigDeath);
@@ -314,8 +313,8 @@ async function main()
     dcpWorkerOptions.watchdogInterval = cliArgs.watchdogInterval;
 
   worker = new DCPWorker(identityKeystore, dcpWorkerOptions);
-  worker.on('error', console.error);
-  worker.on('warning', console.warn);
+  worker.on('error', (...payload) => console.error(...payload));
+  worker.on('warning', (...payload) => console.warn(...payload));
 
   /* Let incorrect event-loop references keep us alive when linked with a debug library, but
    * exit quickly/accurately for production code even when the library isn't perfect.
@@ -336,6 +335,10 @@ async function main()
   startWorkerLogger(worker, cliArgs);
 
   require('../lib/remote-console').setMainEval(function mainEval() { return eval(arguments[0]) });
+  require('../lib/remote-console').reintercept();
+
+  // Only after intercepting console for remote and for event-log
+  verifyDefaultConfigIntegrity();
 
   // Activate public group fallback
   // If requested by CLI
@@ -381,7 +384,7 @@ async function main()
     return plural;
   }
 
-  if (dcpWorkerOptions.jobAddresses)
+  if (dcpWorkerOptions.jobAddresses.length)
     introBanner += ` * Processing only ${qty(dcpWorkerOptions.jobAddresses, 'job')} ` + dcpWorkerOptions.jobAddresses.join(', ') + '\n';
   if (dcpWorkerOptions.computeGroups.length)
     introBanner += ` * Joining compute ${qty(dcpWorkerOptions.computeGroups, 'group')} ` + dcpWorkerOptions.computeGroups.map(el => el.joinKey).join(', ') + '\n';
@@ -630,7 +633,7 @@ function verifyDefaultConfigIntegrity()
   {
     const originalMd5sum = fs.readFileSync(md5sumPath, 'ascii');
     const actualMd5sum = crypto.createHash('md5')
-          .update(fs.readFileSync(workerConfPath, 'ascii'))
+          .update(fs.readFileSync(workerConfPath))
           .digest('hex');
 
     if (!originalMd5sum.startsWith(actualMd5sum))
@@ -644,6 +647,11 @@ function verifyDefaultConfigIntegrity()
       console.warn('    - /etc/override/dcp/dcp-worker/dcp-config.js');
       console.warn('    - the Windows Registry');
 
+      // md5 calculation is incorrect on Windows. Possibly git/npm mangling line-endings?
+      const os = requireNative('os');
+      if (os?.platform() === 'win32')
+        return;
+
       if (require('dcp/build').config.build !== 'debug')
         process.exit(1);
 

package/etc/dcp-worker-config.js.md5

@@ -1,2 +1,2 @@
-ee17a8c00be52fbefd8c642d312317e7  etc/dcp-worker-config.js
+db140f1050d7506373319cc282e3c76d  etc/dcp-worker-config.js
 ### DO NOT MODIFY THIS FILE!!! ###

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcp-worker",
-  "version": "3.2.26",
+  "version": "3.2.28-0",
   "description": "JavaScript portion of DCP Workers for Node.js",
   "main": "bin/dcp-worker",
   "keywords": [
@@ -12,9 +12,10 @@
   },
   "repository": {
     "type": "git",
-    "url": "git@github.com:Distributed-Compute-Labs/dcp-worker.git"
+    "url": "git+ssh://git@gitlab.com/Distributed-Compute-Protocol/dcp-worker.git"
   },
   "license": "MIT",
+  "author": "Kings Distributed Systems",
   "engines": {
     "node": ">=14.0.0"
   },
@@ -38,7 +39,7 @@
     "blessed": "^0.1.81",
     "blessed-contrib": "^4.11.0",
     "chalk": "^4.1.0",
-    "dcp-client": "^4.2.28",
+    "dcp-client": "^4.2.30",
     "semver": "^7.3.8"
   },
   "optionalDependencies": {