Skip to content

fix(napi): don't panic when the instance cache drops at process exit #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
triniwiz merged 1 commit into from
Nov 6, 2026
Merged

fix(napi): don't panic when the instance cache drops at process exit #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions runtime/src/napi_engine/ns_proxy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,8 @@ impl Drop for InstanceCacheEntry {
fn drop(&mut self) {
// Entries are dropped from InstanceState::Drop, which runs inside a GC finalizer. Deleting
// the napi_ref here would call into napi mid-GC (fatal on the V8 shim), so defer it.
REF_GRAVEYARD.with(|g| g.borrow_mut().push((self.env, self.proxy_ref)));
// During thread teardown the graveyard may already be gone; the reference goes with it.
let _ = REF_GRAVEYARD.try_with(|g| g.borrow_mut().push((self.env, self.proxy_ref)));
}
}

Expand Down Expand Up @@ -291,7 +292,7 @@ fn cache_instance(
/// (`o.SetNamedValue is not a function`). The serial guard prevents evicting a newer proxy that
/// already re-cached the same address.
pub(crate) fn evict_instance(identity: usize, serial: u64) {
NAPI_INSTANCE_CACHE.with(|c| {
let _ = NAPI_INSTANCE_CACHE.try_with(|c| {
let mut cache = c.borrow_mut();
if cache.get(&identity).map(|e| e.serial) == Some(serial) {
cache.remove(&identity);
Expand Down