chore: re-enable the wasi build (#193)

---------

Co-authored-by: Boshen <[email protected]>

Author: Brooooooklyn

.github/workflows/ci.yml

@@ -66,7 +66,6 @@ jobs:
           cargo check --target wasm32-unknown-unknown
 
   wasi:
-    if: false # LinkError: WebAssembly.Instance(): Import #68 module="env" function="uv_default_loop" error: function import requires a callable
     name: Test wasi target
     runs-on: ubuntu-latest
     steps:

.github/workflows/release-napi.yml

@@ -77,8 +77,8 @@ jobs:
           - os: macos-latest
             target: aarch64-apple-darwin
 
-          # - os: ubuntu-latest
-            # target: wasm32-wasip1-threads
+          - os: ubuntu-latest
+            target: wasm32-wasip1-threads
 
     name: Package ${{ matrix.target }}
     runs-on: ${{ matrix.os }}
@@ -93,7 +93,7 @@ jobs:
       - uses: goto-bus-stop/setup-zig@v2
         if: ${{ contains(matrix.target, 'musl') }}
         with:
-          version: 0.11.0
+          version: 0.13.0
 
       - name: Build with zig cross
         if: ${{ contains(matrix.target, 'musl') }}

Cargo.lock

@@ -12,8 +12,8 @@ doctest    = false
 
 [dependencies]
 oxc_resolver = { path = ".." }
-napi         = { version = "2.16.6", default-features = false, features = ["napi3", "serde-json", "async"] }
-napi-derive  = { version = "2.16.5" }
+napi         = { version = "2.16.7", default-features = false, features = ["napi3", "serde-json", "async"] }
+napi-derive  = { version = "2.16.6" }
 tokio        = "1.38.0"
 
 [build-dependencies]

napi/Cargo.toml

@@ -2,27 +2,26 @@ import {
   instantiateNapiModuleSync as __emnapiInstantiateNapiModuleSync,
   getDefaultContext as __emnapiGetDefaultContext,
   WASI as __WASI,
+  createOnMessage as __wasmCreateOnMessageForFsProxy,
 } from '@napi-rs/wasm-runtime'
-import { Volume as __Volume, createFsFromVolume as __createFsFromVolume } from '@napi-rs/wasm-runtime/fs'
-
+import { memfs } from '@napi-rs/wasm-runtime/fs'
 import __wasmUrl from './resolver.wasm32-wasi.wasm?url'
 
-const __fs = __createFsFromVolume(
-  __Volume.fromJSON({
-    '/': null,
-  }),
-)
+export const { fs: __fs, vol: __volume } = memfs()
 
 const __wasi = new __WASI({
   version: 'preview1',
   fs: __fs,
+  preopens: {
+    '/': '/',
+  }
 })
 
 const __emnapiContext = __emnapiGetDefaultContext()
 
 const __sharedMemory = new WebAssembly.Memory({
-  initial: 1024,
-  maximum: 10240,
+  initial: 4000,
+  maximum: 65536,
   shared: true,
 })
 
@@ -37,9 +36,13 @@ const {
   asyncWorkPoolSize: 4,
   wasi: __wasi,
   onCreateWorker() {
-    return new Worker(new URL('./wasi-worker-browser.mjs', import.meta.url), {
+    const worker = new Worker(new URL('./wasi-worker-browser.mjs', import.meta.url), {
       type: 'module',
     })
+    
+    worker.addEventListener('message', __wasmCreateOnMessageForFsProxy(__fs))
+
+    return worker
   },
   overwriteImports(importObject) {
     importObject.env = {
@@ -63,7 +66,7 @@ function __napi_rs_initialize_modules(__napiInstance) {
   __napiInstance.exports['__napi_register__ResolveResult_struct_4']?.()
   __napiInstance.exports['__napi_register__sync_5']?.()
   __napiInstance.exports['__napi_register__ResolverFactory_struct_6']?.()
-  __napiInstance.exports['__napi_register__ResolverFactory_impl_12']?.()
+  __napiInstance.exports['__napi_register__ResolverFactory_impl_13']?.()
 }
 export const ResolverFactory = __napiModule.exports.ResolverFactory
 export const EnforceExtension = __napiModule.exports.EnforceExtension

napi/resolver.wasi-browser.js

@@ -3,35 +3,41 @@
 
 /* auto-generated by NAPI-RS */
 
-const __nodeFs= require('node:fs')
+const __nodeFs = require('node:fs')
 const __nodePath = require('node:path')
 const { WASI: __nodeWASI } = require('node:wasi')
 const { Worker } = require('node:worker_threads')
 
 const {
   instantiateNapiModuleSync: __emnapiInstantiateNapiModuleSync,
   getDefaultContext: __emnapiGetDefaultContext,
+  createOnMessage: __wasmCreateOnMessageForFsProxy,
 } = require('@napi-rs/wasm-runtime')
 
+const __rootDir = __nodePath.parse(process.cwd()).root
+
 const __wasi = new __nodeWASI({
   version: 'preview1',
   env: process.env,
   preopens: {
-    '/': '/'
+    [__rootDir]: __rootDir,
   }
 })
 
 const __emnapiContext = __emnapiGetDefaultContext()
 
 const __sharedMemory = new WebAssembly.Memory({
-  initial: 1024,
-  maximum: 10240,
+  initial: 4000,
+  maximum: 65536,
   shared: true,
 })
 
 let __wasmFilePath = __nodePath.join(__dirname, 'resolver.wasm32-wasi.wasm')
+const __wasmDebugFilePath = __nodePath.join(__dirname, 'resolver.wasm32-wasi.debug.wasm')
 
-if (!__nodeFs.existsSync(__wasmFilePath)) {
+if (__nodeFs.existsSync(__wasmDebugFilePath)) {
+  __wasmFilePath = __wasmDebugFilePath
+} else if (!__nodeFs.existsSync(__wasmFilePath)) {
   try {
     __wasmFilePath = __nodePath.resolve('@oxc-resolver/binding-wasm32-wasi')
   } catch {
@@ -52,10 +58,14 @@ const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule
   })(),
   wasi: __wasi,
   onCreateWorker() {
-    return new Worker(__nodePath.join(__dirname, 'wasi-worker.mjs'), {
+    const worker = new Worker(__nodePath.join(__dirname, 'wasi-worker.mjs'), {
       env: process.env,
       execArgv: ['--experimental-wasi-unstable-preview1'],
     })
+    worker.onmessage = ({ data }) => {
+      __wasmCreateOnMessageForFsProxy(__nodeFs)(data)
+    }
+    return worker
   },
   overwriteImports(importObject) {
     importObject.env = {
@@ -79,7 +89,7 @@ function __napi_rs_initialize_modules(__napiInstance) {
   __napiInstance.exports['__napi_register__ResolveResult_struct_4']?.()
   __napiInstance.exports['__napi_register__sync_5']?.()
   __napiInstance.exports['__napi_register__ResolverFactory_struct_6']?.()
-  __napiInstance.exports['__napi_register__ResolverFactory_impl_12']?.()
+  __napiInstance.exports['__napi_register__ResolverFactory_impl_13']?.()
 }
 module.exports.ResolverFactory = __napiModule.exports.ResolverFactory
 module.exports.EnforceExtension = __napiModule.exports.EnforceExtension

napi/resolver.wasi.cjs

@@ -1,16 +1,15 @@
-import { instantiateNapiModuleSync, MessageHandler, WASI } from '@napi-rs/wasm-runtime'
-import { Volume, createFsFromVolume } from '@napi-rs/wasm-runtime/fs'
+import { instantiateNapiModuleSync, MessageHandler, WASI, createFsProxy } from '@napi-rs/wasm-runtime'
+import { memfsExported as __memfsExported } from '@napi-rs/wasm-runtime/fs'
 
-const fs = createFsFromVolume(
-  Volume.fromJSON({
-    '/': null,
-  }),
-)
+const fs = createFsProxy(__memfsExported)
 
 const handler = new MessageHandler({
   onLoad({ wasmModule, wasmMemory }) {
     const wasi = new WASI({
       fs,
+      preopens: {
+        '/': '/',
+      },
       print: function () {
         // eslint-disable-next-line no-console
         console.log.apply(console, arguments)

napi/wasi-worker-browser.mjs

@@ -1,11 +1,13 @@
 import fs from "node:fs";
 import { createRequire } from "node:module";
+import { parse } from "node:path";
+import { WASI } from "node:wasi";
 import { parentPort, Worker } from "node:worker_threads";
 
-import { instantiateNapiModuleSync, MessageHandler, WASI } from "@napi-rs/wasm-runtime";
-
 const require = createRequire(import.meta.url);
 
+const { instantiateNapiModuleSync, MessageHandler, getDefaultContext } = require("@napi-rs/wasm-runtime");
+
 if (parentPort) {
   parentPort.on("message", (data) => {
     globalThis.onmessage({ data });
@@ -26,13 +28,24 @@ Object.assign(globalThis, {
   },
 });
 
+const emnapiContext = getDefaultContext();
+
+const __rootDir = parse(process.cwd()).root;
+
 const handler = new MessageHandler({
   onLoad({ wasmModule, wasmMemory }) {
-    const wasi = new WASI({ fs });
+    const wasi = new WASI({
+      version: 'preview1',
+      env: process.env,
+      preopens: {
+        [__rootDir]: __rootDir,
+      },
+    });
 
     return instantiateNapiModuleSync(wasmModule, {
       childThread: true,
       wasi,
+      context: emnapiContext,
       overwriteImports(importObject) {
         importObject.env = {
           ...importObject.env,

napi/wasi-worker.mjs

@@ -22,6 +22,11 @@
   "napi": {
     "binaryName": "resolver",
     "packageName": "@oxc-resolver/binding",
+    "wasm": {
+      "browser": {
+        "fs": true
+      }
+    },
     "targets": [
       "x86_64-pc-windows-msvc",
       "aarch64-pc-windows-msvc",