koffi 2.12.3 → 2.12.5-beta.1

package/src/core/base/crc_gen.py

@@ -0,0 +1,109 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2025  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.
+
+# This script uses the database of mimetypes distributed here: https://github.com/jshttp/mime-db
+# to produce the X-header file mimetypes.inc
+
+import os
+import argparse
+
+CRC32_POLY = 0xEDB88320
+CRC32C_POLY = 0x82F63B78
+CRC64_XZ_POLY = 0xC96C5795D7870F42
+CRC64_NVME_POLY = 0x9A6C9329AC4BC9B5
+
+LICENSE_HEADER = """// Copyright (C) 2025  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."""
+
+def write_crc32_table(f, name, poly):
+    f.write(f'static const uint32_t {name}[256] = {{')
+    for i in range(0, 256):
+        value = i
+        for j in range(0, 8):
+            value = (value >> 1) ^ (poly if value & 1 else 0)
+
+        if i % 6 == 0:
+            f.write('\n   ')
+        f.write(f' 0x{value:08X}u,')
+    f.write('\n};\n\n')
+
+def write_crc64_tables(f, name, poly):
+    for table in range(0, 16):
+        count = table * 8 + 8
+
+        f.write(f'static const uint64_t {name}{table}[256] = {{')
+        for i in range(0, 256):
+            value = i
+            for j in range(0, count):
+                value = (value >> 1) ^ (poly if value & 1 else 0)
+
+            if i % 4 == 0:
+                f.write('\n   ')
+            f.write(f' 0x{value:016X}ull,')
+        f.write('\n};\n')
+
+    f.write('\n')
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description = 'Update CRC tables header file')
+    parser.add_argument('-O', '--output_file', dest = 'output_file', action = 'store', help = 'Output file')
+    args = parser.parse_args()
+
+    if args.output_file is None:
+        output_file = os.path.join(os.path.dirname(__file__), 'crc.inc')
+    else:
+        output_file = args.output_file
+
+    with open(output_file, 'w') as f:
+        f.write(f'''{LICENSE_HEADER}
+
+// This file is autogenerated by crc_gen.py
+
+namespace RG {{
+
+''')
+
+        write_crc32_table(f, 'Crc32Table', CRC32_POLY)
+        write_crc32_table(f, 'Crc32CTable', CRC32C_POLY)
+        write_crc64_tables(f, 'Crc64XzTable', CRC64_XZ_POLY)
+        write_crc64_tables(f, 'Crc64NvmeTable', CRC64_NVME_POLY)
+
+        f.write('}\n')

package/src/koffi/src/ffi.cc

@@ -242,24 +242,25 @@ static Napi::Value CreateStructType(const Napi::CallbackInfo &info, bool pad)
         return env.Null();
     }
 
-    bool named = info.Length() > 1;
+    bool skip = (info.Length() > 1);
+    bool named = skip && !IsNullOrUndefined(info[0]);
     bool redefine = named && CheckValueTag(instance, info[0], &TypeInfoMarker);
 
     if (named && !info[0].IsString() && !redefine) {
         ThrowError<Napi::TypeError>(env, "Unexpected %1 value for name, expected string", GetValueType(instance, info[0]));
         return env.Null();
     }
-    if (!IsObject(info[named])) {
+    if (!IsObject(info[skip])) {
         ThrowError<Napi::TypeError>(env, "Unexpected %1 value for members, expected object", GetValueType(instance, info[1]));
         return env.Null();
     }
 
     Napi::String name = info[0].As<Napi::String>();
-    Napi::Object obj = info[named].As<Napi::Object>();
+    Napi::Object obj = info[skip].As<Napi::Object>();
     Napi::Array keys = GetOwnPropertyNames(obj);
 
     RG_DEFER_NC(err_guard, count = instance->types.count) {
-        Size start = count + !named;
+        Size start = count + !skip;
 
         for (Size i = start; i < instance->types.count; i++) {
             const TypeInfo *it = &instance->types[i];
@@ -409,24 +410,25 @@ static Napi::Value CreateUnionType(const Napi::CallbackInfo &info)
         return env.Null();
     }
 
-    bool named = info.Length() > 1;
+    bool skip = (info.Length() > 1);
+    bool named = skip && !IsNullOrUndefined(info[0]);
     bool redefine = named && CheckValueTag(instance, info[0], &TypeInfoMarker);
 
     if (named && !info[0].IsString() && !redefine) {
         ThrowError<Napi::TypeError>(env, "Unexpected %1 value for name, expected string", GetValueType(instance, info[0]));
         return env.Null();
     }
-    if (!IsObject(info[named])) {
+    if (!IsObject(info[skip])) {
         ThrowError<Napi::TypeError>(env, "Unexpected %1 value for members, expected object", GetValueType(instance, info[1]));
         return env.Null();
     }
 
     Napi::String name = info[0].As<Napi::String>();
-    Napi::Object obj = info[named].As<Napi::Object>();
+    Napi::Object obj = info[skip].As<Napi::Object>();
     Napi::Array keys = GetOwnPropertyNames(obj);
 
     RG_DEFER_NC(err_guard, count = instance->types.count) {
-        Size start = count + !named;
+        Size start = count + !skip;
 
         for (Size i = start; i < instance->types.count; i++) {
             const TypeInfo *it = &instance->types[i];
@@ -584,7 +586,7 @@ static Napi::Value CreateOpaqueType(const Napi::CallbackInfo &info)
     Napi::Env env = info.Env();
     InstanceData *instance = env.GetInstanceData<InstanceData>();
 
-    bool named = (info.Length() >= 1);
+    bool named = (info.Length() >= 1) && !IsNullOrUndefined(info[0]);
 
     if (named && !info[0].IsString()) {
         ThrowError<Napi::TypeError>(env, "Unexpected %1 value for name, expected string", GetValueType(instance, info[0]));
@@ -621,7 +623,8 @@ static Napi::Value CreatePointerType(const Napi::CallbackInfo &info)
         return env.Null();
     }
 
-    bool named = (info.Length() >= 2 && !info[1].IsNumber());
+    bool skip = (info.Length() > 1) && !info[1].IsNumber();
+    bool named = skip && !IsNullOrUndefined(info[0]);
 
     if (named && !info[0].IsString()) {
         ThrowError<Napi::TypeError>(env, "Unexpected %1 value for name, expected string", GetValueType(instance, info[0]));
@@ -630,18 +633,18 @@ static Napi::Value CreatePointerType(const Napi::CallbackInfo &info)
 
     std::string name = named ? info[0].As<Napi::String>() : std::string();
 
-    const TypeInfo *type = ResolveType(info[named]);
+    const TypeInfo *type = ResolveType(info[skip]);
     if (!type)
         return env.Null();
 
     int count = 0;
-    if (info.Length() >= 2u + named) {
-        if (!info[1 + named].IsNumber()) {
-            ThrowError<Napi::TypeError>(env, "Unexpected %1 value for count, expected number", GetValueType(instance, info[1 + named]));
+    if (info.Length() >= 2u + skip) {
+        if (!info[1 + skip].IsNumber()) {
+            ThrowError<Napi::TypeError>(env, "Unexpected %1 value for count, expected number", GetValueType(instance, info[1 + skip]));
             return env.Null();
         }
 
-        count = info[1 + named].As<Napi::Number>();
+        count = info[1 + skip].As<Napi::Number>();
 
         if (count < 1 || count > 4) {
             ThrowError<Napi::TypeError>(env, "Value of count must be between 1 and 4");
@@ -727,7 +730,8 @@ static Napi::Value CreateDisposableType(const Napi::CallbackInfo &info)
         return env.Null();
     }
 
-    bool named = (info.Length() >= 2 && !info[1].IsFunction());
+    bool skip = (info.Length() > 1) && !info[1].IsFunction();
+    bool named = skip && !IsNullOrUndefined(info[0]);
 
     if (named && !info[0].IsString()) {
         ThrowError<Napi::TypeError>(env, "Unexpected %1 value for name, expected string", GetValueType(instance, info[0]));
@@ -736,7 +740,7 @@ static Napi::Value CreateDisposableType(const Napi::CallbackInfo &info)
 
     Napi::String name = info[0].As<Napi::String>();
 
-    const TypeInfo *src = ResolveType(info[named]);
+    const TypeInfo *src = ResolveType(info[skip]);
     if (!src)
         return env.Null();
     if (src->primitive != PrimitiveKind::Pointer &&
@@ -753,8 +757,8 @@ static Napi::Value CreateDisposableType(const Napi::CallbackInfo &info)
 
     DisposeFunc *dispose;
     Napi::Function dispose_func;
-    if (info.Length() >= 2u + named && !IsNullOrUndefined(info[1 + named])) {
-        Napi::Function func = info[1 + named].As<Napi::Function>();
+    if (info.Length() >= 2u + skip && !IsNullOrUndefined(info[1 + skip])) {
+        Napi::Function func = info[1 + skip].As<Napi::Function>();
 
         if (!func.IsFunction()) {
             ThrowError<Napi::TypeError>(env, "Unexpected %1 value for func, expected function", GetValueType(instance, func));
@@ -989,7 +993,7 @@ static Napi::Value CreateArrayType(const Napi::CallbackInfo &info)
     return WrapType(env, instance, type);
 }
 
-static bool ParseClassicFunction(const Napi::CallbackInfo &info, FunctionInfo *out_func)
+static bool ParseClassicFunction(const Napi::CallbackInfo &info, bool concrete, FunctionInfo *out_func)
 {
     Napi::Env env = info.Env();
     InstanceData *instance = env.GetInstanceData<InstanceData>();
@@ -1010,6 +1014,8 @@ static bool ParseClassicFunction(const Napi::CallbackInfo &info, FunctionInfo *o
         parameters = info[3u].As<Napi::Array>();
     }
 
+    bool named = true;
+
 #if defined(_WIN32)
     if (name.IsNumber()) {
         out_func->ordinal_name = name.As<Napi::Number>().Int32Value();
@@ -1017,11 +1023,16 @@ static bool ParseClassicFunction(const Napi::CallbackInfo &info, FunctionInfo *o
     }
 #endif
     if (!name.IsString()) {
-        ThrowError<Napi::TypeError>(env, "Unexpected %1 value for name, expected string or integer", GetValueType(instance, name));
-        return false;
+        if (!concrete && IsNullOrUndefined(name)) {
+            named = false;
+        } else {
+            ThrowError<Napi::TypeError>(env, "Unexpected %1 value for name, expected string or integer", GetValueType(instance, name));
+            return false;
+        }
     }
 
-    out_func->name = DuplicateString(name.ToString().Utf8Value().c_str(), &instance->str_alloc).ptr;
+    // Leave anonymous naming responsibility to caller
+    out_func->name = named ? DuplicateString(name.Utf8Value().c_str(), &instance->str_alloc).ptr : nullptr;
 
     out_func->ret.type = ResolveType(ret);
     if (!out_func->ret.type)
@@ -1086,7 +1097,7 @@ static Napi::Value CreateFunctionType(const Napi::CallbackInfo &info)
     RG_DEFER_N(err_guard) { instance->callbacks.RemoveLast(1); };
 
     if (info.Length() >= 3) {
-        if (!ParseClassicFunction(info, func))
+        if (!ParseClassicFunction(info, false, func))
             return env.Null();
     } else if (info.Length() >= 1) {
         if (!info[0].IsString()) {
@@ -1095,13 +1106,19 @@ static Napi::Value CreateFunctionType(const Napi::CallbackInfo &info)
         }
 
         std::string proto = info[0u].As<Napi::String>();
-        if (!ParsePrototype(env, proto.c_str(), func))
+        if (!ParsePrototype(env, proto.c_str(), false, func))
             return env.Null();
     } else {
         ThrowError<Napi::TypeError>(env, "Expected 1 or 3 arguments, got %1", info.Length());
         return env.Null();
     }
 
+    bool named = func->name;
+
+    if (!named) {
+        func->name = Fmt(&instance->str_alloc, "<anonymous_%1>", instance->types.count).ptr;
+    }
+
     if (!AnalyseFunction(env, instance, func))
         return env.Null();
 
@@ -1112,7 +1129,7 @@ static Napi::Value CreateFunctionType(const Napi::CallbackInfo &info)
     func->required_parameters += 2;
 
     // We cannot fail after this check
-    if (instance->types_map.Find(func->name)) {
+    if (named && instance->types_map.Find(func->name)) {
         ThrowError<Napi::Error>(env, "Duplicate type name '%1'", func->name);
         return env.Null();
     }
@@ -1649,7 +1666,7 @@ static Napi::Value FindLibraryFunction(const Napi::CallbackInfo &info)
     func->lib = lib->Ref();
 
     if (info.Length() >= 3) {
-        if (!ParseClassicFunction(info, func))
+        if (!ParseClassicFunction(info, true, func))
             return env.Null();
     } else if (info.Length() >= 1) {
         if (!info[0].IsString()) {
@@ -1658,7 +1675,7 @@ static Napi::Value FindLibraryFunction(const Napi::CallbackInfo &info)
         }
 
         std::string proto = info[0u].As<Napi::String>();
-        if (!ParsePrototype(env, proto.c_str(), func))
+        if (!ParsePrototype(env, proto.c_str(), true, func))
             return env.Null();
     } else {
         ThrowError<Napi::TypeError>(env, "Expected 1 or 3 arguments, got %1", info.Length());

package/src/koffi/src/parser.cc

@@ -27,7 +27,7 @@
 
 namespace RG {
 
-bool PrototypeParser::Parse(const char *str, FunctionInfo *out_func)
+bool PrototypeParser::Parse(const char *str, bool concrete, FunctionInfo *out_func)
 {
     tokens.Clear();
     offset = 0;
@@ -41,7 +41,18 @@ bool PrototypeParser::Parse(const char *str, FunctionInfo *out_func)
         return false;
     }
     offset += (offset < tokens.len && DetectCallConvention(tokens[offset], &out_func->convention));
-    out_func->name = ParseIdentifier();
+
+    if (offset >= tokens.len) {
+        MarkError("Unexpected end of prototype, expected identifier");
+        return false;
+    }
+    if (IsIdentifier(tokens[offset])) {
+        Span<const char> tok = tokens[offset++];
+        out_func->name = DuplicateString(tok, &instance->str_alloc).ptr;
+    } else if (concrete) {
+        MarkError("Unexpected token '%1', expected identifier", tokens[offset]);
+        return false;
+    }
 
     Consume("(");
     offset += (offset + 1 < tokens.len && tokens[offset] == "void" && tokens[offset + 1] == ")");
@@ -169,23 +180,6 @@ const TypeInfo *PrototypeParser::ParseType(int *out_directions)
     return instance->void_type;
 }
 
-const char *PrototypeParser::ParseIdentifier()
-{
-    if (offset >= tokens.len) {
-        MarkError("Unexpected end of prototype, expected identifier");
-        return "";
-    }
-    if (!IsIdentifier(tokens[offset])) {
-        MarkError("Unexpected token '%1', expected identifier", tokens[offset]);
-        return "";
-    }
-
-    Span<const char> tok = tokens[offset++];
-    const char *ident = DuplicateString(tok, &instance->str_alloc).ptr;
-
-    return ident;
-}
-
 bool PrototypeParser::Consume(const char *expect)
 {
     if (offset >= tokens.len) {
@@ -217,10 +211,10 @@ bool PrototypeParser::IsIdentifier(Span<const char> tok) const
     return IsAsciiAlpha(tok[0]) || tok[0] == '_';
 }
 
-bool ParsePrototype(Napi::Env env, const char *str, FunctionInfo *out_func)
+bool ParsePrototype(Napi::Env env, const char *str, bool concrete, FunctionInfo *out_func)
 {
     PrototypeParser parser(env);
-    return parser.Parse(str, out_func);
+    return parser.Parse(str, concrete, out_func);
 }
 
 }

package/src/koffi/src/parser.hh

@@ -44,13 +44,12 @@ class PrototypeParser {
 public:
     PrototypeParser(Napi::Env env) : env(env), instance(env.GetInstanceData<InstanceData>()) {}
 
-    bool Parse(const char *str, FunctionInfo *out_func);
+    bool Parse(const char *str, bool concrete, FunctionInfo *out_func);
 
 private:
     void Tokenize(const char *str);
 
     const TypeInfo *ParseType(int *out_directions);
-    const char *ParseIdentifier();
 
     bool Consume(const char *expect);
     bool Match(const char *expect);
@@ -68,6 +67,6 @@ private:
     }
 };
 
-bool ParsePrototype(Napi::Env env, const char *str, FunctionInfo *out_func);
+bool ParsePrototype(Napi::Env env, const char *str, bool concrete, FunctionInfo *out_func);
 
 }