Merge branch 'main' of https://github.com/ratioSolver/ratioGUI

riccardodebenedictis · riccardodebenedictis · commit 9196bd908181 · 2023-10-02T10:31:36.000+02:00
diff --git a/extern/plexa b/extern/plexa
@@ -1 +1 @@
-Subproject commit 680c35b5062308a8d29088472e1601f38b263ad7
+Subproject commit c7c51fcf5400a5b477e40171990f9781098f22ae
diff --git a/extern/rationet b/extern/rationet
@@ -1 +1 @@
-Subproject commit fe19106c024adabcf07cd6139f7c623347a602e5
+Subproject commit 8d6cf4f4b27e8d597e4b03a0dd7d6f4410d71431
diff --git a/include/gui_server.h b/include/gui_server.h
@@ -15,6 +15,7 @@ namespace ratio::gui
   private:
     void on_ws_open(network::websocket_session &ws);
     void on_ws_message(network::websocket_session &ws, const std::string &msg);
+    void on_ws_error(network::websocket_session &ws, const boost::system::error_code &ec);
     void on_ws_close(network::websocket_session &ws);
 
   private:
diff --git a/src/gui_server.cpp b/src/gui_server.cpp
@@ -7,7 +7,7 @@ namespace ratio::gui
         add_file_route("^/$", "client/dist/index.html");
         add_file_route("^/favicon.ico$", "client/dist");
         add_file_route("^/assets/.*$", "client/dist");
-        add_ws_route("^/solver$").on_open(std::bind(&gui_server::on_ws_open, this, std::placeholders::_1)).on_message(std::bind(&gui_server::on_ws_message, this, std::placeholders::_1, std::placeholders::_2)).on_close(std::bind(&gui_server::on_ws_close, this, std::placeholders::_1));
+        add_ws_route("^/solver$").on_open(std::bind(&gui_server::on_ws_open, this, std::placeholders::_1)).on_message(std::bind(&gui_server::on_ws_message, this, std::placeholders::_1, std::placeholders::_2)).on_error(std::bind(&gui_server::on_ws_error, this, std::placeholders::_1, std::placeholders::_2)).on_close(std::bind(&gui_server::on_ws_close, this, std::placeholders::_1));
     }
 
     void gui_server::on_ws_open(network::websocket_session &ws)
@@ -54,11 +54,14 @@ namespace ratio::gui
         if (msg == "tick")
             exec.tick();
     }
-    void gui_server::on_ws_close(network::websocket_session &ws)
+    void gui_server::on_ws_error(network::websocket_session &ws, const boost::system::error_code &)
     {
         std::lock_guard<std::mutex> _(mtx);
         sessions.erase(&ws);
     }
+    void gui_server::on_ws_close(network::websocket_session &)
+    {
+    }
 
     void gui_server::log(const std::string &msg)
     {

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace ratio::gui`
`7`	`7`	`add_file_route("^/$", "client/dist/index.html");`
`8`	`8`	`add_file_route("^/favicon.ico$", "client/dist");`
`9`	`9`	`add_file_route("^/assets/.*$", "client/dist");`
`10`		`- add_ws_route("^/solver$").on_open(std::bind(&gui_server::on_ws_open, this, std::placeholders::_1)).on_message(std::bind(&gui_server::on_ws_message, this, std::placeholders::_1, std::placeholders::_2)).on_close(std::bind(&gui_server::on_ws_close, this, std::placeholders::_1));`
	`10`	`+ add_ws_route("^/solver$").on_open(std::bind(&gui_server::on_ws_open, this, std::placeholders::_1)).on_message(std::bind(&gui_server::on_ws_message, this, std::placeholders::_1, std::placeholders::_2)).on_error(std::bind(&gui_server::on_ws_error, this, std::placeholders::_1, std::placeholders::_2)).on_close(std::bind(&gui_server::on_ws_close, this, std::placeholders::_1));`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`void gui_server::on_ws_open(network::websocket_session &ws)`
`@@ -54,11 +54,14 @@ namespace ratio::gui`
`54`	`54`	`if (msg == "tick")`
`55`	`55`	`exec.tick();`
`56`	`56`	`}`
`57`		`- void gui_server::on_ws_close(network::websocket_session &ws)`
	`57`	`+ void gui_server::on_ws_error(network::websocket_session &ws, const boost::system::error_code &)`
`58`	`58`	`{`
`59`	`59`	`std::lock_guard<std::mutex> _(mtx);`
`60`	`60`	`sessions.erase(&ws);`
`61`	`61`	`}`
	`62`	`+ void gui_server::on_ws_close(network::websocket_session &)`
	`63`	`+ {`
	`64`	`+ }`
`62`	`65`
`63`	`66`	`void gui_server::log(const std::string &msg)`
`64`	`67`	`{`