Support separate WASM/JS files and remove use of callMain (#44)

* Support separate WASM/JS files and remove use of callMain

* Don't use curly braces in copy commands on github runners

demo/package.json

@@ -9,7 +9,7 @@
     "private": true,
     "scripts": {
         "build": "npm run build:wasm && rspack build",
-        "build:wasm": "cp node_modules/@jupyterlite/cockle/src/wasm/*.js assets/",
+        "build:wasm": "cp node_modules/@jupyterlite/cockle/src/wasm/*.js assets/ && cp node_modules/@jupyterlite/cockle/src/wasm/*.wasm assets/",
         "serve": "rspack serve"
     },
     "devDependencies": {

package.json

@@ -13,14 +13,14 @@
         "url": "https://github.com/jupyterlite/cockle/issues"
     },
     "files": [
-        "lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}",
+        "lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,wasm,woff2,ttf}",
         "src/**/*.ts"
     ],
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "scripts": {
         "fetch:wasm:create-env": "micromamba create -p $(pwd)/cockle_wasm_env -y cockle_fs grep coreutils --platform=emscripten-wasm32 -c https://repo.mamba.pm/emscripten-forge -c https://repo.mamba.pm/conda-forge",
-        "fetch:wasm:copy": "mkdir -p src/wasm && cp -r $(pwd)/cockle_wasm_env/bin/*.js src/wasm",
+        "fetch:wasm:copy": "mkdir -p src/wasm && cp $(pwd)/cockle_wasm_env/bin/*.js src/wasm/ && cp $(pwd)/cockle_wasm_env/bin/*.wasm src/wasm/",
         "fetch:wasm": "npm run fetch:wasm:create-env && npm run fetch:wasm:copy",
         "build": "tsc",
         "eslint": "npm run eslint:check -- --fix",
@@ -53,6 +53,7 @@
         "dist",
         "coverage",
         "**/*.d.ts",
+        "**/*.wasm",
         "**/package-lock.json"
     ],
     "eslintConfig": {

src/commands/wasm_command_runner.ts

@@ -1,6 +1,6 @@
 import { ICommandRunner } from './command_runner';
 import { Context } from '../context';
-import { RunCommandError } from '../error_exit_code';
+import { ExitCode } from '../exit_code';
 import { WasmLoader } from '../wasm_loader';
 
 export abstract class WasmCommandRunner implements ICommandRunner {
@@ -36,11 +36,18 @@ export abstract class WasmCommandRunner implements ICommandRunner {
       ];
     }
 
+    let exitCode: number | undefined;
+
     const wasm = await wasmModule({
       thisProgram: cmdName,
-      noInitialRun: true,
+      arguments: args,
       print: (text: string) => stdout.write(`${text}\n`),
       printErr: (text: string) => stderr.write(`${text}\n`),
+      quit: (moduleExitCode: number, toThrow: any) => {
+        if (exitCode === undefined) {
+          exitCode = moduleExitCode;
+        }
+      },
       preRun: (module: any) => {
         if (Object.prototype.hasOwnProperty.call(module, 'FS')) {
           // Use PROXYFS so that command sees the shared FS.
@@ -66,30 +73,24 @@ export abstract class WasmCommandRunner implements ICommandRunner {
         }
       }
     });
-    const loaded = Date.now();
-
-    if (!Object.prototype.hasOwnProperty.call(wasm, 'callMain')) {
-      throw new RunCommandError(
-        cmdName,
-        "WASM module does not export 'callMain' so it cannot be called"
-      );
-    }
 
-    const exitCode = wasm.callMain(args);
-
-    if (Object.prototype.hasOwnProperty.call(wasm, 'FS')) {
-      const FS = wasm.FS;
-      FS.close(FS.streams[1]);
-      FS.close(FS.streams[2]);
-    }
+    if (exitCode === undefined) {
+      exitCode = ExitCode.CANNOT_RUN_COMMAND;
+    } else {
+      if (Object.prototype.hasOwnProperty.call(wasm, 'FS')) {
+        const FS = wasm.FS;
+        FS.close(FS.streams[1]);
+        FS.close(FS.streams[2]);
+      }
 
-    if (Object.prototype.hasOwnProperty.call(wasm, 'getEnvStrings')) {
-      // Copy environment variables back from command.
-      context.environment.copyFromCommand(wasm.getEnvStrings());
+      if (Object.prototype.hasOwnProperty.call(wasm, 'getEnvStrings')) {
+        // Copy environment variables back from command.
+        context.environment.copyFromCommand(wasm.getEnvStrings());
+      }
     }
 
     const end = Date.now();
-    console.log(`${cmdName} load time ${loaded - start} ms, run time ${end - loaded} ms`);
+    console.log(`${cmdName} load and run time ${end - start} ms`);
     return exitCode;
   }
 }

src/error_exit_code.ts

@@ -26,9 +26,3 @@ export class ImproperUseError extends ErrorExitCode {
     super(ExitCode.IMPROPER_USE, message);
   }
 }
-
-export class RunCommandError extends ErrorExitCode {
-  constructor(commandName: string, message: string) {
-    super(ExitCode.CANNOT_RUN_COMMAND, `'${commandName}': ${message}`);
-  }
-}

src/shell_impl.ts

@@ -69,7 +69,6 @@ export class ShellImpl implements IShell {
     } else if (code === 27) {
       // Escape following by 1+ more characters
       const remainder = char.slice(1);
-      console.log('Escape code', char);
       if (
         remainder === '[A' || // Up arrow
         remainder === '[1A' ||

test/package.json

@@ -9,7 +9,7 @@
     "private": true,
     "scripts": {
         "build": "npm run build:wasm && rspack build",
-        "build:wasm": "cp node_modules/@jupyterlite/cockle/src/wasm/*.js assets",
+        "build:wasm": "cp node_modules/@jupyterlite/cockle/src/wasm/*.js assets/ && cp node_modules/@jupyterlite/cockle/src/wasm/*.wasm assets/",
         "serve": "rspack serve",
         "test": "playwright test",
         "test:ui": "playwright test --ui",

test/playwright.config.ts

@@ -2,10 +2,9 @@ import { defineConfig, devices } from '@playwright/test';
 
 export default defineConfig({
   testDir: './tests',
-  fullyParallel: true,
   forbidOnly: !!process.env.CI,
   retries: process.env.CI ? 2 : 0,
-  workers: process.env.CI ? 1 : undefined,
+  workers: 1,
   reporter: [['html', { open: 'never' }]],
   use: {
     baseURL: 'http://localhost:8000',

test/rspack.config.js

@@ -17,7 +17,7 @@ module.exports = {
     ]
   },
   resolve: {
-    extensions: ['.tsx', '.ts', '.js']
+    extensions: ['.tsx', '.ts', '.js', '.wasm']
   },
   output: {
     filename: 'bundle.js',

test/serve/shell_setup.ts

@@ -34,6 +34,7 @@ async function _shell_setup_common(options: IOptions, level: number): Promise<IS
   const shell = new Shell({
     color: options.color ?? false,
     outputCallback: output.callback,
+    wasmBaseUrl: 'http://localhost:8000/',
     initialDirectories,
     initialFiles
   });