Skip to content

Commit cd8431d

Browse files
committed
test(plugins): preserve unrelated processes during render teardown
1 parent 3f25b04 commit cd8431d

3 files changed

Lines changed: 22 additions & 12 deletions

File tree

‎scripts/agent-plugin-captions.test.mjs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// guards: skills/embedded-captions/**, skills/hyperframes/scripts/plugin-cli.mjs, scripts/package-agent-plugin.mjs
22
import assert from "node:assert/strict";
3-
import { execFileSync, spawnSync } from "node:child_process";
3+
import { execFileSync, spawn, spawnSync } from "node:child_process";
44
import {
55
existsSync,
66
mkdirSync,
@@ -85,6 +85,10 @@ for (const { bytes, detached, cancel } of cases) {
8585
test(`ZIP render settles descendants: detached=${detached}, bytes=${bytes}, cancel=${cancel}`, async (t) => {
8686
const dir = mkdtempSync(join(tmpdir(), "hf-caption-timeout-"));
8787
const pidFile = join(dir, "pids.json");
88+
const unrelated = spawn(process.execPath, ["-e", "setInterval(()=>{},1000)"], {
89+
stdio: "ignore",
90+
});
91+
t.after(() => unrelated.kill());
8892
t.after(() => {
8993
if (existsSync(pidFile)) {
9094
const { npm, render } = JSON.parse(readFileSync(pidFile));
@@ -169,6 +173,9 @@ sys.exit(2)
169173
);
170174
assert.equal(result.error, undefined, result.stderr);
171175
assert.equal(result.status, cancel ? 0 : bytes ? 0 : 1, result.stdout + result.stderr);
176+
assert.equal(unrelated.exitCode, null);
177+
assert.doesNotThrow(() => process.kill(unrelated.pid, 0));
178+
if (cancel) assert.equal(existsSync(join(project, "final.mp4")), false);
172179
const pids = JSON.parse(readFileSync(pidFile));
173180
for (const pid of Object.values(pids)) {
174181
const status = spawnSync("ps", ["-o", "stat=", "-p", String(pid)], { encoding: "utf8" });

‎skills-manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"source": "heygen-com/hyperframes",
33
"skills": {
44
"embedded-captions": {
5-
"hash": "bfd68b64618c6807",
5+
"hash": "f585698e3563816f",
66
"files": 144
77
},
88
"faceless-explainer": {

‎skills/embedded-captions/scripts/render-watchdog.mjs‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const exited = new Promise((resolve, reject) => {
1111
});
1212
const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
1313
function processes() {
14-
return execFileSync("ps", ["-axo", "pid=,ppid=,stat="], { encoding: "utf8" })
14+
return execFileSync("ps", ["-axo", "pid=,ppid=,stat="], { encoding: "utf8", timeout: 2000 })
1515
.trim()
1616
.split("\n")
1717
.map((line) => {
@@ -31,18 +31,21 @@ async function settleTree() {
3131
// during teardown. Detached descendants retain their PPID until we kill them.
3232
const owned = new Set([child.pid]);
3333
signal(child.pid, "SIGSTOP");
34-
for (;;) {
35-
let added = false;
36-
for (const row of processes()) {
37-
if (owned.has(row.ppid) && !owned.has(row.pid)) {
38-
signal(row.pid, "SIGSTOP");
39-
owned.add(row.pid);
40-
added = true;
34+
try {
35+
for (;;) {
36+
let added = false;
37+
for (const row of processes()) {
38+
if (owned.has(row.ppid) && !owned.has(row.pid)) {
39+
signal(row.pid, "SIGSTOP");
40+
owned.add(row.pid);
41+
added = true;
42+
}
4143
}
44+
if (!added) break;
4245
}
43-
if (!added) break;
46+
} finally {
47+
for (const pid of [...owned].reverse()) signal(pid, "SIGKILL");
4448
}
45-
for (const pid of [...owned].reverse()) signal(pid, "SIGKILL");
4649
await exited;
4750
// A zombie is already unable to write; its new parent owns reaping it.
4851
while (processes().some((row) => owned.has(row.pid) && !/^[ZX]/.test(row.state))) await delay(20);

0 commit comments

Comments
 (0)