增加 WebSocket 支持

路由未完善

Author: kekxv

CMakeLists.txt

@@ -42,6 +42,7 @@ endif (MSVC)
 include_directories(
         .
         kProxy
+        kProxy/kHttpd
 )
 
 
@@ -70,7 +71,14 @@ endif ()
 
 
 #aux_source_directory(kHttpd srcSource)
-FILE(GLOB_RECURSE srcSource "kProxy/*.c" "kProxy/*.cc" "kProxy/*.cpp" "kProxy/*.h" "kProxy/*.hpp")
+FILE(GLOB_RECURSE srcSource
+        "kProxy/*.c"
+        "kProxy/*.cc"
+        "kProxy/*.cpp"
+        "kProxy/*.h"
+        "kProxy/*.hpp"
+        "kProxy/*/*"
+        )
 
 add_library(kProxy STATIC ${srcSource})
 

clangTools

@@ -105,7 +105,7 @@ class HttpResponseCode {
                 return "Continue";
                 //	切换协议。服务器根据客户端的请求切换协议。只能切换到更高级的协议，例如，切换到HTTP的新版本协议
             case SwitchingProtocols:
-                return "SwitchingProtocols";
+                return "Switching Protocols";
 
                 //	已创建。成功请求并创建了新的资源
             case Created:

kProxy/HttpResponseCode.h

@@ -17,6 +17,7 @@
 #endif
 
 #include <kHttpdClient.h>
+#include <kWebSocketClient.h>
 #include <socket.h>
 
 using namespace std;
@@ -44,11 +45,6 @@ void kHttpd::Init() {
     (void)WSAStartup(wVersionRequested, &wsaData);
 #endif
 
-#ifdef _WIN32
-    evthread_use_windows_threads();
-#else
-    evthread_use_pthreads();
-#endif
 }
 
 kHttpd::kHttpd(int max_thread) {
@@ -128,7 +124,12 @@ int kHttpd::listen(int listen_count, short port, const char *ip) {
                     ) {
                 threadPool->commit([this](int new_fd) -> void {
                     // _logger->d(TAG, __LINE__, "======== client thread run ========");
-                    int _fd = kHttpdClient(this, new_fd).run();
+                    int _fd = -1;
+                    if (isWebSocket) {
+                        _fd = kWebSocketClient(this, new_fd).run();
+                    } else {
+                        _fd = kHttpdClient(this, new_fd).run();
+                    }
                     if (_fd > 0) {
                         shutdown(_fd, SHUT_RDWR);
                         close(_fd);
@@ -167,3 +168,14 @@ bool
 kHttpd::check_host_path(class kHttpdClient *_kHttpdClient, std::string Host, std::string method, std::string url_path) {
     return false;
 }
+
+bool
+kHttpd::check_host_path(class kWebSocketClient *_kWebSocketClient, std::string Host, std::string method,
+                        std::string url_path) {
+    return false;
+}
+
+bool
+kHttpd::check_host_path(class kWebSocketClient *_kWebSocketClient, int type, std::vector<unsigned char> data) {
+    return _kWebSocketClient->send(data, type) >= 0;
+}

kProxy/kHttpd.cpp renamed to kProxy/kHttpd/kHttpd.cpp

@@ -16,11 +16,6 @@
 #endif
 
 #include <logger.h>
-#include <event.h>
-#include <event2/event.h>
-#include <event2/bufferevent.h>
-#include <event2/thread.h>
-#include <event2/listener.h>
 #include <thread_pool.h>
 
 class _kProxy_HEADER_Export kHttpd {
@@ -29,14 +24,18 @@ class _kProxy_HEADER_Export kHttpd {
     static const char *TAG;
     static logger *_logger;
 
-
 public:
     static void Init();
 
     explicit kHttpd(int max_thread = 20);
 
     explicit kHttpd(const char *web_root_path, int max_thread = 20);
 
+    /**
+     * 是否是 WebSocket
+     */
+    bool isWebSocket = false;
+
     ~kHttpd();
 
     int listen(int listen_count = 20, short port = 8080, const char *ip = "0.0.0.0");
@@ -60,7 +59,14 @@ class _kProxy_HEADER_Export kHttpd {
 
     bool check_host_path(class kHttpdClient *_kHttpdClient, std::string Host, std::string method, std::string url_path);
 
+    bool check_host_path(class kWebSocketClient *_kWebSocketClient, std::string Host, std::string method,
+                         std::string url_path);
+
+    bool check_host_path(class kWebSocketClient *_kWebSocketClient, int type, std::vector<unsigned char> data);
+
     friend class kHttpdClient;
+
+    friend class kWebSocketClient;
 };
 
 

kProxy/kHttpd.h renamed to kProxy/kHttpd/kHttpd.h

@@ -44,7 +44,7 @@ static map<string, string> kHttpdClient_HTTP_Content_Type = {
 #ifdef __FILENAME__
 const char *kHttpdClient::TAG = __FILENAME__;
 #else
-const char *kClient::TAG = "kClient";
+const char *kHttpdClient::TAG = "kHttpdClient";
 #endif
 
 logger *kHttpdClient::_logger = logger::instance();