build fix

Author: boybook

.github/workflows/build.yml

@@ -22,7 +22,7 @@ jobs:
           - os: ubuntu-latest
             arch: x64
             node_arch: x64
-            cmake_arch: x64
+            cmake_arch: x86_64
 
           # macOS builds
           - os: macos-latest
@@ -257,48 +257,6 @@ jobs:
             --no-retry \
             --verbose
 
-      # 9. 查找并验证构建产物 (兼容不同构建目录结构)
-      - name: Find and verify build artifacts
-        id: find_artifacts
-        run: |
-          echo "=== Searching for build artifacts ==="
-          
-          # 定义可能的构建产物路径
-          POSSIBLE_PATHS=(
-            "build/wsjtx_lib_nodejs.node"
-            "build/Release/wsjtx_lib_nodejs.node" 
-            "build/Debug/wsjtx_lib_nodejs.node"
-          )
-          
-          FOUND_PATH=""
-          for path in "${POSSIBLE_PATHS[@]}"; do
-            if [ -f "$path" ]; then
-              echo "✅ Found native module at: $path"
-              FOUND_PATH="$path"
-              break
-            else
-              echo "❌ Not found: $path"
-            fi
-          done
-          
-          if [ -z "$FOUND_PATH" ]; then
-            echo "❌ Native module not found in any expected location!"
-            echo "Build directory contents:"
-            find build -type f -name "*.node" || echo "No .node files found"
-            find build -type f || echo "No files found in build directory"
-            exit 1
-          fi
-          
-          # 验证文件
-          ls -la "$FOUND_PATH"
-          file "$FOUND_PATH" || echo "file command not available"
-          
-          # 设置输出变量
-          echo "artifact_path=$FOUND_PATH" >> $GITHUB_OUTPUT
-          echo "artifact_dir=$(dirname $FOUND_PATH)" >> $GITHUB_OUTPUT
-          echo "artifact_name=$(basename $FOUND_PATH)" >> $GITHUB_OUTPUT
-        shell: bash
-
       # 10. 运行测试
       - name: Run tests
         run: |
@@ -310,30 +268,22 @@ jobs:
           if [ -f "dist/test/wsjtx.basic.test.js" ]; then
             echo "✅ Basic test file found: dist/test/wsjtx.basic.test.js"
             
-            # 检查原生模块是否存在 (使用步骤9找到的路径)
-            ARTIFACT_PATH="${{ steps.find_artifacts.outputs.artifact_path }}"
-            if [ -f "$ARTIFACT_PATH" ]; then
-              echo "✅ Native module found: $ARTIFACT_PATH"
-              
-              # 确保原生模块在正确的位置
-              if [ "${{ runner.os }}" = "Windows" ]; then
-                # Windows: 直接使用找到的路径
-                echo "Using native module at: $ARTIFACT_PATH"
-                # 验证文件存在
-                ls -la "$ARTIFACT_PATH"
-              else
-                # Unix: 复制到build目录
-                mkdir -p build
-                cp "$ARTIFACT_PATH" build/
-                echo "Copied native module to build directory"
-                ls -la build/wsjtx_lib_nodejs.node
-              fi
-              
+            # 检查原生模块是否存在 - 使用旧版本的固定路径逻辑
+            if [ -f "build/Release/wsjtx_lib_nodejs.node" ]; then
+              echo "✅ Native module found: build/Release/wsjtx_lib_nodejs.node"
+              ls -la build/Release/wsjtx_lib_nodejs.node
+              # 运行基础测试
+              npm test
+            elif [ -f "build/wsjtx_lib_nodejs.node" ]; then
+              echo "✅ Native module found: build/wsjtx_lib_nodejs.node"
+              ls -la build/wsjtx_lib_nodejs.node
+              # 确保在正确位置，某些系统可能需要Release子目录
+              mkdir -p build/Release
+              cp build/wsjtx_lib_nodejs.node build/Release/
               # 运行基础测试
               npm test
             else
-              echo "❌ Native module not found at: $ARTIFACT_PATH"
-              echo "Searching for .node files..."
+              echo "❌ Native module not found! Searching for .node files..."
               find . -name "*.node" || echo "No .node files found"
               exit 1
             fi
@@ -352,9 +302,17 @@ jobs:
           TARGET_DIR="prebuilds/${{ matrix.os }}-${{ matrix.arch }}"
           mkdir -p "$TARGET_DIR"
           
-          # 复制构建的 .node 文件
-          ARTIFACT_PATH="${{ steps.find_artifacts.outputs.artifact_path }}"
-          cp "$ARTIFACT_PATH" "$TARGET_DIR/"
+          # 复制构建的 .node 文件 - 检查两个可能的位置
+          if [ -f "build/Release/wsjtx_lib_nodejs.node" ]; then
+            cp build/Release/wsjtx_lib_nodejs.node "$TARGET_DIR/"
+            echo "Copied from build/Release/"
+          elif [ -f "build/wsjtx_lib_nodejs.node" ]; then
+            cp build/wsjtx_lib_nodejs.node "$TARGET_DIR/"
+            echo "Copied from build/"
+          else
+            echo "❌ Native module not found for packaging!"
+            exit 1
+          fi
           
           # 显示构建结果
           echo "构建完成的文件:"
@@ -367,8 +325,8 @@ jobs:
             "arch": "${{ matrix.arch }}",
             "node_version": "${{ env.NODE_VERSION }}",
             "build_time": "$(date -u +%Y-%m-%dT%H:%M:%SZ)",
-            "artifact_path": "$ARTIFACT_PATH",
-            "file_size": $(stat -c%s "$ARTIFACT_PATH" 2>/dev/null || stat -f%z "$ARTIFACT_PATH" 2>/dev/null || echo "unknown")
+            "cmake_arch": "${{ matrix.cmake_arch }}",
+            "file_size": $(stat -c%s "$TARGET_DIR"/*.node 2>/dev/null || stat -f%z "$TARGET_DIR"/*.node 2>/dev/null || echo "unknown")
           }
           EOF
           

CMakeLists.txt

@@ -1,8 +1,13 @@
 cmake_minimum_required(VERSION 3.15)
-project(wsjtx_lib_nodejs LANGUAGES C CXX Fortran)
 
-# 包含 cmake-js 提供的 CMake 模块 - 这必须在最前面
-# 注意：cmake-js 7.x 不再使用 CMAKE_JS_DIR，改为直接使用变量
+# 禁用 vcpkg Manifest 模式，使用经典模式
+if(DEFINED CMAKE_TOOLCHAIN_FILE AND CMAKE_TOOLCHAIN_FILE MATCHES "vcpkg")
+    set(VCPKG_MANIFEST_MODE OFF CACHE BOOL "Disable vcpkg manifest mode" FORCE)
+    set(VCPKG_MANIFEST_INSTALL OFF CACHE BOOL "Disable vcpkg manifest install" FORCE)
+    message(STATUS "Detected vcpkg toolchain, disabling manifest mode")
+endif()
+
+project(wsjtx_lib_nodejs LANGUAGES C CXX Fortran)
 
 # Set C++ standard
 set(CMAKE_CXX_STANDARD 17)
@@ -11,7 +16,22 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 # Enable position independent code for all targets (including subprojects)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-# 注意：Node.js 头文件路径将在创建目标后单独为 C++ 目标设置
+# Include cmake-js - this must come first to get CMAKE_JS_* variables
+if(CMAKE_JS_INC)
+    include_directories(${CMAKE_JS_INC})
+endif()
+
+# Add Node.js include path for node_api.h (for all platforms)
+execute_process(
+    COMMAND node -p "require('path').dirname(process.execPath) + '/../include/node'"
+    OUTPUT_VARIABLE NODE_INCLUDE_DIR
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_QUIET
+)
+if(NODE_INCLUDE_DIR AND EXISTS "${NODE_INCLUDE_DIR}")
+    include_directories(${NODE_INCLUDE_DIR})
+    message(STATUS "Added Node.js include directory: ${NODE_INCLUDE_DIR}")
+endif()
 
 # **关键修复**: Windows + MinGW 环境检测并清除 MSVC 特定标志
 if(WIN32 AND CMAKE_CXX_COMPILER_ID MATCHES "GNU")
@@ -128,7 +148,7 @@ endif()
 # Find FFTW3 using pkg-config
 pkg_check_modules(FFTW3F REQUIRED fftw3f)
 
-# Check for FFTW3 threads support
+# Check for FFTW3 threads support - 改进的检测逻辑
 if(UNIX AND NOT APPLE)
     # Linux: search in standard locations
     find_library(FFTW3F_THREADS_LIB 
@@ -168,22 +188,43 @@ else()
         PATHS /mingw64/lib D:/msys64/mingw64/lib
         NO_DEFAULT_PATH
     )
-    
-    if(FFTW3F_THREADS_LIB)
-        message(STATUS "FFTW3 with threads support found: ${FFTW3F_THREADS_LIB}")
-        set(FFTW_THREADS_LIBRARIES fftw3f_threads)
-        set(FFTW_HAS_THREADS TRUE)
-    else()
-        message(STATUS "FFTW3 threads not found, using single-threaded version")
-        set(FFTW_THREADS_LIBRARIES "")
-        set(FFTW_HAS_THREADS FALSE)
+endif()
+
+if(FFTW3F_THREADS_LIB)
+    message(STATUS "FFTW3 with threads support found: ${FFTW3F_THREADS_LIB}")
+    set(FFTW_THREADS_LIBRARIES fftw3f_threads)
+    set(FFTW_HAS_THREADS TRUE)
+else()
+    message(STATUS "FFTW3 threads not found, using single-threaded version")
+    set(FFTW_THREADS_LIBRARIES "")
+    set(FFTW_HAS_THREADS FALSE)
+endif()
+
+# Auto-detect node-addon-api path (monorepo vs standalone)
+set(NODE_ADDON_API_PATHS
+    "${CMAKE_SOURCE_DIR}/node_modules/node-addon-api"           # Standalone project
+    "${CMAKE_SOURCE_DIR}/../../node_modules/node-addon-api"    # Monorepo (2 levels up)
+    "${CMAKE_SOURCE_DIR}/../../../node_modules/node-addon-api" # Monorepo (3 levels up)
+)
+
+set(NODE_ADDON_API_PATH "")
+foreach(path ${NODE_ADDON_API_PATHS})
+    if(EXISTS "${path}/napi.h")
+        set(NODE_ADDON_API_PATH "${path}")
+        message(STATUS "Found node-addon-api at: ${NODE_ADDON_API_PATH}")
+        break()
     endif()
+endforeach()
+
+if(NOT NODE_ADDON_API_PATH)
+    message(FATAL_ERROR "Could not find node-addon-api. Searched paths: ${NODE_ADDON_API_PATHS}")
 endif()
 
 # Include directories
 include_directories(
     ${CMAKE_SOURCE_DIR}/wsjtx_lib
     ${CMAKE_SOURCE_DIR}/native
+    ${NODE_ADDON_API_PATH}
     ${FFTW3F_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
@@ -290,8 +331,27 @@ link_directories(${FFTW3F_LIBRARY_DIRS})
 # Source files for the Node.js addon
 file(GLOB_RECURSE NATIVE_SOURCES "native/*.cpp" "native/*.h")
 
-# 定义输出库（会生成 wsjtx_lib_nodejs.node）
-add_library(${PROJECT_NAME} SHARED ${NATIVE_SOURCES})
+# Create the Node.js addon with MinGW-specific handling
+if(WIN32 AND CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+    # MinGW build: exclude Windows delay load hook
+    add_library(${PROJECT_NAME} SHARED 
+        ${NATIVE_SOURCES}
+    )
+    message(STATUS "MinGW build: excluding CMAKE_JS_SRC (Windows delay load hook)")
+else()
+    # Other platforms: include CMAKE_JS_SRC if available
+    if(CMAKE_JS_SRC)
+        add_library(${PROJECT_NAME} SHARED 
+            ${NATIVE_SOURCES}
+            ${CMAKE_JS_SRC}
+        )
+        message(STATUS "Non-MinGW build: including CMAKE_JS_SRC for delay-load hook")
+    else()
+        add_library(${PROJECT_NAME} SHARED 
+            ${NATIVE_SOURCES}
+        )
+    endif()
+endif()
 
 # Set properties for Node.js addon
 set_target_properties(${PROJECT_NAME} PROPERTIES 
@@ -309,17 +369,15 @@ if(WIN32 AND CMAKE_CXX_COMPILER_ID MATCHES "GNU")
         "/mingw64/include/node"
         "/mingw64/include/node/node"
         "/mingw64/include"
-        "${CMAKE_SOURCE_DIR}/node_modules/node-addon-api"
-        "${CMAKE_SOURCE_DIR}/node_modules/node-addon-api/include"
+        "${NODE_ADDON_API_PATH}"
     )
     message(STATUS "MinGW build: using MSYS2 Node.js headers and local node-addon-api")
     message(STATUS "CMAKE_JS_INC: ${CMAKE_JS_INC}")
 else()
     # 其他平台：使用 cmake-js 提供的头文件路径 + 项目的 node-addon-api
     target_include_directories(${PROJECT_NAME} PRIVATE 
         ${CMAKE_JS_INC}
-        "${CMAKE_SOURCE_DIR}/node_modules/node-addon-api"
-        "${CMAKE_SOURCE_DIR}/node_modules/node-addon-api/include"
+        "${NODE_ADDON_API_PATH}"
     )
     message(STATUS "Using cmake-js provided headers: ${CMAKE_JS_INC}")
 endif()
@@ -335,7 +393,7 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE
 # Add compile flags
 target_compile_options(${PROJECT_NAME} PRIVATE ${FFTW3F_CFLAGS_OTHER})
 
-# 链接 Node.js 运行时库
+# Link libraries with MinGW-specific handling
 if(WIN32 AND CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     # Windows MinGW: 复制库文件到本地目录避免路径问题
     set(LOCAL_NODE_LIB "${CMAKE_BINARY_DIR}/node.lib")
@@ -347,12 +405,14 @@ if(WIN32 AND CMAKE_CXX_COMPILER_ID MATCHES "GNU")
         target_link_libraries(${PROJECT_NAME} PRIVATE "${LOCAL_NODE_LIB}")
         message(STATUS "MinGW build: Using copied Node.js library: ${LOCAL_NODE_LIB}")
     else()
-        message(FATAL_ERROR "Node.js library not found at: ${CMAKE_JS_LIB}")
+        message(STATUS "MinGW build: CMAKE_JS_LIB not found, skipping Node.js library linking")
     endif()
 else()
-    # 其他平台：使用 cmake-js 提供的库
-    target_link_libraries(${PROJECT_NAME} PRIVATE ${CMAKE_JS_LIB})
-    message(STATUS "Using cmake-js provided library: ${CMAKE_JS_LIB}")
+    # Other platforms: link CMAKE_JS_LIB if available
+    if(CMAKE_JS_LIB)
+        target_link_libraries(${PROJECT_NAME} PRIVATE ${CMAKE_JS_LIB})
+        message(STATUS "Using cmake-js provided library: ${CMAKE_JS_LIB}")
+    endif()
 endif()
 
 target_link_libraries(${PROJECT_NAME} PRIVATE