chore: upgrade to NAPI-RS 3.0 stable (#419)

Brooooooklyn · web-flow · commit b2c47f752e9b · 2025-07-18T09:50:00.000+08:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,11 +10,12 @@ version = "0.1.0"
 crate-type = ["cdylib"]
 
 [dependencies]
-napi        = "3.0.0-beta"
-napi-derive = "3.0.0-beta"
+napi        = "3.0.0"
+napi-derive = "3.0.0"
 
 [build-dependencies]
 napi-build = "2"
 
 [profile.release]
 lto = true
+strip = "symbols"
diff --git a/index.js b/index.js
@@ -82,7 +82,6 @@ function requireNative() {
       } catch (e) {
         loadErrors.push(e)
       }
-
     } else if (process.arch === 'arm') {
       try {
         return require('./package-template.android-arm-eabi.node')
@@ -94,7 +93,6 @@ function requireNative() {
       } catch (e) {
         loadErrors.push(e)
       }
-
     } else {
       loadErrors.push(new Error(`Unsupported architecture on Android ${process.arch}`))
     }
@@ -110,7 +108,6 @@ function requireNative() {
       } catch (e) {
         loadErrors.push(e)
       }
-
     } else if (process.arch === 'ia32') {
       try {
         return require('./package-template.win32-ia32-msvc.node')
@@ -122,7 +119,6 @@ function requireNative() {
       } catch (e) {
         loadErrors.push(e)
       }
-
     } else if (process.arch === 'arm64') {
       try {
         return require('./package-template.win32-arm64-msvc.node')
@@ -134,22 +130,20 @@ function requireNative() {
       } catch (e) {
         loadErrors.push(e)
       }
-
     } else {
       loadErrors.push(new Error(`Unsupported architecture on Windows: ${process.arch}`))
     }
   } else if (process.platform === 'darwin') {
     try {
-        return require('./package-template.darwin-universal.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@napi-rs/package-template-darwin-universal')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
+      return require('./package-template.darwin-universal.node')
+    } catch (e) {
+      loadErrors.push(e)
+    }
+    try {
+      return require('@napi-rs/package-template-darwin-universal')
+    } catch (e) {
+      loadErrors.push(e)
+    }
     if (process.arch === 'x64') {
       try {
         return require('./package-template.darwin-x64.node')
@@ -161,7 +155,6 @@ function requireNative() {
       } catch (e) {
         loadErrors.push(e)
       }
-
     } else if (process.arch === 'arm64') {
       try {
         return require('./package-template.darwin-arm64.node')
@@ -173,7 +166,6 @@ function requireNative() {
       } catch (e) {
         loadErrors.push(e)
       }
-
     } else {
       loadErrors.push(new Error(`Unsupported architecture on macOS: ${process.arch}`))
     }
@@ -189,7 +181,6 @@ function requireNative() {
       } catch (e) {
         loadErrors.push(e)
       }
-
     } else if (process.arch === 'arm64') {
       try {
         return require('./package-template.freebsd-arm64.node')
@@ -201,141 +192,167 @@ function requireNative() {
       } catch (e) {
         loadErrors.push(e)
       }
-
     } else {
       loadErrors.push(new Error(`Unsupported architecture on FreeBSD: ${process.arch}`))
     }
   } else if (process.platform === 'linux') {
     if (process.arch === 'x64') {
       if (isMusl()) {
         try {
-        return require('./package-template.linux-x64-musl.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@napi-rs/package-template-linux-x64-musl')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
+          return require('./package-template.linux-x64-musl.node')
+        } catch (e) {
+          loadErrors.push(e)
+        }
+        try {
+          return require('@napi-rs/package-template-linux-x64-musl')
+        } catch (e) {
+          loadErrors.push(e)
+        }
       } else {
         try {
-        return require('./package-template.linux-x64-gnu.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@napi-rs/package-template-linux-x64-gnu')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
+          return require('./package-template.linux-x64-gnu.node')
+        } catch (e) {
+          loadErrors.push(e)
+        }
+        try {
+          return require('@napi-rs/package-template-linux-x64-gnu')
+        } catch (e) {
+          loadErrors.push(e)
+        }
       }
     } else if (process.arch === 'arm64') {
       if (isMusl()) {
         try {
-        return require('./package-template.linux-arm64-musl.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@napi-rs/package-template-linux-arm64-musl')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
+          return require('./package-template.linux-arm64-musl.node')
+        } catch (e) {
+          loadErrors.push(e)
+        }
+        try {
+          return require('@napi-rs/package-template-linux-arm64-musl')
+        } catch (e) {
+          loadErrors.push(e)
+        }
       } else {
         try {
-        return require('./package-template.linux-arm64-gnu.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@napi-rs/package-template-linux-arm64-gnu')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
+          return require('./package-template.linux-arm64-gnu.node')
+        } catch (e) {
+          loadErrors.push(e)
+        }
+        try {
+          return require('@napi-rs/package-template-linux-arm64-gnu')
+        } catch (e) {
+          loadErrors.push(e)
+        }
       }
     } else if (process.arch === 'arm') {
       if (isMusl()) {
         try {
-        return require('./package-template.linux-arm-musleabihf.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@napi-rs/package-template-linux-arm-musleabihf')
-      } catch (e) {
-        loadErrors.push(e)
+          return require('./package-template.linux-arm-musleabihf.node')
+        } catch (e) {
+          loadErrors.push(e)
+        }
+        try {
+          return require('@napi-rs/package-template-linux-arm-musleabihf')
+        } catch (e) {
+          loadErrors.push(e)
+        }
+      } else {
+        try {
+          return require('./package-template.linux-arm-gnueabihf.node')
+        } catch (e) {
+          loadErrors.push(e)
+        }
+        try {
+          return require('@napi-rs/package-template-linux-arm-gnueabihf')
+        } catch (e) {
+          loadErrors.push(e)
+        }
       }
-
+    } else if (process.arch === 'riscv64') {
+      if (isMusl()) {
+        try {
+          return require('./package-template.linux-riscv64-musl.node')
+        } catch (e) {
+          loadErrors.push(e)
+        }
+        try {
+          return require('@napi-rs/package-template-linux-riscv64-musl')
+        } catch (e) {
+          loadErrors.push(e)
+        }
       } else {
         try {
-        return require('./package-template.linux-arm-gnueabihf.node')
+          return require('./package-template.linux-riscv64-gnu.node')
+        } catch (e) {
+          loadErrors.push(e)
+        }
+        try {
+          return require('@napi-rs/package-template-linux-riscv64-gnu')
+        } catch (e) {
+          loadErrors.push(e)
+        }
+      }
+    } else if (process.arch === 'ppc64') {
+      try {
+        return require('./package-template.linux-ppc64-gnu.node')
       } catch (e) {
         loadErrors.push(e)
       }
       try {
-        return require('@napi-rs/package-template-linux-arm-gnueabihf')
+        return require('@napi-rs/package-template-linux-ppc64-gnu')
       } catch (e) {
         loadErrors.push(e)
       }
-
-      }
-    } else if (process.arch === 'riscv64') {
-      if (isMusl()) {
-        try {
-        return require('./package-template.linux-riscv64-musl.node')
+    } else if (process.arch === 's390x') {
+      try {
+        return require('./package-template.linux-s390x-gnu.node')
       } catch (e) {
         loadErrors.push(e)
       }
       try {
-        return require('@napi-rs/package-template-linux-riscv64-musl')
+        return require('@napi-rs/package-template-linux-s390x-gnu')
       } catch (e) {
         loadErrors.push(e)
       }
-
-      } else {
-        try {
-        return require('./package-template.linux-riscv64-gnu.node')
+    } else {
+      loadErrors.push(new Error(`Unsupported architecture on Linux: ${process.arch}`))
+    }
+  } else if (process.platform === 'openharmony') {
+    if (process.arch === 'arm64') {
+      try {
+        return require('./package-template.linux-arm64-ohos.node')
       } catch (e) {
         loadErrors.push(e)
       }
       try {
-        return require('@napi-rs/package-template-linux-riscv64-gnu')
+        return require('@napi-rs/package-template-linux-arm64-ohos')
       } catch (e) {
         loadErrors.push(e)
       }
-
-      }
-    } else if (process.arch === 'ppc64') {
+    } else if (process.arch === 'x64') {
       try {
-        return require('./package-template.linux-ppc64-gnu.node')
+        return require('./package-template.linux-x64-ohos.node')
       } catch (e) {
         loadErrors.push(e)
       }
       try {
-        return require('@napi-rs/package-template-linux-ppc64-gnu')
+        return require('@napi-rs/package-template-linux-x64-ohos')
       } catch (e) {
         loadErrors.push(e)
       }
-
-    } else if (process.arch === 's390x') {
+    } else if (process.arch === 'arm') {
       try {
-        return require('./package-template.linux-s390x-gnu.node')
+        return require('./package-template.linux-arm-ohos.node')
       } catch (e) {
         loadErrors.push(e)
       }
       try {
-        return require('@napi-rs/package-template-linux-s390x-gnu')
+        return require('@napi-rs/package-template-linux-arm-ohos')
       } catch (e) {
         loadErrors.push(e)
       }
-
     } else {
-      loadErrors.push(new Error(`Unsupported architecture on Linux: ${process.arch}`))
+      loadErrors.push(new Error(`Unsupported architecture on OpenHarmony: ${process.arch}`))
     }
   } else {
     loadErrors.push(new Error(`Unsupported OS: ${process.platform}, architecture: ${process.arch}`))
diff --git a/package-template.wasi-browser.js b/package-template.wasi-browser.js
@@ -6,13 +6,15 @@ import {
 } from '@napi-rs/wasm-runtime'
 
 
+
 const __wasi = new __WASI({
   version: 'preview1',
 })
 
 const __wasmUrl = new URL('./package-template.wasm32-wasi.wasm', import.meta.url).href
 const __emnapiContext = __emnapiGetDefaultContext()
 
+
 const __sharedMemory = new WebAssembly.Memory({
   initial: 4000,
   maximum: 65536,
diff --git a/package-template.wasi.cjs b/package-template.wasi.cjs
@@ -65,6 +65,29 @@ const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule
     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) {
diff --git a/package.json b/package.json
diff --git a/yarn.lock b/yarn.lock
