koffi 2.6.10 → 2.6.12

package/src/core/libcc/mimetypes_gen.py

@@ -0,0 +1,77 @@
+#!/usr/bin/env python3
+
+# 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.
+
+# 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
+import json
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description = 'Update mimetypes include file')
+    parser.add_argument('-O', '--output_file', dest = 'output_file', action = 'store', help = 'Output file')
+    parser.add_argument('json', help = 'Source JSON database')
+    args = parser.parse_args()
+
+    if args.output_file is None:
+        output_file = os.path.join(os.path.dirname(__file__), 'mimetypes.inc')
+    else:
+        output_file = args.output_file
+
+    with open(args.json) as f:
+        db = json.load(f)
+
+    extensions = {}
+    for (k, v) in db.items():
+        if 'extensions' not in v:
+            continue
+
+        for ext in v['extensions']:
+            if not ext in extensions:
+                extensions[ext] = 'application/x-'
+            if extensions[ext].startswith('application/x-'):
+                extensions[ext] = k
+
+    extensions = [(k, extensions[k]) for k in sorted(extensions.keys())]
+    extensions.sort()
+
+    with open(output_file) as f:
+        lines = f.readlines()
+    with open(output_file, 'w') as f:
+        for line in lines:
+            if not line.startswith('//'):
+                break
+            f.write(line)
+
+        print('', file = f)
+        print('#ifndef MIMETYPE', file = f)
+        print('    #error Please define MIMETYPE() before including mimetypes.inc', file = f)
+        print('#endif', file = f)
+        print('', file = f)
+
+        for k, v in extensions:
+            print(f'MIMETYPE(".{k}", "{v}")', file = f)
+
+        print('', file = f)
+        print('#undef MIMETYPE', file = f)

package/src/koffi/src/ffi.cc

@@ -1966,7 +1966,7 @@ static Napi::Value EncodeValue(const Napi::CallbackInfo &info)
     Napi::Env env = info.Env();
 
     bool has_offset = (info.Length() >= 2 && info[1].IsNumber());
-    bool has_len = (info.Length() >= 4u + has_offset && info[2u + has_offset].IsNumber());
+    bool has_len = (info.Length() >= 4u + has_offset && info[3u + has_offset].IsNumber());
 
     if (info.Length() < 3u + has_offset) [[unlikely]] {
         ThrowError<Napi::TypeError>(env, "Expected %1 to 5 arguments, got %2", 3 + has_offset, info.Length());
@@ -1979,10 +1979,10 @@ static Napi::Value EncodeValue(const Napi::CallbackInfo &info)
 
     Napi::Value ref = info[0];
     int64_t offset = has_offset ? info[1].As<Napi::Number>().Int64Value() : 0;
-    Napi::Value value = info[2u + has_offset + has_len];
+    Napi::Value value = info[2u + has_offset];
 
     if (has_len) {
-        Size len = info[2u + has_offset].As<Napi::Number>();
+        Size len = info[3u + has_offset].As<Napi::Number>();
 
         if (!Encode(ref, offset, value, type, &len))
             return env.Null();

package/src/koffi/src/util.cc

@@ -117,13 +117,30 @@ const TypeInfo *ResolveType(Napi::Value value, int *out_directions)
 
     if (value.IsString()) {
         std::string str = value.As<Napi::String>();
-        const TypeInfo *type = ResolveType(env, str.c_str(), out_directions);
 
-        if (!type) {
-            if (!env.IsExceptionPending()) {
-                ThrowError<Napi::TypeError>(env, "Unknown or invalid type name '%1'", str.c_str());
+        // Quick path for known types (int, float *, etc.)
+        const TypeInfo *type = instance->types_map.FindValue(str.c_str(), nullptr);
+
+        if (!type || (type->flags & (int)TypeFlag::IsIncomplete)) {
+            type = ResolveType(env, str.c_str(), out_directions);
+
+            if (!type) {
+                if (!env.IsExceptionPending()) {
+                    ThrowError<Napi::TypeError>(env, "Unknown or invalid type name '%1'", str.c_str());
+                }
+                return nullptr;
             }
-            return nullptr;
+
+            // Cache for quick future access
+            bool inserted;
+            auto bucket = instance->types_map.TrySetDefault(str.c_str(), &inserted);
+
+            if (inserted) {
+                bucket->key = DuplicateString(str.c_str(), &instance->str_alloc).ptr;
+                bucket->value = type;
+            }
+        } else if (out_directions) {
+            *out_directions = 1;
         }
 
         return type;
@@ -200,48 +217,54 @@ const TypeInfo *ResolveType(Napi::Env env, Span<const char> str, int *out_direct
         }
     }
 
-    // Skip initial const qualifiers
-    str = TrimStr(str);
-    while (SplitIdentifier(str) == "const") {
-        str = str.Take(6, str.len - 6);
-        str = TrimStr(str);
-    }
-    str = TrimStr(str);
-
-    Span<const char> remain = str;
+    Span<const char> name;
+    Span<const char> after;
+    {
+        Span<const char> remain = str;
 
-    // Consume one or more identifiers (e.g. unsigned int)
-    for (;;) {
+        // Skip initial const qualifiers
+        remain = TrimStr(remain);
+        while (SplitIdentifier(remain) == "const") {
+            remain = remain.Take(6, remain.len - 6);
+            remain = TrimStr(remain);
+        }
         remain = TrimStr(remain);
 
-        Span<const char> token = SplitIdentifier(remain);
-        if (!token.len)
-            break;
-        remain = remain.Take(token.len, remain.len - token.len);
-    }
+        after = remain;
 
-    Span<const char> name = TrimStr(MakeSpan(str.ptr, remain.ptr - str.ptr));
+        // Consume one or more identifiers (e.g. unsigned int)
+        for (;;) {
+            after = TrimStr(after);
+
+            Span<const char> token = SplitIdentifier(after);
+            if (!token.len)
+                break;
+            after = after.Take(token.len, after.len - token.len);
+        }
+
+        name = TrimStr(MakeSpan(remain.ptr, after.ptr - remain.ptr));
+    }
 
     // Consume pointer indirections
-    while (remain.len) {
-        if (remain[0] == '*') {
-            remain = remain.Take(1, remain.len - 1);
+    while (after.len) {
+        if (after[0] == '*') {
+            after = after.Take(1, after.len - 1);
             indirect++;
 
             if (indirect >= RG_SIZE(disposables) * 8) [[unlikely]] {
                 ThrowError<Napi::Error>(env, "Too many pointer indirections");
                 return nullptr;
             }
-        } else if (remain[0] == '!') {
-            remain = remain.Take(1, remain.len - 1);
+        } else if (after[0] == '!') {
+            after = after.Take(1, after.len - 1);
             disposables |= (1u << indirect);
-        } else if (SplitIdentifier(remain) == "const") {
-            remain = remain.Take(6, remain.len - 6);
+        } else if (SplitIdentifier(after) == "const") {
+            after = after.Take(6, after.len - 6);
         } else {
             break;
         }
 
-        remain = TrimStr(remain);
+        after = TrimStr(after);
     }
 
     const TypeInfo *type = instance->types_map.FindValue(name, nullptr);