Close and reuse websocket port correctly

Author: kunlinyu

deploy/lib/systemd/system/dbus2http.service

@@ -9,7 +9,7 @@ Requires=dbus.service
 [Service]
 User=dbus2http
 WorkingDirectory=/opt/cosmos/bin
-ExecStart=/opt/cosmos/bin/dbus2http --system --port 10059 --websocket_port 10058 --service_prefix com org.freedesktop.DBus
+ExecStart=/opt/cosmos/bin/dbus2http --system --port 10059 --websocket_port 10058 --service_prefix com
 Type=simple
 EnvironmentFile=/etc/environment
 Restart=always

include/dbus2http/SignalSocket.h

@@ -51,15 +51,26 @@ class SignalSocket {
   SignalSocket(const InterfaceContext& context, int port, Config config);
 
   void start() {
-    ws_server_thread_ = std::thread([&]() { ws_server_.run(); });
+    ws_server_thread_ = std::thread([this]() { ws_server_.run(); });
     dbus_session_thread_ =
         std::thread([&]() { dbus_connection_->enterEventLoop(); });
   }
 
   void stop() {
     ws_server_.stop_listening();
+
+    for (const auto& [conn_hdl, slot] : conn2slot_) {
+      websocketpp::lib::error_code ec;
+      ws_server_.close(conn_hdl, websocketpp::close::status::going_away,
+                       "server stopping", ec);
+      if (ec)
+        PLOGE << "Error closing connection: " << ec.message();
+    }
+    conn2slot_.clear();
     ws_server_.stop();
+
     if (ws_server_thread_.joinable()) ws_server_thread_.join();
+
     dbus_connection_->leaveEventLoop();
     if (dbus_session_thread_.joinable()) dbus_session_thread_.join();
   }

src/SignalSocket.cpp

@@ -8,12 +8,15 @@ namespace dbus2http {
 
 using websocketpp::log::alevel;
 
-SignalSocket::SignalSocket(const InterfaceContext& context, int port, Config config)
+SignalSocket::SignalSocket(const InterfaceContext& context, int port,
+                           Config config)
     : context_(context), config_(config) {
   ws_server_.init_asio();
+  ws_server_.set_reuse_addr(true);
   ws_server_.set_open_handler([&](auto conn_hdl) {
     websocketpp::lib::error_code ec;
-    server::connection_ptr ws_conn = ws_server_.get_con_from_hdl(conn_hdl, ec);
+    const server::connection_ptr ws_conn =
+        ws_server_.get_con_from_hdl(conn_hdl, ec);
     if (ec) {
       PLOGE << "get_con_from_hdl error: " << ec.message();
       return;
@@ -32,15 +35,14 @@ SignalSocket::SignalSocket(const InterfaceContext& context, int port, Config con
     match = replaceAll(match, "%20", " ");
     match = replaceAll(match, "%27", "'");
     match = replaceAll(match, "%2C", ",");
-    match = replaceAll(match, "%3D", "=");
     match = replaceAll(match, "%2F", "/");
     match = replaceAll(match, "%3A", ":");
     match = replaceAll(match, "%3D", "=");
     PLOGI << "match : " << match;
     try {
       conn2slot_[conn_hdl] = dbus_connection_->addMatch(
           match,
-          [&, conn_hdl](sdbus::Message msg) {
+          [this, &conn_hdl](sdbus::Message msg) {
             PLOGD << "get message from service: " << msg.getInterfaceName()
                   << " member: " << msg.getMemberName();
             std::vector<Argument> args;
@@ -59,6 +61,7 @@ SignalSocket::SignalSocket(const InterfaceContext& context, int port, Config con
 
             nlohmann::json j = Message2Json::WrapHeader(
                 msg, message2json.ExtractMessage(msg, args));
+            websocketpp::lib::error_code ec;
             server::connection_ptr conn =
                 ws_server_.get_con_from_hdl(conn_hdl, ec);
             if (conn) {
@@ -71,6 +74,8 @@ SignalSocket::SignalSocket(const InterfaceContext& context, int port, Config con
           },
           sdbus::return_slot_t());
     } catch (const std::exception& e) {
+      ws_server_.close(conn_hdl, websocketpp::close::status::policy_violation,
+                       "add match failed: " + std::string(e.what()));
       PLOGE << "add match failed: " << e.what();
     }
   });
@@ -102,7 +107,7 @@ SignalSocket::SignalSocket(const InterfaceContext& context, int port, Config con
   ws_server_.set_access_channels(alevel::all);
   ws_server_.set_error_channels(alevel::all);
 #endif
-  dbus_connection_ = DbusUtils::createConnection(system);
+  dbus_connection_ = DbusUtils::createConnection(config.system_bus);
 }
 
 void SignalSocket::on_message(server* s, websocketpp::connection_hdl conn_hdl,

src/main.cpp

@@ -111,6 +111,7 @@ int main(int argc, char* argv[]) {
   PLOGI << "revision: " << REVISION;
   PLOGI << "build time: " << std::string(__DATE__ " " __TIME__);
   PLOGI << "toolchain: " << std::string(TOOLCHAIN);
+  PLOGI << "verbose: " << (program.get<bool>("--verbose") ? "true" : "false");
 
 #ifdef NDEBUG
   PLOGI << "build mode: release";