koffi 2.5.13 → 2.5.15

package/CHANGELOG.md

@@ -4,7 +4,11 @@
 
 ### Koffi 2.5
 
-#### Koffi 2.5.13 (2023-08-23)
+#### Koffi 2.5.15 (2023-08-24)
+
+- Run Koffi tests through usual index.js entry point
+
+#### Koffi 2.5.14 (2023-08-23)
 
 - Fix DLL error when using Koffi from NW.js on Windows
 - Simplify NW.js Koffi example

package/package.json

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

package/src/cnoke/assets/win_delay_hook.c

@@ -29,24 +29,41 @@
 #include <windows.h>
 #include <delayimp.h>
 
+static HMODULE node_dll;
+static HMODULE nw_dll;
+
 static FARPROC WINAPI self_exe_hook(unsigned int event, DelayLoadInfo *info)
 {
-    static const wchar_t *const NodeLibraries[] = {
-        L"node.dll",
-        NULL
-    };
-
-    if (event == dliNotePreLoadLibrary && !stricmp(info->szDll, "node.exe")) {
-        for (int i = 0; i < sizeof(NodeLibraries) / sizeof(*NodeLibraries); i++) {
-            const wchar_t *name = NodeLibraries[i];
-            HMODULE h = GetModuleHandleW(name);
-
-            if (h)
-                return (FARPROC)h;
+    if (event == dliStartProcessing) {
+        node_dll = GetModuleHandleA("node.dll");
+        nw_dll = GetModuleHandleA("nw.dll");
+
+        return NULL;
+    }
+
+    if (event == dliNotePreGetProcAddress) {
+        if (node_dll) {
+            FARPROC ret = GetProcAddress(node_dll, info->dlp.szProcName);
+            if (ret)
+                return ret;
+        }
+
+        if (nw_dll) {
+            FARPROC ret = GetProcAddress(nw_dll, info->dlp.szProcName);
+            if (ret)
+                return ret;
+        }
+    }
+
+    if (event == dliNotePreLoadLibrary && _stricmp(info->szDll, "node.exe") != 0) {
+        if (!node_dll) {
+            node_dll = GetModuleHandleA(NULL);
         }
+        return (FARPROC)node_dll;
     }
 
     return NULL;
 }
 
 const PfnDliHook __pfnDliNotifyHook2 = self_exe_hook;
+const PfnDliHook __pfnDliFailureHook2 = self_exe_hook;

package/src/cnoke/cnoke.js

@@ -77,6 +77,11 @@ async function main() {
                     throw new Error(`Missing value for ${arg}`);
 
                 config.project_dir = fs.realpathSync(value);
+            } else if (arg == '-o' || arg == '--output') {
+                if (value == null)
+                    throw new Error(`Missing value for ${arg}`);
+
+                config.output_directory = value;
             } else if ((command == 'build' || command == 'configure') && (arg == '-v' || arg == '--runtime-version')) {
                 if (value == null)
                     throw new Error(`Missing value for ${arg}`);
@@ -150,6 +155,8 @@ Commands:
 Options:
     -d, --directory <DIR>                Change project directory
                                          (default: current working directory)
+    -O, --output <DIR>                   Change explicit output directory
+                                         (default: ./build)
 
     -B, --config <CONFIG>                Change build type: RelWithDebInfo, Debug, Release
                                          (default: ${cnoke.DefaultOptions.mode})

package/src/cnoke/src/builder.js

@@ -36,7 +36,6 @@ function Builder(config = {}) {
 
     let app_dir = config.app_dir;
     let project_dir = config.project_dir;
-    let package_dir = null;
 
     if (app_dir == null)
         app_dir = __dirname.replace(/\\/g, '/') + '/..';
@@ -44,7 +43,6 @@ function Builder(config = {}) {
         project_dir = process.cwd();
     app_dir = app_dir.replace(/\\/g, '/');
     project_dir = project_dir.replace(/\\/g, '/');
-    package_dir = find_parent_directory(project_dir, 'package.json');
 
     let runtime_version = config.runtime_version;
     let arch = config.arch;
@@ -70,14 +68,15 @@ function Builder(config = {}) {
         let pkg = read_package_json();
 
         if (pkg.cnoke.output != null) {
-            build_dir = expand_path(pkg.cnoke.output);
+            build_dir = pkg.cnoke.output;
 
             if (!tools.path_is_absolute(build_dir))
-                build_dir = package_dir + '/' + build_dir;
+                build_dir = project_dir + '/' + build_dir;
         } else {
             build_dir = project_dir + '/build';
         }
     }
+    build_dir = expand_path(build_dir);
     work_dir = build_dir + `/v${runtime_version}_${arch}`;
 
     let cmake_bin = null;
@@ -286,7 +285,7 @@ function Builder(config = {}) {
                     archive_filename = url;
 
                     if (!tools.path_is_absolute(archive_filename))
-                        archive_filename = path.join(package_dir, archive_filename);
+                        archive_filename = path.join(project_dir, archive_filename);
 
                     if (!fs.existsSync(archive_filename))
                         throw new Error('Cannot find local prebuilt archive');
@@ -303,7 +302,7 @@ function Builder(config = {}) {
             let require_filename = expand_path(pkg.cnoke.require);
 
             if (!tools.path_is_absolute(require_filename))
-                require_filename = path.join(package_dir, require_filename);
+                require_filename = path.join(project_dir, require_filename);
 
             if (fs.existsSync(require_filename)) {
                 let proc = spawnSync(process.execPath, ['-e', 'require(process.argv[1])', require_filename]);
@@ -321,21 +320,6 @@ function Builder(config = {}) {
         tools.unlink_recursive(build_dir);
     };
 
-    function find_parent_directory(dirname, basename)
-    {
-        if (process.platform == 'win32')
-            dirname = dirname.replace(/\\/g, '/');
-
-        do {
-            if (fs.existsSync(dirname + '/' + basename))
-                return dirname;
-
-            dirname = path.dirname(dirname);
-        } while (!dirname.endsWith('/'));
-
-        return null;
-    }
-
     function get_cache_directory() {
         if (process.platform == 'win32') {
             let cache_dir = process.env['APPDATA'];
@@ -420,14 +404,12 @@ function Builder(config = {}) {
     function read_package_json() {
         let pkg = {};
 
-        if (package_dir != null) {
-            try {
-                let json = fs.readFileSync(package_dir + '/package.json', { encoding: 'utf-8' });
-                pkg = JSON.parse(json);
-            } catch (err) {
-                if (err.code != 'ENOENT')
-                    throw err;
-            }
+        try {
+            let json = fs.readFileSync(project_dir + '/package.json', { encoding: 'utf-8' });
+            pkg = JSON.parse(json);
+        } catch (err) {
+            if (err.code != 'ENOENT')
+                throw err;
         }
 
         if (pkg.cnoke == null)
@@ -437,7 +419,7 @@ function Builder(config = {}) {
     }
 
     function expand_path(str) {
-        let ret = str.replace(/{{([a-zA-Z_][a-zA-Z_0-9]*)}}/g, (match, p1) => {
+        let ret = str.replace(/{{ *([a-zA-Z_][a-zA-Z_0-9]*) *}}/g, (match, p1) => {
             switch (p1) {
                 case 'version': {
                     let pkg = read_package_json();

package/src/index.js

@@ -1,103 +1,558 @@
-// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the “Software”), to deal in 
-// the Software without restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
-// Software, and to permit persons to whom the Software is furnished to do so,
-// subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
+"use strict";
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
 
-'use strict';
+// build/dist/src/cnoke/src/tools.js
+var require_tools = __commonJS({
+  "build/dist/src/cnoke/src/tools.js"(exports2, module2) {
+    "use strict";
+    var crypto = require("crypto");
+    var fs2 = require("fs");
+    var http = require("https");
+    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 {
+        await new Promise((resolve, reject) => {
+          let request = http.get(url, (response) => {
+            if (response.statusCode != 200) {
+              let err = new Error(`Download failed: ${response.statusMessage} [${response.statusCode}]`);
+              err.code = response.statusCode;
+              reject(err);
+              return;
+            }
+            response.pipe(file);
+            file.on("finish", () => file.close(() => {
+              try {
+                fs2.renameSync(file.path, dest);
+              } catch (err) {
+                if (err.code != "EBUSY")
+                  reject(err);
+              }
+              resolve();
+            }));
+          });
+          request.on("error", reject);
+          file.on("error", reject);
+        });
+      } catch (err) {
+        file.close();
+        try {
+          fs2.unlinkSync(tmp_name);
+        } catch (err2) {
+          if (err2.code != "ENOENT")
+            throw err2;
+        }
+        throw err;
+      }
+    }
+    function open_temporary_stream(prefix) {
+      let buf = Buffer.allocUnsafe(4);
+      for (; ; ) {
+        try {
+          crypto.randomFillSync(buf);
+          let suffix = buf.toString("hex").padStart(8, "0");
+          let filename = `${prefix}.${suffix}`;
+          let file = fs2.createWriteStream(filename, { flags: "wx", mode: 420 });
+          return [filename, file];
+        } catch (err) {
+          if (err.code != "EEXIST")
+            throw err;
+        }
+      }
+    }
+    function extract_targz(filename, dest_dir, strip = 0) {
+      let reader = fs2.createReadStream(filename).pipe(zlib.createGunzip());
+      return new Promise((resolve, reject) => {
+        let header = null;
+        let extended = {};
+        reader.on("readable", () => {
+          try {
+            for (; ; ) {
+              if (header == null) {
+                let buf = reader.read(512);
+                if (buf == null)
+                  break;
+                if (!buf[0])
+                  continue;
+                header = {
+                  filename: buf.toString("utf-8", 0, 100).replace(/\0/g, ""),
+                  mode: parseInt(buf.toString("ascii", 100, 109), 8),
+                  size: parseInt(buf.toString("ascii", 124, 137), 8),
+                  type: String.fromCharCode(buf[156])
+                };
+                Object.assign(header, extended);
+                extended = {};
+                header.filename = header.filename.replace(/\\/g, "/");
+                if (!header.filename.length)
+                  throw new Error(`Insecure empty filename inside TAR archive`);
+                if (path_is_absolute(header.filename[0]))
+                  throw new Error(`Insecure filename starting with / inside TAR archive`);
+                if (path_has_dotdot(header.filename))
+                  throw new Error(`Insecure filename containing '..' inside TAR archive`);
+                for (let i = 0; i < strip; i++)
+                  header.filename = header.filename.substr(header.filename.indexOf("/") + 1);
+              }
+              let aligned = Math.floor((header.size + 511) / 512) * 512;
+              let data = header.size ? reader.read(aligned) : null;
+              if (data == null) {
+                if (header.size)
+                  break;
+                data = Buffer.alloc(0);
+              }
+              data = data.subarray(0, header.size);
+              if (header.type == "0" || header.type == "7") {
+                let filename2 = dest_dir + "/" + header.filename;
+                let dirname = path.dirname(filename2);
+                fs2.mkdirSync(dirname, { recursive: true, mode: 493 });
+                fs2.writeFileSync(filename2, data, { mode: header.mode });
+              } else if (header.type == "5") {
+                let filename2 = dest_dir + "/" + header.filename;
+                fs2.mkdirSync(filename2, { recursive: true, mode: header.mode });
+              } else if (header.type == "L") {
+                extended.filename = data.toString("utf-8").replace(/\0/g, "");
+              } else if (header.type == "x") {
+                let str = data.toString("utf-8");
+                try {
+                  while (str.length) {
+                    let matches = str.match(/^([0-9]+) ([a-zA-Z0-9\._]+)=(.*)\n/);
+                    let skip = parseInt(matches[1], 10);
+                    let key = matches[2];
+                    let value = matches[3];
+                    switch (key) {
+                      case "path":
+                        {
+                          extended.filename = value;
+                        }
+                        break;
+                      case "size":
+                        {
+                          extended.size = parseInt(value, 10);
+                        }
+                        break;
+                    }
+                    str = str.substr(skip).trimStart();
+                  }
+                } catch (err) {
+                  throw new Error("Malformed PAX entry");
+                }
+              }
+              header = null;
+            }
+          } catch (err) {
+            reject(err);
+          }
+        });
+        reader.on("error", reject);
+        reader.on("end", resolve);
+      });
+    }
+    function path_is_absolute(path2) {
+      if (process.platform == "win32" && path2.match(/^[a-zA-Z]:/))
+        path2 = path2.substr(2);
+      return is_path_separator(path2[0]);
+    }
+    function path_has_dotdot(path2) {
+      let start = 0;
+      for (; ; ) {
+        let offset = path2.indexOf("..", start);
+        if (offset < 0)
+          break;
+        start = offset + 2;
+        if (offset && !is_path_separator(path2[offset - 1]))
+          continue;
+        if (offset + 2 < path2.length && !is_path_separator(path2[offset + 2]))
+          continue;
+        return true;
+      }
+      return false;
+    }
+    function is_path_separator(c) {
+      if (c == "/")
+        return true;
+      if (process.platform == "win32" && c == "\\")
+        return true;
+      return false;
+    }
+    function determine_arch2() {
+      let arch2 = process.arch;
+      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;
+        switch (float_abi) {
+          case 0:
+            {
+              arch2 += "sf";
+            }
+            break;
+          case 1:
+            {
+              arch2 += "hf32";
+            }
+            break;
+          case 2:
+            {
+              arch2 += "hf64";
+            }
+            break;
+          case 3:
+            {
+              arch2 += "hf128";
+            }
+            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) {
+          arch2 += "hf";
+        } else if (header.e_flags & 512) {
+          arch2 += "sf";
+        } else {
+          throw new Error("Unknown ARM floating-point ABI");
+        }
+      }
+      return arch2;
+    }
+    function read_file_header(filename, read) {
+      let fd = null;
+      try {
+        let fd2 = fs2.openSync(filename);
+        let buf = Buffer.allocUnsafe(read);
+        let len = fs2.readSync(fd2, buf);
+        return buf.subarray(0, len);
+      } finally {
+        if (fd != null)
+          fs2.closeSync(fd);
+      }
+    }
+    function decode_elf_header(buf) {
+      let header = {};
+      if (buf.length < 16)
+        throw new Error("Truncated header");
+      if (buf[0] != 127 || buf[1] != 69 || buf[2] != 76 || buf[3] != 70)
+        throw new Error("Invalid magic number");
+      if (buf[6] != 1)
+        throw new Error("Invalid ELF version");
+      if (buf[5] != 1)
+        throw new Error("Big-endian architectures are not supported");
+      let machine = buf.readUInt16LE(18);
+      switch (machine) {
+        case 3:
+          {
+            header.e_machine = "ia32";
+          }
+          break;
+        case 40:
+          {
+            header.e_machine = "arm";
+          }
+          break;
+        case 62:
+          {
+            header.e_machine = "amd64";
+          }
+          break;
+        case 183:
+          {
+            header.e_machine = "arm64";
+          }
+          break;
+        case 243:
+          {
+            switch (buf[4]) {
+              case 1:
+                {
+                  header.e_machine = "riscv32";
+                }
+                break;
+              case 2:
+                {
+                  header.e_machine = "riscv64";
+                }
+                break;
+            }
+          }
+          break;
+        default:
+          throw new Error("Unknown ELF machine type");
+      }
+      switch (buf[4]) {
+        case 1:
+          {
+            buf = buf.subarray(0, 68);
+            if (buf.length < 68)
+              throw new Error("Truncated ELF header");
+            header.ei_class = 32;
+            header.e_flags = buf.readUInt32LE(36);
+          }
+          break;
+        case 2:
+          {
+            buf = buf.subarray(0, 120);
+            if (buf.length < 120)
+              throw new Error("Truncated ELF header");
+            header.ei_class = 64;
+            header.e_flags = buf.readUInt32LE(48);
+          }
+          break;
+        default:
+          throw new Error("Invalid ELF class");
+      }
+      return header;
+    }
+    function unlink_recursive(path2) {
+      try {
+        if (fs2.rmSync != null) {
+          fs2.rmSync(path2, { recursive: true, maxRetries: process.platform == "win32" ? 3 : 0 });
+        } else {
+          fs2.rmdirSync(path2, { recursive: true, maxRetries: process.platform == "win32" ? 3 : 0 });
+        }
+      } catch (err) {
+        if (err.code !== "ENOENT")
+          throw err;
+      }
+    }
+    function get_napi_version2(napi, major) {
+      if (napi > 8)
+        return null;
+      const support = {
+        6: ["6.14.2", "6.14.2", "6.14.2"],
+        8: ["8.6.0", "8.10.0", "8.11.2"],
+        9: ["9.0.0", "9.3.0", "9.11.0"],
+        10: ["10.0.0", "10.0.0", "10.0.0", "10.16.0", "10.17.0", "10.20.0", "10.23.0"],
+        11: ["11.0.0", "11.0.0", "11.0.0", "11.8.0"],
+        12: ["12.0.0", "12.0.0", "12.0.0", "12.0.0", "12.11.0", "12.17.0", "12.19.0", "12.22.0"],
+        13: ["13.0.0", "13.0.0", "13.0.0", "13.0.0", "13.0.0"],
+        14: ["14.0.0", "14.0.0", "14.0.0", "14.0.0", "14.0.0", "14.0.0", "14.12.0", "14.17.0"],
+        15: ["15.0.0", "15.0.0", "15.0.0", "15.0.0", "15.0.0", "15.0.0", "15.0.0", "15.12.0"]
+      };
+      const max = Math.max(...Object.keys(support).map((k) => parseInt(k, 10)));
+      if (major > max)
+        return major + ".0.0";
+      if (support[major] == null)
+        return null;
+      let required = support[major][napi - 1] || null;
+      return required;
+    }
+    function cmp_version(ver1, ver2) {
+      ver1 = String(ver1).replace(/-.*$/, "").split(".").reduce((acc, v, idx) => acc + parseInt(v, 10) * Math.pow(10, 2 * (5 - idx)), 0);
+      ver2 = String(ver2).replace(/-.*$/, "").split(".").reduce((acc, v, idx) => acc + parseInt(v, 10) * Math.pow(10, 2 * (5 - idx)), 0);
+      let cmp = Math.min(Math.max(ver1 - ver2, -1), 1);
+      return cmp;
+    }
+    module2.exports = {
+      download_http,
+      extract_targz,
+      path_is_absolute,
+      path_has_dotdot,
+      determine_arch: determine_arch2,
+      unlink_recursive,
+      get_napi_version: get_napi_version2,
+      cmp_version
+    };
+  }
+});
 
-const util = require('util');
-const fs = require('fs');
-const { get_napi_version, determine_arch } = require('./cnoke/src/tools.js');
-const pkg = require('../package.json');
+// build/dist/src/koffi/package.json
+var require_package = __commonJS({
+  "build/dist/src/koffi/package.json"(exports2, module2) {
+    module2.exports = {
+      name: "koffi",
+      version: "2.5.15",
+      stable: "2.5.15",
+      description: "Fast and simple C FFI (foreign function interface) for Node.js",
+      keywords: [
+        "foreign",
+        "function",
+        "interface",
+        "ffi",
+        "binding",
+        "c",
+        "napi"
+      ],
+      repository: {
+        type: "git",
+        url: "https://github.com/Koromix/koffi"
+      },
+      homepage: "https://koffi.dev/",
+      author: {
+        name: "Niels Martign\xE8ne",
+        email: "niels.martignene@protonmail.com",
+        url: "https://koromix.dev/"
+      },
+      main: "src/index.js",
+      types: "src/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"
+      },
+      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.9.2",
+        "ref-napi": "^3.0.3",
+        "ref-struct-di": "^1.1.1",
+        tar: "^6.1.11"
+      },
+      cnoke: {
+        output: "build/koffi/{{ platform }}_{{ arch }}",
+        napi: 8,
+        require: "./src/index.js"
+      }
+    };
+  }
+});
 
+// build/dist/src/koffi/src/index.js
+var util = require("util");
+var fs = require("fs");
+var { get_napi_version, determine_arch } = require_tools();
+var pkg = require_package();
 if (process.versions.napi == null || process.versions.napi < pkg.cnoke.napi) {
-    let major = parseInt(process.versions.node, 10);
-    let required = get_napi_version(pkg.cnoke.napi, major);
-
-    if (required != null) {
-        throw new Error(`Project ${pkg.name} requires Node >= ${required} in the Node ${major}.x branch (N-API >= ${pkg.cnoke.napi})`);
-    } else {
-        throw new Error(`Project ${pkg.name} does not support the Node ${major}.x branch (N-API < ${pkg.cnoke.napi})`);
-    }
+  let major = parseInt(process.versions.node, 10);
+  let required = get_napi_version(pkg.cnoke.napi, major);
+  if (required != null) {
+    throw new Error(`Project ${pkg.name} requires Node >= ${required} in the Node ${major}.x branch (N-API >= ${pkg.cnoke.napi})`);
+  } else {
+    throw new Error(`Project ${pkg.name} does not support the Node ${major}.x branch (N-API < ${pkg.cnoke.napi})`);
+  }
 }
-
-let arch = determine_arch();
-let triplet = `${process.platform}_${arch}`;
-
-let native = null;
-
-// Try an explicit list with static strings to help bundlers
+var arch = determine_arch();
+var triplet = `${process.platform}_${arch}`;
+var native = null;
 try {
-    switch (triplet) {
-        case 'darwin_arm64': { native = require('../build/koffi/darwin_arm64/koffi.node'); } break;
-        case 'darwin_x64': { native = require('../build/koffi/darwin_x64/koffi.node'); } break;
-        case 'freebsd_arm64': { native = require('../build/koffi/freebsd_arm64/koffi.node'); } break;
-        case 'freebsd_ia32': { native = require('../build/koffi/freebsd_ia32/koffi.node'); } break;
-        case 'freebsd_x64': { native = require('../build/koffi/freebsd_x64/koffi.node'); } break;
-        case 'linux_arm32hf': { native = require('../build/koffi/linux_arm32hf/koffi.node'); } break;
-        case 'linux_arm64': { native = require('../build/koffi/linux_arm64/koffi.node'); } break;
-        case 'linux_ia32': { native = require('../build/koffi/linux_ia32/koffi.node'); } break;
-        case 'linux_riscv64hf64': { native = require('../build/koffi/linux_riscv64hf64/koffi.node'); } break;
-        case 'linux_x64': { native = require('../build/koffi/linux_x64/koffi.node'); } break;
-        case 'openbsd_ia32': { native = require('../build/koffi/openbsd_ia32/koffi.node'); } break;
-        case 'openbsd_x64': { native = require('../build/koffi/openbsd_x64/koffi.node'); } break;
-        case 'win32_arm64': { native = require('../build/koffi/win32_arm64/koffi.node'); } break;
-        case 'win32_ia32': { native = require('../build/koffi/win32_ia32/koffi.node'); } break;
-        case 'win32_x64': { native = require('../build/koffi/win32_x64/koffi.node'); } break;
-    }
+  switch (triplet) {
+    case "darwin_arm64":
+      {
+        native = require("../build/koffi/darwin_arm64/koffi.node");
+      }
+      break;
+    case "darwin_x64":
+      {
+        native = require("../build/koffi/darwin_x64/koffi.node");
+      }
+      break;
+    case "freebsd_arm64":
+      {
+        native = require("../build/koffi/freebsd_arm64/koffi.node");
+      }
+      break;
+    case "freebsd_ia32":
+      {
+        native = require("../build/koffi/freebsd_ia32/koffi.node");
+      }
+      break;
+    case "freebsd_x64":
+      {
+        native = require("../build/koffi/freebsd_x64/koffi.node");
+      }
+      break;
+    case "linux_arm32hf":
+      {
+        native = require("../build/koffi/linux_arm32hf/koffi.node");
+      }
+      break;
+    case "linux_arm64":
+      {
+        native = require("../build/koffi/linux_arm64/koffi.node");
+      }
+      break;
+    case "linux_ia32":
+      {
+        native = require("../build/koffi/linux_ia32/koffi.node");
+      }
+      break;
+    case "linux_riscv64hf64":
+      {
+        native = require("../build/koffi/linux_riscv64hf64/koffi.node");
+      }
+      break;
+    case "linux_x64":
+      {
+        native = require("../build/koffi/linux_x64/koffi.node");
+      }
+      break;
+    case "openbsd_ia32":
+      {
+        native = require("../build/koffi/openbsd_ia32/koffi.node");
+      }
+      break;
+    case "openbsd_x64":
+      {
+        native = require("../build/koffi/openbsd_x64/koffi.node");
+      }
+      break;
+    case "win32_arm64":
+      {
+        native = require("../build/koffi/win32_arm64/koffi.node");
+      }
+      break;
+    case "win32_ia32":
+      {
+        native = require("../build/koffi/win32_ia32/koffi.node");
+      }
+      break;
+    case "win32_x64":
+      {
+        native = require("../build/koffi/win32_x64/koffi.node");
+      }
+      break;
+  }
 } catch (err) {
-    // Go on!
 }
-
-// And now, search everywhere we know
 if (native == null) {
-    let names = [
-        `/koffi/${process.platform}_${arch}/koffi.node`,
-        `/node_modules/koffi/build/koffi/${process.platform}_${arch}/koffi.node`
-    ];
-
-    for (let name of names) {
-        if (fs.existsSync(__dirname + name)) {
-            native = require(__dirname + name);
-            break;
-        }
+  let names = [
+    `/koffi/${process.platform}_${arch}/koffi.node`,
+    `/node_modules/koffi/build/koffi/${process.platform}_${arch}/koffi.node`
+  ];
+  for (let name of names) {
+    if (fs.existsSync(__dirname + name)) {
+      native = require(__dirname + name);
+      break;
     }
-
-    if (native == null && process.resourcesPath != null) {
-        for (let name of names) {
-            if (fs.existsSync(process.resourcesPath + name)) {
-                native = require(process.resourcesPath + name);
-                break;
-            }
-        }
+  }
+  if (native == null && process.resourcesPath != null) {
+    for (let name of names) {
+      if (fs.existsSync(process.resourcesPath + name)) {
+        native = require(process.resourcesPath + name);
+        break;
+      }
     }
+  }
 }
-
 if (native == null)
-    throw new Error('Cannot find the native Koffi module; did you bundle it correctly?');
+  throw new Error("Cannot find the native Koffi module; did you bundle it correctly?");
 if (native.version != pkg.version)
-    throw new Error('Mismatched native Koffi modules');
-
+  throw new Error("Mismatched native Koffi modules");
 module.exports = {
-    ...native,
-
-    // Deprecated functions
-    handle: util.deprecate(native.opaque, 'The koffi.handle() function was deprecated in Koffi 2.1, use koffi.opaque() instead', 'KOFFI001'),
-    callback: util.deprecate(native.proto, 'The koffi.callback() function was deprecated in Koffi 2.4, use koffi.proto() instead', 'KOFFI002')
+  ...native,
+  // Deprecated functions
+  handle: util.deprecate(native.opaque, "The koffi.handle() function was deprecated in Koffi 2.1, use koffi.opaque() instead", "KOFFI001"),
+  callback: util.deprecate(native.proto, "The koffi.callback() function was deprecated in Koffi 2.4, use koffi.proto() instead", "KOFFI002")
 };

package/src/koffi/examples/nwjs/src/package.json

@@ -5,6 +5,6 @@
   "author": "Niels Martignène <niels.martignene@protonmail.com>",
   "license": "MIT",
   "dependencies": {
-    "koffi": "^2.5.9"
+    "koffi": "^2.5.14"
   }
 }