Properly distinguish TL from RE (Fixes #41)

Author: celonymire

src/utils/runtime.ts

@@ -13,25 +13,31 @@ export class Runnable {
 	private _startTime = 0;
 	private _endTime = 0;
 	private _signal: NodeJS.Signals | null = null;
+	private _timedOut = false;
 	private _exitCode: number | null = null;
 
 	run(command: string, timeout: number, cwd?: string, ...args: string[]) {
-		this._process = child_process.spawn(command, args, { cwd, timeout });
+		// FIXME: Simplify TL to check a flag once https://github.com/nodejs/node/pull/51608 lands
+
+		const timeoutSignal = AbortSignal.timeout(timeout);
+		this._process = child_process.spawn(command, args, {
+			cwd,
+			signal: timeoutSignal,
+		});
 		this._process.stdout.setEncoding('utf-8');
 		this._process.stderr.setEncoding('utf-8');
 		this._promise = new Promise((resolve) => {
 			this._process?.once('spawn', () => {
 				this._startTime = performance.now();
 			});
 			this._process?.once('error', () => {
-				this._startTime = performance.now();
-				this._exitCode = -1;
-				resolve();
+				this._startTime = performance.now(); // necessary since an invalid command can lead to process not spawned
 			});
 			this._process?.once('close', (code, signal) => {
 				this._endTime = performance.now();
 				this._signal = signal;
 				this._exitCode = code;
+				this._timedOut = timeoutSignal.aborted;
 				resolve();
 			});
 		});
@@ -49,6 +55,9 @@ export class Runnable {
 	get signal(): NodeJS.Signals | null {
 		return this._signal;
 	}
+	get timedOut(): boolean {
+		return this._timedOut;
+	}
 	get exitCode(): number | null {
 		return this._exitCode;
 	}

src/views/judge/provider/JudgeViewProvider.ts

@@ -39,17 +39,20 @@ interface IState
 	process: Runnable;
 }
 
-function getExitCodeStatus(
-	signal: NodeJS.Signals | null,
-	code: number | null,
-	stdout: string,
-	acceptedStdout: string,
-) {
-	if (signal === 'SIGTERM') return Status.TL;
-	if (code === null || code) return Status.RE;
-	if (acceptedStdout === '\n') return Status.NA;
-	if (stdout === acceptedStdout) return Status.AC;
-	return Status.WA;
+function setTestcaseStats(state: IState, timeLimit: number) {
+	state.elapsed = state.process.elapsed;
+	if (state.process.timedOut) {
+		state.elapsed = timeLimit;
+		state.status = Status.TL;
+	} else if (state.process.exitCode === null || state.process.exitCode) {
+		state.status = Status.RE;
+	} else if (state.acceptedStdout.data === '\n') {
+		state.status = Status.NA;
+	} else if (state.stdout === state.acceptedStdout) {
+		state.status = Status.AC;
+	} else {
+		state.status = Status.WA;
+	}
 }
 
 function coerceToObject(data: unknown): unknown {
@@ -497,19 +500,10 @@ export default class extends BaseViewProvider<ProviderMessage, WebviewMessage> {
 			});
 			this._saveFileData();
 		});
-		testcase.process.process?.once('close', (exitCode: number | null) => {
+		testcase.process.process?.once('close', () => {
 			testcase.process.process?.stderr.removeAllListeners('data');
 			testcase.process.process?.stdout.removeAllListeners('data');
-			testcase.status = getExitCodeStatus(
-				testcase.process.signal,
-				exitCode,
-				testcase.stdout.data,
-				testcase.acceptedStdout.data,
-			);
-			testcase.elapsed =
-				testcase.status === Status.TL
-					? this._timeLimit
-					: testcase.process.elapsed;
+			setTestcaseStats(testcase, this._timeLimit);
 			super._postMessage({
 				type: WebviewMessageType.SET,
 				id,
@@ -703,16 +697,7 @@ export default class extends BaseViewProvider<ProviderMessage, WebviewMessage> {
 		testcase.acceptedStdout.reset();
 		testcase.stdin.write(stdin, true);
 		testcase.acceptedStdout.write(acceptedStdout, true);
-		testcase.status = getExitCodeStatus(
-			testcase.process.signal,
-			testcase.process.exitCode,
-			testcase.stdout.data,
-			testcase.acceptedStdout.data,
-		);
-		testcase.elapsed =
-			testcase.status === Status.TL
-				? this._timeLimit
-				: testcase.process.elapsed;
+		setTestcaseStats(testcase, this._timeLimit);
 
 		super._postMessage({
 			type: WebviewMessageType.SET,

src/views/stress/provider/StressViewProvider.ts

@@ -223,9 +223,11 @@ export default class extends BaseViewProvider<ProviderMessage, WebviewMessage> {
 				cwd,
 				...generatorRunArguments.slice(1),
 			);
-			this._state[0].process.process?.on('error', (data) =>
-				this._state[0].data.write(data.message, true),
-			);
+			this._state[0].process.process?.on('error', (data) => {
+				if (data.name !== 'AbortError') {
+					this._state[0].data.write(data.message, true);
+				}
+			});
 			this._state[0].process.process?.stdin.write(`${seed}\n`);
 			this._state[0].process.process?.stdout.on('data', (data: string) => {
 				this._state[0].data.write(data, false);
@@ -246,9 +248,11 @@ export default class extends BaseViewProvider<ProviderMessage, WebviewMessage> {
 				cwd,
 				...solutionRunArguments.slice(1),
 			);
-			this._state[1].process.process?.on('error', (data) =>
-				this._state[1].data.write(data.message, true),
-			);
+			this._state[1].process.process?.on('error', (data) => {
+				if (data.name !== 'AbortError') {
+					this._state[1].data.write(data.message, true);
+				}
+			});
 			this._state[1].process.process?.stdout.on('data', (data: string) =>
 				this._state[1].data.write(data, false),
 			);
@@ -267,9 +271,11 @@ export default class extends BaseViewProvider<ProviderMessage, WebviewMessage> {
 				cwd,
 				...goodSolutionRunArguments.slice(1),
 			);
-			this._state[2].process.process?.on('error', (data) =>
-				this._state[2].data.write(data.message, true),
-			);
+			this._state[2].process.process?.on('error', (data) => {
+				if (data.name !== 'AbortError') {
+					this._state[2].data.write(data.message, true);
+				}
+			});
 			this._state[2].process.process?.stdout.on('data', (data: string) =>
 				this._state[2].data.write(data, false),
 			);
@@ -294,7 +300,7 @@ export default class extends BaseViewProvider<ProviderMessage, WebviewMessage> {
 				this._state.map((value) => value.process.promise),
 			);
 			for (let i = 0; i < 3; i++) {
-				if (this._state[i].process.signal === 'SIGTERM') {
+				if (this._state[i].process.timedOut) {
 					anyFailed = true;
 					this._state[i].status = Status.TL;
 				} else if (this._state[i].process.signal === 'SIGUSR1') {