koffi 2.14.1 → 2.15.0

package/src/koffi/src/call.cc

@@ -1,25 +1,7 @@
-// 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.
-
-#include "src/core/base/base.hh"
+// SPDX-License-Identifier: MIT
+// SPDX-FileCopyrightText: 2025 Niels Martignène <niels.martignene@protonmail.com>
+
+#include "lib/native/base/base.hh"
 #include "call.hh"
 #include "ffi.hh"
 #include "util.hh"
@@ -88,15 +70,7 @@ void CallData::Dispose()
         }
     }
 
-    instance->temporaries -= mem->temporary;
-
-    if (!--mem->depth) {
-        mem->busy = false;
-
-        if (mem->temporary) {
-            delete mem;
-        }
-    }
+    ReleaseMemory(instance, mem);
 
     instance = nullptr;
 }
@@ -264,6 +238,8 @@ Size CallData::PushString16Value(Napi::Value value, const char16_t **out_str16)
 
 Size CallData::PushString32Value(Napi::Value value, const char32_t **out_str32)
 {
+    static const char32_t ReplacementChar = 0x0000FFFD;
+
     Span<char32_t> buf;
 
     Span<const char16_t> buf16;
@@ -287,15 +263,19 @@ Size CallData::PushString32Value(Napi::Value value, const char32_t **out_str32)
         char32_t uc = buf16[i];
 
         if (uc >= 0xD800 && uc <= 0xDBFF) {
-            char16_t uc2 = buf16.ptr[++i];
+            if (++i < buf16.len) {
+                char16_t uc2 = buf16.ptr[i];
 
-            if (uc2 >= 0xDC00 && uc2 <= 0xDFFF) {
-                uc = ((uc - 0xD800) << 10) + (uc2 - 0xDC00) + 0x10000u;
+                if (uc2 >= 0xDC00 && uc2 <= 0xDFFF) [[likely]] {
+                    uc = ((uc - 0xD800) << 10) + (uc2 - 0xDC00) + 0x10000u;
+                } else {
+                    uc = ReplacementChar;
+                }
             } else {
-                uc = '?';
+                uc = ReplacementChar;
             }
-        } else if (uc >= 0xDC00 && uc <= 0xDFFF) {
-            uc = '?';
+        } else if (uc >= 0xDC00 && uc <= 0xDFFF) [[unlikely]] {
+            uc = ReplacementChar;
         }
 
         buf[j++] = uc;
@@ -316,7 +296,7 @@ bool CallData::PushObject(Napi::Object obj, const TypeInfo *type, uint8_t *origi
     if (type->primitive == PrimitiveKind::Record) {
         members = type->members;
     } else if (type->primitive == PrimitiveKind::Union) {
-        if (CheckValueTag(instance, obj, &MagicUnionMarker)) {
+        if (CheckValueTag(obj, &MagicUnionMarker)) {
             MagicUnion *u = MagicUnion::Unwrap(obj);
             const uint8_t *raw = u->GetRaw();
 
@@ -909,7 +889,7 @@ bool CallData::PushStringArray(Napi::Value obj, const TypeInfo *type, uint8_t *o
 
 bool CallData::PushPointer(Napi::Value value, const TypeInfo *type, int directions, void **out_ptr)
 {
-    if (CheckValueTag(instance, value, &CastMarker)) {
+    if (CheckValueTag(value, &CastMarker)) {
         Napi::External<ValueCast> external = value.As<Napi::External<ValueCast>>();
         ValueCast *cast = external.Data();
 
@@ -932,8 +912,8 @@ bool CallData::PushPointer(Napi::Value value, const TypeInfo *type, int directio
                       type->primitive == PrimitiveKind::String16 ||
                       type->primitive == PrimitiveKind::String32);
 
-            if (!CheckValueTag(instance, value, type->ref.marker) &&
-                    !CheckValueTag(instance, value, instance->void_type) &&
+            if (!CheckValueTag(value, type->ref.marker) &&
+                    !CheckValueTag(value, instance->void_type) &&
                     ref != instance->void_type) [[unlikely]]
                 goto unexpected;
 
@@ -1000,7 +980,7 @@ bool CallData::PushPointer(Napi::Value value, const TypeInfo *type, int directio
                 ptr = AllocHeap(ref->size, 16);
 
                 if (ref->primitive == PrimitiveKind::Union &&
-                        (directions & 2) && !CheckValueTag(instance, obj, &MagicUnionMarker)) [[unlikely]] {
+                        (directions & 2) && !CheckValueTag(obj, &MagicUnionMarker)) [[unlikely]] {
                     ThrowError<Napi::TypeError>(env, "Unexpected %1 value, expected union value", GetValueType(instance, obj));
                     return false;
                 }
@@ -1108,9 +1088,9 @@ bool CallData::PushCallback(Napi::Value value, const TypeInfo *type, void **out_
             return false;
 
         *out_ptr = ptr;
-    } else if (CheckValueTag(instance, value, type->ref.marker)) {
+    } else if (CheckValueTag(value, type->ref.marker)) {
         *out_ptr = value.As<Napi::External<void>>().Data();
-    } else if (CheckValueTag(instance, value, &CastMarker)) {
+    } else if (CheckValueTag(value, &CastMarker)) {
         Napi::External<ValueCast> external = value.As<Napi::External<ValueCast>>();
         ValueCast *cast = external.Data();
 
@@ -1324,7 +1304,7 @@ void CallData::PopOutArguments()
             case OutArgument::Kind::Object: {
                 Napi::Object obj = value.As<Napi::Object>();
 
-                if (CheckValueTag(instance, value, &MagicUnionMarker)) {
+                if (CheckValueTag(value, &MagicUnionMarker)) {
                     MagicUnion *u = MagicUnion::Unwrap(obj);
                     u->SetRaw(out.ptr);
                 } else {

package/src/koffi/src/call.hh

@@ -1,27 +1,9 @@
-// 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.
+// SPDX-License-Identifier: MIT
+// SPDX-FileCopyrightText: 2025 Niels Martignène <niels.martignene@protonmail.com>
 
 #pragma once
 
-#include "src/core/base/base.hh"
+#include "lib/native/base/base.hh"
 #include "ffi.hh"
 #include "util.hh"
 

package/src/koffi/src/errno.inc

@@ -1,23 +1,5 @@
-// 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.
+// SPDX-License-Identifier: MIT
+// SPDX-FileCopyrightText: 2025 Niels Martignène <niels.martignene@protonmail.com>
 
 #include <errno.h>
 

package/src/koffi/src/ffi.cc

@@ -1,29 +1,12 @@
-// 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.
-
-#include "src/core/base/base.hh"
+// SPDX-License-Identifier: MIT
+// SPDX-FileCopyrightText: 2025 Niels Martignène <niels.martignene@protonmail.com>
+
+#include "lib/native/base/base.hh"
 #include "ffi.hh"
 #include "call.hh"
 #include "parser.hh"
 #include "util.hh"
+#include "uv.hh"
 #if defined(_WIN32)
     #include "win32.hh"
 #endif
@@ -222,7 +205,7 @@ static bool MapType(Napi::Env env, InstanceData *instance, const TypeInfo *type,
     }
 
     bool inserted;
-    instance->types_map.TrySet(name, type, &inserted);
+    instance->types_map.InsertOrGet(name, type, &inserted);
 
     if (!inserted) {
         ThrowError<Napi::Error>(env, "Duplicate type name '%1'", name);
@@ -244,7 +227,7 @@ static Napi::Value CreateStructType(const Napi::CallbackInfo &info, bool pad)
 
     bool skip = (info.Length() > 1);
     bool named = skip && !IsNullOrUndefined(info[0]);
-    bool redefine = named && CheckValueTag(instance, info[0], &TypeInfoMarker);
+    bool redefine = named && CheckValueTag(info[0], &TypeInfoMarker);
 
     if (named && !info[0].IsString() && !redefine) {
         ThrowError<Napi::TypeError>(env, "Unexpected %1 value for name, expected string", GetValueType(instance, info[0]));
@@ -364,7 +347,7 @@ static Napi::Value CreateStructType(const Napi::CallbackInfo &info, bool pad)
         }
 
         bool inserted;
-        members.TrySet(member.name, &inserted);
+        members.InsertOrGet(member.name, &inserted);
 
         if (!inserted) {
             ThrowError<Napi::Error>(env, "Duplicate member '%1' in struct '%2'", member.name, type->name);
@@ -414,7 +397,7 @@ static Napi::Value CreateStructType(const Napi::CallbackInfo &info, bool pad)
         type = replace;
     }
 
-    return WrapType(env, instance, type);
+    return WrapType(env, type);
 }
 
 static Napi::Value CreatePaddedStructType(const Napi::CallbackInfo &info)
@@ -439,7 +422,7 @@ static Napi::Value CreateUnionType(const Napi::CallbackInfo &info)
 
     bool skip = (info.Length() > 1);
     bool named = skip && !IsNullOrUndefined(info[0]);
-    bool redefine = named && CheckValueTag(instance, info[0], &TypeInfoMarker);
+    bool redefine = named && CheckValueTag(info[0], &TypeInfoMarker);
 
     if (named && !info[0].IsString() && !redefine) {
         ThrowError<Napi::TypeError>(env, "Unexpected %1 value for name, expected string", GetValueType(instance, info[0]));
@@ -554,7 +537,7 @@ static Napi::Value CreateUnionType(const Napi::CallbackInfo &info)
         }
 
         bool inserted;
-        members.TrySet(member.name, &inserted);
+        members.InsertOrGet(member.name, &inserted);
 
         if (!inserted) {
             ThrowError<Napi::Error>(env, "Duplicate member '%1' in union '%2'", member.name, type->name);
@@ -583,13 +566,12 @@ static Napi::Value CreateUnionType(const Napi::CallbackInfo &info)
         type = replace;
     }
 
-    return WrapType(env, instance, type);
+    return WrapType(env, type);
 }
 
 Napi::Value InstantiateUnion(const Napi::CallbackInfo &info)
 {
     Napi::Env env = info.Env();
-    InstanceData *instance = env.GetInstanceData<InstanceData>();
 
     if (!info.IsConstructCall()) {
         ThrowError<Napi::TypeError>(env, "This function is a constructor and must be called with new");
@@ -609,7 +591,7 @@ Napi::Value InstantiateUnion(const Napi::CallbackInfo &info)
     }
 
     Napi::Object wrapper = type->construct.New({}).As<Napi::Object>();
-    SetValueTag(instance, wrapper, &MagicUnionMarker);
+    SetValueTag(wrapper, &MagicUnionMarker);
 
     return wrapper;
 }
@@ -626,7 +608,7 @@ static Napi::Value CreateOpaqueType(const Napi::CallbackInfo &info)
         return env.Null();
     }
 
-    Napi::String name = info[0].As<Napi::String>();    
+    Napi::String name = info[0].As<Napi::String>();
 
     TypeInfo *type = instance->types.AppendDefault();
     K_DEFER_N(err_guard) { instance->types.RemoveLast(1); };
@@ -643,7 +625,7 @@ static Napi::Value CreateOpaqueType(const Napi::CallbackInfo &info)
         return env.Null();
     err_guard.Disable();
 
-    return WrapType(env, instance, type);
+    return WrapType(env, type);
 }
 
 static Napi::Value CreatePointerType(const Napi::CallbackInfo &info)
@@ -712,7 +694,7 @@ static Napi::Value CreatePointerType(const Napi::CallbackInfo &info)
         type = copy;
     }
 
-    return WrapType(env, instance, type);
+    return WrapType(env, type);
 }
 
 static Napi::Value EncodePointerDirection(const Napi::CallbackInfo &info, int directions)
@@ -720,7 +702,6 @@ static Napi::Value EncodePointerDirection(const Napi::CallbackInfo &info, int di
     K_ASSERT(directions >= 1 && directions <= 3);
 
     Napi::Env env = info.Env();
-    InstanceData *instance = env.GetInstanceData<InstanceData>();
 
     if (info.Length() < 1) {
         ThrowError<Napi::TypeError>(env, "Expected 1 argument, got %1", info.Length());
@@ -742,7 +723,7 @@ static Napi::Value EncodePointerDirection(const Napi::CallbackInfo &info, int di
     // Embed direction in unused pointer bits
     const TypeInfo *marked = (const TypeInfo *)((uint8_t *)type + directions - 1);
 
-    return WrapType(env, instance, marked);
+    return WrapType(env, marked);
 }
 
 static Napi::Value MarkIn(const Napi::CallbackInfo &info)
@@ -810,7 +791,7 @@ static Napi::Value CreateDisposableType(const Napi::CallbackInfo &info)
             const Napi::FunctionReference &ref = type->dispose_ref;
 
             Napi::External<void> external = Napi::External<void>::New(env, (void *)ptr);
-            SetValueTag(instance, external, type->ref.marker);
+            SetValueTag(external, type->ref.marker);
 
             Napi::Value self = env.Null();
             napi_value args[] = {
@@ -845,7 +826,7 @@ static Napi::Value CreateDisposableType(const Napi::CallbackInfo &info)
     // If the insert succeeds, we cannot fail anymore
     if (named) {
         bool inserted;
-        instance->types_map.TrySet(type->name, type, &inserted);
+        instance->types_map.InsertOrGet(type->name, type, &inserted);
 
         if (!inserted) {
             ThrowError<Napi::Error>(env, "Duplicate type name '%1'", type->name);
@@ -854,7 +835,7 @@ static Napi::Value CreateDisposableType(const Napi::CallbackInfo &info)
     }
     err_guard.Disable();
 
-    return WrapType(env, instance, type);
+    return WrapType(env, type);
 }
 
 static inline bool GetExternalPointer(Napi::Env env, Napi::Value value, void **out_ptr)
@@ -864,9 +845,9 @@ static inline bool GetExternalPointer(Napi::Env env, Napi::Value value, void **o
     if (IsNullOrUndefined(value)) {
         *out_ptr = 0;
         return true;
-    } else if (value.IsExternal() && !CheckValueTag(instance, value, &TypeInfoMarker) &&
-                                     !CheckValueTag(instance, value, &CastMarker) &&
-                                     !CheckValueTag(instance, value, &MagicUnionMarker)) {
+    } else if (value.IsExternal() && !CheckValueTag(value, &TypeInfoMarker) &&
+                                     !CheckValueTag(value, &CastMarker) &&
+                                     !CheckValueTag(value, &MagicUnionMarker)) {
         Napi::External<void> external = value.As<Napi::External<void>>();
         void *ptr = external.Data();
 
@@ -922,7 +903,7 @@ static Napi::Value CallAlloc(const Napi::CallbackInfo &info)
     }
 
     Napi::External<void> external = Napi::External<void>::New(env, ptr);
-    SetValueTag(instance, external, type);
+    SetValueTag(external, type);
 
     return external;
 }
@@ -1047,7 +1028,7 @@ static Napi::Value CreateArrayType(const Napi::CallbackInfo &info)
         type->countedby = DuplicateString(str.Utf8Value().c_str(), &instance->str_alloc).ptr;
     }
 
-    return WrapType(env, instance, type);
+    return WrapType(env, type);
 }
 
 static bool ParseClassicFunction(const Napi::CallbackInfo &info, bool concrete, FunctionInfo *out_func)
@@ -1210,7 +1191,7 @@ static Napi::Value CreateFunctionType(const Napi::CallbackInfo &info)
 
     instance->types_map.Set(type->name, type);
 
-    return WrapType(env, instance, type);
+    return WrapType(env, type);
 }
 
 static Napi::Value CreateTypeAlias(const Napi::CallbackInfo &info)
@@ -1238,7 +1219,7 @@ static Napi::Value CreateTypeAlias(const Napi::CallbackInfo &info)
     if (!MapType(env, instance, type, alias))
         return env.Null();
 
-    return WrapType(env, instance, type);
+    return WrapType(env, type);
 }
 
 static Napi::Value GetTypeSize(const Napi::CallbackInfo &info)
@@ -1310,7 +1291,6 @@ static Napi::Value GetMemberOffset(const Napi::CallbackInfo &info)
 static Napi::Value GetResolvedType(const Napi::CallbackInfo &info)
 {
     Napi::Env env = info.Env();
-    InstanceData *instance = env.GetInstanceData<InstanceData>();
 
     if (info.Length() < 1) {
         ThrowError<Napi::TypeError>(env, "Expected 1 argument, got %1", info.Length());
@@ -1321,13 +1301,12 @@ static Napi::Value GetResolvedType(const Napi::CallbackInfo &info)
     if (!type)
         return env.Null();
 
-    return WrapType(env, instance, type);
+    return WrapType(env, type);
 }
 
 static Napi::Value GetTypeDefinition(const Napi::CallbackInfo &info)
 {
     Napi::Env env = info.Env();
-    InstanceData *instance = env.GetInstanceData<InstanceData>();
 
     if (info.Length() < 1) {
         ThrowError<Napi::TypeError>(env, "Expected 1 argument, got %1", info.Length());
@@ -1378,7 +1357,7 @@ static Napi::Value GetTypeDefinition(const Napi::CallbackInfo &info)
                 defn.Set("hint", ArrayHintNames[(int)type->hint]);
             } [[fallthrough]];
             case PrimitiveKind::Pointer: {
-                Napi::Value value = WrapType(env, instance, type->ref.type);
+                Napi::Value value = WrapType(env, type->ref.type);
                 defn.Set("ref", value);
             } break;
             case PrimitiveKind::Record:
@@ -1389,7 +1368,7 @@ static Napi::Value GetTypeDefinition(const Napi::CallbackInfo &info)
                     Napi::Object obj = Napi::Object::New(env);
 
                     obj.Set("name", member.name);
-                    obj.Set("type", WrapType(env, instance, member.type));
+                    obj.Set("type", WrapType(env, member.type));
                     obj.Set("offset", member.offset);
                     if (member.countedby >= 0) {
                         obj.Set("countedBy", type->members[member.countedby].name);
@@ -1409,9 +1388,9 @@ static Napi::Value GetTypeDefinition(const Napi::CallbackInfo &info)
     return type->defn.Value();
 }
 
-static InstanceMemory *AllocateMemory(InstanceData *instance, Size stack_size, Size heap_size)
+InstanceMemory *AllocateMemory(InstanceData *instance, Size stack_size, Size heap_size)
 {
-    std::lock_guard<std::mutex> lock(instance->memories_mutex);
+    std::lock_guard<std::mutex> lock(instance->mem_mutex);
 
     for (Size i = 1; i < instance->memories.len; i++) {
         InstanceMemory *mem = instance->memories[i];
@@ -1424,7 +1403,7 @@ static InstanceMemory *AllocateMemory(InstanceData *instance, Size stack_size, S
 
     bool temporary = (instance->memories.len > instance->config.resident_async_pools);
 
-    if (temporary && instance->temporaries >= instance->config.max_temporaries) [[unlikely]]
+    if (temporary && instance->temporaries > instance->config.max_temporaries)
         return nullptr;
 
     InstanceMemory *mem = new InstanceMemory();
@@ -1475,6 +1454,25 @@ static InstanceMemory *AllocateMemory(InstanceData *instance, Size stack_size, S
     return mem;
 }
 
+void ReleaseMemory(InstanceData *instance, InstanceMemory *mem)
+{
+    if (--mem->depth)
+        return;
+
+    // The first InstanceMemory is used for sync calls, no need to manage the async stuff
+    if (mem == instance->memories[0])
+        return;
+
+    std::lock_guard<std::mutex> lock(instance->mem_mutex);
+
+    if (mem->temporary) {
+        instance->temporaries--;
+        delete mem;
+    } else {
+        mem->busy = false;
+    }
+}
+
 static Napi::Value TranslateNormalCall(const FunctionInfo *func, void *native,
                                        const Napi::CallbackInfo &info)
 {
@@ -1825,7 +1823,7 @@ static Napi::Value FindSymbol(const Napi::CallbackInfo &info)
     }
 
     Napi::External<void> external = Napi::External<void>::New(env, ptr);
-    SetValueTag(instance, external, &type);
+    SetValueTag(external, &type);
 
     return external;
 }
@@ -1876,7 +1874,7 @@ static Napi::Value LoadSharedLibrary(const Napi::CallbackInfo &info)
 
     if (!instance->memories.len) {
         AllocateMemory(instance, instance->config.sync_stack_size, instance->config.sync_heap_size);
-        K_ASSERT(instance->memories.len);
+        K_ASSERT(instance->memories.len == 1);
     }
 
     // Load shared library
@@ -1997,7 +1995,7 @@ static Napi::Value RegisterCallback(const Napi::CallbackInfo &info)
     void *ptr = GetTrampoline(idx, type->ref.proto);
 
     Napi::External<void> external = Napi::External<void>::New(env, ptr);
-    SetValueTag(instance, external, type->ref.marker);
+    SetValueTag(external, type->ref.marker);
 
     // Cache index for fast unregistration
     instance->trampolines_map.Set(ptr, idx);
@@ -2054,7 +2052,6 @@ static Napi::Value UnregisterCallback(const Napi::CallbackInfo &info)
 static Napi::Value CastValue(const Napi::CallbackInfo &info)
 {
     Napi::Env env = info.Env();
-    InstanceData *instance = env.GetInstanceData<InstanceData>();
 
     if (info.Length() < 2) [[unlikely]] {
         ThrowError<Napi::TypeError>(env, "Expected 2 arguments, got %1", info.Length());
@@ -2081,7 +2078,7 @@ static Napi::Value CastValue(const Napi::CallbackInfo &info)
     cast->type = type;
 
     Napi::External<ValueCast> external = Napi::External<ValueCast>::New(env, cast, [](Napi::Env, ValueCast *cast) { delete cast; });
-    SetValueTag(instance, external, &CastMarker);
+    SetValueTag(external, &CastMarker);
 
     return external;
 }
@@ -2384,11 +2381,11 @@ static void RegisterPrimitiveType(Napi::Env env, Napi::Object map, std::initiali
         type->ref.marker = marker;
     }
 
-    Napi::Value wrapper = WrapType(env, instance, type);
+    Napi::Value wrapper = WrapType(env, type);
 
     for (const char *name: names) {
         bool inserted;
-        instance->types_map.TrySet(name, type, &inserted);
+        instance->types_map.InsertOrGet(name, type, &inserted);
         K_ASSERT(inserted);
 
         if (!EndsWith(name, "*")) {
@@ -2596,9 +2593,12 @@ static Napi::Object InitModule(Napi::Env env, Napi::Object exports)
         exports.Set("node", node);
 
         Napi::External<void> external = Napi::External<void>::New(env, (napi_env)env);
-        SetValueTag(instance, external, instance->void_type);
+        SetValueTag(external, instance->void_type);
 
         node.Set("env", external);
+
+        node.Set("poll", Napi::Function::New(env, &Poll, "poll"));
+        node.Set("PollHandle", PollHandle::Define(env));
     }
 
     exports.Set("version", Napi::String::New(env, K_STRINGIFY(VERSION)));

package/src/koffi/src/ffi.hh

@@ -1,27 +1,9 @@
-// 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.
+// SPDX-License-Identifier: MIT
+// SPDX-FileCopyrightText: 2025 Niels Martignène <niels.martignene@protonmail.com>
 
 #pragma once
 
-#include "src/core/base/base.hh"
+#include "lib/native/base/base.hh"
 
 #include <napi.h>
 
@@ -29,13 +11,13 @@ namespace K {
 
 static const Size DefaultSyncStackSize = Mebibytes(1);
 static const Size DefaultSyncHeapSize = Mebibytes(2);
-static const Size DefaultAsyncStackSize = Kibibytes(256);
-static const Size DefaultAsyncHeapSize = Kibibytes(512);
-static const int DefaultResidentAsyncPools = 2;
-static const int DefaultMaxAsyncCalls = 64;
+static const Size DefaultAsyncStackSize = Kibibytes(128);
+static const Size DefaultAsyncHeapSize = Kibibytes(128);
+static const int DefaultResidentAsyncPools = 4;
+static const int DefaultMaxAsyncCalls = 256;
 static const Size DefaultMaxTypeSize = Mebibytes(64);
 
-static const int MaxAsyncCalls = 256;
+static const int MaxAsyncCalls = 4096;
 static const Size MaxParameters = 64;
 static const Size MaxTrampolines = 8192;
 
@@ -269,7 +251,7 @@ struct InstanceMemory {
 
     uint16_t generation; // Can wrap without risk
 
-    std::atomic_bool busy;
+    bool busy;
     bool temporary;
     int depth;
 };
@@ -294,8 +276,8 @@ struct InstanceData {
 
     Napi::Symbol active_symbol;
 
-    std::mutex memories_mutex;
-    LocalArray<InstanceMemory *, 9> memories;
+    std::mutex mem_mutex;
+    LocalArray<InstanceMemory *, 17> memories;
     int temporaries = 0;
 
     std::thread::id main_thread_id;
@@ -362,6 +344,9 @@ static_assert(MaxTrampolines <= INT16_MAX);
 
 extern SharedData shared;
 
+InstanceMemory *AllocateMemory(InstanceData *instance, Size stack_size, Size heap_size);
+void ReleaseMemory(InstanceData *instance, InstanceMemory *mem);
+
 Napi::Value TranslateNormalCall(const Napi::CallbackInfo &info);
 Napi::Value TranslateVariadicCall(const Napi::CallbackInfo &info);
 Napi::Value TranslateAsyncCall(const Napi::CallbackInfo &info);