dcp-worker 4.4.3 → 4.5.0

package/bin/dcp-evaluator-start

@@ -19,11 +19,12 @@ const path    = require('path');
 
 const { logLevels } = require('../lib/consts');
 
-async function processExit(code)
+async function processExit(code, silent=true)
 {
   if (typeof code === 'undefined')
     code = process.exitCode;
-  console.debug('Exit, code', code);
+  if (!silent)
+    console.debug('Exit, code', code);
   await loggers.unhook();
   process.exit(code);
 }
@@ -35,7 +36,7 @@ function panic(...argv)
   processExit(1);
 }
 
-function main()
+async function main()
 {
   const dcpConfig = require('dcp/dcp-config');
   const loggingOptions = {
@@ -117,11 +118,11 @@ Options:
     switch (option)
     {
       case '?':
-        processExit(1);
+        await processExit(1, false);
         break;
       case 'h':
         help();
-        processExit(0);
+        await processExit(0, false);
         break;
       case 'P':
         options.prefix = optarg;
@@ -158,7 +159,7 @@ Options:
       {
         const dump = Object.keys(require(options.sandboxDefinitions));
         console.log(options.json ? JSON.stringify(dump) : dump);
-        processExit(0);
+        await processExit(0);
         break;
       }
       case 'D':
@@ -288,7 +289,7 @@ Options:
       console.log('Evaluator command:', [path.resolve(options.prefix, options.evaluator)].concat(files).concat(args).join(' '));
       console.log('Options:', options);
     }
-    processExit(0);
+    await processExit(0);
   }
 
   if (options.dumpFiles)
@@ -298,7 +299,7 @@ Options:
     if (options.json)
       dump = JSON.stringify(dump);
     console.log(dump);
-    processExit(0);
+    await processExit(0);
   }
 
   if (!options.stdio && options.sandboxType === 'node') {

package/bin/dcp-worker

@@ -582,11 +582,12 @@ async function main()
   worker.runInfo.type = 'dcp-worker';
   worker.on('warning', (...payload) => console.warn (...payload));
   worker.on('claim', amount => console.log(` . transfered ${amount} ⊇ to ${worker.config.paymentAddress}`));
-
+  worker.on('stop', () => workerIsStopping = true );
   await processCliOptsPhase2(remainArgv, operatingMode, loggingOptions);
 
   if (operatingMode.show)
   {
+    await worker.configure();
     const output = await require('../lib/show').show(worker, operatingMode.show);
     if (operatingMode.showSerializer)
       console.log(operatingMode.showSerializer.stringify(output, null, 2));
@@ -781,10 +782,11 @@ async function main()
       console.info(` ! not claming earnings in the amount of ${amount} ⊇ (can claim later)`);
   }
 
-  worker.on('stop', () => { console.log(' - Worker is stopping'); workerIsStopping = true });
-  worker.on('end',  () => { console.log(' * Worker has stopped') });
+  worker.on('stop',  () => { console.log(' - Worker is stopping') });
+  worker.on('end',   () => { console.log(' * Worker has stopped') });
   worker.on('job',   job    => console.log(` . Job: ${job.name} ${job.id.slice(0,8)} ${job.description || ''} ${job.link || ''}`));
-  console.info(' * Ready.\n');
+  worker.on('start', () => console.info(' * Ready.\n'));
+
   await worker.start();
 } /* main() */
 

package/lib/web-iface.js

@@ -353,7 +353,7 @@ async function workerRegisterPostHandler(query, req, res)
 {
   var failExpn;
   const utils = require('./utils');
-  const reg = await utils.registerWorker(worker, query.rkey, msg => failExpn = msg);
+  const reg = await utils.registerWorker(worker, query.rkey, undefined /* no label */, msg => failExpn = msg);
   reg.failExpn = failExpn;
   reg.pid = process.pid;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcp-worker",
-  "version": "4.4.3",
+  "version": "4.5.0",
   "description": "Node.js Worker for Distributive Compute Platform",
   "main": "bin/dcp-worker",
   "keywords": [
@@ -39,7 +39,7 @@
     "blessed": "0.1.81",
     "blessed-contrib": "4.11.0",
     "chalk": "4.1.2",
-    "dcp-client": "^5.6.0",
+    "dcp-client": "^5.7.0",
     "kvin": "^9.0.0",
     "posix-getopt": "1.2.1",
     "semver": "7.7.3",