judge: common analysis

packages/hydrojudge/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@hydrooj/hydrojudge",
     "bin": "bin/hydrojudge.js",
-    "version": "2.15.0",
+    "version": "2.15.1",
     "main": "package.json",
     "author": "undefined <i@undefined.moe>",
     "repository": "https://github.com/hydro-dev/Hydro.git",

packages/hydrojudge/src/judge/default.ts

@@ -82,10 +82,20 @@ function judgeCase(c: Case, sid: string) {
         } else if (status === STATUS.STATUS_RUNTIME_ERROR && code) {
             if (code < 32) message = signals[code];
             else message = { message: 'Your program returned {0}.', params: [code] };
+        }
+        await Promise.all(
+            Object.values(res.fileIds).map((id) => del(id)),
+        ).catch(() => { /* Ignore file doesn't exist */ });
+        if (runner && ctx.rerun && status === STATUS.STATUS_TIME_LIMIT_EXCEEDED) {
+            ctx.rerun--;
+            await runner(ctx, ctxSubtask);
+            return;
+        }
+        if ([STATUS.STATUS_WRONG_ANSWER, STATUS.STATUS_RUNTIME_ERROR].includes(status)) {
             const langConfig = ctx.getLang(ctx.lang);
-            if (langConfig.runtimeErrorAnalysis && !this.runtimeErrorAnalysis) {
-                this.runtimeErrorAnalysis = true;
-                run(langConfig.runtimeErrorAnalysis, {
+            if (langConfig.analysis && !ctx.analysis) {
+                ctx.analysis = true;
+                run(langConfig.analysis, {
                     copyIn: {
                         input: { src: stdin },
                         [langConfig.code_file || 'foo']: { content: ctx.code },
@@ -94,19 +104,12 @@ function judgeCase(c: Case, sid: string) {
                     },
                     time: 5000,
                     memory: 256,
-                })
-                    .then((r) => ctx.next({ compiler_text: r.stdout.toString().substring(0, 1024) }))
-                    .catch((e) => console.error(e));
+                }).then((r) => {
+                    ctx.next({ compiler_text: r.stdout.toString().substring(0, 1024) });
+                    if (process.env.DEV) console.log(r);
+                });
             }
         }
-        await Promise.all(
-            Object.values(res.fileIds).map((id) => del(id)),
-        ).catch(() => { /* Ignore file doesn't exist */ });
-        if (runner && ctx.rerun && status === STATUS.STATUS_TIME_LIMIT_EXCEEDED) {
-            ctx.rerun--;
-            await runner(ctx, ctxSubtask);
-            return;
-        }
         ctxSubtask.score = Score[ctxSubtask.subtask.type](ctxSubtask.score, score);
         ctxSubtask.status = Math.max(ctxSubtask.status, status);
         if (ctxSubtask.status > STATUS.STATUS_ACCEPTED) ctx.failed[sid] = true;

packages/hydrojudge/src/judge/interface.ts

@@ -46,6 +46,7 @@ export interface RuntimeContext {
     queue?: PQueue;
     errored?: boolean;
     rerun?: number;
+    analysis?: boolean;
     failed?: Record<string, boolean>;
 
     execute?: Execute;

packages/hydrojudge/src/judge/run.ts

@@ -79,9 +79,12 @@ export const judge = async (ctx: Context) => {
         status = STATUS.STATUS_RUNTIME_ERROR;
         if (code < 32) message.push(`ExitCode: ${code} (${signals[code]})`);
         else message.push(`ExitCode: ${code}`);
+    }
+    if ([STATUS.STATUS_WRONG_ANSWER, STATUS.STATUS_RUNTIME_ERROR].includes(status)) {
         const langConfig = ctx.getLang(ctx.lang);
-        if (langConfig.runtimeErrorAnalysis) {
-            run(langConfig.runtimeErrorAnalysis, {
+        if (langConfig.analysis) {
+            ctx.analysis = true;
+            run(langConfig.analysis, {
                 copyIn: {
                     input: { src: stdin },
                     [langConfig.code_file || 'foo']: { content: ctx.code },
@@ -90,9 +93,10 @@ export const judge = async (ctx: Context) => {
                 },
                 time: 5000,
                 memory: 256,
-            })
-                .then((r) => ctx.next({ compiler_text: r.stdout.toString().substring(0, 1024) }))
-                .catch((e) => console.error(e));
+            }).then((r) => {
+                ctx.next({ compiler_text: r.stdout.toString().substring(0, 1024) });
+                if (process.env.DEV) console.log(r);
+            });
         }
     }
     message.push(fs.readFileSync(stdout).toString());

packages/hydrojudge/src/sysinfo.ts

@@ -62,9 +62,11 @@ int main(){
     return parseInt(a[a.length - 2], 10);
 }
 
+const stackPromise = stackSize();
+
 export async function get() {
     const info = await _get();
     // @ts-ignore
-    info.stack = await stackSize();
+    info.stack = await stackPromise;
     return info;
 }