@abtnode/util 1.16.29-next-680cf137 → 1.16.29

package/lib/create-blocklet-release.js

@@ -21,7 +21,7 @@ const defaultLogger = {
 // TODO add dependencies
 // TODO remove code in @abtnode/cli
 
-const createRelease = (dir, { printError = defaultLogger.error, printInfo = defaultLogger.info } = {}) =>
+const createRelease = (dir, { printError = defaultLogger.error, printInfo = defaultLogger.info, tarball = '' } = {}) =>
   // eslint-disable-next-line no-async-promise-executor
   new Promise(async (resolve, reject) => {
     const destDir = path.join(dir, BLOCKLET_RELEASE_FOLDER_NAME);
@@ -36,7 +36,7 @@ const createRelease = (dir, { printError = defaultLogger.error, printInfo = defa
     }
 
     meta.dist = {};
-    meta.dist.tarball = `${slugify(meta.name)}-${meta.version}.tgz`;
+    meta.dist.tarball = tarball || `${slugify(meta.name)}-${meta.version}.tgz`;
 
     const destFile = path.join(destDir, meta.dist.tarball);
     const metaFile = path.join(destDir, BLOCKLET_RELEASE_FILE);

package/lib/format-context.js

@@ -1,5 +1,6 @@
 const omit = require('lodash/omit');
 const get = require('lodash/get');
+const getRequestIP = require('./get-request-ip');
 
 // Format context: https://github.com/graphql/express-graphql
 /**
@@ -19,7 +20,7 @@ module.exports = (ctx = {}) => {
     (typeof ctx.get === 'function' ? ctx.get(key) : get(ctx, `headers[${key}]`)) || _default;
   const port = process.env.NODE_ENV === 'production' ? safeGet('x-real-port') : '';
   const result = {
-    ip: safeGet('x-real-ip', '127.0.0.1'),
+    ip: getRequestIP(ctx) || safeGet('x-real-ip', '127.0.0.1'),
     ua: safeGet('user-agent'),
     protocol: safeGet('x-real-protocol').replace(/:$/, '') || 'http',
     user: contextUser,

package/lib/get-ip.js

@@ -35,6 +35,15 @@ const getIP = async ({ includeV6 = false, timeout = 5000, includeExternal = true
     const [inEc2, inGCP] = await Promise.all([isEC2(), gcp.isInGCP()]);
     debug('check env', { inEc2, inGCP });
 
+    if (process.env.ABT_NODE_HOST) {
+      return {
+        internal: process.env.ABT_NODE_HOST,
+        external: process.env.ABT_NODE_HOST,
+        internalV6: process.env.ABT_NODE_HOST,
+        externalV6: process.env.ABT_NODE_HOST,
+      };
+    }
+
     if (inEc2) {
       debug('in ec2');
       const [internal, external, internalV6, externalV6] = await Promise.all([

package/lib/get-request-ip.js

@@ -0,0 +1,20 @@
+const requestIp = require('request-ip');
+
+const emptyIp = '';
+
+const getRequestIP = (request) => {
+  if (!request) {
+    return emptyIp;
+  }
+  let clientIp = request?.clientIp;
+  if (!clientIp) {
+    clientIp = requestIp.getClientIp(request);
+  }
+  if (!clientIp) {
+    clientIp = request.get?.('x-real-ip');
+  }
+
+  return clientIp || emptyIp;
+};
+
+module.exports = getRequestIP;

package/lib/run-script.js

@@ -83,7 +83,6 @@ const runScript = (script, label, options = {}) => {
   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);
@@ -134,20 +133,8 @@ const runScript = (script, label, options = {}) => {
 
     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, signal) => {
+    const handleExit = (code, signal) => {
       if (signal) {
         if (Date.now() - now > timeout) {
           return reject(new Error(`Process timeout after ${timeout / 1000} seconds`));
@@ -162,7 +149,23 @@ const runScript = (script, label, options = {}) => {
       }
 
       return resolve({ code, script });
+    };
+
+    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', handleExit);
+    child.on('exit', handleExit);
   });
 
   promise.abort = cleanup;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.29-next-680cf137",
+  "version": "1.16.29",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,15 +18,15 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.29-next-680cf137",
-    "@abtnode/logger": "1.16.29-next-680cf137",
+    "@abtnode/constant": "1.16.29",
+    "@abtnode/logger": "1.16.29",
     "@arcblock/pm2": "^5.4.0",
-    "@blocklet/constant": "1.16.29-next-680cf137",
-    "@blocklet/meta": "1.16.29-next-680cf137",
-    "@ocap/client": "1.18.126",
-    "@ocap/mcrypto": "1.18.126",
-    "@ocap/util": "1.18.126",
-    "@ocap/wallet": "1.18.126",
+    "@blocklet/constant": "1.16.29",
+    "@blocklet/meta": "1.16.29",
+    "@ocap/client": "1.18.128",
+    "@ocap/mcrypto": "1.18.128",
+    "@ocap/util": "1.18.128",
+    "@ocap/wallet": "1.18.128",
     "archiver": "^7.0.1",
     "axios": "^1.7.2",
     "axios-mock-adapter": "^1.21.2",
@@ -56,6 +56,7 @@
     "parallel-transform": "^1.2.0",
     "public-ip": "^4.0.4",
     "pump": "^3.0.0",
+    "request-ip": "^3.3.0",
     "resolve": "^1.22.8",
     "semver": "^7.6.2",
     "semver-sort": "^1.0.0",
@@ -79,5 +80,5 @@
     "fs-extra": "^11.2.0",
     "jest": "^29.7.0"
   },
-  "gitHead": "17b7e7c5e43c497980d4fe6b5bb20609328041bd"
+  "gitHead": "6c49cffcab4fd0dffc6bed261a5eddf733280ae7"
 }