@abtnode/util 1.6.17 → 1.6.18

package/lib/did-document.js

@@ -76,17 +76,4 @@ const updateDaemon = async ({ ips, wallet, didRegistryUrl, domain }) => {
   }
 };
 
-const updateBlocklet = async ({ nodeDid, wallet, didRegistryUrl, domain }) => {
-  const records = [
-    {
-      type: 'CNAME',
-      rr: wallet.address.toLowerCase(),
-      value: `${nodeDid.toLowerCase()}.${domain}`,
-      domain,
-    },
-  ];
-
-  await updateWithRetry({ records, didRegistryUrl, wallet });
-};
-
-module.exports = { updateDaemon, updateBlocklet };
+module.exports = { updateDaemon };

package/lib/get-ip.js

@@ -14,23 +14,23 @@ const getExternalIp = async ({ v6 = false, timeout = 5000 } = {}) => {
   }
 };
 
-const getIP = async ({ includeV6 = false, timeout = 5000 } = {}) => {
+const getIP = async ({ includeV6 = false, timeout = 5000, includeExternal = true } = {}) => {
   try {
     if (isEC2()) {
       const [internal, external, internalV6, externalV6] = await Promise.all([
         getEc2Meta('local-ipv4', timeout),
-        getEc2Meta('public-ipv4', timeout),
+        includeExternal ? getEc2Meta('public-ipv4', timeout) : '',
         includeV6 ? getEc2Meta('local-ipv6', timeout) : '',
-        includeV6 ? getEc2Meta('public-ipv6', timeout) : '',
+        includeV6 && includeExternal ? getEc2Meta('public-ipv6', timeout) : '',
       ]);
       return { internal, external, internalV6, externalV6 };
     }
 
     const [internal, external, internalV6, externalV6] = await Promise.all([
       internalIp.v4(),
-      getExternalIp({ timeout }),
+      includeExternal ? getExternalIp({ timeout }) : '',
       includeV6 ? internalIp.v6() : '',
-      includeV6 ? getExternalIp({ v6: true, timeout }) : '',
+      includeV6 && includeExternal ? getExternalIp({ v6: true, timeout }) : '',
     ]);
     return { internal, external, internalV6, externalV6 };
   } catch (err) {

package/lib/run-script.js

@@ -0,0 +1,130 @@
+/* eslint-disable prefer-const */
+/* eslint-disable no-nested-ternary */
+const fs = require('fs');
+const which = require('which');
+const stream = require('stream');
+const spawn = require('cross-spawn');
+
+class PrefixTransform extends stream.Transform {
+  constructor(prefix, state) {
+    super();
+
+    this.prefix = prefix;
+    this.state = state;
+  }
+
+  // transform all output from child process with a prefix for better readability
+  _transform(chunk, _encoding, callback) {
+    const { prefix, state } = this;
+    const nPrefix = `\n${prefix}`;
+    const firstPrefix = state.lastIsLineBreak ? prefix : state.lastPrefix !== prefix ? '\n' : '';
+    const prefixed = `${firstPrefix}${chunk}`.replace(/\n/g, nPrefix);
+    const index = prefixed.indexOf(prefix, Math.max(0, prefixed.length - prefix.length));
+
+    state.lastPrefix = prefix;
+    state.lastIsLineBreak = index !== -1;
+
+    callback(null, index !== -1 ? prefixed.slice(0, index) : prefixed);
+  }
+}
+
+const wrapStream = (next, prefix, state) => {
+  const transform = new PrefixTransform(`[${prefix}] `, state);
+  transform.pipe(next);
+  return transform;
+};
+
+/**
+ * Run script with a childProcess.spawn
+ *
+ * @param {string} script
+ * @param {string} label
+ * @param {object} options.env
+ * @param {string} options.cwd
+ * @param {number} options.timeout
+ * @param {bool} options.silent
+ * @return {Promise}
+ */
+const runScript = (script, label, options = {}) => {
+  if (!script) {
+    throw new Error('script is required');
+  }
+  if (!label) {
+    throw new Error('label is required');
+  }
+
+  let child = null;
+
+  const cleanup = () => {
+    if (child) {
+      child.kill();
+      child = null;
+    }
+  };
+
+  const promise = new Promise((resolve, reject) => {
+    process.stdout.setMaxListeners(0);
+    process.stderr.setMaxListeners(0);
+
+    let [command, ...args] = script.split(' ');
+    if (fs.existsSync(command) === false) {
+      command = which.sync(command);
+      if (!command) {
+        reject(new Error(`Command not found: ${command}`));
+        return;
+      }
+    }
+
+    const state = {
+      lastPrefix: null,
+      lastIsLineBreak: true,
+    };
+
+    const stdout = wrapStream(process.stdout, label, state);
+    const stderr = wrapStream(process.stderr, label, state);
+
+    child = spawn(command, args, {
+      timeout: 30 * 60 * 1000,
+      detached: false,
+      shell: false,
+      stdio: ['ignore', 'pipe', 'pipe'],
+      ...options,
+    });
+
+    if (!options.silent) {
+      child.stdout.pipe(stdout, { end: false });
+      child.stderr.pipe(stderr, { end: false });
+    }
+
+    let hasUnhandledRejection = false;
+    const errorMessages = [];
+    child.stderr.on('data', (err) => {
+      errorMessages.push(err);
+      if (err.includes('UnhandledPromiseRejectionWarning')) {
+        hasUnhandledRejection = true;
+      }
+    });
+
+    child.on('error', (err) => {
+      console.error(err);
+      errorMessages.push(err.message);
+      return reject(new Error(errorMessages.join('\r\n')));
+    });
+
+    child.on('close', (code) => {
+      if (errorMessages.length > 0) {
+        if (code !== 0 || hasUnhandledRejection) {
+          return reject(new Error(errorMessages.join('\r\n')));
+        }
+      }
+
+      return resolve({ code, script });
+    });
+  });
+
+  promise.abort = cleanup;
+
+  return promise;
+};
+
+module.exports = runScript;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.17",
+  "version": "1.6.18",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -24,6 +24,7 @@
     "axios": "^0.21.4",
     "axios-mock-adapter": "^1.20.0",
     "axon": "^2.0.3",
+    "cross-spawn": "^7.0.3",
     "debug": "^4.3.3",
     "find-up": "^5.0.0",
     "flush-write-stream": "^2.0.0",
@@ -44,7 +45,8 @@
     "through2-filter": "^3.0.0",
     "through2-map": "^3.0.0",
     "to-semver": "^3.0.0",
-    "url-join": "^4.0.1"
+    "url-join": "^4.0.1",
+    "which": "^2.0.2"
   },
   "devDependencies": {
     "detect-port": "^1.3.0",
@@ -52,5 +54,5 @@
     "fs-extra": "^10.0.0",
     "jest": "^27.4.5"
   },
-  "gitHead": "d567a622a779eba43c95eaeb4633cb2b276bb7b9"
+  "gitHead": "2f02f166869d8ebedc0466068f6ed90ab3e07b87"
 }