dcp-client 4.4.6 → 4.4.7

package/fs-basic.py

@@ -0,0 +1,46 @@
+# @file        fs-basic.py
+#              Python polyfills for OS-level functionality needed by dcp-client
+#
+# @author      Wes Garland, wes@distributive.network
+# @date        Feb 2024
+
+import os
+import pythonmonkey as pm
+
+def readFile(filename: str) -> str:
+    with open(filename, "r", encoding="utf8") as fileHnd:
+        return fileHnd.read()
+
+def writeFile(filename: str, contents: str) -> None:
+    with open(filename, "w", encoding="utf8") as fileHnd:
+        fileHnd.write(contents)
+
+def getMode(filename: str) -> int:
+    return os.stat(filename).st_mode
+
+def fileExists(filename: str) -> bool:
+    return os.path.isfile(filename)
+
+def dirExists(dirname: str) -> bool:
+    return os.path.isdir(dirname)
+
+def mkdir(dirname: str) -> None:
+    return os.makedirs(dirname)
+
+exports['readFile']   = readFile
+exports['writeFile']  = writeFile
+exports['getMode']    = getMode
+exports['fileExists'] = fileExists
+exports['dirExists']  = dirExists
+exports['mkdir']      = mkdir
+exports['constants']  = { 'W_OK': os.W_OK, 'R_OK': os.R_OK }
+exports['pathResolve'] = os.path.join
+exports['basename']    = os.path.basename
+exports['dirname']     = os.path.dirname
+exports['absPath']     = os.path.isabs
+exports['joinPath']    = os.path.join
+exports['pathSep']     = os.path.sep
+exports['readDir']     = os.listdir
+exports['rm']          = os.remove
+exports['rmdir']       = os.rmdir
+exports['fileSize']    = lambda filename: os.stat(filename).st_size

package/index.py

@@ -0,0 +1,105 @@
+# @file        index.py
+#              PythonMonkey loader for the dcp-client package.
+#
+#              During module initialization, we load dist/dcp-client-bundle.js from the
+#              same directory as this file, and setup a minimum compatibility environment
+#              for dcp-client to execute in.
+#
+#              Note that while this code may use PythonMonkey"s require() to get things done,
+#              require is not exposed as a symbol to JS here; the environment used by dcp-client
+#              for PythonMonkey looks pretty much like a web browser to keep things like SocketIO
+#              happy.
+#
+#              A few OS-level interfaces are plumbed in, however, so that the dcp-client UX
+#              remains somewhat similar to Node.js.  In particular,
+#              - window.localStorage is on disk and compatible with the Node.js version
+#              - id and bank keystores are loaded from the same location on disk as the Node.js version
+#              - FUTURE: support for oAuth
+#              - FUTURE: support for dcp-config fragments based on the Node.js loader (./index.js)
+#              - FUTURE: support for bundle auto-update similar to the Node.js loader
+#
+# @author      Will Pringle, will@distributive.network
+# @author      Wes Garland, wes@distributive.network
+# @date        Feb 2024
+#
+import pythonmonkey as pm
+import os
+import asyncio
+
+# @todo determine dcp_client_bundle_filename inside JS via require.resolve
+dcp_client_bundle_filename = os.path.dirname(__file__) + "/dist/dcp-client-bundle.js"
+
+# load dcp-client, then optionally run a callback function
+async def load_dcp_client(callback=None, **kwargs):
+    if callback is not None and not callable(callback):
+        raise Exception("callback must be callable")
+
+    cb_retval = None
+
+    def fetch(url):
+        try:
+            import urllib.request
+            return urllib.request.urlopen(url).read().decode()
+        except Exception as error:
+            raise error
+
+    here = { "filename": __file__, "fromPythonFrame": True }
+    dcp_client_modules = pm.eval("""'use strict';(
+function iife(kwargs, fetch, require, bootstrapRequire)
+{
+  const fsBasic = require('./fs-basic');
+  const dcpSupport = require('./dcp-support');
+  const debug = bootstrapRequire('debug');
+  const vm = bootstrapRequire('vm');
+  debug('dcp-client:')('initializing');
+
+  const schedulerLocation = kwargs.scheduler || python.getenv('DCP_SCHEDULER_LOCATION') || 'https://scheduler.distributed.computer';
+  const configLocation = kwargs.config || python.getenv('DCP_CONFIG_LOCATION') || schedulerLocation + '/etc/dcp-config.js';
+  globalThis.window = globalThis; /** @todo fix in pythonmonkey */
+  globalThis.crypto = Object.assign({}, { getRandomValues: dcpSupport.getRandomValues }, globalThis.crypto);
+
+  /** @todo extract baked-in defaults from bundle */
+  if (!globalThis.dcpConfig)
+    globalThis.dcpConfig = {};
+
+  if (configLocation === false || configLocation === '') /* explicitly request no remote config */
+  {
+    debug('dcp-client:config')('no remote config')
+    if (!globalThis.dcpConfig)
+      globalThis.dcpConfig = {};
+    Object.assign(globalThis.dcpConfig, { scheduler: { configLocation: false } });
+  }
+  else
+  {
+    /** @todo use KVIN version instead */
+    debug('dcp-client:config')('fetching config from', configLocation);
+    const dcpConfigCode = fetch(configLocation);
+    Object.assign(globalThis.dcpConfig, vm.runInContext(dcpConfigCode, undefined, { "filename": configLocation }));
+  }
+
+  globalThis.dcpConfig.build = 'debug' /** @todo fix the bundle so that this is not necessary */
+  const bundleFilename = require.resolve('./dist/dcp-client-bundle');
+  debug('dcp-client:bundle')('loading bundle', bundleFilename);
+  const bundleCode = fsBasic.readFile(bundleFilename);
+  debug('dcp-client:bundle')('evaluating bundle', bundleFilename);                             
+  const dcpClientExports = vm.runInContext(bundleCode, undefined, { "filename": bundleFilename });
+  debug('dcp-client:bundle')('loaded bundle', bundleFilename);
+  globalThis.dcp = dcpClientExports;
+  Object.assign(dcpClientExports['fs-basic'], fsBasic);
+  return dcpClientExports;
+}) /* iife */;
+""", here)(kwargs, fetch, pm.createRequire(__file__), pm.bootstrap.require)
+
+    dcp_client_modules["utils"]["expandPath"] = os.path.expanduser
+
+    if (callback):
+        cb_retval = await callback()
+
+    await pm.wait()
+    return cb_retval
+
+def init(*args, **kwargs):
+    asyncio.run(load_dcp_client(*args, **kwargs))
+
+# exports of dcp-client python-language CommonJS module
+exports["init"] = init

package/libexec/sandbox/access-lists.js

@@ -847,7 +847,7 @@ self.wrapScriptLoading({ scriptName: 'access-lists', ringTransition: true }, fun
             },
             configurable: false
           });
-        } else if (prop in blockList) {
+        } else if (blockList.hasOwnProperty(prop)) {
           let isSet = false;
           let blocked = blockList[prop];
           let propValue = obj[prop];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcp-client",
-  "version": "4.4.6",
+  "version": "4.4.7",
   "description": "Core libraries for accessing DCP network",
   "keywords": [
     "dcp"
@@ -15,7 +15,7 @@
   },
   "license": "MIT",
   "author": "Distributive",
-  "main": "index.js",
+  "main": "index",
   "directories": {
     "example": "examples"
   },
@@ -39,7 +39,6 @@
     "https-proxy-agent": "^5.0.0",
     "kvin": "1.2.14",
     "nanoid": "3.3.7",
-    "node-localstorage": "^2.1.5",
     "physical-cpu-count": "^2.0.0",
     "polyfill-crypto.getrandomvalues": "^1.0.0",
     "regedit": "^3.0.3",
@@ -59,6 +58,10 @@
     "npm": ">=7"
   },
   "overrides": {
-    "@azure/msal-node": "2.2.0"
+    "@kingsds/socket.io-client": {
+      "@kingsds/engine.io-client": {
+        "ws": "8.17.1"
+      }
+    }
   }
 }