发现问题

协程销毁时不调用协程内变量的析构函数

Author: dayu521

README.md

@@ -18,12 +18,12 @@
 
 需要c++20
 
-- linux下使用clang>16,在debug下编译.
+- linux下使用clang>16.
 
     例如,在archlinux下需要安装下述依赖
 
     ```bash
-    sudo pacman -S clang spdlog fmt asio openssl xmake pkgconf git unzip --needed --noconfirm
+    sudo pacman -S clang spdlog fmt asio openssl xmake pkgconf git unzip --needed
     ```
 
     其他发行版对应安装
@@ -36,10 +36,11 @@
 linux下打开`终端`或者windows下打开`windows terminal`
 
 ```shell
+#下载依赖库时,可以设置github镜像代理
 xmake g --proxy_pac=github_mirror.lua
-
-xmake -rvwD hcpp
-
+#编译
+xmake -vDrw hcpp
+#运行
 xmake run hcpp
 ```
 

main.cpp

@@ -89,7 +89,7 @@ int main(int argc, char **argv)
             }
         };
 
-        co_spawn(io_context, hs.wait_http(c->get_port()), exit_handler);
+        co_spawn(io_context, hs.wait_http(c->get_port(),io_context), exit_handler);
         co_spawn(io_context, mhs.wait_c(10, c->get_proxy_service()), exit_handler);
 
         auto create_thread = [&](auto self, int i) -> void

src/http/httpclient.cpp

@@ -90,6 +90,10 @@ namespace hcpp
                 if (h.url_.empty() && !h.host_.empty())
                 {
                     h.url_ = "/";
+                }else if(!h.url_.empty()){
+                    if(auto p=h.url_.find_first_of("?");p!=std::string::npos){
+                        h.url_=h.url_.substr(0,p);
+                    }
                 }
             }
             assert(url_end + 1 <= svl.size());

src/httpserver.cpp

@@ -17,7 +17,7 @@ namespace hcpp
     namespace log = spdlog;
     // inline std::latch latch(1);
 
-    awaitable<void> http_do(std::unique_ptr<http_client> client, std::shared_ptr<service_keeper> sk)
+    awaitable<void> http_handler::http_do(std::unique_ptr<http_client> client, std::shared_ptr<service_keeper> sk)
     {
         co_await client->init();
         while (true)
@@ -136,8 +136,15 @@ namespace hcpp
                     }
                     else // TODO 用于控制自身行为
                     {
-                        co_await ss->async_write_all("HTTP/1.1 200 OK\r\nContent-Type: text/html; charset=utf-8\r\nContent-Length: 16\r\n\r\nHello,from http!");
-                        continue;
+                        if (auto p=base_handlers_.find(req.url_);p!=base_handlers_.end())
+                        {
+                            co_await ss->async_write_all((p->second)(req.url_));
+                        }
+                        else
+                        {
+                            co_await ss->async_write_all("HTTP/1.1 200 OK\r\nContent-Type: text/html; charset=utf-8\r\nContent-Length: 16\r\n\r\nHello,from http!");
+                            continue;
+                        }
                     }
                 }
             }
@@ -151,24 +158,35 @@ namespace hcpp
             }
         }
     }
+    
+    void http_handler::add_handler(std::string_view path, std::function<std::string (std::string_view)> handler)
+    {
+        base_handlers_.insert({path, handler});
+    }
 
     using tcp_acceptor = use_awaitable_t<>::as_default_on_t<ip::tcp::acceptor>;
 
-    awaitable<void> httpserver::wait_http(uint16_t port)
+    awaitable<void> httpserver::wait_http(uint16_t port, io_context &ic)
     {
         auto executor = co_await this_coro::executor;
 
         tcp_acceptor acceptor(executor, {ip::tcp::v4(), port});
         co_await nc->async_receive();
         spdlog::debug("http_server监听端口:{}", acceptor.local_endpoint().port());
+        http_handler hh;
+        hh.add_handler("/stop", [&ic](auto &&path)
+                       { 
+                        ic.stop(); 
+                        return "HTTP/1.1 200 OK\r\nContent-Type: text/html; charset=utf-8\r\nContent-Length: 12\r\n\r\nserver stop!";
+                        });
         for (;;)
         {
             try
             {
                 auto socket = co_await acceptor.async_accept();
                 auto sk = std::make_unique<http_svc_keeper>(make_threadlocal_svc_cache(), slow_dns::get_slow_dns());
                 auto hsk = std::make_shared<hack_sk>(std::move(sk), ta_);
-                co_spawn(executor, http_do(std::make_unique<http_client>(std::move(socket)), std::move(hsk)), detached);
+                co_spawn(executor, hh.http_do(std::make_unique<http_client>(std::move(socket)), std::move(hsk)), detached);
             }
             catch (const std::exception &e)
             {
@@ -204,8 +222,9 @@ namespace hcpp
 
         co_await nc->async_send(asio::error_code{}, "ok");
         // 在当前协程运行
-        auto https_listener = [&executor, c = channel_, cr_ps_map, ca_subject = ca_subject_]() -> awaitable<void>
+        auto https_listener = [c = channel_, cr_ps_map, ca_subject = ca_subject_]() -> awaitable<void>
         {
+            http_handler hh;
             for (;;)
             {
                 try
@@ -253,7 +272,7 @@ namespace hcpp
                         self.set_mem(co_await std::move(*cc).make(std::move(si)));
                     };
 
-                    co_spawn(executor, http_do(std::move(hsc), std::move(sk)), detached);
+                    co_spawn(co_await this_coro::executor, hh.http_do(std::move(hsc), std::move(sk)), detached);
                 }
                 catch (const std::exception &e)
                 {
@@ -280,7 +299,8 @@ namespace hcpp
             }
             spdlog::debug("mimt https server线程退出成功");
         };
-        std::jthread t(https_service);
+        std::thread t(https_service);
+        t.detach();
 
         std::unique_ptr<int, std::function<void(int *)>> ptr(new int(0), [&work_guard, &executor](auto &&p)
                                                              {
@@ -291,7 +311,7 @@ namespace hcpp
             delete p; });
 
         co_await co_spawn(executor, https_listener(), use_awaitable);
-        //XXX 不会执行到这里
+        // XXX 不会执行到这里
         co_return;
     }
 

src/httpserver.h

@@ -21,6 +21,15 @@ namespace hcpp
 
     // using socket_channel = asio::use_awaitable_t<>::as_default_on_t<concurrent_channel<void(asio::error_code, std::shared_ptr<tls_client>)>>;
 
+    class http_handler
+    {
+    public:
+        void add_handler(std::string_view path, std::function<std::string (std::string_view)> handler);
+        awaitable<void> http_do(std::unique_ptr<http_client> client, std::shared_ptr<service_keeper> sk);
+    private:
+        std::unordered_map<std::string_view, std::function<std::string (std::string_view)>> base_handlers_;
+    };
+
     awaitable<void> http_do(std::unique_ptr<http_client> client, std::shared_ptr<service_keeper> sk);
 
     using tunnel_advice = std::function<std::shared_ptr<tunnel>(std::shared_ptr<tunnel>, std::string_view, std::string_view)>;
@@ -49,7 +58,7 @@ namespace hcpp
     class httpserver
     {
     public:
-        awaitable<void> wait_http(uint16_t port);
+        awaitable<void> wait_http(uint16_t port,io_context & ic);
 
         // TODO 让mitm替换掉tunnel实现,从而拦截默认tunnel
         void attach_tunnel(tunnel_advice w);
@@ -76,7 +85,7 @@ namespace hcpp
     class mimt_https_server
     {
     public:
-        awaitable<void> wait_c(std::size_t cn,std::vector<proxy_service> ps);
+        awaitable<void> wait_c(std::size_t cn, std::vector<proxy_service> ps);
         awaitable<void> wait(uint16_t port);
 
         std::optional<std::shared_ptr<tunnel>> find_tunnel(std::string_view svc_host, std::string_view svc_service);
@@ -85,6 +94,7 @@ namespace hcpp
 
         void set_ca(subject_identify ca_subject);
         void set_root_verify_store_path(std::string_view root_verify_store_path);
+
     private:
         std::shared_ptr<socket_channel> channel_;
         std::shared_ptr<subject_identify> ca_subject_;