koffi 2.12.0 → 2.12.1

package/CHANGELOG.md

@@ -7,6 +7,12 @@
 
 ### Koffi 2.12
 
+#### Koffi 2.12.1
+
+*Released on 2025-07-05*
+
+- Fix type errors when casting function pointers
+
 #### Koffi 2.12.0
 
 *Released on 2025-06-19*

package/index.js

@@ -4,9 +4,9 @@ var __commonJS = (cb, mod3) => function __require() {
   return mod3 || (0, cb[__getOwnPropNames(cb)[0]])((mod3 = { exports: {} }).exports, mod3), mod3.exports;
 };
 
-// package/src/cnoke/src/tools.js
+// ../../bin/Koffi/package/src/cnoke/src/tools.js
 var require_tools = __commonJS({
-  "package/src/cnoke/src/tools.js"(exports2, module2) {
+  "../../bin/Koffi/package/src/cnoke/src/tools.js"(exports2, module2) {
     "use strict";
     var crypto = require("crypto");
     var fs2 = require("fs");
@@ -374,13 +374,13 @@ var require_tools = __commonJS({
   }
 });
 
-// package/src/koffi/package.json
+// ../../bin/Koffi/package/src/koffi/package.json
 var require_package = __commonJS({
-  "package/src/koffi/package.json"(exports2, module2) {
+  "../../bin/Koffi/package/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.12.0",
-      stable: "2.12.0",
+      version: "2.12.1",
+      stable: "2.12.1",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",
@@ -424,9 +424,9 @@ var require_package = __commonJS({
   }
 });
 
-// package/src/koffi/src/init.js
+// ../../bin/Koffi/package/src/koffi/src/init.js
 var require_init = __commonJS({
-  "package/src/koffi/src/init.js"(exports, module) {
+  "../../bin/Koffi/package/src/koffi/src/init.js"(exports, module) {
     var fs = require("fs");
     var path = require("path");
     var util = require("util");
@@ -509,7 +509,7 @@ var require_init = __commonJS({
   }
 });
 
-// package/src/koffi/index.js
+// ../../bin/Koffi/package/src/koffi/index.js
 var { detect: detect2, init: init2 } = require_init();
 var triplet2 = detect2();
 var native2 = null;

package/indirect.js

@@ -4,9 +4,9 @@ var __commonJS = (cb, mod3) => function __require() {
   return mod3 || (0, cb[__getOwnPropNames(cb)[0]])((mod3 = { exports: {} }).exports, mod3), mod3.exports;
 };
 
-// package/src/cnoke/src/tools.js
+// ../../bin/Koffi/package/src/cnoke/src/tools.js
 var require_tools = __commonJS({
-  "package/src/cnoke/src/tools.js"(exports2, module2) {
+  "../../bin/Koffi/package/src/cnoke/src/tools.js"(exports2, module2) {
     "use strict";
     var crypto = require("crypto");
     var fs2 = require("fs");
@@ -374,13 +374,13 @@ var require_tools = __commonJS({
   }
 });
 
-// package/src/koffi/package.json
+// ../../bin/Koffi/package/src/koffi/package.json
 var require_package = __commonJS({
-  "package/src/koffi/package.json"(exports2, module2) {
+  "../../bin/Koffi/package/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.12.0",
-      stable: "2.12.0",
+      version: "2.12.1",
+      stable: "2.12.1",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",
@@ -424,9 +424,9 @@ var require_package = __commonJS({
   }
 });
 
-// package/src/koffi/src/init.js
+// ../../bin/Koffi/package/src/koffi/src/init.js
 var require_init = __commonJS({
-  "package/src/koffi/src/init.js"(exports, module) {
+  "../../bin/Koffi/package/src/koffi/src/init.js"(exports, module) {
     var fs = require("fs");
     var path = require("path");
     var util = require("util");
@@ -509,7 +509,7 @@ var require_init = __commonJS({
   }
 });
 
-// package/src/koffi/indirect.js
+// ../../bin/Koffi/package/src/koffi/indirect.js
 var { detect: detect2, init: init2 } = require_init();
 var triplet2 = detect2();
 var mod2 = init2(triplet2, null);

package/package.json

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

package/src/koffi/src/abi_arm32.cc

@@ -431,21 +431,8 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
             } break;
             case PrimitiveKind::Callback: {
                 void *ptr;
-
-                if (value.IsFunction()) {
-                    Napi::Function func = value.As<Napi::Function>();
-
-                    ptr = ReserveTrampoline(param.type->ref.proto, func);
-                    if (!ptr) [[unlikely]]
-                        return false;
-                } else if (CheckValueTag(instance, value, param.type->ref.marker)) {
-                    ptr = value.As<Napi::External<void>>().Data();
-                } else if (IsNullOrUndefined(value)) {
-                    ptr = nullptr;
-                } else {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected %2", GetValueType(instance, value), param.type->name);
+                if (!PushCallback(value, param.type, &ptr)) [[unlikely]]
                     return false;
-                }
 
                 *(void **)((param.gpr_count ? gpr_ptr : args_ptr)++) = ptr;
             } break;

package/src/koffi/src/abi_arm64.cc

@@ -538,21 +538,8 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
             } break;
             case PrimitiveKind::Callback: {
                 void *ptr;
-
-                if (value.IsFunction()) {
-                    Napi::Function func = value.As<Napi::Function>();
-
-                    ptr = ReserveTrampoline(param.type->ref.proto, func);
-                    if (!ptr) [[unlikely]]
-                        return false;
-                } else if (CheckValueTag(instance, value, param.type->ref.marker)) {
-                    ptr = value.As<Napi::External<void>>().Data();
-                } else if (IsNullOrUndefined(value)) {
-                    ptr = nullptr;
-                } else {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected %2", GetValueType(instance, value), param.type->name);
+                if (!PushCallback(value, param.type, &ptr)) [[unlikely]]
                     return false;
-                }
 
 #ifdef __APPLE__
                 args_ptr = param.gpr_count ? args_ptr : AlignUp(args_ptr, 8);

package/src/koffi/src/abi_riscv64.cc

@@ -362,21 +362,8 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
             } break;
             case PrimitiveKind::Callback: {
                 void *ptr;
-
-                if (value.IsFunction()) {
-                    Napi::Function func = value.As<Napi::Function>();
-
-                    ptr = ReserveTrampoline(param.type->ref.proto, func);
-                    if (!ptr) [[unlikely]]
-                        return false;
-                } else if (CheckValueTag(instance, value, param.type->ref.marker)) {
-                    ptr = value.As<Napi::External<void>>().Data();
-                } else if (IsNullOrUndefined(value)) {
-                    ptr = nullptr;
-                } else {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected %2", GetValueType(instance, value), param.type->name);
+                if (!PushCallback(value, param.type, &ptr)) [[unlikely]]
                     return false;
-                }
 
                 *(void **)((param.gpr_count ? gpr_ptr : args_ptr)++) = ptr;
             } break;

package/src/koffi/src/abi_x64_sysv.cc

@@ -403,21 +403,8 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
             } break;
             case PrimitiveKind::Callback: {
                 void *ptr;
-
-                if (value.IsFunction()) {
-                    Napi::Function func = value.As<Napi::Function>();
-
-                    ptr = ReserveTrampoline(param.type->ref.proto, func);
-                    if (!ptr) [[unlikely]]
-                        return false;
-                } else if (CheckValueTag(instance, value, param.type->ref.marker)) {
-                    ptr = value.As<Napi::External<void>>().Data();
-                } else if (IsNullOrUndefined(value)) {
-                    ptr = nullptr;
-                } else {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected %2", GetValueType(instance, value), param.type->name);
+                if (!PushCallback(value, param.type, &ptr)) [[unlikely]]
                     return false;
-                }
 
                 *(void **)((param.gpr_count ? gpr_ptr : args_ptr)++) = ptr;
             } break;

package/src/koffi/src/abi_x64_win.cc

@@ -200,21 +200,8 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
             } break;
             case PrimitiveKind::Callback: {
                 void *ptr;
-
-                if (value.IsFunction()) {
-                    Napi::Function func = value.As<Napi::Function>();
-
-                    ptr = ReserveTrampoline(param.type->ref.proto, func);
-                    if (!ptr) [[unlikely]]
-                        return false;
-                } else if (CheckValueTag(instance, value, param.type->ref.marker)) {
-                    ptr = value.As<Napi::External<void>>().Data();
-                } else if (IsNullOrUndefined(value)) {
-                    ptr = nullptr;
-                } else {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected %2", GetValueType(instance, value), param.type->name);
+                if (!PushCallback(value, param.type, &ptr)) [[unlikely]]
                     return false;
-                }
 
                 *(void **)(args_ptr++) = ptr;
             } break;

package/src/koffi/src/abi_x86.cc

@@ -294,21 +294,8 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
             } break;
             case PrimitiveKind::Callback: {
                 void *ptr;
-
-                if (value.IsFunction()) {
-                    Napi::Function func = value.As<Napi::Function>();
-
-                    ptr = ReserveTrampoline(param.type->ref.proto, func);
-                    if (!ptr) [[unlikely]]
-                        return false;
-                } else if (CheckValueTag(instance, value, param.type->ref.marker)) {
-                    ptr = value.As<Napi::External<void>>().Data();
-                } else if (IsNullOrUndefined(value)) {
-                    ptr = nullptr;
-                } else {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected %2", GetValueType(instance, value), param.type->name);
+                if (!PushCallback(value, param.type, &ptr)) [[unlikely]]
                     return false;
-                }
 
                 *(void **)((param.fast ? fast_ptr : args_ptr)++) = ptr;
             } break;

package/src/koffi/src/call.cc

@@ -743,22 +743,8 @@ bool CallData::PushObject(Napi::Object obj, const TypeInfo *type, uint8_t *origi
             } break;
             case PrimitiveKind::Callback: {
                 void *ptr;
-
-                if (value.IsFunction()) {
-                    Napi::Function func = value.As<Napi::Function>();
-
-                    ptr = ReserveTrampoline(member.type->ref.proto, func);
-                    if (!ptr) [[unlikely]]
-                        return false;
-                } else if (CheckValueTag(instance, value, member.type->ref.marker)) {
-                    Napi::External<void> external = value.As<Napi::External<void>>();
-                    ptr = external.Data();
-                } else if (IsNullOrUndefined(value)) {
-                    ptr = nullptr;
-                } else {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected %2", GetValueType(instance, value), member.type->name);
+                if (!PushCallback(value, member.type, &ptr))
                     return false;
-                }
 
                 *(void **)dest = ptr;
             } break;
@@ -991,22 +977,8 @@ bool CallData::PushNormalArray(Napi::Array array, Size len, const TypeInfo *type
                 uint8_t *dest = origin + offset;
 
                 void *ptr;
-
-                if (value.IsFunction()) {
-                    Napi::Function func = value.As<Napi::Function>();
-
-                    ptr = ReserveTrampoline(ref->ref.proto, func);
-                    if (!ptr) [[unlikely]]
-                        return false;
-                } else if (CheckValueTag(instance, value, ref->ref.marker)) {
-                    Napi::External<void> external = value.As<Napi::External<void>>();
-                    ptr = external.Data();
-                } else if (IsNullOrUndefined(value)) {
-                    ptr = nullptr;
-                } else {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected %2", GetValueType(instance, value), ref->name);
+                if (!PushCallback(value, ref, &ptr))
                     return false;
-                }
 
                 *(void **)dest = ptr;
 
@@ -1274,6 +1246,41 @@ unexpected:
     return false;
 }
 
+bool CallData::PushCallback(Napi::Value value, const TypeInfo *type, void **out_ptr)
+{
+    if (value.IsFunction()) {
+        Napi::Function func = value.As<Napi::Function>();
+
+        void *ptr = ReserveTrampoline(type->ref.proto, func);
+        if (!ptr) [[unlikely]]
+            return false;
+
+        *out_ptr = ptr;
+    } else if (CheckValueTag(instance, value, type->ref.marker)) {
+        *out_ptr = value.As<Napi::External<void>>().Data();
+    } else if (CheckValueTag(instance, value, &CastMarker)) {
+        Napi::External<ValueCast> external = value.As<Napi::External<ValueCast>>();
+        ValueCast *cast = external.Data();
+
+        value = cast->ref.Value();
+
+        if (!value.IsExternal() || cast->type != type)
+            goto unexpected;
+
+        *out_ptr = value.As<Napi::External<void>>().Data();
+    } else if (IsNullOrUndefined(value)) {
+        *out_ptr = nullptr;
+    } else {
+        goto unexpected;
+    }
+
+    return true;
+
+unexpected:
+    ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected %2", GetValueType(instance, value), type->name);
+    return false;
+}
+
 Size CallData::PushIndirectString(Napi::Array array, const TypeInfo *ref, uint8_t **out_ptr)
 {
     if (array.Length() != 1)

package/src/koffi/src/call.hh

@@ -125,6 +125,7 @@ public:
     void PushBuffer(Span<const uint8_t> buffer, Size size, const TypeInfo *type, uint8_t *origin);
     bool PushStringArray(Napi::Value value, const TypeInfo *type, uint8_t *origin);
     bool PushPointer(Napi::Value value, const TypeInfo *type, int directions, void **out_ptr);
+    bool PushCallback(Napi::Value value, const TypeInfo *type, void **out_ptr);
     Size PushIndirectString(Napi::Array array, const TypeInfo *ref, uint8_t **out_ptr);
 
     void *ReserveTrampoline(const FunctionInfo *proto, Napi::Function func);