Fix for base fs in headless mode (#259)

* Fix for base fs in headless mode

* Remove js-untar dependency from runtime

package.json

@@ -27,7 +27,8 @@
     "build:deploy": "npm run bootstrap && npm run build",
     "test:client": "cd packages/client && npm run test",
     "test:wasi": "cd packages/wasi && npm run test:prepare && npm run test",
-    "test": "npm run test:client && npm run test:wasi"
+    "test:runtime": "cd packages/runtime && npm run test",
+    "test": "npm run test:client && npm run test:wasi && npm run test:runtime"
   },
   "eslintConfig": {
     "extends": "preact",

packages/client/package.json

@@ -26,7 +26,7 @@
     "test": "npm run test:playwright"
   },
   "devDependencies": {
-    "@playwright/test": "^1.35.0",
+    "@playwright/test": "^1.37.1",
     "@types/url-safe-base64": "^1.1.0",
     "eslint": "^8.2.0",
     "typescript": "^5.1.6",

packages/runtime/.gitignore

@@ -2,4 +2,7 @@ node_modules
 .DS_Store
 dist
 dist-ssr
-*.local
+*.local
+/test-results/
+/playwright-report/
+/playwright/.cache/

packages/runtime/lib/headless.ts

@@ -5,7 +5,7 @@ import {
   commandsForRuntime,
   getBinaryPathFromCommand,
 } from "./commands";
-import { fetchWASIFS } from "./helpers";
+import { fetchWASIFS, makeRunnoError } from "./helpers";
 
 export async function headlessRunCode(
   runtime: Runtime,
@@ -35,12 +35,32 @@ export async function headlessRunFS(
 ): Promise<RunResult> {
   const commands = commandsForRuntime(runtime, entryPath);
 
-  const prepare = await headlessPrepareFS(commands.prepare ?? [], fs);
-  fs = prepare.fs;
+  let prepare: CompleteResult;
+  try {
+    prepare = await headlessPrepareFS(commands.prepare ?? [], fs);
+    fs = prepare.fs;
+  } catch (e) {
+    return {
+      resultType: "crash",
+      error: makeRunnoError(e),
+    };
+  }
 
   const { run } = commands;
   const binaryPath = getBinaryPathFromCommand(run, fs);
 
+  if (run.baseFSURL) {
+    try {
+      const baseFS = await fetchWASIFS(run.baseFSURL);
+      fs = { ...fs, ...baseFS };
+    } catch (e) {
+      return {
+        resultType: "crash",
+        error: makeRunnoError(e),
+      };
+    }
+  }
+
   const workerHost = new WASIWorkerHost(binaryPath, {
     args: [run.binaryName, ...(run.args ?? [])],
     env: run.env,
@@ -61,7 +81,7 @@ export async function headlessRunFS(
 
   const result = await workerHost.start();
 
-  prepare.fs = { ...prepare.fs, ...result.fs };
+  prepare.fs = { ...fs, ...result.fs };
   prepare.exitCode = result.exitCode;
 
   return prepare;
@@ -129,9 +149,6 @@ export async function headlessPrepareFS(
     prepare.exitCode = result.exitCode;
 
     if (result.exitCode !== 0) {
-      // TODO: Remove this
-      console.error("Prepare failed", prepare);
-
       // If a prepare step fails then we stop.
       throw new PrepareError(
         "Prepare step returned a non-zero exit code",

packages/runtime/lib/helpers.ts

@@ -1,4 +1,3 @@
-import { WASIFS } from "@runno/wasi";
 import { extractTarGz } from "./tar";
 
 export function stripWhitespace(text: string): string {
@@ -62,23 +61,7 @@ export function elementCodeContent(element: HTMLElement): string {
 export async function fetchWASIFS(fsURL: string) {
   const response = await fetch(fsURL);
   const buffer = await response.arrayBuffer();
-  const files = await extractTarGz(new Uint8Array(buffer));
-
-  const fs: WASIFS = {};
-  for (const file of files) {
-    fs[file.name] = {
-      path: file.name,
-      timestamps: {
-        change: new Date(file.lastModified),
-        access: new Date(file.lastModified),
-        modification: new Date(file.lastModified),
-      },
-      mode: "binary",
-      content: new Uint8Array(await file.arrayBuffer()),
-    };
-  }
-
-  return fs;
+  return await extractTarGz(new Uint8Array(buffer));
 }
 
 export function isErrorObject(

packages/runtime/lib/provider.ts

@@ -102,8 +102,18 @@ export class RunnoProvider implements RuntimeMethods {
     this.terminal.terminal.clear();
 
     if (run.baseFSURL) {
-      const baseFS = await fetchWASIFS(run.baseFSURL);
-      fs = { ...fs, ...baseFS };
+      try {
+        const baseFS = await fetchWASIFS(run.baseFSURL);
+        fs = { ...fs, ...baseFS };
+      } catch (e) {
+        console.error(e);
+        this.terminal.terminal.write(`\nRunno crashed: ${e}\n`);
+
+        return {
+          resultType: "crash",
+          error: makeRunnoError(e),
+        };
+      }
     }
 
     return this.terminal.run(