[sandbox] Catch broken pipes
This commit is contained in:
parent
6e673cf390
commit
bd1623c09c
@ -11,7 +11,13 @@ import { runCpp } from './run/cpp.js';
|
|||||||
|
|
||||||
export const timeoutSeconds = 30;
|
export const timeoutSeconds = 30;
|
||||||
|
|
||||||
const RunResultKind = z.enum(['CompileFailed', 'TimeLimitExceeded', 'Completed', 'SandboxError', 'RunError']);
|
const RunResultKind = z.enum([
|
||||||
|
'CompileFailed',
|
||||||
|
'TimeLimitExceeded',
|
||||||
|
'Completed',
|
||||||
|
'SandboxError',
|
||||||
|
'RunError'
|
||||||
|
]);
|
||||||
export type RunResultKind = z.infer<typeof RunResultKind>;
|
export type RunResultKind = z.infer<typeof RunResultKind>;
|
||||||
|
|
||||||
const RunResult = z
|
const RunResult = z
|
||||||
|
@ -4,7 +4,6 @@ import util from 'util';
|
|||||||
import { RunResult, timeoutSeconds } from '../index.js';
|
import { RunResult, timeoutSeconds } from '../index.js';
|
||||||
import { IRunner, IRunnerParams, IRunnerReturn } from './types.js';
|
import { IRunner, IRunnerParams, IRunnerReturn } from './types.js';
|
||||||
import kill from 'tree-kill';
|
import kill from 'tree-kill';
|
||||||
import * as fs from 'fs';
|
|
||||||
|
|
||||||
const execPromise = util.promisify(exec);
|
const execPromise = util.promisify(exec);
|
||||||
|
|
||||||
|
@ -14,76 +14,80 @@ export const runCSharp: IRunner = async function (params: {
|
|||||||
console.log(`- RUN: ${params.srcDir}`);
|
console.log(`- RUN: ${params.srcDir}`);
|
||||||
const child = spawn('dotnet run', { shell: true, cwd: params.srcDir });
|
const child = spawn('dotnet run', { shell: true, cwd: params.srcDir });
|
||||||
|
|
||||||
let outputBuffer = '';
|
try {
|
||||||
child.stdout.setEncoding('utf8');
|
let outputBuffer = '';
|
||||||
child.stdout.on('data', (data) => {
|
child.stdout.setEncoding('utf8');
|
||||||
outputBuffer += data.toString();
|
child.stdout.on('data', (data) => {
|
||||||
params.outputCallback?.(data.toString());
|
outputBuffer += data.toString();
|
||||||
});
|
params.outputCallback?.(data.toString());
|
||||||
child.stderr.setEncoding('utf8');
|
});
|
||||||
child.stderr.on('data', (data) => {
|
child.stderr.setEncoding('utf8');
|
||||||
outputBuffer += data.toString();
|
child.stderr.on('data', (data) => {
|
||||||
params.outputCallback?.(data.toString());
|
outputBuffer += data.toString();
|
||||||
});
|
params.outputCallback?.(data.toString());
|
||||||
|
});
|
||||||
|
|
||||||
let runStartTime = performance.now();
|
let runStartTime = performance.now();
|
||||||
child.stdin.write(params.input);
|
child.stdin.write(params.input);
|
||||||
child.stdin.end();
|
child.stdin.end();
|
||||||
|
|
||||||
let timeLimitExceeded = false;
|
let timeLimitExceeded = false;
|
||||||
let completedNormally = false;
|
let completedNormally = false;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
success: true,
|
success: true,
|
||||||
runResult: new Promise<RunResult>((resolve) => {
|
runResult: new Promise<RunResult>((resolve) => {
|
||||||
child.on('close', () => {
|
child.on('close', () => {
|
||||||
completedNormally = !timeLimitExceeded;
|
completedNormally = !timeLimitExceeded;
|
||||||
|
|
||||||
let runEndTime = performance.now();
|
let runEndTime = performance.now();
|
||||||
const runtimeMilliseconds = Math.floor(runEndTime - runStartTime);
|
const runtimeMilliseconds = Math.floor(runEndTime - runStartTime);
|
||||||
|
|
||||||
if (completedNormally) {
|
if (completedNormally) {
|
||||||
clearTimeout(timeoutHandle);
|
clearTimeout(timeoutHandle);
|
||||||
resolve({
|
resolve({
|
||||||
kind: 'Completed',
|
kind: 'Completed',
|
||||||
output: outputBuffer,
|
output: outputBuffer,
|
||||||
exitCode: child.exitCode!,
|
exitCode: child.exitCode!,
|
||||||
runtimeMilliseconds
|
runtimeMilliseconds
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
console.log(`Process terminated, total sandbox time: ${runtimeMilliseconds}ms`);
|
console.log(`Process terminated, total sandbox time: ${runtimeMilliseconds}ms`);
|
||||||
resolve({
|
resolve({
|
||||||
kind: 'TimeLimitExceeded',
|
kind: 'TimeLimitExceeded',
|
||||||
output: outputBuffer,
|
output: outputBuffer,
|
||||||
resultKindReason: `Timeout after ${timeoutSeconds} seconds`
|
resultKindReason: `Timeout after ${timeoutSeconds} seconds`
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
let timeoutHandle = setTimeout(() => {
|
let timeoutHandle = setTimeout(() => {
|
||||||
if (completedNormally) {
|
if (completedNormally) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log(`Run timed out after ${timeoutSeconds} seconds, killing process...`);
|
console.log(`Run timed out after ${timeoutSeconds} seconds, killing process...`);
|
||||||
timeLimitExceeded = true;
|
timeLimitExceeded = true;
|
||||||
|
|
||||||
child.stdin.end();
|
child.stdin.end();
|
||||||
child.stdin.destroy();
|
child.stdin.destroy();
|
||||||
child.stdout.destroy();
|
child.stdout.destroy();
|
||||||
child.stderr.destroy();
|
child.stderr.destroy();
|
||||||
|
if (child.pid !== undefined) {
|
||||||
|
kill(child.pid);
|
||||||
|
}
|
||||||
|
}, timeoutSeconds * 1000);
|
||||||
|
}),
|
||||||
|
killFunc() {
|
||||||
if (child.pid !== undefined) {
|
if (child.pid !== undefined) {
|
||||||
kill(child.pid);
|
if (!completedNormally && !timeLimitExceeded) {
|
||||||
}
|
kill(child.pid);
|
||||||
}, timeoutSeconds * 1000);
|
params.outputCallback?.('\n[Manually stopped]');
|
||||||
}),
|
}
|
||||||
killFunc() {
|
|
||||||
if (child.pid !== undefined) {
|
|
||||||
if (!completedNormally && !timeLimitExceeded) {
|
|
||||||
kill(child.pid);
|
|
||||||
params.outputCallback?.('\n[Manually stopped]');
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
};
|
} catch (error) {
|
||||||
|
return { success: false, runResult: { kind: 'RunError' } };
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
@ -35,73 +35,77 @@ export const runJava: IRunner<IRunnerParamsJava> = async function (
|
|||||||
console.log(`- RUN: ${params.mainClass}`);
|
console.log(`- RUN: ${params.mainClass}`);
|
||||||
const runCommand = `java -cp "${join(params.srcDir, 'build')}" ${params.mainClass}`;
|
const runCommand = `java -cp "${join(params.srcDir, 'build')}" ${params.mainClass}`;
|
||||||
|
|
||||||
let outputBuffer = '';
|
try {
|
||||||
const child = spawn(runCommand, { shell: true });
|
let outputBuffer = '';
|
||||||
child.stdout.setEncoding('utf8');
|
const child = spawn(runCommand, { shell: true });
|
||||||
child.stdout.on('data', (data) => {
|
child.stdout.setEncoding('utf8');
|
||||||
outputBuffer += data.toString();
|
child.stdout.on('data', (data) => {
|
||||||
});
|
outputBuffer += data.toString();
|
||||||
child.stderr.setEncoding('utf8');
|
});
|
||||||
child.stderr.on('data', (data) => {
|
child.stderr.setEncoding('utf8');
|
||||||
outputBuffer += data.toString();
|
child.stderr.on('data', (data) => {
|
||||||
});
|
outputBuffer += data.toString();
|
||||||
|
});
|
||||||
|
|
||||||
let runStartTime = performance.now();
|
let runStartTime = performance.now();
|
||||||
child.stdin.write(params.input);
|
child.stdin.write(params.input);
|
||||||
child.stdin.end();
|
child.stdin.end();
|
||||||
|
|
||||||
let timeLimitExceeded = false;
|
let timeLimitExceeded = false;
|
||||||
let completedNormally = false;
|
let completedNormally = false;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
success: true,
|
success: true,
|
||||||
runResult: new Promise<RunResult>(async (resolve) => {
|
runResult: new Promise<RunResult>(async (resolve) => {
|
||||||
child.on('close', () => {
|
child.on('close', () => {
|
||||||
completedNormally = !timeLimitExceeded;
|
completedNormally = !timeLimitExceeded;
|
||||||
|
|
||||||
let runEndTime = performance.now();
|
let runEndTime = performance.now();
|
||||||
const runtimeMilliseconds = Math.floor(runEndTime - runStartTime);
|
const runtimeMilliseconds = Math.floor(runEndTime - runStartTime);
|
||||||
|
|
||||||
if (completedNormally) {
|
if (completedNormally) {
|
||||||
clearTimeout(timeoutHandle);
|
clearTimeout(timeoutHandle);
|
||||||
resolve({
|
resolve({
|
||||||
kind: 'Completed',
|
kind: 'Completed',
|
||||||
output: outputBuffer,
|
output: outputBuffer,
|
||||||
exitCode: child.exitCode!,
|
exitCode: child.exitCode!,
|
||||||
runtimeMilliseconds
|
runtimeMilliseconds
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
console.log(`Process terminated, total sandbox time: ${runtimeMilliseconds}ms`);
|
console.log(`Process terminated, total sandbox time: ${runtimeMilliseconds}ms`);
|
||||||
resolve({
|
resolve({
|
||||||
kind: 'TimeLimitExceeded',
|
kind: 'TimeLimitExceeded',
|
||||||
output: outputBuffer,
|
output: outputBuffer,
|
||||||
resultKindReason: `Timeout after ${timeoutSeconds} seconds`
|
resultKindReason: `Timeout after ${timeoutSeconds} seconds`
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
let timeoutHandle = setTimeout(() => {
|
let timeoutHandle = setTimeout(() => {
|
||||||
if (completedNormally) {
|
if (completedNormally) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log(`Run timed out after ${timeoutSeconds} seconds, killing process...`);
|
console.log(`Run timed out after ${timeoutSeconds} seconds, killing process...`);
|
||||||
timeLimitExceeded = true;
|
timeLimitExceeded = true;
|
||||||
|
|
||||||
child.stdin.end();
|
child.stdin.end();
|
||||||
child.stdin.destroy();
|
child.stdin.destroy();
|
||||||
child.stdout.destroy();
|
child.stdout.destroy();
|
||||||
child.stderr.destroy();
|
child.stderr.destroy();
|
||||||
child.kill('SIGKILL');
|
child.kill('SIGKILL');
|
||||||
}, timeoutSeconds * 1000);
|
}, timeoutSeconds * 1000);
|
||||||
}),
|
}),
|
||||||
killFunc() {
|
killFunc() {
|
||||||
if (child.pid !== undefined) {
|
if (child.pid !== undefined) {
|
||||||
if (!completedNormally && !timeLimitExceeded) {
|
if (!completedNormally && !timeLimitExceeded) {
|
||||||
kill(child.pid);
|
kill(child.pid);
|
||||||
params.outputCallback?.('\n[Manually stopped]');
|
params.outputCallback?.('\n[Manually stopped]');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
};
|
} catch (error) {
|
||||||
|
return { success: false, runResult: { kind: 'RunError' } };
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user