koffi 3.0.0-alpha.10 → 3.0.0-alpha.12

package/index.d.ts

@@ -43,10 +43,6 @@ export type KoffiFunc<T extends (...args: any) => any> = T & {
    info: PrototypeInfo;
 };
 
-export type CallbackHandle = {
-    [Symbol.dispose](): void;
-};
-
 type LoadOptions = {
     lazy?: boolean,
     global?: boolean,
@@ -120,23 +116,54 @@ export function proto(convention: string, result: TypeSpec, arguments: TypeSpec[
 export function proto(name: string | null | undefined, result: TypeSpec, arguments: TypeSpec[]): TypeObject;
 export function proto(convention: string, name: string | null | undefined, result: TypeSpec, arguments: TypeSpec[]): TypeObject;
 
-export function register(callback: Function, type: TypeSpec): CallbackHandle;
-export function register(thisValue: any, callback: Function, type: TypeSpec): CallbackHandle;
-export function unregister(callback: CallbackHandle): void;
+export function register(callback: Function, type: TypeSpec): bigint;
+/** @deprecated */ export function register(thisValue: any, callback: Function, type: TypeSpec): bigint;
+export function unregister(callback: bigint): void;
 
 export function as(value: any, type: TypeSpec): IKoffiPointerCast;
-export function decode(value: any, type: TypeSpec): any;
-export function decode(value: any, type: TypeSpec, len: number): any;
-export function decode(value: any, offset: number, type: TypeSpec): any;
-export function decode(value: any, offset: number, type: TypeSpec, len: number): any;
 export function address(value: any): bigint;
 export function call(value: any, type: TypeSpec, ...args: any[]): any;
+export function view(ref: any, len: number): ArrayBuffer;
+
+export const decode: {
+    (value: any, type: TypeSpec): any;
+    (value: any, type: TypeSpec, len: number): any;
+    (value: any, offset: number, type: TypeSpec): any;
+    (value: any, offset: number, type: TypeSpec, len: number): any;
+
+    char(ptr: any): number;
+    short(ptr: any): number;
+    int(ptr: any): number;
+    long(ptr: any): number | bigint;
+    longlong(ptr: any): number | bigint;
+    uchar(ptr: any): number;
+    ushort(ptr: any): number;
+    uint(ptr: any): number;
+    ulong(ptr: any): number | bigint;
+    ulonglong(ptr: any): number | bigint;
+
+    int8(ptr: any): number;
+    int16(ptr: any): number;
+    int32(ptr: any): number;
+    int64(ptr: any): number | bigint;
+    uint8(ptr: any): number;
+    uint16(ptr: any): number;
+    uint32(ptr: any): number;
+    uint64(ptr: any): number | bigint;
+
+    float(ptr: any): number;
+    double(ptr: any): number;
+
+    string(ptr: any, length?: number | bigint | null): string;
+    string16(ptr: any, length?: number | bigint | null): string;
+    string32(ptr: any, length?: number | bigint | null): string;
+};
+
 export function encode(ref: any, type: TypeSpec, value: any): void;
 export function encode(ref: any, type: TypeSpec, value: any, len: number): void;
 export function encode(ref: any, offset: number, type: TypeSpec): void;
 export function encode(ref: any, offset: number, type: TypeSpec, value: any): void;
 export function encode(ref: any, offset: number, type: TypeSpec, value: any, len: number): void;
-export function view(ref: any, len: number): ArrayBuffer;
 
 export function type(type: TypeSpec): TypeObject;
 export function sizeof(type: TypeSpec): number;

package/lib/native/base/base.cc

@@ -2082,6 +2082,9 @@ bool GetDebugFlag(const char *name)
         if (!ParseBool(debug, &ret, K_DEFAULT_PARSE_FLAGS & ~(int)ParseFlag::Log)) {
             LogError("Environment variable '%1' is not a boolean", name);
         }
+        if (ret) {
+            LogWarning("Debug flag '%1' is in effect", name);
+        }
         return ret;
     } else {
         return false;

package/package.json

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

package/src/koffi/index.cjs

@@ -131,7 +131,7 @@ var init_abi = __esm({
 var package_default;
 var init_package = __esm({
   "package.json"() {
-    package_default = { name: "koffi", version: "3.0.0-alpha.10", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/Koffi/{{ toolchain }}", node: 16, napi: 8 } };
+    package_default = { name: "koffi", version: "3.0.0-alpha.12", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/Koffi/{{ toolchain }}", node: 16, napi: 8 } };
   }
 });
 
@@ -184,6 +184,7 @@ function loadDynamic(root, pkg2, triplets2) {
 }
 function wrapNative(native2) {
   let load = native2.load;
+  let register = native2.register;
   native2.sizeof = (spec) => native2.type(spec).size;
   native2.alignof = (spec) => native2.type(spec).alignment;
   native2.offsetof = (spec, name) => {
@@ -195,6 +196,14 @@ function wrapNative(native2) {
       throw new Error(`Record type ${type.name} does not have member '${name}'`);
     return member.offset;
   };
+  native2.register = (...args) => {
+    if (args.length >= 3 && typeof args[1] == "function") {
+      process.emitWarning("Using koffi.register() with a custom this value was deprecated in Koffi 3.0, use function.bind() instead", "Warning", "KOFFI009");
+      args[1] = args[1].bind(args[0]);
+      args = args.slice(1);
+    }
+    return register(...args);
+  };
   native2.resolve = import_node_util.default.deprecate(native2.type, "The koffi.resolve() function was deprecated in Koffi 3.0, use koffi.type() instead", "KOFFI007");
   native2.introspect = import_node_util.default.deprecate(native2.type, "The koffi.introspect() function was deprecated in Koffi 3.0, use koffi.type() instead", "KOFFI008");
   native2.load = (...args) => {
@@ -256,6 +265,12 @@ var require_static = __commonJS({
         } catch (err) {
         }
       }
+      if (native2 == null && pkg2 == "linux-riscv64d") {
+        try {
+          native2 = requireNative2("../../build/koffi/linux_riscv64d/koffi.node");
+        } catch (err) {
+        }
+      }
       if (native2 == null && pkg2 == "freebsd-ia32") {
         try {
           native2 = requireNative2("../../build/koffi/freebsd_ia32/koffi.node");
@@ -310,6 +325,12 @@ var require_static = __commonJS({
         } catch (err) {
         }
       }
+      if (native2 == null && pkg2 == "linux-loong64") {
+        try {
+          native2 = requireNative2("../../build/koffi/linux_loong64/koffi.node");
+        } catch (err) {
+        }
+      }
       return native2;
     }
     module2.exports = {

package/src/koffi/index.js

@@ -94,7 +94,7 @@ function decodeElfHeader(buf) {
 }
 
 // package.json
-var package_default = { name: "koffi", version: "3.0.0-alpha.10", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/Koffi/{{ toolchain }}", node: 16, napi: 8 } };
+var package_default = { name: "koffi", version: "3.0.0-alpha.12", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/Koffi/{{ toolchain }}", node: 16, napi: 8 } };
 
 // src/init.js
 var requireNative = createRequire(import.meta.url);
@@ -140,6 +140,7 @@ function loadDynamic(root, pkg2, triplets2) {
 }
 function wrapNative(native2) {
   let load = native2.load;
+  let register = native2.register;
   native2.sizeof = (spec) => native2.type(spec).size;
   native2.alignof = (spec) => native2.type(spec).alignment;
   native2.offsetof = (spec, name) => {
@@ -151,6 +152,14 @@ function wrapNative(native2) {
       throw new Error(`Record type ${type.name} does not have member '${name}'`);
     return member.offset;
   };
+  native2.register = (...args) => {
+    if (args.length >= 3 && typeof args[1] == "function") {
+      process.emitWarning("Using koffi.register() with a custom this value was deprecated in Koffi 3.0, use function.bind() instead", "Warning", "KOFFI009");
+      args[1] = args[1].bind(args[0]);
+      args = args.slice(1);
+    }
+    return register(...args);
+  };
   native2.resolve = util.deprecate(native2.type, "The koffi.resolve() function was deprecated in Koffi 3.0, use koffi.type() instead", "KOFFI007");
   native2.introspect = util.deprecate(native2.type, "The koffi.introspect() function was deprecated in Koffi 3.0, use koffi.type() instead", "KOFFI008");
   native2.load = (...args) => {
@@ -199,6 +208,12 @@ function loadStatic(pkg2) {
     } catch (err) {
     }
   }
+  if (native2 == null && pkg2 == "linux-riscv64d") {
+    try {
+      native2 = requireNative2("../../build/koffi/linux_riscv64d/koffi.node");
+    } catch (err) {
+    }
+  }
   if (native2 == null && pkg2 == "freebsd-ia32") {
     try {
       native2 = requireNative2("../../build/koffi/freebsd_ia32/koffi.node");
@@ -253,6 +268,12 @@ function loadStatic(pkg2) {
     } catch (err) {
     }
   }
+  if (native2 == null && pkg2 == "linux-loong64") {
+    try {
+      native2 = requireNative2("../../build/koffi/linux_loong64/koffi.node");
+    } catch (err) {
+    }
+  }
   return native2;
 }
 

package/src/koffi/indirect.cjs

@@ -131,7 +131,7 @@ var init_abi = __esm({
 var package_default;
 var init_package = __esm({
   "package.json"() {
-    package_default = { name: "koffi", version: "3.0.0-alpha.10", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/Koffi/{{ toolchain }}", node: 16, napi: 8 } };
+    package_default = { name: "koffi", version: "3.0.0-alpha.12", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/Koffi/{{ toolchain }}", node: 16, napi: 8 } };
   }
 });
 
@@ -184,6 +184,7 @@ function loadDynamic(root, pkg2, triplets2) {
 }
 function wrapNative(native2) {
   let load = native2.load;
+  let register = native2.register;
   native2.sizeof = (spec) => native2.type(spec).size;
   native2.alignof = (spec) => native2.type(spec).alignment;
   native2.offsetof = (spec, name) => {
@@ -195,6 +196,14 @@ function wrapNative(native2) {
       throw new Error(`Record type ${type.name} does not have member '${name}'`);
     return member.offset;
   };
+  native2.register = (...args) => {
+    if (args.length >= 3 && typeof args[1] == "function") {
+      process.emitWarning("Using koffi.register() with a custom this value was deprecated in Koffi 3.0, use function.bind() instead", "Warning", "KOFFI009");
+      args[1] = args[1].bind(args[0]);
+      args = args.slice(1);
+    }
+    return register(...args);
+  };
   native2.resolve = import_node_util.default.deprecate(native2.type, "The koffi.resolve() function was deprecated in Koffi 3.0, use koffi.type() instead", "KOFFI007");
   native2.introspect = import_node_util.default.deprecate(native2.type, "The koffi.introspect() function was deprecated in Koffi 3.0, use koffi.type() instead", "KOFFI008");
   native2.load = (...args) => {
@@ -256,6 +265,12 @@ var require_static = __commonJS({
         } catch (err) {
         }
       }
+      if (native2 == null && pkg2 == "linux-riscv64d") {
+        try {
+          native2 = requireNative2("../../build/koffi/linux_riscv64d/koffi.node");
+        } catch (err) {
+        }
+      }
       if (native2 == null && pkg2 == "freebsd-ia32") {
         try {
           native2 = requireNative2("../../build/koffi/freebsd_ia32/koffi.node");
@@ -310,6 +325,12 @@ var require_static = __commonJS({
         } catch (err) {
         }
       }
+      if (native2 == null && pkg2 == "linux-loong64") {
+        try {
+          native2 = requireNative2("../../build/koffi/linux_loong64/koffi.node");
+        } catch (err) {
+        }
+      }
       return native2;
     }
     module2.exports = {

package/src/koffi/indirect.js

@@ -94,7 +94,7 @@ function decodeElfHeader(buf) {
 }
 
 // package.json
-var package_default = { name: "koffi", version: "3.0.0-alpha.10", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/Koffi/{{ toolchain }}", node: 16, napi: 8 } };
+var package_default = { name: "koffi", version: "3.0.0-alpha.12", cnoke: { api: "../../vendor/node-api-headers", output: "../../bin/Koffi/{{ toolchain }}", node: 16, napi: 8 } };
 
 // src/init.js
 var requireNative = createRequire(import.meta.url);
@@ -140,6 +140,7 @@ function loadDynamic(root, pkg2, triplets2) {
 }
 function wrapNative(native2) {
   let load = native2.load;
+  let register = native2.register;
   native2.sizeof = (spec) => native2.type(spec).size;
   native2.alignof = (spec) => native2.type(spec).alignment;
   native2.offsetof = (spec, name) => {
@@ -151,6 +152,14 @@ function wrapNative(native2) {
       throw new Error(`Record type ${type.name} does not have member '${name}'`);
     return member.offset;
   };
+  native2.register = (...args) => {
+    if (args.length >= 3 && typeof args[1] == "function") {
+      process.emitWarning("Using koffi.register() with a custom this value was deprecated in Koffi 3.0, use function.bind() instead", "Warning", "KOFFI009");
+      args[1] = args[1].bind(args[0]);
+      args = args.slice(1);
+    }
+    return register(...args);
+  };
   native2.resolve = util.deprecate(native2.type, "The koffi.resolve() function was deprecated in Koffi 3.0, use koffi.type() instead", "KOFFI007");
   native2.introspect = util.deprecate(native2.type, "The koffi.introspect() function was deprecated in Koffi 3.0, use koffi.type() instead", "KOFFI008");
   native2.load = (...args) => {