koffi 2.8.9 → 2.8.11

package/CHANGELOG.md

@@ -4,6 +4,10 @@
 
 ### Koffi 2.8
 
+#### Koffi 2.8.10 (2024-06-17)
+
+- Work around MSVC compiler bug introduced in Visual Studio 17.10
+
 #### Koffi 2.8.9 (2024-05-17)
 
 - Fix ABI issue regarding bool return values on x86_64 (and possibly other platforms)

package/index.js

@@ -4,9 +4,9 @@ var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 
-// build/dist/src/cnoke/src/tools.js
+// ../../bin/Koffi/package/src/cnoke/src/tools.js
 var require_tools = __commonJS({
-  "build/dist/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");
@@ -14,19 +14,6 @@ var require_tools = __commonJS({
     var path = require("path");
     var zlib = require("zlib");
     async function download_http(url, dest) {
-      if (Array.isArray(url)) {
-        let urls = url;
-        for (let url2 of urls) {
-          try {
-            await download_http(url2, dest);
-            return;
-          } catch (err) {
-            if (err.code != 404)
-              throw err;
-          }
-        }
-        throw new Error("All URLs returned error 404");
-      }
       console.log(">> Downloading " + url);
       let [tmp_name, file] = open_temporary_stream(dest);
       try {
@@ -196,31 +183,29 @@ var require_tools = __commonJS({
       if (arch2 == "riscv32" || arch2 == "riscv64") {
         let buf = read_file_header(process.execPath, 512);
         let header = decode_elf_header(buf);
-        let float_abi = (header.e_flags & 6) >> 1;
+        let float_abi = header.e_flags & 6;
         switch (float_abi) {
           case 0:
             {
-              arch2 += "sf";
             }
             break;
-          case 1:
+          case 2:
             {
-              arch2 += "hf32";
+              arch2 += "f";
             }
             break;
-          case 2:
+          case 4:
             {
-              arch2 += "hf64";
+              arch2 += "d";
             }
             break;
-          case 3:
+          case 6:
             {
-              arch2 += "hf128";
+              arch2 += "q";
             }
             break;
         }
       } else if (arch2 == "arm") {
-        arch2 = "arm32";
         let buf = read_file_header(process.execPath, 512);
         let header = decode_elf_header(buf);
         if (header.e_flags & 1024) {
@@ -373,13 +358,13 @@ var require_tools = __commonJS({
   }
 });
 
-// build/dist/src/koffi/package.json
+// ../../bin/Koffi/package/src/koffi/package.json
 var require_package = __commonJS({
-  "build/dist/src/koffi/package.json"(exports2, module2) {
+  "../../bin/Koffi/package/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.8.9",
-      stable: "2.8.9",
+      version: "2.8.10",
+      stable: "2.8.10",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",
@@ -403,25 +388,19 @@ var require_package = __commonJS({
       main: "./index.js",
       types: "./index.d.ts",
       scripts: {
-        test: "node tools/qemu.js test",
-        prepack: `echo 'Use "npm run prepare" instead' && false`,
-        prepublishOnly: `echo 'Use "npm run release" instead' && false`,
-        release: "node tools/qemu.js publish"
+        test: "node tools/koffi.js test",
+        prepack: `echo 'Use "npm run package" instead' && false`,
+        prepublishOnly: `echo 'Use "npm run package" instead' && false`,
+        package: "node tools/koffi.js build"
       },
       license: "MIT",
       devDependencies: {
-        chalk: "^4.1.2",
-        esbuild: "^0.19.2",
-        "ffi-napi": "^4.0.3",
-        minimatch: "^5.0.1",
-        "node-ssh": "^12.0.3",
-        raylib: "^0.14.0",
-        "ref-napi": "^3.0.3",
-        "ref-struct-di": "^1.1.1",
-        tar: "^6.1.11"
+        esbuild: "^0.19.2"
       },
       cnoke: {
-        output: "build/koffi/{{ platform }}_{{ arch }}",
+        api: "../../vendor/node-api-headers",
+        output: "../../bin/Koffi/{{ platform }}_{{ arch }}",
+        node: 16,
         napi: 8,
         require: "./index.js"
       }
@@ -429,7 +408,7 @@ var require_package = __commonJS({
   }
 });
 
-// build/dist/src/koffi/index.js
+// ../../bin/Koffi/package/src/koffi/index.js
 var util = require("util");
 var fs = require("fs");
 var { get_napi_version, determine_arch } = require_tools();
@@ -473,9 +452,9 @@ try {
         native = require("./build/koffi/freebsd_x64/koffi.node");
       }
       break;
-    case "linux_arm32hf":
+    case "linux_armhf":
       {
-        native = require("./build/koffi/linux_arm32hf/koffi.node");
+        native = require("./build/koffi/linux_armhf/koffi.node");
       }
       break;
     case "linux_arm64":
@@ -488,9 +467,9 @@ try {
         native = require("./build/koffi/linux_ia32/koffi.node");
       }
       break;
-    case "linux_riscv64hf64":
+    case "linux_riscv64d":
       {
-        native = require("./build/koffi/linux_riscv64hf64/koffi.node");
+        native = require("./build/koffi/linux_riscv64d/koffi.node");
       }
       break;
     case "linux_x64":
@@ -533,7 +512,8 @@ if (native == null) {
   let names = [
     `/build/koffi/${process.platform}_${arch}/koffi.node`,
     `/koffi/${process.platform}_${arch}/koffi.node`,
-    `/node_modules/koffi/build/koffi/${process.platform}_${arch}/koffi.node`
+    `/node_modules/koffi/build/koffi/${process.platform}_${arch}/koffi.node`,
+    `/../../bin/Koffi/${process.platform}_${arch}/koffi.node`
   ];
   for (let root of roots) {
     for (let name of names) {

package/indirect.js

@@ -4,9 +4,9 @@ var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 
-// build/dist/src/cnoke/src/tools.js
+// ../../bin/Koffi/package/src/cnoke/src/tools.js
 var require_tools = __commonJS({
-  "build/dist/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");
@@ -14,19 +14,6 @@ var require_tools = __commonJS({
     var path = require("path");
     var zlib = require("zlib");
     async function download_http(url, dest) {
-      if (Array.isArray(url)) {
-        let urls = url;
-        for (let url2 of urls) {
-          try {
-            await download_http(url2, dest);
-            return;
-          } catch (err) {
-            if (err.code != 404)
-              throw err;
-          }
-        }
-        throw new Error("All URLs returned error 404");
-      }
       console.log(">> Downloading " + url);
       let [tmp_name, file] = open_temporary_stream(dest);
       try {
@@ -196,31 +183,29 @@ var require_tools = __commonJS({
       if (arch2 == "riscv32" || arch2 == "riscv64") {
         let buf = read_file_header(process.execPath, 512);
         let header = decode_elf_header(buf);
-        let float_abi = (header.e_flags & 6) >> 1;
+        let float_abi = header.e_flags & 6;
         switch (float_abi) {
           case 0:
             {
-              arch2 += "sf";
             }
             break;
-          case 1:
+          case 2:
             {
-              arch2 += "hf32";
+              arch2 += "f";
             }
             break;
-          case 2:
+          case 4:
             {
-              arch2 += "hf64";
+              arch2 += "d";
             }
             break;
-          case 3:
+          case 6:
             {
-              arch2 += "hf128";
+              arch2 += "q";
             }
             break;
         }
       } else if (arch2 == "arm") {
-        arch2 = "arm32";
         let buf = read_file_header(process.execPath, 512);
         let header = decode_elf_header(buf);
         if (header.e_flags & 1024) {
@@ -373,13 +358,13 @@ var require_tools = __commonJS({
   }
 });
 
-// build/dist/src/koffi/package.json
+// ../../bin/Koffi/package/src/koffi/package.json
 var require_package = __commonJS({
-  "build/dist/src/koffi/package.json"(exports2, module2) {
+  "../../bin/Koffi/package/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.8.9",
-      stable: "2.8.9",
+      version: "2.8.10",
+      stable: "2.8.10",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",
@@ -403,25 +388,19 @@ var require_package = __commonJS({
       main: "./index.js",
       types: "./index.d.ts",
       scripts: {
-        test: "node tools/qemu.js test",
-        prepack: `echo 'Use "npm run prepare" instead' && false`,
-        prepublishOnly: `echo 'Use "npm run release" instead' && false`,
-        release: "node tools/qemu.js publish"
+        test: "node tools/koffi.js test",
+        prepack: `echo 'Use "npm run package" instead' && false`,
+        prepublishOnly: `echo 'Use "npm run package" instead' && false`,
+        package: "node tools/koffi.js build"
       },
       license: "MIT",
       devDependencies: {
-        chalk: "^4.1.2",
-        esbuild: "^0.19.2",
-        "ffi-napi": "^4.0.3",
-        minimatch: "^5.0.1",
-        "node-ssh": "^12.0.3",
-        raylib: "^0.14.0",
-        "ref-napi": "^3.0.3",
-        "ref-struct-di": "^1.1.1",
-        tar: "^6.1.11"
+        esbuild: "^0.19.2"
       },
       cnoke: {
-        output: "build/koffi/{{ platform }}_{{ arch }}",
+        api: "../../vendor/node-api-headers",
+        output: "../../bin/Koffi/{{ platform }}_{{ arch }}",
+        node: 16,
         napi: 8,
         require: "./index.js"
       }
@@ -429,7 +408,7 @@ var require_package = __commonJS({
   }
 });
 
-// build/dist/src/koffi/indirect.js
+// ../../bin/Koffi/package/src/koffi/indirect.js
 var util = require("util");
 var fs = require("fs");
 var { get_napi_version, determine_arch } = require_tools();
@@ -453,7 +432,8 @@ var native = null;
   let names = [
     `/build/koffi/${process.platform}_${arch}/koffi.node`,
     `/koffi/${process.platform}_${arch}/koffi.node`,
-    `/node_modules/koffi/build/koffi/${process.platform}_${arch}/koffi.node`
+    `/node_modules/koffi/build/koffi/${process.platform}_${arch}/koffi.node`,
+    `/../../bin/Koffi/${process.platform}_${arch}/koffi.node`
   ];
   for (let root of roots) {
     for (let name of names) {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "koffi",
-    "version": "2.8.9",
-    "stable": "2.8.9",
+    "version": "2.8.11",
+    "stable": "2.8.11",
     "description": "Fast and simple C FFI (foreign function interface) for Node.js",
     "keywords": [
         "foreign",
@@ -29,8 +29,10 @@
     },
     "license": "MIT",
     "cnoke": {
+        "api": "../../vendor/node-api-headers",
         "output": "build/koffi/{{ platform }}_{{ arch }}",
+        "node": 16,
         "napi": 8,
         "require": "./index.js"
     }
-}
+}

package/src/cnoke/assets/FindCNoke.cmake

@@ -26,9 +26,17 @@ else()
     set(USE_UNITY_BUILDS OFF CACHE BOOL "Use single-TU builds (aka. Unity builds)")
 endif()
 
+if(NODE_JS_LINK_DEF)
+    add_custom_command(OUTPUT ${NODE_JS_LINK_LIB}
+                       COMMAND ${CMAKE_AR} ${CMAKE_STATIC_LINKER_FLAGS}
+                               /def:${NODE_JS_LINK_DEF} /out:${NODE_JS_LINK_LIB}
+                       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                       MAIN_DEPENDENCY ${NODE_JS_LINK_DEF})
+    add_custom_target(node.lib DEPENDS ${NODE_JS_LINK_LIB})
+endif()
+
 function(add_node_addon)
     cmake_parse_arguments(ARG "" "NAME" "SOURCES" ${ARGN})
-
     add_library(${ARG_NAME} SHARED ${ARG_SOURCES} ${NODE_JS_SOURCES})
     target_link_node(${ARG_NAME})
     set_target_properties(${ARG_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
@@ -36,9 +44,14 @@ endfunction()
 
 function(target_link_node TARGET)
     target_include_directories(${TARGET} PRIVATE ${NODE_JS_INCLUDE_DIRS})
-    target_link_libraries(${TARGET} PRIVATE ${NODE_JS_LIBRARIES})
+    if(NODE_JS_LINK_LIB)
+        if(TARGET node.lib)
+            add_dependencies(${TARGET} node.lib)
+        endif()
+        target_link_libraries(${TARGET} PRIVATE ${NODE_JS_LINK_LIB})
+    endif()
     target_compile_options(${TARGET} PRIVATE ${NODE_JS_COMPILE_FLAGS})
-    if (NODE_JS_LINK_FLAGS)
+    if(NODE_JS_LINK_FLAGS)
         target_link_options(${TARGET} PRIVATE ${NODE_JS_LINK_FLAGS})
     endif()
 endfunction()