dcp-worker 3.2.13 → 3.2.15

package/.gitlab-ci.yml

@@ -0,0 +1,30 @@
+# @file    .gitlab-ci.yml - GitLab CI configuration file.
+# @author  Bryan Hoang <bryan@distributive.network>
+# @date    September 2022
+
+# Note: The CLI requires `glibc`.
+image: node:14
+
+stages:
+  - build
+
+# Use in-house GitLab runners.
+default:
+  tags:
+    - dcp
+    - linux
+
+tidelift:
+  stage: build
+  variables:
+    # This should be kept in a GitLab Variable. Read more:
+    # https://docs.gitlab.com/ee/ci/variables/#create-a-custom-variable-in-the-ui
+    TIDELIFT_API_KEY: $TIDELIFT_API_KEY
+  script:
+    - echo "Downloading Tidelift CLI"
+    - curl https://download.tidelift.com/cli/tidelift -o tidelift
+    - echo "Setting permissions"
+    - chmod +x tidelift
+    - echo "Running alignment and saving to Tidelift"
+    - ./tidelift alignment save --wait
+  cache: []

package/.tidelift

@@ -0,0 +1,2 @@
+TIDELIFT_ORGANIZATION=team/Distributive
+TIDELIFT_PROJECT=dcp-worker

package/bin/dcp-worker

@@ -342,23 +342,31 @@ async function startWorking(cliArgs) {
     syslogPort: cliArgs.syslogPort,
   });
 
-  require('../lib/remote-console').init(cliArgs.replPort, {
-    help: {
-      report: 'Print a worker status & slice report',
-      kill: 'Kill the worker',
-    },
-    commands: {
-      report: printReport,
-      kill: exitcode => exitGuard.exit(exitcode),
-    },
-  });
-  require('../lib/remote-console').setMainEval(function mainEval() { return eval(arguments[0]) });
+  try
+  {
+    require('../lib/remote-console').init(cliArgs.replPort, {
+      help: {
+        report: 'Print a worker status & slice report',
+        kill: 'Kill the worker',
+      },
+      commands: {
+        report: printReport,
+        kill: exitcode => exitGuard.exit(exitcode),
+      },
+    });
+    require('../lib/remote-console').setMainEval(function mainEval() { return eval(arguments[0]) });
+  }
+  catch (error)
+  {
+    console.warn('350: Failed to initialize remote console:', error.message);
+  }
 
-  console.log(` * Starting DCP Worker`);
-  console.log(` . Configured for scheduler ${dcpConfig.scheduler.location}`);
-  console.log(` . Bank is ${dcpConfig.bank.location}`);
-  console.log(` . Earned funds will be deposited in account ${paymentAddress}`);
-  console.log(` . Identity is ${identityKeystore.address}`);
+  let introBanner = '';
+  introBanner += ` * Starting DCP Worker` + '\n';
+  introBanner += ` . Configured for scheduler ${dcpConfig.scheduler.location}` + '\n';
+  introBanner += ` . Bank is ${dcpConfig.bank.location}` + '\n';
+  introBanner += ` . Earned funds will be deposited in account ${paymentAddress}` + '\n';
+  introBanner += ` . Identity is ${identityKeystore.address}` + '\n';
 
   function qty(amount, singular, plural) /* XXX i18n */
   {
@@ -374,22 +382,24 @@ async function startWorking(cliArgs) {
   }
 
   if (dcpWorkerOptions.jobAddresses)
-    console.log(` * Processing only ${qty(dcpWorkerOptions.jobAddresses, 'job')}`, dcpWorkerOptions.jobAddresses.join(', '));
+    introBanner += ` * Processing only ${qty(dcpWorkerOptions.jobAddresses, 'job')}` + dcpWorkerOptions.jobAddresses.join(', ') + '\n';
   if (dcpWorkerOptions.computeGroups.length)
-    console.log(` * Joining compute ${qty(dcpWorkerOptions.computeGroups, 'group')}`, dcpWorkerOptions.computeGroups.map(el => el.joinKey).join(', '));
+    introBanner += ` * Joining compute ${qty(dcpWorkerOptions.computeGroups, 'group')}` + dcpWorkerOptions.computeGroups.map(el => el.joinKey).join(', ') + '\n';
   if (dcpWorkerOptions.publicGroupFallback)
-    console.log(' * Falling back on public group when preferred groups have no work');
+    introBanner += ' * Falling back on public group when preferred groups have no work' + '\n';
   else if (dcpWorkerOptions.leavePublicGroup)
-    console.log(' * Leaving the public compute group');
+    introBanner += ' * Leaving the public compute group' + '\n';
   if (cliArgs.verbose)
-    console.log(` + Verbosity level: ${cliArgs.verbose}`);
+    introBanner += ` + Verbosity level: ${cliArgs.verbose}` + '\n';
   if (cliArgs.eventDebug)
-    console.log(' + Event debug on');
-  console.log(' . output mode: ' + cliArgs.output);
+    introBanner += ' + Event debug on' + '\n';
+  introBanner += ' . output mode: ' + cliArgs.output + '\n';
   
-  require('../lib/check-scheduler-version').check();
+  introBanner += ' . ready' + '\n';
+
+  console.log(introBanner);
 
-  console.log(' . ready');
+  require('../lib/check-scheduler-version').check();
 
 
   /** print the slice report via console.log */

package/lib/worker-loggers/console.js

@@ -81,22 +81,14 @@ const consoleLogger = {
     console.log(" ! Failed to submit results:", ev);
   },
 
-  onError(ev) {
-    this.options.verbose && console.error(" ! Worker error:", ev);
-  },
-
-  onWarning(ev) {
-    this.options.verbose >= 2 && console.warn(" ! Worker warning:", ev);
-  },
-
   onError(ev)
   {
-    this.options.verbose && console.error("Worker Error:", ev);
+    this.options.verbose && console.error(" ! Worker Error:", ev);
   },
 
   onWarning(ev)
   {
-    this.options.verbose && console.warn("Worker Warning:", ev);
+    this.options.verbose && console.warn(" ! Worker Warning:", ev);
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcp-worker",
-  "version": "3.2.13",
+  "version": "3.2.15",
   "description": "JavaScript portion of DCP Workers for Node.js",
   "main": "bin/dcp-worker",
   "keywords": [
@@ -36,12 +36,13 @@
     "blessed-contrib": "^4.11.0",
     "bravojs": "^1.0.15",
     "chalk": "^4.1.1",
-    "dcp-client": "^4.2.15",
-    "kvin": "^1.2.7",
-    "semver": "^7.3.5",
+    "dcp-client": "^4.2.18",
+    "kvin": "^1.2.10",
+    "semver": "^7.3.5"
+  },
+  "optionalDependencies": {
     "telnet-console": "^1.0.4"
   },
-  "optionalDependencies": {},
   "devDependencies": {
     "@kingsds/eslint-config": "1.0.1",
     "eslint": "7.30.0"