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

package/lib/run-script.js

@@ -83,6 +83,7 @@ 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);
@@ -133,8 +134,20 @@ const runScript = (script, label, options = {}) => {
 
     let hasUnhandledRejection = false;
     const errorMessages = [];
+    child.stderr.on('data', (err) => {
+      errorMessages.push(err);
+      if (err.includes('UnhandledPromiseRejectionWarning')) {
+        hasUnhandledRejection = true;
+      }
+    });
 
-    const handleExit = (code, signal) => {
+    child.on('error', (err) => {
+      console.error(err);
+      errorMessages.push(err.message);
+      return reject(new Error(errorMessages.join('\r\n')));
+    });
+
+    child.on('close', (code, signal) => {
       if (signal) {
         if (Date.now() - now > timeout) {
           return reject(new Error(`Process timeout after ${timeout / 1000} seconds`));
@@ -149,23 +162,7 @@ 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-beta-cbfd116d",
+  "version": "1.16.29-next-680cf137",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,11 +18,11 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.29-beta-cbfd116d",
-    "@abtnode/logger": "1.16.29-beta-cbfd116d",
+    "@abtnode/constant": "1.16.29-next-680cf137",
+    "@abtnode/logger": "1.16.29-next-680cf137",
     "@arcblock/pm2": "^5.4.0",
-    "@blocklet/constant": "1.16.29-beta-cbfd116d",
-    "@blocklet/meta": "1.16.29-beta-cbfd116d",
+    "@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",
@@ -79,5 +79,5 @@
     "fs-extra": "^11.2.0",
     "jest": "^29.7.0"
   },
-  "gitHead": "e9bdb7af77f2d126e40195c67972b07fe683adf9"
+  "gitHead": "17b7e7c5e43c497980d4fe6b5bb20609328041bd"
 }