koffi 2.7.1 → 2.7.3

package/CHANGELOG.md

@@ -4,6 +4,16 @@
 
 ### Koffi 2.7
 
+#### Koffi 2.7.3 (2024-01-26)
+
+- Support decoding NULL terminated arrays
+
+#### Koffi 2.7.2 (2024-01-15)
+
+- Add missing TypeScript declaration for `koffi.free()`
+- Fix TypeScript declaration of `koffi.encode()`
+- Try to improve compatibility with webpack
+
 #### Koffi 2.7.1 (2024-01-02)
 
 - Support C-like `int[3]` syntax for [fixed array types](input.md#fixed-size-c-arrays)

package/README.md

@@ -25,9 +25,9 @@ Go to the web site for more information: https://koffi.dev/
 
 # Project history
 
-You can consult the [changelog](https://koffi.dev/changes) on the official website.
+You can consult the [changelog](https://koffi.dev/changelog) on the official website.
 
-Major version increments can include breaking API changes, use the [migration guide](https://koffi.dev/changes#migration-guide) for more information.
+Major version increments can include breaking API changes, use the [migration guide](https://koffi.dev/changelog#migration-guide) for more information.
 
 # License
 

package/doc/misc.md

@@ -69,7 +69,7 @@ You can alias a type with `koffi.alias(name, type)`. Aliased types are completel
 For synchronous/normal calls, Koffi uses two preallocated memory blocks:
 
 - One to construct the C stack and assign registers, subsequently used by the platform-specific assembly code (1 MiB by default)
-- One to allocate strings and big objects/structs (2 MiB by default)
+- One to allocate strings and objects/structs (2 MiB by default)
 
 Unless very big strings or objects (at least more than one page of memory) are used, Koffi does not directly allocate any extra memory during calls or callbacks. However, please note that the JS engine (V8) might.
 

package/doc/unions.md

@@ -49,8 +49,8 @@ const U = koffi.union('U', { i: 'int', str: 'char *' });
 
 const DoSomething = lib.func('void DoSomething(const char *type, U u)');
 
-DoSomething('int', { .i = 42 });
-DoSomething('string', { .str = 'Hello!' });
+DoSomething('int', { i: 42 });
+DoSomething('string', { str: 'Hello!' });
 ```
 
 ### Win32 example

package/index.d.ts

@@ -132,7 +132,6 @@ declare module 'koffi' {
     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 encode(ref: any, type: TypeSpec): void;
     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;
@@ -151,6 +150,8 @@ declare module 'koffi' {
     export function config(cfg: Record<string, unknown>): Record<string, unknown>;
     export function stats(): Record<string, unknown>;
 
+    export function free(value: any): void;
+
     export function errno(): number;
     export function errno(value: number): number;
 

package/index.js

@@ -69,17 +69,17 @@ var require_tools = __commonJS({
         try {
           crypto.randomFillSync(buf);
           let suffix = buf.toString("hex").padStart(8, "0");
-          let filename = `${prefix}.${suffix}`;
-          let file = fs2.createWriteStream(filename, { flags: "wx", mode: 420 });
-          return [filename, file];
+          let filename2 = `${prefix}.${suffix}`;
+          let file = fs2.createWriteStream(filename2, { flags: "wx", mode: 420 });
+          return [filename2, file];
         } catch (err) {
           if (err.code != "EEXIST")
             throw err;
         }
       }
     }
-    function extract_targz(filename, dest_dir, strip = 0) {
-      let reader = fs2.createReadStream(filename).pipe(zlib.createGunzip());
+    function extract_targz(filename2, dest_dir, strip = 0) {
+      let reader = fs2.createReadStream(filename2).pipe(zlib.createGunzip());
       return new Promise((resolve, reject) => {
         let header = null;
         let extended = {};
@@ -119,13 +119,13 @@ var require_tools = __commonJS({
               }
               data = data.subarray(0, header.size);
               if (header.type == "0" || header.type == "7") {
-                let filename2 = dest_dir + "/" + header.filename;
-                let dirname = path.dirname(filename2);
+                let filename3 = dest_dir + "/" + header.filename;
+                let dirname = path.dirname(filename3);
                 fs2.mkdirSync(dirname, { recursive: true, mode: 493 });
-                fs2.writeFileSync(filename2, data, { mode: header.mode });
+                fs2.writeFileSync(filename3, data, { mode: header.mode });
               } else if (header.type == "5") {
-                let filename2 = dest_dir + "/" + header.filename;
-                fs2.mkdirSync(filename2, { recursive: true, mode: header.mode });
+                let filename3 = dest_dir + "/" + header.filename;
+                fs2.mkdirSync(filename3, { recursive: true, mode: header.mode });
               } else if (header.type == "L") {
                 extended.filename = data.toString("utf-8").replace(/\0/g, "");
               } else if (header.type == "x") {
@@ -233,10 +233,10 @@ var require_tools = __commonJS({
       }
       return arch2;
     }
-    function read_file_header(filename, read) {
+    function read_file_header(filename2, read) {
       let fd = null;
       try {
-        let fd2 = fs2.openSync(filename);
+        let fd2 = fs2.openSync(filename2);
         let buf = Buffer.allocUnsafe(read);
         let len = fs2.readSync(fd2, buf);
         return buf.subarray(0, len);
@@ -378,8 +378,8 @@ var require_package = __commonJS({
   "build/dist/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.7.1",
-      stable: "2.7.1",
+      version: "2.7.3",
+      stable: "2.7.3",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",
@@ -527,24 +527,24 @@ try {
 } catch (err) {
 }
 if (native == null) {
+  let roots = [__dirname];
+  if (process.resourcesPath != null)
+    roots.push(process.resourcesPath);
   let names = [
     `/build/koffi/${process.platform}_${arch}/koffi.node`,
     `/koffi/${process.platform}_${arch}/koffi.node`,
     `/node_modules/koffi/build/koffi/${process.platform}_${arch}/koffi.node`
   ];
-  for (let name of names) {
-    if (fs.existsSync(__dirname + name)) {
-      native = require(__dirname + name);
-      break;
-    }
-  }
-  if (native == null && process.resourcesPath != null) {
+  for (let root of roots) {
     for (let name of names) {
-      if (fs.existsSync(process.resourcesPath + name)) {
-        native = require(process.resourcesPath + name);
+      let filename = root + name;
+      if (fs.existsSync(filename)) {
+        native = eval("require")(filename);
         break;
       }
     }
+    if (native != null)
+      break;
   }
 }
 if (native == null)

package/indirect.js

@@ -69,17 +69,17 @@ var require_tools = __commonJS({
         try {
           crypto.randomFillSync(buf);
           let suffix = buf.toString("hex").padStart(8, "0");
-          let filename = `${prefix}.${suffix}`;
-          let file = fs2.createWriteStream(filename, { flags: "wx", mode: 420 });
-          return [filename, file];
+          let filename2 = `${prefix}.${suffix}`;
+          let file = fs2.createWriteStream(filename2, { flags: "wx", mode: 420 });
+          return [filename2, file];
         } catch (err) {
           if (err.code != "EEXIST")
             throw err;
         }
       }
     }
-    function extract_targz(filename, dest_dir, strip = 0) {
-      let reader = fs2.createReadStream(filename).pipe(zlib.createGunzip());
+    function extract_targz(filename2, dest_dir, strip = 0) {
+      let reader = fs2.createReadStream(filename2).pipe(zlib.createGunzip());
       return new Promise((resolve, reject) => {
         let header = null;
         let extended = {};
@@ -119,13 +119,13 @@ var require_tools = __commonJS({
               }
               data = data.subarray(0, header.size);
               if (header.type == "0" || header.type == "7") {
-                let filename2 = dest_dir + "/" + header.filename;
-                let dirname = path.dirname(filename2);
+                let filename3 = dest_dir + "/" + header.filename;
+                let dirname = path.dirname(filename3);
                 fs2.mkdirSync(dirname, { recursive: true, mode: 493 });
-                fs2.writeFileSync(filename2, data, { mode: header.mode });
+                fs2.writeFileSync(filename3, data, { mode: header.mode });
               } else if (header.type == "5") {
-                let filename2 = dest_dir + "/" + header.filename;
-                fs2.mkdirSync(filename2, { recursive: true, mode: header.mode });
+                let filename3 = dest_dir + "/" + header.filename;
+                fs2.mkdirSync(filename3, { recursive: true, mode: header.mode });
               } else if (header.type == "L") {
                 extended.filename = data.toString("utf-8").replace(/\0/g, "");
               } else if (header.type == "x") {
@@ -233,10 +233,10 @@ var require_tools = __commonJS({
       }
       return arch2;
     }
-    function read_file_header(filename, read) {
+    function read_file_header(filename2, read) {
       let fd = null;
       try {
-        let fd2 = fs2.openSync(filename);
+        let fd2 = fs2.openSync(filename2);
         let buf = Buffer.allocUnsafe(read);
         let len = fs2.readSync(fd2, buf);
         return buf.subarray(0, len);
@@ -378,8 +378,8 @@ var require_package = __commonJS({
   "build/dist/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.7.1",
-      stable: "2.7.1",
+      version: "2.7.3",
+      stable: "2.7.3",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",
@@ -447,24 +447,24 @@ var arch = determine_arch();
 var triplet = `${process.platform}_${arch}`;
 var native = null;
 {
+  let roots = [__dirname];
+  if (process.resourcesPath != null)
+    roots.push(process.resourcesPath);
   let names = [
     `/build/koffi/${process.platform}_${arch}/koffi.node`,
     `/koffi/${process.platform}_${arch}/koffi.node`,
     `/node_modules/koffi/build/koffi/${process.platform}_${arch}/koffi.node`
   ];
-  for (let name of names) {
-    if (fs.existsSync(__dirname + name)) {
-      native = require(__dirname + name);
-      break;
-    }
-  }
-  if (native == null && process.resourcesPath != null) {
+  for (let root of roots) {
     for (let name of names) {
-      if (fs.existsSync(process.resourcesPath + name)) {
-        native = require(process.resourcesPath + name);
+      let filename = root + name;
+      if (fs.existsSync(filename)) {
+        native = eval("require")(filename);
         break;
       }
     }
+    if (native != null)
+      break;
   }
 }
 if (native == null)

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "koffi",
-    "version": "2.7.1",
-    "stable": "2.7.1",
+    "version": "2.7.3",
+    "stable": "2.7.3",
     "description": "Fast and simple C FFI (foreign function interface) for Node.js",
     "keywords": [
         "foreign",

package/src/core/libcc/brotli.cc

@@ -26,7 +26,7 @@
 
 namespace RG {
 
-class BrotliDecompressor: public StreamDecompressor {
+class BrotliDecompressor: public StreamDecoder {
     BrotliDecoderState *state = nullptr;
     bool done = false;
 
@@ -37,27 +37,23 @@ class BrotliDecompressor: public StreamDecompressor {
     Size out_len = 0;
 
 public:
-    BrotliDecompressor(StreamReader *reader) : StreamDecompressor(reader) {}
+    BrotliDecompressor(StreamReader *reader, CompressionType type);
     ~BrotliDecompressor();
 
-    bool Init(CompressionType type) override;
     Size Read(Size max_len, void *out_buf) override;
 };
 
-BrotliDecompressor::~BrotliDecompressor()
-{
-    if (state) {
-        BrotliDecoderDestroyInstance(state);
-    }
-}
-
-bool BrotliDecompressor::Init(CompressionType)
+BrotliDecompressor::BrotliDecompressor(StreamReader *reader, CompressionType)
+    : StreamDecoder(reader)
 {
     state = BrotliDecoderCreateInstance(nullptr, nullptr, nullptr);
     if (!state)
         throw std::bad_alloc();
+}
 
-    return true;
+BrotliDecompressor::~BrotliDecompressor()
+{
+    BrotliDecoderDestroyInstance(state);
 }
 
 Size BrotliDecompressor::Read(Size max_len, void *user_buf)
@@ -105,26 +101,19 @@ Size BrotliDecompressor::Read(Size max_len, void *user_buf)
     RG_UNREACHABLE();
 }
 
-class BrotliCompressor: public StreamCompressor {
+class BrotliCompressor: public StreamEncoder {
     BrotliEncoderStateStruct *state = nullptr;
 
 public:
-    BrotliCompressor(StreamWriter *writer) : StreamCompressor(writer) {}
+    BrotliCompressor(StreamWriter *writer, CompressionType type, CompressionSpeed speed);
     ~BrotliCompressor();
 
-    bool Init(CompressionType type, CompressionSpeed speed) override;
     bool Write(Span<const uint8_t> buf) override;
     bool Finalize() override;
 };
 
-BrotliCompressor::~BrotliCompressor()
-{
-    if (state) {
-        BrotliEncoderDestroyInstance(state);
-    }
-}
-
-bool BrotliCompressor::Init(CompressionType, CompressionSpeed speed)
+BrotliCompressor::BrotliCompressor(StreamWriter *writer, CompressionType, CompressionSpeed speed)
+    : StreamEncoder(writer)
 {
     state = BrotliEncoderCreateInstance(nullptr, nullptr, nullptr);
     if (!state)
@@ -137,8 +126,11 @@ bool BrotliCompressor::Init(CompressionType, CompressionSpeed speed)
         case CompressionSpeed::Slow: { BrotliEncoderSetParameter(state, BROTLI_PARAM_QUALITY, 11); } break;
         case CompressionSpeed::Fast: { BrotliEncoderSetParameter(state, BROTLI_PARAM_QUALITY, 0); } break;
     }
+}
 
-    return true;
+BrotliCompressor::~BrotliCompressor()
+{
+    BrotliEncoderDestroyInstance(state);
 }
 
 bool BrotliCompressor::Write(Span<const uint8_t> buf)