dcp-client 4.2.26 → 4.2.28

package/lib/standaloneWorker.js

@@ -7,16 +7,23 @@
  *  @date       March 2018
  */
 "use strict";
-let dcpTimers;
-try{
-  dcpTimers = require('dcp/dcp-timers');
-} catch(e) {
-  dcpTimers = require('dcp/common/dcp-timers');
-}
-const KVIN = require("kvin");
-const { setBackoffInterval, clearBackoffInterval } = dcpTimers;
-const dcpConfig = global.dcpConfig || require('dcp/dcp-config');
-var debugging = () => dcpConfig.standaloneWorker.debug;
+const KVIN = require("kvin"); /* Cannot use internal KVIN to talk to evaluators because we need to send them the source code */
+const { setBackoffInterval, clearBackoffInterval } = require('dcp/dcp-timers');
+const { leafMerge } = require('dcp/utils');
+const dcpConfig = require('dcp/dcp-config');
+const defaultConfig = {
+  debug: process.env.DCP_SAW_DEBUG,
+  quiet: false,
+  evaluatorConnectBackoff:
+  {
+    maxInterval:   5 * 60 * 1000, // max: 5 minutes
+    baseInterval:      10 * 1000, // start: 10s
+    backoffFactor: 1.1            // each fail, back off by 10%
+  },
+};
+dcpConfig.standaloneWorker = Object.assign(dcpConfig.standaloneWorker || {},
+                                           leafMerge(defaultConfig, dcpConfig.standaloneWorker));
+var debugging = dcpConfig.standaloneWorker.debug ? () => true : require('dcp/internal/debugging').scope('saw');
 
 function timestamp() {
   var now = new Date();

package/ns-map.js

@@ -60,27 +60,8 @@ module.declare([], function $$nsMap(require, exports, module) {
 
   /** 
    * LONG TERM PLAN
-   * - put external modules in their own namepsace in webpack bundle - /dcp/internal/ ?
    * - ensure names in webpack need no translation except adding /dcp (looks good now)
    * - remove this module
    * - test all three load modes
    */
-  
-  /* Provide internal copies of third-party npm libraries when external (native?) copies not available */
-  for (moduleIdentifier of [
-    'ethereumjs-util',
-    'ethereumjs-wallet',
-    'bignumber.js',
-    'socket.io-client',
-  ]) {
-    try {
-      require.resolve(moduleIdentifier);
-    } catch(e) {
-      if (e.code === 'MODULE_NOT_FOUND')
-        exports[moduleIdentifier] = moduleIdentifier;
-      else
-        throw e;
-    }
-  }
-  
 }); /* end of module */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcp-client",
-  "version": "4.2.26",
+  "version": "4.2.28",
   "description": "Core libraries for accessing DCP network",
   "keywords": [
     "dcp"
@@ -28,11 +28,14 @@
     "vtest": "npx peter -v tests"
   },
   "dependencies": {
+    "@kingsds/socket.io-client": "^4.5.4",
     "@kingsds/xmlhttprequest-ssl": "^2.1.0",
     "atob": "2.1.2",
     "bravojs": "^1.0.16",
     "btoa": "^1.2.1",
     "chalk": "^4.1.2",
+    "ethereumjs-util": "^7.1.5",
+    "ethereumjs-wallet": "^1.0.2",
     "html-to-text": "^5.1.1",
     "http-proxy-agent": "^4.0.1",
     "https-agent": "^1.0.0",
@@ -44,7 +47,7 @@
     "polyfill-crypto.getrandomvalues": "^1.0.0",
     "regedit": "^3.0.3",
     "semver": "^7.3.5",
-    "webpack": "^5.75.0",
+    "webpack": "^5.79.0",
     "webpack-cli": "^4.7.2",
     "yargs": "16.2.0"
   },
@@ -52,7 +55,7 @@
     "@kingsds/eslint-config": "1.0.1",
     "eslint": "7.30.0",
     "express": "^4.18.2",
-    "peter": "^2.3.5"
+    "peter": "^2.3.10"
   },
   "peerDependencies": {
     "dcp-worker": "^3.0.0"

package/test-pseudo-root/home/username/.dcp/dcp-config.js

@@ -7,6 +7,8 @@
 // Note: we are also using these test configs to test accepted forms
 // this file tests that we can use global keys like 'scheduler' and that
 // we can return an object
+const bootstrapConfig = require('dcp/dcp-config');
+dcpConfig.bank.location = bootstrapConfig.bank.location;
 dcpConfig.bank.location.pathname = '/from/tests-homedir/dcp-client/dcp-config';
 
 return {

package/windows-registry.js

@@ -11,10 +11,23 @@
  *              Note: In registry-speak, keys are like directories and values are like files -- i.e. a key can
  *              contain keys and/or values, but values cannot contain keys; only strings and numbers and stuff.
  *
+ * 
+ * future - we will need a better way to return registry values, current proposal is to use
+ * REG_BINARY to encode richer types thus:
+ *   0x00 - null
+ *   0x20 - next 8 bytes are a little-endian float64
+ *   0x40 - next byte is start of Uint8Array
+ *   0x80 - false
+ *   0x81 - true
+ *   0x82 - undefined
+ * future - we should probably expand our understanding of types as follows
+ *   REG_DWORD - integer
+ *   REG_QWORD - bigint
+ *   REG_NONE  - treat as missing
+ *   
  * @author      Wes Garland, wes@kingsds.network
  * @date        Jul 2020
  */
-
 const machHive = 'HKLM';
 const userHive = 'HKCU';
 const regedit = require('regedit');
@@ -133,63 +146,6 @@ exports.getObject = async function dcpClient$$windowsRegistry$getObject(hive, ke
   return tree;
 }
 
-/** 
- * @deprecated
- * Get a DCP Config object for a certain configuration "level". Levels always exist in a
- * 'this program' and 'any program' sandwhich, provided programName is not falsey.
- *
- * @param {string}     hive             the hive to check: used to allow us to
- *                                      differentiate between user-specific and 
- *                                      machine-wide configuration entries.
- * @param {string}     programName      the name of the program doing the configuration
- *                                      lookup (ignored if falsey).
- * @param {boolean}    override         true if we are looking at the top-most level
- *                                      of configury; used, for example, by registry
- *                                      entries written by an adminsitrator as some
- *                                      kind of group policy.
- *
- * @returns {object} a DCP config object describing the overrides at this specific configuration 
- *                   "level", with no inheritance from levels either below or above this one.
- */
-async function getDcpConfig(hive, programName, override) {
-  var tree = {};
-  var baseKey = keyJoin(hive, exports.baseKey, override ? 'override' : 'dcp-client');
-
-  if (await keyExists(keyJoin(baseKey, programName, 'dcp-config')))
-    await regTree(keyJoin(baseKey, programName, 'dcp-config'), tree);
-  if (await keyExists(keyJoin(baseKey, 'dcp-config')))
-    await regTree(keyJoin(baseKey, 'dcp-config'), tree);
-
-  return tree;
-}
-
-/** Return any DCP Config values defined in the registry for the user 
- * @deprecated
- */
-exports.getUserDcpConfig = async function dcpClient$$windowsRegistry$getUserDcpConfig(programName) {
-  if (!programName && programName !== false)
-    programName = path.basename(process.argv[1], '.js');
-  return getDcpConfig(userHive, programName, false);
-}
-
-/** Return any DCP Config values defined in the registry for the machine
- * @deprecated
- */
-exports.getMachDcpConfig = async function dcpClient$$windowsRegistry$getMachDcpConfig(programName) {
-  if (!programName && programName !== false)
-    programName = path.basename(process.argv[1], '.js');
-  return getDcpConfig(machHive, programName, false);
-}
-
-/** Return any DCP Config values defined in the registry as administrative overrides 
- * @deprecated
- */
-exports.getOverrideDcpConfig = async function dcpClient$$windowsRegistry$getOverrideDcpConfig() {
-  if (!programName && programName !== false)
-    programName = path.basename(process.argv[1], '.js');
-  return getDcpConfig(machHive, programName, true)
-}
-
 /** Make all exported functions fast-path false return on non-windows */
 if (require('os').platform() !== 'win32') {
   for (let exp in exports) {