Merge branch 'main' of https://github.com/orosmatthew/bw-hspc-contest-env

sandbox/src/index.ts

@@ -1,7 +1,7 @@
 import dotenv from 'dotenv';
 import fs from 'fs-extra';
 import urlJoin from 'url-join';
-import { string, z } from 'zod';
+import { z } from 'zod';
 import os, { EOL } from 'os';
 import { join } from 'path';
 import { simpleGit, SimpleGit } from 'simple-git';
@@ -11,7 +11,13 @@ import { runCpp } from './run/cpp.js';
 
 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>;
 
 const RunResult = z
@@ -84,12 +90,10 @@ async function cloneAndRun(submissionData: SubmissionGetData) {
 		return;
 	}
 	const tmpDir = os.tmpdir();
-	const buildDir = join(tmpDir, 'bwcontest-build');
-	if (fs.existsSync(buildDir)) {
-		fs.removeSync(buildDir);
+	const repoDir = join(tmpDir, 'bwcontest-src');
+	if (fs.existsSync(repoDir)) {
+		fs.removeSync(repoDir);
 	}
-	fs.mkdirSync(buildDir);
-	const repoDir = join(buildDir, 'src');
 	fs.mkdirSync(repoDir);
 
 	const teamRepoUrl = urlJoin(
@@ -108,7 +112,7 @@ async function cloneAndRun(submissionData: SubmissionGetData) {
 	try {
 		if (submissionData.submission.teamLanguage === 'Java') {
 			let res = await runJava({
-				srcDir: buildDir,
+				srcDir: repoDir,
 				mainFile: join(repoDir, problemName, problemName + '.java'),
 				mainClass: problemName,
 				input: submissionData.submission.problem.realInput

sandbox/src/run/cpp.ts

@@ -4,7 +4,8 @@ import util from 'util';
 import { RunResult, timeoutSeconds } from '../index.js';
 import { IRunner, IRunnerParams, IRunnerReturn } from './types.js';
 import kill from 'tree-kill';
-import * as fs from 'fs';
+import os from 'os';
+import fs from 'fs-extra';
 
 const execPromise = util.promisify(exec);
 
@@ -21,9 +22,16 @@ interface IRunnerParamsCpp extends IRunnerParams {
 export const runCpp: IRunner<IRunnerParamsCpp> = async function (
 	params: IRunnerParamsCpp
 ): IRunnerReturn {
+	const tmpDir = os.tmpdir();
+	const buildDir = join(tmpDir, 'bwcontest-cpp');
+	if (fs.existsSync(buildDir)) {
+		fs.removeSync(buildDir);
+	}
+	fs.mkdirSync(buildDir);
+
 	console.log(`- BUILD: ${params.problemName}`);
 
-	const configureCommand = `cmake -S ${params.srcDir} -B ${join(params.srcDir, 'build')}`;
+	const configureCommand = `cmake -S ${params.srcDir} -B ${buildDir}`;
 	try {
 		await execPromise(configureCommand);
 	} catch (e) {
@@ -35,7 +43,7 @@ export const runCpp: IRunner<IRunnerParamsCpp> = async function (
 		};
 	}
 
-	const compileCommand = `cmake --build ${join(params.srcDir, 'build')} --target ${params.problemName}`;
+	const compileCommand = `cmake --build ${buildDir} --target ${params.problemName}`;
 	try {
 		await execPromise(compileCommand);
 	} catch (e) {
@@ -51,9 +59,9 @@ export const runCpp: IRunner<IRunnerParamsCpp> = async function (
 
 	let runCommand = '';
 	if (params.cppPlatform === 'VisualStudio') {
-		runCommand = `${join(params.srcDir, 'build', 'Debug', `${params.problemName}.exe`)}`;
+		runCommand = `${join(buildDir, 'Debug', `${params.problemName}.exe`)}`;
 	} else {
-		runCommand = `${join(params.srcDir, 'build', params.problemName)}`;
+		runCommand = `${join(buildDir, params.problemName)}`;
 	}
 	try {
 		let outputBuffer = '';

sandbox/src/run/csharp.ts

@@ -14,6 +14,7 @@ export const runCSharp: IRunner = async function (params: {
 	console.log(`- RUN: ${params.srcDir}`);
 	const child = spawn('dotnet run', { shell: true, cwd: params.srcDir });
 
+	try {
 		let outputBuffer = '';
 		child.stdout.setEncoding('utf8');
 		child.stdout.on('data', (data) => {
@@ -86,4 +87,7 @@ export const runCSharp: IRunner = async function (params: {
 				}
 			}
 		};
+	} catch (error) {
+		return { success: false, runResult: { kind: 'RunError' } };
+	}
 };

sandbox/src/run/java.ts

@@ -35,6 +35,7 @@ export const runJava: IRunner<IRunnerParamsJava> = async function (
 	console.log(`- RUN: ${params.mainClass}`);
 	const runCommand = `java -cp "${join(params.srcDir, 'build')}" ${params.mainClass}`;
 
+	try {
 		let outputBuffer = '';
 		const child = spawn(runCommand, { shell: true });
 		child.stdout.setEncoding('utf8');
@@ -104,4 +105,7 @@ export const runJava: IRunner<IRunnerParamsJava> = async function (
 				}
 			}
 		};
+	} catch (error) {
+		return { success: false, runResult: { kind: 'RunError' } };
+	}
 };