dcp-worker 3.2.34 → 3.2.37

package/.eslintrc.js

@@ -15,7 +15,7 @@
 module.exports = {
   root: true,
   reportUnusedDisableDirectives: true,
-  extends: ['eslint:recommended', '@distributive'],
+  extends: ['eslint:recommended', '@distributive/eslint-config'],
   env: {
     node: true,
     es2022: true,

package/bin/dcp-evaluator-start

@@ -55,12 +55,6 @@ function main() {
           alias: ['r'],
           desc: 'Path to evaluator as a module identitifer',
         })
-        .option('evaluator-lib-dir', {
-          alias: ['l'],
-          deprecated: true,
-          desc: 'Location of evaluator libraries',
-          default: dcpConfig.evaluator.libDir || undefined
-        })
         .option('sandbox-libexec-dir', {
           desc: 'Location of sandbox setup files',
           default: path.resolve(dcpClientDir, 'libexec', 'sandbox'),
@@ -128,12 +122,6 @@ function main() {
   if (!options.stdio && options.port)
     args = args.concat(['-p', options.port]);
 
-  if (options.evaluatorLibDir) {
-    console.warn(`Note: --evaluator-lib-dir (-l) is deprecated. Please pass this argument to the evalutor 'dcp-evaluator-start ... -- -l ${options.evaluatorLibDir}'`);
-    options.evaluatorLibDir = path.resolve(options.prefix, 'etc', options.evaluatorLibDir);
-    args = args.concat(['-l', options.evaluatorLibDir]);
-  }
-
   /* Decode log-level parameters and translate as appropriate for the type of evaluator in use */
   if (options.debugLogLevel || options.debugLogLevel === 0)
   {

package/bin/dcp-worker

@@ -50,9 +50,9 @@ require('dcp-client').init({ configName }).then(main).catch(handleUnhandled);
 function parseCliArgs()
 {
   var defaultPidFileName;
-  
+
   defaultPidFileName = require('../lib/pidfile').getDefaultPidFileName(dcpConfig.worker.pidfile);
-  
+
   const cliArgs = require('dcp/cli')
   .base('Standalone NodeJS DCP Worker')
     .options({
@@ -60,6 +60,10 @@ function parseCliArgs()
         describe: 'The address to deposit funds into, will use the default bank keystore if not provided.',
         type: 'string',
       },
+      defaultPaymentAddressToDCP: {
+        describe: 'If this option is set and no other payment address is provided, send payment for work completed to the DCP Community account',
+        type: 'boolean',
+      },
       cores: {
         alias: 'c',
         describe: 'Number of CPU and GPU cores to work with: the format is 7,1 (or just 7) for 7 CPU cores and 1 GPU',
@@ -171,7 +175,7 @@ function parseCliArgs()
         describe: 'Address of syslog server',
         type: 'string',
         group: 'Syslog output options',
-        default: 'loghost',
+        default: 'loghost', // Unix standard for syslog
       },
       syslogFacility: {
         describe: 'Name of syslog facility',
@@ -254,7 +258,7 @@ function addConfig(target, ...objs)
   Object.assign(target, tmp);
 }
 
-/** 
+/**
  * Replacement for process.exit() that tries to increase the probability
  * that remote log messages will make it out over the network.
 */
@@ -291,13 +295,26 @@ async function main()
   process.on('unhandledRejection', handleUnhandled);
   process.on('uncaughtException', handleUnhandled);
   
+  const getOpts = {};
+  if (cliArgs.defaultPaymentAddressToDCP)
+    getOpts.oAuth = false;
+
   let paymentAddress = false
       || cliArgs.paymentAddress
       || dcpConfig.worker.paymentAddress
-      || (await wallet.get()).address;
+      || (await wallet.get(getOpts).catch(error => {
+          // if flag is set and no other address is provided, use the DCP Community Account,
+          // which is 0x079DAC0612C710ab4e975dAb7171C7e4beF78c5a at time of writing
+          if ((error.code === 'ENOENT') && cliArgs.defaultPaymentAddressToDCP)
+          {
+            console.warn('Warning: Defaulting payment to DCP Community Account');
+            return {address:'0x079DAC0612C710ab4e975dAb7171C7e4beF78c5a'};
+          }
+          throw error;
+          })).address;
   if (typeof paymentAddress === 'string')
     paymentAddress = new wallet.Address(paymentAddress);
-    
+
   if (cliArgs.pidFile)
     require('../lib/pidfile').write(cliArgs.pidFile);
 
@@ -311,7 +328,7 @@ async function main()
     identityKeystore = await wallet.getId();
   await wallet.addId(identityKeystore);
 
-  /* Build the worker options, which are largely given by dcpConfig.worker. We use a reference for 
+  /* Build the worker options, which are largely given by dcpConfig.worker. We use a reference for
    * dcpConfig.worker rather than copying it, so that runtime modifications to the worker configuration
    * in memory take effect immediately.
    *
@@ -389,7 +406,7 @@ async function main()
 
   if (cliArgs.outputMode === 'dashboard')
     require('../lib/dashboard-tui').init(worker, cliArgs);
-  
+
   /* 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.
    */
@@ -455,6 +472,14 @@ async function main()
     introBanner += ` + Verbosity level: ${cliArgs.verbose}` + '\n';
   if (telnetd.hasOwnProperty('port'))
     introBanner += ` ! telnetd listening on port ${telnetd.port}\n`;
+
+  const { worktimes } = require('dcp-client/libexec/sandbox/worktimes');
+  if (Object.keys(worktimes).length > 0)
+  {
+    introBanner += ' . Worktimes Available:\n';
+    for (const wt of worktimes)
+      introBanner += `    -\t${wt.name}@${wt.versions.join(';')}\n`;
+  }
   
   introBanner += ' . Supervisor version: ' + worker.supervisorVersion;
   introBanner += ' . Output mode: ' + cliArgs.outputMode + '\n';
@@ -475,7 +500,7 @@ async function main()
   await worker.start();
 }
 
-/** 
+/**
  * Process the cores and density cli arguments.
  *
  * cliArgs.cores is the core count of the hardware to use.
@@ -517,7 +542,7 @@ function processCoresAndDensity (dcpWorkerOptions, cliArgs)
  * Log a closing message (or messages). Since the dashboard clears the screen on exit, we use the
  * memoized console property to log the message after we destroy the instance of screen.
  */
-function logClosing(facility, ...message) 
+function logClosing(facility, ...message)
 {
   var screen = require('../lib/worker-loggers/dashboard').screen;
 
@@ -537,7 +562,7 @@ function logClosing(facility, ...message)
   console[facility](...message);
 }
 
-/** 
+/**
  * Fatal error handler: __must not ever throw no matter what__.
  * If we hit a fatal error, we are by definition no longer confident of our program state, meaning that
  * the worker must be restarted. This handler does its best to report the rejection and give the worker a few
@@ -549,7 +574,7 @@ function handleUnhandled(error)
   worker = false;
 
   process.exitCode = process.exitCode || EXIT_UNHANDLED;
-  
+
   try
   {
     logClosing('error', error);
@@ -661,7 +686,7 @@ function sliceReport()
 }
 
 /**
- * Handle a signal which requests our the death of the Worker by 
+ * Handle a signal which requests our the death of the Worker by
  *  - stopping the worker
  *  - unregistering the handler (this allows a second signal to forcibly terminate the process
  *    if that is the default behaviour)
@@ -708,7 +733,7 @@ function getCleanupTimeoutMs()
 }
 
 /**
- * Ensure the default configuration hasn't been modified by the end-user-sysadmin. It is an 
+ * Ensure the default configuration hasn't been modified by the end-user-sysadmin. It is an
  * attractive nuisance, as it looks just like the file they should modify, but if they make
  * security changes there that are overwritten in an subsequent update, it will be a problem.
  *

package/docs/CODEOWNERS

@@ -12,8 +12,6 @@
 
 []
 
-[Brandon]
-
 [Eddie]
 /package-lock.json @eroosenmaallen
 
@@ -21,15 +19,17 @@
 /npm-hooks/ @wesgarland
 /README.md @wesgarland
 /docs/ @wesgarland
-/.eslintrc.json @wesgarland
+/.eslintrc.js @wesgarland
 /.npmrc @wesgarland
 /.tidelift @wesgarland
 /lib/ @wesgarland
 /LICENSE.md @wesgarland
+/.trunk/ @wesgarland
 /.gitignore @wesgarland
 /etc/ @wesgarland
 /.gitlab-ci.yml @wesgarland
 /bin/ @wesgarland
+/catalog-info.yaml @wesgarland
 /etc/ @wesgarland
 /lib/ @wesgarland
 /bin/ @wesgarland

package/lib/worker-loggers/syslog.js

@@ -28,12 +28,12 @@ exports.init = function syslog$$init(cliArgs)
   {
     const syslogOptions = {
       syslogHostname: os.hostname(),
-      transport: cliArgs.syslogTransport || 'udp', // tcp, udp, unix, tls
+      transport: cliArgs.syslogTransport, // tcp, udp, unix, tls
       port:      cliArgs.syslogPort,
       facility: syslog.Facility[cliArgs.syslogFacility[0].toUpperCase() + cliArgs.syslogFacility.slice(1)],
     }
 
-    syslogClient = syslog.createClient(cliArgs.syslogAddress || '127.0.0.1', syslogOptions);
+    syslogClient = syslog.createClient(cliArgs.syslogAddress, syslogOptions);
     processName = require('path').basename(process.mainModule.filename || process.argv0);
     exports.close = () => syslogClient.close();
   }
@@ -60,7 +60,7 @@ function log(level, ...argv)
       logMessage = logPrefix + logMessage;
       syslogClient.log(logMessage, { severity }, error => {
         if (error)
-          _console.error('168: Unexpected error writing to syslog:');
+          _console.error('168: Unexpected error writing to syslog:', error);
       });
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcp-worker",
-  "version": "3.2.34",
+  "version": "3.2.37",
   "description": "JavaScript portion of DCP Workers for Node.js",
   "main": "bin/dcp-worker",
   "keywords": [
@@ -40,7 +40,7 @@
     "blessed": "^0.1.81",
     "blessed-contrib": "^4.11.0",
     "chalk": "^4.1.0",
-    "dcp-client": "4.3.4",
+    "dcp-client": "4.3.6",
     "kvin": "^1.2.7",
     "posix-getopt": "^1.2.1",
     "semver": "^7.3.8",
@@ -51,11 +51,11 @@
     "telnet-console": "^1.0.4"
   },
   "devDependencies": {
+    "@distributive/eslint-config": "2.1.1",
     "@distributive/eslint-plugin": "1.0.2",
     "@kingsds/eslint-config": "^1.0.1",
     "@trunkio/launcher": "1.2.7",
-    "eslint": ">=8",
-    "eslint-plugin-jsdoc": "46.8.2"
+    "eslint": "8.56.0"
   },
   "peerDependencies": {
     "node-eventlog": "https://gitpkg.now.sh/Distributive-Network/node-eventlog/package?dcp/0.0.1"
@@ -70,6 +70,10 @@
     "npm": ">=7"
   },
   "overrides": {
-    "@azure/msal-node": "2.2.0"
+    "dbus-next": {
+      "usocket": {
+        "node-gyp": "10.0.1"
+      }
+    }
   }
 }