@napi-rs/tar-wasm32-wasi 0.1.4 → 1.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@napi-rs/tar-wasm32-wasi",
-  "version": "0.1.4",
+  "version": "1.0.0",
   "cpu": [
     "wasm32"
   ],
@@ -25,13 +25,13 @@
   "engines": {
     "node": ">=14.0.0"
   },
+  "repository": "git@github.com:napi-rs/tar.git",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "repository": "git@github.com:napi-rs/tar.git",
   "browser": "tar.wasi-browser.js",
   "dependencies": {
-    "@napi-rs/wasm-runtime": "^0.2.4"
+    "@napi-rs/wasm-runtime": "^1.0.1"
   }
 }

package/tar.wasi-browser.js

@@ -1,18 +1,20 @@
 import {
-  instantiateNapiModuleSync as __emnapiInstantiateNapiModuleSync,
+  createOnMessage as __wasmCreateOnMessageForFsProxy,
   getDefaultContext as __emnapiGetDefaultContext,
+  instantiateNapiModuleSync as __emnapiInstantiateNapiModuleSync,
   WASI as __WASI,
-  createOnMessage as __wasmCreateOnMessageForFsProxy,
 } from '@napi-rs/wasm-runtime'
 
-import __wasmUrl from './tar.wasm32-wasi.wasm?url'
+
 
 const __wasi = new __WASI({
   version: 'preview1',
 })
 
+const __wasmUrl = new URL('./tar.wasm32-wasi.wasm', import.meta.url).href
 const __emnapiContext = __emnapiGetDefaultContext()
 
+
 const __sharedMemory = new WebAssembly.Memory({
   initial: 4000,
   maximum: 65536,
@@ -46,23 +48,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__Entries_struct_0']?.()
-  __napiInstance.exports['__napi_register__Entries_impl_1']?.()
-  __napiInstance.exports['__napi_register__Entry_struct_2']?.()
-  __napiInstance.exports['__napi_register__Entry_impl_5']?.()
-  __napiInstance.exports['__napi_register__EntryType_6']?.()
-  __napiInstance.exports['__napi_register__Header_struct_7']?.()
-  __napiInstance.exports['__napi_register__Header_impl_37']?.()
-  __napiInstance.exports['__napi_register__ReadonlyHeader_struct_38']?.()
-  __napiInstance.exports['__napi_register__ReadonlyHeader_impl_54']?.()
-  __napiInstance.exports['__napi_register__Archive_struct_55']?.()
-  __napiInstance.exports['__napi_register__Archive_impl_66']?.()
-}
+export default __napiModule.exports
 export const Archive = __napiModule.exports.Archive
 export const Entries = __napiModule.exports.Entries
 export const Entry = __napiModule.exports.Entry

package/tar.wasi.cjs

@@ -9,9 +9,9 @@ const { WASI: __nodeWASI } = require('node:wasi')
 const { Worker } = require('node:worker_threads')
 
 const {
-  instantiateNapiModuleSync: __emnapiInstantiateNapiModuleSync,
-  getDefaultContext: __emnapiGetDefaultContext,
   createOnMessage: __wasmCreateOnMessageForFsProxy,
+  getDefaultContext: __emnapiGetDefaultContext,
+  instantiateNapiModuleSync: __emnapiInstantiateNapiModuleSync,
 } = require('@napi-rs/wasm-runtime')
 
 const __rootDir = __nodePath.parse(process.cwd()).root
@@ -56,15 +56,38 @@ const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule
       return 4
     }
   })(),
+  reuseWorker: true,
   wasi: __wasi,
   onCreateWorker() {
     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 (kHandle) {
+        worker[kHandle].ref = () => {};
+      }
+
+      worker.unref();
+    }
     return worker
   },
   overwriteImports(importObject) {
@@ -77,23 +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__Entries_struct_0']?.()
-  __napiInstance.exports['__napi_register__Entries_impl_1']?.()
-  __napiInstance.exports['__napi_register__Entry_struct_2']?.()
-  __napiInstance.exports['__napi_register__Entry_impl_5']?.()
-  __napiInstance.exports['__napi_register__EntryType_6']?.()
-  __napiInstance.exports['__napi_register__Header_struct_7']?.()
-  __napiInstance.exports['__napi_register__Header_impl_37']?.()
-  __napiInstance.exports['__napi_register__ReadonlyHeader_struct_38']?.()
-  __napiInstance.exports['__napi_register__ReadonlyHeader_impl_54']?.()
-  __napiInstance.exports['__napi_register__Archive_struct_55']?.()
-  __napiInstance.exports['__napi_register__Archive_impl_66']?.()
-}
+module.exports = __napiModule.exports
 module.exports.Archive = __napiModule.exports.Archive
 module.exports.Entries = __napiModule.exports.Entries
 module.exports.Entry = __napiModule.exports.Entry