Skip to content

Commit 7b584d3

Browse files
wraithgarwraithgar
committed
1 parent 941d0d7 commit 7b584d3

File tree

12 files changed

+153
-105
lines changed

12 files changed

+153
-105
lines changed

node_modules/foreground-child/dist/cjs/all-signals.js renamed to node_modules/foreground-child/dist/commonjs/all-signals.js

File renamed without changes.

node_modules/foreground-child/dist/cjs/index.js renamed to node_modules/foreground-child/dist/commonjs/index.js

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ exports.foregroundChild = exports.normalizeFgArgs = void 0;
77
const child_process_1 = require("child_process");
88
const cross_spawn_1 = __importDefault(require("cross-spawn"));
99
const signal_exit_1 = require("signal-exit");
10-
const all_signals_js_1 = require("./all-signals.js");
10+
const proxy_signals_js_1 = require("./proxy-signals.js");
1111
const watchdog_js_1 = require("./watchdog.js");
1212
/* c8 ignore start */
1313
const spawn = process?.platform === 'win32' ? cross_spawn_1.default : child_process_1.spawn;
@@ -50,7 +50,6 @@ function foregroundChild(...fgArgs) {
5050
spawnOpts.stdio.push('ipc');
5151
}
5252
const child = spawn(program, args, spawnOpts);
53-
const unproxySignals = proxySignals(child);
5453
const childHangup = () => {
5554
try {
5655
child.kill('SIGHUP');
@@ -63,20 +62,18 @@ function foregroundChild(...fgArgs) {
6362
/* c8 ignore stop */
6463
};
6564
const removeOnExit = (0, signal_exit_1.onExit)(childHangup);
66-
const dog = (0, watchdog_js_1.watchdog)(child);
65+
(0, proxy_signals_js_1.proxySignals)(child);
66+
(0, watchdog_js_1.watchdog)(child);
6767
let done = false;
6868
child.on('close', async (code, signal) => {
69-
dog.kill('SIGKILL');
7069
/* c8 ignore start */
71-
if (done) {
70+
if (done)
7271
return;
73-
}
7472
/* c8 ignore stop */
7573
done = true;
7674
const result = cleanup(code, signal);
7775
const res = isPromise(result) ? await result : result;
7876
removeOnExit();
79-
unproxySignals();
8077
if (res === false)
8178
return;
8279
else if (typeof res === 'string') {
@@ -120,35 +117,5 @@ function foregroundChild(...fgArgs) {
120117
return child;
121118
}
122119
exports.foregroundChild = foregroundChild;
123-
/**
124-
* Starts forwarding signals to `child` through `parent`.
125-
*/
126-
const proxySignals = (child) => {
127-
const listeners = new Map();
128-
for (const sig of all_signals_js_1.allSignals) {
129-
const listener = () => {
130-
// some signals can only be received, not sent
131-
try {
132-
child.kill(sig);
133-
/* c8 ignore start */
134-
}
135-
catch (_) { }
136-
/* c8 ignore stop */
137-
};
138-
try {
139-
// if it's a signal this system doesn't recognize, skip it
140-
process.on(sig, listener);
141-
listeners.set(sig, listener);
142-
/* c8 ignore start */
143-
}
144-
catch (_) { }
145-
/* c8 ignore stop */
146-
}
147-
return () => {
148-
for (const [sig, listener] of listeners) {
149-
process.removeListener(sig, listener);
150-
}
151-
};
152-
};
153120
const isPromise = (o) => !!o && typeof o === 'object' && typeof o.then === 'function';
154121
//# sourceMappingURL=index.js.map

node_modules/foreground-child/dist/cjs/package.json renamed to node_modules/foreground-child/dist/commonjs/package.json

File renamed without changes.

‎node_modules/foreground-child/dist/commonjs/proxy-signals.js‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
"use strict";
2+
Object.defineProperty(exports, "__esModule", { value: true });
3+
exports.proxySignals = void 0;
4+
const all_signals_js_1 = require("./all-signals.js");
5+
/**
6+
* Starts forwarding signals to `child` through `parent`.
7+
*/
8+
const proxySignals = (child) => {
9+
const listeners = new Map();
10+
for (const sig of all_signals_js_1.allSignals) {
11+
const listener = () => {
12+
// some signals can only be received, not sent
13+
try {
14+
child.kill(sig);
15+
/* c8 ignore start */
16+
}
17+
catch (_) { }
18+
/* c8 ignore stop */
19+
};
20+
try {
21+
// if it's a signal this system doesn't recognize, skip it
22+
process.on(sig, listener);
23+
listeners.set(sig, listener);
24+
/* c8 ignore start */
25+
}
26+
catch (_) { }
27+
/* c8 ignore stop */
28+
}
29+
const unproxy = () => {
30+
for (const [sig, listener] of listeners) {
31+
process.removeListener(sig, listener);
32+
}
33+
};
34+
child.on('exit', unproxy);
35+
return unproxy;
36+
};
37+
exports.proxySignals = proxySignals;
38+
//# sourceMappingURL=proxy-signals.js.map

node_modules/foreground-child/dist/cjs/watchdog.js renamed to node_modules/foreground-child/dist/commonjs/watchdog.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ if (!isNaN(pid)) {
2727
process.on('SIGHUP', bark)
2828
}
2929
`;
30+
/**
31+
* Pass in a ChildProcess, and this will spawn a watchdog process that
32+
* will make sure it exits if the parent does, thus preventing any
33+
* dangling detached zombie processes.
34+
*
35+
* If the child ends before the parent, then the watchdog will terminate.
36+
*/
3037
const watchdog = (child) => {
3138
let dogExited = false;
3239
const dog = (0, child_process_1.spawn)(process.execPath, ['-e', watchdogCode, String(child.pid)], {
@@ -35,7 +42,7 @@ const watchdog = (child) => {
3542
dog.on('exit', () => (dogExited = true));
3643
child.on('exit', () => {
3744
if (!dogExited)
38-
dog.kill('SIGTERM');
45+
dog.kill('SIGKILL');
3946
});
4047
return dog;
4148
};

node_modules/foreground-child/dist/mjs/all-signals.js renamed to node_modules/foreground-child/dist/esm/all-signals.js

File renamed without changes.

node_modules/foreground-child/dist/mjs/index.js renamed to node_modules/foreground-child/dist/esm/index.js

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { spawn as nodeSpawn, } from 'child_process';
22
import crossSpawn from 'cross-spawn';
33
import { onExit } from 'signal-exit';
4-
import { allSignals } from './all-signals.js';
4+
import { proxySignals } from './proxy-signals.js';
55
import { watchdog } from './watchdog.js';
66
/* c8 ignore start */
77
const spawn = process?.platform === 'win32' ? crossSpawn : nodeSpawn;
@@ -43,7 +43,6 @@ export function foregroundChild(...fgArgs) {
4343
spawnOpts.stdio.push('ipc');
4444
}
4545
const child = spawn(program, args, spawnOpts);
46-
const unproxySignals = proxySignals(child);
4746
const childHangup = () => {
4847
try {
4948
child.kill('SIGHUP');
@@ -56,20 +55,18 @@ export function foregroundChild(...fgArgs) {
5655
/* c8 ignore stop */
5756
};
5857
const removeOnExit = onExit(childHangup);
59-
const dog = watchdog(child);
58+
proxySignals(child);
59+
watchdog(child);
6060
let done = false;
6161
child.on('close', async (code, signal) => {
62-
dog.kill('SIGKILL');
6362
/* c8 ignore start */
64-
if (done) {
63+
if (done)
6564
return;
66-
}
6765
/* c8 ignore stop */
6866
done = true;
6967
const result = cleanup(code, signal);
7068
const res = isPromise(result) ? await result : result;
7169
removeOnExit();
72-
unproxySignals();
7370
if (res === false)
7471
return;
7572
else if (typeof res === 'string') {
@@ -112,35 +109,5 @@ export function foregroundChild(...fgArgs) {
112109
}
113110
return child;
114111
}
115-
/**
116-
* Starts forwarding signals to `child` through `parent`.
117-
*/
118-
const proxySignals = (child) => {
119-
const listeners = new Map();
120-
for (const sig of allSignals) {
121-
const listener = () => {
122-
// some signals can only be received, not sent
123-
try {
124-
child.kill(sig);
125-
/* c8 ignore start */
126-
}
127-
catch (_) { }
128-
/* c8 ignore stop */
129-
};
130-
try {
131-
// if it's a signal this system doesn't recognize, skip it
132-
process.on(sig, listener);
133-
listeners.set(sig, listener);
134-
/* c8 ignore start */
135-
}
136-
catch (_) { }
137-
/* c8 ignore stop */
138-
}
139-
return () => {
140-
for (const [sig, listener] of listeners) {
141-
process.removeListener(sig, listener);
142-
}
143-
};
144-
};
145112
const isPromise = (o) => !!o && typeof o === 'object' && typeof o.then === 'function';
146113
//# sourceMappingURL=index.js.map

node_modules/foreground-child/dist/mjs/package.json renamed to node_modules/foreground-child/dist/esm/package.json

File renamed without changes.

‎node_modules/foreground-child/dist/esm/proxy-signals.js‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import { allSignals } from './all-signals.js';
2+
/**
3+
* Starts forwarding signals to `child` through `parent`.
4+
*/
5+
export const proxySignals = (child) => {
6+
const listeners = new Map();
7+
for (const sig of allSignals) {
8+
const listener = () => {
9+
// some signals can only be received, not sent
10+
try {
11+
child.kill(sig);
12+
/* c8 ignore start */
13+
}
14+
catch (_) { }
15+
/* c8 ignore stop */
16+
};
17+
try {
18+
// if it's a signal this system doesn't recognize, skip it
19+
process.on(sig, listener);
20+
listeners.set(sig, listener);
21+
/* c8 ignore start */
22+
}
23+
catch (_) { }
24+
/* c8 ignore stop */
25+
}
26+
const unproxy = () => {
27+
for (const [sig, listener] of listeners) {
28+
process.removeListener(sig, listener);
29+
}
30+
};
31+
child.on('exit', unproxy);
32+
return unproxy;
33+
};
34+
//# sourceMappingURL=proxy-signals.js.map

node_modules/foreground-child/dist/mjs/watchdog.js renamed to node_modules/foreground-child/dist/esm/watchdog.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@ if (!isNaN(pid)) {
2424
process.on('SIGHUP', bark)
2525
}
2626
`;
27+
/**
28+
* Pass in a ChildProcess, and this will spawn a watchdog process that
29+
* will make sure it exits if the parent does, thus preventing any
30+
* dangling detached zombie processes.
31+
*
32+
* If the child ends before the parent, then the watchdog will terminate.
33+
*/
2734
export const watchdog = (child) => {
2835
let dogExited = false;
2936
const dog = spawn(process.execPath, ['-e', watchdogCode, String(child.pid)], {
@@ -32,7 +39,7 @@ export const watchdog = (child) => {
3239
dog.on('exit', () => (dogExited = true));
3340
child.on('exit', () => {
3441
if (!dogExited)
35-
dog.kill('SIGTERM');
42+
dog.kill('SIGKILL');
3643
});
3744
return dog;
3845
};

0 commit comments

Comments
 (0)