dcp-client 4.2.9 → 4.2.12

package/docs/CODEOWNERS

@@ -0,0 +1,12 @@
+# @file    CODEOWNERS - Defines who develops and maintains a feature, and own
+#          the resulting files or directories in the repository.
+#
+#          See https://docs.gitlab.com/ee/user/project/code_owners.html
+#
+# @author  Bryan Hoang <bryan@distributive.network>
+# @date    August 2022
+
+# Username mapping:
+# @wesgarland -> Wes Garland <wes@distributive.network>
+
+* @wesgarland

package/generated/sandbox-definitions.json

@@ -1 +1 @@
-{"browser":["deny-node","kvin/kvin.js","script-load-wrapper","wrap-event-listeners","event-loop-virtualization","gpu-timers","access-lists","bravojs-init","bravojs/bravo.js","bravojs-env","calculate-capabilities","bootstrap"],"node":["kvin/kvin.js","sa-ww-simulation","script-load-wrapper","wrap-event-listeners","event-loop-virtualization","gpu-timers","access-lists","bravojs-init","bravojs/bravo.js","bravojs-env","calculate-capabilities","bootstrap"],"native":["deny-node","kvin/kvin.js","sa-ww-simulation","script-load-wrapper","native-event-loop","wrap-event-listeners","event-loop-virtualization","webgpu-worker-environment","gpu-timers","access-lists","bravojs-init","bravojs/bravo.js","bravojs-env","calculate-capabilities","bootstrap"],"webGpuNative":["deny-node","kvin/kvin.js","bootstrap"],"nodeTesting":["kvin/kvin.js","sa-ww-simulation","script-load-wrapper","wrap-event-listeners","event-loop-virtualization","gpu-timers","access-lists","bravojs-init","bravojs/bravo.js","bravojs-env","calculate-capabilities","bootstrap","testing.js"],"testing":["deny-node","kvin/kvin.js","sa-ww-simulation","script-load-wrapper","native-event-loop","wrap-event-listeners","event-loop-virtualization","webgpu-worker-environment","gpu-timers","access-lists","bravojs-init","bravojs/bravo.js","bravojs-env","calculate-capabilities","bootstrap","testing.js"]}
+{"browser":["deny-node","kvin/kvin.js","script-load-wrapper","wrap-event-listeners","event-loop-virtualization","gpu-timers","access-lists","bravojs-init","bravojs/bravo.js","bravojs-env","calculate-capabilities","bootstrap"],"node":["kvin/kvin.js","sa-ww-simulation","script-load-wrapper","wrap-event-listeners","event-loop-virtualization","gpu-timers","access-lists","bravojs-init","bravojs/bravo.js","bravojs-env","calculate-capabilities","bootstrap"],"native":["deny-node","kvin/kvin.js","sa-ww-simulation","script-load-wrapper","native-event-loop","wrap-event-listeners","event-loop-virtualization","gpu-timers","access-lists","bravojs-init","bravojs/bravo.js","bravojs-env","calculate-capabilities","bootstrap"],"webGpuNative":["deny-node","kvin/kvin.js","sa-ww-simulation","script-load-wrapper","native-event-loop","wrap-event-listeners","event-loop-virtualization","webgpu-worker-environment","gpu-timers","access-lists","bravojs-init","bravojs/bravo.js","bravojs-env","calculate-capabilities","bootstrap"],"nodeTesting":["kvin/kvin.js","sa-ww-simulation","script-load-wrapper","wrap-event-listeners","event-loop-virtualization","gpu-timers","access-lists","bravojs-init","bravojs/bravo.js","bravojs-env","calculate-capabilities","bootstrap","testing.js"],"testing":["deny-node","kvin/kvin.js","sa-ww-simulation","script-load-wrapper","native-event-loop","wrap-event-listeners","event-loop-virtualization","gpu-timers","access-lists","bravojs-init","bravojs/bravo.js","bravojs-env","calculate-capabilities","bootstrap","testing.js"]}

package/index.js

@@ -33,6 +33,7 @@ const kvin    = require('kvin');
 const moduleSystem = require('module');
 const { spawnSync } = require('child_process');
 const vm = require('vm');
+const protectedDcpConfigKeys = [ 'system' ];
 
 exports.debug = false;
 let initInvoked = false; /* flag to help us detect use of Compute API before init */
@@ -96,6 +97,7 @@ const bundleSandbox = {
   setImmediate, clearImmediate,
   crypto: { getRandomValues: require('polyfill-crypto.getrandomvalues') },
   dcpConfig: {
+    build: 'bootstrap',
     bundleConfig: true,
     scheduler: {},
     bank: {
@@ -466,7 +468,11 @@ function addConfigFile(existing /*, file path components ... */) {
  *  becomes the neo config.
  */
 async function addConfigRKey(existing, hive, keyTail) {
-  var neo = await require('./windows-registry').getObject(hive, keyTail);
+  var neo;
+  // make sure RKey calls do not execute the windows registry calls on non-windows platforms
+  if (os.platform() !== 'win32')
+    return;
+  neo = await require('./windows-registry').getObject(hive, keyTail);
   debugging() && console.debug(` * Loading configuration from ${hive} ${keyTail}`);
   if (neo)
     addConfig(existing, neo);
@@ -485,11 +491,10 @@ function addConfigEnviron(existing, prefix) {
       continue
     }
     if (process.env[v][0] === '{') {
-      // FIXME(bryan-hoang): fixCase is not defined.
       let prop = fixCase(v.slice(prefix.length))
       if (typeof neo[prop] !== 'object') {
         neo[prop] = {}
-        addConfig(neo[prop], JSON.parse(process.env[v]))
+        addConfig(neo[prop], eval(`"use strict"; (${process.env[v]})`));
       } else {
         if (typeof neo[prop] === "object") {
           throw new Error("Cannot override configuration property " + prop + " with a string (is an object)")
@@ -502,6 +507,18 @@ function addConfigEnviron(existing, prefix) {
   addConfig(existing, neo);
 }
 
+/** Turn UGLY_STRING into uglyString */
+function fixCase(ugly)
+{
+  var fixed = ugly.toLowerCase();
+  var idx;
+
+  while ((idx = fixed.indexOf('_')) !== -1)
+    fixed = fixed.slice(0, idx) + fixed[idx + 1].toUpperCase() + fixed.slice(idx + 2);
+
+  return fixed;
+}
+
 /** 
  * Tasks which are run in the early phases of initialization
  * - plumb in global.XMLHttpRequest which lives forever -- that way KeepAlive etc works.
@@ -606,6 +623,8 @@ function initTail(aggrConfig, finalBundleCode, finalBundleURL) {
     bundleSandbox.dcpConfig = defaultConfig;
   }
 
+  bundleSandbox.dcpConfig.build = require('dcp/build').config.build;
+
   Object.defineProperty(exports, 'distDir', {
     value: function dcpClient$$distDir$getter() {
       return distDir;
@@ -657,6 +676,7 @@ function initTail(aggrConfig, finalBundleCode, finalBundleURL) {
   ret = makeInitReturnObject();
   if (bundle.postInitTailHook) /* for use by auto-update future backwards compat */ 
     ret = bundle.postInitTailHook(ret, aggrConfig, bundle, finalBundleLabel, bundleSandbox, injectModule);
+  dcpConfig.build = bundleSandbox.dcpConfig.build = require('dcp/build').config.build;
   return ret;
 }
 
@@ -777,16 +797,6 @@ exports.createAggregateConfig = async function dcpClient$$createAggregateConfig(
     programName = path.basename(programName, '.js');
   let config = localConfig;
 
-  /* This follows spec doc line-by-line */
-                 await addConfigRKey(config, 'HKLM', 'dcp-client/dcp-config');
-                 await addConfigFile(config, etc,    'dcp-client/dcp-config.js');
-  programName && await addConfigRKey(config, 'HKLM', `dcp-client/${programName}/dcp-config`);
-  programName && await addConfigFile(config, etc,    `dcp-client/${programName}/dcp-config.js`);
-  await addConfigFile(config, home,   '.dcp/dcp-client/dcp-config.js');
-  programName && await addConfigFile(config, home,   `.dcp/dcp-client/${programName}/dcp-config.js`); 
-                 await addConfigRKey(config, 'HKCU', `dcp-client/dcp-config`);
-  programName && await addConfigRKey(config, 'HKCU', `dcp-client/${programName}/dcp-config`);
-
   // Sort out polymorphic arguments: 'passed-in configuration'.
   if (initArgv[0]) {
     if (typeof initArgv[0] === 'string' || (typeof initArgv[0] === 'object' && initArgv[0] instanceof global.URL)) {
@@ -806,9 +816,18 @@ exports.createAggregateConfig = async function dcpClient$$createAggregateConfig(
   if (initArgv[2])
     addConfig(localConfig.bundle, { location: new URL(initArgv[2])});
   
-  await addConfigEnviron(localConfig, 'DCP_CONFIG_');
-  await addConfigFile(localConfig, etc,    `override/dcp-config.js`);
-  await addConfigRKey(localConfig, 'HKLM', 'override/dcp-config');
+  /* This follows spec doc line-by-line */
+  await addConfigRKey(config, 'HKLM', 'dcp-client/dcp-config');
+  addConfigFile(config, etc, 'dcp/dcp-client/dcp-config.js');
+  programName && await addConfigRKey(config, 'HKLM', `dcp-client/${programName}/dcp-config`);
+  programName && addConfigFile(config, etc, `dcp/dcp-client/${programName}/dcp-config.js`);
+  addConfigFile(config, home, '.dcp/dcp-client/dcp-config.js');
+  programName && addConfigFile(config, home, `.dcp/dcp-client/${programName}/dcp-config.js`);
+  await addConfigRKey(config, 'HKCU', 'dcp-client/dcp-config');
+  programName && await addConfigRKey(config, 'HKCU', `dcp-client/${programName}/dcp-config`);
+
+  addConfigEnviron(localConfig, 'DCP_CONFIG_');
+  addConfigFile(localConfig, etc, 'dcp/override/dcp-config.js');
   addConfig(aggrConfig, localConfig);
 
   /**
@@ -870,6 +889,8 @@ exports.createAggregateConfig = async function dcpClient$$createAggregateConfig(
     let remoteConfig = {};
     let newConfig = {};
     addConfig(remoteConfig, evalStringInSandbox(remoteConfigCode, bundleSandbox, aggrConfig.scheduler.configLocation.href));
+    for (let key of protectedDcpConfigKeys)
+      delete remoteConfig[key];
     addConfig(remoteConfig, bundleSandbox.dcpConfig);
 
     /* remote config has lower precedence than local modifications, but gets loaded

package/libexec/evaluator-node.js

@@ -366,7 +366,7 @@ function main() {
   setupErrorHandlers();
   
   const argv = require('yargs')
-  .usage('Node Evaluator - Copyright (c) 2020-2021 Kings Distributed Systems, Ltd. All Rights Reserved.'
+  .usage('Node Evaluator - Copyright (c) 2020-2022 Distributive, Ltd. All Rights Reserved.'
     + 'Usage: dcp-evaluator [options] [<file.js> <file.js> ...]')
   .options({
     port: {

package/libexec/sandbox/bootstrap.js

@@ -1,6 +1,6 @@
 /**
  *  @file       worker/evaluator-lib/bootstrap.js
- *              Copyright (c) 2018, Kings Distributed Systems, Ltd.  All Rights Reserved.
+ *              Copyright (c) 2018-2022, Distributive, Ltd.  All Rights Reserved.
  *
  *              Final evaluator bootstrap code for defining functions to be used in the work function.
  *

package/libexec/sandbox/bravojs-env.js

@@ -2,7 +2,7 @@
  *  This file extends BravoJS, creating a CommonJS Modules/2.0
  *  environment for WebWorkers and similar environments.
  *
- *  Copyright (c) 2018, Kings Distributed Systems, Ltd.  All Rights Reserved.
+ *  Copyright (c) 2018-2022, Distributive, Ltd.  All Rights Reserved.
  *  Wes Garland, wes@kingsds.network
  */
 

package/libexec/sandbox/bravojs-init.js

@@ -1,8 +1,8 @@
 /**
  *  @file       worker/evaluator-lib/bravojs-init.js
- *              Copyright (c) 2018, Kings Distributed Systems, Ltd.  All Rights Reserved.
+ *              Copyright (c) 2020-2022, Distributive, Ltd. All Rights Reserved.
  *
- *              This file sets up the environment for bravojs to load properly.
+ *              This file sets up the environment for BravoJS to load properly.
  *
  *  @author     Ryan Rossiter, ryan@kingsds.network
  *  @date       Sept 2020

package/libexec/sandbox/calculate-capabilities.js

@@ -1,6 +1,6 @@
 /**
  *  @file       worker/evaluator-lib/calculate-capabilities.js
- *              Copyright (c) 2018, Kings Distributed Systems, Ltd.  All Rights Reserved.
+ *              Copyright (c) 2020-2022, Distributive. All Rights Reserved.
  *
  *              This file provides a message handler for handling capabilities requests.
  *

package/libexec/sandbox/event-loop-virtualization.js

@@ -20,6 +20,7 @@ self.wrapScriptLoading({ scriptName: 'event-loop-virtualization' }, function eve
 {
   (function privateScope(realSetTimeout, realSetInterval, realSetImmediate, realClearTimeout, realClearInterval, realClearImmediate) {
     let totalCPUTime = 0;
+    let startTime;
     const events = [];
     events.serial = 0;
 
@@ -34,7 +35,7 @@ self.wrapScriptLoading({ scriptName: 'event-loop-virtualization' }, function eve
       serviceEvents.servicing = true;
       serviceEvents.sliceIsFinished = false;
 
-      const startTime = performance.now();
+      startTime = performance.now();
       let now = Date.now();
 
       sortEvents();
@@ -72,18 +73,17 @@ self.wrapScriptLoading({ scriptName: 'event-loop-virtualization' }, function eve
           }
         }
       }
+    }
+    protectedStorage.markCPUTimeAsDone = function markCPUTimeAsDone()
+    {
+      const endTime = performance.now();
+      totalCPUTime += endTime - startTime;
+      serviceEvents.sliceIsFinished = true;
+    }
 
-      protectedStorage.markCPUTimeAsDone = function markCPUTimeAsDone()
-      {
-        const endTime = performance.now();
-        totalCPUTime += endTime - startTime;
-        serviceEvents.sliceIsFinished = true;
-      }
-
-      protectedStorage.subtractWebGLTimeFromCPUTime = function subtractCPUTime(time)
-      {
-        totalCPUTime -= time;
-      }
+    protectedStorage.subtractWebGLTimeFromCPUTime = function subtractCPUTime(time)
+    {
+      totalCPUTime -= time;
     }
 
     /** Execute callback after at least timeout ms. 

package/libexec/sandbox/gpu-timers.js

@@ -1,6 +1,7 @@
 /**
  *  @file       gpu-timers.js
- *              Copyright (c) 2018, Kings Distributed Systems, Ltd.  All Rights Reserved. @todo: is this correct lol?
+ *              Copyright (c) 2022, Distributive, Ltd.
+ *              All Rights Reserved. Licensed under the terms of the MIT License.
  *
  *              This file adds wrappers for webGL and webGPU functions so we can measure their GPU time
  *

package/libexec/sandbox/native-event-loop.js

@@ -51,27 +51,29 @@ self.wrapScriptLoading({ scriptName: 'native-event-loop' }, function nativeEvent
     function fireTimerCallbacks()
     {
       sortTimers();
-      let timer;
-      while ((timer = timers.shift()))
+      let timer = timers.shift();
+      let now = Date.now();
+      if (!timer)
+        throw new Error('Logic error: trying to run timer when no timer exists') /* should be impossible */
+      if (timer.when > now)  /* should be impossible, but at least we can handle this */
       {
-        let now =  Date.now();
-        if (timer.when > now)
-        {
-          timers.push(timer);
-          break;
-        }
-        timer.fn.apply(null, timer.args);
+        timers.unshift(timer);
+        nextTimer(timers[0].when);
+        return;
+      }
+      timer.fn.apply(null, timer.args);
 
-        if (timer.recur)
-        {
-          timer.when = Date.now() + timer.recur;
-          timers.push(timer);
-        }
-        sortTimers();
+      if (timer.recur)
+      {
+        timer.when = Date.now() + timer.recur;
+        timers.push(timer);
       }
+
+      sortTimers();
       if (timers.length)
         nextTimer(timers[0].when);
     }
+
     ontimer(fireTimerCallbacks);
 
     /** Execute callback after at least timeout ms. 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcp-client",
-  "version": "4.2.9",
+  "version": "4.2.12",
   "description": "Core libraries for accessing DCP network",
   "keywords": [
     "dcp"
@@ -14,9 +14,9 @@
     "url": "git+ssh://git@github.com/Distributed-Compute-Labs/dcp-client.git"
   },
   "license": "MIT",
-  "author": "Kings Distributed Systems",
+  "author": "Distributive",
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=14.15.0"
   },
   "main": "index.js",
   "directories": {
@@ -53,7 +53,7 @@
     "@kingsds/eslint-config": "1.0.1",
     "eslint": "7.30.0",
     "express": "^4.17.1",
-    "peter": "^2.3.2"
+    "peter": "^2.3.3"
   },
   "peerDependencies": {
     "dcp-worker": "^3.0.0"

package/windows-registry.js

@@ -19,7 +19,7 @@ const machHive = 'HKLM';
 const userHive = 'HKCU';
 const regedit = require('regedit');
 
-exports.baseKey = process.env.DCP_REGISTRY_BASEKEY || 'Software\\Kings Distributed Systems\\DCP';
+exports.baseKey = process.env.DCP_REGISTRY_BASEKEY || 'Software\\Distributive\\DCP';
 
 /** Join multiple registry keys fragments together into a full path. 
  *  @param      {string|Array} ...