Skip to content

[spark-compete] fix(runcommand): src/lib/server/command-runner #855

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
4gjnbzb4zf-sudo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[spark-compete] fix(runcommand): src/lib/server/command-runner #855

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
16 changes: 16 additions & 0 deletions src/lib/server/command-runner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { externalProjectPathsAllowed, resolveContainedPath, sparkWorkspaceRoot }

export const MAX_OUTPUT_LENGTH = 5000;
export const COMMAND_TIMEOUT_MS = commandTimeoutMs();
const SIGTERM_GRACE_MS = 5000;

export interface CommandResult {
exitCode: number;
Expand Down Expand Up @@ -112,6 +113,19 @@ export function runCommand(
windowsHide: true
});

// Node sends SIGTERM when the spawn `timeout` fires. If the child ignores
// SIGTERM (npm/test shells with their own signal handlers, hung worker
// pools), `close` never fires and the API caller waits indefinitely.
// Schedule a SIGKILL escalation that fires only if the child is still
// running after the SIGTERM grace window.
const sigkillTimer = setTimeout(() => {
try {
child.kill('SIGKILL');
} catch {
// Child may already have exited after SIGTERM.
}
}, timeoutMs + SIGTERM_GRACE_MS);

child.stdout?.on('data', (data: Buffer) => {
stdout += data.toString();
});
Expand All @@ -121,6 +135,7 @@ export function runCommand(
});

child.on('close', (code) => {
clearTimeout(sigkillTimer);
if (!resolved) {
resolved = true;
res({
Expand All @@ -133,6 +148,7 @@ export function runCommand(
});

child.on('error', (err) => {
clearTimeout(sigkillTimer);
if (!resolved) {
resolved = true;
res({
Expand Down