@abtnode/util 1.16.6-beta-79e0bbcc → 1.16.6-beta-56be9f01

package/lib/run-script.js

@@ -1,6 +1,6 @@
 /* eslint-disable prefer-const */
 /* eslint-disable no-nested-ternary */
-const fs = require('fs');
+const fs = require('fs-extra');
 const which = require('which');
 const stream = require('stream');
 const spawn = require('cross-spawn');
@@ -44,6 +44,8 @@ const wrapStream = (next, prefix, state) => {
  * @param {string} options.cwd
  * @param {number} options.timeout
  * @param {boolean} options.silent
+ * @param {string} options.output
+ * @param {string} options.error
  * @return {Promise}
  */
 const runScript = (script, label, options = {}) => {
@@ -63,6 +65,9 @@ const runScript = (script, label, options = {}) => {
     }
   };
 
+  const { output: outputFile, error: errorFile, silent, env, cwd, ...opts } = options;
+  const timeout = opts.timeout ?? 1000 * 120;
+
   const promise = new Promise((resolve, reject) => {
     process.stdout.setMaxListeners(0);
     process.stderr.setMaxListeners(0);
@@ -81,19 +86,28 @@ const runScript = (script, label, options = {}) => {
       lastIsLineBreak: true,
     };
 
-    const stdout = wrapStream(process.stdout, label, state);
-    const stderr = wrapStream(process.stderr, label, state);
+    [outputFile, errorFile].forEach((file) => {
+      if (file) {
+        fs.ensureFileSync(file);
+      }
+    });
+
+    const stdout = wrapStream(outputFile ? fs.createWriteStream(outputFile) : process.stdout, label, state);
+    const stderr = wrapStream(errorFile ? fs.createWriteStream(errorFile) : process.stderr, label, state);
 
+    const now = Date.now();
     child = spawn(command, args, {
-      timeout: 2 * 60 * 1000,
+      ...opts,
       windowsHide: true, // required for Windows
       detached: false,
       shell: false,
       stdio: ['ignore', 'pipe', 'pipe'],
-      ...options,
+      timeout,
+      env,
+      cwd,
     });
 
-    if (!options.silent) {
+    if (!silent) {
       child.stdout.pipe(stdout, { end: false });
       child.stderr.pipe(stderr, { end: false });
     }
@@ -113,7 +127,14 @@ const runScript = (script, label, options = {}) => {
       return reject(new Error(errorMessages.join('\r\n')));
     });
 
-    child.on('close', (code) => {
+    child.on('close', (code, signal) => {
+      if (signal) {
+        if (Date.now() - now > timeout) {
+          return reject(new Error(`Process timeout after ${timeout / 1000} seconds`));
+        }
+        return reject(new Error(`Process was killed with signal: ${signal}`));
+      }
+
       if (errorMessages.length > 0) {
         if (code !== 0 || hasUnhandledRejection) {
           return reject(new Error(errorMessages.join('\r\n')));

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.6-beta-79e0bbcc",
+  "version": "1.16.6-beta-56be9f01",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,9 +18,9 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.16.6-beta-79e0bbcc",
-    "@abtnode/logger": "1.16.6-beta-79e0bbcc",
-    "@blocklet/constant": "1.16.6-beta-79e0bbcc",
+    "@abtnode/constant": "1.16.6-beta-56be9f01",
+    "@abtnode/logger": "1.16.6-beta-56be9f01",
+    "@blocklet/constant": "1.16.6-beta-56be9f01",
     "@ocap/client": "1.18.76",
     "@ocap/mcrypto": "1.18.76",
     "@ocap/util": "1.18.76",
@@ -71,5 +71,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "a14091393bf4c1a7b430155cf27343a0f23ffa2c"
+  "gitHead": "f93c24693ed27c4a2821ec33c345696afe6f001a"
 }