koffi 2.15.5 → 2.15.6

package/CHANGELOG.md

@@ -7,6 +7,12 @@
 
 ### Koffi 2.15
 
+#### Koffi 2.15.6
+
+*Released on 2026-04-07*
+
+- Fix possile exit crash after using `koffi.reset()` (introduced in Koffi 2.15.2)
+
 #### Koffi 2.15.5
 
 *Released on 2026-04-05*

package/index.js

@@ -398,7 +398,7 @@ var require_package = __commonJS({
   "../../../bin/Koffi/package/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.15.5",
+      version: "2.15.6",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",

package/indirect.js

@@ -398,7 +398,7 @@ var require_package = __commonJS({
   "../../../bin/Koffi/package/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.15.5",
+      version: "2.15.6",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koffi",
-    "version": "2.15.5",
+    "version": "2.15.6",
     "description": "Fast and simple C FFI (foreign function interface) for Node.js",
     "keywords": [
         "foreign",

package/src/koffi/src/ffi.cc

@@ -2364,11 +2364,6 @@ bool InitAsyncBroker(Napi::Env env, InstanceData *instance)
             return false;
         }
         napi_unref_threadsafe_function(env, instance->broker);
-
-        napi_add_env_cleanup_hook(env, [](void *udata) {
-            napi_threadsafe_function broker = (napi_threadsafe_function)udata;
-            napi_release_threadsafe_function(broker, napi_tsfn_abort);
-        }, instance->broker);
     }
 
     return true;
@@ -2630,6 +2625,17 @@ static Napi::Object InitModule(Napi::Env env, Napi::Object exports)
 
     exports.Set("version", Napi::String::New(env, K_STRINGIFY(VERSION)));
 
+    napi_add_env_cleanup_hook(env, [](void *udata) {
+        InstanceData *instance = (InstanceData *)udata;
+
+        if (instance->broker) {
+            // This deadlocks if we try to do this when the module is destroyed, when
+            // the InstanceData destructor runs, so run in the env cleanup hook instead,
+            // where it seems to go okay.
+            napi_release_threadsafe_function(instance->broker, napi_tsfn_abort);
+        }
+    }, instance);
+
     return exports;
 }