Update copyright headers; disable precompile header; Fix shutdown exception

kzhdev · kzhdev · commit 4dff91a6a1b5 · 2025-01-05T22:52:04.000-06:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+1.0.0.2
+- Fix shutdown exception
+- Disable precompile header
+
 1.0.0.1
 - Fix shutdown deadlock
 - Add example
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,6 +42,7 @@ set(RELEASE_DIR "${CMAKE_CURRENT_BINARY_DIR}/dist")
 configure_file(src/version.h.in dist/include/websocket_proxy/version.h)
 
 set(SOURCES
+    # src/pch.cpp
     src/main.cpp
     src/websocket_proxy.cpp
 )
@@ -50,6 +51,7 @@ add_executable(websocket_proxy ${SOURCES})
 target_include_directories(websocket_proxy PUBLIC include ${slick_queue_SOURCE_DIR}/include ${RELEASE_DIR}/include)
 target_link_libraries(websocket_proxy PRIVATE spdlog::spdlog_header_only Boost::asio Boost::beast Boost::context OpenSSL::SSL OpenSSL::Crypto)
 target_link_libraries(websocket_proxy PRIVATE ${VCPKG_ROOT})
+# target_precompile_headers(websocket_proxy PRIVATE "src/pch.hpp")
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS_RELEASE "-O2")
diff --git a/include/websocket_proxy/types.h b/include/websocket_proxy/types.h
@@ -1,5 +1,4 @@
-// MIT License
-// 
+// The MIT License (MIT)
 // Copyright (c) 2024-2025 Kun Zhao
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/include/websocket_proxy/websocket_proxy_client.h b/include/websocket_proxy/websocket_proxy_client.h
@@ -1,5 +1,4 @@
-// MIT License
-// 
+// The MIT License (MIT) 
 // Copyright (c) 2024-2025 Kun Zhao
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -164,12 +163,18 @@ inline WebsocketProxyClient::WebsocketProxyClient(WebsocketProxyCallback* callba
     }
 }
 
-inline WebsocketProxyClient::~WebsocketProxyClient() {
-    if (server_pid_.load(std::memory_order_relaxed)) {
+inline WebsocketProxyClient::~WebsocketProxyClient()
+{
+    if (server_pid_.load(std::memory_order_relaxed))
+    {
         unregister();
     }
-    run_->store(false, std::memory_order_release);
-    if (worker_thread_ && worker_thread_->joinable()) {
+    if (run_)
+    {
+        run_->store(false, std::memory_order_release);
+    }
+    if (worker_thread_ && worker_thread_->joinable())
+    {
 // #ifdef _WIN32
 //         worker_thread_->detach();
 // #endif // _WIN32
diff --git a/src/main.cpp b/src/main.cpp
@@ -1,6 +1,25 @@
-// websockets_proxy.cpp : This file contains the 'main' function. Program execution begins and ends there.
-//
-// #include "pch.hpp"
+// The MIT License (MIT) 
+// Copyright (c) 2024-2025 Kun Zhao
+// 
+// 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.
+
+#include "pch.hpp"
 
 #include "spdlog_include.h"
 #include <spdlog/async.h>
diff --git a/src/pch.cpp b/src/pch.cpp
@@ -0,0 +1,22 @@
+// The MIT License (MIT) 
+// Copyright (c) 2024-2025 Kun Zhao
+// 
+// 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.
+
+#include "pch.hpp"
diff --git a/src/pch.hpp b/src/pch.hpp
@@ -0,0 +1,50 @@
+// The MIT License (MIT)
+// Copyright (c) 2024-2025 Kun Zhao
+// 
+// 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.
+
+#pragma once
+
+#include <boost/asio.hpp>
+#include <boost/asio/signal_set.hpp>
+#include <boost/asio/spawn.hpp>
+#include <boost/asio/ssl.hpp>
+#include <boost/asio/strand.hpp>
+#include <boost/beast/core.hpp>
+#include <boost/beast/websocket.hpp>
+#include <boost/beast/websocket/ssl.hpp>
+#include "spdlog_include.h"
+#include "slick_queue.h"
+
+#if defined(_MSC_VER)
+#include <windows.h>
+#include <tchar.h>
+#endif
+
+#include <atomic>
+#include <thread>
+#include <string>
+#include <format>
+#include <atomic>
+#include <unordered_map>
+#include <unordered_set>
+#include <cstdlib>
+#include <cstdint>
+#include <stdexcept>
+#include <cassert>
diff --git a/src/spdlog_include.h b/src/spdlog_include.h
@@ -1,5 +1,4 @@
-// MIT License
-// 
+// The MIT License (MIT)
 // Copyright (c) 2024-2025 Kun Zhao
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/version.h.in b/src/version.h.in
@@ -1,5 +1,4 @@
-// MIT License
-// 
+// The MIT License (MIT) 
 // Copyright (c) 2024-2025 Kun Zhao
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/websocket.h b/src/websocket.h
@@ -1,5 +1,4 @@
-// MIT License
-// 
+// The MIT License (MIT)
 // Copyright (c) 2024-2025 Kun Zhao
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/websocket_proxy.cpp b/src/websocket_proxy.cpp
@@ -1,5 +1,4 @@
-// MIT License
-// 
+// The MIT License (MIT)
 // Copyright (c) 2024-2025 Kun Zhao
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/websocket_proxy.h b/src/websocket_proxy.h
@@ -1,5 +1,4 @@
-// MIT License
-// 
+// The MIT License (MIT)
 // Copyright (c) 2024-2025 Kun Zhao
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/version b/version
@@ -1 +1 @@
-1.0.0.1
+1.0.0.2
