@percy/cli-exec 1.32.12-beta.2 → 1.32.12-beta.4

package/dist/exec.js

@@ -1,3 +1,4 @@
+import os from 'os';
 import command from '@percy/cli-command';
 import logger from '@percy/logger';
 import start from './start.js';
@@ -173,15 +174,38 @@ async function* spawn(cmd, args, percy) {
         process.stderr.write(`${data}`);
       });
     }
-    proc.on('error', err => error = err);
-    proc.on('close', code => {
-      closed = code;
+
+    // wake the current wait as soon as the child errors or closes. A child killed by a signal
+    // closes with a null code, so report it the way shells do (128 + signal number); `| 0`
+    // keeps an unmapped signal at a non-zero 128 rather than NaN
+    let done = false;
+    let wake;
+    proc.on('error', err => {
+      done = true;
+      error = err;
+      wake();
+    });
+    proc.on('close', (code, signal) => {
+      done = true;
+      closed = code ?? 128 + (os.constants.signals[signal] | 0);
+      wake();
     });
 
-    // run until an event is triggered
+    // run until an event is triggered. Waiting on the exit event rather than spinning on
+    // setImmediate keeps an idle child from costing a CPU core (percy/cli#2460), and the
+    // periodic wake lets an abort signal interrupt the generator promptly. Each tick waits on
+    // a fresh promise: racing one long-lived exit promise would retain a reaction per tick.
     /* eslint-disable-next-line no-unmodified-loop-condition */
-    while (closed == null && error == null) {
-      yield new Promise(r => setImmediate(r));
+    while (!done) {
+      let timer;
+      try {
+        yield new Promise(resolve => {
+          wake = resolve;
+          timer = setTimeout(resolve, 100);
+        });
+      } finally {
+        clearTimeout(timer);
+      }
     }
     if (error) throw error;
     return [closed];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@percy/cli-exec",
-  "version": "1.32.12-beta.2",
+  "version": "1.32.12-beta.4",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -34,10 +34,10 @@
     ]
   },
   "dependencies": {
-    "@percy/cli-command": "1.32.12-beta.2",
-    "@percy/logger": "1.32.12-beta.2",
+    "@percy/cli-command": "1.32.12-beta.4",
+    "@percy/logger": "1.32.12-beta.4",
     "cross-spawn": "^7.0.3",
     "which": "^2.0.2"
   },
-  "gitHead": "35e95e257d7f09d763698765e429dbae0ce7d5e9"
+  "gitHead": "916cdcd8854848b48c3d658d9d01779176feb2d0"
 }