@napi-rs/image-wasm32-wasi 1.9.2 → 1.11.0

package/image.wasi-browser.js

@@ -1,28 +1,21 @@
 import {
-  instantiateNapiModuleSync as __emnapiInstantiateNapiModuleSync,
+  createOnMessage as __wasmCreateOnMessageForFsProxy,
   getDefaultContext as __emnapiGetDefaultContext,
+  instantiateNapiModule as __emnapiInstantiateNapiModule,
   WASI as __WASI,
 } from '@napi-rs/wasm-runtime'
-import { Volume as __Volume, createFsFromVolume as __createFsFromVolume } from '@napi-rs/wasm-runtime/fs'
 
-import __wasmUrl from './image.wasm32-wasi.wasm?url'
-
-const __fs = __createFsFromVolume(
-  __Volume.fromJSON({
-    '/': null,
-  }),
-)
 
 const __wasi = new __WASI({
   version: 'preview1',
-  fs: __fs,
 })
 
+const __wasmUrl = new URL('./image.wasm32-wasi.wasm', import.meta.url).href
 const __emnapiContext = __emnapiGetDefaultContext()
 
 const __sharedMemory = new WebAssembly.Memory({
-  initial: 1024,
-  maximum: 10240,
+  initial: 4000,
+  maximum: 65536,
   shared: true,
 })
 
@@ -32,14 +25,16 @@ const {
   instance: __napiInstance,
   module: __wasiModule,
   napiModule: __napiModule,
-} = __emnapiInstantiateNapiModuleSync(__wasmFile, {
+} = await __emnapiInstantiateNapiModule(__wasmFile, {
   context: __emnapiContext,
   asyncWorkPoolSize: 4,
   wasi: __wasi,
   onCreateWorker() {
-    return new Worker(new URL('@napi-rs/image-wasm32-wasi/wasi-worker-browser.mjs', import.meta.url), {
+    const worker = new Worker(new URL('@napi-rs/image-wasm32-wasi/wasi-worker-browser.mjs', import.meta.url), {
       type: 'module',
     })
+
+    return worker
   },
   overwriteImports(importObject) {
     importObject.env = {
@@ -51,42 +46,14 @@ const {
     return importObject
   },
   beforeInit({ instance }) {
-    __napi_rs_initialize_modules(instance)
+    for (const name of Object.keys(instance.exports)) {
+      if (name.startsWith('__napi_register__')) {
+        instance.exports[name]()
+      }
+    }
   },
 })
-
-function __napi_rs_initialize_modules(__napiInstance) {
-  __napiInstance.exports['__napi_register__AvifConfig_struct_0']?.()
-  __napiInstance.exports['__napi_register__ChromaSubsampling_1']?.()
-  __napiInstance.exports['__napi_register__FastResizeFilter_2']?.()
-  __napiInstance.exports['__napi_register__ResizeFit_3']?.()
-  __napiInstance.exports['__napi_register__FastResizeOptions_struct_4']?.()
-  __napiInstance.exports['__napi_register__JpegCompressOptions_struct_5']?.()
-  __napiInstance.exports['__napi_register__compress_jpeg_sync_6']?.()
-  __napiInstance.exports['__napi_register__CompressJpegTask_impl_7']?.()
-  __napiInstance.exports['__napi_register__compress_jpeg_8']?.()
-  __napiInstance.exports['__napi_register__CompressionType_9']?.()
-  __napiInstance.exports['__napi_register__FilterType_10']?.()
-  __napiInstance.exports['__napi_register__PngEncodeOptions_struct_11']?.()
-  __napiInstance.exports['__napi_register__PngRowFilter_12']?.()
-  __napiInstance.exports['__napi_register__PNGLosslessOptions_struct_13']?.()
-  __napiInstance.exports['__napi_register__lossless_compress_png_sync_14']?.()
-  __napiInstance.exports['__napi_register__LosslessPngTask_impl_15']?.()
-  __napiInstance.exports['__napi_register__lossless_compress_png_16']?.()
-  __napiInstance.exports['__napi_register__PngQuantOptions_struct_17']?.()
-  __napiInstance.exports['__napi_register__png_quantize_sync_18']?.()
-  __napiInstance.exports['__napi_register__PngQuantTask_impl_19']?.()
-  __napiInstance.exports['__napi_register__png_quantize_20']?.()
-  __napiInstance.exports['__napi_register__Orientation_21']?.()
-  __napiInstance.exports['__napi_register__ResizeFilterType_22']?.()
-  __napiInstance.exports['__napi_register__JsColorType_23']?.()
-  __napiInstance.exports['__napi_register__Metadata_struct_24']?.()
-  __napiInstance.exports['__napi_register__MetadataTask_impl_25']?.()
-  __napiInstance.exports['__napi_register__ResizeOptions_struct_26']?.()
-  __napiInstance.exports['__napi_register__EncodeTask_impl_27']?.()
-  __napiInstance.exports['__napi_register__Transformer_struct_28']?.()
-  __napiInstance.exports['__napi_register__Transformer_impl_70']?.()
-}
+export default __napiModule.exports
 export const Transformer = __napiModule.exports.Transformer
 export const ChromaSubsampling = __napiModule.exports.ChromaSubsampling
 export const CompressionType = __napiModule.exports.CompressionType

package/image.wasi.cjs

@@ -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,
+  createOnMessage: __wasmCreateOnMessageForFsProxy,
   getDefaultContext: __emnapiGetDefaultContext,
+  instantiateNapiModuleSync: __emnapiInstantiateNapiModuleSync,
 } = 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, 'image.wasm32-wasi.wasm')
+const __wasmDebugFilePath = __nodePath.join(__dirname, 'image.wasm32-wasi.debug.wasm')
 
-if (!__nodeFs.existsSync(__wasmFilePath)) {
+if (__nodeFs.existsSync(__wasmDebugFilePath)) {
+  __wasmFilePath = __wasmDebugFilePath
+} else if (!__nodeFs.existsSync(__wasmFilePath)) {
   try {
     __wasmFilePath = __nodePath.resolve('@napi-rs/image-wasm32-wasi')
   } catch {
@@ -50,12 +56,39 @@ const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule
       return 4
     }
   })(),
+  reuseWorker: true,
   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)
+    }
+
+    // The main thread of Node.js waits for all the active handles before exiting.
+    // But Rust threads are never waited without `thread::join`.
+    // So here we hack the code of Node.js to prevent the workers from being referenced (active).
+    // According to https://github.com/nodejs/node/blob/19e0d472728c79d418b74bddff588bea70a403d0/lib/internal/worker.js#L415,
+    // a worker is consist of two handles: kPublicPort and kHandle.
+    {
+      const kPublicPort = Object.getOwnPropertySymbols(worker).find(s =>
+        s.toString().includes("kPublicPort")
+      );
+      if (kPublicPort) {
+        worker[kPublicPort].ref = () => {};
+      }
+
+      const kHandle = Object.getOwnPropertySymbols(worker).find(s =>
+        s.toString().includes("kHandle")
+      );
+      if (kPublicPort) {
+        worker[kHandle].ref = () => {};
+      }
+
+      worker.unref();
+    }
+    return worker
   },
   overwriteImports(importObject) {
     importObject.env = {
@@ -67,42 +100,14 @@ const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule
     return importObject
   },
   beforeInit({ instance }) {
-    __napi_rs_initialize_modules(instance)
-  }
+    for (const name of Object.keys(instance.exports)) {
+      if (name.startsWith('__napi_register__')) {
+        instance.exports[name]()
+      }
+    }
+  },
 })
-
-function __napi_rs_initialize_modules(__napiInstance) {
-  __napiInstance.exports['__napi_register__AvifConfig_struct_0']?.()
-  __napiInstance.exports['__napi_register__ChromaSubsampling_1']?.()
-  __napiInstance.exports['__napi_register__FastResizeFilter_2']?.()
-  __napiInstance.exports['__napi_register__ResizeFit_3']?.()
-  __napiInstance.exports['__napi_register__FastResizeOptions_struct_4']?.()
-  __napiInstance.exports['__napi_register__JpegCompressOptions_struct_5']?.()
-  __napiInstance.exports['__napi_register__compress_jpeg_sync_6']?.()
-  __napiInstance.exports['__napi_register__CompressJpegTask_impl_7']?.()
-  __napiInstance.exports['__napi_register__compress_jpeg_8']?.()
-  __napiInstance.exports['__napi_register__CompressionType_9']?.()
-  __napiInstance.exports['__napi_register__FilterType_10']?.()
-  __napiInstance.exports['__napi_register__PngEncodeOptions_struct_11']?.()
-  __napiInstance.exports['__napi_register__PngRowFilter_12']?.()
-  __napiInstance.exports['__napi_register__PNGLosslessOptions_struct_13']?.()
-  __napiInstance.exports['__napi_register__lossless_compress_png_sync_14']?.()
-  __napiInstance.exports['__napi_register__LosslessPngTask_impl_15']?.()
-  __napiInstance.exports['__napi_register__lossless_compress_png_16']?.()
-  __napiInstance.exports['__napi_register__PngQuantOptions_struct_17']?.()
-  __napiInstance.exports['__napi_register__png_quantize_sync_18']?.()
-  __napiInstance.exports['__napi_register__PngQuantTask_impl_19']?.()
-  __napiInstance.exports['__napi_register__png_quantize_20']?.()
-  __napiInstance.exports['__napi_register__Orientation_21']?.()
-  __napiInstance.exports['__napi_register__ResizeFilterType_22']?.()
-  __napiInstance.exports['__napi_register__JsColorType_23']?.()
-  __napiInstance.exports['__napi_register__Metadata_struct_24']?.()
-  __napiInstance.exports['__napi_register__MetadataTask_impl_25']?.()
-  __napiInstance.exports['__napi_register__ResizeOptions_struct_26']?.()
-  __napiInstance.exports['__napi_register__EncodeTask_impl_27']?.()
-  __napiInstance.exports['__napi_register__Transformer_struct_28']?.()
-  __napiInstance.exports['__napi_register__Transformer_impl_70']?.()
-}
+module.exports = __napiModule.exports
 module.exports.Transformer = __napiModule.exports.Transformer
 module.exports.ChromaSubsampling = __napiModule.exports.ChromaSubsampling
 module.exports.CompressionType = __napiModule.exports.CompressionType

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@napi-rs/image-wasm32-wasi",
-  "version": "1.9.2",
+  "version": "1.11.0",
   "cpu": [
     "wasm32"
   ],
@@ -38,6 +38,6 @@
   "repository": "git@github.com:Brooooooklyn/Image.git",
   "browser": "image.wasi-browser.js",
   "dependencies": {
-    "@napi-rs/wasm-runtime": "^0.2.0"
+    "@napi-rs/wasm-runtime": "^0.2.11"
   }
 }

package/wasi-worker-browser.mjs

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

package/wasi-worker.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,