Massbug/judge4c
2
0
Fork 0
mirror of https://github.com/massbug/judge4c.git synced 2025-05-18 07:16:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(judge): ensure container remains running and capture stderr separately

Browse Source
This commit is contained in:
cfngc4594 2025-03-01 21:07:06 +08:00
parent 83deae7a02
commit 38038dc7b1
1 changed files with 62 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/app/actions/judge.ts
View File

@ -2,7 +2,7 @@
import tar from "tar-stream";
import Docker from "dockerode";
import { Readable } from "stream";
import { Readable, Writable } from "stream";
import { LanguageConfigs } from "@/config/judge";
const docker = new Docker({ socketPath: "/var/run/docker.sock" });
@ -20,7 +20,7 @@ async function prepareEnvironment(image: string, tag: string) {
async function createContainer(image: string, tag: string, workingDir: string) {
const container = await docker.createContainer({
Image: `${image}:${tag}`,
Tty: true,
Cmd: ["tail", "-f", "/dev/null"],
WorkingDir: workingDir,
});
@ -51,9 +51,36 @@ async function compileCode(container: Docker.Container, filePath: string, fileNa
return reject(new Error("Stream is undefined"));
}
let data = "";
stream.on("data", (chunk) => (data += chunk.toString()));
stream.on("end", () => resolve(data));
let stdoutChunks: string[] = [];
let stderrChunks: string[] = [];
const stdoutStream = new Writable({
write(chunk, encoding, callback) {
stdoutChunks.push(chunk.toString());
callback();
}
});
const stderrStream = new Writable({
write(chunk, encoding, callback) {
stderrChunks.push(chunk.toString());
callback();
}
});
docker.modem.demuxStream(stream, stdoutStream, stderrStream);
stream.on("end", () => {
const stdout = stdoutChunks.join("");
const stderr = stderrChunks.join("");
if (stderr) {
resolve(stdout + stderr);
} else {
resolve(stdout);
}
});
stream.on("error", (error) => reject(error));
});
});
@ -75,9 +102,35 @@ async function runCode(container: Docker.Container, fileName: string) {
return reject(new Error("Stream is undefined"));
}
let data = "";
stream.on("data", (chunk) => (data += chunk.toString()));
stream.on("end", () => resolve(data));
let stdoutChunks: string[] = [];
let stderrChunks: string[] = [];
const stdoutStream = new Writable({
write(chunk, encoding, callback) {
stdoutChunks.push(chunk.toString());
callback();
}
});
const stderrStream = new Writable({
write(chunk, encoding, callback) {
stderrChunks.push(chunk.toString());
callback();
}
});
docker.modem.demuxStream(stream, stdoutStream, stderrStream);
stream.on("end", () => {
const stdout = stdoutChunks.join("");
const stderr = stderrChunks.join("");
if (stderr) {
resolve(stdout + stderr);
} else {
resolve(stdout);
}
});
stream.on("error", (error) => reject(error));
});
});
@ -116,7 +169,7 @@ export async function judge(language: string, value: string) {
throw error;
} finally {
if (container) {
cleanupContainer(container).catch(() => {});
cleanupContainer(container).catch(() => { });
}
}
}