perf: update zx to v8

qiwi · Apr 6, 2024 · b2fa177 · b2fa177
1 parent 959ba03
commit b2fa177
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
   "dependencies": {
     "@qiwi/deep-proxy": "^3.0.0",
     "@types/ip": "^1.1.3",
-    "@types/node": "^20.11.30",
+    "@types/node": "^20.12.5",
     "@types/semver": "^7.5.8",
     "globby-cp": "^1.3.0",
     "ini": "^4.1.2",
@@ -50,7 +50,7 @@
     "semver": "^7.6.0",
     "ssri": "^10.0.5",
     "tempy": "^3.1.0",
-    "zx": "7.2.3-dev.0844b88"
+    "zx": "8.0.0"
   },
   "devDependencies": {
     "c8": "^9.1.0"

diff --git a/src/test/js/test.mjs b/src/test/js/test.mjs
@@ -12,7 +12,8 @@ import {
   fs,
   path,
   SSRI,
-  INI
+  INI,
+  ps,
 } from '../../main/js/index.mjs'
 
 // $.verbose
@@ -109,14 +110,23 @@ password = dbpassword
 {
   const SIGNAL = 'SIGTERM'
   const nothrow = createHook({nothrow: true}, 'nothrow')
-  const quiet = createHook({ verbose: 0 }, 'quiet')
+  const quiet = createHook({ verbose: 0, quiet: true }, 'quiet')
   const debug = createHook({ verbose: 2 }, 'debug')
   const timeout = createHook(
     null,
     'timeout',
     (p, t, signal) => {
       if (!t) return p
-      let timer = setTimeout(() => p.kill(signal), t)
+      let timer = setTimeout(() => {
+        (async () => {
+          const list =  await ps.tree({ pid: p.child.pid, recursive: true })
+          for (const l of list) {
+            process.kill(+l.pid)
+          }
+          process.kill(+p.child.pid, signal)
+        })()
+        // p.kill(signal)
+      }, t)
 
       p.finally(() => clearTimeout(timer))