dcp-client 5.0.4 → 5.1.1

package/.gitattributes

@@ -0,0 +1,2 @@
+dist/dcp-client-bundle.js* binary
+libexec/sandbox/pyodide-core.js binary

package/assets/dcp-client.css

@@ -0,0 +1,16 @@
+/**
+ * @file        dcp-client.css   Styles for dcp-client. These impact the appearance of DOM elements
+ *                               generated by DCP-Client; eg. the modal dialogs which pop up when the
+ *                               wallet API is used.
+ *
+ *              This stylesheet is loaded automatically by dcp-client when the load-css attribute is
+ *              undefined or has the value true. Any other value will be interpreted as a URL from
+ *              which to load the css.
+ *
+ * @author      Wes Garland, wes@distributive.network
+ * @date        Nov 2024
+ */
+
+@layer dcp-style dcp-client;
+@import https://cdn.distributed.computerl
+

package/assets/lucide/bug.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bug"><path d="m8 2 1.88 1.88"/><path d="M14.12 3.88 16 2"/><path d="M9 7.13v-1a3.003 3.003 0 1 1 6 0v1"/><path d="M12 20c-3.3 0-6-2.7-6-6v-3a4 4 0 0 1 4-4h4a4 4 0 0 1 4 4v3c0 3.3-2.7 6-6 6"/><path d="M12 20v-9"/><path d="M6.53 9C4.6 8.8 3 7.1 3 5"/><path d="M6 13H2"/><path d="M3 21c0-2.1 1.7-3.9 3.8-4"/><path d="M20.97 5c0 2.1-1.6 3.8-3.5 4"/><path d="M22 13h-4"/><path d="M17.2 17c2.1.1 3.8 1.9 3.8 4"/></svg>

package/assets/lucide/circle-alert.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-alert"><circle cx="12" cy="12" r="10"/><line x1="12" x2="12" y1="8" y2="12"/><line x1="12" x2="12.01" y1="16" y2="16"/></svg>

package/assets/lucide/hard-drive-upload.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-hard-drive-upload"><path d="m16 6-4-4-4 4"/><path d="M12 2v8"/><rect width="20" height="8" x="2" y="14" rx="2"/><path d="M6 18h.01"/><path d="M10 18h.01"/></svg>

package/assets/lucide/triangle-alert.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-triangle-alert"><path d="m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3"/><path d="M12 9v4"/><path d="M12 17h.01"/></svg>

package/assets/x.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-x"><path d="M18 6 6 18"/><path d="m6 6 12 12"/></svg>

package/bin/dcp-config-value

@@ -27,7 +27,7 @@ ${progName} - Query values from dcpConfig
 Copyright (c) 2018-2025 Distributive Corp., All Rights Reserved.
 
 Usage:   ${progName} [--keys] [--to-string] [--json]
-                     [--programName=string]
+                     [--program-name=string]
                      [--scheduler=URL] [--bundle-location[=URL]]
                      [--no-remote-config] [--remote-config=URL]
                      <--all | path.to.config.variable [path.to.config.variable...]>
@@ -109,7 +109,7 @@ for (let i=2; i < process.argv.length; i++)
         mods.push(JSON.stringify);
         mods.push(stringModFn);
         break;
-      case '--programName':
+      case '--program-name':
         dcpClientOptions.programName = optarg;
         break;
       case '--scheduler':

package/bin/dcp-module-bundler

@@ -0,0 +1,149 @@
+#! /usr/bin/env node
+/**
+ * @file        dcp-client/bin/dcp-module-bundler.js
+ *
+ * Run webpack using dynamic in-memory input.
+ * Uses unionfs to layer memfs on top of fs,
+ * in order to resolve modules in the local filesystem.
+ *
+ * @author      Paul, paul@distributive.network
+ * @date        June 2025
+ */
+// @ts-check
+'use strict';
+
+const webpack = require('webpack');
+const process = require('process');
+const debug   = require('debug')('webpack');
+const fs      = require('fs');
+const { Union } = require('unionfs');
+const { createFsFromVolume, Volume } = require('memfs');
+const debugDetails = debug.extend('details');
+
+//
+// Tracing Note:
+//
+// DEBUG=webpack         -- turns on debug(...)
+// DEBUG=webpack:details -- turns on debugDetails(...)
+// Debug=webpack*        -- turns on debug(...) and debugDetails(...)
+//
+
+function compile (compiler)
+{
+  try
+  {
+    return new Promise((resolve, reject) => {
+      compiler.run((err, stats) => {
+        (err) ? reject(err) : resolve(stats);
+      });
+    });
+  }
+  catch (error)
+  {
+    debug('Webpack compilation failure:', error);
+    throw error;
+  }
+}
+
+function showDiags (stats)
+{
+  const statsConfig = {
+    colors:       true,
+    errors:       true,
+    errorCause:   true,
+    errorDetails: true,
+    errorErrors:  true,
+    errorStack:   true,
+    warnings:     true,
+    assets:       false,  // Include information about generated assets
+    chunks:       false,  // Include information about chunks
+    entrypoints:  false,  // Include information about entrypoints
+    modules:      false,  // Include information about modules
+    // You can add more options here based on what you need:
+    // https://webpack.js.org/api/stats/#stats-options
+  };
+
+  // Convert stats to a JSON object for easier access and filtering
+  const info = stats.toJson(statsConfig);
+
+  if (stats.hasErrors())
+  {
+    debug('Webpack compilation errors:');
+    info.errors.forEach(error => debug(error.message));
+    throw new Error('Webpack compilation failed with errors.', { cause: info.errors });
+  }
+
+  if (stats.hasWarnings())
+  {
+    debug('Webpack compilation warnings:');
+    info.warnings.forEach(warning => debug(warning.message));
+  }
+
+  debugDetails('webpack compilation stats:', JSON.stringify(info, null, 2));
+
+  return info;
+}
+
+async function inMemWebpack (config)
+{
+  // Create a memory filesystem
+  let memVolume = new Volume();
+  let memfs = createFsFromVolume(memVolume);
+
+  // Create a union filesystem that combines memory fs and normal node fs.
+  let ufs = new Union();
+  // @ts-ignore
+  ufs.use(memfs).use(fs);
+
+  // Place the input in memfs and update config.entry.
+  const buf = fs.readFileSync(config.entry);
+  config.entry = '/inMemoryinput.js';
+  memfs.writeFileSync(config.entry, buf);
+  if (debug.enabled)
+  {
+    const _buf = memfs.readFileSync(config.entry);
+    if (!Buffer.isBuffer(_buf))
+      throw new Error("Webpack: Buffer.isBuffer has failed");
+  }
+
+  const compiler = webpack(config);
+  try
+  {
+    // @ts-ignore
+    compiler.inputFileSystem = ufs;
+    const stats = await compile(compiler);
+    showDiags(stats);
+  }
+  finally
+  {
+    compiler.close((closeErr) => {
+      if (debug.enabled && closeErr)
+        debug('Failure closing webpack compiler', { cause: closeErr });
+    });
+  }
+}
+
+async function main ()
+{
+  const success = 0;
+  const failure = 1;
+
+  debug('Webpack command-line args', process.argv);
+  try
+  {
+    // node dcp-module-bundler.js configFile.json
+    const configuration = require(process.argv[2]);
+    debug('Webpack configuration:', configuration);
+
+    await inMemWebpack(configuration);
+  }
+  catch (error)
+  {
+    process.exitCode = failure;
+    debug('Failure compiling webpack', { cause: error });
+    throw error;
+  }
+  process.exitCode = success;
+}
+
+( async () => { await main(); } )();

package/build/bundle

@@ -174,7 +174,7 @@ fi
 NO_LOG=1 \
 SKIP_SUDO_CHECK=1 \
 DCP_LOCAL_CONFIG_EXTRAS="${BUNDLE_TMP}/local-config.incl" \
-  "${DCP_SRC}/install.sh" -NI ${DCP_INSTALL_FLAGS} build-dcp-client
+  "${DCP_SRC}/install.sh" -NI ${DCP_INSTALL_FLAGS} autogen-schemas build-dcp-client
 
 EXIT_CODE="$?"
 if [ "$EXIT_CODE" != "0" ]; then

package/dcp-client.js

@@ -258,22 +258,35 @@ https://distributive.network/`, "font-weight: bold; font-size: 1.2em; color: #00
         };
     }
 
-    /* Load the modal stylesheet
-     *  Add our favicon (unless they've already got one)
+    /* Load the default appearance CSS. This lets us style trivial DCP programs so that the modals use
+     * e.g. so that popups in wallet API look right.
      */
-    function loadLinks () {
+    function loadCSS () {
+      // Best-effort to find cdn location
+      //  1. use dcpConfig.cdn.location
+      //  2. use dcpConfigHref to infer where cdn is (when dcpConfigHref is loading through some service)
+      //  3. use thisScriptURL to infer where cdn is
+      var cdnOrigin;
+      if (typeof dcpConfig === 'object' && dcpConfig.cdn?.location?.href)
+        cdnOrigin = dcpConfig.cdn.location.origin
+      else if (typeof dcpConfigHref === 'string' && dcpConfigHref.match(/(portal|auth|cdn|scheduler)\.?/))
+      {
+        cdnOrigin = new URL(dcpConfigHref).origin;
+        cdnOrigin = cdnOrigin.replace(/(portal|auth|cdn|scheduler)\.?/, 'cdn.');
+      }
+      else
+      {
+        cdnOrigin = thisScriptURL.origin.replace(/(portal|auth|cdn|scheduler)\.?/, 'cdn.');
+        if (!cdnOrigin.match(/^(http|https):\/\/cdn/)) // Loaded directly 
+          cdnOrigin = cdnOrigin.replace(/^(http:\/\/|https:\/\/)/, '$1cdn.');
+      }
+
       const head = document.getElementsByTagName('head')[0];
       let styleLink = document.createElement('link');
       styleLink.rel = 'stylesheet';
-      styleLink.href = thisScript.src.replace('/dcp-client.js', '/templates/dcp-modal.css');
-      head.prepend(styleLink);
-
-      if (document.querySelector("link[rel*='icon']")) return
-      let faviconLink = document.createElement('link');
-      faviconLink.type = 'image/x-icon';
-      faviconLink.rel = 'shortcut icon';
-      faviconLink.href = thisScript.src.replace('/dcp-client.js', '/favicon.ico');
-      head.appendChild(faviconLink);
+      styleLink.href = cdnOrigin + '/css/dcp-modals.css';
+      styleLink.id = 'dcp-modal-styles'
+      head.appendChild(styleLink);
     }
 
     let shimCallback;
@@ -281,8 +294,8 @@ https://distributive.network/`, "font-weight: bold; font-size: 1.2em; color: #00
       shimCallback = loadCJS2Shim(); /* BravoJS, NobleJS, etc - set up for requireNative */
 
     loadConfig();
+    loadCSS();
     loadBundle(shimCallback);
-    loadLinks();
   }
 })();