fix: fix a bug that program couldn't print exception properly

async3619 · Oct 4, 2022 · 8d32434 · 8d32434
1 parent 2845ce7
commit 8d32434
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/utils/runChallenge.ts b/src/utils/runChallenge.ts
@@ -33,14 +33,18 @@ async function runTestCase(
 ) {
     try {
         const data = await transpileAndRun(input, output, targetPath, provider);
+        if (data instanceof Error) {
+            throw data;
+        }
+
         if (data[0] !== output) {
             throw new TestCaseFailedError(index, data);
         }
     } catch (e) {
         if (e instanceof TestCaseFailedError) {
             throw e;
         } else if (e instanceof Error) {
-            throw new TestCaseFailedError(index, (e as any).stderr || e.message, "Test case failed with an error");
+            throw new TestCaseFailedError(index, [(e as any).stderr || e.stack, ""], "Test case failed with an error");
         }
     }
 }

diff --git a/src/utils/transpileAndRun.ts b/src/utils/transpileAndRun.ts
@@ -2,6 +2,7 @@ import * as fs from "fs-extra";
 import * as esbuild from "esbuild";
 import { NodeVM } from "vm2";
 
+import logger from "../logger";
 import { InputType } from "../types";
 import { BaseProvider } from "../providers/base";
 
@@ -12,7 +13,7 @@ export async function transpileAndRun(
     output: string,
     targetPath: string,
     provider: BaseProvider,
-): Promise<[string, string]> {
+): Promise<[string, string] | Error> {
     let fileContent = await fs.readFile(targetPath).then(res => res.toString());
     fileContent = provider.beforeExecute(fileContent, input);
 
@@ -51,7 +52,17 @@ export async function transpileAndRun(
     vm.on("console.warn", handleConsoleMessage(outputBuffer));
     vm.on("console.error", handleConsoleMessage(outputBuffer));
     vm.on("console.debug", handleConsoleMessage(debugBuffer));
-    vm.run(transpiledContent.code);
+
+    try {
+        vm.run(transpiledContent.code);
+    } catch (e) {
+        if (!(e instanceof Error)) {
+            logger.error("fatal error: " + e);
+            process.exit();
+        }
+
+        return e;
+    }
 
     return [outputBuffer.join("\n").replace(/\r\n/g, "\n"), debugBuffer.join("\n").replace(/\r\n/g, "\n")];
 }