fix(*): update wasi bindings (#831)

* fix(*): update wasi bindings * Add architecture
napi-rs · Apr 23, 2024 · 83037ac · 83037ac
1 parent 69e7f80
commit 83037ac
Show file tree

Hide file tree

Showing 44 changed files with 187 additions and 116 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -263,6 +263,7 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
           cache: yarn
+          architecture: x64
 
       - name: Install dependencies
         run: yarn install --immutable --mode=skip-build

diff --git a/package.json b/package.json
@@ -24,8 +24,8 @@
     "postinstall": "husky install"
   },
   "devDependencies": {
-    "@napi-rs/cli": "^3.0.0-alpha.52",
-    "@napi-rs/wasm-runtime": "^0.2.0",
+    "@napi-rs/cli": "^3.0.0-alpha.53",
+    "@napi-rs/wasm-runtime": "^0.2.3",
     "@swc-node/core": "^1.13.0",
     "@swc-node/register": "^1.9.0",
     "@swc/core": "^1.4.16",

diff --git a/packages/argon2/argon2.wasi-browser.js b/packages/argon2/argon2.wasi-browser.js
@@ -2,6 +2,7 @@ import {
   instantiateNapiModuleSync as __emnapiInstantiateNapiModuleSync,
   getDefaultContext as __emnapiGetDefaultContext,
   WASI as __WASI,
+  createOnMessage as __wasmCreateOnMessageForFsProxy,
 } from '@napi-rs/wasm-runtime'
 
 import __wasmUrl from './argon2.wasm32-wasi.wasm?url'
@@ -29,9 +30,11 @@ 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',
     })
+
+    return worker
   },
   overwriteImports(importObject) {
     importObject.env = {

diff --git a/packages/argon2/argon2.wasi.cjs b/packages/argon2/argon2.wasi.cjs
@@ -3,14 +3,15 @@
 
 /* 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
@@ -57,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 = {

diff --git a/packages/argon2/npm/wasm32-wasi/package.json b/packages/argon2/npm/wasm32-wasi/package.json
@@ -39,6 +39,6 @@
   },
   "browser": "argon2.wasi-browser.js",
   "dependencies": {
-    "@napi-rs/wasm-runtime": "^0.2.0"
+    "@napi-rs/wasm-runtime": "^0.2.3"
   }
 }
diff --git a/packages/argon2/package.json b/packages/argon2/package.json
@@ -62,7 +62,7 @@
     "version": "napi version && git add npm"
   },
   "devDependencies": {
-    "@napi-rs/cli": "^3.0.0-alpha.52",
+    "@napi-rs/cli": "^3.0.0-alpha.53",
     "argon2": "^0.40.1",
     "cross-env": "^7.0.3"
   }

diff --git a/packages/argon2/wasi-worker-browser.mjs b/packages/argon2/wasi-worker-browser.mjs
@@ -1,11 +1,14 @@
-import { instantiateNapiModuleSync, MessageHandler, WASI } from '@napi-rs/wasm-runtime'
+import { instantiateNapiModuleSync, MessageHandler, WASI, createFsProxy } from '@napi-rs/wasm-runtime'
 
 const fs = null
 
 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)

diff --git a/packages/argon2/wasi-worker.mjs b/packages/argon2/wasi-worker.mjs
@@ -1,5 +1,6 @@
 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";
 
@@ -27,15 +28,17 @@ Object.assign(globalThis, {
   },
 });
 
-const emnapiContext = getDefaultContext()
+const emnapiContext = getDefaultContext();
+
+const __rootDir = parse(process.cwd()).root;
 
 const handler = new MessageHandler({
   onLoad({ wasmModule, wasmMemory }) {
     const wasi = new WASI({
       version: 'preview1',
       env: process.env,
       preopens: {
-        '/': '/',
+        [__rootDir]: __rootDir,
       },
     });
 

diff --git a/packages/bcrypt/bcrypt.wasi-browser.js b/packages/bcrypt/bcrypt.wasi-browser.js
@@ -2,6 +2,7 @@ import {
   instantiateNapiModuleSync as __emnapiInstantiateNapiModuleSync,
   getDefaultContext as __emnapiGetDefaultContext,
   WASI as __WASI,
+  createOnMessage as __wasmCreateOnMessageForFsProxy,
 } from '@napi-rs/wasm-runtime'
 
 import __wasmUrl from './bcrypt.wasm32-wasi.wasm?url'
@@ -29,9 +30,11 @@ 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',
     })
+
+    return worker
   },
   overwriteImports(importObject) {
     importObject.env = {

diff --git a/packages/bcrypt/bcrypt.wasi.cjs b/packages/bcrypt/bcrypt.wasi.cjs
@@ -3,14 +3,15 @@
 
 /* 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
@@ -57,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 = {

diff --git a/packages/bcrypt/npm/wasm32-wasi/package.json b/packages/bcrypt/npm/wasm32-wasi/package.json
@@ -43,6 +43,6 @@
   },
   "browser": "bcrypt.wasi-browser.js",
   "dependencies": {
-    "@napi-rs/wasm-runtime": "^0.2.0"
+    "@napi-rs/wasm-runtime": "^0.2.3"
   }
 }
diff --git a/packages/bcrypt/package.json b/packages/bcrypt/package.json
@@ -70,7 +70,7 @@
     "url": "https://github.com/napi-rs/node-rs/issues"
   },
   "devDependencies": {
-    "@napi-rs/cli": "^3.0.0-alpha.52",
+    "@napi-rs/cli": "^3.0.0-alpha.53",
     "@types/bcrypt": "^5.0.2",
     "bcrypt": "^5.1.1",
     "bcryptjs": "^2.4.3",

diff --git a/packages/bcrypt/wasi-worker-browser.mjs b/packages/bcrypt/wasi-worker-browser.mjs
@@ -1,11 +1,14 @@
-import { instantiateNapiModuleSync, MessageHandler, WASI } from '@napi-rs/wasm-runtime'
+import { instantiateNapiModuleSync, MessageHandler, WASI, createFsProxy } from '@napi-rs/wasm-runtime'
 
 const fs = null
 
 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)

diff --git a/packages/bcrypt/wasi-worker.mjs b/packages/bcrypt/wasi-worker.mjs
@@ -1,5 +1,6 @@
 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";
 
@@ -27,15 +28,17 @@ Object.assign(globalThis, {
   },
 });
 
-const emnapiContext = getDefaultContext()
+const emnapiContext = getDefaultContext();
+
+const __rootDir = parse(process.cwd()).root;
 
 const handler = new MessageHandler({
   onLoad({ wasmModule, wasmMemory }) {
     const wasi = new WASI({
       version: 'preview1',
       env: process.env,
       preopens: {
-        '/': '/',
+        [__rootDir]: __rootDir,
       },
     });
 

diff --git a/packages/crc32/crc32.wasi-browser.js b/packages/crc32/crc32.wasi-browser.js
@@ -2,6 +2,7 @@ import {
   instantiateNapiModuleSync as __emnapiInstantiateNapiModuleSync,
   getDefaultContext as __emnapiGetDefaultContext,
   WASI as __WASI,
+  createOnMessage as __wasmCreateOnMessageForFsProxy,
 } from '@napi-rs/wasm-runtime'
 
 import __wasmUrl from './crc32.wasm32-wasi.wasm?url'
@@ -29,9 +30,11 @@ 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',
     })
+
+    return worker
   },
   overwriteImports(importObject) {
     importObject.env = {

diff --git a/packages/crc32/crc32.wasi.cjs b/packages/crc32/crc32.wasi.cjs
@@ -3,14 +3,15 @@
 
 /* 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
@@ -57,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 = {

diff --git a/packages/crc32/npm/wasm32-wasi/package.json b/packages/crc32/npm/wasm32-wasi/package.json
@@ -40,6 +40,6 @@
   },
   "browser": "crc32.wasi-browser.js",
   "dependencies": {
-    "@napi-rs/wasm-runtime": "^0.2.0"
+    "@napi-rs/wasm-runtime": "^0.2.3"
   }
 }
diff --git a/packages/crc32/package.json b/packages/crc32/package.json
@@ -64,7 +64,7 @@
     "url": "https://github.com/napi-rs/node-rs/issues"
   },
   "devDependencies": {
-    "@napi-rs/cli": "^3.0.0-alpha.52",
+    "@napi-rs/cli": "^3.0.0-alpha.53",
     "@types/crc": "^3.8.3",
     "buffer": "^6.0.3",
     "crc": "^4.3.2",

diff --git a/packages/crc32/wasi-worker-browser.mjs b/packages/crc32/wasi-worker-browser.mjs
@@ -1,11 +1,14 @@
-import { instantiateNapiModuleSync, MessageHandler, WASI } from '@napi-rs/wasm-runtime'
+import { instantiateNapiModuleSync, MessageHandler, WASI, createFsProxy } from '@napi-rs/wasm-runtime'
 
 const fs = null
 
 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)

diff --git a/packages/crc32/wasi-worker.mjs b/packages/crc32/wasi-worker.mjs
@@ -1,5 +1,6 @@
 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";
 
@@ -27,15 +28,17 @@ Object.assign(globalThis, {
   },
 });
 
-const emnapiContext = getDefaultContext()
+const emnapiContext = getDefaultContext();
+
+const __rootDir = parse(process.cwd()).root;
 
 const handler = new MessageHandler({
   onLoad({ wasmModule, wasmMemory }) {
     const wasi = new WASI({
       version: 'preview1',
       env: process.env,
       preopens: {
-        '/': '/',
+        [__rootDir]: __rootDir,
       },
     });
 

diff --git a/packages/deno-lint/package.json b/packages/deno-lint/package.json
@@ -73,7 +73,7 @@
     "typanion": "^3.14.0"
   },
   "devDependencies": {
-    "@napi-rs/cli": "^3.0.0-alpha.52",
+    "@napi-rs/cli": "^3.0.0-alpha.53",
     "@types/webpack": "^5.28.5"
   },
   "funding": {

diff --git a/packages/jieba/jieba.wasi-browser.js b/packages/jieba/jieba.wasi-browser.js
@@ -2,6 +2,7 @@ import {
   instantiateNapiModuleSync as __emnapiInstantiateNapiModuleSync,
   getDefaultContext as __emnapiGetDefaultContext,
   WASI as __WASI,
+  createOnMessage as __wasmCreateOnMessageForFsProxy,
 } from '@napi-rs/wasm-runtime'
 
 import __wasmUrl from './jieba.wasm32-wasi.wasm?url'
@@ -29,9 +30,11 @@ 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',
     })
+
+    return worker
   },
   overwriteImports(importObject) {
     importObject.env = {