koffi 3.0.0 → 3.0.2

package/src/koffi/src/ffi.hh

@@ -9,6 +9,37 @@
 
 namespace K {
 
+// #define EXTERNAL_POINTERS
+// #define EXTERNAL_TYPES
+
+#if defined(_MSC_VER)
+    #define FORCE_INLINE __forceinline
+#else
+    #define FORCE_INLINE __attribute__((always_inline)) inline
+#endif
+#if defined(UNITY_BUILD)
+    #define INLINE_UNITY FORCE_INLINE
+#else
+    #define INLINE_UNITY
+#endif
+
+#if defined(__GNUC__) || defined(__clang__)
+    #if  __has_attribute(musttail) && __has_attribute(preserve_none)
+        #define MUST_TAIL __attribute__((musttail))
+        #define PRESERVE_NONE __attribute__((preserve_none))
+    #elif  __has_attribute(musttail) && !defined(__clang__)
+        // GCC regalloc seems better, so the generated code is not too bad even without preserve_none
+        #define MUST_TAIL __attribute__((musttail))
+        #define PRESERVE_NONE
+    #endif
+#endif
+
+#define NAPI_OK(Call) \
+    do { \
+        napi_status status = (Call); \
+        K_ASSERT(status == napi_ok); \
+    } while (false)
+
 static const Size DefaultSyncStackSize = Mebibytes(1);
 static const Size DefaultSyncHeapSize = Mebibytes(2);
 static const Size DefaultAsyncStackSize = Kibibytes(128);
@@ -47,11 +78,13 @@ enum class TypeFlag {
 enum class ArrayHint {
     Array,
     Typed,
+    Buffer,
     String
 };
 static const char *const ArrayHintNames[] = {
     "Array",
     "Typed",
+    "Buffer",
     "String"
 };
 
@@ -66,11 +99,6 @@ struct RecordMember {
 struct TypeInfo {
     const char *name;
 
-    // Make sure primitive ends up as the upper N-API tag value when we cast TypeInfo pointers to
-    // napi_type_tag pointers. Yes, I want to do this. We don't do strict aliasing here.
-    // N.B. Some node versions don't like when one of the two tag values is 0, so make sure
-    // this does not happen! It would happen if primitive is 0 and size is 0. To avoid this
-    // situation, PrimitiveKind::Void (the only type with size 0) is explictly not 0.
     alignas(8) PrimitiveKind primitive;
     int32_t size;
     int16_t align;
@@ -123,7 +151,7 @@ class LibraryHandle: public Napi::ObjectWrap<LibraryHandle> {
     LibraryHolder *lib = nullptr;
 
 public:
-    static Napi::Function InitClass(Napi::Env env);
+    static Napi::Function InitClass(InstanceData *instance);
 
     LibraryHandle(const Napi::CallbackInfo &info);
 
@@ -309,8 +337,11 @@ struct InstanceData {
     const TypeInfo *str16_type;
     const TypeInfo *str32_type;
 
+    Napi::ObjectReference object_constructor;
     Napi::FunctionReference construct_lib;
+#if !defined(EXTERNAL_TYPES)
     Napi::FunctionReference construct_type;
+#endif
     Napi::FunctionReference construct_poll;
     Napi::Reference<Napi::Symbol> active_symbol;
 
@@ -388,12 +419,20 @@ struct SharedData {
 };
 static_assert(MaxTrampolines <= INT16_MAX);
 
+extern const napi_type_tag LibraryHandleMarker;
+extern const napi_type_tag TypeObjectMarker;
+extern const napi_type_tag DirectionMarker;
+extern const napi_type_tag UnionValueMarker;
+extern const napi_type_tag CastMarker;
+
 extern SharedData shared;
 
-// Some N-API functions are loaded dynamically to work around bugs or because they are recent
+// Some Node-API functions are loaded dynamically to work around bugs or because they are recent
 extern napi_status (NAPI_CDECL *node_api_get_buffer_info)(napi_env env, napi_value value, void **data, size_t *length);
 extern napi_status (NAPI_CDECL *node_api_create_property_key_utf8)(napi_env env, const char* str, size_t length, napi_value* result);
 extern napi_status (NAPI_CDECL *node_api_post_finalizer)(node_api_basic_env env, napi_finalize finalize_cb, void* finalize_data, void* finalize_hint);
+extern napi_status (NAPI_CDECL *node_api_create_object_with_properties)(napi_env env, napi_value prototype_or_null, const napi_value *property_names,
+                                                                        const napi_value *property_values, size_t property_count, napi_value *result);
 extern napi_value (*translate_zero_call)(napi_env env, napi_callback_info info);
 
 InstanceMemory *AllocateMemory(InstanceData *instance, Size stack_size, Size heap_size);

package/src/koffi/src/parser.cc

@@ -4,6 +4,8 @@
 #include "lib/native/base/base.hh"
 #include "ffi.hh"
 #include "parser.hh"
+#include "type.hh"
+#include "util.hh"
 
 #include <napi.h>
 
@@ -159,7 +161,7 @@ const TypeInfo *PrototypeParser::ParseType(int *out_directions)
 
     while (offset >= start) {
         Span<const char> str = MakeSpan(tokens[start].ptr, tokens[offset].end() - tokens[start].ptr);
-        const TypeInfo *type = ResolveType(env, str);
+        const TypeInfo *type = ResolveType(instance, str);
 
         if (type) {
             offset++;

package/src/koffi/src/primitives.inc

@@ -5,11 +5,8 @@
     #error Please define PRIMITIVE() before including primitives.inc
 #endif
 
-// Void is explictly not first so that it is not 0, for reasons related to N-API type tags.
-// Look at TypeInfo definition for more information!
-
-PRIMITIVE(Bool)
 PRIMITIVE(Void)
+PRIMITIVE(Bool)
 PRIMITIVE(Int8)
 PRIMITIVE(UInt8)
 PRIMITIVE(Int16)

package/src/koffi/src/static.cjs

@@ -0,0 +1,122 @@
+// SPDX-License-Identifier: MIT
+// SPDX-FileCopyrightText: 2026 Niels Martignène <niels.martignene@protonmail.com>
+
+function loadStatic(pkg) {
+    let native = null;
+
+    if (pkg == 'linux-arm64') {
+        try {
+            native = require('@koromix/koffi-linux-arm64');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'linux-ia32') {
+        try {
+            native = require('@koromix/koffi-linux-ia32');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'linux-x64') {
+        try {
+            native = require('@koromix/koffi-linux-x64');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'linux-riscv64') {
+        try {
+            native = require('@koromix/koffi-linux-riscv64');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'freebsd-ia32') {
+        try {
+            native = require('@koromix/koffi-freebsd-ia32');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'freebsd-x64') {
+        try {
+            native = require('@koromix/koffi-freebsd-x64');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'freebsd-arm64') {
+        try {
+            native = require('@koromix/koffi-freebsd-arm64');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'openbsd-ia32') {
+        try {
+            native = require('@koromix/koffi-openbsd-ia32');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'openbsd-x64') {
+        try {
+            native = require('@koromix/koffi-openbsd-x64');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'win32-ia32') {
+        try {
+            native = require('@koromix/koffi-win32-ia32');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'win32-x64') {
+        try {
+            native = require('@koromix/koffi-win32-x64');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'darwin-x64') {
+        try {
+            native = require('@koromix/koffi-darwin-x64');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'darwin-arm64') {
+        try {
+            native = require('@koromix/koffi-darwin-arm64');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'linux-loong64') {
+        try {
+            native = require('@koromix/koffi-linux-loong64');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    return native;
+}
+
+module.exports = { loadStatic };

package/src/koffi/src/static.js

@@ -0,0 +1,122 @@
+// SPDX-License-Identifier: MIT
+// SPDX-FileCopyrightText: 2026 Niels Martignène <niels.martignene@protonmail.com>
+
+function loadStatic(pkg) {
+    let native = null;
+
+    if (pkg == 'linux-arm64') {
+        try {
+            native = require('@koromix/koffi-linux-arm64');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'linux-ia32') {
+        try {
+            native = require('@koromix/koffi-linux-ia32');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'linux-x64') {
+        try {
+            native = require('@koromix/koffi-linux-x64');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'linux-riscv64') {
+        try {
+            native = require('@koromix/koffi-linux-riscv64');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'freebsd-ia32') {
+        try {
+            native = require('@koromix/koffi-freebsd-ia32');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'freebsd-x64') {
+        try {
+            native = require('@koromix/koffi-freebsd-x64');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'freebsd-arm64') {
+        try {
+            native = require('@koromix/koffi-freebsd-arm64');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'openbsd-ia32') {
+        try {
+            native = require('@koromix/koffi-openbsd-ia32');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'openbsd-x64') {
+        try {
+            native = require('@koromix/koffi-openbsd-x64');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'win32-ia32') {
+        try {
+            native = require('@koromix/koffi-win32-ia32');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'win32-x64') {
+        try {
+            native = require('@koromix/koffi-win32-x64');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'darwin-x64') {
+        try {
+            native = require('@koromix/koffi-darwin-x64');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'darwin-arm64') {
+        try {
+            native = require('@koromix/koffi-darwin-arm64');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    if (pkg == 'linux-loong64') {
+        try {
+            native = require('@koromix/koffi-linux-loong64');
+        } catch (err) {
+            // Go on
+        }
+    }
+
+    return native;
+}
+
+export { loadStatic }