koffi 2.3.15 → 2.3.16

package/CHANGELOG.md

@@ -4,6 +4,17 @@
 
 ### Koffi 2.3
 
+#### Koffi 2.3.16
+
+**Main changes:**
+
+- Fix Windows ARM64 build to work with official Node.js version
+- Compile Windows builds with Visual Studio 2022 17.5.3
+
+**Other changes:**
+
+- Support null in koffi.free() and koffi.address()
+
 #### Koffi 2.3.15
 
 **Main changes:**

package/package.json

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

package/src/cnoke/cnoke.js

@@ -155,7 +155,7 @@ Options:
                                          (default: ${cnoke.DefaultOptions.mode})
     -D, --debug                          Shortcut for --config Debug
 
-        --prebuild                       Use prebuilt binari if available
+        --prebuild                       Use prebuilt binary if available
 
     -a, --arch <ARCH>                    Change architecture and ABI
                                          (default: ${cnoke.determine_arch()})

package/src/cnoke/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnoke",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Build native Node addons based on CMake, without extra dependency",
   "keywords": [
     "native",

package/src/cnoke/src/builder.js

@@ -103,7 +103,7 @@ function Builder(config = {}) {
             let basename = `node-v${runtime_version}-headers.tar.gz`;
             let urls = [
                 `https://nodejs.org/dist/v${runtime_version}/${basename}`,
-                `https://unofficial-builds.nodejs.org/download/release/v${runtime_version}/${basename}`
+                // `https://unofficial-builds.nodejs.org/download/release/v${runtime_version}/${basename}`
             ];
             let destname = `${cache_dir}/${basename}`;
 
@@ -130,7 +130,7 @@ function Builder(config = {}) {
             if (!fs.existsSync(destname)) {
                 let urls = [
                     `https://nodejs.org/dist/v${runtime_version}/${dirname}/node.lib`,
-                    `https://unofficial-builds.nodejs.org/download/release/v${runtime_version}/${dirname}/node.lib`
+                    // `https://unofficial-builds.nodejs.org/download/release/v${runtime_version}/${dirname}/node.lib`
                 ];
                 await tools.download_http(urls, destname);
             }

package/src/koffi/CMakeLists.txt

@@ -20,6 +20,8 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 
 cmake_minimum_required(VERSION 3.6)
+cmake_policy(SET CMP0091 NEW)
+
 project(koffi C CXX ASM)
 
 include(CheckCXXCompilerFlag)
@@ -58,6 +60,8 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
     # CMAKE_SYSTEM_PROCESSOR is wrong on Windows ARM64
 
     if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch|arm" OR CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64" OR CMAKE_OSX_ARCHITECTURES MATCHES "arm")
+        set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded)
+
         if(WIN32)
             get_filename_component(cl_dir "${CMAKE_CXX_COMPILER}" DIRECTORY)
             file(TO_CMAKE_PATH "${cl_dir}/armasm64.exe" asm_compiler)

package/src/koffi/src/ffi.cc

@@ -723,18 +723,25 @@ static Napi::Value CreateDisposableType(const Napi::CallbackInfo &info)
     return WrapType(env, instance, type);
 }
 
-static inline bool CheckExternalPointer(Napi::Env env, Napi::Value value)
+static inline bool GetExternalPointer(Napi::Env env, Napi::Value value, void **out_ptr)
 {
     InstanceData *instance = env.GetInstanceData<InstanceData>();
 
-    if (!value.IsExternal() || CheckValueTag(instance, value, &TypeInfoMarker) ||
-                               CheckValueTag(instance, value, &CastMarker) ||
-                               CheckValueTag(instance, value, &MagicUnionMarker)) {
+    if (IsNullOrUndefined(value)) {
+        *out_ptr = 0;
+        return true;
+    } else if (value.IsExternal() && !CheckValueTag(instance, value, &TypeInfoMarker) &&
+                                     !CheckValueTag(instance, value, &CastMarker) &&
+                                     !CheckValueTag(instance, value, &MagicUnionMarker)) {
+        Napi::External<void> external = value.As<Napi::External<void>>();
+        void *ptr = external.Data();
+
+        *out_ptr = ptr;
+        return true;
+    } else {
         ThrowError<Napi::TypeError>(env, "Unexpected %1 value for ptr, expected external pointer", GetValueType(instance, value));
         return false;
     }
-
-    return true;
 }
 
 static Napi::Value CallFree(const Napi::CallbackInfo &info)
@@ -745,11 +752,10 @@ static Napi::Value CallFree(const Napi::CallbackInfo &info)
         ThrowError<Napi::TypeError>(env, "Expected 1 argument, got %1", info.Length());
         return env.Null();
     }
-    if (!CheckExternalPointer(env, info[0]))
-        return env.Null();
 
-    Napi::External<void> external = info[0].As<Napi::External<void>>();
-    void *ptr = external.Data();
+    void *ptr = nullptr;
+    if (!GetExternalPointer(env, info[0], &ptr))
+        return env.Null();
 
     free(ptr);
 
@@ -2030,11 +2036,10 @@ static Napi::Value GetPointerAddress(const Napi::CallbackInfo &info)
         ThrowError<Napi::TypeError>(env, "Expected 1 argument, got %1", info.Length());
         return env.Null();
     }
-    if (!CheckExternalPointer(env, info[0]))
-        return env.Null();
 
-    Napi::External<void> external = info[0].As<Napi::External<void>>();
-    void *ptr = external.Data();
+    void *ptr = nullptr;
+    if (!GetExternalPointer(env, info[0], &ptr))
+        return env.Null();
 
     uint64_t ptr64 = (uint64_t)(uintptr_t)ptr;
     Napi::BigInt bigint = Napi::BigInt::New(env, ptr64);