Skip to content

fix: serialize moduleInit/cleanupHook across N-API envs #31

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

Open
GrapeBaBa wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: serialize moduleInit/cleanupHook across N-API envs #31

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
680c8ad
fix: serialize moduleInit/cleanupHook across N-API envs
GrapeBaBa May 13, 2026
957d7e7
Merge remote-tracking branch 'origin/main' into gr/serialize-module-l…
GrapeBaBa Jul 14, 2026
02b7ad0
refactor(js): use blocking lifecycle mutex
GrapeBaBa Jul 14, 2026
92d74cd
fix(js): use Io interface for lifecycle mutex
GrapeBaBa Jul 14, 2026
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
14 changes: 13 additions & 1 deletion src/js/export_module.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ const class_runtime = @import("class_runtime.zig");
///
/// The DSL internally manages an atomic refcount for module instances across
/// different N-API environments, and uses the same env lifecycle to retain a
/// shared `js.io()` handle for the addon.
/// shared `js.io()` handle for the addon. Modules with lifecycle hooks also
/// serialize initialization and cleanup across environments.
///
/// Usage Examples:
/// ```zig
Expand Down Expand Up @@ -66,6 +67,7 @@ pub fn exportModule(comptime Module: type, comptime options: anytype) void {

const State = struct {
var env_refcount: std.atomic.Value(u32) = std.atomic.Value(u32).init(0);
var lifecycle_mutex: std.Io.Mutex = .init;

// addEnvCleanupHook requires a non-null *Data pointer.
const CleanupData = struct {
Expand All @@ -75,6 +77,10 @@ pub fn exportModule(comptime Module: type, comptime options: anytype) void {

fn cleanupHook(_: *CleanupData) void {
if (has_lifecycle) {
const io = io_context.io();
lifecycle_mutex.lockUncancelable(io);
defer lifecycle_mutex.unlock(io);

const prev = env_refcount.fetchSub(1, .acq_rel);
const new_refcount = prev - 1;
if (has_cleanup) {
Expand All @@ -96,6 +102,12 @@ pub fn exportModule(comptime Module: type, comptime options: anytype) void {
io_context.release();
};

const io = io_context.io();
if (has_lifecycle) {
State.lifecycle_mutex.lockUncancelable(io);
}
defer if (has_lifecycle) State.lifecycle_mutex.unlock(io);

var prev_refcount: u32 = 0;
if (has_lifecycle) {
prev_refcount = State.env_refcount.fetchAdd(1, .monotonic);
Expand Down
Loading