feat: improve CMake configuration and add support for MSVC bridge mode

boybook · boybook · commit 2f823ee9f3df · 2025-10-23T23:22:59.000+08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,18 +26,19 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 # Include cmake-js
 if(CMAKE_JS_INC)
     include_directories(${CMAKE_JS_INC})
-endif()
-
-# Add Node.js include path
-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 "Node.js include directory: ${NODE_INCLUDE_DIR}")
+    message(STATUS "Using cmake-js include directory: ${CMAKE_JS_INC}")
+else()
+    # Fallback: Add Node.js include path if cmake-js is not used
+    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 "Node.js include directory: ${NODE_INCLUDE_DIR}")
+    endif()
 endif()
 
 # ==================== 平台特定编译选项 ====================
@@ -90,28 +91,27 @@ endif()
 
 # ==================== 依赖库查找 ====================
 
-# Boost (header-only)
-if(WIN32 AND NOT MSVC)
-    # MinGW: 尝试find_package和手动查找
-    find_package(Boost QUIET)
-    if(NOT Boost_FOUND)
-        find_path(Boost_INCLUDE_DIRS
-            NAMES boost/version.hpp
-            PATHS /mingw64/include C:/msys64/mingw64/include
-            NO_DEFAULT_PATH
-        )
-        if(Boost_INCLUDE_DIRS)
-            message(STATUS "Found Boost headers: ${Boost_INCLUDE_DIRS}")
-            set(Boost_FOUND TRUE)
-        endif()
-    endif()
-else()
-    # 其他平台
-    find_package(Boost REQUIRED)
-endif()
-
 # pkg-config 和 FFTW3（仅在构建库时需要）
 if(WSJTX_BUILD_LIBS)
+    # Boost (header-only) - 仅在构建wsjtx_lib时需要
+    if(WIN32 AND NOT MSVC)
+        # MinGW: 尝试find_package和手动查找
+        find_package(Boost QUIET)
+        if(NOT Boost_FOUND)
+            find_path(Boost_INCLUDE_DIRS
+                NAMES boost/version.hpp
+                PATHS /mingw64/include C:/msys64/mingw64/include
+                NO_DEFAULT_PATH
+            )
+            if(Boost_INCLUDE_DIRS)
+                message(STATUS "Found Boost headers: ${Boost_INCLUDE_DIRS}")
+                set(Boost_FOUND TRUE)
+            endif()
+        endif()
+    else()
+        # 其他平台
+        find_package(Boost REQUIRED)
+    endif()
     find_package(PkgConfig REQUIRED)
     pkg_check_modules(FFTW3F REQUIRED fftw3f)
 
@@ -172,16 +172,22 @@ if(NOT NODE_ADDON_API_PATH)
     message(FATAL_ERROR "Could not find node-addon-api")
 endif()
 
-# Include directories
+# Include directories (base paths needed by all targets)
 include_directories(
     ${CMAKE_SOURCE_DIR}/wsjtx_lib
     ${CMAKE_SOURCE_DIR}/wsjtx_bridge
     ${CMAKE_SOURCE_DIR}/native
     ${NODE_ADDON_API_PATH}
-    ${FFTW3F_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
 )
 
+# Only add FFTW and Boost includes when building libs
+if(WSJTX_BUILD_LIBS)
+    include_directories(
+        ${FFTW3F_INCLUDE_DIRS}
+        ${Boost_INCLUDE_DIRS}
+    )
+endif()
+
 # ==================== 库依赖定义 ====================
 
 set(LIBRARIES_FROM_REFERENCES
@@ -360,10 +366,10 @@ if(WSJTX_BUILD_NODE_ADDON)
         target_link_libraries(${PROJECT_NAME} PRIVATE ${CMAKE_JS_LIB})
     endif()
 
-    # 链接库（仅链接Boost，运行时动态加载wsjtx_bridge）
-    target_link_libraries(${PROJECT_NAME} PRIVATE
-        ${BOOST_LIBRARIES}
-    )
+    # 链接Boost（仅在构建wsjtx_lib时需要，MSVC模式下不需要）
+    if(WSJTX_BUILD_LIBS AND BOOST_LIBRARIES)
+        target_link_libraries(${PROJECT_NAME} PRIVATE ${BOOST_LIBRARIES})
+    endif()
 
     message(STATUS ".node extension will dynamically load wsjtx_bridge at runtime")
     message(STATUS "Build complete: wsjtx_lib (static) -> wsjtx_bridge (dynamic) -> .node (loads bridge)")
diff --git a/native/wsjtx_wrapper.cpp b/native/wsjtx_wrapper.cpp
@@ -257,6 +257,12 @@ namespace wsjtx_nodejs
     {
         Napi::Env env = info.Env();
 
+#if WSJTX_WINDOWS_MSVC_MODE
+        // WSPR is not supported in MSVC bridge mode
+        Napi::Error::New(env, "WSPR decode is not currently supported in Windows MSVC mode")
+            .ThrowAsJavaScriptException();
+        return env.Null();
+#else
         if (info.Length() < 3)
         {
             Napi::TypeError::New(env, "Expected 3 arguments: iqData, options, callback")
@@ -340,6 +346,7 @@ namespace wsjtx_nodejs
         Napi::Error::New(env, "WSPR decoding is not yet supported in the current bridge architecture. Use standard decode() for supported modes.")
             .ThrowAsJavaScriptException();
         return env.Null();
+#endif
     }
 
     // Pull decoded messages from the queue
@@ -362,17 +369,8 @@ namespace wsjtx_nodejs
             }
 
             // Convert C message to JavaScript object
-            WsjtxMessage msg(
-                c_msg.hh,
-                c_msg.min,
-                c_msg.sec,
-                c_msg.snr,
-                c_msg.sync,
-                c_msg.dt,
-                c_msg.freq,
-                std::string(c_msg.message)
-            );
-            results[count++] = CreateWSJTXMessage(env, msg);
+            // In MSVC mode, WsjtxMessage is just wsjtx_message_t (a C struct)
+            results[count++] = CreateWSJTXMessage(env, c_msg);
         }
 
         return results;
@@ -531,7 +529,7 @@ namespace wsjtx_nodejs
     {
         Napi::Object result = Napi::Object::New(env);
 
-        result.Set("text", Napi::String::New(env, msg.msg));
+        result.Set("text", Napi::String::New(env, msg.message));
         result.Set("snr", Napi::Number::New(env, msg.snr));
         result.Set("deltaTime", Napi::Number::New(env, msg.dt));
         result.Set("deltaFrequency", Napi::Number::New(env, msg.freq));
@@ -585,6 +583,23 @@ namespace wsjtx_nodejs
           threads_(threads),
           useFloat_(false) {}
 
+    EncodeWorker::EncodeWorker(Napi::Function &callback,
+                                wsjtx_handle_t handle,
+                                wsjtx_encode_fn encode_fn,
+                                wsjtx_get_max_samples_fn get_max_samples_fn,
+                                wsjtxMode mode,
+                                const std::string &message,
+                                int frequency,
+                                int threads)
+        : AsyncWorkerBase(callback),
+          handle_(handle),
+          encode_fn_(encode_fn),
+          get_max_samples_fn_(get_max_samples_fn),
+          mode_(mode),
+          message_(message),
+          frequency_(frequency),
+          threads_(threads) {}
+
     void DecodeWorker::Execute()
     {
         try
@@ -764,7 +779,7 @@ namespace wsjtx_nodejs
                     // Clamp then scale
                     if (v > 1.0f) v = 1.0f;
                     else if (v < -1.0f) v = -1.0f;
-                    intOut_[i] = static_cast<short int>(std::max(-32768, std::min(32767, static_cast<int>(std::lround(v * 32768.0f)))));
+                    intOut_[i] = static_cast<short int>((std::max)(-32768, (std::min)(32767, static_cast<int>(std::lround(v * 32768.0f)))));
                 }
             }
         }
diff --git a/native/wsjtx_wrapper.h b/native/wsjtx_wrapper.h
@@ -21,11 +21,61 @@
     #define FREE_LIBRARY(handle) dlclose(handle)
 #endif
 
+// 检测MSVC模式（Windows + MSVC编译器）
+#if defined(_WIN32) && defined(_MSC_VER)
+    #define WSJTX_WINDOWS_MSVC_MODE 1
+#else
+    #define WSJTX_WINDOWS_MSVC_MODE 0
+#endif
+
 // 引用bridge API头文件
-#include "wsjtx_bridge.h"
+#include "../wsjtx_bridge/wsjtx_bridge.h"
 
 // 引用C++类型定义（仅用于类型声明，不会链接wsjtx_lib）
+#if !WSJTX_WINDOWS_MSVC_MODE
 #include <wsjtx_lib.h>
+#else
+// MSVC模式下:只使用C bridge类型，避免C++运行时冲突
+// 模式枚举：使用bridge的wsjtx_mode_t，但为兼容性保留enum名
+enum wsjtxMode {
+    FT8 = 0,
+    FT4 = 1,
+    JT4 = 2,
+    JT65 = 3,
+    JT9 = 4,
+    FT2 = 5,
+    WSPR = 6,
+    ECHO = 7,
+    FST4 = 8,
+    Q65 = 9,
+    FST4W = 10
+};
+
+// 使用C bridge类型作为WsjtxMessage（无std::string，安全跨CRT）
+using WsjtxMessage = wsjtx_message_t;
+
+// WSPR相关结构（当前不支持）
+struct decoder_options {
+    int freq;
+    char rcall[13];
+    char rloc[7];
+    int quickmode;
+    int usehashtable;
+    int npasses;
+    int subtraction;
+};
+
+struct decoder_results {
+    double freq;
+    float sync, snr, dt, drift;
+    int jitter;
+    char message[23];
+    char call[13];
+    char loc[7];
+    char pwr[3];
+    int cycles;
+};
+#endif
 
 namespace wsjtx_nodejs {
 
