@rrule-rust/lib-wasm32-wasi 2.1.0-alpha.5 → 3.0.0-alpha.2

package/package.json

@@ -1,20 +1,28 @@
 {
   "name": "@rrule-rust/lib-wasm32-wasi",
-  "version": "2.1.0-alpha.5",
+  "version": "3.0.0-alpha.2",
+  "cpu": [
+    "wasm32"
+  ],
   "main": "rrule-rust.wasi.cjs",
   "files": [
     "rrule-rust.wasm32-wasi.wasm",
     "rrule-rust.wasi.cjs",
     "rrule-rust.wasi-browser.js",
     "wasi-worker.mjs",
-    "runtime.js",
-    "wasi-worker-browser.mjs",
-    "patches/**/*"
+    "wasi-worker-browser.mjs"
+  ],
+  "description": "RRule implementation for Node.js written in Rust",
+  "keywords": [
+    "rrule",
+    "icalendar",
+    "rust",
+    "rs"
   ],
   "author": {
     "name": "lsndr",
-    "email": "alexander@lsndr.dev",
-    "url": "https://lsndr.dev"
+    "email": "alexander@lsndr.me",
+    "url": "https://lsndr.me"
   },
   "license": "MIT",
   "engines": {
@@ -23,13 +31,9 @@
   "repository": "lsndr/rrule-rust",
   "browser": "rrule-rust.wasi-browser.js",
   "dependencies": {
-    "@napi-rs/wasm-runtime": "=0.2.4",
-    "patch-package": "^8.0.0"
+    "@napi-rs/wasm-runtime": "^1.0.3"
   },
   "publishConfig": {
     "access": "public"
-  },
-  "scripts": {
-    "postinstall": "patch-package"
   }
 }

package/rrule-rust.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 './runtime.js'
+} from '@napi-rs/wasm-runtime'
+
 
-import __wasmUrl from './rrule-rust.wasm32-wasi.wasm?url'
 
 const __wasi = new __WASI({
   version: 'preview1',
 })
 
+const __wasmUrl = new URL('./rrule-rust.wasm32-wasi.wasm', import.meta.url).href
 const __emnapiContext = __emnapiGetDefaultContext()
 
+
 const __sharedMemory = new WebAssembly.Memory({
   initial: 4000,
   maximum: 65536,
@@ -46,22 +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__Frequency_0']?.()
-  __napiInstance.exports['__napi_register__Month_1']?.()
-  __napiInstance.exports['__napi_register__NWeekday_struct_2']?.()
-  __napiInstance.exports['__napi_register__RRule_struct_3']?.()
-  __napiInstance.exports['__napi_register__RRule_impl_21']?.()
-  __napiInstance.exports['__napi_register__RRuleSet_struct_22']?.()
-  __napiInstance.exports['__napi_register__RRuleSet_impl_36']?.()
-  __napiInstance.exports['__napi_register__RRuleSetIterator_struct_37']?.()
-  __napiInstance.exports['__napi_register__RRuleSetIterator_impl_39']?.()
-  __napiInstance.exports['__napi_register__Weekday_40']?.()
-}
+export default __napiModule.exports
 export const RRule = __napiModule.exports.RRule
 export const RRuleSet = __napiModule.exports.RRuleSet
 export const RRuleSetIterator = __napiModule.exports.RRuleSetIterator

package/rrule-rust.wasi.cjs

@@ -9,10 +9,10 @@ const { WASI: __nodeWASI } = require('node:wasi')
 const { Worker } = require('node:worker_threads')
 
 const {
-  instantiateNapiModuleSync: __emnapiInstantiateNapiModuleSync,
-  getDefaultContext: __emnapiGetDefaultContext,
   createOnMessage: __wasmCreateOnMessageForFsProxy,
-} = frequire('./runtime.js')
+  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,22 +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__Frequency_0']?.()
-  __napiInstance.exports['__napi_register__Month_1']?.()
-  __napiInstance.exports['__napi_register__NWeekday_struct_2']?.()
-  __napiInstance.exports['__napi_register__RRule_struct_3']?.()
-  __napiInstance.exports['__napi_register__RRule_impl_21']?.()
-  __napiInstance.exports['__napi_register__RRuleSet_struct_22']?.()
-  __napiInstance.exports['__napi_register__RRuleSet_impl_36']?.()
-  __napiInstance.exports['__napi_register__RRuleSetIterator_struct_37']?.()
-  __napiInstance.exports['__napi_register__RRuleSetIterator_impl_39']?.()
-  __napiInstance.exports['__napi_register__Weekday_40']?.()
-}
+module.exports = __napiModule.exports
 module.exports.RRule = __napiModule.exports.RRule
 module.exports.RRuleSet = __napiModule.exports.RRuleSet
 module.exports.RRuleSetIterator = __napiModule.exports.RRuleSetIterator

package/wasi-worker-browser.mjs

@@ -1,4 +1,4 @@
-import { instantiateNapiModuleSync, MessageHandler, WASI } from './runtime.js'
+import { instantiateNapiModuleSync, MessageHandler, WASI } from '@napi-rs/wasm-runtime'
 
 const handler = new MessageHandler({
   onLoad({ wasmModule, wasmMemory }) {

package/patches/@napi-rs+wasm-runtime+0.2.4.patch

@@ -1,28 +0,0 @@
-diff --git a/node_modules/@napi-rs/wasm-runtime/dist/runtime.js b/node_modules/@napi-rs/wasm-runtime/dist/runtime.js
-index e06c158..a23882c 100644
---- a/node_modules/@napi-rs/wasm-runtime/dist/runtime.js
-+++ b/node_modules/@napi-rs/wasm-runtime/dist/runtime.js
-@@ -2532,7 +2532,22 @@ function createNapiModule(options) {
-                     }
-                     return str;
-                 }
--                return emnapiString.utf8Decoder.decode(((typeof SharedArrayBuffer === "function" && HEAPU8.buffer instanceof SharedArrayBuffer) || (Object.prototype.toString.call(HEAPU8.buffer.constructor) === "[object SharedArrayBuffer]")) ? HEAPU8.slice(ptr, end) : HEAPU8.subarray(ptr, end));
-+                var decodeFromSharedBuffer = (sharedBuffer) => {
-+                    const decoder = new TextDecoder()
-+                    const copyLength = sharedBuffer.byteLength
-+
-+                    const tempBuffer = new ArrayBuffer(copyLength)
-+                    const tempView = new Uint8Array(tempBuffer)
-+
-+                    let sharedView = new Uint8Array(sharedBuffer)
-+                    if (sharedBuffer.byteLength != copyLength) {
-+                        sharedView = sharedView.subarray(0, copyLength)
-+                    }
-+                    tempView.set(sharedView)
-+
-+                    return decoder.decode(tempBuffer)
-+                }
-+                return decodeFromSharedBuffer(((typeof SharedArrayBuffer === "function" && HEAPU8.buffer instanceof SharedArrayBuffer) || (Object.prototype.toString.call(HEAPU8.buffer.constructor) === "[object SharedArrayBuffer]")) ? HEAPU8.slice(ptr, end) : HEAPU8.subarray(ptr, end));
-             },
-             stringToUTF8: function (str, outPtr, maxBytesToWrite) {
-                 var HEAPU8 = new Uint8Array(wasmMemory.buffer);