koffi 2.8.0 → 2.8.2

package/CHANGELOG.md

@@ -4,6 +4,14 @@
 
 ### Koffi 2.8
 
+#### Koffi 2.8.2 (2024-04-07)
+
+- Support [loading library](functions.md#loading-options) with RTLD_GLOBAL on POSIX platforms
+
+#### Koffi 2.8.1 (2024-04-04)
+
+- Fix incompatibility with Node 20.12+ and 21.6+
+
 #### Koffi 2.8.0 (2024-02-12)
 
 - Support pushing pointers for string arguments

package/doc/functions.md

@@ -21,13 +21,14 @@ On some platforms (such as with the [musl C library on Linux](https://wiki.musl-
 
 ## Loading options
 
-*New in Koffi 2.6*
+*New in Koffi 2.6 and Koffi 2.8.2*
 
 The `load` function can take an optional object argument, with the following options:
 
 ```js
 const options = {
-    lazy: true // Use RTLD_LAZY (lazy-binding) on POSIX platforms (by default, use RTLD_NOW)
+    lazy: true, // Use RTLD_LAZY (lazy-binding) on POSIX platforms (by default, use RTLD_NOW)
+    global: true // Use RTLD_GLOBAL on POSIX platforms (by default, use RTLD_LOCAL)
 };
 
 const lib = koffi.load('/path/to/shared/library.so', options);

package/doc/output.md

@@ -30,7 +30,7 @@ const koffi = require('koffi');
 const user32 = koffi.load('user32.dll');
 
 const DWORD = koffi.alias('DWORD', 'uint32_t');
-const HANDLE = koffi.pointer(koffi.opaque('HANDLE'));
+const HANDLE = koffi.pointer('HANDLE', koffi.opaque());
 const HWND = koffi.alias('HWND', HANDLE);
 
 const FindWindowEx = user32.func('HWND __stdcall FindWindowExW(HWND hWndParent, HWND hWndChildAfter, const char16_t *lpszClass, const char16_t *lpszWindow)');

package/index.js

@@ -43,7 +43,7 @@ var require_tools = __commonJS({
               try {
                 fs2.renameSync(file.path, dest);
               } catch (err) {
-                if (err.code != "EBUSY")
+                if (!fs2.existsSync(dest))
                   reject(err);
               }
               resolve();
@@ -378,8 +378,8 @@ var require_package = __commonJS({
   "build/dist/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.8.0",
-      stable: "2.8.0",
+      version: "2.8.2",
+      stable: "2.8.2",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",

package/indirect.js

@@ -43,7 +43,7 @@ var require_tools = __commonJS({
               try {
                 fs2.renameSync(file.path, dest);
               } catch (err) {
-                if (err.code != "EBUSY")
+                if (!fs2.existsSync(dest))
                   reject(err);
               }
               resolve();
@@ -378,8 +378,8 @@ var require_package = __commonJS({
   "build/dist/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.8.0",
-      stable: "2.8.0",
+      version: "2.8.2",
+      stable: "2.8.2",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",

package/package.json

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

package/src/cnoke/src/tools.js

@@ -66,7 +66,7 @@ async function download_http(url, dest) {
                     try {
                         fs.renameSync(file.path, dest);
                     } catch (err) {
-                        if (err.code != 'EBUSY')
+                        if (!fs.existsSync(dest))
                             reject(err);
                     }
 

package/src/koffi/src/ffi.cc

@@ -1717,10 +1717,15 @@ static Napi::Value LoadSharedLibrary(const Napi::CallbackInfo &info)
     }
 
 #ifndef _WIN32
-    bool lazy = false;
+    int flags = 0;
+
     if (info.Length() >= 2) {
         Napi::Object options = info[1].As<Napi::Object>();
-        lazy = options.Get("lazy").ToBoolean();
+
+        flags |= options.Get("lazy").ToBoolean() ? RTLD_LAZY : RTLD_NOW;
+        flags |= options.Get("global").ToBoolean() ? RTLD_GLOBAL : RTLD_LOCAL;
+    } else {
+        flags = RTLD_NOW | RTLD_LOCAL;
     }
 #endif
 
@@ -1744,8 +1749,6 @@ static Napi::Value LoadSharedLibrary(const Napi::CallbackInfo &info)
     }
 #else
     if (info[0].IsString()) {
-        int flags = lazy ? RTLD_LAZY : RTLD_NOW;
-
         std::string filename = info[0].As<Napi::String>();
         module = dlopen(filename.c_str(), flags);
 

package/src/koffi/src/ffi.hh

@@ -272,7 +272,10 @@ struct InstanceData {
     Size base_types_len;
 
     bool debug;
+
     uint64_t tag_lower;
+    BucketArray<napi_type_tag> tags;
+    HashMap<const void *, napi_type_tag *> tags_map;
 
     const TypeInfo *void_type;
     const TypeInfo *char_type;

package/src/koffi/src/util.cc

@@ -579,12 +579,22 @@ const char *GetValueType(const InstanceData *instance, Napi::Value value)
     return "Unknown";
 }
 
-void SetValueTag(const InstanceData *instance, Napi::Value value, const void *marker)
+void SetValueTag(InstanceData *instance, Napi::Value value, const void *marker)
 {
     RG_ASSERT(marker);
 
-    napi_type_tag tag = { instance->tag_lower, (uint64_t)marker };
-    napi_status status = napi_type_tag_object(value.Env(), value, &tag);
+    napi_type_tag *tag = instance->tags_map.FindValue(marker, nullptr);
+
+    if (!tag) {
+        tag = instance->tags.AppendDefault();
+
+        tag->lower = instance->tag_lower;
+        tag->upper = (uint64_t)marker;
+
+        instance->tags_map.Set(marker, tag);
+    }
+
+    napi_status status = napi_type_tag_object(value.Env(), value, tag);
     RG_ASSERT(status == napi_ok);
 }
 

package/src/koffi/src/util.hh

@@ -102,7 +102,7 @@ bool CanStoreType(const TypeInfo *type);
 // Can be slow, only use for error messages
 const char *GetValueType(const InstanceData *instance, Napi::Value value);
 
-void SetValueTag(const InstanceData *instance, Napi::Value value, const void *marker);
+void SetValueTag(InstanceData *instance, Napi::Value value, const void *marker);
 bool CheckValueTag(const InstanceData *instance, Napi::Value value, const void *marker);
 
 static inline bool IsNullOrUndefined(Napi::Value value)