koffi 3.0.0-alpha.2 → 3.0.0-alpha.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koffi",
-    "version": "3.0.0-alpha.2",
+    "version": "3.0.0-alpha.3",
     "description": "Fast and simple C FFI (foreign function interface) for Node.js",
     "keywords": [
         "foreign",

package/src/build.js

@@ -28,7 +28,7 @@ var import_fs4 = __toESM(require("fs"), 1);
 // ../cnoke/src/builder.js
 var import_fs3 = __toESM(require("fs"), 1);
 var import_os = __toESM(require("os"), 1);
-var import_path2 = __toESM(require("path"), 1);
+var import_path = __toESM(require("path"), 1);
 var import_child_process = require("child_process");
 
 // ../cnoke/src/abi.js
@@ -122,168 +122,11 @@ function decodeElfHeader(buf) {
 }
 
 // ../cnoke/src/util.js
-var import_crypto = __toESM(require("crypto"), 1);
 var import_fs2 = __toESM(require("fs"), 1);
-var import_https = __toESM(require("https"), 1);
-var import_path = __toESM(require("path"), 1);
-var import_zlib = __toESM(require("zlib"), 1);
-async function downloadHttp(url, dest) {
-  console.log(">> Downloading " + url);
-  let [tmp_name, file] = openTemporaryStream(dest);
-  try {
-    await new Promise((resolve, reject) => {
-      let request = import_https.default.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 {
-            import_fs2.default.renameSync(file.path, dest);
-          } catch (err) {
-            if (!import_fs2.default.existsSync(dest))
-              reject(err);
-          }
-          resolve();
-        }));
-      });
-      request.on("error", reject);
-      file.on("error", reject);
-    });
-  } catch (err) {
-    file.close();
-    try {
-      import_fs2.default.unlinkSync(tmp_name);
-    } catch (err2) {
-      if (err2.code != "ENOENT")
-        throw err2;
-    }
-    throw err;
-  }
-}
-function openTemporaryStream(prefix) {
-  let buf = Buffer.allocUnsafe(4);
-  for (; ; ) {
-    try {
-      import_crypto.default.randomFillSync(buf);
-      let suffix = buf.toString("hex").padStart(8, "0");
-      let filename = `${prefix}.${suffix}`;
-      let file = import_fs2.default.createWriteStream(filename, { flags: "wx", mode: 420 });
-      return [filename, file];
-    } catch (err) {
-      if (err.code != "EEXIST")
-        throw err;
-    }
-  }
-}
-function extractTarGz(filename, dest_dir, strip = 0) {
-  let reader = import_fs2.default.createReadStream(filename).pipe(import_zlib.default.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 (pathIsAbsolute(header.filename[0]))
-              throw new Error(`Insecure filename starting with / inside TAR archive`);
-            if (pathHasDotDot(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 = import_path.default.dirname(filename2);
-            import_fs2.default.mkdirSync(dirname, { recursive: true, mode: 493 });
-            import_fs2.default.writeFileSync(filename2, data, { mode: header.mode });
-          } else if (header.type == "5") {
-            let filename2 = dest_dir + "/" + header.filename;
-            import_fs2.default.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 pathIsAbsolute(path3) {
-  if (process.platform == "win32" && path3.match(/^[a-zA-Z]:/))
-    path3 = path3.substr(2);
-  return isPathSeparator(path3[0]);
-}
-function pathHasDotDot(path3) {
-  let start = 0;
-  for (; ; ) {
-    let offset = path3.indexOf("..", start);
-    if (offset < 0)
-      break;
-    start = offset + 2;
-    if (offset && !isPathSeparator(path3[offset - 1]))
-      continue;
-    if (offset + 2 < path3.length && !isPathSeparator(path3[offset + 2]))
-      continue;
-    return true;
-  }
-  return false;
+function pathIsAbsolute(path2) {
+  if (process.platform == "win32" && path2.match(/^[a-zA-Z]:/))
+    path2 = path2.substr(2);
+  return isPathSeparator(path2[0]);
 }
 function isPathSeparator(c) {
   if (c == "/")
@@ -314,9 +157,9 @@ function syncFiles(src_dir, dest_dir) {
     }
   }
 }
-function unlinkRecursive(path3) {
+function unlinkRecursive(path2) {
   try {
-    import_fs2.default.rmSync(path3, { recursive: true, maxRetries: process.platform == "win32" ? 3 : 0 });
+    import_fs2.default.rmSync(path2, { recursive: true, maxRetries: process.platform == "win32" ? 3 : 0 });
   } catch (err) {
     if (err.code !== "ENOENT")
       throw err;
@@ -518,128 +361,6 @@ const PfnDliHook __pfnDliNotifyHook2 = self_exe_hook;
 #endif
 `;
 
-// ../cnoke/src/toolchains.json
-var toolchains_default = {
-  linux_ia32: {
-    system: "Linux",
-    processor: "i386",
-    triplet: "i686-linux-gnu",
-    sysroot: "../../tools/cross/sysroots/debian_i386"
-  },
-  linux_x64: {
-    system: "Linux",
-    processor: "x86_64",
-    triplet: "x86_64-linux-gnu",
-    sysroot: "../../tools/cross/sysroots/debian_x64"
-  },
-  linux_armhf: {
-    system: "Linux",
-    processor: "arm",
-    triplet: "arm-linux-gnueabihf",
-    sysroot: "../../tools/cross/sysroots/debian_arm32"
-  },
-  linux_arm64: {
-    system: "Linux",
-    processor: "aarch64",
-    triplet: "aarch64-linux-gnu",
-    sysroot: "../../tools/cross/sysroots/debian_arm64"
-  },
-  linux_riscv64d: {
-    system: "Linux",
-    processor: "riscv64",
-    triplet: "riscv64-linux-gnu",
-    sysroot: "../../tools/cross/sysroots/debian_riscv64"
-  },
-  linux_loong64: {
-    system: "Linux",
-    processor: "loongarch64",
-    triplet: "loongarch64-linux-gnu",
-    sysroot: "../../tools/cross/sysroots/debian_loong64"
-  },
-  win32_ia32: {
-    system: "Windows",
-    processor: "X86",
-    lib: "win-x86",
-    flags: ["-DNODE_JS_LINK_FLAGS=/DELAYLOAD:node.exe;/SAFESEH:NO", "-A", "Win32"],
-    triplet: "i386-pc-windows-msvc",
-    linux: {
-      sysroot: "../../tools/cross/sysroots/windows_i386",
-      flags: ["-DNODE_JS_LINK_FLAGS=-Wl,/DELAYLOAD:node.exe,/SAFESEH:NO", "-DNODE_JS_DLLTOOL_MACHINE=i386"],
-      variables: {
-        CMAKE_DLLTOOL: "llvm-dlltool",
-        CMAKE_RC_COMPILER: "llvm-rc",
-        CMAKE_C_FLAGS: "-Xmicrosoft-windows-sys-root {{ sysroot }}",
-        CMAKE_CXX_FLAGS: "-Xmicrosoft-windows-sys-root {{ sysroot }}",
-        CMAKE_EXE_LINKER_FLAGS: "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/x86_64 -ldelayimp",
-        CMAKE_STATIC_LINKER_FLAGS: "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/x86_64 -ldelayimp",
-        CMAKE_SHARED_LINKER_FLAGS: "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/x86_64 -ldelayimp"
-      }
-    }
-  },
-  win32_x64: {
-    system: "Windows",
-    processor: "AMD64",
-    lib: "win-x64",
-    flags: ["-DNODE_JS_LINK_FLAGS=/DELAYLOAD:node.exe"],
-    triplet: "x86_64-pc-windows-msvc",
-    linux: {
-      sysroot: "../../tools/cross/sysroots/windows_x64",
-      flags: ["-DNODE_JS_LINK_FLAGS=-Wl,/DELAYLOAD:node.exe", "-DNODE_JS_DLLTOOL_MACHINE=i386:x86-64"],
-      variables: {
-        CMAKE_DLLTOOL: "llvm-dlltool",
-        CMAKE_RC_COMPILER: "llvm-rc",
-        CMAKE_C_FLAGS: "-Xmicrosoft-windows-sys-root {{ sysroot }}",
-        CMAKE_CXX_FLAGS: "-Xmicrosoft-windows-sys-root {{ sysroot }}",
-        CMAKE_EXE_LINKER_FLAGS: "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/x86_64 -ldelayimp",
-        CMAKE_STATIC_LINKER_FLAGS: "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/x86_64 -ldelayimp",
-        CMAKE_SHARED_LINKER_FLAGS: "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/x86_64 -ldelayimp"
-      }
-    }
-  },
-  win32_arm64: {
-    system: "Windows",
-    processor: "ARM64",
-    lib: "win-arm64",
-    flags: ["-DNODE_JS_LINK_FLAGS=/DELAYLOAD:node.exe;/SAFESEH:NO", "-A", "ARM64"],
-    triplet: "aarch64-pc-windows-msvc",
-    linux: {
-      sysroot: "../../tools/cross/sysroots/windows_arm64",
-      flags: ["-DNODE_JS_LINK_FLAGS=-Wl,/DELAYLOAD:node.exe,/SAFESEH:NO", "-DNODE_JS_DLLTOOL_MACHINE=arm64"],
-      variables: {
-        CMAKE_DLLTOOL: "llvm-dlltool",
-        CMAKE_RC_COMPILER: "llvm-rc",
-        CMAKE_C_FLAGS: "-Xmicrosoft-windows-sys-root {{ sysroot }}",
-        CMAKE_CXX_FLAGS: "-Xmicrosoft-windows-sys-root {{ sysroot }}",
-        CMAKE_EXE_LINKER_FLAGS: "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/aarch64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/aarch64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/aarch64 -ldelayimp",
-        CMAKE_STATIC_LINKER_FLAGS: "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/aarch64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/aarch64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/aarch64 -ldelayimp",
-        CMAKE_SHARED_LINKER_FLAGS: "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/aarch64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/aarch64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/aarch64 -ldelayimp"
-      }
-    }
-  },
-  darwin_x64: {
-    system: "Darwin",
-    processor: "x86_64",
-    flags: ["-DNODE_JS_LINK_FLAGS=-undefined;dynamic_lookup", "-DCMAKE_OSX_ARCHITECTURES=x86_64"]
-  },
-  darwin_arm64: {
-    system: "Darwin",
-    processor: "arm64",
-    flags: ["-DNODE_JS_LINK_FLAGS=-undefined;dynamic_lookup", "-DCMAKE_OSX_ARCHITECTURES=arm64"]
-  },
-  freebsd_x64: {
-    system: "FreeBSD",
-    processor: "amd64",
-    triplet: "x86_64-unknown-freebsd",
-    sysroot: "../../tools/cross/sysroots/freebsd_x64"
-  },
-  freebsd_arm64: {
-    system: "FreeBSD",
-    processor: "arm64",
-    triplet: "aarch64-unknown-freebsd",
-    sysroot: "../../tools/cross/sysroots/freebsd_arm64"
-  }
-};
-
 // ../cnoke/src/builder.js
 var DefaultOptions = {
   mode: "RelWithDebInfo"
@@ -668,10 +389,6 @@ function Builder(config = {}) {
     runtime_version = process.version;
   if (runtime_version.startsWith("v"))
     runtime_version = runtime_version.substr(1);
-  UNSAFE: (() => {
-    if (toolchain != null && !Object.hasOwn(toolchains_default, toolchain))
-      throw new Error(`Unknown cross-compilation toolchain '${toolchain}'`);
-  })();
   let options = null;
   let cache_dir = getCacheDirectory();
   let build_dir = config.build_dir;
@@ -703,17 +420,6 @@ function Builder(config = {}) {
     args.push(`-DNODE_JS_EXECPATH=${process.execPath}`);
     if (options2.api == null) {
       let downloaded = false;
-      UNSAFE: await (async () => {
-        let destname = `${cache_dir}/node-v${runtime_version}-headers.tar.gz`;
-        if (!import_fs3.default.existsSync(destname)) {
-          import_fs3.default.mkdirSync(cache_dir, { recursive: true, mode: 493 });
-          let url = `https://nodejs.org/dist/v${runtime_version}/node-v${runtime_version}-headers.tar.gz`;
-          await downloadHttp(url, destname);
-        }
-        await extractTarGz(destname, work_dir + "/headers", 1);
-        downloaded = true;
-        args.push(`-DNODE_JS_INCLUDE_DIRS=${work_dir}/headers/include/node`);
-      })();
       if (!downloaded)
         throw new Error("Cannot download API headers");
     } else {
@@ -731,18 +437,6 @@ function Builder(config = {}) {
       } else {
         if (options2.api == null) {
           let downloaded = false;
-          UNSAFE: await (async () => {
-            let info = toolchains_default[toolchain ?? host];
-            let destname = `${cache_dir}/node_v${runtime_version}_${toolchain ?? host}.lib`;
-            if (!import_fs3.default.existsSync(destname)) {
-              import_fs3.default.mkdirSync(cache_dir, { recursive: true, mode: 493 });
-              let url = `https://nodejs.org/dist/v${runtime_version}/${info.lib}/node.lib`;
-              await downloadHttp(url, destname);
-            }
-            import_fs3.default.copyFileSync(destname, work_dir + "/node.lib");
-            args.push(`-DNODE_JS_LINK_LIB=${work_dir}/node.lib`);
-            downloaded = true;
-          })();
           if (!downloaded)
             throw new Error("Cannot download Node import library");
         } else {
@@ -764,62 +458,6 @@ function Builder(config = {}) {
         args.push("-DCMAKE_CXX_COMPILER_LAUNCHER=ccache");
       }
     }
-    UNSAFE: (() => {
-      let info = toolchains_default[toolchain ?? host];
-      if (info != null) {
-        if (Object.hasOwn(info, process.platform))
-          info = Object.assign({}, info, info[process.platform]);
-        if (info.flags != null)
-          args.push(...info.flags);
-      }
-      if (toolchain == null && process.arch == "ia32") {
-        let proc2 = (0, import_child_process.spawnSync)("uname", ["-m"]);
-        let machine = (proc2.stdout ?? "").toString("utf-8").trim();
-        if (machine == "x86_64") {
-          args.push("-DCMAKE_ASM_FLAGS=-m32", "-DCMAKE_C_FLAGS=-m32", "-DCMAKE_CXX_FLAGS=-m32");
-        }
-      }
-      if (toolchain != null && info.triplet != null) {
-        let values = [
-          ["CMAKE_SYSTEM_NAME", info.system],
-          ["CMAKE_SYSTEM_PROCESSOR", info.processor]
-        ];
-        let sysroot = null;
-        if (process.platform != "win32" && !prefer_clang) {
-          let binary = info.triplet + "-gcc";
-          if ((0, import_child_process.spawnSync)(binary, ["-v"]).status !== 0)
-            prefer_clang = true;
-        }
-        if (prefer_clang) {
-          values.push(["CMAKE_ASM_COMPILER_TARGET", info.triplet]);
-          values.push(["CMAKE_C_COMPILER_TARGET", info.triplet]);
-          values.push(["CMAKE_CXX_COMPILER_TARGET", info.triplet]);
-          values.push(["CMAKE_EXE_LINKER_FLAGS", "-fuse-ld=lld"]);
-          values.push(["CMAKE_SHARED_LINKER_FLAGS", "-fuse-ld=lld"]);
-          values.push(["CMAKE_STATIC_LINKER_FLAGS", "-fuse-ld=lld"]);
-        } else if (process.platform != "win32") {
-          values.push(["CMAKE_ASM_COMPILER", info.triplet + "-gcc"]);
-          values.push(["CMAKE_C_COMPILER", info.triplet + "-gcc"]);
-          values.push(["CMAKE_CXX_COMPILER", info.triplet + "-g++"]);
-        }
-        if (info.sysroot != null) {
-          sysroot = expandPath(info.sysroot, __dirname + "/..");
-          if (!import_fs3.default.existsSync(sysroot))
-            throw new Error(`Cross-compilation sysroot '${sysroot}' does not exist`);
-          values.push(["CMAKE_SYSROOT", sysroot]);
-        }
-        if (info.variables != null) {
-          for (let key in info.variables) {
-            let value = expandString(info.variables[key], { sysroot });
-            values.push([key, value]);
-          }
-        }
-        let filename = `${work_dir}/toolchain.cmake`;
-        let text = values.map((pair) => `set(${pair[0]} "${pair[1]}")`).join("\n");
-        import_fs3.default.writeFileSync(filename, text);
-        args.push(`-DCMAKE_TOOLCHAIN_FILE=${filename}`);
-      }
-    })();
     if (prefer_clang) {
       if (process.platform == "win32" && !mingw) {
         args.push("-T", "ClangCL");
@@ -890,7 +528,7 @@ function Builder(config = {}) {
     do {
       if (import_fs3.default.existsSync(dirname + "/" + basename))
         return dirname;
-      dirname = import_path2.default.dirname(dirname);
+      dirname = import_path.default.dirname(dirname);
     } while (!dirname.endsWith("/"));
     return null;
   }
@@ -899,7 +537,7 @@ function Builder(config = {}) {
       let cache_dir2 = process.env["LOCALAPPDATA"] || process.env["APPDATA"];
       if (cache_dir2 == null)
         throw new Error("Missing LOCALAPPDATA and APPDATA environment variable");
-      cache_dir2 = import_path2.default.join(cache_dir2, "cnoke");
+      cache_dir2 = import_path.default.join(cache_dir2, "cnoke");
       return cache_dir2;
     } else {
       let cache_dir2 = process.env["XDG_CACHE_HOME"];
@@ -907,9 +545,9 @@ function Builder(config = {}) {
         let home = process.env["HOME"];
         if (home == null)
           throw new Error("Missing HOME environment variable");
-        cache_dir2 = import_path2.default.join(home, ".cache");
+        cache_dir2 = import_path.default.join(home, ".cache");
       }
-      cache_dir2 = import_path2.default.join(cache_dir2, "cnoke");
+      cache_dir2 = import_path.default.join(cache_dir2, "cnoke");
       return cache_dir2;
     }
   }
@@ -928,7 +566,7 @@ function Builder(config = {}) {
           if (proc2.status === 0) {
             let matches = proc2.stdout.toString("utf-8").match(/InstallDir[ \t]+REG_[A-Z_]+[ \t]+(.*)+/);
             if (matches != null) {
-              let bin = import_path2.default.join(matches[1].trim(), "bin\\cmake.exe");
+              let bin = import_path.default.join(matches[1].trim(), "bin\\cmake.exe");
               if (import_fs3.default.existsSync(bin))
                 cmake_bin = bin;
             }
@@ -972,7 +610,7 @@ function Builder(config = {}) {
     if (cnoke == null)
       cnoke = pkg?.cnoke ?? {};
     options = {
-      name: pkg?.name ?? import_path2.default.basename(project_dir),
+      name: pkg?.name ?? import_path.default.basename(project_dir),
       version: pkg?.version ?? null,
       directory,
       ...cnoke
@@ -1006,8 +644,8 @@ function Builder(config = {}) {
   function expandPath(str, root) {
     let expanded = expandString(str);
     if (!pathIsAbsolute(expanded))
-      expanded = import_path2.default.join(root, expanded);
-    expanded = import_path2.default.normalize(expanded);
+      expanded = import_path.default.join(root, expanded);
+    expanded = import_path.default.normalize(expanded);
     return expanded;
   }
 }

package/src/koffi/index.js

@@ -8,8 +8,8 @@ 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, mod3) => function __require() {
-  return mod3 || (0, cb[__getOwnPropNames(cb)[0]])((mod3 = { exports: {} }).exports, mod3), mod3.exports;
+var __commonJS = (cb, mod2) => function __require() {
+  return mod2 || (0, cb[__getOwnPropNames(cb)[0]])((mod2 = { exports: {} }).exports, mod2), mod2.exports;
 };
 var __export = (target, all) => {
   for (var name in all)
@@ -23,22 +23,22 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod3, isNodeMode, target) => (target = mod3 != null ? __create(__getProtoOf(mod3)) : {}, __copyProps(
+var __toESM = (mod2, isNodeMode, target) => (target = mod2 != null ? __create(__getProtoOf(mod2)) : {}, __copyProps(
   // If the importer is in node compatibility mode or this is not an ESM
   // file that has been converted to a CommonJS file using a Babel-
   // compatible transform (i.e. "__esModule" has not been set), then set
   // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod3 || !mod3.__esModule ? __defProp(target, "default", { value: mod3, enumerable: true }) : target,
-  mod3
+  isNodeMode || !mod2 || !mod2.__esModule ? __defProp(target, "default", { value: mod2, enumerable: true }) : target,
+  mod2
 ));
-var __toCommonJS = (mod3) => __copyProps(__defProp({}, "__esModule", { value: true }), mod3);
+var __toCommonJS = (mod2) => __copyProps(__defProp({}, "__esModule", { value: true }), mod2);
 
 // ../cnoke/src/abi.js
 var abi_exports = {};
 __export(abi_exports, {
-  determineAbi: () => determineAbi2
+  determineAbi: () => determineAbi
 });
-function determineAbi2() {
+function determineAbi() {
   let abi = process.arch;
   if (abi == "riscv32" || abi == "riscv64") {
     let buf = readFileHeader(process.execPath, 512);
@@ -78,10 +78,10 @@ function determineAbi2() {
   }
   return abi;
 }
-function readFileHeader(filename2, read) {
+function readFileHeader(filename, read) {
   let fd = null;
   try {
-    let fd2 = import_fs.default.openSync(filename2);
+    let fd2 = import_fs.default.openSync(filename);
     let buf = Buffer.allocUnsafe(read);
     let len = import_fs.default.readSync(fd2, buf);
     return buf.subarray(0, len);
@@ -137,7 +137,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "3.0.0-alpha.2",
+      version: "3.0.0-alpha.3",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",
@@ -180,66 +180,66 @@ var require_package = __commonJS({
 
 // src/init.js
 var require_init = __commonJS({
-  "src/init.js"(exports, module) {
+  "src/init.js"(exports2, module2) {
     "use strict";
-    var fs = require("fs");
+    var fs2 = require("fs");
     var path = require("path");
     var util = require("util");
-    var { determineAbi } = (init_abi(), __toCommonJS(abi_exports));
+    var { determineAbi: determineAbi2 } = (init_abi(), __toCommonJS(abi_exports));
     var PACKAGE = require_package();
-    function detect() {
+    function detect2() {
       if (process.versions.napi == null || process.versions.napi < PACKAGE.cnoke.napi) {
         let major = parseInt(process.versions.node, 10);
         throw new Error(`This engine is based on Node ${process.versions.node}, but ${PACKAGE.name} does not support the Node ${major}.x branch (N-API < ${PACKAGE.cnoke.napi})`);
       }
-      let abi = determineAbi();
-      let pkg3 = `${process.platform}-${process.arch}`;
-      let triplets3 = [`${process.platform}_${abi}`];
+      let abi = determineAbi2();
+      let pkg2 = `${process.platform}-${process.arch}`;
+      let triplets2 = [`${process.platform}_${abi}`];
       if (process.platform == "linux")
-        triplets3.push(`musl_${abi}`);
-      return [pkg3, triplets3];
+        triplets2.push(`musl_${abi}`);
+      return [pkg2, triplets2];
     }
-    function init(root, pkg, triplets, native) {
+    function init2(root, pkg2, triplets2, native2) {
       let err = null;
-      if (native == null) {
+      if (native2 == null) {
         let roots = [root];
         if (process.resourcesPath != null)
           roots.push(process.resourcesPath);
-        let filenames = roots.flatMap((dir) => triplets.flatMap((triplet) => [
+        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-${pkg}/${triplet}/koffi.node`
+          `${dir}/../@koromix/koffi-${pkg2}/${triplet}/koffi.node`
         ]));
         for (let filename of filenames) {
-          if (!fs.existsSync(filename))
+          if (!fs2.existsSync(filename))
             continue;
           try {
-            native = eval("require")(filename);
+            native2 = require(filename);
             break;
           } catch (e) {
             err ??= e;
           }
         }
       }
-      if (native == null) {
+      if (native2 == null) {
         err ??= new Error("Cannot find the native Koffi module; did you bundle it correctly?");
         throw err;
       }
-      if (native.version != PACKAGE.version)
+      if (native2.version != PACKAGE.version)
         throw new Error("Mismatched native Koffi modules");
-      let mod = wrap(native);
-      return mod;
+      let mod2 = wrap(native2);
+      return mod2;
     }
-    function wrap(native3) {
+    function wrap(native2) {
       let obj = {
-        ...native3,
+        ...native2,
         // Deprecated functions
-        handle: util.deprecate(native3.opaque, "The koffi.handle() function was deprecated in Koffi 2.1, use koffi.opaque() instead", "KOFFI001"),
-        callback: util.deprecate(native3.proto, "The koffi.callback() function was deprecated in Koffi 2.4, use koffi.proto() instead", "KOFFI002")
+        handle: util.deprecate(native2.opaque, "The koffi.handle() function was deprecated in Koffi 2.1, use koffi.opaque() instead", "KOFFI001"),
+        callback: util.deprecate(native2.proto, "The koffi.callback() function was deprecated in Koffi 2.4, use koffi.proto() instead", "KOFFI002")
       };
       obj.load = (...args) => {
-        let lib = native3.load(...args);
+        let lib = native2.load(...args);
         lib.cdecl = util.deprecate((...args2) => lib.func("__cdecl", ...args2), "The koffi.cdecl() function was deprecated in Koffi 2.7, use koffi.func(...) instead", "KOFFI003");
         lib.stdcall = util.deprecate((...args2) => lib.func("__stdcall", ...args2), 'The koffi.stdcall() function was deprecated in Koffi 2.7, use koffi.func("__stdcall", ...) instead', "KOFFI004");
         lib.fastcall = util.deprecate((...args2) => lib.func("__fastcall", ...args2), 'The koffi.fastcall() function was deprecated in Koffi 2.7, use koffi.func("__fastcall", ...) instead', "KOFFI005");
@@ -248,9 +248,9 @@ var require_init = __commonJS({
       };
       return obj;
     }
-    module.exports = {
-      detect,
-      init
+    module2.exports = {
+      detect: detect2,
+      init: init2
     };
   }
 });
@@ -258,102 +258,102 @@ var require_init = __commonJS({
 // src/static.js
 var require_static = __commonJS({
   "src/static.js"(exports2, module2) {
-    function find2(pkg3) {
-      let native3 = null;
-      if (native3 == null && pkg3 == "linux-arm64") {
+    function find2(pkg2) {
+      let native2 = null;
+      if (native2 == null && pkg2 == "linux-arm64") {
         try {
-          native3 = require("../../build/koffi/linux_arm64/koffi.node");
-        } catch (err2) {
+          native2 = require("../../build/koffi/linux_arm64/koffi.node");
+        } catch (err) {
         }
       }
-      if (native3 == null && pkg3 == "linux-arm64") {
+      if (native2 == null && pkg2 == "linux-arm64") {
         try {
-          native3 = require("../../build/koffi/musl_arm64/koffi.node");
-        } catch (err2) {
+          native2 = require("../../build/koffi/musl_arm64/koffi.node");
+        } catch (err) {
         }
       }
-      if (native3 == null && pkg3 == "linux-ia32") {
+      if (native2 == null && pkg2 == "linux-ia32") {
         try {
-          native3 = require("../../build/koffi/linux_ia32/koffi.node");
-        } catch (err2) {
+          native2 = require("../../build/koffi/linux_ia32/koffi.node");
+        } catch (err) {
         }
       }
-      if (native3 == null && pkg3 == "linux-x64") {
+      if (native2 == null && pkg2 == "linux-x64") {
         try {
-          native3 = require("../../build/koffi/linux_x64/koffi.node");
-        } catch (err2) {
+          native2 = require("../../build/koffi/linux_x64/koffi.node");
+        } catch (err) {
         }
       }
-      if (native3 == null && pkg3 == "linux-x64") {
+      if (native2 == null && pkg2 == "linux-x64") {
         try {
-          native3 = require("../../build/koffi/musl_x64/koffi.node");
-        } catch (err2) {
+          native2 = require("../../build/koffi/musl_x64/koffi.node");
+        } catch (err) {
         }
       }
-      if (native3 == null && pkg3 == "freebsd-ia32") {
+      if (native2 == null && pkg2 == "freebsd-ia32") {
         try {
-          native3 = require("../../build/koffi/freebsd_ia32/koffi.node");
-        } catch (err2) {
+          native2 = require("../../build/koffi/freebsd_ia32/koffi.node");
+        } catch (err) {
         }
       }
-      if (native3 == null && pkg3 == "freebsd-x64") {
+      if (native2 == null && pkg2 == "freebsd-x64") {
         try {
-          native3 = require("../../build/koffi/freebsd_x64/koffi.node");
-        } catch (err2) {
+          native2 = require("../../build/koffi/freebsd_x64/koffi.node");
+        } catch (err) {
         }
       }
-      if (native3 == null && pkg3 == "freebsd-arm64") {
+      if (native2 == null && pkg2 == "freebsd-arm64") {
         try {
-          native3 = require("../../build/koffi/freebsd_arm64/koffi.node");
-        } catch (err2) {
+          native2 = require("../../build/koffi/freebsd_arm64/koffi.node");
+        } catch (err) {
         }
       }
-      if (native3 == null && pkg3 == "openbsd-ia32") {
+      if (native2 == null && pkg2 == "openbsd-ia32") {
         try {
-          native3 = require("../../build/koffi/openbsd_ia32/koffi.node");
-        } catch (err2) {
+          native2 = require("../../build/koffi/openbsd_ia32/koffi.node");
+        } catch (err) {
         }
       }
-      if (native3 == null && pkg3 == "openbsd-x64") {
+      if (native2 == null && pkg2 == "openbsd-x64") {
         try {
-          native3 = require("../../build/koffi/openbsd_x64/koffi.node");
-        } catch (err2) {
+          native2 = require("../../build/koffi/openbsd_x64/koffi.node");
+        } catch (err) {
         }
       }
-      if (native3 == null && pkg3 == "win32-ia32") {
+      if (native2 == null && pkg2 == "win32-ia32") {
         try {
-          native3 = require("../../build/koffi/win32_ia32/koffi.node");
-        } catch (err2) {
+          native2 = require("../../build/koffi/win32_ia32/koffi.node");
+        } catch (err) {
         }
       }
-      if (native3 == null && pkg3 == "win32-x64") {
+      if (native2 == null && pkg2 == "win32-x64") {
         try {
-          native3 = require("../../build/koffi/win32_x64/koffi.node");
-        } catch (err2) {
+          native2 = require("../../build/koffi/win32_x64/koffi.node");
+        } catch (err) {
         }
       }
-      if (native3 == null && pkg3 == "darwin-x64") {
+      if (native2 == null && pkg2 == "darwin-x64") {
         try {
-          native3 = require("../../build/koffi/darwin_x64/koffi.node");
-        } catch (err2) {
+          native2 = require("../../build/koffi/darwin_x64/koffi.node");
+        } catch (err) {
         }
       }
-      if (native3 == null && pkg3 == "darwin-arm64") {
+      if (native2 == null && pkg2 == "darwin-arm64") {
         try {
-          native3 = require("../../build/koffi/darwin_arm64/koffi.node");
-        } catch (err2) {
+          native2 = require("../../build/koffi/darwin_arm64/koffi.node");
+        } catch (err) {
         }
       }
-      return native3;
+      return native2;
     }
     module2.exports = { find: find2 };
   }
 });
 
 // index.js
-var { detect: detect2, init: init2 } = require_init();
+var { detect, init } = require_init();
 var { find } = require_static();
-var [pkg2, triplets2] = detect2();
-var native2 = find(pkg2);
-var mod2 = init2(__dirname + "/../..", pkg2, triplets2, native2);
-module.exports = mod2;
+var [pkg, triplets] = detect();
+var native = find(pkg);
+var mod = init(__dirname + "/../..", pkg, triplets, native);
+module.exports = mod;

package/src/koffi/indirect.js

@@ -8,8 +8,8 @@ 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, mod3) => function __require() {
-  return mod3 || (0, cb[__getOwnPropNames(cb)[0]])((mod3 = { exports: {} }).exports, mod3), mod3.exports;
+var __commonJS = (cb, mod2) => function __require() {
+  return mod2 || (0, cb[__getOwnPropNames(cb)[0]])((mod2 = { exports: {} }).exports, mod2), mod2.exports;
 };
 var __export = (target, all) => {
   for (var name in all)
@@ -23,22 +23,22 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod3, isNodeMode, target) => (target = mod3 != null ? __create(__getProtoOf(mod3)) : {}, __copyProps(
+var __toESM = (mod2, isNodeMode, target) => (target = mod2 != null ? __create(__getProtoOf(mod2)) : {}, __copyProps(
   // If the importer is in node compatibility mode or this is not an ESM
   // file that has been converted to a CommonJS file using a Babel-
   // compatible transform (i.e. "__esModule" has not been set), then set
   // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod3 || !mod3.__esModule ? __defProp(target, "default", { value: mod3, enumerable: true }) : target,
-  mod3
+  isNodeMode || !mod2 || !mod2.__esModule ? __defProp(target, "default", { value: mod2, enumerable: true }) : target,
+  mod2
 ));
-var __toCommonJS = (mod3) => __copyProps(__defProp({}, "__esModule", { value: true }), mod3);
+var __toCommonJS = (mod2) => __copyProps(__defProp({}, "__esModule", { value: true }), mod2);
 
 // ../cnoke/src/abi.js
 var abi_exports = {};
 __export(abi_exports, {
-  determineAbi: () => determineAbi2
+  determineAbi: () => determineAbi
 });
-function determineAbi2() {
+function determineAbi() {
   let abi = process.arch;
   if (abi == "riscv32" || abi == "riscv64") {
     let buf = readFileHeader(process.execPath, 512);
@@ -78,10 +78,10 @@ function determineAbi2() {
   }
   return abi;
 }
-function readFileHeader(filename2, read) {
+function readFileHeader(filename, read) {
   let fd = null;
   try {
-    let fd2 = import_fs.default.openSync(filename2);
+    let fd2 = import_fs.default.openSync(filename);
     let buf = Buffer.allocUnsafe(read);
     let len = import_fs.default.readSync(fd2, buf);
     return buf.subarray(0, len);
@@ -134,42 +134,42 @@ var init_abi = __esm({
 
 // src/init.js
 var require_init = __commonJS({
-  "src/init.js"(exports, module) {
+  "src/init.js"(exports2, module2) {
     "use strict";
-    var fs = require("fs");
+    var fs2 = require("fs");
     var path = require("path");
     var util = require("util");
-    var { determineAbi } = (init_abi(), __toCommonJS(abi_exports));
+    var { determineAbi: determineAbi2 } = (init_abi(), __toCommonJS(abi_exports));
     var PACKAGE = require("./package.json");
-    function detect() {
+    function detect2() {
       if (process.versions.napi == null || process.versions.napi < PACKAGE.cnoke.napi) {
         let major = parseInt(process.versions.node, 10);
         throw new Error(`This engine is based on Node ${process.versions.node}, but ${PACKAGE.name} does not support the Node ${major}.x branch (N-API < ${PACKAGE.cnoke.napi})`);
       }
-      let abi = determineAbi();
-      let pkg3 = `${process.platform}-${process.arch}`;
-      let triplets3 = [`${process.platform}_${abi}`];
+      let abi = determineAbi2();
+      let pkg2 = `${process.platform}-${process.arch}`;
+      let triplets2 = [`${process.platform}_${abi}`];
       if (process.platform == "linux")
-        triplets3.push(`musl_${abi}`);
-      return [pkg3, triplets3];
+        triplets2.push(`musl_${abi}`);
+      return [pkg2, triplets2];
     }
-    function init(root, pkg, triplets, native) {
+    function init2(root, pkg2, triplets2, native) {
       let err = null;
       if (native == null) {
         let roots = [root];
         if (process.resourcesPath != null)
           roots.push(process.resourcesPath);
-        let filenames = roots.flatMap((dir) => triplets.flatMap((triplet) => [
+        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-${pkg}/${triplet}/koffi.node`
+          `${dir}/../@koromix/koffi-${pkg2}/${triplet}/koffi.node`
         ]));
         for (let filename of filenames) {
-          if (!fs.existsSync(filename))
+          if (!fs2.existsSync(filename))
             continue;
           try {
-            native = eval("require")(filename);
+            native = require(filename);
             break;
           } catch (e) {
             err ??= e;
@@ -182,18 +182,18 @@ var require_init = __commonJS({
       }
       if (native.version != PACKAGE.version)
         throw new Error("Mismatched native Koffi modules");
-      let mod = wrap(native);
-      return mod;
+      let mod2 = wrap(native);
+      return mod2;
     }
-    function wrap(native2) {
+    function wrap(native) {
       let obj = {
-        ...native2,
+        ...native,
         // Deprecated functions
-        handle: util.deprecate(native2.opaque, "The koffi.handle() function was deprecated in Koffi 2.1, use koffi.opaque() instead", "KOFFI001"),
-        callback: util.deprecate(native2.proto, "The koffi.callback() function was deprecated in Koffi 2.4, use koffi.proto() instead", "KOFFI002")
+        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")
       };
       obj.load = (...args) => {
-        let lib = native2.load(...args);
+        let lib = native.load(...args);
         lib.cdecl = util.deprecate((...args2) => lib.func("__cdecl", ...args2), "The koffi.cdecl() function was deprecated in Koffi 2.7, use koffi.func(...) instead", "KOFFI003");
         lib.stdcall = util.deprecate((...args2) => lib.func("__stdcall", ...args2), 'The koffi.stdcall() function was deprecated in Koffi 2.7, use koffi.func("__stdcall", ...) instead', "KOFFI004");
         lib.fastcall = util.deprecate((...args2) => lib.func("__fastcall", ...args2), 'The koffi.fastcall() function was deprecated in Koffi 2.7, use koffi.func("__fastcall", ...) instead', "KOFFI005");
@@ -202,15 +202,15 @@ var require_init = __commonJS({
       };
       return obj;
     }
-    module.exports = {
-      detect,
-      init
+    module2.exports = {
+      detect: detect2,
+      init: init2
     };
   }
 });
 
 // indirect.js
-var { detect: detect2, init: init2 } = require_init();
-var [pkg2, triplets2] = detect2();
-var mod2 = init2(__dirname + "/../..", pkg2, triplets2, null);
-module.exports = mod2;
+var { detect, init } = require_init();
+var [pkg, triplets] = detect();
+var mod = init(__dirname + "/../..", pkg, triplets, null);
+module.exports = mod;