@nuggetslife/vc 0.4.1 → 0.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuggetslife/vc",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "main": "index.js",
   "types": "index.d.ts",
   "napi": {
@@ -42,10 +42,10 @@
   },
   "packageManager": "yarn@4.3.1",
   "optionalDependencies": {
-    "@nuggetslife/vc-darwin-arm64": "0.4.1",
-    "@nuggetslife/vc-linux-arm64-gnu": "0.4.1",
-    "@nuggetslife/vc-linux-arm64-musl": "0.4.1",
-    "@nuggetslife/vc-linux-x64-gnu": "0.4.1",
-    "@nuggetslife/vc-linux-x64-musl": "0.4.1"
+    "@nuggetslife/vc-darwin-arm64": "0.4.3",
+    "@nuggetslife/vc-linux-arm64-gnu": "0.4.3",
+    "@nuggetslife/vc-linux-arm64-musl": "0.4.3",
+    "@nuggetslife/vc-linux-x64-gnu": "0.4.3",
+    "@nuggetslife/vc-linux-x64-musl": "0.4.3"
   }
 }

package/src/bbs_2023.rs

@@ -1,4 +1,45 @@
+//! BBS+ 2023 cryptosuite NAPI exports.
+//!
+//! Each export delegates to an async `vc::bbs_2023::*` function via a
+//! **single process-wide tokio runtime** (`bbs_runtime`). Before
+//! v1.14.3 each call constructed a fresh `tokio::runtime::Runtime::new()`
+//! and dropped it on return — that pattern caused a V8 fatal
+//! (`Check failed: node->IsInUse()`) when a vitest / node worker_thread
+//! consumer terminated a worker mid-suite: the per-call runtime's worker
+//! threads were still finishing as V8 began isolate teardown, racing the
+//! NAPI handle lifecycle.
+//!
+//! The shared runtime sidesteps that race — its worker threads outlive
+//! every JS worker isolate, no `Drop`-during-teardown happens, and V8's
+//! handle bookkeeping stays consistent through worker rotation. The
+//! runtime is intentionally never shut down; it lives for the process
+//! lifetime, which matches how every other `pub async fn` in this crate
+//! is scheduled (napi-rs's built-in tokio integration also uses a
+//! single shared runtime — we just couldn't switch these specific
+//! exports to `pub async fn` because the underlying `vc::bbs_2023::*`
+//! futures are not `Send`).
+
+use std::sync::OnceLock;
+
 use serde_json::Value;
+use tokio::runtime::Runtime;
+
+// ---------------------------------------------------------------------------
+// Shared tokio runtime
+// ---------------------------------------------------------------------------
+
+fn bbs_runtime() -> napi::Result<&'static Runtime> {
+  static RUNTIME: OnceLock<Runtime> = OnceLock::new();
+  if let Some(rt) = RUNTIME.get() {
+    return Ok(rt);
+  }
+  let rt = Runtime::new()
+    .map_err(|e| napi::Error::from_reason(format!("bbs_2023 runtime init failed: {e}")))?;
+  // Race-safe: if another thread also constructed one, the loser's Runtime
+  // is dropped here and we return the winner. Cheap because Runtime::new
+  // only happens on the first call(s); steady-state is the get() above.
+  Ok(RUNTIME.get_or_init(|| rt))
+}
 
 // ---------------------------------------------------------------------------
 // Result types
@@ -6,8 +47,8 @@ use serde_json::Value;
 
 #[napi(object)]
 pub struct Bbs2023VerifyOutput {
-    pub verified: bool,
-    pub error: Option<String>,
+  pub verified: bool,
+  pub error: Option<String>,
 }
 
 // ---------------------------------------------------------------------------
@@ -16,17 +57,12 @@ pub struct Bbs2023VerifyOutput {
 
 #[napi(js_name = "bbs2023Sign")]
 pub fn bbs2023_sign(options: Value) -> napi::Result<Value> {
-    let sign_opts: vc::bbs_2023::SignOptions = serde_json::from_value(options)
-        .map_err(|e| napi::Error::from_reason(format!("bbs2023Sign parse options: {e}")))?;
-
-    let rt = tokio::runtime::Runtime::new()
-        .map_err(|e| napi::Error::from_reason(format!("bbs2023Sign runtime: {e}")))?;
-
-    let result = rt
-        .block_on(vc::bbs_2023::create_base_proof(sign_opts))
-        .map_err(|e| napi::Error::from_reason(format!("bbs2023Sign failed: {e}")))?;
+  let sign_opts: vc::bbs_2023::SignOptions = serde_json::from_value(options)
+    .map_err(|e| napi::Error::from_reason(format!("bbs2023Sign parse options: {e}")))?;
 
-    Ok(result)
+  bbs_runtime()?
+    .block_on(vc::bbs_2023::create_base_proof(sign_opts))
+    .map_err(|e| napi::Error::from_reason(format!("bbs2023Sign failed: {e}")))
 }
 
 // ---------------------------------------------------------------------------
@@ -35,17 +71,12 @@ pub fn bbs2023_sign(options: Value) -> napi::Result<Value> {
 
 #[napi(js_name = "bbs2023Derive")]
 pub fn bbs2023_derive(options: Value) -> napi::Result<Value> {
-    let derive_opts: vc::bbs_2023::DeriveOptions = serde_json::from_value(options)
-        .map_err(|e| napi::Error::from_reason(format!("bbs2023Derive parse options: {e}")))?;
+  let derive_opts: vc::bbs_2023::DeriveOptions = serde_json::from_value(options)
+    .map_err(|e| napi::Error::from_reason(format!("bbs2023Derive parse options: {e}")))?;
 
-    let rt = tokio::runtime::Runtime::new()
-        .map_err(|e| napi::Error::from_reason(format!("bbs2023Derive runtime: {e}")))?;
-
-    let result = rt
-        .block_on(vc::bbs_2023::create_derived_proof(derive_opts))
-        .map_err(|e| napi::Error::from_reason(format!("bbs2023Derive failed: {e}")))?;
-
-    Ok(result)
+  bbs_runtime()?
+    .block_on(vc::bbs_2023::create_derived_proof(derive_opts))
+    .map_err(|e| napi::Error::from_reason(format!("bbs2023Derive failed: {e}")))
 }
 
 // ---------------------------------------------------------------------------
@@ -54,18 +85,15 @@ pub fn bbs2023_derive(options: Value) -> napi::Result<Value> {
 
 #[napi(js_name = "bbs2023HolderCommit")]
 pub fn bbs2023_holder_commit(options: Value) -> napi::Result<Value> {
-    let commit_opts: vc::bbs_2023::HolderCommitOptions = serde_json::from_value(options)
-        .map_err(|e| napi::Error::from_reason(format!("bbs2023HolderCommit parse options: {e}")))?;
+  let commit_opts: vc::bbs_2023::HolderCommitOptions = serde_json::from_value(options)
+    .map_err(|e| napi::Error::from_reason(format!("bbs2023HolderCommit parse options: {e}")))?;
 
-    let rt = tokio::runtime::Runtime::new()
-        .map_err(|e| napi::Error::from_reason(format!("bbs2023HolderCommit runtime: {e}")))?;
+  let result = bbs_runtime()?
+    .block_on(vc::bbs_2023::create_holder_commitment(commit_opts))
+    .map_err(|e| napi::Error::from_reason(format!("bbs2023HolderCommit failed: {e}")))?;
 
-    let result = rt
-        .block_on(vc::bbs_2023::create_holder_commitment(commit_opts))
-        .map_err(|e| napi::Error::from_reason(format!("bbs2023HolderCommit failed: {e}")))?;
-
-    serde_json::to_value(&result)
-        .map_err(|e| napi::Error::from_reason(format!("bbs2023HolderCommit serialize: {e}")))
+  serde_json::to_value(&result)
+    .map_err(|e| napi::Error::from_reason(format!("bbs2023HolderCommit serialize: {e}")))
 }
 
 // ---------------------------------------------------------------------------
@@ -74,17 +102,12 @@ pub fn bbs2023_holder_commit(options: Value) -> napi::Result<Value> {
 
 #[napi(js_name = "bbs2023BlindSign")]
 pub fn bbs2023_blind_sign(options: Value) -> napi::Result<Value> {
-    let blind_opts: vc::bbs_2023::BlindSignOptions = serde_json::from_value(options)
-        .map_err(|e| napi::Error::from_reason(format!("bbs2023BlindSign parse options: {e}")))?;
-
-    let rt = tokio::runtime::Runtime::new()
-        .map_err(|e| napi::Error::from_reason(format!("bbs2023BlindSign runtime: {e}")))?;
+  let blind_opts: vc::bbs_2023::BlindSignOptions = serde_json::from_value(options)
+    .map_err(|e| napi::Error::from_reason(format!("bbs2023BlindSign parse options: {e}")))?;
 
-    let result = rt
-        .block_on(vc::bbs_2023::create_blind_base_proof(blind_opts))
-        .map_err(|e| napi::Error::from_reason(format!("bbs2023BlindSign failed: {e}")))?;
-
-    Ok(result)
+  bbs_runtime()?
+    .block_on(vc::bbs_2023::create_blind_base_proof(blind_opts))
+    .map_err(|e| napi::Error::from_reason(format!("bbs2023BlindSign failed: {e}")))
 }
 
 // ---------------------------------------------------------------------------
@@ -93,30 +116,27 @@ pub fn bbs2023_blind_sign(options: Value) -> napi::Result<Value> {
 
 #[napi(js_name = "bbs2023Verify")]
 pub fn bbs2023_verify(
-    document: Value,
-    public_key: Option<String>,
-    additional_contexts: Option<Value>,
+  document: Value,
+  public_key: Option<String>,
+  additional_contexts: Option<Value>,
 ) -> napi::Result<Bbs2023VerifyOutput> {
-    let rt = tokio::runtime::Runtime::new()
-        .map_err(|e| napi::Error::from_reason(format!("bbs2023Verify runtime: {e}")))?;
-
-    // LR-3 (issue #107 v1.14.1): caller-registered contexts forwarded to
-    // canonicalize. Accepts an optional JSON map; absence is treated as
-    // the empty map (bundled-static loader only).
-    let extras = additional_contexts
-        .map(|v| {
-            serde_json::from_value::<std::collections::HashMap<String, Value>>(v).map_err(|e| {
-                napi::Error::from_reason(format!("bbs2023Verify parse additional_contexts: {e}"))
-            })
-        })
-        .transpose()?;
-
-    let result = rt
-        .block_on(vc::bbs_2023::verify_proof(document, public_key, extras))
-        .map_err(|e| napi::Error::from_reason(format!("bbs2023Verify failed: {e}")))?;
-
-    Ok(Bbs2023VerifyOutput {
-        verified: result.verified,
-        error: result.error,
+  // LR-3 (issue #107 v1.14.1): caller-registered contexts forwarded to
+  // canonicalize. Accepts an optional JSON map; absence is treated as
+  // the empty map (bundled-static loader only).
+  let extras = additional_contexts
+    .map(|v| {
+      serde_json::from_value::<std::collections::HashMap<String, Value>>(v).map_err(|e| {
+        napi::Error::from_reason(format!("bbs2023Verify parse additional_contexts: {e}"))
+      })
     })
+    .transpose()?;
+
+  let result = bbs_runtime()?
+    .block_on(vc::bbs_2023::verify_proof(document, public_key, extras))
+    .map_err(|e| napi::Error::from_reason(format!("bbs2023Verify failed: {e}")))?;
+
+  Ok(Bbs2023VerifyOutput {
+    verified: result.verified,
+    error: result.error,
+  })
 }