pake-cli 3.11.7 → 3.11.9

package/src-tauri/src/app/window.rs

@@ -1,12 +1,14 @@
 use crate::app::config::PakeConfig;
-use crate::util::get_data_dir;
+use crate::util::{
+    check_file_or_append, get_data_dir, get_download_message_with_lang, show_toast, MessageType,
+};
 use std::{
     path::PathBuf,
     str::FromStr,
     sync::atomic::{AtomicU32, Ordering},
 };
 use tauri::{
-    webview::{NewWindowFeatures, NewWindowResponse},
+    webview::{DownloadEvent, NewWindowFeatures, NewWindowResponse},
     AppHandle, Config, Manager, Url, WebviewUrl, WebviewWindow, WebviewWindowBuilder,
 };
 
@@ -426,6 +428,61 @@ fn build_window(
         }
     }
 
+    // Capture webview-initiated downloads (blob:, data:, Content-Disposition,
+    // etc.) and write them to the OS Downloads folder. This is essential for
+    // sites with a strict Content-Security-Policy (e.g. Gemini): their
+    // `connect-src` blocks Tauri's IPC origin, so downloads cannot be routed
+    // through the JS bridge, and downloads triggered from a sandboxed iframe
+    // can't reach the IPC either. Letting the browser download natively and
+    // catching it here is independent of the page CSP and the IPC channel.
+    {
+        let download_handle = app.clone();
+        window_builder = window_builder.on_download(move |_webview, event| match event {
+            DownloadEvent::Requested { url, destination } => {
+                match download_handle.path().download_dir() {
+                    Ok(download_dir) => {
+                        let filename = destination
+                            .file_name()
+                            .map(|name| name.to_string_lossy().to_string())
+                            .filter(|name| !name.is_empty())
+                            .or_else(|| {
+                                url.path_segments()
+                                    .and_then(|mut segments| segments.next_back())
+                                    .map(|segment| segment.to_string())
+                                    .filter(|segment| !segment.is_empty())
+                            })
+                            .unwrap_or_else(|| "download".to_string());
+
+                        let target = download_dir.join(filename);
+                        if let Some(path_str) = target.to_str() {
+                            *destination = PathBuf::from(check_file_or_append(path_str));
+                        }
+                    }
+                    Err(error) => {
+                        eprintln!("[Pake] Failed to resolve download dir: {error}");
+                    }
+                }
+                true
+            }
+            DownloadEvent::Finished {
+                url: _,
+                path: _,
+                success,
+            } => {
+                if let Some(window) = download_handle.get_webview_window("pake") {
+                    let message_type = if success {
+                        MessageType::Success
+                    } else {
+                        MessageType::Failure
+                    };
+                    show_toast(&window, &get_download_message_with_lang(message_type, None));
+                }
+                true
+            }
+            _ => true,
+        });
+    }
+
     window_builder = window_builder.on_navigation(|_| true);
 
     window_builder.build()

package/src-tauri/src/inject/event.js

@@ -340,118 +340,19 @@ document.addEventListener("DOMContentLoaded", () => {
     true,
   );
 
-  // Collect blob urls to blob by overriding window.URL.createObjectURL
-  function collectUrlToBlobs() {
-    const backupCreateObjectURL = window.URL.createObjectURL;
-    window.blobToUrlCaches = new Map();
-    window.URL.createObjectURL = (blob) => {
-      const url = backupCreateObjectURL.call(window.URL, blob);
-      window.blobToUrlCaches.set(url, blob);
-      return url;
-    };
-  }
-
-  function convertBlobUrlToBinary(blobUrl) {
-    return new Promise((resolve, reject) => {
-      const blob = window.blobToUrlCaches.get(blobUrl);
-      if (!blob) {
-        fetch(blobUrl)
-          .then((res) => res.arrayBuffer())
-          .then((buffer) => resolve(Array.from(new Uint8Array(buffer))))
-          .catch(reject);
-        return;
-      }
-      const reader = new FileReader();
-      reader.readAsArrayBuffer(blob);
-      reader.onload = () => {
-        resolve(Array.from(new Uint8Array(reader.result)));
-      };
-      reader.onerror = () => reject(reader.error);
-    });
-  }
-
-  function downloadFromDataUri(dataURI, filename) {
-    try {
-      const byteString = atob(dataURI.split(",")[1]);
-      // write the bytes of the string to an ArrayBuffer
-      const bufferArray = new ArrayBuffer(byteString.length);
-
-      // create a view into the buffer
-      const binary = new Uint8Array(bufferArray);
-
-      // set the bytes of the buffer to the correct values
-      for (let i = 0; i < byteString.length; i++) {
-        binary[i] = byteString.charCodeAt(i);
-      }
-
-      // write the ArrayBuffer to a binary, and you're done
-      const userLanguage = getUserLanguage();
-      invoke("download_file_by_binary", {
-        params: {
-          filename,
-          binary: Array.from(binary),
-          language: userLanguage,
-        },
-      }).catch((error) => {
-        console.error("Failed to download data URI file:", filename, error);
-        showDownloadError(filename);
-      });
-    } catch (error) {
-      console.error("Failed to process data URI:", dataURI, error);
-      showDownloadError(filename || "file");
-    }
-  }
-
-  function downloadFromBlobUrl(blobUrl, filename) {
-    convertBlobUrlToBinary(blobUrl)
-      .then((binary) => {
-        const userLanguage = getUserLanguage();
-        invoke("download_file_by_binary", {
-          params: {
-            filename,
-            binary,
-            language: userLanguage,
-          },
-        }).catch((error) => {
-          console.error("Failed to download blob file:", filename, error);
-          showDownloadError(filename);
-        });
-      })
-      .catch((error) => {
-        console.error("Failed to convert blob to binary:", blobUrl, error);
-        showDownloadError(filename);
-      });
-  }
-
-  // detect blob download by createElement("a")
-  function detectDownloadByCreateAnchor() {
-    const createEle = document.createElement;
-    document.createElement = (el) => {
-      if (el !== "a") return createEle.call(document, el);
-      const anchorEle = createEle.call(document, el);
-
-      // use addEventListener to avoid overriding the original click event.
-      anchorEle.addEventListener(
-        "click",
-        (e) => {
-          const url = anchorEle.href;
-          const filename = anchorEle.download || getFilenameFromUrl(url);
-          if (window.blobToUrlCaches.has(url)) {
-            e.preventDefault();
-            e.stopImmediatePropagation();
-            downloadFromBlobUrl(url, filename);
-            // case: download from dataURL -> convert dataURL ->
-          } else if (url.startsWith("data:")) {
-            e.preventDefault();
-            e.stopImmediatePropagation();
-            downloadFromDataUri(url, filename);
-          }
-        },
-        true,
-      );
-
-      return anchorEle;
-    };
+  // Trigger a native browser download via a transient anchor click. The Rust
+  // on_download handler then writes the file to the Downloads folder. This is
+  // used for blob:/data: URLs because routing their bytes through the Tauri
+  // IPC fails on strict-CSP sites (e.g. Gemini), whose connect-src blocks the
+  // IPC origin. The native download path is independent of the page CSP.
+  function triggerNativeDownload(url, filename) {
+    const anchor = document.createElement("a");
+    anchor.href = url;
+    anchor.download = filename || "";
+    anchor.style.display = "none";
+    document.body.appendChild(anchor);
+    anchor.click();
+    document.body.removeChild(anchor);
   }
 
   // process special download protocol['data:','blob:']
@@ -587,11 +488,16 @@ document.addEventListener("DOMContentLoaded", () => {
         return;
       }
 
-      // Process download links for Rust to handle.
-      if (
-        isDownloadRequired(absoluteUrl, anchorElement, e) &&
-        !isSpecialDownload(absoluteUrl)
-      ) {
+      // Process download links.
+      if (isDownloadRequired(absoluteUrl, anchorElement, e)) {
+        // Let the browser download blob:/data: URLs natively; the Rust
+        // on_download handler saves them to the Downloads folder. Routing them
+        // through the IPC fails on strict-CSP sites (e.g. Gemini), whose
+        // connect-src blocks the IPC origin, and on downloads triggered from a
+        // sandboxed iframe where the IPC can't be reached.
+        if (isSpecialDownload(absoluteUrl)) {
+          return;
+        }
         e.preventDefault();
         e.stopImmediatePropagation();
         const userLanguage = getUserLanguage();
@@ -625,9 +531,6 @@ document.addEventListener("DOMContentLoaded", () => {
   // Prevent some special websites from executing in advance, before the click event is triggered.
   document.addEventListener("click", detectAnchorElementClick, true);
 
-  collectUrlToBlobs();
-  detectDownloadByCreateAnchor();
-
   // Rewrite the window.open function.
   const originalWindowOpen = window.open;
   window.open = function (url, name, specs) {
@@ -863,12 +766,10 @@ document.addEventListener("DOMContentLoaded", () => {
     const filename = getFilenameFromUrl(imageUrl) || "image";
 
     // Handle different URL types
-    if (imageUrl.startsWith("data:")) {
-      downloadFromDataUri(imageUrl, filename);
-    } else if (imageUrl.startsWith("blob:")) {
-      if (window.blobToUrlCaches && window.blobToUrlCaches.has(imageUrl)) {
-        downloadFromBlobUrl(imageUrl, filename);
-      }
+    if (isSpecialDownload(imageUrl)) {
+      // Download blob:/data: natively so it works under strict CSP; the Rust
+      // on_download handler saves it to the Downloads folder.
+      triggerNativeDownload(imageUrl, filename);
     } else {
       // Regular HTTP(S) image
       const userLanguage = getUserLanguage();

package/src-tauri/src/lib.rs

@@ -13,9 +13,8 @@ const WINDOW_SHOW_DELAY: u64 = 50;
 
 use app::{
     invoke::{
-        clear_cache_and_restart, clear_dock_badge, download_file, download_file_by_binary,
-        increment_dock_badge, send_notification, set_dock_badge, set_dock_badge_label,
-        update_theme_mode,
+        clear_cache_and_restart, clear_dock_badge, download_file, increment_dock_badge,
+        send_notification, set_dock_badge, set_dock_badge_label, update_theme_mode,
     },
     setup::{set_global_shortcut, set_system_tray},
     window::{open_additional_window_safe, set_window, MultiWindowState},
@@ -43,7 +42,7 @@ pub fn run_app() {
     let start_to_tray = pake_config.windows[0].start_to_tray && show_system_tray; // Only valid when tray is enabled
     let multi_instance = pake_config.multi_instance;
     let multi_window = pake_config.multi_window;
-    let enable_find = pake_config.windows[0].enable_find;
+    let _enable_find = pake_config.windows[0].enable_find;
 
     let window_state_plugin = WindowStatePlugin::default()
         .with_state_flags(if init_fullscreen {
@@ -81,7 +80,6 @@ pub fn run_app() {
     app_builder
         .invoke_handler(tauri::generate_handler![
             download_file,
-            download_file_by_binary,
             send_notification,
             increment_dock_badge,
             set_dock_badge,
@@ -99,7 +97,7 @@ pub fn run_app() {
             // --- Menu Construction Start ---
             #[cfg(target_os = "macos")]
             {
-                app::menu::set_app_menu(app.app_handle(), multi_window, enable_find)?;
+                app::menu::set_app_menu(app.app_handle(), multi_window, _enable_find)?;
 
                 // Event Handling for Custom Menu Item
                 app.on_menu_event(move |app_handle, event| {

package/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "productName": "Weekly",
   "identifier": "com.pake.weekly",
-  "version": "3.11.7",
+  "version": "3.11.9",
   "app": {
     "withGlobalTauri": true,
     "trayIcon": {