koffi 2.14.1 → 2.15.1

package/lib/native/base/tower.hh

@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: MIT
+// SPDX-FileCopyrightText: 2025 Niels Martignène <niels.martignene@protonmail.com>
+
+#pragma once
+
+#include "lib/native/base/base.hh"
+#include "lib/native/wrap/json.hh"
+
+namespace K {
+
+static const int MaxTowerSources = 10;
+
+class TowerServer {
+#if defined(_WIN32)
+    char name[512] = {};
+    LocalArray<struct OverlappedPipe *, MaxTowerSources> pipes;
+#else
+    int fd = -1;
+#endif
+
+    LocalArray<WaitSource, MaxTowerSources> sources;
+
+    std::function<bool(StreamReader *, StreamWriter *)> handle_func;
+
+public:
+    TowerServer() {}
+    ~TowerServer() { Stop(); }
+
+    bool Bind(const char *path);
+    void Start(std::function<bool(StreamReader *, StreamWriter *)> func);
+    void Stop();
+
+    Span<const WaitSource> GetWaitSources() const { return sources; }
+    bool Process(uint64_t ready = UINT64_MAX);
+
+    void Send(FunctionRef<void(StreamWriter *)> func);
+    void Send(Span<const uint8_t> buf) { Send([&](StreamWriter *writer) { writer->Write(buf); }); }
+    void Send(Span<const char> buf) { Send([&](StreamWriter *writer) { writer->Write(buf); }); }
+
+private:
+#if defined(_WIN32)
+    void RunClients(FunctionRef<bool(Size, struct OverlappedPipe *)> func);
+#else
+    void RunClients(FunctionRef<bool(Size, int)> func);
+#endif
+};
+
+class TowerClient {
+#if defined(_WIN32)
+    struct OverlappedPipe *pipe = nullptr;
+#else
+    int sock = -1;
+#endif
+
+    std::function<void(StreamReader *)> handle_func;
+
+    WaitSource src = {};
+
+public:
+    ~TowerClient() { Stop(); }
+
+    bool Connect(const char *path);
+    void Start(std::function<void(StreamReader *)> func);
+    void Stop();
+
+    WaitSource GetWaitSource() const { return src; }
+    bool Process();
+
+    bool Send(FunctionRef<void(StreamWriter *)> func);
+    bool Send(Span<const uint8_t> buf) { return Send([&](StreamWriter *writer) { writer->Write(buf); }); }
+    bool Send(Span<const char> buf) { return Send([&](StreamWriter *writer) { writer->Write(buf); }); }
+};
+
+enum class ControlScope {
+    System,
+    User
+};
+
+const char *GetControlSocketPath(ControlScope scope, const char *name, Allocator *alloc);
+
+}

package/{src/core → lib/native}/base/unicode.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>
 
 // This file is autogenerated by unicode_gen.py
 // Version: DerivedCoreProperties-16.0.0.txt -- Date: 2024-05-31, 18:09:32 GMT

package/{src/core → lib/native}/base/unicode_gen.py

@@ -1,25 +1,6 @@
 #!/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.
+# SPDX-License-Identifier: MIT
+# SPDX-FileCopyrightText: 2025 Niels Martignène <niels.martignene@protonmail.com>
 
 import sys
 import re
@@ -30,26 +11,8 @@ from collections import namedtuple
 
 DEFAULT_URL = 'https://unicode.org/Public/16.0.0'
 
-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."""
+LICENSE_HEADER = """// SPDX-License-Identifier: MIT
+// SPDX-FileCopyrightText: 2025 Niels Martignène <niels.martignene@protonmail.com>"""
 
 WcWidthResult = namedtuple('WcWidthResult', ['null', 'wide'])
 XidResult = namedtuple('XidResult', ['id_start', 'id_continue'])

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koffi",
-    "version": "2.14.1",
+    "version": "2.15.1",
     "description": "Fast and simple C FFI (foreign function interface) for Node.js",
     "keywords": [
         "foreign",
@@ -34,5 +34,5 @@
         "napi": 8,
         "require": "./index.js"
     },
-    "funding": "https://buymeacoffee.com/koromix"
+    "funding": "https://liberapay.com/Koromix"
 }

package/src/cnoke/assets/FindCNoke.cmake

@@ -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(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo" OR
    CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
@@ -27,12 +9,19 @@ else()
 endif()
 
 if(NODE_JS_LINK_DEF)
-    add_custom_command(OUTPUT ${NODE_JS_LINK_LIB}
-                       COMMAND ${CMAKE_AR} ${CMAKE_STATIC_LINKER_FLAGS}
-                               /def:${NODE_JS_LINK_DEF} /out:${NODE_JS_LINK_LIB}
-                       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                       MAIN_DEPENDENCY ${NODE_JS_LINK_DEF})
-    add_custom_target(node.lib DEPENDS ${NODE_JS_LINK_LIB})
+    set(NODE_JS_LINK_LIB "${CMAKE_CURRENT_BINARY_DIR}/node.lib")
+    if (MSVC)
+        add_custom_command(OUTPUT node.lib
+                           COMMAND ${CMAKE_AR} ${CMAKE_STATIC_LINKER_FLAGS}
+                                   /def:${NODE_JS_LINK_DEF} /out:${NODE_JS_LINK_LIB}
+                           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                           MAIN_DEPENDENCY ${NODE_JS_LINK_DEF})
+    else()
+        add_custom_command(OUTPUT node.lib
+                           COMMAND ${CMAKE_DLLTOOL} -d ${NODE_JS_LINK_DEF} -l ${NODE_JS_LINK_LIB}
+                           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                           MAIN_DEPENDENCY ${NODE_JS_LINK_DEF})
+    endif()
 endif()
 
 function(add_node_addon)
@@ -44,10 +33,10 @@ endfunction()
 
 function(target_link_node TARGET)
     target_include_directories(${TARGET} PRIVATE ${NODE_JS_INCLUDE_DIRS})
+    if(NODE_JS_LINK_DEF)
+        target_sources(${TARGET} PRIVATE node.lib)
+    endif()
     if(NODE_JS_LINK_LIB)
-        if(TARGET node.lib)
-            add_dependencies(${TARGET} node.lib)
-        endif()
         target_link_libraries(${TARGET} PRIVATE ${NODE_JS_LINK_LIB})
     endif()
     target_compile_options(${TARGET} PRIVATE ${NODE_JS_COMPILE_FLAGS})
@@ -58,6 +47,8 @@ endfunction()
 
 if(USE_UNITY_BUILDS)
     function(enable_unity_build TARGET)
+        cmake_parse_arguments(ARG "" "" "EXCLUDE" ${ARGN})
+
         get_target_property(sources ${TARGET} SOURCES)
         string(GENEX_STRIP "${sources}" sources)
 
@@ -69,6 +60,10 @@ if(USE_UNITY_BUILDS)
         set(cpp_definitions "")
 
         foreach(src ${sources})
+            if (src IN_LIST ARG_EXCLUDE)
+                continue()
+            endif()
+
             get_source_file_property(language ${src} LANGUAGE)
             get_property(definitions SOURCE ${src} PROPERTY COMPILE_DEFINITIONS)
             if(IS_ABSOLUTE ${src})
@@ -112,7 +107,6 @@ else()
 endif()
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    message(STATUS ${CMAKE_SYSTEM_PROCESSOR})
     if(CMAKE_SYSTEM_PROCESSOR MATCHES "(amd64|x86_64)")
         foreach(lang C CXX)
             set(CMAKE_${lang}_FLAGS_RELEASE "${CMAKE_${lang}_FLAGS_RELEASE} -mpopcnt -msse4.1 -msse4.2 -mssse3 -mcx16")

package/src/cnoke/assets/win_delay_hook.c

@@ -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 <stdlib.h>
 #if !defined(NOMINMAX)
@@ -47,4 +29,8 @@ static FARPROC WINAPI self_exe_hook(unsigned int event, DelayLoadInfo *info)
     return NULL;
 }
 
+#if defined(__MINGW32__)
+PfnDliHook __pfnDliNotifyHook2 = self_exe_hook;
+#else
 const PfnDliHook __pfnDliNotifyHook2 = self_exe_hook;
+#endif

package/src/cnoke/cnoke.js

@@ -1,25 +1,6 @@
 #!/usr/bin/env node
-
-// 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>
 
 'use strict';
 

package/src/cnoke/src/builder.js

@@ -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>
 
 'use strict';
 
@@ -124,44 +106,41 @@ function Builder(config = {}) {
             args.push(`-DNODE_JS_INCLUDE_DIRS=${options.api}/include`);
         }
 
-        // Download or create Node import library (Windows)
-        if (process.platform == 'win32') {
-            if (options.api == null) {
-                let dirname;
-                switch (arch) {
-                    case 'ia32': { dirname = 'win-x86'; } break;
-                    case 'x64': { dirname = 'win-x64'; } break;
-                    case 'arm64': { dirname = 'win-arm64'; } break;
-
-                    default: {
-                        throw new Error(`Unsupported architecture '${arch}' for Node on Windows`);
-                    } break;
-                }
-
-                let destname = `${cache_dir}/node_v${runtime_version}_${arch}.lib`;
-
-                if (!fs.existsSync(destname)) {
-                    fs.mkdirSync(cache_dir, { recursive: true, mode: 0o755 });
+        args.push(`-DCMAKE_MODULE_PATH=${app_dir}/assets`);
 
-                    let url = `https://nodejs.org/dist/v${runtime_version}/${dirname}/node.lib`;
-                    await tools.download_http(url, destname);
-                }
+        let win32 = (process.platform == 'win32');
+        let msvc = (process.platform == 'win32' && process.env.MSYSTEM == null);
+        let darwin = (process.platform == 'darwin');
+
+        // Handle Node import library on Windows
+        if (win32) {
+            if (msvc) {
+                if (options.api == null) {
+                    let dirname;
+                    switch (arch) {
+                        case 'ia32': { dirname = 'win-x86'; } break;
+                        case 'x64': { dirname = 'win-x64'; } break;
+                        case 'arm64': { dirname = 'win-arm64'; } break;
+
+                        default: {
+                            throw new Error(`Unsupported architecture '${arch}' for Node on Windows`);
+                        } break;
+                    }
 
-                fs.copyFileSync(destname, work_dir + '/node.lib');
-            } else {
-                args.push(`-DNODE_JS_LINK_DEF=${options.api}/def/node_api.def`);
-            }
-        }
+                    let destname = `${cache_dir}/node_v${runtime_version}_${arch}.lib`;
 
-        args.push(`-DCMAKE_MODULE_PATH=${app_dir}/assets`);
+                    if (!fs.existsSync(destname)) {
+                        fs.mkdirSync(cache_dir, { recursive: true, mode: 0o755 });
 
-        // Set platform flags
-        switch (process.platform) {
-            case 'win32': {
-                fs.copyFileSync(`${app_dir}/assets/win_delay_hook.c`, work_dir + '/win_delay_hook.c');
+                        let url = `https://nodejs.org/dist/v${runtime_version}/${dirname}/node.lib`;
+                        await tools.download_http(url, destname);
+                    }
 
-                args.push(`-DNODE_JS_SOURCES=${work_dir}/win_delay_hook.c`);
-                args.push(`-DNODE_JS_LINK_LIB=${work_dir}/node.lib`);
+                    fs.copyFileSync(destname, work_dir + '/node.lib');
+                    args.push(`-DNODE_JS_LINK_LIB=${work_dir}/node.lib`);
+                } else {
+                    args.push(`-DNODE_JS_LINK_DEF=${options.api}/def/node_api.def`);
+                }
 
                 switch (arch) {
                     case 'ia32': {
@@ -177,22 +156,29 @@ function Builder(config = {}) {
                         args.push('-A', 'x64');
                     } break;
                 }
-            } break;
 
-            case 'darwin': {
-                args.push('-DNODE_JS_LINK_FLAGS=-undefined;dynamic_lookup');
+                fs.copyFileSync(`${app_dir}/assets/win_delay_hook.c`, work_dir + '/win_delay_hook.c');
+                args.push(`-DNODE_JS_SOURCES=${work_dir}/win_delay_hook.c`);
+            } else {
+                args.push(`-DNODE_JS_LINK_LIB=node.dll`);
+            }
+        }
+
+        if (darwin) {
+            args.push('-DNODE_JS_LINK_FLAGS=-undefined;dynamic_lookup');
 
-                switch (arch) {
-                    case 'arm64': { args.push('-DCMAKE_OSX_ARCHITECTURES=arm64'); } break;
-                    case 'x64': { args.push('-DCMAKE_OSX_ARCHITECTURES=x86_64'); } break;
-                }
-            } break;
+            switch (arch) {
+                case 'arm64': { args.push('-DCMAKE_OSX_ARCHITECTURES=arm64'); } break;
+                case 'x64': { args.push('-DCMAKE_OSX_ARCHITECTURES=x86_64'); } break;
+            }
         }
 
-        if (process.platform != 'win32') {
-            // Prefer Ninja if available
-            if (spawnSync('ninja', ['--version']).status === 0)
+        if (!msvc) {
+            if (spawnSync('ninja', ['--version']).status === 0) {
                 args.push('-G', 'Ninja');
+            } else if (process.platform == 'win32') {
+                args.push('-G', 'MinGW Makefiles');
+            }
 
             // Use CCache if available
             if (spawnSync('ccache', ['--version']).status === 0) {
@@ -200,9 +186,8 @@ function Builder(config = {}) {
                 args.push('-DCMAKE_CXX_COMPILER_LAUNCHER=ccache');
             }
         }
-
         if (prefer_clang) {
-            if (process.platform == 'win32') {
+            if (msvc) {
                 args.push('-T', 'ClangCL');
             } else {
                 args.push('-DCMAKE_C_COMPILER=clang');

package/src/cnoke/src/index.js

@@ -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>
 
 const builder = require('./builder.js');
 const tools = require('./tools.js');

package/src/cnoke/src/tools.js

@@ -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>
 
 'use strict';
 

package/src/koffi/CMakeLists.txt

@@ -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>
 
 cmake_minimum_required(VERSION 3.6)
 cmake_policy(SET CMP0091 NEW)
@@ -54,6 +36,8 @@ if(UNIX AND NOT APPLE)
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -z noexecstack")
 endif()
 
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
 # ---- Koffi ----
 
 # Recompute the version string after each commit
@@ -75,8 +59,9 @@ set(KOFFI_SRC
     src/ffi.cc
     src/parser.cc
     src/util.cc
+    src/uv.cc
     src/win32.cc
-    ../../src/core/base/base.cc
+    ../../lib/native/base/base.cc
 )
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
     # CMAKE_SYSTEM_PROCESSOR is wrong on Windows ARM64
@@ -114,7 +99,11 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
         list(APPEND KOFFI_SRC src/abi_riscv64.cc src/abi_loong64_asm.S)
     else()
         if(WIN32)
-            list(APPEND KOFFI_SRC src/abi_x64_win.cc src/abi_x64_win_asm.asm)
+            if(MSVC)
+                list(APPEND KOFFI_SRC src/abi_x64_win.cc src/abi_x64_win_asm.asm)
+            else()
+                list(APPEND KOFFI_SRC src/abi_x64_win.cc src/abi_x64_win_asm.S)
+            endif()
         else()
             list(APPEND KOFFI_SRC src/abi_x64_sysv.cc src/abi_x64_sysv_asm.S)
         endif()
@@ -134,6 +123,24 @@ endif()
 add_node_addon(NAME koffi SOURCES ${KOFFI_SRC})
 target_include_directories(koffi PRIVATE . ../.. ../../vendor/node-addon-api)
 
+if(WIN32)
+    set(UV_LINK_LIB "${CMAKE_CURRENT_BINARY_DIR}/uv.lib")
+    if(MSVC)
+        add_custom_command(OUTPUT uv.lib
+                           COMMAND ${CMAKE_AR} ${CMAKE_STATIC_LINKER_FLAGS}
+                                   /def:src/uv.def /out:${UV_LINK_LIB}
+                           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                           MAIN_DEPENDENCY src/uv.def)
+    else()
+        add_custom_command(OUTPUT uv.lib
+                           COMMAND ${CMAKE_DLLTOOL} -d src/uv.def -l ${UV_LINK_LIB}
+                           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                           MAIN_DEPENDENCY src/uv.def)
+    endif()
+    target_sources(koffi PRIVATE uv.lib)
+    target_link_libraries(koffi PRIVATE ${UV_LINK_LIB})
+endif()
+
 target_compile_definitions(koffi PRIVATE FELIX_TARGET=koffi NAPI_DISABLE_CPP_EXCEPTIONS NAPI_VERSION=8 CORE_NO_STATX)
 if(WIN32)
     target_compile_definitions(koffi PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE)
@@ -157,4 +164,4 @@ if(NOT MSVC OR CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
     endif()
 endif()
 
-enable_unity_build(koffi)
+enable_unity_build(koffi EXCLUDE src/uv.cc)