@freestyle-sh/with-java 0.2.0 → 0.2.2

package/dist/index.d.ts

@@ -1,9 +1,12 @@
-import { VmWithInstance, VmWith, CreateVmOptions } from 'freestyle-sandboxes';
+import { VmWithInstance, VmWith, VmSpec } from 'freestyle-sandboxes';
 import { VmRunCodeInstance, JSONValue, RunCodeResponse, VmRunCode } from '@freestyle-sh/with-type-run-code';
 
 declare class VmJavaInstance extends VmWithInstance implements VmRunCodeInstance {
-    runCode<Result extends JSONValue = any>({ code, }: {
+    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> {
@@ -11,7 +14,7 @@ declare class VmJava extends VmWith<VmJavaInstance> implements VmRunCode<VmRunCo
     constructor(options?: {
         version: string;
     });
-    configure(existingConfig: CreateVmOptions): CreateVmOptions | Promise<CreateVmOptions>;
+    configureSnapshotSpec(spec: VmSpec): VmSpec;
     createInstance(): VmJavaInstance;
     installServiceName(): string;
 }

package/dist/index.js

@@ -1,19 +1,28 @@
-import { VmWithInstance, VmWith, VmTemplate } from 'freestyle-sandboxes';
+import { VmWithInstance, VmWith, VmSpec } from 'freestyle-sandboxes';
 
 class VmJavaInstance extends VmWithInstance {
-  async runCode({
-    code
-  }) {
+  async runCode(args) {
+    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}`;
+          }
         }
       }
     }
@@ -30,7 +39,7 @@ class VmJava extends VmWith {
     super();
     this.options = options;
   }
-  configure(existingConfig) {
+  configureSnapshotSpec(spec) {
     const installScript = `#!/bin/bash
 set -e
 sudo apt-get update
@@ -42,8 +51,9 @@ echo "deb [signed-by=/usr/share/keyrings/corretto-keyring.gpg] https://apt.corre
 sudo apt-get update
 sudo apt-get install -y java-${this.options.version}-amazon-corretto-jdk libxi6 libxtst6 libxrender1
 `;
-    const javaConfig = {
-      template: new VmTemplate({
+    return this.composeSpecs(
+      spec,
+      new VmSpec({
         additionalFiles: {
           "/opt/install-java.sh": {
             content: installScript
@@ -61,8 +71,7 @@ sudo apt-get install -y java-${this.options.version}-amazon-corretto-jdk libxi6
           ]
         }
       })
-    };
-    return this.compose(existingConfig, javaConfig);
+    );
   }
   createInstance() {
     return new VmJavaInstance();

package/package.json

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