diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt index d1227b930b..33adcee65e 100644 --- a/src/slic3r/CMakeLists.txt +++ b/src/slic3r/CMakeLists.txt @@ -770,12 +770,8 @@ set(SLIC3R_GUI_SOURCES Utils/ICameraSignalingChannel.hpp Utils/OrcaCloudServiceAgent.cpp Utils/OrcaCloudServiceAgent.hpp - Utils/OrcaMqttConnection.cpp - Utils/OrcaMqttConnection.hpp Utils/OrcaPrinterAgent.cpp Utils/OrcaPrinterAgent.hpp - Utils/OrcaCloudSignalingChannel.cpp - Utils/OrcaCloudSignalingChannel.hpp Utils/QidiPrinterAgent.cpp Utils/QidiPrinterAgent.hpp Utils/SnapmakerPrinterAgent.cpp @@ -915,7 +911,7 @@ target_include_directories(libslic3r_gui PRIVATE Utils ${CMAKE_CURRENT_BINARY_DI if (WIN32) target_include_directories(libslic3r_gui SYSTEM PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../deps/WebView2/include) - target_link_libraries(libslic3r_gui Advapi32 Crypt32) + target_link_libraries(libslic3r_gui Advapi32) endif() source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SLIC3R_GUI_SOURCES}) diff --git a/src/slic3r/Utils/Http.cpp b/src/slic3r/Utils/Http.cpp index 00b9a0153f..552c0b6a39 100644 --- a/src/slic3r/Utils/Http.cpp +++ b/src/slic3r/Utils/Http.cpp @@ -31,19 +31,8 @@ #include #include -#include -#include +#ifdef OPENSSL_CERT_OVERRIDE #include -#include - -#ifdef _WIN32 -# ifndef NOMINMAX -# define NOMINMAX -# endif -# include -# include -// wincrypt.h uses this token for a certificate-name property identifier. -# undef X509_NAME #endif namespace fs = boost::filesystem; @@ -967,45 +956,6 @@ std::string Http::tls_system_cert_store() return ret; } -void Http::add_platform_root_certificates(SSL_CTX* ssl_context) -{ -#ifdef _WIN32 - X509_STORE* openssl_store = SSL_CTX_get_cert_store(ssl_context); - if (!openssl_store) - throw std::runtime_error("unable to get OpenSSL certificate store"); - - const auto load_store = [&](DWORD location) { - HCERTSTORE windows_store = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, - location | CERT_STORE_OPEN_EXISTING_FLAG | CERT_STORE_READONLY_FLAG, - L"ROOT"); - if (!windows_store) - return; - - PCCERT_CONTEXT windows_certificate = nullptr; - while ((windows_certificate = CertEnumCertificatesInStore(windows_store, windows_certificate)) != nullptr) { - const unsigned char* encoded = windows_certificate->pbCertEncoded; - X509* certificate = d2i_X509(nullptr, &encoded, static_cast(windows_certificate->cbCertEncoded)); - if (!certificate) { - ERR_clear_error(); - continue; - } - - ERR_clear_error(); - if (X509_STORE_add_cert(openssl_store, certificate) != 1) - ERR_clear_error(); - X509_free(certificate); - } - - CertCloseStore(windows_store, 0); - }; - - load_store(CERT_SYSTEM_STORE_CURRENT_USER); - load_store(CERT_SYSTEM_STORE_LOCAL_MACHINE); -#else - (void)ssl_context; -#endif -} - std::string Http::url_encode(const std::string &str) { ::CURL *curl = ::curl_easy_init(); diff --git a/src/slic3r/Utils/Http.hpp b/src/slic3r/Utils/Http.hpp index 9c22eecb19..d8fa012124 100644 --- a/src/slic3r/Utils/Http.hpp +++ b/src/slic3r/Utils/Http.hpp @@ -13,8 +13,6 @@ #include "libslic3r/Exception.hpp" #include "libslic3r_version.h" -typedef struct ssl_ctx_st SSL_CTX; - #define MAX_SIZE_TO_FILE 3*1024 namespace Slic3r { @@ -202,10 +200,6 @@ public: // Return empty string on success or error message on fail. static std::string tls_global_init(); static std::string tls_system_cert_store(); - // Add platform root certificates to a standalone OpenSSL context. This - // supplements set_default_verify_paths() on platforms where OpenSSL does - // not use the native certificate store. - static void add_platform_root_certificates(SSL_CTX* ssl_context); // converts the given string to an url_encoded_string static std::string url_encode(const std::string &str); diff --git a/src/slic3r/Utils/OrcaCloudServiceAgent.cpp b/src/slic3r/Utils/OrcaCloudServiceAgent.cpp index aef4fa1b09..2cebdb8ab9 100644 --- a/src/slic3r/Utils/OrcaCloudServiceAgent.cpp +++ b/src/slic3r/Utils/OrcaCloudServiceAgent.cpp @@ -1,8 +1,6 @@ #include "OrcaCloudServiceAgent.hpp" #include "CloudProvider.hpp" #include "Http.hpp" -#include "ICameraSignalingChannel.hpp" -#include "OrcaCloudSignalingChannel.hpp" #include "bambu_networking.hpp" #include "ICloudServiceAgent.hpp" #include "libslic3r/Utils.hpp" @@ -14,8 +12,6 @@ #include #include #include -#include -#include #include #include #include @@ -41,18 +37,14 @@ #include #include #include -#include #include #include -#include -#include #include #include #include #include #include -#include #include #include @@ -520,7 +512,6 @@ OrcaCloudServiceAgent::OrcaCloudServiceAgent(std::string log_dir) , api_base_url(ORCA_DEFAULT_API_URL) , auth_base_url(ORCA_DEFAULT_AUTH_URL) , cloud_base_url(ORCA_DEFAULT_CLOUD_URL) - , mqtt_connection(std::make_unique()) { auth_headers["apikey"] = ORCA_DEFAULT_PUB_KEY; pkce_bundle.loopback_port = choose_loopback_port(); @@ -531,8 +522,6 @@ OrcaCloudServiceAgent::OrcaCloudServiceAgent(std::string log_dir) OrcaCloudServiceAgent::~OrcaCloudServiceAgent() { - if (mqtt_connection) - mqtt_connection->stop(); if (refresh_thread.joinable()) { refresh_thread.join(); } @@ -975,45 +964,22 @@ bool OrcaCloudServiceAgent::ensure_token_fresh(const std::string& reason) { retu int OrcaCloudServiceAgent::connect_server() { - const bool logged_in = is_user_login(); - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: OrcaCloudServiceAgent::connect_server logged_in=" << logged_in - << " api_base_url=" << api_base_url; - if (!logged_in) { - if (mqtt_connection) - mqtt_connection->stop(); - { - std::lock_guard lock(state_mutex); - is_connected = false; - } - BOOST_LOG_TRIVIAL(warning) << "OrcaCloudServiceAgent: connect_server requires a logged-in user"; - invoke_server_connected_callback(-1, 401); - return BAMBU_NETWORK_ERR_INVALID_HANDLE; - } - std::string response; unsigned int http_code = 0; int result = http_get(ORCA_HEALTH_PATH, &response, &http_code); bool connected = (result == BAMBU_NETWORK_SUCCESS && http_code >= 200 && http_code < 300); - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: cloud health result=" << result << " http_code=" << http_code - << " connected=" << connected << " response_bytes=" << response.size(); - - // connect_server() remains a REST health probe. The long-lived fleet MQTT socket - // is started lazily by set_user_selected_machine -> configure_selected_printer_mqtt; - // subscriptions queued before that point are replayed when it starts. { std::lock_guard lock(state_mutex); is_connected = connected; } + invoke_server_connected_callback(connected ? 0 : -1, http_code); return connected ? BAMBU_NETWORK_SUCCESS : BAMBU_NETWORK_ERR_CONNECTION_TO_SERVER_FAILED; } bool OrcaCloudServiceAgent::is_server_connected() { - // The REST health probe is the signal; the per-printer MQTT socket does not gate - // whole-cloud connectivity (one printer reconnecting must not report the whole - // cloud as lost). std::lock_guard lock(state_mutex); return is_connected; } @@ -1034,238 +1000,13 @@ int OrcaCloudServiceAgent::stop_subscribe(std::string module) int OrcaCloudServiceAgent::add_subscribe(std::vector dev_list) { - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: OrcaCloudServiceAgent::add_subscribe count=" << dev_list.size() - << " logged_in=" << is_user_login() << " mqtt_connection=" << (mqtt_connection ? "set" : "null"); - if (!is_user_login() || !mqtt_connection) { - BOOST_LOG_TRIVIAL(warning) << "Orca diagnostic: add_subscribe rejected because cloud is not ready"; - return BAMBU_NETWORK_ERR_INVALID_HANDLE; - } - bool queued = true; - for (const std::string& dev_id : dev_list) - queued = mqtt_connection->subscribe(dev_id) && queued; - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: add_subscribe queued=" << queued; - return queued ? BAMBU_NETWORK_SUCCESS : BAMBU_NETWORK_ERR_CONNECT_FAILED; + (void) dev_list; + return BAMBU_NETWORK_SUCCESS; } int OrcaCloudServiceAgent::del_subscribe(std::vector dev_list) { - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: OrcaCloudServiceAgent::del_subscribe count=" << dev_list.size() - << " logged_in=" << is_user_login() << " mqtt_connection=" << (mqtt_connection ? "set" : "null"); - if (!is_user_login() || !mqtt_connection) { - BOOST_LOG_TRIVIAL(warning) << "Orca diagnostic: del_subscribe rejected because cloud is not ready"; - return BAMBU_NETWORK_ERR_INVALID_HANDLE; - } - bool queued = true; - for (const std::string& dev_id : dev_list) - queued = mqtt_connection->unsubscribe(dev_id) && queued; - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: del_subscribe queued=" << queued; - return queued ? BAMBU_NETWORK_SUCCESS : BAMBU_NETWORK_ERR_CONNECT_FAILED; -} - -int OrcaCloudServiceAgent::configure_selected_printer_mqtt(const std::string& dev_id, - OrcaMqttConnection::StateHandler state_handler) -{ - (void) dev_id; - if (!ensure_token_fresh("configure_selected_printer_mqtt")) - { - BOOST_LOG_TRIVIAL(warning) << "ensure_token_fresh returned false"; - return BAMBU_NETWORK_ERR_CONNECTION_TO_SERVER_FAILED; - } - - OrcaMqttConnection::Config cfg; - cfg.url = "wss://" + api_base_url + "/api/v1/printers/mqtt"; - cfg.use_tls = true; - cfg.bearer_provider = [this] { return get_access_token(); }; - cfg.client_id = "OrcaSlicer"; - cfg.keepalive_seconds = 300; - - { - std::lock_guard lock(m_selected_url_mutex); - m_selected_printer_mqtt_url = cfg.url; - } - - if (mqtt_connection->is_running()) { - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: fleet MQTT connection already running"; - return BAMBU_NETWORK_SUCCESS; - } - - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: configuring fleet MQTT endpoint=" << cfg.url; - - // NOTE: no lock is held across start() — it blocks for the whole initial connect - // attempt (up to ~10s), and the message handler below re-enters callback_mutex on - // the MQTT worker thread. - const bool ok = mqtt_connection->start( - cfg, - [this](const std::string& id, const std::string& payload) { deliver_cloud_message(id, payload); }, - std::move(state_handler)); - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: fleet MQTT start returned=" << ok; - return ok ? BAMBU_NETWORK_SUCCESS : BAMBU_NETWORK_ERR_CONNECTION_TO_SERVER_FAILED; -} - -void OrcaCloudServiceAgent::teardown_selected_printer_mqtt() -{ - if (mqtt_connection) { - mqtt_connection->stop(); - // The connection object is reused for the next printer; drop this printer's - // report topic so its 1:1 socket does not re-subscribe the previous device. - mqtt_connection->clear_subscriptions(); - } - std::lock_guard lock(m_selected_url_mutex); - m_selected_printer_mqtt_url.clear(); -} - -std::string OrcaCloudServiceAgent::selected_printer_mqtt_url() const -{ - std::lock_guard lock(m_selected_url_mutex); - return m_selected_printer_mqtt_url; -} - -void OrcaCloudServiceAgent::deliver_cloud_message(const std::string& dev_id, const std::string& payload) -{ - OnMessageFn callback; - { - std::lock_guard lock(callback_mutex); - callback = printer_status_callback; - } - if (callback) - callback(dev_id, payload); -} - -int OrcaCloudServiceAgent::set_printer_status_callback(OnMessageFn fn) -{ - std::lock_guard lock(callback_mutex); - printer_status_callback = std::move(fn); - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: printer status callback=" << (printer_status_callback ? "set" : "clear"); - return BAMBU_NETWORK_SUCCESS; -} - -int OrcaCloudServiceAgent::send_printer_command(const std::string& dev_id, const std::string& body) -{ - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: send_printer_command dev_id=" << dev_id - << " body_bytes=" << body.size() << " logged_in=" << is_user_login(); - if (dev_id.empty() || !is_user_login()) { - BOOST_LOG_TRIVIAL(warning) << "Orca diagnostic: send_printer_command rejected"; - return BAMBU_NETWORK_ERR_INVALID_HANDLE; - } - - const std::string path = std::string(ORCA_CLOUD_PRINTER) + "/" + dev_id + "/commands"; - std::string response; - unsigned int http_code = 0; - int result = http_post(path, body, &response, &http_code); - BOOST_LOG_TRIVIAL(info) << "OrcaCloudServiceAgent: command dev=" << dev_id - << " http=" << http_code << " result=" << result - << " response_bytes=" << response.size(); - return (result == BAMBU_NETWORK_SUCCESS && http_code >= 200 && http_code < 300) - ? BAMBU_NETWORK_SUCCESS - : BAMBU_NETWORK_ERR_CONNECT_FAILED; -} - -int OrcaCloudServiceAgent::upload_gcode_via_cloud(const std::string& dev_id, - const std::string& local_gcode_path, - std::string* job_id, - OnUpdateStatusFn update_fn, - WasCancelledFn cancel_fn) -{ - if (dev_id.empty() || local_gcode_path.empty() || !is_user_login()) - return BAMBU_NETWORK_ERR_INVALID_HANDLE; - if (cancel_fn && cancel_fn()) - return BAMBU_NETWORK_ERR_CANCELED; - - // Step 1: POST print-jobs/uploads -> a short-lived presigned R2 PUT URL. No - // metadata rides this request; filename/start are only relevant to the HTTP - // .../start finalize route, which this MQTT-driven flow does not call. - const std::string uploads_path = std::string(ORCA_CLOUD_PRINTER) + "/" + Http::url_encode(dev_id) + "/print-jobs/uploads"; - std::string response; - unsigned int http_code = 0; - int result = http_post(uploads_path, "{}", &response, &http_code); - if (result != BAMBU_NETWORK_SUCCESS || http_code < 200 || http_code >= 300) { - BOOST_LOG_TRIVIAL(warning) << "OrcaCloudServiceAgent: print-jobs/uploads failed http_code=" << http_code; - return BAMBU_NETWORK_ERR_CONNECT_FAILED; - } - - std::string upload_job_id; - std::string upload_url; - try { - const nlohmann::json j = nlohmann::json::parse(response); - upload_job_id = j.value("job_id", ""); - upload_url = j.value("upload_url", ""); - } catch (const std::exception& e) { - BOOST_LOG_TRIVIAL(error) << "OrcaCloudServiceAgent: failed to parse print-jobs/uploads response: " << e.what(); - return BAMBU_NETWORK_ERR_CONNECT_FAILED; - } - if (upload_job_id.empty() || upload_url.empty()) { - BOOST_LOG_TRIVIAL(error) << "OrcaCloudServiceAgent: print-jobs/uploads response missing job_id/upload_url"; - return BAMBU_NETWORK_ERR_CONNECT_FAILED; - } - - if (cancel_fn && cancel_fn()) - return BAMBU_NETWORK_ERR_CANCELED; - - // Step 2: PUT the G-code straight to R2 with the one-time URL from step 1. This - // is a scoped, PUT-only, short-TTL capability with no bearer token of its own, - // so it bypasses http_put (which always prefixes api_base_url and attaches the - // cloud session's Authorization header - neither belongs on an R2 PUT). - bool canceled = false; - unsigned put_status = 0; - std::string put_error; - Http::put(upload_url) - .tls_verify(true) - .header("Content-Type", "text/x.gcode") - .set_put_body(boost::filesystem::path(local_gcode_path)) - .timeout_connect(5) - .timeout_max(300) // large G-code over a slow link - .on_progress([&](Http::Progress progress, bool& cancel) { - if (cancel_fn && cancel_fn()) { - cancel = true; - canceled = true; - return; - } - if (update_fn && progress.ultotal > 0) { - const int percent = static_cast((progress.ulnow * 100) / progress.ultotal); - update_fn(PrintingStageUpload, percent, "Uploading..."); - } - }) - .on_complete([&](std::string, unsigned status) { put_status = status; }) - .on_error([&](std::string, std::string err, unsigned status) { - put_status = status; - put_error = std::move(err); - }) - .perform_sync(); - - if (canceled) - return BAMBU_NETWORK_ERR_CANCELED; - if (put_status < 200 || put_status >= 300) { - BOOST_LOG_TRIVIAL(warning) << "OrcaCloudServiceAgent: R2 upload failed status=" << put_status << " error=" << put_error; - return BAMBU_NETWORK_ERR_PRINT_SG_UPLOAD_FTP_FAILED; - } - - if (job_id) - *job_id = std::move(upload_job_id); - return BAMBU_NETWORK_SUCCESS; -} - -int OrcaCloudServiceAgent::start_cloud_print_job(const std::string& dev_id, - const std::string& job_id, - const std::string& filename, - bool start) -{ - if (dev_id.empty() || job_id.empty() || !is_user_login()) - return BAMBU_NETWORK_ERR_INVALID_HANDLE; - - nlohmann::json body; - if (!filename.empty()) - body["filename"] = filename; - body["start"] = start; - - const std::string path = std::string(ORCA_CLOUD_PRINTER) + "/" + Http::url_encode(dev_id) + "/print-jobs/" + - Http::url_encode(job_id) + "/start"; - std::string response; - unsigned int http_code = 0; - const int result = http_post(path, body.dump(), &response, &http_code); - if (result != BAMBU_NETWORK_SUCCESS || http_code < 200 || http_code >= 300) { - BOOST_LOG_TRIVIAL(warning) << "OrcaCloudServiceAgent: print-jobs/" << job_id << "/start failed http_code=" << http_code; - return BAMBU_NETWORK_ERR_CONNECT_FAILED; - } + (void) dev_list; return BAMBU_NETWORK_SUCCESS; } @@ -2300,10 +2041,6 @@ bool OrcaCloudServiceAgent::set_user_session(const json& session_json, bool noti void OrcaCloudServiceAgent::clear_session(bool all_backends) { - if (mqtt_connection) { - mqtt_connection->stop(); - mqtt_connection->clear_subscriptions(); - } { std::lock_guard lock(session_mutex); session = SessionInfo{}; @@ -2419,11 +2156,7 @@ int OrcaCloudServiceAgent::http_get(const std::string& path, std::string* respon return (res.success && !suppress) ? BAMBU_NETWORK_SUCCESS : BAMBU_NETWORK_ERR_CONNECT_FAILED; } -int OrcaCloudServiceAgent::http_post(const std::string& path, - const std::string& body, - std::string* response_body, - unsigned int* http_code, - const std::string& content_type) +int OrcaCloudServiceAgent::http_post(const std::string& path, const std::string& body, std::string* response_body, unsigned int* http_code) { std::string url = api_base_url + path; BOOST_LOG_TRIVIAL(trace) << "OrcaCloudServiceAgent: POST " << url; @@ -2447,7 +2180,7 @@ int OrcaCloudServiceAgent::http_post(const std::string& path, http.header("Authorization", "Bearer " + token); } - http.header("Content-Type", content_type); + http.header("Content-Type", "application/json"); http.set_post_body(body); http.on_complete([&](std::string resp_body, unsigned resp_status) { @@ -2914,28 +2647,19 @@ int OrcaCloudServiceAgent::get_user_print_info(unsigned int* http_code, std::str if (http_code) *http_code = code; - if (result != 0 || code != 200) { - BOOST_LOG_TRIVIAL(error) << "OrcaCloudServiceAgent: get_user_print_info failed - http_code=" << code << ", response=" << response; + if (result != 0 || code != 200) return result != 0 ? result : BAMBU_NETWORK_ERR_GET_SETTING_LIST_FAILED; - } - - BOOST_LOG_TRIVIAL(trace) << "OrcaCloudServiceAgent: get_user_print_info fetched - http_code=" << code << ", response=" << response; try { auto resp_json = nlohmann::json::parse(response); nlohmann::json devices = nlohmann::json::array(); for (const auto& printer : resp_json.value("data", nlohmann::json::array())) { - nlohmann::json device; - std::string role = printer.value("access_role", ""); - - // A printer with the role "view" only has monitoring access for orca cloud. - // The printer is owned by a different person and was shared to the current user without - // any permission to control the printer so we discard this printer. Comment this out if - // OrcaSlicer wants to support view only printers. + const std::string role = printer.value("access_role", ""); if (role.empty() || role == "viewer") continue; + nlohmann::json device; device["dev_id"] = printer.value("id", ""); device["dev_name"] = printer.value("name", ""); if (printer.contains("model") && printer["model"].is_string()) @@ -2949,20 +2673,15 @@ int OrcaCloudServiceAgent::get_user_print_info(unsigned int* http_code, std::str device["task_status"] = status["job"].value("state", ""); } device["dev_online"] = online; - - devices.push_back(device); + devices.push_back(std::move(device)); } if (http_body) { nlohmann::json out; - out["devices"] = devices; + out["devices"] = std::move(devices); *http_body = out.dump(); } - - BOOST_LOG_TRIVIAL(debug) << "OrcaCloudServiceAgent: get_user_print_info parsed - device_count=" << devices.size() - << ", devices=" << devices.dump(); - } catch (const std::exception& e) { - BOOST_LOG_TRIVIAL(error) << "OrcaCloudServiceAgent: get_user_print_info parse exception - " << e.what(); + } catch (const std::exception&) { return BAMBU_NETWORK_ERR_GET_SETTING_LIST_FAILED; } @@ -3047,9 +2766,6 @@ int OrcaCloudServiceAgent::get_camera_url(std::string dev_id, std::function OrcaCloudServiceAgent::create_camera_signaling_channel(const std::string& dev_id) -{ return std::make_unique(this, dev_id); } - int OrcaCloudServiceAgent::get_design_staffpick(int offset, int limit, std::function callback) { BOOST_LOG_TRIVIAL(debug) << "OrcaCloudServiceAgent: get_design_staffpick (stub)"; diff --git a/src/slic3r/Utils/OrcaCloudServiceAgent.hpp b/src/slic3r/Utils/OrcaCloudServiceAgent.hpp index 49c5bbf96e..458aa55fcd 100644 --- a/src/slic3r/Utils/OrcaCloudServiceAgent.hpp +++ b/src/slic3r/Utils/OrcaCloudServiceAgent.hpp @@ -4,11 +4,6 @@ #include "CloudProvider.hpp" #include "ICameraSignalingChannel.hpp" #include "ICloudServiceAgent.hpp" -#include -#include -#include -#include -#include #include "bambu_networking.hpp" #include #include "libslic3r/ProjectTask.hpp" @@ -18,9 +13,6 @@ #include #include #include -#include -#include -#include #include #include #include @@ -28,8 +20,6 @@ #include #include -#include "OrcaMqttConnection.hpp" - class wxSecretStore; namespace Slic3r { @@ -166,8 +156,6 @@ public: // Configuration void configure_urls(AppConfig* app_config); - // Hostname only; cloud REST, MQTT, and WebRTC signaling use fixed TLS - // endpoints on port 443. void set_api_base_url(const std::string& url); void set_auth_base_url(const std::string& url); void set_cloud_base_url(const std::string& url); @@ -223,19 +211,6 @@ public: int add_subscribe(std::vector dev_list) override; int del_subscribe(std::vector dev_list) override; void enable_multi_machine(bool enable) override; - int set_printer_status_callback(OnMessageFn fn); - int send_printer_command(const std::string& dev_id, const std::string& body); - - int upload_gcode_via_cloud(const std::string& dev_id, - const std::string& local_gcode_path, - std::string* job_id, - OnUpdateStatusFn update_fn, - WasCancelledFn cancel_fn); - - int start_cloud_print_job(const std::string& dev_id, - const std::string& job_id, - const std::string& filename, - bool start = true); // ======================================================================== // ICloudServiceAgent Interface Implementation - Settings Synchronization @@ -271,7 +246,7 @@ public: // ICloudServiceAgent Interface Implementation - Model Mall & Publishing // ======================================================================== int get_camera_url(std::string dev_id, std::function callback) override; - std::unique_ptr create_camera_signaling_channel(const std::string& dev_id) override; + // std::unique_ptr create_camera_signaling_channel(const std::string& dev_id) override; int get_design_staffpick(int offset, int limit, std::function callback) override; int start_publish(PublishParams params, OnUpdateStatusFn update_fn, WasCancelledFn cancel_fn, std::string* out) override; int get_model_publish_url(std::string* url) override; @@ -377,29 +352,7 @@ public: static std::string generate_uuid_for_setting_id(const std::string& name, const std::string& user_id = ""); - OrcaMqttConnection* get_mqtt_connection() noexcept { - return mqtt_connection.get(); - } - - const OrcaMqttConnection* get_mqtt_connection() const noexcept { - return mqtt_connection.get(); - } - - // Account-scoped cloud socket: wss:///api/v1/printers/mqtt. - // configure_ blocks for the duration of the initial connect attempt, so callers - // drive it off the UI thread; teardown_ is synchronous. The dev_id argument is - // retained for source compatibility with the printer-agent lifecycle; it does - // not participate in endpoint construction. - int configure_selected_printer_mqtt(const std::string& dev_id, - OrcaMqttConnection::StateHandler state_handler = {}); - void teardown_selected_printer_mqtt(); - // Test hook: the wss:// URL of the current fleet socket ("" when none). - std::string selected_printer_mqtt_url() const; - private: - // Fans one inbound fleet MQTT message out to printer_status_callback. - void deliver_cloud_message(const std::string& dev_id, const std::string& payload); - // Sync protocol helpers int sync_pull( std::function on_success, @@ -423,11 +376,7 @@ private: // HTTP request helpers int http_get(const std::string& path, std::string* response_body, unsigned int* http_code); - int http_post(const std::string& path, - const std::string& body, - std::string* response_body, - unsigned int* http_code, - const std::string& content_type = "application/json"); + int http_post(const std::string& path, const std::string& body, std::string* response_body, unsigned int* http_code); int http_put(const std::string& path, const std::string& body, std::string* response_body, unsigned int* http_code); int http_delete(const std::string& path, std::string* response_body, unsigned int* http_code); std::map data_headers(); @@ -485,9 +434,6 @@ private: std::chrono::system_clock::now().time_since_epoch()).count()}; // Member variables - connection state - std::unique_ptr mqtt_connection; - std::string m_selected_printer_mqtt_url; // guarded by m_selected_url_mutex - mutable std::mutex m_selected_url_mutex; bool is_connected{false}; bool enable_track{false}; bool multi_machine_enabled{false}; @@ -501,7 +447,6 @@ private: AppOnHttpErrorFn on_http_error_fn; GetCountryCodeFn get_country_code_fn; QueueOnMainFn queue_on_main_fn; - OnMessageFn printer_status_callback; mutable std::mutex callback_mutex; // Thread safety diff --git a/src/slic3r/Utils/OrcaCloudSignalingChannel.cpp b/src/slic3r/Utils/OrcaCloudSignalingChannel.cpp deleted file mode 100644 index 3e7b0bfa82..0000000000 --- a/src/slic3r/Utils/OrcaCloudSignalingChannel.cpp +++ /dev/null @@ -1,337 +0,0 @@ -#include "OrcaCloudSignalingChannel.hpp" - -#include "Http.hpp" - -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include - -namespace Slic3r { - -OrcaCloudSignalingChannel::OrcaCloudSignalingChannel(OrcaCloudServiceAgent* cloud, std::string dev_id) - : m_cloud(cloud) - , m_dev_id(std::move(dev_id)) -{ -} - -OrcaCloudSignalingChannel::~OrcaCloudSignalingChannel() -{ - close(); -} - -void OrcaCloudSignalingChannel::open() -{ - bool expected = false; - if (!m_open.compare_exchange_strong(expected, true)) - return; - m_stop.store(false); - m_thread = std::thread([this] { run(); }); -} - -void OrcaCloudSignalingChannel::close() -{ - m_stop.store(true); - std::shared_ptr conn; - Http::Ptr request; - { - std::lock_guard lock(m_mutex); - conn = m_conn; - request = m_inflight_requests; - } - // m_conn is installed only after the live-token request completes, so - // cancel the request independently before waiting for the worker. - if (request) - request->cancel(); - if (conn) { - // Established session: close the socket on the io_context's own thread so - // the pending async_read completes and io_context.run() unwinds. - boost::asio::post(conn->io_context, [conn] { - boost::system::error_code ec; - boost::beast::get_lowest_layer(conn->websocket).cancel(ec); - boost::beast::get_lowest_layer(conn->websocket).close(ec); - }); - // Pre-run() phase (still in the synchronous connect/handshake): best-effort - // direct interruption. - boost::system::error_code ec; - boost::beast::get_lowest_layer(conn->websocket).cancel(ec); - boost::beast::get_lowest_layer(conn->websocket).close(ec); - } - if (m_thread.joinable()) - m_thread.join(); - m_open.store(false); -} - -void OrcaCloudSignalingChannel::send_offer(std::string sdp) -{ - send_json(nlohmann::json{{"type", "webrtc.offer"}, {"sdp", std::move(sdp)}}.dump()); -} - -void OrcaCloudSignalingChannel::send_ice(std::string candidate, std::string mid) -{ - send_json(nlohmann::json{{"type", "webrtc.ice"}, - {"candidate", std::move(candidate)}, - {"sdpMid", std::move(mid)}} - .dump()); -} - -std::string OrcaCloudSignalingChannel::encode_path_component(const std::string& value) -{ - std::ostringstream encoded; - encoded << std::uppercase << std::hex; - for (unsigned char c : value) { - if (std::isalnum(c) || c == '-' || c == '_' || c == '.' || c == '~') - encoded << c; - else - encoded << '%' << std::setw(2) << std::setfill('0') << static_cast(c); - } - return encoded.str(); -} - -void OrcaCloudSignalingChannel::unavailable(CameraUnavailableReason reason, std::string detail) -{ - if (on_unavailable) - on_unavailable(reason, std::move(detail)); -} - -void OrcaCloudSignalingChannel::run() -{ - try { - if (!m_cloud || !m_cloud->ensure_token_fresh("camera")) { - unavailable(CameraUnavailableReason::Error, "Unable to refresh OrcaCloud credentials"); - m_open.store(false); - return; - } - const std::string token = m_cloud->get_access_token(); - // OrcaCloud exposes a bare API hostname. WebRTC signaling uses the - // fixed HTTPS/WSS endpoints on port 443; custom schemes, ports, and - // base paths are not supported by this agent. - const std::string host = m_cloud->get_cloud_service_host(); - if (token.empty() || host.empty()) { - unavailable(CameraUnavailableReason::Error, "OrcaCloud session is unavailable"); - m_open.store(false); - return; - } - - const std::string live_token_url = - "https://" + host + "/api/v1/printers/" + encode_path_component(m_dev_id) + "/live-token"; - BOOST_LOG_TRIVIAL(info) << "signaling: POST " << live_token_url << " (dev_id=" << m_dev_id << ")"; - - nlohmann::json token_response; - std::string token_body; - unsigned int http_code = 0; - - auto request = std::make_shared(Http::post(live_token_url)); - request->set_post_body(std::string("{}")) - .header("Authorization", "Bearer " + token) - .header("Content-Type", "application/json") - .tls_verify(true) - .timeout_max(30) - .on_complete([&token_body, &http_code](std::string body, unsigned status) { - http_code = status; - token_body = std::move(body); - }) - .on_error([&http_code](std::string, std::string, unsigned status) { - http_code = status; - }); - - { - std::lock_guard lock(m_mutex); - m_inflight_requests = request; - } - - // If close() raced with request setup, make sure this request is - // cancelled before entering the blocking call. - if (m_stop.load()) - request->cancel(); - try { - request->perform_sync(); - } catch (...) { - std::lock_guard lock(m_mutex); - if (m_inflight_requests == request) - m_inflight_requests.reset(); - throw; - } - - { - std::lock_guard lock(m_mutex); - if (m_inflight_requests == request) - m_inflight_requests.reset(); - } - - try { - token_response = nlohmann::json::parse(token_body); - } catch (const std::exception&) { - } - if (http_code < 200 || http_code >= 300 || !token_response.contains("token")) { - unavailable(CameraUnavailableReason::Error, "Unable to mint camera live token"); - m_open.store(false); - return; - } - - std::vector ice_servers; - if (token_response.contains("ice_servers") && token_response["ice_servers"].is_array()) { - for (const auto& entry : token_response["ice_servers"]) { - if (entry.is_string()) { - ice_servers.push_back({entry.get(), {}, {}}); - } else if (entry.is_object()) { - // RTCIceServer.urls is "string | string[]" (Cloudflare - // Realtime returns an array). Emit one CameraIceServer per - // URL, sharing the credentials. - const std::string username = entry.value("username", std::string{}); - const std::string credential = entry.value("credential", std::string{}); - const auto add_url = [&](const nlohmann::json& url) { - if (url.is_string() && !url.get().empty()) - ice_servers.push_back({url.get(), username, credential}); - }; - const auto urls = entry.find("urls"); - if (urls != entry.end()) { - if (urls->is_array()) { - for (const auto& url : *urls) - add_url(url); - } else { - add_url(*urls); - } - } - } - } - } - auto conn = std::make_shared(); - conn->ssl_context.set_default_verify_paths(); - Http::add_platform_root_certificates(conn->ssl_context.native_handle()); - { - std::lock_guard lock(m_mutex); - m_conn = conn; - } - auto& websocket = conn->websocket; - boost::asio::ip::tcp::resolver resolver(conn->io_context); - const auto endpoints = resolver.resolve(host, "443"); - boost::asio::connect(boost::beast::get_lowest_layer(websocket), endpoints); - if (!SSL_set_tlsext_host_name(websocket.next_layer().native_handle(), host.c_str())) - throw std::runtime_error("Unable to configure TLS server name"); - websocket.next_layer().set_verify_mode(boost::asio::ssl::verify_peer); - websocket.next_layer().set_verify_callback(boost::asio::ssl::host_name_verification(host)); - websocket.next_layer().handshake(boost::asio::ssl::stream_base::client); - const std::string ws_target = "/api/v1/printers/" + encode_path_component(m_dev_id) + - "/camera/live?token=" + - encode_path_component(token_response["token"].get()); - websocket.handshake(host, ws_target); - BOOST_LOG_TRIVIAL(info) << "signaling: websocket handshake ok (" << ice_servers.size() - << " ice servers)"; - - if (on_ready) - on_ready(std::move(ice_servers)); - send_json(nlohmann::json{{"type", "camera.mode"}, {"mode", "webrtc"}}.dump()); - // Async read loop, driven by the connection's own io_context. run() - // returns once close() has shut the socket down, giving a bounded, - // deadlock-free teardown from any thread. - do_read(conn); - conn->io_context.run(); - } catch (const std::exception& e) { - BOOST_LOG_TRIVIAL(warning) << "signaling: run() exception: " << e.what(); - if (!m_stop.load()) - unavailable(CameraUnavailableReason::Closed, e.what()); - } - { - std::lock_guard lock(m_mutex); - m_conn.reset(); - } - m_open.store(false); -} - -void OrcaCloudSignalingChannel::do_read(std::shared_ptr conn) -{ - auto buffer = std::make_shared(); - conn->websocket.async_read( - *buffer, [this, conn, buffer](boost::system::error_code ec, std::size_t) { - if (ec) { - if (!m_stop.load()) - unavailable(CameraUnavailableReason::Closed, ec.message()); - return; // do not re-arm; io_context.run() unwinds - } - const std::string raw = boost::beast::buffers_to_string(buffer->data()); - // A malformed or unexpectedly-shaped message must not tear down the - // session: parse/dispatch is guarded. - try { - dispatch_message(nlohmann::json::parse(raw), raw); - } catch (const std::exception& e) { - BOOST_LOG_TRIVIAL(warning) << "signaling: ignoring malformed message: " << e.what() - << " raw=" << raw.substr(0, 256); - } - if (!m_stop.load()) - do_read(conn); - }); -} - -// Returns the string at key, or "" if absent or not a string (JSON null included). -static std::string json_string(const nlohmann::json& object, const char* key) -{ - const auto it = object.find(key); - return (it != object.end() && it->is_string()) ? it->get() : std::string{}; -} - -void OrcaCloudSignalingChannel::dispatch_message(const nlohmann::json& message, const std::string& raw) -{ - const std::string type = json_string(message, "type"); - BOOST_LOG_TRIVIAL(info) << "signaling: recv type=" << type << " raw=" << raw.substr(0, 256); - if (type == "webrtc.answer") { - const std::string sdp = json_string(message, "sdp"); - if (on_answer && !sdp.empty()) - on_answer(sdp); - } else if (type == "webrtc.ice" && message.contains("candidate")) { - // The peer may send "candidate" as a flat string or as a nested - // RTCIceCandidateInit object { candidate, sdpMid, sdpMLineIndex }. - const nlohmann::json& candidate = message["candidate"]; - std::string sdp_candidate; - std::string mid = json_string(message, "sdpMid"); - if (candidate.is_string()) { - sdp_candidate = candidate.get(); - } else if (candidate.is_object()) { - sdp_candidate = json_string(candidate, "candidate"); - std::string nested_mid = json_string(candidate, "sdpMid"); - if (!nested_mid.empty()) - mid = std::move(nested_mid); - } - if (on_ice && !sdp_candidate.empty()) - on_ice(sdp_candidate, mid); - } else if (type == "webrtc.unavailable") { - const std::string reason = json_string(message, "reason"); - unavailable(reason == "busy" ? CameraUnavailableReason::Busy - : reason == "disabled" ? CameraUnavailableReason::Disabled - : CameraUnavailableReason::Error, - reason.empty() ? "error" : reason); - } -} - -void OrcaCloudSignalingChannel::send_json(const std::string& message) -{ - std::shared_ptr conn; - { - std::lock_guard lock(m_mutex); - conn = m_conn; - } - if (!conn || m_stop.load()) - return; - // Serialize the write onto the io_context thread (same thread that runs - // async_read), so reads and writes never touch the stream concurrently. - auto payload = std::make_shared(message); - boost::asio::post(conn->io_context, [this, conn, payload] { - if (m_stop.load()) - return; - boost::system::error_code ec; - conn->websocket.write(boost::asio::buffer(*payload), ec); - if (ec && !m_stop.load()) - unavailable(CameraUnavailableReason::Closed, ec.message()); - }); -} - -} // namespace Slic3r diff --git a/src/slic3r/Utils/OrcaCloudSignalingChannel.hpp b/src/slic3r/Utils/OrcaCloudSignalingChannel.hpp deleted file mode 100644 index ff84190853..0000000000 --- a/src/slic3r/Utils/OrcaCloudSignalingChannel.hpp +++ /dev/null @@ -1,66 +0,0 @@ -#pragma once - -#include "ICameraSignalingChannel.hpp" -#include "OrcaCloudServiceAgent.hpp" -#include "Http.hpp" - -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include -#include - -namespace Slic3r { - -class OrcaCloudSignalingChannel : public ICameraSignalingChannel { -public: - OrcaCloudSignalingChannel(OrcaCloudServiceAgent* cloud, std::string dev_id); - ~OrcaCloudSignalingChannel() override; - - void open() override; - void close() override; - void send_offer(std::string sdp) override; - void send_ice(std::string candidate, std::string mid) override; - -private: - using WebSocket = boost::beast::websocket::stream< - boost::beast::ssl_stream>; - - // The io_context and ssl_context must outlive the websocket stream that - // references them. Bundling them here with the stream declared last makes - // the destruction order correct (stream first, then contexts), and lets a - // single shared_ptr own the whole set. - struct Connection { - boost::asio::io_context io_context; - boost::asio::ssl::context ssl_context{boost::asio::ssl::context::tls_client}; - WebSocket websocket{io_context, ssl_context}; - }; - - void run(); - void do_read(std::shared_ptr conn); - void dispatch_message(const nlohmann::json& message, const std::string& raw); - void send_json(const std::string& message); - void unavailable(CameraUnavailableReason reason, std::string detail); - static std::string encode_path_component(const std::string& value); - - OrcaCloudServiceAgent* m_cloud; - - Http::Ptr m_inflight_requests{nullptr}; - - std::string m_dev_id; - std::atomic m_stop{false}; - std::atomic m_open{false}; - std::thread m_thread; - mutable std::mutex m_mutex; - std::shared_ptr m_conn; -}; - -} // namespace Slic3r diff --git a/src/slic3r/Utils/OrcaMqttConnection.cpp b/src/slic3r/Utils/OrcaMqttConnection.cpp deleted file mode 100644 index 0639939e74..0000000000 --- a/src/slic3r/Utils/OrcaMqttConnection.cpp +++ /dev/null @@ -1,805 +0,0 @@ -#include "OrcaMqttConnection.hpp" -#include "Http.hpp" - -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include - -namespace Slic3r { - -struct OrcaMqttConnection::Connection { - boost::asio::io_context io_context; - boost::asio::ssl::context ssl_context; - boost::asio::ip::tcp::resolver resolver; - boost::asio::steady_timer keepalive_timer; - boost::beast::flat_buffer read_buffer; - std::deque>> outbound_packets; - boost::system::error_code terminal_error; - std::atomic_bool async_session_started{false}; - bool write_in_progress{false}; - // Exactly one of these is engaged once ws_handshake() has run: wss for - // wss:// endpoints, ws for plaintext ws://. - std::optional wss; - std::optional ws; - - Connection() - : ssl_context(boost::asio::ssl::context::tls_client) - , resolver(io_context) - , keepalive_timer(io_context) - {} -}; - -namespace { -// Apply / clear a tcp_stream timeout on whichever websocket is engaged. -// Templated on the connection type only because Connection is a private nested -// type: a deduced parameter needs no (inaccessible) name for it. -template void expires_after(Conn& conn, std::chrono::seconds timeout) { - if (conn.wss) boost::beast::get_lowest_layer(*conn.wss).expires_after(timeout); - else if (conn.ws) boost::beast::get_lowest_layer(*conn.ws).expires_after(timeout); -} -template void expires_never(Conn& conn) { - if (conn.wss) boost::beast::get_lowest_layer(*conn.wss).expires_never(); - else if (conn.ws) boost::beast::get_lowest_layer(*conn.ws).expires_never(); -} -} // namespace - -OrcaMqttConnection::~OrcaMqttConnection() { stop(); } - -bool OrcaMqttConnection::start(const Config& config, MessageHandler on_message, StateHandler on_state) { - std::lock_guard lifecycle_lock(lifecycle_mutex); - stop(); - { - std::lock_guard lock(mutex); - current_config = config; - this->on_message = std::move(on_message); - this->on_state = std::move(on_state); - initial_result = false; - initial_completed = false; - connected = false; - m_last_connack_rc.store(-1); - } - stopping.store(false); - worker = std::thread(&OrcaMqttConnection::run, this); - - std::unique_lock lock(mutex); - if (!initial_cv.wait_for(lock, std::chrono::seconds(10), [this] { return initial_completed; })) { - initial_completed = true; - initial_result = false; - } - return initial_result; -} - -void OrcaMqttConnection::stop() { - std::lock_guard lifecycle_lock(lifecycle_mutex); - stopping.store(true); - state_cv.notify_all(); - { - std::lock_guard lock(connection_mutex); - if (active_connection) { - if (active_connection->async_session_started.load()) { - // The worker owns the live WebSocket. Stop dispatching its - // asynchronous operations; the worker closes the socket after - // leaving the event loop. - active_connection->io_context.stop(); - } else { - // Setup still uses synchronous operations on the worker. Wake a - // pending resolve/connect/CONNACK read without competing with a - // live asynchronous session. - auto shutdown_socket = [](auto& websocket) { - auto& socket = boost::beast::get_lowest_layer(websocket).socket(); - boost::system::error_code socket_error; - if (socket.cancel(socket_error)) - return; - if (socket.shutdown(boost::asio::ip::tcp::socket::shutdown_both, socket_error)) - return; - if (socket.close(socket_error)) - return; - }; - if (active_connection->wss) - shutdown_socket(*active_connection->wss); - else if (active_connection->ws) - shutdown_socket(*active_connection->ws); - active_connection->resolver.cancel(); - } - } - } - if (worker.joinable()) - worker.join(); - - { - std::lock_guard lock(mutex); - connected = false; - acknowledged_subscriptions.clear(); - pending_subscribe_packets.clear(); - pending_requests.clear(); - if (!initial_completed) { - initial_completed = true; - initial_result = false; - } - } - initial_cv.notify_all(); -} - -bool OrcaMqttConnection::is_running() const { - return worker.joinable() && !stopping.load(); -} - -void OrcaMqttConnection::flush_subscription_change() { - std::shared_ptr conn; - { - std::lock_guard lock(connection_mutex); - conn = active_connection; - } - bool connacked; - { - std::lock_guard lock(mutex); - connacked = connected; - } - if (!conn || !connacked) - return; // no live MQTT session yet — the worker sends the set on CONNACK - boost::asio::post(conn->io_context, [this, conn] { - if (!stopping.load() && connected.load()) - send_pending_subscriptions(conn); - }); -} - -bool OrcaMqttConnection::subscribe(const std::string& dev_id) { - if (dev_id.empty()) { - return false; - } - const std::string topic = report_topic(dev_id); - if (topic.size() > 96) { // MQTT topic filter cap enforced by the service - return false; - } - { - std::lock_guard lock(mutex); - if (subscriptions.count(topic) != 0 && pending_unsubscriptions.count(topic) == 0) { - return true; - } - subscriptions.insert(topic); - pending_unsubscriptions.erase(topic); - pending_subscriptions.insert(topic); - } - state_cv.notify_all(); - flush_subscription_change(); // ask the worker to emit SUBSCRIBE now (no reconnect) - return true; -} - -bool OrcaMqttConnection::unsubscribe(const std::string& dev_id) { - const std::string topic = report_topic(dev_id); - { - std::lock_guard lock(mutex); - subscriptions.erase(topic); - acknowledged_subscriptions.erase(topic); - pending_subscriptions.erase(topic); - pending_unsubscriptions.insert(topic); - for (auto it = pending_subscribe_packets.begin(); it != pending_subscribe_packets.end();) { - if (it->second == topic) - it = pending_subscribe_packets.erase(it); - else - ++it; - } - for (auto it = pending_requests.begin(); it != pending_requests.end();) { - if (it->first == dev_id) - it = pending_requests.erase(it); - else - ++it; - } - } - state_cv.notify_all(); - flush_subscription_change(); // ask the worker to emit UNSUBSCRIBE now (no reconnect) - return true; -} - -void OrcaMqttConnection::clear_subscriptions() { - std::lock_guard lock(mutex); - subscriptions.clear(); - pending_subscriptions.clear(); - pending_unsubscriptions.clear(); - acknowledged_subscriptions.clear(); - pending_subscribe_packets.clear(); - pending_requests.clear(); -} - -bool OrcaMqttConnection::parse_endpoint(const std::string& url, Endpoint& endpoint) { - std::string rest; - std::string default_port; - if (url.rfind("wss://", 0) == 0) { rest = url.substr(6); default_port = "443"; } - else if (url.rfind("ws://", 0) == 0) { rest = url.substr(5); default_port = "80"; } - else return false; - - const auto slash = rest.find('/'); - const std::string authority = rest.substr(0, slash); - endpoint.target = (slash == std::string::npos) ? "/" : rest.substr(slash); - - // host[:port] — leave an unbracketed IPv6 literal alone - const auto colon = authority.rfind(':'); - if (colon != std::string::npos && authority.find(']') == std::string::npos) { - endpoint.host = authority.substr(0, colon); - endpoint.port = authority.substr(colon + 1); - } else { - endpoint.host = authority; - endpoint.port = default_port; - } - return !endpoint.host.empty() && !endpoint.port.empty() && !endpoint.target.empty(); -} - -void OrcaMqttConnection::append_string(std::vector& packet, const std::string& value) { - if (value.size() > 0xffff) - throw std::runtime_error("MQTT string is too long"); - packet.push_back(static_cast(value.size() >> 8)); - packet.push_back(static_cast(value.size() & 0xff)); - packet.insert(packet.end(), value.begin(), value.end()); -} - -void OrcaMqttConnection::prepend_remaining_length(std::vector& packet, size_t length) { - std::vector encoded; - do { - uint8_t byte = static_cast(length % 128); - length /= 128; - if (length != 0) - byte |= 0x80; - encoded.push_back(byte); - } while (length != 0); - packet.insert(packet.begin() + 1, encoded.begin(), encoded.end()); -} - -std::vector OrcaMqttConnection::make_connect_packet( - const std::string& client_id, const std::string& username, - const std::string& password, int keepalive_seconds) { - std::vector packet{0x10}; - append_string(packet, "MQTT"); - packet.push_back(4); // protocol level 3.1.1 - - uint8_t flags = 0x02; // clean session - if (!username.empty()) { flags |= 0x80; if (!password.empty()) flags |= 0x40; } - packet.push_back(flags); - - packet.push_back(static_cast(keepalive_seconds >> 8)); - packet.push_back(static_cast(keepalive_seconds & 0xff)); - - append_string(packet, client_id.empty() ? "OrcaSlicer" : client_id); - if (!username.empty()) { - append_string(packet, username); - if (!password.empty()) append_string(packet, password); - } - prepend_remaining_length(packet, packet.size() - 1); - return packet; -} - -std::string OrcaMqttConnection::report_topic(const std::string& device_id) { return "device/" + device_id + "/report"; } - -std::string OrcaMqttConnection::request_topic(const std::string& id) { return "device/" + id + "/request"; } - -std::vector OrcaMqttConnection::make_publish_packet(const std::string& topic, const std::string& payload) { - std::vector packet{0x30}; // PUBLISH, QoS 0, no retain - append_string(packet, topic); // no packet id at QoS 0 - packet.insert(packet.end(), payload.begin(), payload.end()); - prepend_remaining_length(packet, packet.size() - 1); - return packet; -} - -std::vector OrcaMqttConnection::make_subscribe_packet(uint16_t id, const std::string& topic, uint8_t qos) { - std::vector packet{0x82}; - packet.push_back(id >> 8); packet.push_back(id & 0xff); - append_string(packet, topic); - packet.push_back(qos); - prepend_remaining_length(packet, packet.size() - 1); - return packet; -} - -std::vector OrcaMqttConnection::make_unsubscribe_packet(uint16_t id, const std::string& topic) { - std::vector packet{0xA2}; - packet.push_back(id >> 8); packet.push_back(id & 0xff); - append_string(packet, topic); - prepend_remaining_length(packet, packet.size() - 1); - return packet; -} - -std::vector OrcaMqttConnection::make_ping_packet() { return {0xc0, 0}; } - -void OrcaMqttConnection::ws_write(Connection& conn, const std::vector& packet) { - if (packet.empty()) { - return; - } - if (conn.wss) { - conn.wss->binary(true); - conn.wss->write(boost::asio::buffer(packet)); - } else if (conn.ws) { - conn.ws->binary(true); - conn.ws->write(boost::asio::buffer(packet)); - } -} - -void OrcaMqttConnection::close_connection(Connection& conn) { - boost::system::error_code error; - if (conn.wss) { - auto& socket = boost::beast::get_lowest_layer(*conn.wss).socket(); - if (socket.cancel(error)) - return; - if (socket.shutdown(boost::asio::ip::tcp::socket::shutdown_both, error)) - return; - if (socket.close(error)) - return; - } else if (conn.ws) { - auto& socket = boost::beast::get_lowest_layer(*conn.ws).socket(); - if (socket.cancel(error)) - return; - if (socket.shutdown(boost::asio::ip::tcp::socket::shutdown_both, error)) - return; - if (socket.close(error)) - return; - } -} - -void OrcaMqttConnection::enqueue_packet(const std::shared_ptr& conn, - std::vector packet) { - if (!conn || packet.empty()) - return; - conn->outbound_packets.emplace_back(std::make_shared>(std::move(packet))); - start_async_write(conn); -} - -void OrcaMqttConnection::start_async_write(const std::shared_ptr& conn) { - if (!conn || conn->write_in_progress || conn->outbound_packets.empty() || stopping.load()) - return; - - conn->write_in_progress = true; - const auto packet = conn->outbound_packets.front(); - auto on_write = [this, conn](const boost::system::error_code& error, std::size_t) { - conn->write_in_progress = false; - if (error) { - if (!stopping.load()) - conn->terminal_error = error; - conn->io_context.stop(); - return; - } - conn->outbound_packets.pop_front(); - start_async_write(conn); - }; - if (conn->wss) { - conn->wss->binary(true); - conn->wss->async_write(boost::asio::buffer(*packet), std::move(on_write)); - } else if (conn->ws) { - conn->ws->binary(true); - conn->ws->async_write(boost::asio::buffer(*packet), std::move(on_write)); - } else { - conn->write_in_progress = false; - conn->outbound_packets.pop_front(); - } -} - -void OrcaMqttConnection::start_async_read(const std::shared_ptr& conn) { - if (!conn || stopping.load()) - return; - - auto on_read = [this, conn](const boost::system::error_code& error, std::size_t) { - if (error) { - if (!stopping.load()) - conn->terminal_error = error; - conn->io_context.stop(); - return; - } - const std::string packet = boost::beast::buffers_to_string(conn->read_buffer.data()); - conn->read_buffer.consume(conn->read_buffer.size()); - handle_packet(packet); - start_async_read(conn); - }; - if (conn->wss) - conn->wss->async_read(conn->read_buffer, std::move(on_read)); - else if (conn->ws) - conn->ws->async_read(conn->read_buffer, std::move(on_read)); -} - -void OrcaMqttConnection::schedule_keepalive(const std::shared_ptr& conn) { - const int keepalive = current_config.keepalive_seconds; - if (!conn || keepalive <= 0 || stopping.load()) - return; - - conn->keepalive_timer.expires_after(std::chrono::seconds(std::max(1, keepalive / 2))); - conn->keepalive_timer.async_wait([this, conn](const boost::system::error_code& error) { - if (error || stopping.load()) - return; - enqueue_packet(conn, make_ping_packet()); - schedule_keepalive(conn); - }); -} - -void OrcaMqttConnection::post_packet(const std::shared_ptr& conn, - std::vector packet) { - if (!conn || packet.empty()) - return; - boost::asio::post(conn->io_context, [this, conn, packet = std::move(packet)]() mutable { - if (!stopping.load()) - enqueue_packet(conn, std::move(packet)); - }); -} - -std::size_t OrcaMqttConnection::ws_read(Connection& conn, boost::beast::flat_buffer& buffer, - boost::system::error_code& ec) { - if (conn.wss) - return conn.wss->read(buffer, ec); - if (conn.ws) - return conn.ws->read(buffer, ec); - ec = boost::asio::error::not_connected; - return 0; -} - -void OrcaMqttConnection::ws_handshake(Connection& conn, const Config& config, const Endpoint& endpoint) { - const auto results = conn.resolver.resolve(endpoint.host, endpoint.port); - - std::string token; - if (config.bearer_provider) { - token = config.bearer_provider(); - } - auto decorator = [token](boost::beast::websocket::request_type& request) { - request.set(boost::beast::http::field::user_agent, "OrcaSlicer"); - if (!token.empty()) - request.set(boost::beast::http::field::authorization, "Bearer " + token); - request.set("Sec-WebSocket-Protocol", "mqtt"); - }; - boost::beast::http::response response; - boost::system::error_code handshake_error; - - if (config.use_tls) { - // stop() inspects the engaged optional under connection_mutex; publish it - // under the same lock, then release before the blocking connect. - { - std::lock_guard lock(connection_mutex); - conn.wss.emplace(conn.io_context, conn.ssl_context); - } - auto& websocket = *conn.wss; - auto& stream = boost::beast::get_lowest_layer(websocket); - stream.expires_after(std::chrono::seconds(10)); - stream.connect(results); - // Set SNI before the TLS handshake so the cloud edge selects the correct - // certificate. - auto& tls_stream = websocket.next_layer(); - if (!SSL_set_tlsext_host_name(tls_stream.native_handle(), endpoint.host.c_str())) - throw std::runtime_error("failed to set Orca Cloud TLS server name"); - if (!config.ca_file.empty()) - conn.ssl_context.load_verify_file(config.ca_file); - else - conn.ssl_context.set_default_verify_paths(); - Http::add_platform_root_certificates(conn.ssl_context.native_handle()); - tls_stream.set_verify_mode(boost::asio::ssl::verify_peer); - tls_stream.set_verify_callback(boost::asio::ssl::host_name_verification(endpoint.host)); - tls_stream.handshake(boost::asio::ssl::stream_base::client); - websocket.set_option(boost::beast::websocket::stream_base::decorator(decorator)); - websocket.handshake(response, endpoint.host, endpoint.target, handshake_error); - } else { - { - std::lock_guard lock(connection_mutex); - conn.ws.emplace(conn.io_context); - } - auto& websocket = *conn.ws; - auto& stream = boost::beast::get_lowest_layer(websocket); - stream.expires_after(std::chrono::seconds(10)); - stream.connect(results); - websocket.set_option(boost::beast::websocket::stream_base::decorator(decorator)); - websocket.handshake(response, endpoint.host, endpoint.target, handshake_error); - } - - if (handshake_error) { - throw boost::system::system_error(handshake_error, "Orca WebSocket handshake"); - } - if (response["Sec-WebSocket-Protocol"] != "mqtt") { - throw std::runtime_error("Orca WebSocket did not negotiate MQTT"); - } -} - -bool OrcaMqttConnection::send_request(const std::string& dev_id, const std::string& payload) { - if (dev_id.empty()) { - return false; - } - if (!connected.load()) { - return false; - } - std::shared_ptr conn; - { - std::lock_guard lock(connection_mutex); - conn = active_connection; - } - if (!conn) { - return false; - } - const std::string report = report_topic(dev_id); - { - std::lock_guard lock(mutex); - if (subscriptions.count(report) != 0 && acknowledged_subscriptions.count(report) == 0) { - pending_requests.emplace_back(dev_id, payload); - return true; - } - } - post_packet(conn, make_publish_packet(request_topic(dev_id), payload)); - return true; -} - -void OrcaMqttConnection::connect_and_read() { - auto connection = std::make_shared(); - { - std::lock_guard lock(connection_mutex); - active_connection = connection; - if (stopping.load()) { - active_connection.reset(); - return; - } - } - - auto clear_connection = [this, connection] { - close_connection(*connection); - std::lock_guard lock(connection_mutex); - if (active_connection == connection) - active_connection.reset(); - }; - - try { - Endpoint endpoint; - if (!parse_endpoint(current_config.url, endpoint)) { - throw std::runtime_error("invalid Orca Cloud WebSocket endpoint"); - } - - - ws_handshake(*connection, current_config, endpoint); - - // Auth precedence: a bearer_provider authenticates the WebSocket upgrade, so the - // CONNECT username/password fields are omitted entirely (the cloud form). - const bool use_bearer = static_cast(current_config.bearer_provider); - ws_write(*connection, make_connect_packet(current_config.client_id, - use_bearer ? std::string() : current_config.username, - use_bearer ? std::string() : current_config.password, - current_config.keepalive_seconds)); - - boost::beast::flat_buffer buffer; - expires_after(*connection, std::chrono::seconds(10)); - boost::system::error_code connack_error; - ws_read(*connection, buffer, connack_error); - if (connack_error) - throw boost::system::system_error(connack_error, "read Orca MQTT CONNACK"); - // Beast leaves this expiry armed after the synchronous CONNACK read above; - // disable it before starting the long-lived async WebSocket session. - expires_never(*connection); - const std::string connack = boost::beast::buffers_to_string(buffer.data()); - // rc: 0 accepted, 1..5 refusal, -1 malformed/not a CONNACK. - const int rc = (connack.size() == 4 && static_cast(connack[0]) == 0x20) - ? static_cast(static_cast(connack[3])) - : -1; - m_last_connack_rc.store(rc); - if (rc != 0) { - if (rc == 4 || rc == 5) { - // Bad credentials / not authorized — retrying cannot help. Make run()'s - // loop exit and unblock any waiting start(). - stopping.store(true); - { - std::lock_guard lock(mutex); - initial_completed = true; - initial_result = false; - } - initial_cv.notify_all(); - } - throw std::runtime_error("Orca MQTT CONNECT refused rc=" + std::to_string(rc)); - } - - // The subscription acknowledgement belongs to this MQTT session. Clear - // the previous session's state before notifying the owner, because the - // reconnect callback immediately queues the printer's initial requests. - { - std::lock_guard lock(mutex); - acknowledged_subscriptions.clear(); - pending_subscribe_packets.clear(); - } - connection->async_session_started.store(true); - notify_state(true); - reconnect_delay_seconds.store(1); // a fresh CONNACK resets the backoff - send_current_subscriptions(connection); - start_async_read(connection); - schedule_keepalive(connection); - const std::size_t handlers_run = connection->io_context.run(); - if (handlers_run == 0 && !stopping.load()) - throw std::runtime_error("Orca MQTT event loop stopped unexpectedly"); - if (connection->terminal_error && !stopping.load()) - throw boost::system::system_error(connection->terminal_error, "read Orca MQTT message"); - clear_connection(); - if (!stopping.load()) - notify_state(false); - } catch (...) { - clear_connection(); - throw; - } -} - -void OrcaMqttConnection::send_current_subscriptions(const std::shared_ptr& conn) { - std::vector topics; - { - std::lock_guard lock(mutex); - topics.assign(subscriptions.begin(), subscriptions.end()); - acknowledged_subscriptions.clear(); - pending_subscribe_packets.clear(); - for (const std::string& topic : topics) - pending_subscriptions.erase(topic); - } - for (const std::string& topic : topics) { - const uint16_t packet_id = next_packet_id++; - { - std::lock_guard lock(mutex); - pending_subscribe_packets[packet_id] = topic; - } - enqueue_packet(conn, make_subscribe_packet(packet_id, topic, 1)); - } -} - -void OrcaMqttConnection::send_pending_subscriptions(const std::shared_ptr& conn) { - std::vector subscribe_topics; - std::vector unsubscribe_topics; - { - std::lock_guard lock(mutex); - subscribe_topics.assign(pending_subscriptions.begin(), pending_subscriptions.end()); - unsubscribe_topics.assign(pending_unsubscriptions.begin(), pending_unsubscriptions.end()); - pending_subscriptions.clear(); - pending_unsubscriptions.clear(); - } - for (const std::string& topic : subscribe_topics) { - const uint16_t packet_id = next_packet_id++; - { - std::lock_guard lock(mutex); - pending_subscribe_packets[packet_id] = topic; - } - enqueue_packet(conn, make_subscribe_packet(packet_id, topic, 1)); - } - for (const std::string& topic : unsubscribe_topics) { - const uint16_t packet_id = next_packet_id++; - enqueue_packet(conn, make_unsubscribe_packet(packet_id, topic)); - } -} - -void OrcaMqttConnection::handle_packet(const std::string& packet) { - if (packet.size() < 2) { - return; - } - const uint8_t header = static_cast(packet[0]); - const uint8_t packet_type = header >> 4; - if (packet_type != 3) { // Only QoS 0 PUBLISH carries printer status. - if (packet_type == 9 && packet.size() >= 5) { - const uint16_t packet_id = (static_cast(static_cast(packet[2])) << 8) | - static_cast(static_cast(packet[3])); - std::ostringstream result_codes; - for (size_t index = 4; index < packet.size(); ++index) { - if (index != 4) - result_codes << ','; - result_codes << "0x" << std::hex << static_cast(static_cast(packet[index])); - } - - // Each production SUBSCRIBE packet currently contains one topic. - // MQTT grants QoS 0 or 1 for a requested QoS 1 subscription; 0x80 - // means the subscription was rejected. - const uint8_t result = static_cast(packet[4]); - std::string topic; - std::deque> requests; - { - std::lock_guard lock(mutex); - auto pending = pending_subscribe_packets.find(packet_id); - if (pending != pending_subscribe_packets.end()) { - topic = pending->second; - pending_subscribe_packets.erase(pending); - for (auto it = pending_requests.begin(); it != pending_requests.end();) { - if (report_topic(it->first) == topic) { - requests.push_back(std::move(*it)); - it = pending_requests.erase(it); - } else { - ++it; - } - } - if (result == 0 || result == 1) { - acknowledged_subscriptions.insert(topic); - } - } - } - if (topic.empty()) { - } else if (result == 0 || result == 1) { - for (const auto& request : requests) { - if (!send_request(request.first, request.second)) { - } - } - } else { - } - } - return; - } - size_t index = 1; - size_t multiplier = 1; - size_t remaining = 0; - uint8_t encoded = 0; - do { - if (index >= packet.size() || multiplier > 128 * 128 * 128) { - return; - } - encoded = static_cast(packet[index++]); - remaining += (encoded & 0x7f) * multiplier; - multiplier *= 128; - } while ((encoded & 0x80) != 0); - const size_t remaining_end = index + remaining; - if (remaining_end > packet.size() || remaining < 2 || index + 2 > remaining_end) { - return; - } - const uint16_t topic_length = (static_cast(packet[index]) << 8) | - static_cast(packet[index + 1]); - index += 2; - if (topic_length > packet.size() - index) { - return; - } - const std::string topic(packet.data() + index, topic_length); - index += topic_length; - if (((header >> 1) & 0x03) != 0) { - if (index + 2 > remaining_end) { - return; - } - index += 2; // QoS 1/2 packet identifier; the service currently sends QoS 0. - } - const size_t payload_size = remaining_end - index; - // topic is "device//report" (or "/request"); hand the id up, drop anything else. - std::string dev_id; - if (topic.rfind("device/", 0) == 0) { - const size_t id_start = 7; - const size_t id_end = topic.rfind('/'); - if (id_end != std::string::npos && id_end > id_start) - dev_id = topic.substr(id_start, id_end - id_start); - } - if (dev_id.empty()) { - } else if (on_message) { - on_message(dev_id, packet.substr(index, remaining_end - index)); - } else { - } -} - -void OrcaMqttConnection::notify_state(bool is_now_connected) { - StateHandler callback; - bool initial = false; - { - std::lock_guard lock(mutex); - connected = is_now_connected; - initial = !initial_completed; - if (initial) { - initial_result = is_now_connected; - initial_completed = true; - } - callback = on_state; - } - if (initial) - initial_cv.notify_all(); - else if (callback) - callback(is_now_connected, false); -} - -void OrcaMqttConnection::run() { - while (!stopping.load()) { - const int retry_seconds = reconnect_delay_seconds.load(); - const uint64_t attempt = ++m_attempt_number; - try { - connect_and_read(); - } catch (const std::exception& error) { - if (!stopping.load()) - notify_state(false); - } - if (stopping.load()) - break; - // Grow the backoff only across attempts that never reached CONNACK; a - // successful connection resets reconnect_delay_seconds to 1 (connect_and_read). - reconnect_delay_seconds.store(std::min(retry_seconds * 2, 30)); - std::unique_lock lock(mutex); - state_cv.wait_for(lock, std::chrono::seconds(retry_seconds), [this] { return stopping.load(); }); - } -} - -} // namespace Slic3r diff --git a/src/slic3r/Utils/OrcaMqttConnection.hpp b/src/slic3r/Utils/OrcaMqttConnection.hpp deleted file mode 100644 index 1565542f69..0000000000 --- a/src/slic3r/Utils/OrcaMqttConnection.hpp +++ /dev/null @@ -1,155 +0,0 @@ -#ifndef slic3r_OrcaMqttConnection_hpp_ -#define slic3r_OrcaMqttConnection_hpp_ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace Slic3r { - -// Minimal MQTT 3.1.1 codec + WebSocket transport (ws:// and wss://), shared by the -// LAN (OrcaSonar) and cloud (fleet) printer connections. Both PUBLISH -// commands to device//request and SUBSCRIBE device//report; Config is the -// only per-transport difference. -class OrcaMqttConnection -{ -public: - using TokenProvider = std::function; - using MessageHandler = std::function; - using StateHandler = std::function; - - struct Endpoint { std::string host; std::string port; std::string target; }; - - struct Config { - std::string url; - bool use_tls = false; - std::string ca_file; - TokenProvider bearer_provider; // set => bearer on WS upgrade, CONNECT creds omitted - std::string username; - std::string password; - std::string client_id = "OrcaSlicer"; - int keepalive_seconds = 60; - }; - - static bool parse_endpoint(const std::string& url, Endpoint& endpoint); - - // Build an MQTT 3.1.1 CONNECT packet. Clean-session is always set; the - // username/password connect flags and payload fields are added only when - // username is non-empty (the cloud form authenticates via a bearer on the - // WebSocket upgrade and omits CONNECT credentials). Public for unit tests. - static std::vector make_connect_packet(const std::string& client_id, - const std::string& username, - const std::string& password, - int keepalive_seconds); - - // Topic-string helpers for the per-device request/report channels and the - // MQTT 3.1.1 PUBLISH / SUBSCRIBE / UNSUBSCRIBE packet builders. All public - // for unit tests. make_publish_packet emits QoS 0 (no packet identifier). - static std::string request_topic(const std::string& dev_id); // "device//request" - static std::string report_topic(const std::string& dev_id); // "device//report" - static std::vector make_publish_packet(const std::string& topic, const std::string& payload); - static std::vector make_subscribe_packet(uint16_t packet_id, const std::string& topic, uint8_t qos); - static std::vector make_unsubscribe_packet(uint16_t packet_id, const std::string& topic); - - ~OrcaMqttConnection(); - - bool start(const Config& config, MessageHandler on_message, StateHandler on_state); - void stop(); - // True while the worker thread is alive (connected OR retrying). Lets callers - // avoid restarting a healthy connection. - bool is_running() const; - // True once CONNACK has been received and the socket has not since dropped. - bool is_connected() const { return connected.load(); } - bool subscribe(const std::string& dev_id); - bool unsubscribe(const std::string& dev_id); - // Last MQTT CONNACK return code: 0 ok, 1..5 refusal, -1 none seen this attempt. - int last_connack_rc() const { return m_last_connack_rc.load(); } - void clear_subscriptions(); - bool send_request(const std::string& dev_id, const std::string& payload); - -private: - // The endpoint may be either a TLS (wss://) or a plaintext (ws://) WebSocket; - // Connection holds whichever one is engaged and the ws_* helpers below - // dispatch on it. - using TlsWebSocket = boost::beast::websocket::stream< - boost::asio::ssl::stream>; - using PlainWebSocket = boost::beast::websocket::stream; - struct Connection; - - static void append_string(std::vector& packet, const std::string& value); - static void prepend_remaining_length(std::vector& packet, size_t length); - static std::vector make_ping_packet(); - - // Transport dispatch: each forwards to conn.wss (TLS) or conn.ws (plaintext). - // These synchronous operations are called only by the MQTT worker during - // connection setup. Once the MQTT session is established, all socket I/O is - // asynchronous and owned by that worker's io_context. - void ws_write(Connection& conn, const std::vector& packet); - std::size_t ws_read(Connection& conn, boost::beast::flat_buffer& buffer, boost::system::error_code& ec); - void ws_handshake(Connection& conn, const Config& config, const Endpoint& endpoint); - void close_connection(Connection& conn); - void enqueue_packet(const std::shared_ptr& conn, std::vector packet); - void start_async_write(const std::shared_ptr& conn); - void start_async_read(const std::shared_ptr& conn); - void schedule_keepalive(const std::shared_ptr& conn); - void post_packet(const std::shared_ptr& conn, std::vector packet); - // Ask the MQTT worker to emit subscription changes on its own io_context. - void flush_subscription_change(); - void connect_and_read(); - void send_current_subscriptions(const std::shared_ptr& conn); - void send_pending_subscriptions(const std::shared_ptr& conn); - void handle_packet(const std::string& packet); - void notify_state(bool is_now_connected); - void run(); - - std::atomic_bool stopping{true}; - std::atomic_int reconnect_delay_seconds{1}; - // Serialises the whole of start() and stop() against each other, so the UI - // thread's stop() (disconnect / dtor) cannot race the connect thread's start() - // into a concurrent worker.join(). Recursive because start() calls stop(). - std::recursive_mutex lifecycle_mutex; - std::thread worker; - std::mutex mutex; - std::mutex connection_mutex; - std::shared_ptr active_connection; - std::condition_variable initial_cv; - std::condition_variable state_cv; - Config current_config; - MessageHandler on_message; - StateHandler on_state; - // Full report-topic strings ("device//report"), not bare device ids. - std::set subscriptions; - std::set pending_subscriptions; - std::set pending_unsubscriptions; - // Requests for a subscribed device wait until the corresponding SUBACK is - // received. Otherwise an immediate pushall response can be published by - // the broker before this client is actually subscribed to the report topic. - std::set acknowledged_subscriptions; - std::map pending_subscribe_packets; - std::deque> pending_requests; - std::atomic next_packet_id{1}; - std::atomic m_last_connack_rc{-1}; - uint64_t m_attempt_number{0}; // worker-thread diagnostic sequence - bool initial_result{false}; - bool initial_completed{false}; - std::atomic_bool connected{false}; -}; - -} // namespace Slic3r - -#endif // slic3r_OrcaMqttConnection_hpp_ diff --git a/src/slic3r/Utils/OrcaPrinterAgent.cpp b/src/slic3r/Utils/OrcaPrinterAgent.cpp index 63f8158663..cb8b38acc8 100644 --- a/src/slic3r/Utils/OrcaPrinterAgent.cpp +++ b/src/slic3r/Utils/OrcaPrinterAgent.cpp @@ -1,1248 +1,63 @@ #include "OrcaPrinterAgent.hpp" - #include "IPrinterAgent.hpp" -#include "Http.hpp" #include "NetworkAgentFactory.hpp" -#include "OrcaCloudServiceAgent.hpp" -#include "bambu_networking.hpp" - -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include #include #include +#include +#include "bambu_networking.hpp" namespace Slic3r { const std::string OrcaPrinterAgent_VERSION = "0.0.1"; -namespace { - -namespace fs = boost::filesystem; - -// params.filename is normally the exported .3mf archive; the sliced G-code sits -// beside it with the same stem (".12345.0.3mf" -> ".12345.0.gcode"). params.dst_file, -// when set, already points straight at a file (the "print a file already on the -// card" flow), so it wins. -std::string resolve_local_gcode_path(const PrintParams& params) +OrcaPrinterAgent::OrcaPrinterAgent(std::string log_dir) : log_dir(std::move(log_dir)) { - if (!params.dst_file.empty()) - return params.dst_file; - - std::string path = params.filename; - if (boost::iends_with(path, ".3mf")) - path.replace(path.size() - 4, 4, ".gcode"); - return path; } -// The name the file is stored as under the printer's `gcodes` root, and the value -// passed to OrcaSonar's print.gcode_file `param`. Must be a pure function of params -// so start_local_print's upload and start_sdcard_print's start agree on it. -// OrcaSonar rejects newlines, ';', '#', '*' and NUL in the path, and Klipper's -// SDCARD_PRINT_FILE splits its argument on whitespace, so collapse anything unsafe. -std::string remote_gcode_name(const PrintParams& params) -{ - std::string name = params.project_name.empty() ? fs::path(resolve_local_gcode_path(params)).filename().string() : - fs::path(params.project_name).filename().string(); - - if (boost::iends_with(name, ".3mf")) // "model.gcode.3mf" -> "model.gcode" - name.erase(name.size() - 4); - - std::replace_if( - name.begin(), name.end(), - [](unsigned char c) { return std::isspace(c) != 0 || c == ';' || c == '#' || c == '*' || c == '/' || c == '\\'; }, '_'); - - if (name.empty()) - name = "orca_print"; - if (!boost::iends_with(name, ".gcode")) - name += ".gcode"; - return name; -} - -// http(s) origin of the Moonraker-compatible upload facade, derived from the live -// LAN MQTT session URL ("ws://host:port/mqtt" -> "http://host:port"). Used only as -// a fallback when the print job carries no dev_ip of its own. -std::string http_origin_from_lan_ws(const std::string& ws_url) -{ - if (ws_url.empty()) - return {}; - std::string s = ws_url; - if (boost::istarts_with(s, "wss://")) - s = "https://" + s.substr(6); - else if (boost::istarts_with(s, "ws://")) - s = "http://" + s.substr(5); - const auto scheme = s.find("://"); - if (scheme != std::string::npos) { - if (const auto slash = s.find('/', scheme + 3); slash != std::string::npos) - s.erase(slash); - } - return s; -} - -// print.gcode_file is non-idempotent and OrcaSonar replays a cached response for a -// reused (namespace, command, sequence_id). Seed from the wall clock so ids do not -// collide across slicer restarts, then bump once per call within a run. -std::string next_gcode_file_sequence_id() -{ - static std::atomic counter{[] { - const auto now = std::chrono::system_clock::now().time_since_epoch(); - return static_cast(std::chrono::duration_cast(now).count()); - }()}; - return std::to_string(counter.fetch_add(1, std::memory_order_relaxed)); -} - -static constexpr const char* ORCASONAR_FALLBACK = "orcasonar"; - -bool fetch_orcasonar_body(const std::string& url, std::string& body) -{ - bool ok = false; - Http::get(url) - .timeout_connect(4) - .timeout_max(6) - .on_complete([&](std::string b, unsigned status) { - if (status == 200) { - body = std::move(b); - ok = true; - } - }) - .on_error([&](std::string, std::string err, unsigned status) { - BOOST_LOG_TRIVIAL(info) << "OrcaPrinterAgent: identity probe " << url << " failed status=" << status << " err=" << err; - }) - .perform_sync(); - return ok; -} - -std::string extract_line_value(const std::string& body, const std::string& key) -{ - const auto pos = body.find(key); - if (pos == std::string::npos) - return {}; - const auto value_start = pos + key.size(); - const auto value_end = body.find('\n', value_start); - std::string value = body.substr(value_start, value_end == std::string::npos ? std::string::npos : value_end - value_start); - boost::trim(value); - return value; -} - -// Manual binding uses the OrcaSonar landing page as its sole identity source. -// The page returns device_id and may return device_name/model_id. -bool probe_orcasonar_landing_page( - const std::string& host, const std::string& port, std::string& device_id, std::string& device_name, std::string& model_id) -{ - device_name = ORCASONAR_FALLBACK; - model_id = ORCASONAR_FALLBACK; - - std::string body; - if (fetch_orcasonar_body("http://" + host + ":" + port + "/", body)) { - device_id = extract_line_value(body, "device_id="); - const std::string name = extract_line_value(body, "device_name="); - const std::string model = extract_line_value(body, "model_id="); - if (!name.empty()) - device_name = name; - if (!model.empty()) - model_id = model; - if (!device_id.empty()) - return true; - } - - return false; -} - -// SSDP discovery uses the LOCATION URL's UPnP device description as its sole -// identity source. OrcaSonar maps device_id/device_name/model_id to UDN, -// friendlyName, and modelNumber respectively. -bool parse_orcasonar_device_xml(const std::string& body, std::string& device_id, std::string& device_name, std::string& model_id) -{ - device_name = ORCASONAR_FALLBACK; - model_id = ORCASONAR_FALLBACK; - - try { - boost::property_tree::ptree tree; - std::istringstream stream(body); - boost::property_tree::read_xml(stream, tree, boost::property_tree::xml_parser::trim_whitespace); - const auto device = tree.get_child_optional("root.device"); - if (!device) - return false; - - std::string udn = device->get("UDN", ""); - boost::trim(udn); - if (boost::istarts_with(udn, "uuid:")) - device_id = udn.substr(5); - else - device_id = device->get("device_id", ""); - boost::trim(device_id); - if (device_id.empty()) - return false; - - device_name = device->get("friendlyName", ""); - if (device_name.empty()) - device_name = device->get("device_name", ORCASONAR_FALLBACK); - model_id = device->get("modelNumber", ""); - if (model_id.empty()) - model_id = device->get("model_id", ORCASONAR_FALLBACK); - boost::trim(device_name); - boost::trim(model_id); - if (device_name.empty()) - device_name = ORCASONAR_FALLBACK; - if (model_id.empty()) - model_id = ORCASONAR_FALLBACK; - return true; - } catch (const std::exception& error) { - BOOST_LOG_TRIVIAL(info) << "OrcaPrinterAgent: failed to parse OrcaSonar device.xml: " << error.what(); - return false; - } -} - -bool probe_orcasonar_device_xml(const std::string& location, std::string& device_id, std::string& device_name, std::string& model_id) -{ - std::string body; - return fetch_orcasonar_body(location, body) && parse_orcasonar_device_xml(body, device_id, device_name, model_id); -} -} // namespace - -class OrcaPrinterAgent::OrcaSonarDiscovery -{ -public: - using EmitFn = std::function; - - explicit OrcaSonarDiscovery(EmitFn emit) : m_emit(std::move(emit)) {} - ~OrcaSonarDiscovery() { stop(); } - - OrcaSonarDiscovery(const OrcaSonarDiscovery&) = delete; - OrcaSonarDiscovery& operator=(const OrcaSonarDiscovery&) = delete; - - void start() - { - std::lock_guard lock(m_lifecycle_mutex); - if (m_running.exchange(true)) - return; - m_thread = std::thread(&OrcaSonarDiscovery::browse_loop, this); - } - - void stop() - { - std::lock_guard lock(m_lifecycle_mutex); - if (!m_running.exchange(false)) - return; - m_wait_cv.notify_all(); - if (m_thread.joinable()) - m_thread.join(); - } - -private: - static std::string lower_ascii(std::string value) - { - std::transform(value.begin(), value.end(), value.begin(), [](unsigned char c) { return static_cast(std::tolower(c)); }); - return value; - } - - static std::string trim_ascii(const std::string& value) - { - const auto first = value.find_first_not_of(" \t\r\n"); - if (first == std::string::npos) - return {}; - const auto last = value.find_last_not_of(" \t\r\n"); - return value.substr(first, last - first + 1); - } - - static bool get_header(const std::string& datagram, const std::string& header_name, std::string& value) - { - std::size_t line_start = 0; - while (line_start < datagram.size()) { - const std::size_t line_end = datagram.find('\n', line_start); - const std::string line = datagram.substr(line_start, line_end == std::string::npos ? std::string::npos : line_end - line_start); - line_start = line_end == std::string::npos ? datagram.size() : line_end + 1; - - const std::size_t colon = line.find(':'); - if (colon == std::string::npos) - continue; - if (lower_ascii(trim_ascii(line.substr(0, colon))) != lower_ascii(header_name)) - continue; - value = trim_ascii(line.substr(colon + 1)); - return !value.empty(); - } - return false; - } - - static bool make_machine_alive_json(const std::string& usn, const std::string& host, const std::string& location, std::string& json) - { - const std::string lower_usn = lower_ascii(usn); - static const std::string uuid_prefix = "uuid:"; - static const std::string device_type = "::urn:schemas-upnp-org:device:basic:1"; - if (lower_usn.rfind(uuid_prefix, 0) != 0) - return false; - - const std::size_t type_start = lower_usn.find(device_type, uuid_prefix.size()); - if (type_start == std::string::npos) - return false; - if (host.empty()) - return false; - - const std::string lower_location = lower_ascii(location); - const std::size_t scheme_end = lower_location.find("://"); - if (scheme_end == std::string::npos) - return false; - const std::size_t authority_start = scheme_end + 3; - const std::size_t authority_end = location.find_first_of("/ ?#", authority_start); - const std::string authority = location.substr(authority_start, authority_end == std::string::npos ? - std::string::npos : - authority_end - authority_start); - std::string port = "8280"; - if (!authority.empty()) { - if (authority.front() == '[') { - const std::size_t bracket = authority.find(']'); - if (bracket != std::string::npos && bracket + 1 < authority.size() && authority[bracket + 1] == ':') - port = authority.substr(bracket + 2); - } else { - const std::size_t colon = authority.rfind(':'); - if (colon != std::string::npos && colon + 1 < authority.size()) - port = authority.substr(colon + 1); - } - } - if (port.empty() || port.find_first_not_of("0123456789") != std::string::npos) - return false; - - // SSDP LOCATION commonly advertises the device's mDNS name (for - // example, http://orcasonar-123.local:8280/upnp/device.xml). The - // discovery response already gives us the sender's reachable address, - // so use that address for the HTTP probe instead of requiring the - // platform HTTP client to resolve .local. Keep the advertised path so - // this remains compatible with non-default device-description URLs. - const std::string location_path = authority_end == std::string::npos ? "/" : location.substr(authority_end); - const std::string probe_host = host.find(':') == std::string::npos ? host : "[" + host + "]"; - const std::string probe_url = location.substr(0, scheme_end + 3) + probe_host + ":" + port + location_path; - - std::string device_id; - std::string device_name; - std::string model_id; - if (!probe_orcasonar_device_xml(probe_url, device_id, device_name, model_id)) - return false; - - nlohmann::json machine; - machine["dev_name"] = device_name; - machine["dev_id"] = device_id; - machine["dev_type"] = model_id; - machine["connection_name"] = device_id; - machine["dev_ip"] = host + ":" + port; - - machine["dev_signal"] = "0"; - machine["connect_type"] = "lan"; - machine["bind_state"] = "free"; - machine["sec_link"] = "secure"; - machine["ssdp_version"] = "v1"; - json = machine.dump(); - return true; - } - - void ssdp_round() - { - namespace asio = boost::asio; - using asio::ip::udp; - try { - asio::io_context io_context; - udp::socket socket(io_context); - socket.open(udp::v4()); - socket.set_option(udp::socket::reuse_address(true)); - socket.bind(udp::endpoint(udp::v4(), 0)); - socket.non_blocking(true); - - static constexpr char search_request[] = "M-SEARCH * HTTP/1.1\r\n" - "HOST: 239.255.255.250:1900\r\n" - "MAN: \"ssdp:discover\"\r\n" - "MX: 2\r\n" - "ST: urn:schemas-upnp-org:device:Basic:1\r\n" - "\r\n"; - const auto multicast = asio::ip::make_address_v4("239.255.255.250"); - socket.send_to(asio::buffer(search_request, sizeof(search_request) - 1), udp::endpoint(multicast, 1900)); - - std::array buffer{}; - udp::endpoint sender; - std::set seen_ids; - const auto deadline = std::chrono::steady_clock::now() + std::chrono::seconds(3); - while (m_running.load() && std::chrono::steady_clock::now() < deadline) { - boost::system::error_code error; - const std::size_t received = socket.receive_from(asio::buffer(buffer), sender, 0, error); - if (!error) { - const std::string datagram(buffer.data(), received); - std::string usn; - std::string location; - std::string server; - if (get_header(datagram, "USN", usn) && get_header(datagram, "LOCATION", location) && - (!get_header(datagram, "SERVER", server) || lower_ascii(server).find("orcasonar") != std::string::npos)) { - std::string machine_alive; - if (make_machine_alive_json(usn, sender.address().to_string(), location, machine_alive)) { - nlohmann::json machine = nlohmann::json::parse(machine_alive); - const std::string device_id = machine["dev_id"].get(); - if (seen_ids.insert(device_id).second && m_emit) - m_emit(machine_alive); - } - } - } else if (error != asio::error::would_block && error != asio::error::try_again) { - BOOST_LOG_TRIVIAL(warning) << "OrcaSonarDiscovery: SSDP receive failed: " << error.message(); - break; - } else { - std::this_thread::sleep_for(std::chrono::milliseconds(50)); - } - } - } catch (const std::exception& error) { - BOOST_LOG_TRIVIAL(warning) << "OrcaSonarDiscovery: SSDP round failed: " << error.what(); - } - } - - void browse_loop() - { - while (m_running.load()) { - ssdp_round(); - std::unique_lock lock(m_wait_mutex); - m_wait_cv.wait_for(lock, std::chrono::seconds(5), [this] { return !m_running.load(); }); - } - } - - EmitFn m_emit; - std::atomic m_running{false}; - std::thread m_thread; - std::mutex m_lifecycle_mutex; - std::mutex m_wait_mutex; - std::condition_variable m_wait_cv; -}; - -OrcaPrinterAgent::OrcaPrinterAgent(std::string log_dir) : log_dir(std::move(log_dir)) {} - -const char* OrcaPrinterAgent::connection_type_name(CurrentConn connection) -{ - switch (connection) { - case LAN: return "LAN"; - case CLOUD: return "cloud"; - case NONE: return "none"; - } - return "unknown"; -} - -OrcaPrinterAgent::~OrcaPrinterAgent() -{ - start_discovery(false, false); - ++m_lan_generation; // fence any late worker callback - ++m_cloud_generation; - - // Drop the cloud status callback before anything else: it holds `this`, and the - // cloud agent outlives the printer agent (NetworkAgent::set_printer_agent swaps - // the printer agent while m_cloud_agents persist). - if (auto* cloud = get_orca_cloud_agent()) - cloud->set_printer_status_callback(nullptr); - - // Stop the LAN connection so the connect thread's start() returns, but keep the - // object alive until that thread is joined (the thread holds a raw conn pointer). - OrcaMqttConnection* live_lan = nullptr; - { - std::lock_guard l(state_mutex); - live_lan = lan_mqtt_connection.get(); - } - if (live_lan) - live_lan->stop(); - - // Same for the cloud per-printer connection the cloud connect thread may hold. - if (auto* cloud = get_orca_cloud_agent()) - cloud->teardown_selected_printer_mqtt(); - - if (m_lan_connect_thread.joinable()) - m_lan_connect_thread.join(); - if (m_cloud_connect_thread.joinable()) - m_cloud_connect_thread.join(); - - // stop() is not sticky: a connect thread that had not yet reached start() when the - // teardown above ran could have raised a fresh socket in between. Tear down once - // more now that both threads are joined, so no live socket survives *this. - if (auto* cloud = get_orca_cloud_agent()) - cloud->teardown_selected_printer_mqtt(); - - { - std::lock_guard l(state_mutex); - lan_mqtt_connection.reset(); - } -} - -OrcaCloudServiceAgent* OrcaPrinterAgent::get_orca_cloud_agent() -{ - if (!m_cloud_agent) - return nullptr; - - return dynamic_cast(m_cloud_agent.get()); -} - -OrcaMqttConnection* OrcaPrinterAgent::get_appropriate_mqtt_connection(bool is_lan) -{ - if (is_lan) { - std::lock_guard l(state_mutex); - return lan_mqtt_connection.get(); - } - auto* cloud = get_orca_cloud_agent(); - return cloud ? cloud->get_mqtt_connection() : nullptr; -} - -// ============================================================================ -// Orca-dialect -> Bambu-dialect compatibility shim for inbound printer reports. -// -// OrcaSonar and the bridge adapter speak the "Orca Protocol" JSON dialect. -// MachineObject::parse_json (DeviceManager.cpp) only understands the Bambu -// dialect. Until the Orca Protocol is formally specified, this function is the -// ONE place where an inbound Orca-dialect report is rewritten into the Bambu -// shape parse_json already handles. -// -// Rules of this seam: -// 1. parse_json and the rest of DeviceManager are NOT modified to accommodate -// the Orca dialect - every such accommodation is a rule inside this -// function. -// 2. Each rule documents its Orca-dialect source, the Bambu-dialect target -// parse_json expects, and the rewrite between them. Rules are independent -// and can be removed one at a time as parse_json gains native support. -// 3. When parse_json reads the Orca dialect directly, this function and the -// single call in deliver_to_sink can be deleted, state included. Nothing -// else should need to change. -// -// It runs on every inbound report, so it stays cheap for payloads it does not -// touch (substring pre-check, no re-serialize unless something changed) and -// never throws (non-throwing parse, every field access guarded). -// ============================================================================ -std::string OrcaPrinterAgent::merge_capabilities(const std::string& dev_id, const std::string& payload) -{ - if (payload.find("get_capabilities") == std::string::npos && payload.find("push_status") == std::string::npos) - return payload; - - nlohmann::json envelope = nlohmann::json::parse(payload, nullptr, false); - if (!envelope.is_object()) - return payload; - - // Shim-local state, kept here (not on the class) so deleting this function - // removes its storage too. Process-wide and keyed by the globally-unique - // dev_id, with its own mutex; C++11 makes the one-time init thread-safe. - static std::unordered_map nozzle_diameter_cache; - static std::mutex nozzle_diameter_cache_mutex; - - bool modified = false; - - // ---- Rule: nozzle geometry --------------------------------------------- - // Orca dialect : info.capabilities.topology.tools[i].nozzle.diameter_mm, - // delivered once in the get_capabilities reply; push_status - // frames carry no nozzle geometry at all. - // Bambu dialect: parse_json runs DevNozzleSystemParser::ParseV1_0 only for a - // push_status frame that holds BOTH print.nozzle_diameter and - // print.nozzle_type. - // Rewrite : cache the diameter from the capabilities reply per device, - // then stamp print.nozzle_diameter + a neutral print.nozzle_type - // ("N/A" -> NozzleType::ntUndefine, as MoonrakerPrinterAgent - // does; Klipper has no Bambu nozzle type) onto later push_status - // frames that carry no real nozzle data. - const auto info_it = envelope.find("info"); - const bool is_capabilities_reply = info_it != envelope.end() && info_it->is_object() && - info_it->value("command", "") == "get_capabilities"; - - if (is_capabilities_reply) { - double nozzle_dia = 0.0; - const auto caps_it = info_it->find("capabilities"); - if (caps_it != info_it->end() && caps_it->is_object()) { - const auto topology_it = caps_it->find("topology"); - if (topology_it != caps_it->end() && topology_it->is_object()) { - const auto tools_it = topology_it->find("tools"); - if (tools_it != topology_it->end() && tools_it->is_array()) { - // First tool with a usable diameter wins: ParseV1_0 keeps a - // single nozzle (id 0). - for (const auto& tool : *tools_it) { - if (!tool.is_object()) - continue; - const auto nozzle_it = tool.find("nozzle"); - if (nozzle_it == tool.end() || !nozzle_it->is_object()) - continue; - const auto dia_it = nozzle_it->find("diameter_mm"); - if (dia_it != nozzle_it->end() && dia_it->is_number() && dia_it->get() > 0.0) { - nozzle_dia = dia_it->get(); - break; - } - } - } - } - } - if (nozzle_dia > 0.0) { - std::lock_guard l(nozzle_diameter_cache_mutex); - nozzle_diameter_cache[dev_id] = nozzle_dia; - } - // The capabilities reply itself is forwarded unchanged. - } - else { - const auto print_it = envelope.find("print"); - if (print_it != envelope.end() && print_it->is_object() && - print_it->value("command", "") == "push_status" && !print_it->contains("nozzle_diameter")) { - - double nozzle_dia = 0.0; - { - std::lock_guard l(nozzle_diameter_cache_mutex); - const auto it = nozzle_diameter_cache.find(dev_id); - if (it != nozzle_diameter_cache.end()) - nozzle_dia = it->second; - } - if (nozzle_dia > 0.0) { - (*print_it)["nozzle_diameter"] = nozzle_dia; - (*print_it)["nozzle_type"] = "N/A"; - modified = true; - } - } - } - // ---------------------------------------------------------------------- - - return modified ? envelope.dump() : payload; -} - -void OrcaPrinterAgent::deliver_to_sink(const std::string& dev_id, const std::string& payload, bool local) -{ - parse_ipcam_info(dev_id, payload); - std::string merged_payload = merge_capabilities(dev_id, payload); - - OnMessageFn fn; - QueueOnMainFn q; - { - std::lock_guard l(state_mutex); - fn = local ? on_local_message_fn : on_message_fn; - q = queue_on_main_fn; - } - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: delivering " << (local ? "local" : "cloud") << " report payload dev_id=" << dev_id - << " payload=" << merged_payload - << " callback=" << (fn ? "set" : "null") << " queue_on_main=" << (q ? "set" : "null"); - if (!fn) { - BOOST_LOG_TRIVIAL(warning) << "Orca diagnostic: dropping " << (local ? "local" : "cloud") << " message because on_message_fn is not set" - << " dev_id=" << dev_id; - return; - } - if (q) - q([fn, dev_id, merged_payload] { fn(dev_id, merged_payload); }); - else - fn(dev_id, merged_payload); -} - -void OrcaPrinterAgent::dispatch_local_connect(int state, const std::string& dev_id, const std::string& message) -{ - OnLocalConnectedFn callback; - QueueOnMainFn queue; - { - std::lock_guard lock(state_mutex); - callback = on_local_connect_fn; - queue = queue_on_main_fn; - } - - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: LAN connection callback state=" << state << " dev_id=" << dev_id << " message=" << message - << " callback=" << (callback ? "set" : "null") << " queue_on_main=" << (queue ? "set" : "null"); - if (!callback) - return; - - auto dispatch = [callback, state, dev_id, message] { callback(state, dev_id, message); }; - if (queue) - queue(dispatch); - else - dispatch(); -} - -std::function OrcaPrinterAgent::make_lan_message_handler(uint64_t generation) -{ - return [this, generation](const std::string& id, const std::string& payload) { - if (generation == m_lan_generation.load()) - deliver_to_sink(id, payload, true); - else - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: dropping stale LAN message generation=" << generation - << " current_generation=" << m_lan_generation.load() << " dev_id=" << id; - }; -} +OrcaPrinterAgent::~OrcaPrinterAgent() = default; void OrcaPrinterAgent::set_cloud_agent(std::shared_ptr cloud) { - BOOST_LOG_TRIVIAL(info) << "OrcaPrinterAgent::set_cloud_agent: cloud=" << (cloud ? cloud->get_id() : ""); - { - std::lock_guard lock(state_mutex); - m_cloud_agent = cloud; - } - if (!get_orca_cloud_agent()) { - BOOST_LOG_TRIVIAL(warning) << "OrcaPrinterAgent::set_cloud_agent: cloud is not OrcaCloudServiceAgent"; - return; // BBL provider active - nothing to bridge - } - - // OrcaCloudServiceAgent owns the aggregate MQTT socket; it already strips the - // device//report topic and hands us (dev_id, raw_json). Forward to the - // standard sink. message_arrive_fn self-marshals to the UI thread via CallAfter, - // so being called from the MQTT worker thread is fine. - const int callback_result = get_orca_cloud_agent()->set_printer_status_callback( - [this](std::string dev_id, std::string payload) { deliver_to_sink(dev_id, payload, false); }); - BOOST_LOG_TRIVIAL(info) << "OrcaPrinterAgent::set_cloud_agent: status callback result=" << callback_result; -} - -// ============================================================================ -// Communication -// ============================================================================ - -int OrcaPrinterAgent::send_message(std::string dev_id, std::string json_str, int /*qos*/, int /*flag*/) -{ return route_send(/*is_lan=*/false, dev_id, json_str); } - -int OrcaPrinterAgent::command_ams_refresh_rfid(std::string dev_id, int ams_id, int tray_id, int sequence_id, bool lan_mode) -{ - (void) ams_id; - // int tray_number = 0; - // if (!parse_nonnegative_command_id(tray_id, tray_number)) { - // BOOST_LOG_TRIVIAL(warning) << "OrcaPrinterAgent: invalid RFID tray id=" << tray_id; - // return BAMBU_NETWORK_ERR_INVALID_HANDLE; - // } - - nlohmann::json j; - j["print"]["command"] = "ams_get_rfid"; - j["print"]["sequence_id"] = std::to_string(sequence_id); - j["print"]["tray_id"] = tray_id; - return route_send(lan_mode, dev_id, j.dump()); -} - -int OrcaPrinterAgent::command_ams_calibrate(std::string /*dev_id*/, int /*ams_id*/, int /*sequence_id*/, bool /*lan_mode*/) -{ - // OrcaSonar has no ams_calibrate command. Do not send the Bambu M620 C - // dialect through the vendor-neutral OrcaSonar gcode_line command. - BOOST_LOG_TRIVIAL(info) << "OrcaPrinterAgent: AMS calibration is not part of the OrcaSonar API"; - return ORCA_NETWORK_ERR_CMD_NOT_SUPPORTED; -} - -int OrcaPrinterAgent::command_ams_select_tray(std::string dev_id, std::string tray_id, int sequence_id, bool lan_mode) -{ - int tray_number = 0; - if (!parse_nonnegative_command_id(tray_id, tray_number)) { - BOOST_LOG_TRIVIAL(warning) << "OrcaPrinterAgent: invalid AMS target tray id=" << tray_id; - return BAMBU_NETWORK_ERR_INVALID_HANDLE; - } - - nlohmann::json j; - j["print"]["command"] = "ams_change_filament"; - j["print"]["sequence_id"] = std::to_string(sequence_id); - j["print"]["target"] = tray_number; - return route_send(lan_mode, dev_id, j.dump()); -} - -int OrcaPrinterAgent::command_start_camera(std::string /*dev_id*/) -{ - // OrcaSonar exposes camera.ipcam_* controls, not the legacy start_camera - // operation used by the Bambu agent. - BOOST_LOG_TRIVIAL(info) << "OrcaPrinterAgent: camera start is not part of the OrcaSonar API"; - return ORCA_NETWORK_ERR_CMD_NOT_SUPPORTED; -} - -int OrcaPrinterAgent::command_xyz_abs(std::string dev_id, int sequence_id, bool lan_mode) -{ - nlohmann::json j; - j["print"]["command"] = "gcode_line"; - j["print"]["param"] = "G90\n"; - j["print"]["sequence_id"] = std::to_string(sequence_id); - return route_send(lan_mode, dev_id, j.dump()); -} - -int OrcaPrinterAgent::command_auto_leveling(std::string dev_id, int sequence_id, bool lan_mode) -{ - nlohmann::json j; - j["print"]["command"] = "gcode_line"; - j["print"]["param"] = "G29\n"; - j["print"]["sequence_id"] = std::to_string(sequence_id); - return route_send(lan_mode, dev_id, j.dump()); -} - -int OrcaPrinterAgent::command_go_home(std::string dev_id, bool is_printing, bool supports_mqtt_homing, int sequence_id, bool lan_mode) -{ - nlohmann::json j; - j["print"]["sequence_id"] = std::to_string(sequence_id); - if (supports_mqtt_homing) { - j["print"]["command"] = "back_to_center"; - } else { - // Preserve the existing safety behavior: never home Z/Y during a print. - j["print"]["command"] = "gcode_line"; - j["print"]["param"] = is_printing ? "G28 X\n" : "G28\n"; - } - return route_send(lan_mode, dev_id, j.dump()); -} - -int OrcaPrinterAgent::command_set_bed(std::string dev_id, int temp, bool /*supports_mqtt_bed_ctrl*/, int sequence_id, bool lan_mode) -{ - nlohmann::json j; - j["print"]["command"] = "set_bed_temp"; - j["print"]["sequence_id"] = std::to_string(sequence_id); - j["print"]["temp"] = temp; - return route_send(lan_mode, dev_id, j.dump()); -} - -int OrcaPrinterAgent::command_set_nozzle(std::string dev_id, int temp, int sequence_id, bool lan_mode) -{ - nlohmann::json j; - j["print"]["command"] = "set_nozzle_temp"; - j["print"]["sequence_id"] = std::to_string(sequence_id); - j["print"]["extruder_index"] = 0; - j["print"]["target_temp"] = temp; - return route_send(lan_mode, dev_id, j.dump()); -} - -int OrcaPrinterAgent::command_axis_control(std::string dev_id, - std::string axis, - double unit, - double input_val, - int /*speed*/, - bool is_core_xy, - bool /*supports_mqtt_axis_control*/, - int sequence_id, - bool lan_mode) -{ - std::transform(axis.begin(), axis.end(), axis.begin(), [](unsigned char c) { return static_cast(std::toupper(c)); }); - if (axis != "X" && axis != "Y" && axis != "Z" && axis != "E") { - BOOST_LOG_TRIVIAL(warning) << "OrcaPrinterAgent: invalid axis control axis=" << axis; - return BAMBU_NETWORK_ERR_INVALID_HANDLE; - } - - const double requested_distance = input_val * unit; - if (!std::isfinite(requested_distance) || requested_distance == 0.0) { - BOOST_LOG_TRIVIAL(warning) << "OrcaPrinterAgent: invalid axis control distance input=" << input_val << " unit=" << unit; - return BAMBU_NETWORK_ERR_INVALID_HANDLE; - } - - int direction = requested_distance > 0.0 ? 1 : -1; - if (!is_core_xy && (axis == "Y" || axis == "Z")) - direction = -direction; - - nlohmann::json j; - j["print"]["command"] = "xyz_ctrl"; - j["print"]["sequence_id"] = std::to_string(sequence_id); - j["print"]["axis"] = axis; - j["print"]["dir"] = direction; - j["print"]["distance"] = requested_distance < 0.0 ? -requested_distance : requested_distance; - return route_send(lan_mode, dev_id, j.dump()); -} - -bool OrcaPrinterAgent::parse_lan_endpoint(const std::string& dev_ip, std::string& host, std::string& port) -{ - std::string s = dev_ip; - if (s.rfind("http://", 0) == 0) - s.erase(0, 7); - else if (s.rfind("https://", 0) == 0) - s.erase(0, 8); - if (const auto slash = s.find('/'); slash != std::string::npos) - s.erase(slash); - if (s.empty()) - return false; - port = "8280"; - // split a trailing :port only for host:port, not an unbracketed IPv6 literal - if (const auto colon = s.rfind(':'); colon != std::string::npos && s.find(']') == std::string::npos) { - port = s.substr(colon + 1); - s.erase(colon); - } - if (s.empty() || port.empty()) - return false; - host = s; - return true; -} - -std::string OrcaPrinterAgent::make_lan_client_id(const std::string& dev_id) -{ - static const std::string suffix = [] { - std::random_device rd; - char buf[9]; - std::snprintf(buf, sizeof(buf), "%08x", static_cast(rd())); - return std::string(buf); - }(); - return "orcaslicer-lan-" + dev_id + "-" + suffix; -} - -bool OrcaPrinterAgent::parse_nonnegative_command_id(const std::string& value, int& result) -{ - if (value.empty()) - return false; - try { - std::size_t consumed = 0; - const long long parsed = std::stoll(value, &consumed); - if (consumed != value.size() || parsed < 0 || parsed > std::numeric_limits::max()) - return false; - result = static_cast(parsed); - return true; - } catch (const std::exception&) { - return false; - } -} - -void OrcaPrinterAgent::parse_ipcam_info(const std::string& dev_id, const std::string& payload) -{ - const nlohmann::json envelope = nlohmann::json::parse(payload, nullptr, false); - if (!envelope.is_object()) - return; - - const auto print_it = envelope.find("print"); - if (print_it == envelope.end() || !print_it->is_object()) - return; - - const nlohmann::json& print = *print_it; - const auto command_it = print.find("command"); - const bool is_push_status = command_it != print.end() && command_it->is_string() && command_it->get() == "push_status"; - bool is_full_snapshot = false; - if (is_push_status) { - const auto msg_it = print.find("msg"); - is_full_snapshot = msg_it == print.end() || (msg_it->is_number_integer() && msg_it->get() == 0); - } - - CameraStreamMode stream_mode = CameraStreamMode::none; - std::string stream_url; - bool has_camera_update = false; - const auto ipcam_it = print.find("ipcam"); - if (ipcam_it != print.end() && ipcam_it->is_object()) { - const auto stream_modes_it = ipcam_it->find("stream_mode"); - if (stream_modes_it != ipcam_it->end() && stream_modes_it->is_array()) { - has_camera_update = true; - for (const auto& stream : *stream_modes_it) { - if (!stream.is_object()) - continue; - const auto mode_it = stream.find("mode"); - const auto url_it = stream.find("url"); - if (mode_it == stream.end() || url_it == stream.end() || !mode_it->is_string() || !url_it->is_string()) - continue; - - const std::string mode = mode_it->get(); - if (mode == "rtsp") - stream_mode = CameraStreamMode::rtsp; - else if (mode == "http") - stream_mode = CameraStreamMode::http; - else if (mode == "http_snapshot") - stream_mode = CameraStreamMode::http_snapshot; - else - continue; - - stream_url = url_it->get(); - break; // OrcaSonar orders entries by preference. - } - } else if (is_full_snapshot) { - has_camera_update = true; - } - } else if (is_full_snapshot) { - // A full push_status without ipcam means the printer has no camera - // stream information. Diff reports omit unchanged domains. - has_camera_update = true; - } - - if (!has_camera_update) - return; - std::lock_guard lock(state_mutex); - if (m_current_connection != LAN || m_lan_dev_id != dev_id) { - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: ignoring camera update for inactive LAN printer dev_id=" << dev_id; - return; - } - - m_camera_stream_mode = stream_mode; - m_camera_url = std::move(stream_url); - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: updated camera state dev_id=" << dev_id << " transport=LAN" - << " mode=" << static_cast(m_camera_stream_mode) << " url=" << m_camera_url; + m_cloud_agent = cloud; } -std::string OrcaPrinterAgent::lan_connection_target() const +// ============================================================================ +// Communication - All Stubs +// ============================================================================ + +int OrcaPrinterAgent::send_message(std::string dev_id, std::string json_str, int qos, int flag) { - std::lock_guard l(state_mutex); - return m_lan_url; -} - -std::string OrcaPrinterAgent::seq(int n) { return std::to_string(20000 + (n % 10000)); } - -std::string OrcaPrinterAgent::build_pushing_start(const std::string& sid) -{ return R"({"pushing":{"command":"start","sequence_id":")" + sid + R"("}})"; } -std::string OrcaPrinterAgent::build_pushing_stop(const std::string& sid) -{ return R"({"pushing":{"command":"stop","sequence_id":")" + sid + R"("}})"; } -std::string OrcaPrinterAgent::build_pushall(const std::string& sid) -{ return R"({"pushing":{"command":"pushall","sequence_id":")" + sid + R"(","version":1,"push_target":1}})"; } -std::string OrcaPrinterAgent::build_get_version(const std::string& sid) -{ return R"({"info":{"command":"get_version","sequence_id":")" + sid + R"("}})"; } -std::string OrcaPrinterAgent::build_get_capabilities(const std::string& sid) -{ return R"({"info":{"command":"get_capabilities","sequence_id":")" + sid + R"("}})"; } - -void OrcaPrinterAgent::emit_connect_sequence(const std::string& dev_id, - std::function subscribe, - std::function request) -{ - subscribe(dev_id); - request(build_pushing_start(seq(1))); - request(build_pushall(seq(2))); - request(build_get_version(seq(3))); - request(build_get_capabilities(seq(4))); -} - -void OrcaPrinterAgent::on_connected(const std::string& dev_id, OrcaMqttConnection* conn, uint64_t generation) -{ - // Called from both connect paths with whichever epoch that path captured; the two - // counters are independent, so matching either one means the caller is still live. - if (!conn || (generation != m_lan_generation.load() && generation != m_cloud_generation.load())) - return; - emit_connect_sequence( - dev_id, [conn](const std::string& id) { conn->subscribe(id); }, - [conn, dev_id](const std::string& body) { conn->send_request(dev_id, body); }); // dev_id captured BY VALUE + return BAMBU_NETWORK_SUCCESS; } int OrcaPrinterAgent::connect_printer(const PrinterConnectionParams& params) { - BOOST_LOG_TRIVIAL(trace) << "Orca diagnostic: connect_printer requested dev_id=" << params.dev_id << " dev_ip=" << params.host - << " username=" << (params.username.empty() ? "" : params.username) << " password_present=" << (!params.password.empty()) - << " use_ssl=" << params.use_ssl; - if (params.dev_id.empty() || params.host.empty()) { - BOOST_LOG_TRIVIAL(warning) << "Orca diagnostic: connect_printer rejected missing dev_id or dev_ip"; - return BAMBU_NETWORK_ERR_INVALID_HANDLE; - } - std::string host, port; - if (!parse_lan_endpoint(params.host, host, port)) { - BOOST_LOG_TRIVIAL(warning) << "Orca diagnostic: connect_printer rejected unparsable LAN endpoint dev_ip=" << params.host; - return BAMBU_NETWORK_ERR_INVALID_HANDLE; - } - disconnect_printer(); - const uint64_t gen = ++m_lan_generation; - - OrcaMqttConnection::Config cfg; - cfg.url = (params.use_ssl ? "wss://" : "ws://") + host + ":" + port + "/mqtt"; - cfg.use_tls = params.use_ssl; - cfg.ca_file = params.ca_file; - cfg.username = params.username.empty() ? std::string("orcasonar") : params.username; - cfg.password = params.password; - cfg.client_id = make_lan_client_id(params.dev_id); - cfg.keepalive_seconds = 60; - - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: LAN connection prepared generation=" << gen << " host=" << host << " port=" << port - << " url=" << cfg.url << " mqtt_username=" << cfg.username << " password_present=" << (!cfg.password.empty()) - << " client_id=" << cfg.client_id; - - OrcaMqttConnection* conn = nullptr; - CurrentConn previous_connection; - { - std::lock_guard l(state_mutex); - previous_connection = m_current_connection; - m_lan_dev_id = params.dev_id; - m_lan_url = cfg.url; - m_lan_use_ssl = params.use_ssl; - m_lan_ca_file = params.ca_file; - m_camera_stream_mode = CameraStreamMode::none; - m_camera_url.clear(); - m_current_connection = LAN; - lan_mqtt_connection = std::make_unique(); - conn = lan_mqtt_connection.get(); - } - BOOST_LOG_TRIVIAL(info) << "OrcaPrinterAgent: selected LAN printer dev_id=" << params.dev_id - << " transport=" << connection_type_name(previous_connection) << "->LAN"; - - if (m_lan_connect_thread.joinable()) - m_lan_connect_thread.join(); // disconnect_printer() above already stopped the old conn, so this is fast - m_lan_connect_thread = std::thread([this, conn, cfg, params, gen] { - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: LAN connect worker started generation=" << gen << " dev_id=" << params.dev_id - << " url=" << cfg.url; - if (gen != m_lan_generation.load()) { - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: LAN connect worker abandoned before start generation=" << gen - << " current_generation=" << m_lan_generation.load(); - return; // superseded before we ran: never raise a socket nobody will tear down - } - const bool ok = conn->start(cfg, make_lan_message_handler(gen), [this, gen, params, conn](bool connected, bool initial) { - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: LAN MQTT state callback connected=" << connected << " initial=" << initial - << " generation=" << gen << " current_generation=" << m_lan_generation.load() - << " connack_rc=" << conn->last_connack_rc(); - if (gen != m_lan_generation.load()) { - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: ignoring stale LAN MQTT state callback generation=" << gen; - return; - } - if (connected && !initial) { - on_connected(params.dev_id, conn, gen); - dispatch_local_connect(ConnectStatusOk, params.dev_id, "0"); - } else if (!connected && !initial) { - dispatch_local_connect(ConnectStatusLost, params.dev_id, "connection_lost"); - } - }); - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: LAN MQTT start returned ok=" << ok << " generation=" << gen - << " current_generation=" << m_lan_generation.load() << " connected=" << conn->is_connected() - << " running=" << conn->is_running() << " connack_rc=" << conn->last_connack_rc(); - if (ok && gen == m_lan_generation.load()) { - on_connected(params.dev_id, conn, gen); - dispatch_local_connect(ConnectStatusOk, params.dev_id, "0"); - } else if (!ok && gen == m_lan_generation.load() && !conn->is_running()) { - // A refusal with rc 4/5 terminates the transport. Network errors keep - // retrying in OrcaMqttConnection, so leave the UI in its connecting state. - const int rc = conn->last_connack_rc(); - const std::string reason = rc >= 0 ? std::to_string(rc) : "initial_connect_failed"; - BOOST_LOG_TRIVIAL(warning) << "Orca diagnostic: LAN MQTT connection terminated before readiness" - << " generation=" << gen << " connack_rc=" << rc << " reason=" << reason; - dispatch_local_connect(ConnectStatusFailed, params.dev_id, reason); - } else if (!ok && gen == m_lan_generation.load()) { - BOOST_LOG_TRIVIAL(warning) << "Orca diagnostic: LAN MQTT initial attempt failed but worker is retrying" - << " generation=" << gen << " connack_rc=" << conn->last_connack_rc(); - } - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: LAN connect worker exiting generation=" << gen - << " current_generation=" << m_lan_generation.load(); - }); - return BAMBU_NETWORK_SUCCESS; } int OrcaPrinterAgent::disconnect_printer() { - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: disconnect_printer requested"; - ++m_lan_generation; // fence stale worker callbacks - std::unique_ptr doomed; - std::string prev_dev; - CurrentConn previous_connection; - CurrentConn current_connection; - { - std::lock_guard l(state_mutex); - previous_connection = m_current_connection; - doomed = std::move(lan_mqtt_connection); - prev_dev = m_lan_dev_id; - m_lan_dev_id.clear(); - m_lan_use_ssl = false; - m_lan_ca_file.clear(); - if (m_current_connection == LAN) { - m_current_connection = NONE; - m_camera_stream_mode = CameraStreamMode::none; - m_camera_url.clear(); - } - current_connection = m_current_connection; - } - BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: LAN disconnect generation=" << m_lan_generation.load() << " previous_dev_id=" << prev_dev - << " had_connection=" << (doomed ? "yes" : "no") - << " connected=" << (doomed && doomed->is_connected() ? "yes" : "no") - << " transport=" << connection_type_name(previous_connection) << "->" - << connection_type_name(current_connection); - // Tell the printer to stop pushing and drop the report topic before the socket - // goes away (§3.2/§5.4: deselect issues pushing.stop on both transports). - if (doomed && !prev_dev.empty() && doomed->is_connected()) { - doomed->send_request(prev_dev, build_pushing_stop(seq(5))); - doomed->unsubscribe(prev_dev); - } - if (doomed) - doomed->stop(); // joins the OrcaMqttConnection worker; OUTSIDE state_mutex - if (m_lan_connect_thread.joinable()) - m_lan_connect_thread.join(); // start() has returned (doomed->stop above); the thread's raw conn ptr - // is still valid here because `doomed` is not destroyed until we return return BAMBU_NETWORK_SUCCESS; } -int OrcaPrinterAgent::send_message_to_printer(std::string dev_id, std::string json_str, int /*qos*/, int /*flag*/) -{ return route_send(/*is_lan=*/true, dev_id, json_str); } - -int OrcaPrinterAgent::route_send(bool is_lan, const std::string& dev_id, const std::string& json_str) +int OrcaPrinterAgent::send_message_to_printer(std::string dev_id, std::string json_str, int qos, int flag) { - std::string command = ""; - try { - const nlohmann::json envelope = nlohmann::json::parse(json_str); - for (const char* namespace_name : {"pushing", "info", "print", "system", "camera", "xcam", "upgrade", "event", "files"}) { - const auto namespace_it = envelope.find(namespace_name); - if (namespace_it != envelope.end() && namespace_it->is_object()) { - const auto command_it = namespace_it->find("command"); - if (command_it != namespace_it->end() && command_it->is_string()) { - command = std::string(namespace_name) + "." + command_it->get(); - break; - } - } - } - } catch (const std::exception&) { - // Preserve the transport's existing behavior for malformed payloads; - // the printer will report the protocol error asynchronously. - } - BOOST_LOG_TRIVIAL(info) << "OrcaPrinterAgent::route_send is_lan=" << is_lan << " dev_id=" << dev_id << " command=" << command - << " payload_bytes=" << json_str.size(); - if (dev_id.empty()) - return BAMBU_NETWORK_ERR_INVALID_HANDLE; - OrcaMqttConnection* conn = get_appropriate_mqtt_connection(is_lan); - if (!conn) - return BAMBU_NETWORK_ERR_INVALID_HANDLE; - const bool queued = conn->send_request(dev_id, json_str); - BOOST_LOG_TRIVIAL(info) << "OrcaPrinterAgent::route_send command=" << command << " queued=" << queued << " is_lan=" << is_lan - << " dev_id=" << dev_id; - return queued ? BAMBU_NETWORK_SUCCESS : BAMBU_NETWORK_ERR_CONNECTION_TO_SERVER_FAILED; + return BAMBU_NETWORK_SUCCESS; } // ============================================================================ -// Discovery +// Discovery - Stub // ============================================================================ -bool OrcaPrinterAgent::start_discovery(bool start, bool /*sending*/) +bool OrcaPrinterAgent::start_discovery(bool start, bool sending) { - if (start) { - std::lock_guard lock(state_mutex); - if (!m_discovery) { - m_discovery = std::make_unique([this](const std::string& machine_alive) { - OnMsgArrivedFn ssdp_fn; - QueueOnMainFn queue_fn; - { - std::lock_guard callback_lock(state_mutex); - ssdp_fn = on_ssdp_msg_fn; - queue_fn = queue_on_main_fn; - } - if (!ssdp_fn) - return; - if (queue_fn) - queue_fn([ssdp_fn, machine_alive] { ssdp_fn(machine_alive); }); - else - ssdp_fn(machine_alive); - }); - } - m_discovery->start(); - return true; - } - - // The discovery thread invokes the callback, which takes state_mutex. Move the - // owner out first, then join without holding that mutex. - std::unique_ptr discovery; - { - std::lock_guard lock(state_mutex); - discovery = std::move(m_discovery); - } - if (discovery) - discovery->stop(); return true; } -// Runs on the "Input IP address" dialog worker thread, before any MachineObject -// exists. Probe the address for a live OrcaSonar and hand its real device id back -// so DeviceManager::insert_local_device keys the machine correctly; connect_type -// and bind_state must be set for is_lan_mode_printer()/is_avaliable() to hold, or -// set_selected_machine never routes to the LAN connect path. -int OrcaPrinterAgent::bind_detect(std::string dev_ip, std::string /*sec_link*/, detectResult& detect) +int OrcaPrinterAgent::bind_detect(std::string dev_ip, std::string sec_link, detectResult& detect) { - std::string host, port; - if (!parse_lan_endpoint(dev_ip, host, port)) { - BOOST_LOG_TRIVIAL(warning) << "OrcaPrinterAgent::bind_detect: unparsable dev_ip=" << dev_ip; - return BAMBU_NETWORK_ERR_INVALID_HANDLE; // -1: dialog shows "Failed to connect to printer." - } - - std::string device_id; - std::string device_name; - std::string model_id; - if (!probe_orcasonar_landing_page(host, port, device_id, device_name, model_id) || device_id.empty()) { - BOOST_LOG_TRIVIAL(warning) << "OrcaPrinterAgent::bind_detect: no OrcaSonar reachable at " << host << ":" << port; - return BAMBU_NETWORK_ERR_INVALID_HANDLE; - } - - detect.dev_id = device_id; - detect.dev_name = device_name; - detect.model_id = model_id; - detect.version = ""; - detect.connect_type = "lan"; // required by MachineObject::is_lan_mode_printer() - detect.bind_state = "free"; // required by MachineObject::is_avaliable() - detect.result_msg = ""; - BOOST_LOG_TRIVIAL(info) << "OrcaPrinterAgent::bind_detect: found OrcaSonar dev_id=" << device_id << " at " << host << ":" << port; return BAMBU_NETWORK_SUCCESS; } @@ -1265,94 +80,8 @@ std::string OrcaPrinterAgent::get_user_selected_machine() int OrcaPrinterAgent::set_user_selected_machine(std::string dev_id) { - auto* cloud = get_orca_cloud_agent(); - std::string previous; - CurrentConn previous_connection; - CurrentConn current_connection; - { - std::lock_guard lock(state_mutex); - previous_connection = m_current_connection; - // An empty cloud selection must not clear an independently active LAN - // selection. Conversely, selecting a cloud machine with the same id - // while LAN is active is still a transport switch and must proceed. - const bool same_selection = dev_id == selected_machine; - const bool same_transport = dev_id.empty() ? m_current_connection != CLOUD : m_current_connection == CLOUD; - if (same_selection && same_transport) { - BOOST_LOG_TRIVIAL(info) << "OrcaPrinterAgent::set_user_selected_machine: unchanged dev_id=" << dev_id - << " transport=" << connection_type_name(m_current_connection); - return BAMBU_NETWORK_SUCCESS; - } - previous = selected_machine; - selected_machine = dev_id; - if (dev_id.empty()) { - if (m_current_connection == CLOUD) { - m_current_connection = NONE; - m_camera_stream_mode = CameraStreamMode::none; - m_camera_url.clear(); - } - } else { - m_current_connection = CLOUD; - m_camera_stream_mode = CameraStreamMode::none; - m_camera_url.clear(); - } - current_connection = m_current_connection; - } - BOOST_LOG_TRIVIAL(info) << "OrcaPrinterAgent::set_user_selected_machine: previous=" << previous << " new=" << dev_id - << " cloud=" << (cloud ? "set" : "") << " transport=" << connection_type_name(previous_connection) << "->" - << connection_type_name(current_connection); - if (!cloud) { - BOOST_LOG_TRIVIAL(warning) << "OrcaPrinterAgent::set_user_selected_machine: no Orca cloud agent"; - return BAMBU_NETWORK_SUCCESS; - } - - // Bump ONCE at the top for any change (select or deselect) so a deselect also - // fences an in-flight configure thread started by the previous selection. This is - // the CLOUD epoch only — a cloud selection must not fence a live LAN session. - const uint64_t gen = ++m_cloud_generation; - - auto* conn = cloud->get_mqtt_connection(); - if (!previous.empty()) { - cloud->del_subscribe({previous}); - if (conn && conn->is_connected()) - conn->send_request(previous, build_pushing_stop(seq(5))); - } - - // A previous initial-connect worker may still be blocking in start(). Stop it - // only when no fleet connection has reached CONNACK; an established fleet - // socket survives printer selection changes. - if (m_cloud_connect_thread.joinable()) { - if (conn && !conn->is_connected()) - conn->stop(); - m_cloud_connect_thread.join(); - } - - if (dev_id.empty()) - return BAMBU_NETWORK_SUCCESS; - - if (conn && conn->is_running()) { - on_connected(dev_id, conn, gen); - return BAMBU_NETWORK_SUCCESS; - } - - m_cloud_connect_thread = std::thread([this, cloud, dev_id, gen] { - if (gen != m_cloud_generation.load()) - return; // superseded before we ran: do not raise a socket nobody owns - - auto state_handler = [this](bool connected, bool initial) { - if (!connected || initial) - return; - auto* current_cloud = get_orca_cloud_agent(); - OrcaMqttConnection* current_conn = current_cloud ? current_cloud->get_mqtt_connection() : nullptr; - const std::string selected = get_user_selected_machine(); - if (current_conn && !selected.empty()) - on_connected(selected, current_conn, m_cloud_generation.load()); - }; - - if (cloud->configure_selected_printer_mqtt(dev_id, std::move(state_handler)) == BAMBU_NETWORK_SUCCESS && - gen == m_cloud_generation.load()) { - on_connected(dev_id, cloud->get_mqtt_connection(), gen); - } - }); + std::lock_guard lock(state_mutex); + selected_machine = dev_id; return BAMBU_NETWORK_SUCCESS; } @@ -1360,269 +89,39 @@ int OrcaPrinterAgent::set_user_selected_machine(std::string dev_id) // Agent Information // ============================================================================ AgentInfo OrcaPrinterAgent::get_agent_info_static() -{ return AgentInfo{ORCA_PRINTER_AGENT_ID, "Orca", OrcaPrinterAgent_VERSION, "Orca Printer Communication Protocol Agent"}; } +{ + return AgentInfo{ORCA_PRINTER_AGENT_ID, "Orca", OrcaPrinterAgent_VERSION, "Orca Printer Communication Protocol Agent"}; +} // ============================================================================ // Print Job Operations - All Stubs // ============================================================================ -// Simply uploads the file to the printer via HTTP (cloud) then sends a HTTP request to start print. In the future, this might be a MQTT command to start print instead of HTTP. int OrcaPrinterAgent::start_print(PrintParams params, OnUpdateStatusFn update_fn, WasCancelledFn cancel_fn, OnWaitFn wait_fn) { - (void) wait_fn; - - if (update_fn) - update_fn(PrintingStageCreate, 0, "Preparing..."); - - if (cancel_fn && cancel_fn()) - return BAMBU_NETWORK_ERR_CANCELED; - - auto* cloud = get_orca_cloud_agent(); - if (!cloud || params.dev_id.empty()) - return BAMBU_NETWORK_ERR_INVALID_HANDLE; - - const std::string local_path = resolve_local_gcode_path(params); - boost::system::error_code ec; - if (!fs::exists(local_path, ec) || !fs::is_regular_file(local_path, ec)) { - BOOST_LOG_TRIVIAL(error) << "OrcaPrinterAgent: G-code file does not exist: " << local_path; - return BAMBU_NETWORK_ERR_FILE_NOT_EXIST; - } - - if (cancel_fn && cancel_fn()) - return BAMBU_NETWORK_ERR_CANCELED; - - if (update_fn) - update_fn(PrintingStageUpload, 0, "Uploading G-code..."); - - std::string job_id; - int result = cloud->upload_gcode_via_cloud(params.dev_id, local_path, &job_id, update_fn, cancel_fn); - if (result != BAMBU_NETWORK_SUCCESS) - return result; - - if (cancel_fn && cancel_fn()) - return BAMBU_NETWORK_ERR_CANCELED; - - if (update_fn) - update_fn(PrintingStageSending, 0, "Starting print..."); - - result = start_sdcard_print(params, update_fn, cancel_fn); - - if (result != BAMBU_NETWORK_SUCCESS) - return result; - - if (update_fn) - update_fn(PrintingStageFinished, 100, "Print started"); - return BAMBU_NETWORK_SUCCESS; } -int OrcaPrinterAgent::start_local_print_with_record(PrintParams params, +int OrcaPrinterAgent::start_local_print_with_record(PrintParams params, OnUpdateStatusFn update_fn, - WasCancelledFn cancel_fn, - OnWaitFn wait_fn) -{ return BAMBU_NETWORK_SUCCESS; } + WasCancelledFn cancel_fn, + OnWaitFn wait_fn) +{ + return BAMBU_NETWORK_SUCCESS; +} -// Upload one G-code file to the printer's `gcodes` root over OrcaSonar's -// Moonraker-compatible HTTP facade. No print is started here (print=false); the -// caller issues print.gcode_file over MQTT separately (start_sdcard_print). -int OrcaPrinterAgent::start_send_gcode_to_sdcard(PrintParams params, - OnUpdateStatusFn update_fn, - WasCancelledFn cancel_fn, - OnWaitFn /*wait_fn*/) +int OrcaPrinterAgent::start_send_gcode_to_sdcard(PrintParams params, OnUpdateStatusFn update_fn, WasCancelledFn cancel_fn, OnWaitFn wait_fn) { - if (update_fn) - update_fn(PrintingStageCreate, 0, "Preparing..."); - - const std::string local_path = resolve_local_gcode_path(params); - const fs::path source(local_path); - boost::system::error_code ec; - if (!fs::exists(source, ec) || !fs::is_regular_file(source, ec)) { - BOOST_LOG_TRIVIAL(error) << "OrcaPrinterAgent: G-code file does not exist: " << local_path; - return BAMBU_NETWORK_ERR_FILE_NOT_EXIST; - } - - const std::uintmax_t file_size = fs::file_size(source, ec); - if (ec) { - BOOST_LOG_TRIVIAL(error) << "OrcaPrinterAgent: cannot stat G-code file " << local_path << ": " << ec.message(); - return BAMBU_NETWORK_ERR_PRINT_SG_UPLOAD_FTP_FAILED; - } - if (file_size > 1024ull * 1024 * 1024) { // OrcaSonar caps a single upload at 1 GiB - BOOST_LOG_TRIVIAL(error) << "OrcaPrinterAgent: G-code file too large: " << file_size << " bytes"; - return BAMBU_NETWORK_ERR_PRINT_SG_UPLOAD_FTP_FAILED; - } - - bool use_ssl = false; - std::string ca_file; - { - std::lock_guard lock(state_mutex); - use_ssl = m_lan_use_ssl; - ca_file = m_lan_ca_file; - } - - std::string host, port, origin; - if (parse_lan_endpoint(params.dev_ip, host, port)) - origin = (use_ssl ? "https://" : "http://") + host; - else - origin = http_origin_from_lan_ws(lan_connection_target()); - if (origin.empty()) { - BOOST_LOG_TRIVIAL(warning) << "OrcaPrinterAgent: no LAN HTTP endpoint for G-code upload (dev_ip=" << params.dev_ip << ")"; - return BAMBU_NETWORK_ERR_INVALID_HANDLE; - } - - const std::string upload_name = remote_gcode_name(params); - BOOST_LOG_TRIVIAL(info) << "OrcaPrinterAgent: uploading G-code " << local_path << " -> " << origin << "/server/files/upload as " - << upload_name << " (" << file_size << " bytes)"; - - if (update_fn) - update_fn(PrintingStageUpload, 0, "Uploading..."); - - bool canceled = false; - long http_status = 0; - std::string http_error; - std::string response_body; - - // check if printer has enough storage - auto directory_http = Http::get(origin + "/server/files/directory?path=gcodes"); - directory_http.tls_verify(use_ssl); - if (!ca_file.empty()) - directory_http.ca_file(ca_file); - directory_http - .on_complete([&](std::string body, unsigned status) { - if (body.empty()) { - http_status = 400; - http_error = "Failed to get gcodes directory."; - } - - int free = 0; - - nlohmann::json json = nlohmann::json::parse(body); - if (json.contains("result")) { - json = json["result"]; - if (json.contains("disk_usage")) { - json = json["disk_usage"]; - if (json.contains("free")) - free = json["free"].get(); - } - } - - if (free < file_size) { - http_status = 507; - http_error = "Not enough storage on the printer."; - } - }) - .on_error([&](std::string body, std::string err, unsigned status) { - http_status = status; - http_error = std::move(err); - response_body = std::move(body); - }) - .perform_sync(); - - if (http_status >= 400) { - BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << " failed with error code: " << http_status << ", " << http_error; - return BAMBU_NETWORK_ERR_PRINT_SG_UPLOAD_FTP_FAILED; - } - - auto http = Http::post(origin + "/server/files/upload"); - http.tls_verify(use_ssl); - if (!ca_file.empty()) - http.ca_file(ca_file); - if (!params.password.empty()) - http.header("X-Api-Key", params.password); // trusted LAN facades may not require it; harmless when they do not - http.form_add("root", "gcodes") - .form_add("print", "false") - .form_add_file("file", source, upload_name) - .timeout_connect(5) - .timeout_max(300) // large G-code over a slow link - .on_complete([&](std::string body, unsigned status) { - http_status = status; - response_body = std::move(body); - }) - .on_error([&](std::string body, std::string err, unsigned status) { - http_status = status; - http_error = std::move(err); - response_body = std::move(body); - }) - .on_progress([&](Http::Progress progress, bool& cancel) { - if (cancel_fn && cancel_fn()) { - cancel = true; - canceled = true; - return; - } - if (update_fn && progress.ultotal > 0) { - const int percent = static_cast((progress.ulnow * 100) / progress.ultotal); - update_fn(PrintingStageUpload, percent, "Uploading..."); - } - }) - .perform_sync(); - - if (canceled) { - BOOST_LOG_TRIVIAL(info) << "OrcaPrinterAgent: G-code upload canceled by user"; - return BAMBU_NETWORK_ERR_CANCELED; - } - - // OrcaSonar's Moonraker facade returns 201 Created on a successful save. - if (http_status != 200 && http_status != 201) { - BOOST_LOG_TRIVIAL(warning) << "OrcaPrinterAgent: G-code upload failed http_status=" << http_status << " error=" << http_error - << " body=" << response_body; - return BAMBU_NETWORK_ERR_PRINT_SG_UPLOAD_FTP_FAILED; - } - - if (update_fn) - update_fn(PrintingStageUpload, 100, "File uploaded"); return BAMBU_NETWORK_SUCCESS; } -// Upload the sliced G-code, then start it: the LAN "print now" path. int OrcaPrinterAgent::start_local_print(PrintParams params, OnUpdateStatusFn update_fn, WasCancelledFn cancel_fn) { - if (cancel_fn && cancel_fn()) - return BAMBU_NETWORK_ERR_CANCELED; - - const int upload_rc = start_send_gcode_to_sdcard(params, update_fn, cancel_fn, nullptr); - if (upload_rc != BAMBU_NETWORK_SUCCESS) - return upload_rc; - - if (cancel_fn && cancel_fn()) - return BAMBU_NETWORK_ERR_CANCELED; - - return start_sdcard_print(params, update_fn, cancel_fn); + return BAMBU_NETWORK_SUCCESS; } -// Start a file that already lives on the printer by publishing the canonical -// OPCP print.gcode_file command to device//request. The acknowledgement -// and lifecycle progress arrive asynchronously as print.push_status on the -// report topic, which the GUI already consumes. int OrcaPrinterAgent::start_sdcard_print(PrintParams params, OnUpdateStatusFn update_fn, WasCancelledFn cancel_fn) { - if (params.dev_id.empty()) { - BOOST_LOG_TRIVIAL(warning) << "OrcaPrinterAgent: start_sdcard_print rejected missing dev_id"; - return BAMBU_NETWORK_ERR_INVALID_HANDLE; - } - if (cancel_fn && cancel_fn()) - return BAMBU_NETWORK_ERR_CANCELED; - - // dst_file, when set, names a file already on the printer (print-from-SD flow); - // otherwise start what start_send_gcode_to_sdcard just uploaded to `gcodes`. - const std::string target = params.dst_file.empty() ? remote_gcode_name(params) : fs::path(params.dst_file).filename().string(); - - nlohmann::json j; - j["print"]["command"] = "gcode_file"; - j["print"]["sequence_id"] = next_gcode_file_sequence_id(); - j["print"]["param"] = target; - - if (update_fn) - update_fn(PrintingStageSending, 0, "Starting print..."); - - const bool is_lan = params.connection_type == "lan"; - const int rc = route_send(is_lan, params.dev_id, j.dump()); - if (rc != BAMBU_NETWORK_SUCCESS) { - BOOST_LOG_TRIVIAL(warning) << "OrcaPrinterAgent: start_sdcard_print publish failed rc=" << rc << " dev_id=" << params.dev_id - << " param=" << target; - return BAMBU_NETWORK_ERR_PRINT_LP_PUBLISH_MSG_FAILED; - } - - if (update_fn) - update_fn(PrintingStageFinished, 100, "Print started"); return BAMBU_NETWORK_SUCCESS; } @@ -1655,7 +154,6 @@ int OrcaPrinterAgent::set_on_message_fn(OnMessageFn fn) { std::lock_guard lock(state_mutex); on_message_fn = fn; - BOOST_LOG_TRIVIAL(info) << "OrcaPrinterAgent::set_on_message_fn: callback=" << (fn ? "set" : "clear"); return BAMBU_NETWORK_SUCCESS; } @@ -1670,7 +168,6 @@ int OrcaPrinterAgent::set_on_local_connect_fn(OnLocalConnectedFn fn) { std::lock_guard lock(state_mutex); on_local_connect_fn = fn; - BOOST_LOG_TRIVIAL(info) << "OrcaPrinterAgent::set_on_local_connect_fn: callback=" << (fn ? "set" : "clear"); return BAMBU_NETWORK_SUCCESS; } @@ -1678,7 +175,6 @@ int OrcaPrinterAgent::set_on_local_message_fn(OnMessageFn fn) { std::lock_guard lock(state_mutex); on_local_message_fn = fn; - BOOST_LOG_TRIVIAL(info) << "OrcaPrinterAgent::set_on_local_message_fn: callback=" << (fn ? "set" : "clear"); return BAMBU_NETWORK_SUCCESS; } @@ -1689,20 +185,4 @@ int OrcaPrinterAgent::set_queue_on_main_fn(QueueOnMainFn fn) return BAMBU_NETWORK_SUCCESS; } -CameraStreamMode OrcaPrinterAgent::get_camera_stream_mode() const -{ - std::lock_guard lock(state_mutex); - if (m_current_connection == CLOUD) - return CameraStreamMode::webrtc; - return m_camera_stream_mode; -} - -std::string OrcaPrinterAgent::get_camera_url() const -{ - std::lock_guard lock(state_mutex); - if (m_current_connection != LAN) - return {}; - return m_camera_url; -} - } // namespace Slic3r diff --git a/src/slic3r/Utils/OrcaPrinterAgent.hpp b/src/slic3r/Utils/OrcaPrinterAgent.hpp index 337850a3a0..a56b2c8dda 100644 --- a/src/slic3r/Utils/OrcaPrinterAgent.hpp +++ b/src/slic3r/Utils/OrcaPrinterAgent.hpp @@ -3,29 +3,20 @@ #include "IPrinterAgent.hpp" #include "ICloudServiceAgent.hpp" -#include "OrcaCloudServiceAgent.hpp" -#include "OrcaMqttConnection.hpp" -#include -#include -#include #include "bambu_networking.hpp" #include #include #include -#include namespace Slic3r { -class OrcaCloudServiceAgent; - /** - * OrcaPrinterAgent - OrcaSonar MQTT printer agent. + * OrcaPrinterAgent - Stub implementation for printer operations. * - * LAN and cloud commands use the same OrcaSonar protocol payloads; only the - * MQTT connection selected by route_send() differs. + * All printer-related operations are currently stubs that return success. + * Actual printer connectivity requires the BBL SDK or future Orca implementation. */ -class OrcaPrinterAgent : public IPrinterAgent -{ +class OrcaPrinterAgent : public IPrinterAgent { public: explicit OrcaPrinterAgent(std::string log_dir); ~OrcaPrinterAgent() override; @@ -35,8 +26,6 @@ public: // ======================================================================== void set_cloud_agent(std::shared_ptr cloud) override; - CameraStreamMode get_camera_stream_mode() const override; - std::string get_camera_url() const override; // Communication int send_message(std::string dev_id, std::string json_str, int qos, int flag) override; @@ -80,131 +69,10 @@ public: int set_on_local_message_fn(OnMessageFn fn) override; int set_queue_on_main_fn(QueueOnMainFn fn) override; - int command_ams_refresh_rfid(std::string dev_id, int ams_id, int tray_id, int sequence_id, bool lan_mode) override; - int command_ams_calibrate(std::string dev_id, int ams_id, int sequence_id, bool lan_mode) override; - int command_ams_select_tray(std::string dev_id, std::string tray_id, int sequence_id, bool lan_mode) override; - int command_start_camera(std::string dev_id) override; - int command_xyz_abs(std::string dev_id, int sequence_id, bool lan_mode) override; - int command_auto_leveling(std::string dev_id, int sequence_id, bool lan_mode) override; - int command_go_home(std::string dev_id, bool is_printing, bool supports_mqtt_homing, int sequence_id, bool lan_mode) override; - int command_set_bed(std::string dev_id, int temp, bool supports_mqtt_bed_ctrl, int sequence_id, bool lan_mode) override; - int command_set_nozzle(std::string dev_id, int temp, int sequence_id, bool lan_mode) override; - int command_axis_control(std::string dev_id, - std::string axis, - double unit, - double input_val, - int speed, - bool is_core_xy, - bool supports_mqtt_axis_control, - int sequence_id, - bool lan_mode) override; - - // Test-only: drive emit_connect_sequence directly (no socket). - void run_connect_sequence_for_test(const std::string& dev_id) - { - emit_connect_sequence(dev_id, [](const std::string&) {}, [](const std::string&) {}); - } - - // Test-only: advance the LAN connection epoch without a connect/disconnect cycle. - void bump_lan_generation_for_test() { ++m_lan_generation; } - // Test-only: the same for the (independent) cloud selection epoch. - void bump_cloud_generation_for_test() { ++m_cloud_generation; } - - FilamentSyncMode get_filament_sync_mode() const override { return FilamentSyncMode::subscription; } - -protected: - // Forward one inbound printer message to on_message_fn or on_local_message_fn (marshalled onto the UI - // thread via queue_on_main_fn when set). Body of every connection's MessageHandler. - void deliver_to_sink(const std::string& dev_id, const std::string& payload, bool local); - - // Extract OrcaSonar's print.ipcam.stream_mode from LAN reports before they - // are forwarded to the GUI. The getters below then read this agent-owned state. - void parse_ipcam_info(const std::string& dev_id, const std::string& payload); - - // Orca-dialect -> Bambu-dialect compatibility shim for inbound reports: the single - // place Orca Protocol JSON is rewritten into the shapes MachineObject::parse_json - // already handles, so parse_json needs no Orca-specific changes. Self-contained - // (its cache is a function-local static) and deletable together with its call site - // once parse_json reads the Orca dialect natively. See the definition for the - // per-rule detail. Returns the payload unchanged when no rule applies. - std::string merge_capabilities(const std::string& dev_id, const std::string& payload); - - // Report the asynchronous LAN connection state using the same callback contract as - // the other printer agents. The transport result cannot be returned by - // connect_printer(), which only starts the worker. - void dispatch_local_connect(int state, const std::string& dev_id, const std::string& message); - - // The LAN inbound-message handler for one connection generation: forwards to - // deliver_to_sink only while `generation` is still the live epoch. - std::function make_lan_message_handler(uint64_t generation); - - // Pure LAN-address parsing + client-id. protected static so the test Probe reaches them. - static bool parse_lan_endpoint(const std::string& dev_ip, std::string& host, std::string& port); - static std::string make_lan_client_id(const std::string& dev_id); - // Test hook: the ws:// URL connect_printer built for the current LAN session ("" if none). - std::string lan_connection_target() const; - // Shared post-connect sequence: SUBSCRIBE, then pushing.start, pushall, - // info.get_version, info.get_capabilities. Runs identically on LAN and cloud. - void on_connected(const std::string& dev_id, OrcaMqttConnection* conn, uint64_t generation); - - // The post-connect command sequence, factored behind a seam so a test can - // observe the SUBSCRIBE + 4 request payloads without a live OrcaMqttConnection. - virtual void emit_connect_sequence(const std::string& dev_id, - std::function subscribe, - std::function request); - static std::string seq(int n); // decimal string in the OrcaSlicer 20000..29999 band - static std::string build_pushing_start(const std::string& sequence_id); - static std::string build_pushing_stop(const std::string& sequence_id); - static std::string build_pushall(const std::string& sequence_id); - static std::string build_get_version(const std::string& sequence_id); - static std::string build_get_capabilities(const std::string& sequence_id); - private: - class OrcaSonarDiscovery; - std::string log_dir; std::string selected_machine; - - enum CurrentConn { NONE, CLOUD, LAN }; - static const char* connection_type_name(CurrentConn connection); - - // The transport for the printer currently selected by the UI. LAN and - // cloud sessions have separate connection objects, so this is selection - // state rather than an inference from whichever socket happens to exist. - CurrentConn m_current_connection = NONE; - std::shared_ptr m_cloud_agent; - std::unique_ptr lan_mqtt_connection; - - // Two independent epochs: a cloud (de)selection must not fence the live LAN - // feed, and vice versa. Each transport's connect thread and inbound handler - // compare against their own counter only. - std::atomic m_lan_generation{0}; - std::atomic m_cloud_generation{0}; - - // The short-lived threads that run the blocking initial connect for the current - // LAN / cloud session. Joined members (never detached) so they cannot outlive - // *this or the connection they hold a raw pointer to. - std::thread m_lan_connect_thread; - std::thread m_cloud_connect_thread; - - std::unique_ptr m_discovery; - - std::string m_lan_dev_id; // guarded by state_mutex - std::string m_lan_url; // guarded by state_mutex — the Config.url of the live LAN session - bool m_lan_use_ssl = false; // guarded by state_mutex - std::string m_lan_ca_file; // guarded by state_mutex - CameraStreamMode m_camera_stream_mode = CameraStreamMode::none; // guarded by state_mutex - std::string m_camera_url; // guarded by state_mutex - - OrcaCloudServiceAgent* get_orca_cloud_agent(); - - OrcaMqttConnection* get_appropriate_mqtt_connection(bool is_lan = true); - static bool parse_nonnegative_command_id(const std::string& value, int& result); - - // Route one command payload to device//request on the LAN or the shared - // cloud connection. The uniform send path for both send_message* overrides. - int route_send(bool is_lan, const std::string& dev_id, const std::string& json_str); // Callbacks OnMsgArrivedFn on_ssdp_msg_fn;