From c2ba0f9af2a8593378d1f2f2fb498f94056712e6 Mon Sep 17 00:00:00 2001
From: womendoushihaoyin <xyliu_leo@163.com>
Date: Tue, 14 Jan 2025 16:17:27 +0800
Subject: [PATCH] 1. add 'unsubscribe', 'getmachineobjects',
 'setmachinesubscribefilter' 2. add 'async_send_gcodes' 3. show native dialog
 after conneting successfully or unseccessfully 4. add machine cover to web by
 sswcp 5. sign app and notary on mac with git push to 2.0.0

---
 .github/workflows/build_orca.yml |   2 +-
 resources/web/flutter/index.html |  80 ++++++++++++-
 src/slic3r/GUI/GUI_App.hpp       |   1 +
 src/slic3r/GUI/SSWCP.cpp         | 190 ++++++++++++++++++++++++++++++-
 src/slic3r/GUI/SSWCP.hpp         |   5 +-
 src/slic3r/Utils/MoonRaker.cpp   |  81 ++++++++++++-
 src/slic3r/Utils/MoonRaker.hpp   |  14 +++
 src/slic3r/Utils/PrintHost.hpp   |   9 ++
 8 files changed, 368 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml
index 42cffde13f..f4d76fb0f3 100644
--- a/.github/workflows/build_orca.yml
+++ b/.github/workflows/build_orca.yml
@@ -95,7 +95,7 @@ jobs:
 
  # Thanks to RaySajuuk, it's working now
       - name: Sign app and notary
-        if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) && inputs.os == 'macos-14'
+        if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || github.ref == 'refs/heads/2.0.0') && inputs.os == 'macos-14'
         working-directory: ${{ github.workspace }}
         env:
           BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
diff --git a/resources/web/flutter/index.html b/resources/web/flutter/index.html
index b955781318..53e43a7574 100644
--- a/resources/web/flutter/index.html
+++ b/resources/web/flutter/index.html
@@ -36,6 +36,20 @@
   <script src="flutter_bootstrap.js" async></script>
 
   <script>
+    function test_mqtt_unsubscribe() {
+      body = {
+        header:{
+          swquenceId: 202519,
+        },
+        payload:{
+          cmd: "sw_StopMachineStateSubscription",
+          params: {},
+        }
+      };
+
+      window.wx.postMessage(JSON.stringify(body));
+    }
+
     function test_mqtt_subscribe() {
       body = {
         header:{
@@ -51,6 +65,44 @@
       window.wx.postMessage(JSON.stringify(body));
     }
 
+    function test_mqtt_subscribe_filter(){
+      body  = {
+        header:{
+          sequenceId: 202510,
+        },
+        payload:{
+          cmd: "sw_SetSubscribeFilter",
+          params: {
+            "targets":{
+              "gcode_move": null,
+              "toolhead": ["position", "status"]
+            }
+          }
+        }
+      };
+      window.wx.postMessage(JSON.stringify(body));
+    }
+
+    function test_mqtt_send_gcodes(){
+      body  = {
+        header:{
+          sequenceId: 202592,
+        },
+        payload:{
+          cmd: "sw_SendGCodes",
+          params: {
+            "script":[
+              "T0",
+              "T1",
+              "T2",
+              "T3",
+            ]
+          }
+        }
+      };
+      window.wx.postMessage(JSON.stringify(body));
+    }
+
     function test_mqtt_machine_info(){
       body  = {
         header:{
@@ -69,6 +121,30 @@
       window.wx.postMessage(JSON.stringify(body));
     }
 
+    function test_mqtt_machine_objects(){
+      body = {
+        header:{
+          sequenceId: 202504,
+        },
+        payload:{
+          cmd: "sw_GetMachineObjects",
+        }
+      };
+      window.wx.postMessage(JSON.stringify(body));
+    }
+
+
+    function test_mqtt_disconnect() {
+      body = {
+        header:{
+          sequenceId: 202500,
+        },
+        payload:{
+          cmd: "sw_DisConnect",
+        }
+      }
+      window.wx.postMessage(JSON.stringify(body));
+    }
 
     function test_mqtt_connect() {
       body = {
@@ -78,9 +154,9 @@
         payload:{
           cmd: "sw_Connect",
           params: {
-            ip: "172.18.1.46",
+            ip: "172.18.1.66",
             port: 1883,
-            sn: "61BC45A47ED2BE8E",
+            sn: "BE667E5F8A060BDF",
           }
         }
       }
diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp
index a02aec84ab..79d27eae60 100644
--- a/src/slic3r/GUI/GUI_App.hpp
+++ b/src/slic3r/GUI/GUI_App.hpp
@@ -317,6 +317,7 @@ class GUI_App : public wxApp
     bool             m_show_gcode_window{true};
     boost::thread    m_check_network_thread;
   public:
+    wxDialog* get_web_device_dialog() { return web_device_dialog; }
       //try again when subscription fails
     void            on_start_subscribe_again(std::string dev_id);
     void            check_filaments_in_blacklist(std::string tag_supplier, std::string tag_material, bool& in_blacklist, std::string& action, std::string& info);
diff --git a/src/slic3r/GUI/SSWCP.cpp b/src/slic3r/GUI/SSWCP.cpp
index 9e0a0f3cd3..5d664aeb42 100644
--- a/src/slic3r/GUI/SSWCP.cpp
+++ b/src/slic3r/GUI/SSWCP.cpp
@@ -188,7 +188,7 @@ void SSWCP_MachineFind_Instance::sw_StartMachineFind()
                     m_engines.push_back(nullptr);
                 }
 
-                Bonjour::TxtKeys txt_keys   = {"sn", "version"};
+                Bonjour::TxtKeys txt_keys   = {"sn", "version", "machine_type"};
                 std::string      unique_key = "sn";
 
                 for (size_t i = 0; i < m_engines.size(); ++i) {
@@ -217,6 +217,23 @@ void SSWCP_MachineFind_Instance::sw_StartMachineFind()
                                              machine_data[unique_key]     = machine_data["unique_value"];
                                          }
 
+                                         // 模拟一下
+                                         machine_data["cover"] = LOCALHOST_URL + std::to_string(PAGE_HTTP_PORT) +
+                                                                 "/profiles/Snapmaker/Snapmaker A350 Dual BKit_cover.png";
+
+                                         if (reply.txt_data.count("machine_type")) {
+                                             std::string machine_type      = reply.txt_data["machine_type"];
+                                             size_t      vendor_pos    = machine_type.find_first_of(" ");
+                                             if (vendor_pos != std::string::npos) {
+                                                 std::string vendor = machine_type.substr(0, vendor_pos);
+                                                 std::string machine_cover = LOCALHOST_URL + std::to_string(PAGE_HTTP_PORT) + "/profiles/" +
+                                                                             vendor + machine_type + "_cover.png";
+
+                                                 machine_data["cover"] = machine_cover;
+                                             }
+                                             
+
+                                         }
                                          json machine_object;
                                          if (machine_data.count("unique_value")) {
                                              this->add_machine_to_list(machine_object);
@@ -305,9 +322,40 @@ void SSWCP_MachineOption_Instance::process()
         sw_GetMachineState();
     } else if (m_cmd == "sw_SubscribeMachineState") {
         sw_SubscribeMachineState();
+    } else if (m_cmd == "sw_GetMachineObjects") {
+        sw_GetMachineObjects();
+    } else if (m_cmd == "sw_SetSubscribeFilter") {
+        sw_SetMachineSubscribeFilter();
+    } else if (m_cmd == "sw_StopMachineStateSubscription") {
+        sw_UnSubscribeMachineState();
     }
 }
 
+void SSWCP_MachineOption_Instance::sw_UnSubscribeMachineState() {
+    try {
+        std::shared_ptr<PrintHost> host(PrintHost::get_print_host(&wxGetApp().preset_bundle->printers.get_edited_preset().config));
+
+        if (!host) {
+            m_status = 1;
+            m_msg    = "failure";
+            send_to_js();
+            finish_job();
+        }
+
+        host->async_unsubscribe_machine_info([this](const json& response) {
+            if (response.is_null()) {
+                m_status = -1;
+                m_msg    = "failure";
+                send_to_js();
+            } else {
+                m_res_data = response;
+                send_to_js();
+            }
+        });
+
+    } catch (std::exception& e) {}
+}
+
 void SSWCP_MachineOption_Instance::sw_SubscribeMachineState() {
     try {
         std::shared_ptr<PrintHost> host(PrintHost::get_print_host(&wxGetApp().preset_bundle->printers.get_edited_preset().config));
@@ -320,7 +368,7 @@ void SSWCP_MachineOption_Instance::sw_SubscribeMachineState() {
         }
 
         host->async_subscribe_machine_info([this](const json& response) {
-            if (response.is_null() || response.empty()) {
+            if (response.is_null()) {
                 m_status = -1;
                 m_msg    = "failure";
                 send_to_js();
@@ -396,10 +444,42 @@ void SSWCP_MachineOption_Instance::sw_GetMachineState() {
 
 void SSWCP_MachineOption_Instance::sw_SendGCodes() {
     try {
-        if (m_param_data.count("codes")) {
+        if (m_param_data.count("script")) {
             std::shared_ptr<PrintHost> host(PrintHost::get_print_host(&wxGetApp().preset_bundle->printers.get_edited_preset().config));
             std::vector<std::string>   str_codes;
+        
+
+            if (m_param_data["script"].is_array()) {
+                json codes = m_param_data["script"];
+                for (size_t i = 0; i < codes.size(); ++i) {
+                    str_codes.push_back(codes[i].get<std::string>());
+                }
+            } else if (m_param_data["script"].is_string()) {
+                str_codes.push_back(m_param_data["script"].get<std::string>());
+            }
 
+            if (!host) {
+                // 错误处理
+                m_status = -1;
+                m_msg    = "failure";
+                send_to_js();
+                finish_job();
+            } else {
+                host->async_send_gcodes(str_codes, [this](const json& response) {
+                    if (response.is_null() || response.empty()) {
+                        m_status = -1;
+                        m_msg    = "failure";
+                        send_to_js();
+                        finish_job();
+                    } else {
+                        m_res_data = response;
+                        send_to_js();
+                        finish_job();
+                    }
+                });
+            }
+
+        /*http 同步做法 
             if (m_param_data["codes"].is_array()) {
                 json codes = m_param_data["codes"];
                 for (size_t i = 0; i < codes.size(); ++i) {
@@ -430,15 +510,96 @@ void SSWCP_MachineOption_Instance::sw_SendGCodes() {
         } else {
             // 错误处理
             finish_job();
+         */
         }
+        
     } catch (const std::exception&) {}
 }
 
+void SSWCP_MachineOption_Instance::sw_SetMachineSubscribeFilter()
+{
+    try {
+        if (m_param_data.count("targets")) {
+            std::shared_ptr<PrintHost> host(PrintHost::get_print_host(&wxGetApp().preset_bundle->printers.get_edited_preset().config));
+            std::vector<std::pair<std::string, std::vector<std::string>>> targets;
+
+            json items = m_param_data["targets"];
+            for (auto& [key, value] : items.items()) {
+                if (value.is_null()) {
+                    targets.push_back({key, {}});
+                } else {
+                    std::vector<std::string> items;
+                    if (value.is_array()) {
+                        for (size_t i = 0; i < value.size(); ++i) {
+                            items.push_back(value[i].get<std::string>());
+                        }
+                    } else {
+                        items.push_back(value.get<std::string>());
+                    }
+                    targets.push_back({key, items});
+                }
+            }
+
+            if (!host) {
+                // 错误处理
+                m_status = -1;
+                m_msg    = "failure";
+                send_to_js();
+                finish_job();
+            } else {
+                host->async_set_machine_subscribe_filter(targets, [this](const json& response) {
+                    if (response.is_null() || response.empty()) {
+                        m_status = -1;
+                        m_msg    = "failure";
+                        send_to_js();
+                        finish_job();
+                    } else {
+                        m_res_data = response;
+                        send_to_js();
+                        finish_job();
+                    }
+                });
+            }
+        } else {
+            finish_job();
+        }
+
+    } catch (std::exception& e) {}
+}
+void SSWCP_MachineOption_Instance::sw_GetMachineObjects()
+{
+    try {
+        std::shared_ptr<PrintHost> host(PrintHost::get_print_host(&wxGetApp().preset_bundle->printers.get_edited_preset().config));
+            
+        if (!host) {
+            m_status = -1;
+            m_msg = "failure";
+            send_to_js();
+            finish_job();
+            return;
+        }
+
+        host->async_get_machine_objects([this](const json& response) {
+            if (response.is_null() || response.empty()) {
+                m_status = -1;
+                m_msg = "failure";
+                send_to_js();
+                finish_job();
+            } else {
+                m_res_data = response;
+                send_to_js();
+                finish_job();
+            }
+        });
+
+    } catch (std::exception& e) {}
+}
+
 // SSWCP_MachineConnect_Instance
 void SSWCP_MachineConnect_Instance::process() {
     if (m_cmd == "sw_Test_connect") {
         sw_test_connect();
-    } else if (m_cmd == "sw_Connect") {
+    } else if (m_cmd == "sw_SelectMachine") {
         sw_connect();
     } else if (m_cmd == "sw_DisConnect") {
         sw_disconnect();
@@ -553,15 +714,29 @@ void SSWCP_MachineConnect_Instance::sw_connect() {
                     json     params;
                     bool res = host->connect(msg, connect_params);
 
+                    std::string ip_port = host->get_host();
                     if (res) {
                         // 后续应改成机器交互页的本地web服务器地址
-                        std::string ip_port = host->get_host();
                         int         pos     = ip_port.find(':');
                         if (pos != std::string::npos) {
                             ip_port = ip_port.substr(0, pos);
                         }
                         wxGetApp().mainframe->load_printer_url("http://" + ip_port);
+
+                        MessageDialog msg_window(nullptr,
+                                                 ip_port + _L(" connected sucessfully !\n"),
+                                                 L("Machine Connected"), wxICON_QUESTION | wxOK);
+                        msg_window.ShowModal();
+
+                        auto dialog = wxGetApp().get_web_device_dialog();
+                        if (dialog) {
+                            dialog->Hide();
+                        }
                     } else {
+                        MessageDialog msg_window(nullptr, ip_port + _L(" connected unseccessfully !\n"), L("Failed"),
+                                                 wxICON_QUESTION | wxOK);
+                        msg_window.ShowModal();
+
                         m_status = 1;
                         m_msg    = msg.c_str();
                     }
@@ -612,11 +787,14 @@ std::unordered_set<std::string> SSWCP::m_machine_option_cmd_list = {
     "sw_SendGCodes",
     "sw_GetMachineState",
     "sw_SubscribeMachineState",
+    "sw_GetMachineObjects",
+    "sw_SetSubscribeFilter",
+    "sw_StopMachineStateSubscription",
 };
 
 std::unordered_set<std::string> SSWCP::m_machine_connect_cmd_list = {
     "sw_Test_connect",
-    "sw_Connect",
+    "sw_SelectMachine",
     "sw_DisConnect",
 };
 
diff --git a/src/slic3r/GUI/SSWCP.hpp b/src/slic3r/GUI/SSWCP.hpp
index baf8c8559d..ff342d4e0d 100644
--- a/src/slic3r/GUI/SSWCP.hpp
+++ b/src/slic3r/GUI/SSWCP.hpp
@@ -156,10 +156,11 @@ class SSWCP_MachineOption_Instance : public SSWCP_Instance
 
 private:
     void sw_SendGCodes();
-
     void sw_GetMachineState();
-
     void sw_SubscribeMachineState();
+    void sw_UnSubscribeMachineState();
+    void sw_GetMachineObjects();
+    void sw_SetMachineSubscribeFilter();
 
 private:
     std::thread m_work_thread;
diff --git a/src/slic3r/Utils/MoonRaker.cpp b/src/slic3r/Utils/MoonRaker.cpp
index 0607ced162..f37357defd 100644
--- a/src/slic3r/Utils/MoonRaker.cpp
+++ b/src/slic3r/Utils/MoonRaker.cpp
@@ -678,15 +678,81 @@ void Moonraker_Mqtt::async_subscribe_machine_info(std::function<void(const nlohm
 {
     bool res = m_mqtt_client->Subscribe(m_sn + m_status_topic, 0);
 
-    if (!res || m_status_cb) {
-        callback(json::value_t::null);
+    if (!res) {
+        if (m_status_cb) {
+            callback(json::value_t::null);
+        }
         return;
     }
 
     m_status_cb = callback;
+
+    callback(json::object());
 }
 
-void Moonraker_Mqtt::async_get_machine_info(const std::vector<std::pair<std::string, std::vector<std::string>>>& targets, std::function<void(const nlohmann::json& response)> callback)
+void Moonraker_Mqtt::async_send_gcodes(const std::vector<std::string>& scripts, std::function<void(const nlohmann::json&)> callback)
+{
+    std::string method = "printer.gcode.script";
+
+    std::string str_scripts = "";
+    for (size_t i = 0; i < scripts.size(); ++i) {
+        if (i != 0) {
+            str_scripts += "\n";
+        }
+        str_scripts += scripts[i];
+    }
+
+    json params;
+    params["script"] = str_scripts;
+    
+
+    if (!send_to_request(method, params, true, callback) && callback) {
+        callback(json::value_t::null);
+    }
+}
+
+void Moonraker_Mqtt::async_unsubscribe_machine_info(std::function<void(const nlohmann::json&)> callback)
+{
+    bool res = m_mqtt_client->Unsubscribe(m_sn + m_status_topic);
+
+    if (!res) {
+        if (m_status_cb) {
+            callback(json::value_t::null);
+        }
+        return;
+    }
+
+    callback(json::object());
+}
+
+void Moonraker_Mqtt::async_set_machine_subscribe_filter(const std::vector<std::pair<std::string, std::vector<std::string>>>& targets,
+                                                        std::function<void(const nlohmann::json& response)>                  callback)
+{
+    std::string method = "printer.objects.subscribe";
+
+    json params;
+    params["objects"] = json::object();
+
+    for (size_t i = 0; i < targets.size(); ++i) {
+        if (targets[i].second.size() == 0) {
+            params["objects"][targets[i].first] = json::value_t::null;
+        } else {
+            params["objects"][targets[i].first] = json::array();
+
+            for (const auto& key : targets[i].second) {
+                params["objects"][targets[i].first].push_back(key);
+            }
+        }
+    }
+
+    if (!send_to_request(method, params, true, callback) && callback) {
+        callback(json::value_t::null);
+    }
+}
+
+
+void Moonraker_Mqtt::async_get_machine_info(const std::vector<std::pair<std::string, std::vector<std::string>>>& targets, 
+                                          std::function<void(const nlohmann::json& response)> callback)
 {
     std::string method = "printer.objects.query";
 
@@ -710,6 +776,15 @@ void Moonraker_Mqtt::async_get_machine_info(const std::vector<std::pair<std::str
     }
 }
 
+void Moonraker_Mqtt::async_get_machine_objects(std::function<void(const nlohmann::json& response)> callback)
+{
+    std::string method = "printer.objects.list";
+    json params = json::object();  // 空参数对象
+
+    if (!send_to_request(method, params, true, callback) && callback) {
+        callback(json::value_t::null);
+    }
+}
 
 bool Moonraker_Mqtt::send_to_request(const std::string& method, const json& params, bool need_response, std::function<void(const nlohmann::json& response)> callback) 
 {
diff --git a/src/slic3r/Utils/MoonRaker.hpp b/src/slic3r/Utils/MoonRaker.hpp
index 50b8d917da..d8797cbfc9 100644
--- a/src/slic3r/Utils/MoonRaker.hpp
+++ b/src/slic3r/Utils/MoonRaker.hpp
@@ -44,6 +44,11 @@ class Moonraker : public PrintHost
     virtual bool disconnect(wxString& msg, const nlohmann::json& params) override { return true; }
     virtual void async_get_machine_info(const std::vector<std::pair<std::string, std::vector<std::string>>>& targets, std::function<void(const nlohmann::json& response)>) override  {}
     virtual void async_subscribe_machine_info(std::function<void(const nlohmann::json&)>) override {}
+    virtual void async_get_machine_objects(std::function<void(const nlohmann::json& response)>)override {}
+    virtual void async_set_machine_subscribe_filter(const std::vector<std::pair<std::string, std::vector<std::string>>>& targets,
+                                                    std::function<void(const nlohmann::json& response)>                  callback) override {}
+    virtual void async_unsubscribe_machine_info(std::function<void(const nlohmann::json&)>) override {}
+    virtual void async_send_gcodes(const std::vector<std::string>& scripts, std::function<void(const nlohmann::json&)>) override{}
 
 protected:
 #ifdef WIN32
@@ -81,6 +86,15 @@ class Moonraker_Mqtt : public Moonraker
 
     virtual void async_subscribe_machine_info(std::function<void(const nlohmann::json&)>) override;
 
+    virtual void async_get_machine_objects(std::function<void(const nlohmann::json& response)> callback) override;
+
+    virtual void async_set_machine_subscribe_filter(const std::vector<std::pair<std::string, std::vector<std::string>>>& targets,
+                                                    std::function<void(const nlohmann::json& response)>                  callback) override;
+
+    virtual void async_unsubscribe_machine_info(std::function<void(const nlohmann::json&)>) override;
+
+    virtual void async_send_gcodes(const std::vector<std::string>& scripts, std::function<void(const nlohmann::json&)>) override;
+
 public:
     void on_mqtt_message_arrived(const std::string& topic, const std::string& payload);
 
diff --git a/src/slic3r/Utils/PrintHost.hpp b/src/slic3r/Utils/PrintHost.hpp
index c69300878f..9b685ad0a7 100644
--- a/src/slic3r/Utils/PrintHost.hpp
+++ b/src/slic3r/Utils/PrintHost.hpp
@@ -78,8 +78,17 @@ class PrintHost
 
     virtual void async_get_machine_info(const std::vector<std::pair<std::string, std::vector<std::string>>>& targets, std::function<void(const nlohmann::json& response)>) {}
 
+    virtual void async_get_machine_objects(std::function<void(const nlohmann::json& response)>) {}
+
+    virtual void async_set_machine_subscribe_filter(const std::vector<std::pair<std::string, std::vector<std::string>>>& targets,
+                                                    std::function<void(const nlohmann::json& response)>                  callback) {}
+
+    virtual void async_unsubscribe_machine_info(std::function<void(const nlohmann::json&)>) {}
+
     virtual void async_subscribe_machine_info(std::function<void(const nlohmann::json&)>) {}
 
+    virtual void async_send_gcodes(const std::vector<std::string>& scripts, std::function<void(const nlohmann::json&)>) {}
+
     virtual bool connect(wxString& msg, const nlohmann::json& params) { return false; }
 
     virtual bool disconnect(wxString& msg, const nlohmann::json& params) { return true; }