koffi 3.0.0-alpha.5 → 3.0.0-alpha.6

package/doc/contribute.md

@@ -145,8 +145,10 @@ cd src/koffi
 node tools/brew.js test # If not done before
 node tools/brew.js build
 
-cd ../../bin/Koffi/package
-npm publish
+cd ../../bin/koffi/packages
+
+./prepare.sh
+./publish.sh
 ```
 
 Some platforms are emulated so this can take a few minutes until the pre-built binaries are ready. Go grab a cup of coffee, come back and execute the `npm publish` command!

package/doc/packaging.md

@@ -11,7 +11,7 @@ Koffi uses native modules to work. The NPM package contains binaries for various
 
 In theory, the **packagers/bundlers should be able to find all native modules** because they are explictly listed in the Javascript file (as static strings) and package them somehow.
 
-If that is not the case, you can manually arrange to copy the `node_modules/koffi/build/koffi` directory next to your bundled script.
+If that is not the case, you can manually arrange to copy the `node_modules/koffi/bin/koffi` directory next to your bundled script.
 
 Here is an example that would work:
 

package/index.d.ts

@@ -152,8 +152,6 @@ type KoffiConfig = {
     resident_async_pools?: number;
     max_async_calls?: number;
     max_type_size?: number;
-    fast_pointers?: boolean;
-    fast_callbacks?: boolean;
 };
 type KoffiStats = {
     disposed: number

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koffi",
-    "version": "3.0.0-alpha.5",
+    "version": "3.0.0-alpha.6",
     "description": "Fast and simple C FFI (foreign function interface) for Node.js",
     "keywords": [
         "foreign",
@@ -21,18 +21,29 @@
         "email": "niels.martignene@protonmail.com",
         "url": "https://koromix.dev/"
     },
-    "module": "./index.js",
     "scripts": {
-        "install": "node src/build.js -P . -D src/koffi --prebuild --release"
+        "install": "node ./build.js -P . -D src/koffi --prebuild --release"
     },
     "license": "MIT",
     "cnoke": {
         "api": "../../vendor/node-api-headers",
-        "output": "build/koffi/{{ toolchain }}",
+        "output": "bin/koffi/{{ toolchain }}",
         "node": 16,
         "napi": 8
     },
     "funding": "https://liberapay.com/Koromix",
+    "type": "module",
     "main": "./index.cjs",
+    "module": "./index.js",
+    "exports": {
+        ".": {
+            "import": "./index.js",
+            "require": "./index.cjs"
+        },
+        "./indirect": {
+            "import": "./indirect.js",
+            "require": "./indirect.cjs"
+        }
+    },
     "types": "./index.d.ts"
 }

package/src/koffi/index.cjs

@@ -7,6 +7,9 @@ var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
 };
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -128,47 +131,7 @@ var init_abi = __esm({
 var package_default;
 var init_package = __esm({
   "package.json"() {
-    package_default = {
-      name: "koffi",
-      version: "3.0.0-alpha.5",
-      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: "./index.cjs",
-      module: "./index.js",
-      types: "./index.d.ts",
-      scripts: {
-        test: "node tools/brew.js test",
-        prepack: `echo 'Use "npm run package" instead' && false`,
-        prepublishOnly: `echo 'Use "npm run package" instead' && false`,
-        package: "node tools/brew.js build"
-      },
-      license: "MIT",
-      cnoke: {
-        api: "../../vendor/node-api-headers",
-        output: "../../bin/Koffi/{{ toolchain }}",
-        node: 16,
-        napi: 8
-      },
-      funding: "https://liberapay.com/Koromix"
-    };
+    package_default = { name: "koffi", version: "3.0.0-alpha.6", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/koffi/{{ toolchain }}", node: 16, napi: 8 } };
   }
 });
 
@@ -195,19 +158,17 @@ function loadDynamic(root, pkg2, triplets2) {
   let roots = [root];
   let native2 = null;
   let err = null;
-  if (process.resourcesPath != null)
+  if (process.resourcesPath != null) {
     roots.push(process.resourcesPath);
-  let filenames = roots.flatMap((dir) => triplets2.flatMap((triplet) => [
-    `${dir}/build/koffi/${triplet}/koffi.node`,
-    `${dir}/bin/Koffi/${triplet}/koffi.node`,
-    `${dir}/node_modules/koffi/build/koffi/${triplet}/koffi.node`,
-    `${dir}/../@koromix/koffi-${pkg2}/${triplet}/koffi.node`
-  ]));
-  for (let filename of filenames) {
-    if (!import_fs2.default.existsSync(filename))
-      continue;
+    roots.push(process.resourcesPath + "/node_modules/koffi");
+  }
+  let names = [
+    `@koromix/koffi-${pkg2}`,
+    ...triplets2.flatMap((triplet) => roots.map((dir) => `${dir}/bin/koffi/${triplet}/koffi.node`))
+  ];
+  for (let name of names) {
     try {
-      native2 = requireNative(filename);
+      native2 = requireNative(name);
       break;
     } catch (e) {
       err ??= e;
@@ -230,11 +191,10 @@ function wrapNative(native2) {
     return lib;
   };
 }
-var import_util, import_fs2, import_node_module, requireNative;
+var import_util, import_node_module, requireNative;
 var init_init = __esm({
   "src/init.js"() {
     import_util = __toESM(require("util"));
-    import_fs2 = __toESM(require("fs"));
     import_node_module = require("node:module");
     init_abi();
     init_package();
@@ -242,10 +202,111 @@ var init_init = __esm({
   }
 });
 
+// src/static.js
+var require_static = __commonJS({
+  "src/static.js"(exports2, module2) {
+    var { createRequire: createRequire2 } = require("node:module");
+    var requireNative2 = createRequire2(__dirname);
+    function loadStatic2(pkg2) {
+      let native2 = null;
+      if (native2 == null && pkg2 == "linux-arm64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/linux_arm64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "linux-arm64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/musl_arm64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "linux-ia32") {
+        try {
+          native2 = requireNative2("../../bin/koffi/linux_ia32/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "linux-x64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/linux_x64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "linux-x64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/musl_x64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "freebsd-ia32") {
+        try {
+          native2 = requireNative2("../../bin/koffi/freebsd_ia32/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "freebsd-x64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/freebsd_x64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "freebsd-arm64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/freebsd_arm64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "openbsd-ia32") {
+        try {
+          native2 = requireNative2("../../bin/koffi/openbsd_ia32/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "openbsd-x64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/openbsd_x64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "win32-ia32") {
+        try {
+          native2 = requireNative2("../../bin/koffi/win32_ia32/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "win32-x64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/win32_x64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "darwin-x64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/darwin_x64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "darwin-arm64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/darwin_arm64/koffi.node");
+        } catch (err) {
+        }
+      }
+      return native2;
+    }
+    module2.exports = { loadStatic: loadStatic2 };
+  }
+});
+
 // index.cjs
 var { detectPlatform: detectPlatform2, loadDynamic: loadDynamic2, wrapNative: wrapNative2 } = (init_init(), __toCommonJS(init_exports));
+var { loadStatic } = require_static();
 var [version, pkg, triplets] = detectPlatform2();
-var native = loadDynamic2(__dirname + "/../..", pkg, triplets);
+var native = null;
+STATIC: native = loadStatic(pkg);
+if (native == null)
+  native = loadDynamic2(__dirname + "/../..", pkg, triplets);
 if (native.version != version)
   throw new Error("Mismatched native Koffi modules");
 wrapNative2(native);

package/src/koffi/index.js

@@ -1,6 +1,5 @@
 // src/init.js
 import util from "util";
-import fs2 from "fs";
 import { createRequire } from "node:module";
 
 // ../cnoke/src/abi.js
@@ -94,47 +93,7 @@ function decodeElfHeader(buf) {
 }
 
 // package.json
-var package_default = {
-  name: "koffi",
-  version: "3.0.0-alpha.5",
-  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: "./index.cjs",
-  module: "./index.js",
-  types: "./index.d.ts",
-  scripts: {
-    test: "node tools/brew.js test",
-    prepack: `echo 'Use "npm run package" instead' && false`,
-    prepublishOnly: `echo 'Use "npm run package" instead' && false`,
-    package: "node tools/brew.js build"
-  },
-  license: "MIT",
-  cnoke: {
-    api: "../../vendor/node-api-headers",
-    output: "../../bin/Koffi/{{ toolchain }}",
-    node: 16,
-    napi: 8
-  },
-  funding: "https://liberapay.com/Koromix"
-};
+var package_default = { name: "koffi", version: "3.0.0-alpha.6", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/koffi/{{ toolchain }}", node: 16, napi: 8 } };
 
 // src/init.js
 var requireNative = createRequire(import.meta.dirname);
@@ -154,19 +113,17 @@ function loadDynamic(root, pkg2, triplets2) {
   let roots = [root];
   let native2 = null;
   let err = null;
-  if (process.resourcesPath != null)
+  if (process.resourcesPath != null) {
     roots.push(process.resourcesPath);
-  let filenames = roots.flatMap((dir) => triplets2.flatMap((triplet) => [
-    `${dir}/build/koffi/${triplet}/koffi.node`,
-    `${dir}/bin/Koffi/${triplet}/koffi.node`,
-    `${dir}/node_modules/koffi/build/koffi/${triplet}/koffi.node`,
-    `${dir}/../@koromix/koffi-${pkg2}/${triplet}/koffi.node`
-  ]));
-  for (let filename of filenames) {
-    if (!fs2.existsSync(filename))
-      continue;
+    roots.push(process.resourcesPath + "/node_modules/koffi");
+  }
+  let names = [
+    `@koromix/koffi-${pkg2}`,
+    ...triplets2.flatMap((triplet) => roots.map((dir) => `${dir}/bin/koffi/${triplet}/koffi.node`))
+  ];
+  for (let name of names) {
     try {
-      native2 = requireNative(filename);
+      native2 = requireNative(name);
       break;
     } catch (e) {
       err ??= e;
@@ -197,85 +154,85 @@ function loadStatic(pkg2) {
   let native2 = null;
   if (native2 == null && pkg2 == "linux-arm64") {
     try {
-      native2 = requireNative2("../../build/koffi/linux_arm64/koffi.node");
+      native2 = requireNative2("../../bin/koffi/linux_arm64/koffi.node");
     } catch (err) {
     }
   }
   if (native2 == null && pkg2 == "linux-arm64") {
     try {
-      native2 = requireNative2("../../build/koffi/musl_arm64/koffi.node");
+      native2 = requireNative2("../../bin/koffi/musl_arm64/koffi.node");
     } catch (err) {
     }
   }
   if (native2 == null && pkg2 == "linux-ia32") {
     try {
-      native2 = requireNative2("../../build/koffi/linux_ia32/koffi.node");
+      native2 = requireNative2("../../bin/koffi/linux_ia32/koffi.node");
     } catch (err) {
     }
   }
   if (native2 == null && pkg2 == "linux-x64") {
     try {
-      native2 = requireNative2("../../build/koffi/linux_x64/koffi.node");
+      native2 = requireNative2("../../bin/koffi/linux_x64/koffi.node");
     } catch (err) {
     }
   }
   if (native2 == null && pkg2 == "linux-x64") {
     try {
-      native2 = requireNative2("../../build/koffi/musl_x64/koffi.node");
+      native2 = requireNative2("../../bin/koffi/musl_x64/koffi.node");
     } catch (err) {
     }
   }
   if (native2 == null && pkg2 == "freebsd-ia32") {
     try {
-      native2 = requireNative2("../../build/koffi/freebsd_ia32/koffi.node");
+      native2 = requireNative2("../../bin/koffi/freebsd_ia32/koffi.node");
     } catch (err) {
     }
   }
   if (native2 == null && pkg2 == "freebsd-x64") {
     try {
-      native2 = requireNative2("../../build/koffi/freebsd_x64/koffi.node");
+      native2 = requireNative2("../../bin/koffi/freebsd_x64/koffi.node");
     } catch (err) {
     }
   }
   if (native2 == null && pkg2 == "freebsd-arm64") {
     try {
-      native2 = requireNative2("../../build/koffi/freebsd_arm64/koffi.node");
+      native2 = requireNative2("../../bin/koffi/freebsd_arm64/koffi.node");
     } catch (err) {
     }
   }
   if (native2 == null && pkg2 == "openbsd-ia32") {
     try {
-      native2 = requireNative2("../../build/koffi/openbsd_ia32/koffi.node");
+      native2 = requireNative2("../../bin/koffi/openbsd_ia32/koffi.node");
     } catch (err) {
     }
   }
   if (native2 == null && pkg2 == "openbsd-x64") {
     try {
-      native2 = requireNative2("../../build/koffi/openbsd_x64/koffi.node");
+      native2 = requireNative2("../../bin/koffi/openbsd_x64/koffi.node");
     } catch (err) {
     }
   }
   if (native2 == null && pkg2 == "win32-ia32") {
     try {
-      native2 = requireNative2("../../build/koffi/win32_ia32/koffi.node");
+      native2 = requireNative2("../../bin/koffi/win32_ia32/koffi.node");
     } catch (err) {
     }
   }
   if (native2 == null && pkg2 == "win32-x64") {
     try {
-      native2 = requireNative2("../../build/koffi/win32_x64/koffi.node");
+      native2 = requireNative2("../../bin/koffi/win32_x64/koffi.node");
     } catch (err) {
     }
   }
   if (native2 == null && pkg2 == "darwin-x64") {
     try {
-      native2 = requireNative2("../../build/koffi/darwin_x64/koffi.node");
+      native2 = requireNative2("../../bin/koffi/darwin_x64/koffi.node");
     } catch (err) {
     }
   }
   if (native2 == null && pkg2 == "darwin-arm64") {
     try {
-      native2 = requireNative2("../../build/koffi/darwin_arm64/koffi.node");
+      native2 = requireNative2("../../bin/koffi/darwin_arm64/koffi.node");
     } catch (err) {
     }
   }

package/src/koffi/indirect.cjs

@@ -7,6 +7,9 @@ var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
 };
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -128,47 +131,7 @@ var init_abi = __esm({
 var package_default;
 var init_package = __esm({
   "package.json"() {
-    package_default = {
-      name: "koffi",
-      version: "3.0.0-alpha.5",
-      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: "./index.cjs",
-      module: "./index.js",
-      types: "./index.d.ts",
-      scripts: {
-        test: "node tools/brew.js test",
-        prepack: `echo 'Use "npm run package" instead' && false`,
-        prepublishOnly: `echo 'Use "npm run package" instead' && false`,
-        package: "node tools/brew.js build"
-      },
-      license: "MIT",
-      cnoke: {
-        api: "../../vendor/node-api-headers",
-        output: "../../bin/Koffi/{{ toolchain }}",
-        node: 16,
-        napi: 8
-      },
-      funding: "https://liberapay.com/Koromix"
-    };
+    package_default = { name: "koffi", version: "3.0.0-alpha.6", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/koffi/{{ toolchain }}", node: 16, napi: 8 } };
   }
 });
 
@@ -195,19 +158,17 @@ function loadDynamic(root, pkg2, triplets2) {
   let roots = [root];
   let native2 = null;
   let err = null;
-  if (process.resourcesPath != null)
+  if (process.resourcesPath != null) {
     roots.push(process.resourcesPath);
-  let filenames = roots.flatMap((dir) => triplets2.flatMap((triplet) => [
-    `${dir}/build/koffi/${triplet}/koffi.node`,
-    `${dir}/bin/Koffi/${triplet}/koffi.node`,
-    `${dir}/node_modules/koffi/build/koffi/${triplet}/koffi.node`,
-    `${dir}/../@koromix/koffi-${pkg2}/${triplet}/koffi.node`
-  ]));
-  for (let filename of filenames) {
-    if (!import_fs2.default.existsSync(filename))
-      continue;
+    roots.push(process.resourcesPath + "/node_modules/koffi");
+  }
+  let names = [
+    `@koromix/koffi-${pkg2}`,
+    ...triplets2.flatMap((triplet) => roots.map((dir) => `${dir}/bin/koffi/${triplet}/koffi.node`))
+  ];
+  for (let name of names) {
     try {
-      native2 = requireNative(filename);
+      native2 = requireNative(name);
       break;
     } catch (e) {
       err ??= e;
@@ -230,11 +191,10 @@ function wrapNative(native2) {
     return lib;
   };
 }
-var import_util, import_fs2, import_node_module, requireNative;
+var import_util, import_node_module, requireNative;
 var init_init = __esm({
   "src/init.js"() {
     import_util = __toESM(require("util"));
-    import_fs2 = __toESM(require("fs"));
     import_node_module = require("node:module");
     init_abi();
     init_package();
@@ -242,10 +202,110 @@ var init_init = __esm({
   }
 });
 
+// src/static.js
+var require_static = __commonJS({
+  "src/static.js"(exports2, module2) {
+    var { createRequire: createRequire2 } = require("node:module");
+    var requireNative2 = createRequire2(__dirname);
+    function loadStatic2(pkg2) {
+      let native2 = null;
+      if (native2 == null && pkg2 == "linux-arm64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/linux_arm64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "linux-arm64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/musl_arm64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "linux-ia32") {
+        try {
+          native2 = requireNative2("../../bin/koffi/linux_ia32/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "linux-x64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/linux_x64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "linux-x64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/musl_x64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "freebsd-ia32") {
+        try {
+          native2 = requireNative2("../../bin/koffi/freebsd_ia32/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "freebsd-x64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/freebsd_x64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "freebsd-arm64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/freebsd_arm64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "openbsd-ia32") {
+        try {
+          native2 = requireNative2("../../bin/koffi/openbsd_ia32/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "openbsd-x64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/openbsd_x64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "win32-ia32") {
+        try {
+          native2 = requireNative2("../../bin/koffi/win32_ia32/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "win32-x64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/win32_x64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "darwin-x64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/darwin_x64/koffi.node");
+        } catch (err) {
+        }
+      }
+      if (native2 == null && pkg2 == "darwin-arm64") {
+        try {
+          native2 = requireNative2("../../bin/koffi/darwin_arm64/koffi.node");
+        } catch (err) {
+        }
+      }
+      return native2;
+    }
+    module2.exports = { loadStatic: loadStatic2 };
+  }
+});
+
 // index.cjs
 var { detectPlatform: detectPlatform2, loadDynamic: loadDynamic2, wrapNative: wrapNative2 } = (init_init(), __toCommonJS(init_exports));
+var { loadStatic } = require_static();
 var [version, pkg, triplets] = detectPlatform2();
-var native = loadDynamic2(__dirname + "/../..", pkg, triplets);
+var native = null;
+if (native == null)
+  native = loadDynamic2(__dirname + "/../..", pkg, triplets);
 if (native.version != version)
   throw new Error("Mismatched native Koffi modules");
 wrapNative2(native);

package/src/koffi/indirect.js

@@ -1,6 +1,5 @@
 // src/init.js
 import util from "util";
-import fs2 from "fs";
 import { createRequire } from "node:module";
 
 // ../cnoke/src/abi.js
@@ -94,47 +93,7 @@ function decodeElfHeader(buf) {
 }
 
 // package.json
-var package_default = {
-  name: "koffi",
-  version: "3.0.0-alpha.5",
-  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: "./index.cjs",
-  module: "./index.js",
-  types: "./index.d.ts",
-  scripts: {
-    test: "node tools/brew.js test",
-    prepack: `echo 'Use "npm run package" instead' && false`,
-    prepublishOnly: `echo 'Use "npm run package" instead' && false`,
-    package: "node tools/brew.js build"
-  },
-  license: "MIT",
-  cnoke: {
-    api: "../../vendor/node-api-headers",
-    output: "../../bin/Koffi/{{ toolchain }}",
-    node: 16,
-    napi: 8
-  },
-  funding: "https://liberapay.com/Koromix"
-};
+var package_default = { name: "koffi", version: "3.0.0-alpha.6", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/koffi/{{ toolchain }}", node: 16, napi: 8 } };
 
 // src/init.js
 var requireNative = createRequire(import.meta.dirname);
@@ -154,19 +113,17 @@ function loadDynamic(root, pkg2, triplets2) {
   let roots = [root];
   let native2 = null;
   let err = null;
-  if (process.resourcesPath != null)
+  if (process.resourcesPath != null) {
     roots.push(process.resourcesPath);
-  let filenames = roots.flatMap((dir) => triplets2.flatMap((triplet) => [
-    `${dir}/build/koffi/${triplet}/koffi.node`,
-    `${dir}/bin/Koffi/${triplet}/koffi.node`,
-    `${dir}/node_modules/koffi/build/koffi/${triplet}/koffi.node`,
-    `${dir}/../@koromix/koffi-${pkg2}/${triplet}/koffi.node`
-  ]));
-  for (let filename of filenames) {
-    if (!fs2.existsSync(filename))
-      continue;
+    roots.push(process.resourcesPath + "/node_modules/koffi");
+  }
+  let names = [
+    `@koromix/koffi-${pkg2}`,
+    ...triplets2.flatMap((triplet) => roots.map((dir) => `${dir}/bin/koffi/${triplet}/koffi.node`))
+  ];
+  for (let name of names) {
     try {
-      native2 = requireNative(filename);
+      native2 = requireNative(name);
       break;
     } catch (e) {
       err ??= e;

package/src/koffi/src/abi/arm64.cc

@@ -602,6 +602,9 @@ namespace {
         [&]() { \
             TEB *teb = GetTEB(); \
              \
+            K_DEFER { call->instance->last_error = teb->LastErrorValue; }; \
+            teb->LastErrorValue = call->instance->last_error; \
+             \
             ADJUST_TEB(teb, call->mem->stack0.ptr, call->mem->stack0.end); \
              \
             return (Expr); \

package/src/koffi/src/abi/x64win.cc

@@ -237,6 +237,9 @@ namespace {
         [&]() { \
             TEB *teb = GetTEB(); \
              \
+            K_DEFER { call->instance->last_error = teb->LastErrorValue; }; \
+            teb->LastErrorValue = call->instance->last_error; \
+             \
             ADJUST_TEB(teb, call->mem->stack0.ptr, call->mem->stack0.end); \
              \
             return (Expr); \

package/src/koffi/src/abi/x86.cc

@@ -307,6 +307,9 @@ napi_value RunLoop(CallData *call, napi_value *args, uint32_t *base, const AbiIn
         [&]() { \
             TEB *teb = GetTEB(); \
              \
+            K_DEFER { call->instance->last_error = teb->LastErrorValue; }; \
+            teb->LastErrorValue = call->instance->last_error; \
+             \
             ADJUST_TEB(teb, call->mem->stack0.ptr, call->mem->stack0.end); \
              \
             return (Expr); \

package/src/koffi/src/call.cc

@@ -866,12 +866,13 @@ bool CallData::PushPointer(napi_value value, const TypeInfo *type, int direction
     // just made things worse. Oh, well.
 
     void *ptr = nullptr;
+    napi_valuetype kind = napi_undefined;
 
 restart:
 
-    // Fast path
-    if (bool external = false; TryPointer(env, value, &ptr, &external)) {
-        if (external && CheckValueTag(env, value, &CastMarker)) {
+    if (TryPointer(env, value, &ptr, &kind)) {
+#if defined(EXTERNAL_POINTERS)
+        if (kind == napi_external && CheckValueTag(env, value, &CastMarker)) {
             Napi::External<ValueCast> external = Napi::External<ValueCast>(env, value);
             ValueCast *cast = external.Data();
 
@@ -880,21 +881,55 @@ restart:
 
             goto restart;
         }
+#endif
 
         *out_ptr = ptr;
         return true;
     }
 
-    return PushPointerSlow(value, type, directions, out_ptr);
+#if !defined(EXTERNAL_POINTERS)
+    if (kind == napi_external && CheckValueTag(env, value, &CastMarker)) {
+        Napi::External<ValueCast> external = Napi::External<ValueCast>(env, value);
+        ValueCast *cast = external.Data();
+
+        napi_get_reference_value(env, cast->ref, &value);
+        type = cast->type;
+
+        goto restart;
+    }
+#endif
+
+    return PushPointerSlow(value, kind, type, directions, out_ptr);
 }
 
-bool CallData::PushPointerSlow(napi_value value, const TypeInfo *type, int directions, void **out_ptr)
+bool CallData::PushPointerSlow(napi_value value, napi_valuetype kind, const TypeInfo *type, int directions, void **out_ptr)
 {
     const TypeInfo *ref = type->ref.type;
 
     void *ptr = nullptr;
 
-    if (IsArray(env, value)) {
+    if (kind == napi_string) {
+        K_ASSERT(type->primitive == PrimitiveKind::Pointer);
+
+        if (directions & 2) [[unlikely]]
+            goto unexpected;
+
+        if (ref == instance->void_type) {
+            PushStringValue(value, (const char **)out_ptr);
+            return true;
+        } else if (ref->primitive == PrimitiveKind::Int8) {
+            PushStringValue(value, (const char **)out_ptr);
+            return true;
+        } else if (ref->primitive == PrimitiveKind::Int16) {
+            PushString16Value(value, (const char16_t **)out_ptr);
+            return true;
+        } else if (ref->primitive == PrimitiveKind::Int32) {
+            PushString32Value(value, (const char32_t **)out_ptr);
+            return true;
+        } else {
+            goto unexpected;
+        }
+    } else if (IsArray(env, value)) {
         Napi::Array array = Napi::Array(env, value);
         Size len = PushIndirectString(array, ref, &ptr);
 
@@ -981,27 +1016,6 @@ bool CallData::PushPointerSlow(napi_value value, const TypeInfo *type, int direc
 
         *out_ptr = ptr;
         return true;
-    } else if (napi_valuetype kind = GetKindOf(env, value); kind == napi_string) {
-        K_ASSERT(type->primitive == PrimitiveKind::Pointer);
-
-        if (directions & 2) [[unlikely]]
-            goto unexpected;
-
-        if (ref == instance->void_type) {
-            PushStringValue(value, (const char **)out_ptr);
-            return true;
-        } else if (ref->primitive == PrimitiveKind::Int8) {
-            PushStringValue(value, (const char **)out_ptr);
-            return true;
-        } else if (ref->primitive == PrimitiveKind::Int16) {
-            PushString16Value(value, (const char16_t **)out_ptr);
-            return true;
-        } else if (ref->primitive == PrimitiveKind::Int32) {
-            PushString32Value(value, (const char32_t **)out_ptr);
-            return true;
-        } else {
-            goto unexpected;
-        }
     } else if (kind == napi_function) {
         if (type->primitive != PrimitiveKind::Callback) [[unlikely]] {
             ThrowError<Napi::TypeError>(env, "Cannot pass function to type %1", type->name);
@@ -1026,11 +1040,13 @@ unexpected:
 bool CallData::PushCallback(napi_value value, const TypeInfo *type, void **out_ptr)
 {
     void *ptr = nullptr;
+    napi_valuetype kind = napi_undefined;
 
 restart:
 
-    if (bool external = false; TryPointer(env, value, &ptr, &external)) {
-        if (external && CheckValueTag(env, value, &CastMarker)) {
+    if (TryPointer(env, value, &ptr, &kind)) {
+#if defined(EXTERNAL_POINTERS)
+        if (kind == napi_external && CheckValueTag(env, value, &CastMarker)) {
             Napi::External<ValueCast> external = Napi::External<ValueCast>(env, value);
             ValueCast *cast = external.Data();
 
@@ -1039,10 +1055,13 @@ restart:
 
             goto restart;
         }
+#endif
 
         *out_ptr = ptr;
         return true;
-    } else if (GetKindOf(env, value) == napi_function) {
+    }
+
+    if (kind == napi_function) {
         Napi::Function func = Napi::Function(env, value);
 
         ptr = ReserveTrampoline(type->ref.proto, func);
@@ -1051,6 +1070,16 @@ restart:
 
         *out_ptr = ptr;
         return true;
+#if !defined(EXTERNAL_POINTERS)
+    } else if (kind == napi_external && CheckValueTag(env, value, &CastMarker)) {
+        Napi::External<ValueCast> external = Napi::External<ValueCast>(env, value);
+        ValueCast *cast = external.Data();
+
+        napi_get_reference_value(env, cast->ref, &value);
+        type = cast->type;
+
+        goto restart;
+#endif
     }
 
     ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected %2", GetValueType(instance, value), type->name);

package/src/koffi/src/call.hh

@@ -87,7 +87,7 @@ struct alignas(8) CallData {
     INLINE_UNITY void PushBuffer(Span<const uint8_t> buffer, const TypeInfo *type, uint8_t *origin);
     bool PushStringArray(napi_value value, const TypeInfo *type, uint8_t *origin);
     INLINE_UNITY bool PushPointer(napi_value value, const TypeInfo *type, int directions, void **out_ptr);
-    bool PushPointerSlow(napi_value value, const TypeInfo *type, int directions, void **out_ptr);
+    bool PushPointerSlow(napi_value value, napi_valuetype kind, const TypeInfo *type, int directions, void **out_ptr);
     INLINE_UNITY bool PushCallback(napi_value value, const TypeInfo *type, void **out_ptr);
     Size PushIndirectString(Napi::Array array, const TypeInfo *ref, void **out_ptr);
 

package/src/koffi/src/ffi.cc

@@ -143,20 +143,6 @@ static Napi::Value GetSetConfig(const Napi::CallbackInfo &info)
             } else if (key == "max_type_size") {
                 if (!ChangeSize(key.c_str(), value, 32, Mebibytes(512), &new_config.max_type_size))
                     return env.Null();
-            } else if (key == "fast_pointers") {
-                if (!value.IsBoolean()) {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for '%2', expected boolean", GetValueType(instance, value), key.c_str());
-                    return env.Null();
-                }
-
-                new_config.fast_pointers = value.As<Napi::Boolean>();
-            } else if (key == "fast_callbacks") {
-                if (!value.IsBoolean()) {
-                    ThrowError<Napi::TypeError>(env, "Unexpected %1 value for '%2', expected boolean", GetValueType(instance, value), key.c_str());
-                    return env.Null();
-                }
-
-                new_config.fast_callbacks = value.As<Napi::Boolean>();
             } else {
                 ThrowError<Napi::Error>(env, "Unexpected config member '%1'", key.c_str());
                 return env.Null();
@@ -181,8 +167,6 @@ static Napi::Value GetSetConfig(const Napi::CallbackInfo &info)
     obj.Set("resident_async_pools", instance->config.resident_async_pools);
     obj.Set("max_async_calls", instance->config.resident_async_pools + instance->config.max_temporaries);
     obj.Set("max_type_size", instance->config.max_type_size);
-    obj.Set("fast_pointers", instance->config.fast_pointers);
-    obj.Set("fast_callbacks", instance->config.fast_callbacks);
 
     return obj;
 }

package/src/koffi/src/ffi.hh

@@ -292,6 +292,8 @@ struct InstanceData {
 #if defined(_WIN32)
     void *main_stack_max;
     void *main_stack_min;
+
+    uint32_t last_error = 0;
 #endif
 
     BucketArray<LinkedAllocator> encode_allocators;
@@ -309,9 +311,6 @@ struct InstanceData {
         int resident_async_pools = DefaultResidentAsyncPools;
         int max_temporaries = DefaultMaxAsyncCalls - DefaultResidentAsyncPools;
         Size max_type_size = DefaultMaxTypeSize;
-
-        bool fast_pointers = true;
-        bool fast_callbacks = true;
     } config;
 
     struct {

package/src/koffi/src/util.cc

@@ -1768,32 +1768,6 @@ Napi::Function WrapFunction(Napi::Env env, const FunctionInfo *func)
     return wrapper;
 }
 
-Napi::Value WrapPointer(Napi::Env env, const TypeInfo *ref, void *ptr)
-{
-    InstanceData *instance = env.GetInstanceData<InstanceData>();
-
-    if (instance->config.fast_pointers) {
-        Napi::BigInt big = Napi::BigInt::New(env, (uint64_t)(uintptr_t)ptr);
-        return big;
-    } else {
-        Napi::External<void> external = Napi::External<void>::New(env, ptr);
-        return external;
-    }
-}
-
-Napi::Value WrapCallback(Napi::Env env, const TypeInfo *ref, void *ptr)
-{
-    InstanceData *instance = env.GetInstanceData<InstanceData>();
-
-    if (instance->config.fast_callbacks) {
-        Napi::BigInt big = Napi::BigInt::New(env, (uint64_t)(uintptr_t)ptr);
-        return big;
-    } else {
-        Napi::External<void> external = Napi::External<void>::New(env, ptr);
-        return external;
-    }
-}
-
 bool DetectCallConvention(Span<const char> name, CallConvention *out_convention)
 {
     if (name == "__cdecl") {

package/src/koffi/src/util.hh

@@ -10,6 +10,8 @@
 
 namespace K {
 
+// #define EXTERNAL_POINTERS
+
 #if defined(_MSC_VER)
     #define FORCE_INLINE __forceinline
 #else
@@ -243,6 +245,9 @@ static FORCE_INLINE bool TryPointer(napi_env env, napi_value value, void **out_p
     if (uintptr_t ptr = 0; TryNumber(env, value, &ptr)) {
         *out_ptr = (void *)ptr;
         return true;
+    } else if (IsTypedArray(env, value)) {
+        napi_get_typedarray_info(env, value, nullptr, nullptr, out_ptr, nullptr, nullptr);
+        return true;
     }
 
     napi_valuetype kind = GetKindOf(env, value);
@@ -250,14 +255,13 @@ static FORCE_INLINE bool TryPointer(napi_env env, napi_value value, void **out_p
     if (IsNullOrUndefined(kind)) {
         *out_ptr = nullptr;
         return true;
-    } else if (IsTypedArray(env, value)) {
-        napi_get_typedarray_info(env, value, nullptr, nullptr, out_ptr, nullptr, nullptr);
-        return true;
+#if defined(EXTERNAL_POINTERS)
     } else if (kind == napi_external) {
         Napi::External<void> external = Napi::External<void>(env, value);
 
         *out_ptr = (void *)external.Data();
         return true;
+#endif
     } else if (IsArrayBuffer(env, value)) {
         Napi::ArrayBuffer buffer = Napi::ArrayBuffer(env, value);
 
@@ -268,11 +272,17 @@ static FORCE_INLINE bool TryPointer(napi_env env, napi_value value, void **out_p
     return false;
 }
 
-static FORCE_INLINE bool TryPointer(napi_env env, napi_value value, void **out_ptr, bool *out_external)
+// The output value type is not accurate: napi_number instead of napi_bing, napi_null instead of napi_undefined
+static FORCE_INLINE bool TryPointer(napi_env env, napi_value value, void **out_ptr, napi_valuetype *out_kind)
 {
     if (uintptr_t ptr = 0; TryNumber(env, value, &ptr)) {
         *out_ptr = (void *)ptr;
-        *out_external = false;
+        *out_kind = napi_number;
+
+        return true;
+    } else if (IsTypedArray(env, value)) {
+        napi_get_typedarray_info(env, value, nullptr, nullptr, out_ptr, nullptr, nullptr);
+        *out_kind = napi_object;
 
         return true;
     }
@@ -281,30 +291,28 @@ static FORCE_INLINE bool TryPointer(napi_env env, napi_value value, void **out_p
 
     if (IsNullOrUndefined(kind)) {
         *out_ptr = nullptr;
-        *out_external = false;
-
-        return true;
-    } else if (IsTypedArray(env, value)) {
-        napi_get_typedarray_info(env, value, nullptr, nullptr, out_ptr, nullptr, nullptr);
-        *out_external = false;
+        *out_kind = napi_null;
 
         return true;
+#if defined(EXTERNAL_POINTERS)
     } else if (kind == napi_external) {
         Napi::External<void> external = Napi::External<void>(env, value);
 
         *out_ptr = (void *)external.Data();
-        *out_external = true;
+        *out_kind = napi_external;
 
         return true;
+#endif
     } else if (IsArrayBuffer(env, value)) {
         Napi::ArrayBuffer buffer = Napi::ArrayBuffer(env, value);
 
         *out_ptr = (void *)buffer.Data();
-        *out_external = false;
+        *out_kind = napi_object;
 
         return true;
     }
 
+    *out_kind = kind;
     return false;
 }
 
@@ -421,6 +429,28 @@ static FORCE_INLINE Napi::Array GetOwnPropertyNames(napi_env env, napi_value obj
 
 Napi::Function WrapFunction(Napi::Env env, const FunctionInfo *func);
 
+static FORCE_INLINE Napi::Value WrapPointer(Napi::Env env, const TypeInfo *ref, void *ptr)
+{
+#if defined(EXTERNAL_POINTERS)
+    Napi::External<void> external = Napi::External<void>::New(env, ptr);
+    return external;
+#else
+    Napi::BigInt big = Napi::BigInt::New(env, (uint64_t)(uintptr_t)ptr);
+    return big;
+#endif
+}
+
+static FORCE_INLINE Napi::Value WrapCallback(Napi::Env env, const TypeInfo *ref, void *ptr)
+{
+#if defined(EXTERNAL_POINTERS)
+    Napi::External<void> external = Napi::External<void>::New(env, ptr);
+    return external;
+#else
+    Napi::BigInt big = Napi::BigInt::New(env, (uint64_t)(uintptr_t)ptr);
+    return big;
+#endif
+}
+
 Napi::Value INLINE_UNITY WrapPointer(Napi::Env env, const TypeInfo *ref, void *ptr);
 Napi::Value INLINE_UNITY WrapCallback(Napi::Env env, const TypeInfo *ref, void *ptr);