log version; add precompiled headers

Author: kzhdev

CMakeLists.txt

@@ -6,9 +6,6 @@ project(websocket_proxy
         VERSION ${BUILD_VERSION}
         LANGUAGES CXX)
 
-file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/include" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-configure_file(src/version.h.in include/version.h)
-
 set(CMAKE_CXX_STANDARD 20)
 
 if (NOT CMAKE_BUILD_TYPE)
@@ -23,6 +20,10 @@ if (CMAKE_BUILD_TYPE MATCHES Release)
     add_definitions(-DNDEBUG)
 endif()
 
+set(RELEASE_DIR "${CMAKE_CURRENT_BINARY_DIR}/release")
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/include" DESTINATION "${RELEASE_DIR}")
+configure_file(src/version.h.in release/include/websocket_proxy/version.h)
+
 find_package(boost_beast REQUIRED CONFIG)
 find_package(OpenSSL REQUIRED)
 find_package(spdlog REQUIRED CONFIG)
@@ -43,13 +44,18 @@ set(SOURCES
 )
 
 add_executable(websocket_proxy ${SOURCES})
-target_include_directories(websocket_proxy PUBLIC include ${slick_queue_SOURCE_DIR}/include ${spdlog_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+target_include_directories(websocket_proxy PUBLIC include ${slick_queue_SOURCE_DIR}/include ${spdlog_SOURCE_DIR} ${RELEASE_DIR}/include)
 target_link_libraries(websocket_proxy PRIVATE spdlog::spdlog_header_only Boost::asio Boost::beast OpenSSL::SSL OpenSSL::Crypto)
+target_precompile_headers(websocket_proxy PRIVATE src/pch.hpp)
 
 if (MSVC)
     add_definitions(-D_WIN32_WINNT=0x0A00)
     set(CMAKE_SUPPRESS_REGENERATION true)   # supress zero_check
+    set_target_properties(websocket_proxy PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+    set_target_properties(websocket_proxy PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/bin/Debug")
+    set_target_properties(websocket_proxy PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/bin/Release")
+    set_target_properties(websocket_proxy PROPERTIES LINK_INCREMENTAL ON)
     target_compile_definitions(websocket_proxy PUBLIC _UNICODE) # set CharacterSet to unicode
     target_compile_options(websocket_proxy PRIVATE "/bigobj")
     set_target_properties(websocket_proxy PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-endif()
+endif()

example/alpaca_websocket_client/main.cpp

@@ -0,0 +1,16 @@
+#include "alpaca_websocket_client.h"
+
+using namespace websocket_proxy;
+using namespace alpaca_websocket;
+
+int main(int argc, char* argv[])
+{
+#ifdef DEBUG
+    std::string proxy_exe("../Debug/websocket_proxy.exe");
+#else
+    std::string proxy_exe("../Release/websocket_proxy.exe");
+#endif
+    
+    AlpacaWebSocketClient client(proxy_exe);
+    client.openWebsocket();
+}

src/main.cpp

@@ -12,6 +12,7 @@
 #include "spdlog/sinks/stdout_color_sinks.h"
 #endif
 #include "websocket_proxy.h"
+#include <websocket_proxy/version.h>
 
 #ifdef _WIN32
 #pragma comment(lib, "Ws2_32.lib")
@@ -92,7 +93,7 @@ int main(int argc, char* argv[])
 
     spdlog::set_pattern("[%Y-%m-%d %H:%M:%S.%F][%t][%l][%s:%#] %v");
 
-    SPDLOG_INFO("Start WebsocketProxy...");
+    SPDLOG_INFO(std::format("Start WebsocketProxy {}.{}.{}.{} ...", WebsocketProxy_VERSION_MAJOR, WebsocketProxy_VERSION_MINOR, WebsocketProxy_VERSION_PATCH, WebsocketProxy_VERSION_TWEAK));
     WebsocketProxy proxy(server_queue_size);
     proxy.run();
     SPDLOG_INFO("WebsocketProxy Exit.");

src/pch.hpp

@@ -0,0 +1,16 @@
+#include <atomic>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+#include <cstdlib>
+#include <format>
+#include <boost/beast/core.hpp>
+#include <boost/beast/websocket.hpp>
+#include <boost/beast/websocket/ssl.hpp>
+#include <boost/asio.hpp>
+#include <boost/asio/ssl.hpp>
+#include <boost/asio/strand.hpp>
+#include <boost/asio/spawn.hpp>
+#include <boost/asio/signal_set.hpp>
+#include <spdlog/spdlog.h>

src/websocket_proxy.cpp

@@ -129,7 +129,7 @@ void WebsocketProxy::run() {
     boost::asio::signal_set signals(ioc_, SIGINT, SIGTERM);
     signals.async_wait([&](auto, auto){ stop(); });
 
-    SPDLOG_INFO("\n\nWebsocketProxy started. PID={}\n\n", pid_);
+    SPDLOG_INFO("\n\nWebsocketProxy started. PID={}\n", pid_);
 
     // start heartbeat
     ioc_.post([this]() { startHeartbeat(); });
@@ -156,24 +156,6 @@ void WebsocketProxy::run() {
         }
     }
 
-    // while (run_.load(std::memory_order_relaxed)) {
-    //     auto req = client_queue_.read(client_index_);
-    //     if (req.first) {
-    //         handleClientMessage(reinterpret_cast<Message&>(*req.first));
-    //     }
-
-    //     removeClosedSockets();
-        
-    //     if (!checkHeartbeats() && !req.first) {
-    //         std::this_thread::yield();
-    //     }
-
-    //     if (shutdown_time_ && (get_timestamp() - shutdown_time_) >= 60000) {
-    //         run_.store(false, std::memory_order_release);
-    //         break;
-    //     }
-    // }
-
     SPDLOG_INFO("WebsocketProxy Exit. PID={}", pid_);
 }