dcp-client 4.2.24 → 4.2.26

package/bin/build-dcp-config

@@ -11,30 +11,20 @@ const fs = require('fs');
 
 const dcpClient = require('..');
 const { Address } = require('dcp/wallet');
-const serializer = require('dcp/serialize');
-
-// To be able to serialize dcpConfig identities
-serializer.userCtors.dcpEth$$Address = Address;
-const { serializeAsync, deserialize } = serializer;
+const kvin = require('kvin');
 
 let outputFd = +(process.env.BUILD_DCP_CONFIG_OUTPUT_FD || "3");
 
 async function main() {
-  var input, initArgv, programName;
-  
+  const custom = new kvin.KVIN();
+  custom.userCtors.dcpEth$$Address = Address;
+
   dcpClient._initHead();
 
-  if (!process.stdin.isTTY)
-    input = fs.readFileSync(process.stdin.fd, 'utf-8');
-  if (input && input.length > 1) {
-    ({ initArgv, programName } = deserialize(input));
-  } else {
-    initArgv = [];
-    programName = false;
-  }
-        
-  let outputObjects = await dcpClient.createAggregateConfig(initArgv, programName);
-  const output = await serializeAsync(outputObjects);
+  const input = fs.readFileSync(process.stdin.fd, 'utf-8');
+  const { initConfig, options } = custom.deserialize(input);
+  const outputObjects = await dcpClient.createAggregateConfig(initConfig, options);
+  const output = await custom.serializeAsync(outputObjects);
   
   try {
     fs.writeSync(outputFd, output, 'utf-8');

package/bin/download

@@ -7,7 +7,7 @@
  * @date        May 2020
  */
 
-const dcpClient = require('..');
+const dcpClient = require('..'); /* eslint-disable no-unused-vars */
 const fs = require('fs');
 
 function usage() {
@@ -16,6 +16,7 @@ function usage() {
  Where:
     --fd=N:     send all output to file descriptor N
     --quiet:    suppress progress messages
+    --silent:   suppress progress and error messages
 `);
 }
 
@@ -29,6 +30,9 @@ async function main(argv) {
     let [,key,,value] = argv[i].match(/(^[^=]*)(=?)(.*)/); /* separate by first = */
     
     switch(key) {
+      case '--silent':
+        console.error = function(){};
+        /* fallthrough */
       case '--quiet':
         argv.splice(i--,1);
         console.log = console.debug = function(){};

package/dcp-client.js

@@ -12,7 +12,21 @@
  *  @author     Wes Garland, wes@kingsds.network
  *  @date       Aug 2019
  */
-(function namespaceIIFE() {
+const allScripts = document.getElementsByTagName('SCRIPT');
+const thisScript = allScripts[allScripts.length - 1];
+
+if (thisScript.getAttribute('data-autoinit') === 'false')
+{
+  thisScript.removeAttribute('data-autoinit');
+  window.dcp = { init: namespace };
+}
+else
+{
+  namespace();
+}
+
+function namespace()
+{
 
   console.log(`%c
    _____ _____ ___________   _   
@@ -31,8 +45,6 @@ https://distributed.computer/`, "font-weight: bold; font-size: 1.2em; color: #00
   var _dcpConfig = typeof dcpConfig === 'object' ? dcpConfig : undefined;
   
   {
-    let allScripts = document.getElementsByTagName('SCRIPT');
-    let thisScript = allScripts[allScripts.length - 1];
     let thisScriptURL = new URL(thisScript.src)
     let schedulerURL;
     let dcpConfigHref = thisScript.getAttribute('dcpConfig');
@@ -177,5 +189,5 @@ https://distributed.computer/`, "font-weight: bold; font-size: 1.2em; color: #00
     loadBundle(shimCallback);
     loadLinks();
   }
-})();
+};