dcp-worker 3.2.21 → 3.2.23

package/bin/dcp-worker

@@ -43,7 +43,10 @@ async function main () {
   if (!ANALYZE_UNHANDELD_REJECTION)
     process.on('unhandledRejection', unhandledRejectionHandler);
 
-  await require('dcp-client').init(require(process.env.DCP_CONFIG || '../etc/dcp-config'));
+  await require('dcp-client').init({
+    configName: '../etc/dcp-config',
+  });
+
   dcpConfig = require('dcp/dcp-config');
 
   const cliArgs = require('dcp/cli')
@@ -274,9 +277,10 @@ async function startWorking(cliArgs) {
 
 
   /** @type {string[]} */
-  const dcpWorkerOptions = {
+  const dcpWorkerOptions = dcpConfig.worker;
+
+  Object.assign(dcpWorkerOptions, {
     paymentAddress,
-    identity: identityKeystore,
     maxWorkingSandboxes: cliArgs.cores,
     cores:               { cpu: TOTAL_CPU_VCORES, gpu: undefined }, /** XXXpfr @todo: Figure out how many gpus. */
     targetLoad:          { cpu: 1.0, gpu: 1.0 }, /** Use 100%: XXXpfr @todo Allow command-line override. */
@@ -285,7 +289,7 @@ async function startWorking(cliArgs) {
     },
     computeGroups: [], /* public group is implied */
     leavePublicGroup: cliArgs.leavePublicGroup || dcpConfig.worker.leavePublicGroup,
-  };
+  });
 
   /* cliArgs.join is the list of compute groups to join */
   if (cliArgs.join && cliArgs.join.length)
@@ -306,12 +310,11 @@ async function startWorking(cliArgs) {
     dcpWorkerOptions.priorityOnly = true;
   }
   if (cliArgs.allowedOrigins)
-    dcpConfig.worker.allowOrigins.any = cliArgs.allowedOrigins;
+    dcpConfig.worker.allowOrigins.any.concat(cliArgs.allowedOrigins);
   if (cliArgs.watchdogInterval)
     dcpWorkerOptions.watchdogInterval = cliArgs.watchdogInterval;
 
-
-  worker = new DCPWorker(/*identityKeystore, */dcpWorkerOptions);
+    worker = new DCPWorker(identityKeystore, dcpWorkerOptions);
 
   /**
    * NOTE: In Supervisor2 this function is a NOOP.

package/etc/dcp-config.js

@@ -12,31 +12,36 @@
 
 const dcpConfig =
 {
-  evaluator:
-  {
-    listen: new URL('dcpsaw://localhost:9000/'),
-    libDir: '../libexec/evaluator', // relative to prefix
-  },
+  worker: { /******* Note: all properties passed to web; no filtering! ********/
 
-  standaloneWorker:
-  {
-    quiet: false,
-    debug: process.env.DCP_SAW_DEBUG,
-    evaluatorConnectBackoff:
-    {
-      maxInterval:   5 * 60 * 1000, // max: 5 minutes
-      baseInterval:      10 * 1000, // start: 10s
-      backoffFactor: 1.1            // each fail, back off by 10%
+    trustComputeGroupOrigins: true, // trust the scheduler to give network access to origins on a per-compute-group basis
+
+    /* Allow lists permitting supervisor network access beyond DCP messages to services */
+    allowOrigins: {
+      any: [],
+      fetchWorkFunctions: [],
+      fetchArguments: [],
+      fetchData: [],
+      sendResults: [],
     },
-    reloadBehaviour: 'process.exit(12)',
+
+    minimumWage: {
+      CPU:  0,
+      GPU:  0,
+      'in': 0,
+      out:  0,
+    },
+
+    computeGroups: {},              // integer-one-indexed; format is 1:{ joinKey,joinHash } or 2:{ joinKey, joinSecret }
+    jobAddresses: [],               // Specific job addresses the worker may work on. If not empty, worker will only work on those jobs.
+    maxWorkingSandboxes: 1,
+    paymentAddress: null,           // user must to specify
+    evaluatorOptions: {}            /** @todo: add default options here. Note: right now they will be a bit off until we get localexec's evaluator a bit less special cased. */
   },
-  worker:
+  evaluator:
   {
-    sandbox: {
-      progressTimeout: 30 * 1000,
-    },
-    leavePublicGroup: false,
-    allowConsoleAccess: false,
+    listen: new URL('dcpsaw://localhost:9000/'),
+    libDir: '../libexec/evaluator', // relative to prefix
   },
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcp-worker",
-  "version": "3.2.21",
+  "version": "3.2.23",
   "description": "JavaScript portion of DCP Workers for Node.js",
   "main": "bin/dcp-worker",
   "keywords": [
@@ -36,7 +36,7 @@
     "blessed-contrib": "^4.11.0",
     "bravojs": "^1.0.16",
     "chalk": "^4.1.0",
-    "dcp-client": "^4.2.26",
+    "dcp-client": "^4.2.27",
     "semver": "^7.3.8"
   },
   "optionalDependencies": {