From e48b6812150dd53f09fa0ab36d7c8fa393eaa117 Mon Sep 17 00:00:00 2001
From: zhom <2717306+zhom@users.noreply.github.com>
Date: Fri, 8 Aug 2025 09:50:26 +0400
Subject: [PATCH] refactor: better error handling for browser download

---
 src-tauri/src/browser_runner.rs   | 55 ++++++++++++++++++++++++++++++-
 src/hooks/use-browser-download.ts | 13 ++++++--
 src/hooks/use-version-updater.ts  | 31 +++++++++++++----
 3 files changed, 90 insertions(+), 9 deletions(-)

diff --git a/src-tauri/src/browser_runner.rs b/src-tauri/src/browser_runner.rs
index 2374036..ba4151c 100644
--- a/src-tauri/src/browser_runner.rs
+++ b/src-tauri/src/browser_runner.rs
@@ -1250,6 +1250,59 @@ impl BrowserRunner {
     // Use the browser's own verification method
     let binaries_dir = self.get_binaries_dir();
     if !browser.is_version_downloaded(&version, &binaries_dir) {
+      // Provide detailed error information for debugging
+      let browser_dir = binaries_dir.join(&browser_str).join(&version);
+      let mut error_details = format!(
+        "Browser download completed but verification failed for {} {}. Expected directory: {}",
+        browser_str,
+        version,
+        browser_dir.display()
+      );
+
+      // List what files actually exist
+      if browser_dir.exists() {
+        error_details.push_str("\nFiles found in directory:");
+        if let Ok(entries) = std::fs::read_dir(&browser_dir) {
+          for entry in entries.flatten() {
+            let path = entry.path();
+            let file_type = if path.is_dir() { "DIR" } else { "FILE" };
+            error_details.push_str(&format!("\n  {} {}", file_type, path.display()));
+          }
+        } else {
+          error_details.push_str("\n  (Could not read directory contents)");
+        }
+      } else {
+        error_details.push_str("\nDirectory does not exist!");
+      }
+
+      // For Camoufox on Linux, provide specific expected files
+      if browser_str == "camoufox" && cfg!(target_os = "linux") {
+        let camoufox_subdir = browser_dir.join("camoufox");
+        error_details.push_str(&format!("\nExpected Camoufox executable locations:"));
+        error_details.push_str(&format!("\n  {}/camoufox-bin", camoufox_subdir.display()));
+        error_details.push_str(&format!("\n  {}/camoufox", camoufox_subdir.display()));
+
+        if camoufox_subdir.exists() {
+          error_details.push_str(&format!(
+            "\nCamoufox subdirectory exists: {}",
+            camoufox_subdir.display()
+          ));
+          if let Ok(entries) = std::fs::read_dir(&camoufox_subdir) {
+            error_details.push_str("\nFiles in camoufox subdirectory:");
+            for entry in entries.flatten() {
+              let path = entry.path();
+              let file_type = if path.is_dir() { "DIR" } else { "FILE" };
+              error_details.push_str(&format!("\n  {} {}", file_type, path.display()));
+            }
+          }
+        } else {
+          error_details.push_str(&format!(
+            "\nCamoufox subdirectory does not exist: {}",
+            camoufox_subdir.display()
+          ));
+        }
+      }
+
       let _ = registry.cleanup_failed_download(&browser_str, &version);
       let _ = registry.save();
       // Remove browser-version pair from downloading set on verification failure
@@ -1257,7 +1310,7 @@ impl BrowserRunner {
         let mut downloading = DOWNLOADING_BROWSERS.lock().unwrap();
         downloading.remove(&download_key);
       }
-      return Err("Browser download completed but verification failed".into());
+      return Err(error_details.into());
     }
 
     registry
diff --git a/src/hooks/use-browser-download.ts b/src/hooks/use-browser-download.ts
index fc3452f..353ba72 100644
--- a/src/hooks/use-browser-download.ts
+++ b/src/hooks/use-browser-download.ts
@@ -210,9 +210,18 @@ export function useBrowserDownload() {
         if (!suppressNotifications) {
           // Dismiss any existing download toast and show error
           dismissToast(`download-${browserStr}-${version}`);
+
+          let errorMessage = "Unknown error occurred";
+          if (error instanceof Error) {
+            errorMessage = error.message;
+          } else if (typeof error === "string") {
+            errorMessage = error;
+          } else if (error && typeof error === "object" && "message" in error) {
+            errorMessage = String(error.message);
+          }
+
           showErrorToast(`Failed to download ${browserName} ${version}`, {
-            description:
-              error instanceof Error ? error.message : "Unknown error occurred",
+            description: errorMessage,
           });
         }
         throw error;
diff --git a/src/hooks/use-version-updater.ts b/src/hooks/use-version-updater.ts
index 3e2a458..e895ce6 100644
--- a/src/hooks/use-version-updater.ts
+++ b/src/hooks/use-version-updater.ts
@@ -245,11 +245,22 @@ export function useVersionUpdater() {
                 }
               } catch (error) {
                 console.error("Failed to handle browser auto-update:", error);
+
+                let errorMessage = "Unknown error occurred";
+                if (error instanceof Error) {
+                  errorMessage = error.message;
+                } else if (typeof error === "string") {
+                  errorMessage = error;
+                } else if (
+                  error &&
+                  typeof error === "object" &&
+                  "message" in error
+                ) {
+                  errorMessage = String(error.message);
+                }
+
                 showErrorToast(`Failed to auto-update ${browserDisplayName}`, {
-                  description:
-                    error instanceof Error
-                      ? error.message
-                      : "Unknown error occurred",
+                  description: errorMessage,
                   duration: 8000,
                 });
               } finally {
@@ -336,9 +347,17 @@ export function useVersionUpdater() {
       return results;
     } catch (error) {
       console.error("Failed to trigger manual update:", error);
+      let errorMessage = "Unknown error occurred";
+      if (error instanceof Error) {
+        errorMessage = error.message;
+      } else if (typeof error === "string") {
+        errorMessage = error;
+      } else if (error && typeof error === "object" && "message" in error) {
+        errorMessage = String(error.message);
+      }
+
       showErrorToast("Failed to update browser versions", {
-        description:
-          error instanceof Error ? error.message : "Unknown error occurred",
+        description: errorMessage,
         duration: 4000,
       });
       throw error;