koffi 2.3.10-beta.3 → 2.3.10

package/src/core/libcc/miniz.cc

@@ -0,0 +1,361 @@
+// Copyright 2023 Niels Martignène <niels.martignene@protonmail.com>
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the “Software”), to deal in 
+// the Software without restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+// Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+
+#include "libcc.hh"
+
+#define MINIZ_NO_ZLIB_COMPATIBLE_NAMES
+#include "vendor/miniz/miniz.h"
+
+namespace RG {
+
+class MinizDecompressor: public StreamDecompressor {
+    tinfl_decompressor inflator;
+    bool done = false;
+
+    uint8_t in_buf[256 * 1024];
+    uint8_t *in_ptr = nullptr;
+    Size in_len = 0;
+
+    uint8_t out_buf[256 * 1024];
+    uint8_t *out_ptr = nullptr;
+    Size out_len = 0;
+
+    // Gzip support
+    bool is_gzip = false;
+    bool header_done = false;
+    uint32_t crc32 = MZ_CRC32_INIT;
+    Size uncompressed_size = 0;
+
+public:
+    MinizDecompressor(StreamReader *reader) : StreamDecompressor(reader) {}
+    ~MinizDecompressor() {}
+
+    bool Init(CompressionType type) override;
+    Size Read(Size max_len, void *out_buf) override;
+};
+
+bool MinizDecompressor::Init(CompressionType type)
+{
+    RG_STATIC_ASSERT(RG_SIZE(out_buf) >= TINFL_LZ_DICT_SIZE);
+
+    tinfl_init(&inflator);
+    is_gzip = (type == CompressionType::Gzip);
+
+    return true;
+}
+
+Size MinizDecompressor::Read(Size max_len, void *user_buf)
+{
+    // Gzip header is not directly supported by miniz. Currently this
+    // will fail if the header is longer than 4096 bytes, which is
+    // probably quite rare.
+    if (is_gzip && !header_done) {
+        uint8_t header[4096];
+        Size header_len;
+
+        header_len = ReadRaw(RG_SIZE(header), header);
+        if (header_len < 0) {
+            return -1;
+        } else if (header_len < 10 || header[0] != 0x1F || header[1] != 0x8B) {
+            LogError("File '%1' does not look like a Gzip stream", GetFileName());
+            return -1;
+        }
+
+        Size header_offset = 10;
+        if (header[3] & 0x4) { // FEXTRA
+            if (header_len - header_offset < 2)
+                goto truncated_error;
+            uint16_t extra_len = (uint16_t)((header[11] << 8) | header[10]);
+            if (extra_len > header_len - header_offset)
+                goto truncated_error;
+            header_offset += extra_len;
+        }
+        if (header[3] & 0x8) { // FNAME
+            uint8_t *end_ptr = (uint8_t *)memchr(header + header_offset, '\0',
+                                                 (size_t)(header_len - header_offset));
+            if (!end_ptr)
+                goto truncated_error;
+            header_offset = end_ptr - header + 1;
+        }
+        if (header[3] & 0x10) { // FCOMMENT
+            uint8_t *end_ptr = (uint8_t *)memchr(header + header_offset, '\0',
+                                                 (size_t)(header_len - header_offset));
+            if (!end_ptr)
+                goto truncated_error;
+            header_offset = end_ptr - header + 1;
+        }
+        if (header[3] & 0x2) { // FHCRC
+            if (header_len - header_offset < 2)
+                goto truncated_error;
+            uint16_t crc16 = (uint16_t)(header[1] << 8 | header[0]);
+            if ((mz_crc32(MZ_CRC32_INIT, header, (size_t)header_offset) & 0xFFFF) == crc16) {
+                LogError("Failed header CRC16 check in '%s'", GetFileName());
+                return -1;
+            }
+            header_offset += 2;
+        }
+
+        // Put back remaining data in the buffer
+        memcpy_safe(in_buf, header + header_offset, (size_t)(header_len - header_offset));
+        in_ptr = in_buf;
+        in_len = header_len - header_offset;
+
+        header_done = true;
+    }
+
+    // Inflate (with miniz)
+    {
+        Size read_len = 0;
+        for (;;) {
+            if (max_len < out_len) {
+                memcpy_safe(user_buf, out_ptr, (size_t)max_len);
+                read_len += max_len;
+                out_ptr += max_len;
+                out_len -= max_len;
+
+                return read_len;
+            } else {
+                memcpy_safe(user_buf, out_ptr, (size_t)out_len);
+                read_len += out_len;
+                user_buf = (uint8_t *)user_buf + out_len;
+                max_len -= out_len;
+                out_ptr = out_buf;
+                out_len = 0;
+
+                if (done) {
+                    SetEOF(true);
+                    return read_len;
+                }
+            }
+
+            while (out_len < RG_SIZE(out_buf)) {
+                if (!in_len) {
+                    in_ptr = in_buf;
+                    in_len = ReadRaw(RG_SIZE(in_buf), in_buf);
+                    if (in_len < 0)
+                        return read_len ? read_len : in_len;
+                }
+
+                size_t in_arg = (size_t)in_len;
+                size_t out_arg = (size_t)(RG_SIZE(out_buf) - out_len);
+                uint32_t flags = (uint32_t)
+                    ((is_gzip ? 0 : TINFL_FLAG_PARSE_ZLIB_HEADER) |
+                     (IsSourceEOF() ? 0 : TINFL_FLAG_HAS_MORE_INPUT));
+
+                tinfl_status status = tinfl_decompress(&inflator, in_ptr, &in_arg,
+                                                       out_buf, out_buf + out_len,
+                                                       &out_arg, flags);
+
+                if (is_gzip) {
+                    crc32 = (uint32_t)mz_crc32(crc32, out_buf + out_len, out_arg);
+                    uncompressed_size += (Size)out_arg;
+                }
+
+                in_ptr += (Size)in_arg;
+                in_len -= (Size)in_arg;
+                out_len += (Size)out_arg;
+
+                if (status == TINFL_STATUS_DONE) {
+                    // Gzip footer (CRC and size check)
+                    if (is_gzip) {
+                        uint32_t footer[2];
+                        RG_STATIC_ASSERT(RG_SIZE(footer) == 8);
+
+                        if (in_len < RG_SIZE(footer)) {
+                            memcpy_safe(footer, in_ptr, (size_t)in_len);
+
+                            Size missing_len = RG_SIZE(footer) - in_len;
+                            if (ReadRaw(missing_len, footer + in_len) < missing_len) {
+                                if (IsValid()) {
+                                    goto truncated_error;
+                                } else {
+                                    return -1;
+                                }
+                            }
+                        } else {
+                            memcpy_safe(footer, in_ptr, RG_SIZE(footer));
+                        }
+                        footer[0] = LittleEndian(footer[0]);
+                        footer[1] = LittleEndian(footer[1]);
+
+                        if (crc32 != footer[0] || (uint32_t)uncompressed_size != footer[1]) {
+                            LogError("Failed CRC32 or size check in GZip stream '%1'", GetFileName());
+                            return -1;
+                        }
+                    }
+
+                    done = true;
+                    break;
+                } else if (status < TINFL_STATUS_DONE) {
+                    LogError("Failed to decompress '%1' (Deflate)", GetFileName());
+                    return -1;
+                }
+            }
+        }
+    }
+
+truncated_error:
+    LogError("Truncated Gzip header in '%1'", GetFileName());
+    return -1;
+}
+
+class MinizCompressor: public StreamCompressor {
+    tdefl_compressor deflator;
+
+    // Gzip support
+    bool is_gzip = false;
+    uint32_t crc32 = MZ_CRC32_INIT;
+    Size uncompressed_size = 0;
+
+    // Used to buffer small writes
+    LocalArray<uint8_t, 1024> small_buf;
+
+public:
+    MinizCompressor(StreamWriter *writer) : StreamCompressor(writer) {}
+    ~MinizCompressor() {}
+
+    bool Init(CompressionType type, CompressionSpeed speed) override;
+    bool Write(Span<const uint8_t> buf) override;
+    bool Finalize() override;
+
+private:
+    bool WriteDeflate(Span<const uint8_t> buf);
+};
+
+bool MinizCompressor::Init(CompressionType type, CompressionSpeed speed)
+{
+    is_gzip = (type == CompressionType::Gzip);
+
+    int flags = 0;
+    switch (speed) {
+        case CompressionSpeed::Default: { flags = 32 | TDEFL_GREEDY_PARSING_FLAG; } break;
+        case CompressionSpeed::Slow: { flags = 512; } break;
+        case CompressionSpeed::Fast: { flags = 1 | TDEFL_GREEDY_PARSING_FLAG; } break;
+    }
+    flags |= (is_gzip ? 0 : TDEFL_WRITE_ZLIB_HEADER);
+
+    tdefl_status status = tdefl_init(&deflator, [](const void *buf, int len, void *udata) {
+        MinizCompressor *compressor = (MinizCompressor *)udata;
+        return (int)compressor->WriteRaw(MakeSpan((uint8_t *)buf, len));
+    }, this, flags);
+    if (status != TDEFL_STATUS_OKAY) {
+        LogError("Failed to initialize Deflate compression for '%1'", GetFileName());
+        return false;
+    }
+
+    if (is_gzip) {
+        static uint8_t gzip_header[] = {
+            0x1F, 0x8B, // Fixed bytes
+            8,          // Deflate
+            0,          // FLG
+            0, 0, 0, 0, // MTIME
+            0,          // XFL
+            0           // OS
+        };
+
+        if (!WriteRaw(gzip_header))
+            return false;
+    }
+
+    return true;
+}
+
+bool MinizCompressor::Write(Span<const uint8_t> buf)
+{
+    if (small_buf.len) {
+        Size copy_len = std::min(buf.len, small_buf.Available());
+
+        memcpy_safe(small_buf.end(), buf.ptr, copy_len);
+        small_buf.len += copy_len;
+        buf.ptr += copy_len;
+        buf.len -= copy_len;
+    }
+
+    if (buf.len) {
+        if (small_buf.len && !WriteDeflate(small_buf))
+            return false;
+        small_buf.Clear();
+
+        if (buf.len >= RG_SIZE(small_buf.data) / 2) {
+            if (!WriteDeflate(buf))
+                return false;
+        } else {
+            memcpy_safe(small_buf.data, buf.ptr, buf.len);
+            small_buf.len = buf.len;
+        }
+    }
+
+    return true;
+}
+
+bool MinizCompressor::WriteDeflate(Span<const uint8_t> buf)
+{
+    if (is_gzip) {
+        crc32 = (uint32_t)mz_crc32(crc32, buf.ptr, (size_t)buf.len);
+        uncompressed_size += buf.len;
+    }
+
+    tdefl_status status = tdefl_compress_buffer(&deflator, buf.ptr, (size_t)buf.len, TDEFL_NO_FLUSH);
+    if (status < TDEFL_STATUS_OKAY) {
+        if (status != TDEFL_STATUS_PUT_BUF_FAILED) {
+            LogError("Failed to deflate stream to '%1'", GetFileName());
+        }
+
+        return false;
+    }
+
+    return true;
+}
+
+bool MinizCompressor::Finalize()
+{
+    if (small_buf.len && !WriteDeflate(small_buf))
+        return false;
+
+    uint8_t dummy; // Avoid UB in miniz
+    tdefl_status status = tdefl_compress_buffer(&deflator, &dummy, 0, TDEFL_FINISH);
+    if (status != TDEFL_STATUS_DONE) {
+        if (status != TDEFL_STATUS_PUT_BUF_FAILED) {
+            LogError("Failed to end Deflate stream for '%1", GetFileName());
+        }
+
+        return false;
+    }
+
+    if (is_gzip) {
+        uint32_t gzip_footer[] = {
+            LittleEndian(crc32),
+            LittleEndian((uint32_t)uncompressed_size)
+        };
+
+        if (!WriteRaw(MakeSpan((uint8_t *)gzip_footer, RG_SIZE(gzip_footer))))
+            return false;
+    }
+
+    return true;
+}
+
+RG_REGISTER_DECOMPRESSOR(CompressionType::Zlib, MinizDecompressor);
+RG_REGISTER_DECOMPRESSOR(CompressionType::Gzip, MinizDecompressor);
+RG_REGISTER_COMPRESSOR(CompressionType::Zlib, MinizCompressor);
+RG_REGISTER_COMPRESSOR(CompressionType::Gzip, MinizCompressor);
+
+}

package/src/koffi/CMakeLists.txt

@@ -108,7 +108,7 @@ endif()
 add_node_addon(NAME koffi SOURCES ${KOFFI_SRC})
 target_include_directories(koffi PRIVATE . ../.. ../../vendor/node-addon-api)
 
-target_compile_definitions(koffi PRIVATE FELIX_TARGET=koffi NAPI_DISABLE_CPP_EXCEPTIONS NAPI_VERSION=8 LIBCC_NO_BROTLI LIBCC_NO_MINIZ)
+target_compile_definitions(koffi PRIVATE FELIX_TARGET=koffi NAPI_DISABLE_CPP_EXCEPTIONS NAPI_VERSION=8 LIBCC_NO_STATX)
 if(WIN32)
     target_compile_definitions(koffi PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE)
     target_link_libraries(koffi PRIVATE ws2_32)

package/src/koffi/src/call.cc

@@ -1049,6 +1049,24 @@ bool CallData::PushPointer(Napi::Value value, const TypeInfo *type, int directio
             return true;
         } break;
 
+        case napi_number: {
+            Napi::Number number = value.As<Napi::Number>();
+            intptr_t ptr = (intptr_t)number.Int32Value();
+
+            *out_ptr = (void *)ptr;
+            return true;
+        } break;
+
+        case napi_bigint: {
+            Napi::BigInt bigint = value.As<Napi::BigInt>();
+
+            bool lossless;
+            intptr_t ptr = (intptr_t)bigint.Int64Value(&lossless);
+
+            *out_ptr = (void *)ptr;
+            return true;
+        } break;
+
         default: {} break;
     }