koffi 3.0.1 → 3.0.2

package/src/koffi/indirect.js

@@ -1,9 +1,9 @@
-// src/init.js
+// src/koffi/src/init.js
 import util from "node:util";
 import fs2 from "node:fs";
 import { createRequire } from "node:module";
 
-// ../cnoke/src/abi.js
+// src/cnoke/src/abi.js
 import fs from "node:fs";
 function determineAbi() {
   let abi = process.arch.toString();
@@ -93,11 +93,11 @@ function decodeElfHeader(buf) {
   return header;
 }
 
-// package.json
-var package_default = { name: "koffi", version: "3.0.1", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/Koffi/{{ toolchain }}", node: 16, napi: 8 } };
+// src/koffi/package.json
+var package_default = { name: "koffi", version: "3.0.2", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/Koffi/{{ toolchain }}", node: 16, napi: 8 } };
 
-// src/init.js
-var requireNative = createRequire(import.meta.url);
+// src/koffi/src/init.js
+var require2 = createRequire(import.meta.url);
 function detectPlatform() {
   if (process.versions.napi == null || process.versions.napi < package_default.cnoke.napi) {
     let major = parseInt(process.versions.node, 10);
@@ -110,13 +110,20 @@ function detectPlatform() {
     triplets2.push(`musl_${abi}`);
   return [package_default.version, pkg2, triplets2];
 }
-function loadDynamic(root, pkg2, triplets2) {
+function loadDynamic(dirname, pkg2, triplets2) {
+  let suffix = "/../../build/koffi";
+  let root = dirname + suffix;
   let roots = [root];
   let native2 = null;
   let err = null;
   if (process["resourcesPath"] != null) {
-    roots.push(process["resourcesPath"]);
-    roots.push(process["resourcesPath"] + "/node_modules/koffi");
+    let suffixes = [
+      "/koffi",
+      "/koffi/build",
+      "/node_modules/koffi/build"
+    ];
+    for (let suffix2 of suffixes)
+      roots.push(process["resourcesPath"] + suffix2);
   }
   let names = [
     `${import.meta.dirname}/../../../@koromix/koffi-${pkg2}`,
@@ -126,19 +133,21 @@ function loadDynamic(root, pkg2, triplets2) {
     if (!fs2.existsSync(name))
       continue;
     try {
-      native2 = requireNative(name);
+      native2 = require2(name);
       break;
     } catch (e) {
       err ??= e;
     }
   }
-  if (native2 == null) {
-    err ??= new Error("Cannot find the native Koffi module; did you bundle it correctly?");
+  if (native2 == null && err != null)
     throw err;
-  }
   return native2;
 }
-function wrapNative(native2) {
+function wrapNative(native2, version2) {
+  if (native2 == null)
+    throw new Error("Cannot find the native Koffi module; did you bundle it correctly?");
+  if (native2.version != version2)
+    throw new Error("Mismatched native Koffi modules");
   let load = native2.load;
   let register = native2.register;
   let introspect = native2.introspect ?? native2.type;
@@ -177,19 +186,10 @@ function wrapNative(native2) {
   }
 }
 
-// src/static.js
-import { createRequire as createRequire2 } from "node:module";
-var requireNative2 = createRequire2(import.meta.url);
-var BINARY_ROOT = import.meta.dirname + "/../../build/koffi";
-
-// index.js
+// src/koffi/indirect.js
 var [version, pkg, triplets] = detectPlatform();
-var native = null;
-if (native == null)
-  native = loadDynamic(BINARY_ROOT, pkg, triplets);
-if (native.version != version)
-  throw new Error("Mismatched native Koffi modules");
-wrapNative(native);
+var native = loadDynamic(import.meta.dirname, pkg, triplets);
+wrapNative(native, version);
 var mod_LibraryHandle = native.LibraryHandle;
 var mod_TypeObject = native.TypeObject;
 var mod_Union = native.Union;
@@ -232,7 +232,7 @@ var mod_union = native.union;
 var mod_unregister = native.unregister;
 var mod_version = native.version;
 var mod_view = native.view;
-var index_default = native;
+var indirect_default = native;
 export {
   mod_LibraryHandle as LibraryHandle,
   mod_TypeObject as TypeObject,
@@ -246,7 +246,7 @@ export {
   mod_call as call,
   mod_config as config,
   mod_decode as decode,
-  index_default as default,
+  indirect_default as default,
   mod_disposable as disposable,
   mod_encode as encode,
   mod_enumeration as enumeration,

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

@@ -6,6 +6,7 @@
 #include "lib/native/base/base.hh"
 #include "../ffi.hh"
 #include "../call.hh"
+#include "../type.hh"
 #include "../util.hh"
 #if defined(_WIN32)
     #include "../win32.hh"

package/src/koffi/src/abi/riscv64.cc

@@ -6,6 +6,7 @@
 #include "lib/native/base/base.hh"
 #include "../ffi.hh"
 #include "../call.hh"
+#include "../type.hh"
 #include "../util.hh"
 
 #include <napi.h>

package/src/koffi/src/abi/x64sysv.cc

@@ -6,6 +6,7 @@
 #include "lib/native/base/base.hh"
 #include "../ffi.hh"
 #include "../call.hh"
+#include "../type.hh"
 #include "../util.hh"
 
 #include <napi.h>

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

@@ -6,6 +6,7 @@
 #include "lib/native/base/base.hh"
 #include "../ffi.hh"
 #include "../call.hh"
+#include "../type.hh"
 #include "../util.hh"
 #include "../win32.hh"
 

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

@@ -6,6 +6,7 @@
 #include "lib/native/base/base.hh"
 #include "../ffi.hh"
 #include "../call.hh"
+#include "../type.hh"
 #include "../util.hh"
 #if defined(_WIN32)
     #include "../win32.hh"