juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-27 10:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Introducing Orca Cloud: https://cloud.orcaslicer.com (#13414)

Browse Source 
* Add OrcaCloud sync platform and preset bundle sharing system

  Introduce OrcaCloud, a cloud sync platform for user presets, alongside
  a preset bundle system that enables sharing printer/filament/process
  profiles as local exportable bundles or subscribed cloud bundles.

  OrcaCloud platform:
  - Auth to Orca Cloud
  - Encrypted token storage (file-based or system keychain)
  - User preset sync with
  - Profile migration from default/bambu folders on first login
  - Homepage integration with entrance to cloud.orcaslicer.com

  Preset bundles:
  - Local bundle import/export with bundle_structure.json metadata
  - Subscribed cloud bundles with version-based update checking
  - Thread-safe concurrent bundle access with read-write mutex
  - Canonical bundle preset naming (_local/<id>/... and _subscribed/<id>/...)
  - Bundle presets are read-only; grouped under subheaders in combo boxes
  - PresetBundleDialog with auto-sync toggle, refresh, update notifications
  - Hyperlinked bundle names to cloud bundle pages

  Co-authored-by: Sabriel Koh <sabrielkcr@gmail.com>
  Co-authored-by: Derrick <derrick992110@gmail.com>
  Co-authored-by: Mykola Nahirnyi <mnahirnyi@amcbridge.com>
  Co-authored-by: Ian Chua <iancrb00@gmail.com>
  Co-authored-by: Draginraptor <draginraptor@gmail.com>
  Co-authored-by: ExPikaPaka <112851715+ExPikaPaka@users.noreply.github.com>
  Co-authored-by: Ian Bassi <ian.bassi@outlook.com>
  Co-authored-by: Ocraftyone <Ocraftyone@users.noreply.github.com>
  Co-authored-by: yw4z <ywsyildiz@gmail.com>
  Co-authored-by: peterm-m <101202951+peterm-m@users.noreply.github.com>

* Fixed an issue on Windows it failed to login Orca Cloud with Google account
This commit is contained in:
SoftFever
2026-05-01 18:01:29 +08:00
committed by GitHub
parent e54e7a61c0
commit c04be9ab37
113 changed files with 8690 additions and 3466 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/Utils/OrcaCloudServiceAgent.hpp
+29 -17
View File
@@ -16,8 +16,9 @@ class wxSecretStore;
namespace Slic3r {
// Forward declaration
// Forward declarations
class AppConfig;
struct BundleMetadata;
// Constants for OAuth loopback server
namespace auth_constants {
@@ -39,12 +40,12 @@ struct ProfileUpsert {
std::string id;
std::string name;
nlohmann::json content;
std::string updated_at;
std::string created_at;
long long updated_time;
long long created_time;
};
struct SyncPullResponse {
std::string next_cursor;
long long next_cursor;
std::vector<ProfileUpsert> upserts;
std::vector<std::string> deletes;
};
@@ -52,14 +53,14 @@ struct SyncPullResponse {
struct SyncPushResult {
bool success;
int http_code;
std::string new_updated_at;
long long new_updated_time;
ProfileUpsert server_version;
bool server_deleted;
std::string error_message;
};
struct SyncState {
std::string last_sync_timestamp;
long long last_sync_timestamp;
};
#endif // ORCA_SYNC_STRUCTS_DEFINED
@@ -87,6 +88,8 @@ public:
std::string access_token;
std::string refresh_token;
std::string user_id;
// Orca auth semantics: user_name is unique orca cloud username(orca_xxxxx), user_nickname is
// the display name shown in the UI when available.
std::string user_name;
std::string user_nickname;
std::string user_avatar;
@@ -108,10 +111,14 @@ public:
explicit OrcaCloudServiceAgent(std::string log_dir);
~OrcaCloudServiceAgent() override;
std::string get_id() const override { return ORCA_CLOUD_PROVIDER; }
// Configuration
void configure_urls(AppConfig* app_config);
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);
std::string get_cloud_base_url() const { return cloud_base_url; }
void set_use_encrypted_token_file(bool use);
bool get_use_encrypted_token_file() const;
@@ -157,6 +164,7 @@ public:
int connect_server() override;
bool is_server_connected() override;
int refresh_connection() override;
bool is_refresh_running() const { return refresh_running.load(); }
int start_subscribe(std::string module) override;
int stop_subscribe(std::string module) override;
int add_subscribe(std::vector<std::string> dev_list) override;
@@ -223,8 +231,6 @@ public:
// ========================================================================
// ICloudServiceAgent Interface Implementation - Extra Features
// ========================================================================
int set_extra_http_header(std::map<std::string, std::string> extra_headers) override;
std::string get_studio_info_url() override;
int get_mw_user_preference(std::function<void(std::string)> callback) override;
int get_mw_user_4ulist(int seed, int limit, std::function<void(std::string)> callback) override;
std::string get_version() override;
@@ -232,9 +238,8 @@ public:
// ========================================================================
// ICloudServiceAgent Interface Implementation - Callbacks
// ========================================================================
int set_on_user_login_fn(OnUserLoginFn fn) override;
int set_on_server_connected_fn(OnServerConnectedFn fn) override;
int set_on_http_error_fn(OnHttpErrorFn fn) override;
int set_on_server_connected_fn(AppOnServerConnectedFn fn) override;
int set_on_http_error_fn(AppOnHttpErrorFn fn) override;
int set_get_country_code_fn(GetCountryCodeFn fn) override;
int set_queue_on_main_fn(QueueOnMainFn fn) override;
@@ -244,6 +249,14 @@ public:
void clear_sync_state();
const SyncState& get_sync_state() const { return sync_state; }
// ========================================================================
// Orca-Specific: Bundle Subscription
// ========================================================================
bool unsubscribe_bundle(const std::string& bundle_id);
std::string get_bundle_url(const std::string& bundle_id) const;
int get_subscribed_bundles(std::vector<std::pair<std::string, std::string>>* bundles,std::vector<std::string>& notfound, std::vector<std::string>& unauthorized);
int get_shared_bundle(const std::string& bundle_id, std::map<std::string, std::map<std::string, std::string>>* presets, BundleMetadata* bundle_metadata);
// ========================================================================
// Additional Public Methods - Auth
// ========================================================================
@@ -267,10 +280,10 @@ public:
bool set_user_session(const std::string& token,
const std::string& user_id,
const std::string& username,
const std::string& name,
const std::string& nickname,
const std::string& avatar,
const std::string& refresh_token = "");
bool set_user_session(const nlohmann::json& session_json, bool notify_login = true);
void clear_session();
private:
@@ -284,7 +297,7 @@ private:
const std::string& profile_id,
const std::string& name,
const nlohmann::json& content,
const std::string& original_updated_at = ""
const std::string& original_updated_time = ""
);
// HTTP request helpers
@@ -303,7 +316,6 @@ private:
void compute_fallback_path();
bool decode_jwt_expiry(const std::string& token, std::chrono::system_clock::time_point& out_tp);
bool should_refresh_locked(std::chrono::seconds skew) const;
void invoke_user_login_callback(int online_login, bool login);
// Callback invocation
void invoke_server_connected_callback(int return_code, int reason_code);
@@ -318,6 +330,7 @@ private:
std::string config_dir;
std::string api_base_url;
std::string auth_base_url;
std::string cloud_base_url;
std::string country_code;
std::map<std::string, std::string> extra_headers;
std::map<std::string, std::string> auth_headers;
@@ -342,9 +355,8 @@ private:
std::string sync_state_path;
// Callbacks
OnUserLoginFn on_user_login_fn;
OnServerConnectedFn on_server_connected_fn;
OnHttpErrorFn on_http_error_fn;
AppOnServerConnectedFn on_server_connected_fn;
AppOnHttpErrorFn on_http_error_fn;
GetCountryCodeFn get_country_code_fn;
QueueOnMainFn queue_on_main_fn;
mutable std::mutex callback_mutex;