fix(macos): add macOS support for deep links and background sync

- Make tauri-plugin-frame conditional on Windows only
- Add deep-link://new-url event listener for macOS OAuth callbacks
- Register cloudreve:// URL scheme via tauri.conf.json deep-link config
- Move initial sync to background so add_drive returns immediately
- Add HTTP request timeout to prevent indefinite hangs during sync

Author: Mike-Solar

crates/cloudreve-api/src/client.rs

@@ -152,7 +152,8 @@ impl Client {
     /// Create a new API client
     pub fn new(config: ClientConfig) -> Self {
         let mut builder = HttpClient::builder()
-            .connect_timeout(std::time::Duration::from_secs(config.timeout_seconds));
+            .connect_timeout(std::time::Duration::from_secs(config.timeout_seconds))
+            .timeout(std::time::Duration::from_secs(config.timeout_seconds));
 
         if let Some(ref user_agent) = config.user_agent {
             builder = builder.user_agent(user_agent);

crates/cloudreve-sync/src/drive/manager/mod.rs

@@ -167,7 +167,8 @@ impl DriveManager {
             }
         }
 
-        let mut write_guard = self.drives.write().await;
+        // Create and start the mount before acquiring the write lock
+        // to avoid holding the lock during potentially long-running operations
         let mut mount = Mount::new(
             config.clone(),
             self.inventory.clone(),
@@ -185,6 +186,23 @@ impl DriveManager {
             .spawn_remote_event_processor(mount_arc.clone())
             .await;
         mount_arc.spawn_props_refresh_task().await;
+
+        // Spawn initial sync in the background so add_drive returns immediately
+        let mount_for_sync = mount_arc.clone();
+        tokio::spawn(async move {
+            let sync_path = mount_for_sync.config.read().await.sync_path.clone();
+            tracing::info!(target: "drive", id = %mount_for_sync.id, path = %sync_path.display(), "Starting background initial sync");
+            if let Err(e) = mount_for_sync
+                .sync_paths(vec![sync_path], crate::drive::sync::SyncMode::FullHierarchy)
+                .await
+            {
+                tracing::error!(target: "drive", id = %mount_for_sync.id, error = ?e, "Background initial sync failed");
+            } else {
+                tracing::info!(target: "drive", id = %mount_for_sync.id, "Background initial sync completed");
+            }
+        });
+
+        let mut write_guard = self.drives.write().await;
         let id = mount_arc.id.clone();
         write_guard.insert(id.clone(), mount_arc);
         Ok(id)

crates/cloudreve-sync/src/drive/mounts.rs

@@ -387,8 +387,6 @@ impl Mount {
             let sync_path = self.config.read().await.sync_path.clone();
             std::fs::create_dir_all(&sync_path).context("failed to create sync directory")?;
             self.start_fs_watcher().await?;
-            self.sync_paths(vec![sync_path], crate::drive::sync::SyncMode::FullHierarchy)
-                .await?;
             return Ok(());
         }
 

src-tauri/Cargo.toml

@@ -38,13 +38,13 @@ urlencoding = "2.1"
 # Main sync service crate
 cloudreve-sync = { path = "../crates/cloudreve-sync" }
 
-tauri-plugin-frame = "1.1.6"
 tauri-plugin-http = "2"
 tauri-plugin-opener = "2"
 tauri-plugin-deep-link = "2.4.9"
 tauri-plugin-dialog = "2.7.1"
 tauri-plugin-prevent-default = "4"
 tauri-plugin-os = "2"
+tauri-plugin-frame = "1.1.6"
 
 [target.'cfg(windows)'.dependencies.windows]
 version = "0.58.0"

src-tauri/src/commands.rs

@@ -14,6 +14,7 @@ use tauri::{
     webview::{WebviewWindow, WebviewWindowBuilder},
     AppHandle, Manager, State, WebviewUrl,
 };
+#[cfg(windows)]
 use tauri_plugin_frame::WebviewWindowExt;
 use tauri_plugin_positioner::{Position, WindowExt};
 use uuid::Uuid;
@@ -630,6 +631,7 @@ fn show_drive_window_internal(app: &AppHandle, title: &str, url_path: &str) {
                 let _ = window.set_effects(effects);
             }
             move_window_safely(&window, Position::Center, "add-drive");
+            #[cfg(windows)]
             let _ = window.create_overlay_titlebar();
             let _ = window.show();
             let _ = window.set_focus();
@@ -693,6 +695,7 @@ pub fn show_settings_window_impl(app: &AppHandle) {
                 let _ = window.set_effects(effects);
             }
             move_window_safely(&window, Position::Center, "settings");
+            #[cfg(windows)]
             let _ = window.create_overlay_titlebar();
             let _ = window.show();
             let _ = window.set_focus();

src-tauri/src/lib.rs

@@ -8,8 +8,9 @@ use tauri::{
     async_runtime::spawn,
     menu::{Menu, MenuItem},
     tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent},
-    AppHandle, Emitter, Manager, RunEvent,
+    AppHandle, Emitter, Listener, Manager, RunEvent,
 };
+#[cfg(not(target_os = "macos"))]
 use tauri_plugin_deep_link::DeepLinkExt;
 use tokio::sync::OnceCell;
 
@@ -258,7 +259,8 @@ pub fn run() {
     // Initialize i18n (uses config language setting or falls back to system locale)
     init_i18n();
 
-    tauri::Builder::default()
+    #[allow(unused_mut)]
+    let mut builder = tauri::Builder::default()
         .plugin(tauri_plugin_single_instance::init(|app, argv, _cwd| {
             tracing::info!("a new app instance was opened with {argv:?} and the deep link event was already triggered");
             if argv.len() > 1 {
@@ -268,8 +270,14 @@ pub fn run() {
             // when defining deep link schemes at runtime, you must also check `argv` here
         }))
         .plugin(tauri_plugin_opener::init())
-        .plugin(tauri_plugin_http::init())
-        .plugin(tauri_plugin_frame::init())
+        .plugin(tauri_plugin_http::init());
+
+    #[cfg(windows)]
+    {
+        builder = builder.plugin(tauri_plugin_frame::init());
+    }
+
+    builder
         .plugin(tauri_plugin_deep_link::init())
         .plugin(tauri_plugin_dialog::init())
         .plugin(tauri_plugin_os::init())
@@ -281,9 +289,21 @@ pub fn run() {
             // Setup system tray
             setup_tray(app)?;
 
-            #[cfg(desktop)]
+            #[cfg(not(target_os = "macos"))]
             app.deep_link().register("cloudreve")?;
 
+            // Listen for deep-link events (macOS and Linux)
+            let app_handle = app.handle().clone();
+            app.listen("deep-link://new-url", move |event: tauri::Event| {
+                if let Ok(urls) = serde_json::from_str::<Vec<String>>(event.payload()) {
+                    if let Some(url) = urls.first() {
+                        tracing::info!(target: "main", "Received deep-link URL: {}", url);
+                        let _ = app_handle.emit("deeplink", url.clone());
+                        show_add_drive_window_impl(&app_handle);
+                    }
+                }
+            });
+
             // Spawn async setup task - this runs in the background
             // while the app continues to start
             let app_handle = app.handle().clone();

src-tauri/tauri.conf.json

@@ -46,5 +46,12 @@
       "icons/icon.icns",
       "icons/icon.ico"
     ]
+  },
+  "plugins": {
+    "deep-link": {
+      "desktop": {
+        "schemes": ["cloudreve"]
+      }
+    }
   }
 }