koffi 2.14.0 → 2.15.0

package/src/koffi/src/uv.cc

@@ -0,0 +1,193 @@
+// SPDX-License-Identifier: MIT
+
+#include "uv.hh"
+#include "util.hh"
+
+#include <uv.h>
+
+namespace K {
+
+Napi::Function PollHandle::Define(Napi::Env env)
+{
+    return DefineClass(env, "PollHandle", {
+        InstanceMethod("start", &PollHandle::Start),
+        InstanceMethod("stop", &PollHandle::Stop),
+        InstanceMethod("close", &PollHandle::Close),
+        InstanceMethod("unref", &PollHandle::Unref),
+        InstanceMethod("ref", &PollHandle::Ref)
+    });
+}
+
+PollHandle::PollHandle(const Napi::CallbackInfo &info)
+    : Napi::ObjectWrap<PollHandle>(info), env(info.Env())
+{
+    InstanceData *instance = env.GetInstanceData<InstanceData>();
+
+    if (info.Length() < 1 || !info[0].IsNumber()) {
+        ThrowError<Napi::Error>(env, "Expected 1 argument, got %1", info.Length());
+        return;
+    }
+    if (!info[0].IsNumber()) {
+        ThrowError<Napi::TypeError>(env, "Unexpected %1 value for descriptor, expected number", GetValueType(instance, info[0]));
+        return;
+    }
+
+    int fd = info[0].As<Napi::Number>().Int32Value();
+
+    uv_loop_t *loop = nullptr;
+    if (napi_get_uv_event_loop(env, &loop) != napi_ok || !loop) {
+        ThrowError<Napi::Error>(env, "napi_get_uv_event_loop() failed");
+        return;
+    }
+
+    // We would store it inside the class, but the definition of uv_poll_t involves windows.h...
+    // and we won't want that on Windows. Heap allocation it is!
+    // Also, it may have to outlive the object, because uv_close() is asynchronous.
+    handle = new uv_poll_t();
+
+    if (int ret = uv_poll_init_socket(loop, handle, (uv_os_sock_t)fd); ret != 0) {
+        ThrowError<Napi::Error>(env, "Failed to init UV poll: %1", uv_strerror(ret));
+        return;
+    }
+
+    handle->data = this;
+}
+
+void PollHandle::Start(const Napi::CallbackInfo &info)
+{
+    InstanceData *instance = env.GetInstanceData<InstanceData>();
+
+    bool has_opts = (info.Length() >= 2 && info[0].IsObject());
+
+    if (info.Length() < 1u + has_opts) {
+        ThrowError<Napi::TypeError>(env, "Expected 1 to 2 arguments, got %1", info.Length());
+        return;
+    }
+    if (!info[0u + has_opts].IsFunction()) {
+        ThrowError<Napi::TypeError>(env, "Unexpected %1 value for callback, expected function", GetValueType(instance, info[0u + has_opts]));
+        return;
+    }
+
+    int events = 0;
+    Napi::Function cb = info[0 + has_opts].As<Napi::Function>();
+
+    if (has_opts) {
+        Napi::Object opts = has_opts ? info[0].As<Napi::Object>() : Napi::Object::New(env);
+
+        events |= opts.Get("readable").ToBoolean() ? UV_READABLE : 0;
+        events |= opts.Get("writable").ToBoolean() ? UV_WRITABLE : 0;
+        events |= opts.Get("disconnect").ToBoolean() ? UV_DISCONNECT : 0;
+    } else {
+        events = UV_READABLE;
+    }
+
+    callback.Reset(cb, 1);
+
+    if (int ret = uv_poll_start(handle, events, &PollHandle::OnPoll); ret != 0) {
+        callback.Reset();
+        ThrowError<Napi::Error>(env, "Failed to start UV poll: %1", uv_strerror(ret));
+    }
+}
+
+void PollHandle::Stop(const Napi::CallbackInfo &)
+{
+    uv_poll_stop(handle);
+    callback.Reset();
+}
+
+void PollHandle::Close(const Napi::CallbackInfo &)
+{
+    Close();
+    callback.Reset();
+}
+
+void PollHandle::Ref(const Napi::CallbackInfo &)
+{
+    uv_ref((uv_handle_t *)handle);
+}
+
+void PollHandle::Unref(const Napi::CallbackInfo &)
+{
+    uv_unref((uv_handle_t *)handle);
+}
+
+void PollHandle::Close()
+{
+    if (!handle)
+        return;
+
+    const auto release = [](uv_handle_t *ptr) {
+        uv_poll_t *handle = (uv_poll_t *)ptr;
+        delete handle;
+    };
+
+    uv_poll_stop(handle);
+    uv_close((uv_handle_t *)handle, release);
+
+    handle = nullptr;
+}
+
+void PollHandle::OnPoll(uv_poll_t *h, int status, int events)
+{
+    PollHandle *poll = (PollHandle *)h->data;
+
+    if (poll->callback.IsEmpty()) [[unlikely]]
+        return;
+
+    Napi::Env env = poll->env;
+    Napi::HandleScope scope(env);
+
+    Napi::Object obj = Napi::Object::New(env);
+
+    obj.Set("readable", !!(events & UV_READABLE));
+    obj.Set("writable", !!(events & UV_WRITABLE));
+    obj.Set("disconnect", !!(events & UV_DISCONNECT));
+
+    napi_value args[] = { Napi::Number::New(env, status), obj };
+    poll->callback.Call(poll->Value(), K_LEN(args), args);
+}
+
+Napi::Value Poll(const Napi::CallbackInfo &info)
+{
+    Napi::Env env = info.Env();
+    InstanceData *instance = env.GetInstanceData<InstanceData>();
+
+    bool has_opts = (info.Length() >= 3 && info[1].IsObject());
+
+    if (info.Length() < 2u + has_opts) {
+        ThrowError<Napi::TypeError>(env, "Expected 2 to 3 arguments, got %1", info.Length());
+        return env.Null();
+    }
+
+    if (!info[0].IsNumber()) {
+        ThrowError<Napi::TypeError>(env, "Unexpected %1 value for descriptor, expected number", GetValueType(instance, info[0]));
+        return env.Null();
+    }
+    if (!info[1 + has_opts].IsFunction()) {
+        ThrowError<Napi::TypeError>(env, "Unexpected %1 value for callback, expected function", GetValueType(instance, info[1 + has_opts]));
+        return env.Null();
+    }
+
+    int fd = info[0].As<Napi::Number>().Int32Value();
+
+    Napi::Function ctor = PollHandle::Define(env);
+    Napi::Object inst = ctor.New({ Napi::Number::New(env, fd) });
+    Napi::Function start = inst.Get("start").As<Napi::Function>();
+
+    if (env.IsExceptionPending()) [[unlikely]]
+        return env.Null();
+
+    if (has_opts) {
+        Napi::Value opts = info[1];
+        Napi::Function cb = info[2].As<Napi::Function>();
+
+        start.Call(inst, { opts, cb });
+    } else {
+        Napi::Function cb = info[1].As<Napi::Function>();
+        start.Call(inst, { cb });
+    }
+
+    return inst;
+}
+
+}

package/src/koffi/src/uv.def

@@ -0,0 +1,10 @@
+NAME NODE.EXE
+EXPORTS
+uv_close
+uv_ref
+uv_unref
+uv_strerror
+uv_poll_init
+uv_poll_init_socket
+uv_poll_start
+uv_poll_stop

package/src/koffi/src/uv.hh

@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include "lib/native/base/base.hh"
+
+#include <napi.h>
+
+struct uv_poll_s;
+typedef struct uv_poll_s uv_poll_t;
+
+namespace K {
+
+class PollHandle: public Napi::ObjectWrap<PollHandle> {
+    Napi::Env env = nullptr;
+
+    uv_poll_t *handle = nullptr;
+    Napi::FunctionReference callback;
+
+public:
+    static Napi::Function Define(Napi::Env env);
+
+    PollHandle(const Napi::CallbackInfo &info);
+    ~PollHandle() { Close(); }
+
+    void Start(const Napi::CallbackInfo &info);
+    void Stop(const Napi::CallbackInfo &info);
+    void Close(const Napi::CallbackInfo &info);
+    void Ref(const Napi::CallbackInfo &info);
+    void Unref(const Napi::CallbackInfo &info);
+
+private:
+    void Close();
+
+    static void OnPoll(uv_poll_t *handle, int status, int events);
+};
+
+Napi::Value Poll(const Napi::CallbackInfo &info);
+
+}

package/src/koffi/src/win32.cc

@@ -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>
 
 #if defined(_WIN32)
 
@@ -34,7 +16,7 @@
 #include <ntsecapi.h>
 #include <processthreadsapi.h>
 
-namespace RG {
+namespace K {
 
 const HashMap<int, const char *> WindowsMachineNames = {
     { 0x184, "Alpha AXP, 32-bit" },
@@ -138,9 +120,9 @@ static int GetFileMachine(HANDLE h, bool check_dll)
     PE_DOS_HEADER dos = {};
     PE_NT_HEADERS nt = {};
 
-    if (!ReadAt(h, 0, &dos, RG_SIZE(dos)))
+    if (!ReadAt(h, 0, &dos, K_SIZE(dos)))
         goto generic;
-    if (!ReadAt(h, dos.e_lfanew, &nt, RG_SIZE(nt)))
+    if (!ReadAt(h, dos.e_lfanew, &nt, K_SIZE(nt)))
         goto generic;
 
     if (dos.e_magic != 0x5A4D) // MZ
@@ -179,7 +161,7 @@ int GetSelfMachine()
         LogError("Cannot open '%1': %2", filename, GetWin32ErrorString());
         return -1;
     }
-    RG_DEFER { CloseHandle(h); };
+    K_DEFER { CloseHandle(h); };
 
     return GetFileMachine(h, false);
 }
@@ -193,7 +175,7 @@ int GetDllMachine(const wchar_t *filename)
         LogError("Cannot open '%1': %2", filename, GetWin32ErrorString());
         return -1;
     }
-    RG_DEFER { CloseHandle(h); };
+    K_DEFER { CloseHandle(h); };
 
     return GetFileMachine(h, true);
 }

package/src/koffi/src/win32.hh

@@ -1,32 +1,14 @@
-// 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 <intrin.h>
 #include <napi.h>
 
-namespace RG {
+namespace K {
 
 struct PE_DOS_HEADER {
     uint16_t e_magic;

package/vendor/node-api-headers/include/uv/aix.h

@@ -0,0 +1,32 @@
+/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
+ *
+ * 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.
+ */
+
+#ifndef UV_AIX_H
+#define UV_AIX_H
+
+#define UV_PLATFORM_LOOP_FIELDS                                               \
+  int fs_fd;                                                                  \
+
+#define UV_PLATFORM_FS_EVENT_FIELDS                                           \
+  uv__io_t event_watcher;                                                     \
+  char *dir_filename;                                                         \
+
+#endif /* UV_AIX_H */

package/vendor/node-api-headers/include/uv/bsd.h

@@ -0,0 +1,34 @@
+/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
+ *
+ * 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.
+ */
+
+#ifndef UV_BSD_H
+#define UV_BSD_H
+
+#define UV_PLATFORM_FS_EVENT_FIELDS                                           \
+  uv__io_t event_watcher;                                                     \
+
+#define UV_IO_PRIVATE_PLATFORM_FIELDS                                         \
+  int rcount;                                                                 \
+  int wcount;                                                                 \
+
+#define UV_HAVE_KQUEUE 1
+
+#endif /* UV_BSD_H */

package/vendor/node-api-headers/include/uv/darwin.h

@@ -0,0 +1,61 @@
+/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
+ *
+ * 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.
+ */
+
+#ifndef UV_DARWIN_H
+#define UV_DARWIN_H
+
+#if defined(__APPLE__) && defined(__MACH__)
+# include <mach/mach.h>
+# include <mach/task.h>
+# include <mach/semaphore.h>
+# include <TargetConditionals.h>
+# define UV_PLATFORM_SEM_T semaphore_t
+#endif
+
+#define UV_IO_PRIVATE_PLATFORM_FIELDS                                         \
+  int rcount;                                                                 \
+  int wcount;                                                                 \
+
+#define UV_PLATFORM_LOOP_FIELDS                                               \
+  uv_thread_t cf_thread;                                                      \
+  void* _cf_reserved;                                                         \
+  void* cf_state;                                                             \
+  uv_mutex_t cf_mutex;                                                        \
+  uv_sem_t cf_sem;                                                            \
+  struct uv__queue cf_signals;                                                \
+
+#define UV_PLATFORM_FS_EVENT_FIELDS                                           \
+  uv__io_t event_watcher;                                                     \
+  char* realpath;                                                             \
+  int realpath_len;                                                           \
+  int cf_flags;                                                               \
+  uv_async_t* cf_cb;                                                          \
+  struct uv__queue cf_events;                                                 \
+  struct uv__queue cf_member;                                                 \
+  int cf_error;                                                               \
+  uv_mutex_t cf_mutex;                                                        \
+
+#define UV_STREAM_PRIVATE_PLATFORM_FIELDS                                     \
+  void* select;                                                               \
+
+#define UV_HAVE_KQUEUE 1
+
+#endif /* UV_DARWIN_H */