dcp-client 5.0.3 → 5.1.0

package/index.py

@@ -87,6 +87,7 @@ function iife(kwargs, fetch, require, bootstrapRequire)
   debug('dcp-client:bundle')('loaded bundle', bundleFilename);
   globalThis.dcp = dcpClientExports;
   Object.assign(dcpClientExports['fs-basic'], fsBasic);
+  Object.assign(dcpClientExports['os-basic'], osBasic);
   return dcpClientExports;
 }) /* iife */;
 """, here)(kwargs, fetch, pm.createRequire(__file__), pm.bootstrap.require)

package/lib/standaloneWorker.js

@@ -8,7 +8,7 @@
  */
 'use strict';
 
-const { setBackoffInterval, clearBackoffInterval } = require('dcp/dcp-timers');
+const { setBackoffInterval, clearBackoffInterval, Reference } = require('dcp/dcp-timers');
 const { leafMerge, deepClone } = require('dcp/utils');
 
 var debugging = require('dcp/internal/debugging').scope('saw');
@@ -29,7 +29,7 @@ var debugging = require('dcp/internal/debugging').scope('saw');
  *                              readStream:   An instance of Stream.readable connected to an Evaluator
  *                              writeStream:  An instance of Stream.writeable connected to the same Evaluator, default=readStream
  *
- *  @returns an object with the following
+ *  @returns an object that inherits from dcp-timers::References, having the following
  *  - methods:
  *    . addEventListener
  *    . removeEventListener
@@ -58,6 +58,7 @@ function StandaloneWorker(options = {})
   var shutdown;
   var connectTimer = false;
 
+  Reference.call(this, debugging, () => `sa-worker@${this.serial}/${this.config.location}`);
   const defaultConfig = {
     tuning: {
       noDelay: true,
@@ -134,6 +135,7 @@ function StandaloneWorker(options = {})
 
   this.addEventListener = ee.addListener.bind(ee)
   this.removeEventListener = ee.removeListener.bind(ee)
+  this.removeAllListeners = ee.removeAllListeners.bind(ee);
   this.serial = StandaloneWorker.lastSerial = (StandaloneWorker.lastSerial || 0) + 1
   this.serialize = JSON.stringify
   this.deserialize = JSON.parse
@@ -334,7 +336,7 @@ function StandaloneWorker(options = {})
    * running work.
    */
   this.terminate = function standaloneWorker$$Worker$terminate () {
-    debugging() && console.log(`312: saw.terminate on Evaluator ${this.serial}`);
+    debugging() && console.log(`saw.terminate on Evaluator ${this.serial}`);
     var wrappedMessage = this.serialize({ type: 'die' }) + '\n'
 
     try {
@@ -342,6 +344,10 @@ function StandaloneWorker(options = {})
     } catch (e) {
       // Socket may have already been destroyed
     }
+    finally
+    {
+      this.unref();
+    }
 
     clearBackoffInterval(connectTimer);
 
@@ -350,6 +356,7 @@ function StandaloneWorker(options = {})
     dieTimer.unref();
   }
 }
+StandaloneWorker.prototype = Object.create(Reference.prototype);
 
 /**
  * Function to create constructors which behave very much like the WindowOrWorkerGlobalScope Worker
@@ -361,6 +368,8 @@ function StandaloneWorker(options = {})
  */
 exports.workerFactory = function standaloneWorker$$WorkerFactory(options)
 {
+  const KVIN = new (require('kvin').KVIN)();
+
   function Worker()
   {
     if (!new.target)
@@ -368,6 +377,32 @@ exports.workerFactory = function standaloneWorker$$WorkerFactory(options)
     return new StandaloneWorker(options);
   }
 
+  /**
+   * There is a data encapsulation design bug in our stack which has accidentally made KVIN part of the
+   * evaluator -> sa-worker communication stack.  The net effect of this is that node programs using
+   * the StandaloneWorker class must decode messages from the evaluator using the same serialization as
+   * that evaluator used to encode them.  This is correctly specified in the sandbox-definitions.js file
+   * as kvin/kvin.js (May 2025).
+   *
+   * This work-around function decodes messages exactly how they were encoded, and returns the plain
+   * object containing the message.  Eventually, this function will go away, leaving behind something
+   * like "return arguments[0]" as a backwards compat API entry point.
+   */
+  Worker.decodeMessageEvent = function saWorker$$decodeMessageEvent(event)
+  {
+    const eventData = KVIN.unmarshal(event.data);
+    return { data: eventData };
+  }
+
+  /**
+   * See comments for decodeWorkerMessageEvent. This same design flaw also requires an encoding function
+   * that will also eventually become a NOP.
+   */
+  Worker.encodeMessage = function saWorker$$encodeMessage(message)
+  {
+    return KVIN.marshal(message);
+  }
+
   return Worker;
 }
 

package/ns-map.js

@@ -35,6 +35,7 @@ module.declare([], function $$nsMap(require, exports, module) {
     'wallet',
     'identity',
     'jnu',
+    'types',
     'protocol',
     'client-modal',
     'dcp-assert',

package/os-basic.py

@@ -0,0 +1,13 @@
+# @file        os-basic.py
+#              Python polyfills for OS-level functionality needed by dcp-client
+#
+# @author      Wes Garland, wes@distributive.network
+# @date        Jul 2025
+
+import socket
+import getpass
+import os
+
+exports['hostname'] = socket.hostname
+exports['username'] = getpass.getuser
+exports['getpid' ]  = os.getpid

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "dcp-client",
-  "version": "5.0.3",
+  "version": "5.1.0",
   "dcp": {
-    "version": "b89b2ff85c833668564ab976d378ee3fb3608c88",
+    "version": "866a225f6654da1b630d333eaca83c57c827ea74",
     "repository": "git@gitlab.com:Distributed-Compute-Protocol/dcp.git"
   },
   "description": "Core libraries for accessing DCP network",
@@ -20,6 +20,9 @@
   "license": "MIT",
   "author": "Distributive",
   "main": "index",
+  "bin": {
+    "dcp-config-value": "bin/dcp-config-value"
+  },
   "directories": {
     "example": "examples"
   },
@@ -42,7 +45,7 @@
     "http-proxy-agent": "^4.0.1",
     "https-agent": "^1.0.0",
     "https-proxy-agent": "^5.0.0",
-    "kvin": "1.2.17",
+    "kvin": "^1.2.18",
     "nanoid": "3.3.11",
     "physical-cpu-count": "^2.0.0",
     "polyfill-crypto.getrandomvalues": "^1.0.0",

package/test-helpers/attempt-to-fetch.js

@@ -12,14 +12,14 @@
  * @author    Will Pringle <will@distributive.network>
  * @date      December 2023
  */
-const sandboxScripts = '../../libexec/sandbox/';
+const sandboxScripts = '../libexec/sandbox/';
 
 const files = [
   require.resolve(sandboxScripts + 'script-load-wrapper.js'),
   require.resolve(sandboxScripts + 'access-lists.js'),
 ];
 
-require('../../test-helpers/globalPolyfillHelper').init(files, ()=>{});
+require('../test-helpers/globalPolyfillHelper').init(files, ()=>{});
 emitEvent('message', {request: 'applyRequirements', requirements: {environment: {}}});
 
 setTimeout(() => {

package/templates/alert-modal.html

@@ -1,26 +0,0 @@
-<div class="dcp-modal dcp-slide" id="dcp-modal-alert" aria-hidden="true">
-  <div class="dcp-modal-overlay" tabindex="-1" data-micromodal-close>
-    <div class="dcp-modal-container" role="dialog" aria-modal="true" aria-labelledby="dcp-modal-alert-title">
-      <form id="dcp-modal-alert-form" method="dialog"></form>
-      <header class="dcp-modal-header">
-        <h2 class="dcp-modal-title" id="dcp-modal-alert-title"></h2>
-        <button class="dcp-modal-close" aria-label="Close modal" data-micromodal-close></button>
-      </header>
-      <main class="dcp-modal-content" id="dcp-modal-alert-content">
-        <!-- div class="dcp-bug-icon" style="display: inline-block; float: right">&#x1F41E;</div-->
-        <p id="dcp-modal-alert-message"></p>
-        <pre class="dcp-stack-trace">stack trace goes here</pre>
-      </main>
-      <footer class="dcp-modal-footer">
-        <div class="dcp-buttons-wrapper">
-          <button form="dcp-modal-alert-form"
-            id="dcp-modal-alert-submit-button"
-            class="dcp-modal-btn dcp-modal-btn-positive">
-          </button> 
-        </div>
-        <a class='dcp-bug-icon' href='#' title="Stack Trace">&#x1F41E;</a>
-        <a class="dcp-modal-logo-link" href="https://distributed.computer/"></a>
-      </footer>
-    </div>
-  </div>
-</div>

package/templates/confirm-modal.html

@@ -1,27 +0,0 @@
-<div class="dcp-modal dcp-slide" id="dcp-modal-confirm" aria-hidden="true">
-  <div class="dcp-modal-overlay" tabindex="-1" data-micromodal-close>
-    <div class="dcp-modal-container" role="dialog" aria-modal="true" aria-labelledby="dcp-modal-confirm-title">
-      <form id="dcp-modal-confirm-form" method="dialog"></form>
-      <header class="dcp-modal-header">
-        <h2 class="dcp-modal-title" id="dcp-modal-confirm-title"></h2>
-        <button class="dcp-modal-close" aria-label="Close modal" data-micromodal-close></button>
-      </header>
-      <main class="dcp-modal-content" id="dcp-modal-confirm-content">
-        <p id="dcp-modal-confirm-prompt"></p>
-      </main>
-      <footer class="dcp-modal-footer">
-        <div class="dcp-buttons-wrapper">
-          <button form="dcp-modal-confirm-form"
-            id="dcp-modal-confirm-positive-button"
-            class="dcp-modal-btn dcp-modal-btn-negative">
-          </button>
-          <button form="dcp-modal-confirm-form"
-            id="dcp-modal-confirm-negative-button"
-            class="dcp-modal-btn dcp-modal-btn-positive">
-          </button>
-        </div>
-        <a class="dcp-modal-logo-link" href="https://distributed.computer"></a>
-      </footer>
-    </div>
-  </div>
-</div>

package/templates/dcp-modal.css

@@ -1,365 +0,0 @@
-/**************************\
-  Basic Modal Styles
-\**************************/
-@font-face {
-  font-family: "Proxima Nova";
-  src: local("Proxima Nova"), url(../assets/proxima-nova.otf);
-}
-
-.dcp-modal {
-  font-family: "Proxima Nova";
-}
-
-.dcp-modal > DIV,
-.dcp-modal > DIV *,
-.dcp-modal DIV,
-.dcp-modal
-{
-  font-family: "Proxima Nova";
-  font-size: 16px;
-}
-
-.dcp-modal .dcp-modal-overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: rgba(0,0,0,0.6);
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.dcp-modal .dcp-modal-container {
-  background-color: #fff;
-  padding: 30px 50px;
-  width: 400px;
-  height: 360px;
-  max-height: 100vh;
-  border-radius: 4px;
-  overflow-y: auto;
-  box-sizing: border-box;
-}
-
-.dcp-modal .dcp-modal-header {
-  display: flex;
-  justify-content: center;
-}
-
-.dcp-modal .dcp-modal-title {
-  font-weight: 500;
-  font-size: 20px;
-  line-height: 1.25;
-  color: black;
-  box-sizing: border-box;
-  margin: 0;
-}
-
-.dcp-modal .dcp-modal-remember {
-  margin-top: 10px;
-  margin-bottom: 0;
-  font-size: 1rem;
-  line-height: 2.5;
-  color: rgba(0,0,0,.8);
-  box-sizing: border-box;
-}
-
-.dcp-modal .dcp-modal-close {
-  background: transparent;
-  border: 0;
-  position: absolute;
-  top: 15px;
-  right: 9px;
-}
-
-.dcp-modal .dcp-modal-close:hover {
-  cursor: pointer;
-}
-
-.dcp-modal .dcp-modal-close:before { content: url(../assets/close-icon.svg); }
-
-.dcp-modal .dcp-modal-content {
-  line-height: 1.5;
-  color: rgba(0,0,0,.8);
-  text-align: center;
-  overflow: hidden;
-}
-
-#dcp-modal-logo {
-  height: 70px;
-  margin-bottom: 16px;
-}
-
-.dcp-modal .dcp-modal-content > p {
-  margin-bottom: 0;
-}
-
-#dcp-modal-password-create-matching-error {
-  font-size: 0.65em;
-  text-align: right;
-  color: red;
-}
-
-#dcp-modal-oauth-login-button,
-#dcp-modal-password-submit,
-#dcp-modal-keystore-file-upload-button,
-#dcp-modal-alert-submit-button {
-  box-sizing: border-box;
-  position: relative;
-  height: 3em;
-  min-width: 8em;
-  padding: 0 2em;
-  font-weight: bold;
-  background: #1aa473;
-  color: white;
-  border: 1px solid #1aa473;
-  cursor: pointer;
-  margin-top: 48px;
-  font-size: 15px;
-}
-
-#dcp-modal-password-submit,
-#dcp-modal-alert-submit-button {
-  margin-top: 20px;
-}
-
-#dcp-modal-keystore-file-input,
-#dcp-modal-keystore-file-submit {
-  display: none;
-}
-
-#dcp-modal-password-submit {
-  max-width: 8em;
-}
-
-#dcp-modal-keystore-file-input::file-selector-button {
-  background: white;
-  border: 1px solid #1aa473;
-  color: #1aa473;
-}
-
-#dcp-modal-keystore-file-input::file-selector-button:hover {
-  background: #6fc495;
-  color: white;
-  transition: 200ms;
-}
-
-#dcp-modal-oauth-login-button:hover {
-  background: #6fc495;
-}
-
-.dcp-modal .dcp-modal-btn-primary {
-  background-color: #444;
-  color: #fff;
-}
-
-.dcp-modal .dcp-modal-btn-positive {
-  background-color: #444;
-  color: #fff;
-  margin: 0px 0.5em 0px 0.5em;
-
-}
-
-.dcp-modal .dcp-modal-btn-negative {
-  background-color: #fff;
-  color: #444;
-  border: solid 1px gray;
-  margin: 0px 0.5em 0px 0.5em;
-
-}
-
-.dcp-modal .invisible {
-  visibility: hidden;
-}
-
-.dcp-modal .inlineinput {
-  text-align: left;
-  position: relative;
-  bottom: 10px;
-}
-
-.inlineinput input,
-.inlineinput select {
-  filter: none;
-  height: 35px;
-  padding: 0.4em 1em 0.2em;
-  border: 1px solid #8A8A8A;
-  border-radius: 0;
-  box-sizing: border-box;
-  font-size: 1em;
-}
-
-@media screen and (min-device-width: 800px) {
-  .inlineinput input,
-  .inlineinput select {
-    width: 100%;
-  }
-}
-
-.inlineinput input:focus, .inlineinput select:focus {
-  box-shadow: 0 0 0 0.25rem rgba(0, 164, 115, 0.25);
-  outline: none;
-}
-
-.inlineinput input[type=number] {
-  color: #1aa473;
-  font-weight: bold;
-}
-
-.inlineinput select option {
-  color: black;
-}
-
-.inlineinput input::placeholder, .inlineinput select:invalid {
-  color: #e5e5e5;
-}
-
-.inlineinput label {
-  position: relative;
-  display: inline-block;
-  background-color: white;
-  margin: 0 1.25em 0 0.4em;
-  padding: 0 0.75em 0 0.75em;
-  font-size: 0.9em;
-  line-height: 1em;
-  top: 0.6em;
-  left: 0.2em;
-  color: #8a8a8a;
-  z-index: 2;
-  text-align: initial;
-}
-
-select.invalid,
-input.invalid {
-  border-color: red;
-}
-
-.dcp-modal-remember input[type='checkbox'] {
-  transform: scale(1.4);
-  margin-right: 10px;
-}
-
-#dcp-modal-keystore-file-input {
-  margin-top: 10px;
-}
-
-#dcp-modal-password input {
-  padding: 10px;
-}
-
-#dcp-modal-password-content {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  overflow: visible;
-} 
-
-#dcp-modal-password-content h2 {
-  margin: 0;
-  margin-bottom: 13px;
-}
-
-#dcp-modal-password-content p {
-  margin: 0;
-  line-height: 22px;
-  height: 44px;
-}
-
-/**************************\
-  Demo Animation Style
-\**************************/
-@keyframes mmfadeIn {
-    from { opacity: 0; }
-      to { opacity: 1; }
-}
-
-@keyframes mmfadeOut {
-    from { opacity: 1; }
-      to { opacity: 0; }
-}
-
-@keyframes mmslideIn {
-  from { transform: translateY(15%); }
-    to { transform: translateY(0); }
-}
-
-@keyframes mmslideOut {
-    from { transform: translateY(0); }
-    to { transform: translateY(-10%); }
-}
-
-.dcp-slide {
-  display: none;
-}
-
-.dcp-slide.is-open {
-  display: block;
-}
-
-.dcp-slide[aria-hidden="false"] .dcp-modal-overlay {
-  animation: mmfadeIn .3s cubic-bezier(0.0, 0.0, 0.2, 1);
-}
-
-.dcp-slide[aria-hidden="false"] .dcp-modal-container {
-  animation: mmslideIn .3s cubic-bezier(0, 0, .2, 1);
-}
-
-.dcp-slide[aria-hidden="true"] .dcp-modal-overlay {
-  animation: mmfadeOut .3s cubic-bezier(0.0, 0.0, 0.2, 1);
-}
-
-.dcp-slide[aria-hidden="true"] .dcp-modal-container {
-  animation: mmslideOut .3s cubic-bezier(0, 0, .2, 1);
-}
-
-.dcp-slide .dcp-modal-container,
-.dcp-slide .dcp-modal-overlay {
-  will-change: transform;
-}
-
-.dcp-modal .dcp-modal-footer {
-  display: flex;
-  align-items: center;
-}
-
-.dcp-modal .dcp-buttons-wrapper {
-  display: flex;
-  justify-content: flex-start;
-  width: 100%;
-}
-
-.dcp-modal .dcp-platform-win  button[name="positive"] {
-  order: 0;
-}
-
-.dcp-modal .dcp-platform-win  button[name="negative"] {
-  order: 1;
-}
-
-#dcp-modal-alert .dcp-bug-icon,
-#dcp-modal-alert .dcp-stack-trace {
-  display: none;
-}
-
-#dcp-modal-alert.exception .dcp-bug-icon {
-  padding-right: 0.35em;
-  display: inline-block;
-  text-decoration: none;
-}
-
-#dcp-modal-alert.exception .dcp-stack-trace {
-  text-align: right;
-  font-size: 0.8em;
-  padding-right: 0.35em;
-}
-
-#dcp-modal-alert.exception .dcp-stack-trace {
-  display: none;
-  max-height: 10em;
-}
-
-#dcp-modal-alert.exception.dcp-show-stack .dcp-stack-trace {
-  display: initial;
-  white-space: pre-wrap;
-}

package/templates/keystore-file-modal.html

@@ -1,22 +0,0 @@
-<!-- DCP Keystore File Modal -->
-<div class="dcp-modal dcp-slide" id="dcp-modal-keystore-file" aria-hidden="true">
-  <div class="dcp-modal-overlay" tabindex="-1">
-    <div class="dcp-modal-container" role="dialog" aria-modal="true" aria-labelledby="dcp-modal-keystore-file-title">
-      <form id="dcp-modal-keystore-file-form" method="dialog"></form>
-      <div class="dcp-modal-header">
-        <a class="dcp-modal-logo-link" href="https://distributed.computer">
-          <img id="dcp-modal-logo" src="https://secure.distributed.computer/assets/dcp-logo-5db53cc2b8186a6c250379b20bcb5ed4926c433903a3441234f09ea40b3cea65.png"/>
-        </a>
-      </div>
-      <main class="dcp-modal-content" id="dcp-modal-keystore-file-content">
-        <h2 class="dcp-modal-title" id="dcp-modal-keystore-file-title">Keystore Required</h2>
-        <p id="dcp-modal-keystore-file-prompt"></p>
-        <input type="file" form="dcp-modal-keystore-file-form" required="required" id="dcp-modal-keystore-file-input">
-        <button id="dcp-modal-keystore-file-upload-button">Upload</button>
-        <button form="dcp-modal-keystore-file-form"
-                id="dcp-modal-keystore-file-submit">
-        </button> 
-      </main>
-    </div>
-  </div>
-</div>

package/templates/oauth-login-modal.html

@@ -1,18 +0,0 @@
-<!-- DCP OAuth Login Modal -->
-<div class="dcp-modal dcp-slide" id="dcp-modal-oauth-login" aria-hidden="true" >
-  <div class="dcp-modal-overlay" tabindex="-1" data-backdrop="static" data-keyboard="false">
-    <div class="dcp-modal-container" role="dialog" aria-modal="true" aria-labelledby="dcp-modal-keystore-file-title">
-      <form id="dcp-modal-oauth-login-form" method="dialog"></form>  
-      <div class="dcp-modal-header">
-        <a class="dcp-modal-logo-link" href="https://distributed.computer">
-          <img id="dcp-modal-logo" src="https://secure.distributed.computer/assets/dcp-logo-5db53cc2b8186a6c250379b20bcb5ed4926c433903a3441234f09ea40b3cea65.png"/>
-        </a>
-      </div>
-      <main class="dcp-modal-content" id="dcp-modal-oauth-login-content">
-        <h2 class="dcp-modal-title" id="dcp-modal-oauth-login-title">Login Required</h2>
-        <p>Log in to the DCP Portal <br>to access your wallet.</p>
-        <button id="dcp-modal-oauth-login-button">Log In</button>
-      </main>
-    </div>
-  </div>
-</div>

package/templates/password-creation-modal.html

@@ -1,29 +0,0 @@
-<!-- DCP Keystore Password Modal -->
-<div class="dcp-modal dcp-slide" id="dcp-modal-password-create" aria-hidden="true">
-  <div class="dcp-modal-overlay" tabindex="-1" data-micromodal-close>
-    <div class="dcp-modal-container" role="dialog" aria-modal="true" aria-labelledby="dcp-modal-password-create-title">
-      <form id="dcp-modal-password-create-form" method="dialog"></form>
-      <header class="dcp-modal-header">
-        <h2 class="dcp-modal-title" id="dcp-modal-password-create-title">Set Passphrase</h2>
-        <button class="dcp-modal-close" aria-label="Close modal" data-micromodal-close></button>
-      </header>
-      <main class="dcp-modal-content" id="dcp-modal-password-create-content">
-        <p id="dcp-modal-password-create-prompt">Please enter new password:</p>
-        <input form="dcp-modal-password-create-form" type="text" autocomplete="username" id='dcp-modal-password-create-hidden-username' style="display:none">
-        <input form="dcp-modal-password-create-form" type="password" autocomplete="new-password" id="dcp-modal-password-create-input">
-        <p id="dcp-modal-password-create-prompt-confirm">Please confirm new passphrase by entering it again:</p>
-        <div style="display: inline-block;">
-          <input form="dcp-modal-password-create-form" type="password" autocomplete="new-password" id="dcp-modal-password-create-input-confirm">
-          <div id="dcp-modal-password-create-matching-error">Passphrases do not match.</div>
-        </div>
-      </main>
-      <footer class="dcp-modal-footer">
-        <div class="dcp-buttons-wrapper">
-          <button form="dcp-modal-password-create-form" class="dcp-modal-btn dcp-modal-btn-primary" id="dcp-modal-password-create-submit" type="submit">Submit</button>
-        </div>
-        <a class="dcp-modal-logo-link" href="https://distributed.computer"></a>
-      </footer>
-    </div>
-  </div>
-</div>
-