Merge: Snapmaker Orca 2.1.2

src/slic3r/GUI/HttpServer.hpp

@@ -15,6 +15,7 @@
 #include <memory>
 
 #define LOCALHOST_PORT      13618
+#define PAGE_HTTP_PORT      13619
 #define LOCALHOST_URL       "http://localhost:"
 
 namespace Slic3r { namespace GUI {
@@ -73,6 +74,10 @@ class HttpServer
 {
     boost::asio::ip::port_type port;
 
+    // 添加辅助函数声明
+    static bool is_port_available(boost::asio::ip::port_type port);
+    boost::asio::ip::port_type find_available_port(boost::asio::ip::port_type start_port);
+
 public:
     class Response
     {
@@ -98,31 +103,85 @@ public:
         void write_response(std::stringstream& ssOut) override;
     };
 
+    class ResponseFile : public Response
+    {
+        std::string file_path;
+
+    public:
+        ResponseFile(const std::string& path) : file_path(path){}
+        ~ResponseFile() override = default;
+
+        void write_response(std::stringstream& ssOut) override;
+
+        bool ends_with(const std::string& str, const std::string& suffix)
+        {
+            if (str.length() >= suffix.length()) {
+                return str.compare(str.length() - suffix.length(), suffix.length(), suffix) == 0;
+            }
+            return false;
+        };
+    };
+
     HttpServer(boost::asio::ip::port_type port = LOCALHOST_PORT);
+    ~HttpServer();  // 添加析构函数
 
     boost::thread m_http_server_thread;
     bool          start_http_server = false;
+    
+    // 添加自动健康检查相关成员
+    boost::thread m_health_check_thread;
+    bool          m_health_check_enabled = false;
+    int           m_health_check_interval = 5000; // 5秒检查一次
+    mutable std::mutex m_health_check_mutex;  // 保护健康检查相关变量
+    std::condition_variable m_health_check_cv;  // 条件变量，用于精确控制间隔
+    bool          m_restart_requested = false;  // 添加重启请求标志
+    
+    // 添加重启检查线程
+    boost::thread m_restart_check_thread;
+    bool          m_restart_check_enabled = false;
 
     bool is_started() { return start_http_server; }
     void start();
     void stop();
+    void restart();  // 添加重启方法
+    bool is_healthy();  // 添加健康检查方法
+    void start_health_check();  // 启动健康检查
+    void stop_health_check();   // 停止健康检查
+    void set_health_check_interval(int interval_ms);  // 设置健康检查间隔
+    int get_health_check_interval() const;  // 获取健康检查间隔
+    bool is_health_check_enabled() const;   // 检查健康检查是否启用
+    bool is_restart_requested() const;      // 检查是否有重启请求
+    void start_restart_check();  // 启动重启检查
+    void stop_restart_check();   // 停止重启检查
+    void simulate_crash();       // 模拟服务器崩溃，用于测试重启机制
     void set_request_handler(const std::function<std::shared_ptr<Response>(const std::string&)>& m_request_handler);
+    void setPort(boost::asio::ip::port_type new_port) { 
+        if (!start_http_server) {  // 只有在服务器未启动时才允许修改端口
+            port = new_port; 
+        }
+    }
+
+    boost::asio::ip::port_type get_port() const { return port; }
+
+    static std::string map_url_to_file_path(const std::string& url);
 
     static std::shared_ptr<Response> bbl_auth_handle_request(const std::string& url);
 
+    static std::shared_ptr<Response> web_server_handle_request(const std::string& url);
+
 private:
     class IOServer
     {
     public:
         HttpServer&                        server;
-        boost::asio::io_service            io_service;
-        boost::asio::ip::tcp::acceptor     acceptor;
+        boost::asio::io_service           io_service;
+        boost::asio::ip::tcp::acceptor    acceptor;
         std::set<std::shared_ptr<session>> sessions;
 
-        IOServer(HttpServer& server) : server(server), acceptor(io_service, {boost::asio::ip::tcp::v4(), server.port}) {}
+        // 只声明构造函数，不在头文件中定义
+        IOServer(HttpServer& server);
 
         void do_accept();
-
         void start(std::shared_ptr<session> session);
         void stop(std::shared_ptr<session> session);
         void stop_all();