@freestyle-sh/with-java 0.2.1 → 0.2.2

package/dist/index.d.ts

@@ -4,6 +4,9 @@ import { VmRunCodeInstance, JSONValue, RunCodeResponse, VmRunCode } from '@frees
 declare class VmJavaInstance extends VmWithInstance implements VmRunCodeInstance {
     runCode<Result extends JSONValue = any>(args: string | {
         code: string;
+        argv?: string[];
+        env?: Record<string, string>;
+        workdir?: string;
     }): Promise<RunCodeResponse<Result>>;
 }
 declare class VmJava extends VmWith<VmJavaInstance> implements VmRunCode<VmRunCodeInstance> {

package/dist/index.js

@@ -2,17 +2,27 @@ import { VmWithInstance, VmWith, VmSpec } from 'freestyle-sandboxes';
 
 class VmJavaInstance extends VmWithInstance {
   async runCode(args) {
-    const code = typeof args === "string" ? args : args.code;
+    const options = typeof args === "string" ? { code: args } : args;
+    const { code, argv, env, workdir } = options;
+    const shellEscape = (value) => `'${value.replace(/'/g, "'\\''")}'`;
+    const argvArgs = argv?.map(shellEscape).join(" ");
+    const envPrefix = env ? `${Object.entries(env).map(([key, value]) => `${key}=${shellEscape(value)}`).join(" ")} ` : "";
+    const cdPrefix = workdir ? `cd ${shellEscape(workdir)} && ` : "";
+    const command = `${cdPrefix}${envPrefix}java -cp /tmp -c "${code.replace(/"/g, '\\"')}"${argvArgs ? ` -- ${argvArgs}` : ""}`;
     const result = await this.vm.exec({
-      command: `java -cp /tmp -c "${code.replace(/"/g, '\\"')}"`
+      command
     });
     let parsedResult = void 0;
     if (result.stdout) {
-      try {
-        parsedResult = JSON.parse(result.stdout);
-      } catch (e) {
-        if (result.stderr) {
-          `Failed to parse JSON output. Stderr: ${result.stderr}`;
+      const lines = result.stdout.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0);
+      const lastLine = lines[lines.length - 1];
+      if (lastLine) {
+        try {
+          parsedResult = JSON.parse(lastLine);
+        } catch (e) {
+          if (result.stderr) {
+            `Failed to parse JSON output. Stderr: ${result.stderr}`;
+          }
         }
       }
     }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@freestyle-sh/with-java",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "private": false,
   "dependencies": {
     "freestyle-sandboxes": "^0.1.8",
-    "@freestyle-sh/with-type-run-code": "^0.2.1"
+    "@freestyle-sh/with-type-run-code": "^0.2.2"
   },
   "type": "module",
   "main": "./dist/index.js",