Skip to content

Make desktop process log waits event-driven #2586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ymichael wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make desktop process log waits event-driven #2586

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 44 additions & 14 deletions apps/desktop/test/bb-process.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ interface TempScript {
interface WaitForLogArgs {
process: BbAppProcess;
text: string;
timeoutMs: number;
}

interface CreateTempScriptArgs {
Expand Down Expand Up @@ -56,17 +55,51 @@ async function createTempScript(
return script;
}

async function waitForLog(args: WaitForLogArgs): Promise<void> {
const deadline = Date.now() + args.timeoutMs;
while (Date.now() <= deadline) {
if (args.process.logs.text().includes(args.text)) {
return;
}
await new Promise<void>((resolvePromise) => {
setTimeout(resolvePromise, 10);
});
function waitForLog(args: WaitForLogArgs): Promise<void> {
if (args.process.logs.text().includes(args.text)) {
return Promise.resolve();
}
throw new Error(`Timed out waiting for log line: ${args.text}`);

return new Promise<void>((resolvePromise, rejectPromise) => {
let settled = false;
const finish = (error?: Error): void => {
if (settled) {
return;
}
settled = true;
args.process.childProcess.stdout?.off("data", handleData);
args.process.childProcess.stderr?.off("data", handleData);
args.process.childProcess.off("exit", handleExit);
if (error === undefined) {
resolvePromise();
} else {
rejectPromise(error);
}
};
const handleData = (): void => {
if (args.process.logs.text().includes(args.text)) {
finish();
}
};
const handleExit = (): void => {
finish(
new Error(
`Process exited before log line: ${args.text}\n${args.process.logs.text()}`,
),
);
};

args.process.childProcess.stdout?.on("data", handleData);
args.process.childProcess.stderr?.on("data", handleData);
args.process.childProcess.once("exit", handleExit);
handleData();
if (
args.process.childProcess.exitCode !== null ||
args.process.childProcess.signalCode !== null
) {
handleExit();
}
});
}

afterEach(async () => {
Expand Down Expand Up @@ -209,7 +242,6 @@ process.stdout.write(\`grandchild=\${grandchild.pid}\\n\`);
await waitForLog({
process: processEntry,
text: "grandchild=",
timeoutMs: 1_000,
});
const grandchildPid = Number(
processEntry.logs.text().match(/grandchild=(\d+)/u)?.[1],
Expand Down Expand Up @@ -302,15 +334,13 @@ setInterval(() => undefined, 1000);
await waitForLog({
process: processEntry,
text: "ready",
timeoutMs: 1_000,
});
// Prove the fixture can handle SIGTERM before starting the short
// escalation window, which may otherwise expire before the child runs.
processEntry.childProcess.kill("SIGTERM");
await waitForLog({
process: processEntry,
text: "ignored SIGTERM",
timeoutMs: 1_000,
});
const killSpy = vi.spyOn(processEntry.childProcess, "kill");

Expand Down
Loading