pake-cli 3.5.3 → 3.6.0

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

@@ -0,0 +1,75 @@
+// OAuth and Authentication Logic
+
+// Check if URL matches OAuth/authentication patterns
+function matchesAuthUrl(url, baseUrl = window.location.href) {
+  try {
+    const urlObj = new URL(url, baseUrl);
+    const hostname = urlObj.hostname.toLowerCase();
+    const pathname = urlObj.pathname.toLowerCase();
+    const fullUrl = urlObj.href.toLowerCase();
+
+    // Common OAuth providers and paths
+    const oauthPatterns = [
+      /accounts\.google\.com/,
+      /accounts\.google\.[a-z]+/,
+      /login\.microsoftonline\.com/,
+      /github\.com\/login/,
+      /facebook\.com\/.*\/dialog/,
+      /twitter\.com\/oauth/,
+      /appleid\.apple\.com/,
+      /\/oauth\//,
+      /\/auth\//,
+      /\/authorize/,
+      /\/login\/oauth/,
+      /\/signin/,
+      /\/login/,
+      /servicelogin/,
+      /\/o\/oauth2/,
+    ];
+
+    const isMatch = oauthPatterns.some(
+      (pattern) =>
+        pattern.test(hostname) ||
+        pattern.test(pathname) ||
+        pattern.test(fullUrl),
+    );
+
+    if (isMatch) {
+      console.log("[Pake] OAuth URL detected:", url);
+    }
+
+    return isMatch;
+  } catch (e) {
+    return false;
+  }
+}
+
+// Check if URL is an OAuth/authentication link
+function isAuthLink(url) {
+  return matchesAuthUrl(url);
+}
+
+// Check if this is an OAuth/authentication popup
+function isAuthPopup(url, name) {
+  // Check for known authentication window names
+  const authWindowNames = [
+    "AppleAuthentication",
+    "oauth2",
+    "oauth",
+    "google-auth",
+    "auth-popup",
+    "signin",
+    "login",
+  ];
+
+  if (authWindowNames.includes(name)) {
+    return true;
+  }
+
+  return matchesAuthUrl(url);
+}
+
+// Export functions to global scope
+window.matchesAuthUrl = matchesAuthUrl;
+window.isAuthLink = isAuthLink;
+window.isAuthPopup = isAuthPopup;

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

@@ -394,6 +394,12 @@ document.addEventListener("DOMContentLoaded", () => {
       const absoluteUrl = hrefUrl.href;
       let filename = anchorElement.download || getFilenameFromUrl(absoluteUrl);
 
+      // Early check: Allow OAuth/authentication links to navigate naturally
+      if (window.isAuthLink(absoluteUrl)) {
+        console.log("[Pake] Allowing OAuth navigation to:", absoluteUrl);
+        return;
+      }
+
       // Handle _blank links: same domain navigates in-app, cross-domain opens new window
       if (target === "_blank") {
         if (forceInternalNavigation) {
@@ -477,7 +483,8 @@ document.addEventListener("DOMContentLoaded", () => {
   // Rewrite the window.open function.
   const originalWindowOpen = window.open;
   window.open = function (url, name, specs) {
-    if (name === "AppleAuthentication") {
+    // Allow authentication popups to open normally
+    if (window.isAuthPopup(url, name)) {
       return originalWindowOpen.call(window, url, name, specs);
     }
 

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

@@ -0,0 +1,124 @@
+document.addEventListener("DOMContentLoaded", () => {
+  // Helper: Calculate brightness from RGB color
+  const isDarkColor = (color) => {
+    if (!color) return false;
+    const match = color.match(/rgba?\((\d+),\s*(\d+),\s*(\d+)/);
+    if (!match) return false;
+    const r = parseInt(match[1]);
+    const g = parseInt(match[2]);
+    const b = parseInt(match[3]);
+    // Standard luminance formula
+    const luminance = 0.299 * r + 0.587 * g + 0.114 * b;
+    return luminance < 128;
+  };
+
+  // Debounce helper
+  const debounce = (func, wait) => {
+    let timeout;
+    return function executedFunction(...args) {
+      const later = () => {
+        clearTimeout(timeout);
+        func(...args);
+      };
+      clearTimeout(timeout);
+      timeout = setTimeout(later, wait);
+    };
+  };
+
+  // Function to detect and send theme to Rust
+  const updateTheme = () => {
+    let mode = "light";
+    let detected = false;
+
+    // Strategy 1: Explicit DOM Class/Attribute (High Priority)
+    // Many apps use specific classes for hard-coded themes
+    const doc = document.documentElement;
+    const body = document.body;
+
+    const isExplicitDark =
+      doc.classList.contains("dark") ||
+      body.classList.contains("dark") ||
+      doc.getAttribute("data-theme") === "dark" ||
+      body.getAttribute("data-theme") === "dark" ||
+      doc.style.colorScheme === "dark";
+
+    const isExplicitLight =
+      doc.classList.contains("light") ||
+      body.classList.contains("light") ||
+      doc.getAttribute("data-theme") === "light" ||
+      body.getAttribute("data-theme") === "light" ||
+      doc.style.colorScheme === "light";
+
+    if (isExplicitDark) {
+      mode = "dark";
+      detected = true;
+    } else if (isExplicitLight) {
+      mode = "light";
+      detected = true;
+    }
+
+    // Strategy 2: Computed Background Color (Fallback & Verification)
+    // If no explicit class is found, or to double-check, look at the actual background color.
+    // This is useful when the site relies purely on CSS media queries without classes.
+    if (!detected) {
+      const bodyBg = window.getComputedStyle(document.body).backgroundColor;
+      const htmlBg = window.getComputedStyle(
+        document.documentElement,
+      ).backgroundColor;
+
+      // Check body first, then html
+      if (bodyBg && bodyBg !== "rgba(0, 0, 0, 0)" && bodyBg !== "transparent") {
+        mode = isDarkColor(bodyBg) ? "dark" : "light";
+      } else if (
+        htmlBg &&
+        htmlBg !== "rgba(0, 0, 0, 0)" &&
+        htmlBg !== "transparent"
+      ) {
+        mode = isDarkColor(htmlBg) ? "dark" : "light";
+      } else {
+        // Strategy 3: System Preference (Last Resort)
+        if (
+          window.matchMedia &&
+          window.matchMedia("(prefers-color-scheme: dark)").matches
+        ) {
+          mode = "dark";
+        }
+      }
+    }
+
+    // Send to Rust
+    if (window.__TAURI__ && window.__TAURI__.core) {
+      window.__TAURI__.core.invoke("update_theme_mode", { mode });
+    }
+  };
+
+  // Debounced version of updateTheme
+  const debouncedUpdateTheme = debounce(updateTheme, 200);
+
+  // Initial check
+  // Delay slightly to ensure styles are applied
+  setTimeout(updateTheme, 100);
+
+  // Watch for system theme changes
+  window
+    .matchMedia("(prefers-color-scheme: dark)")
+    .addEventListener("change", updateTheme);
+
+  // Watch for DOM changes
+  // We observe attributes for class changes, and also style changes just in case
+  const observer = new MutationObserver((mutations) => {
+    debouncedUpdateTheme();
+  });
+
+  observer.observe(document.documentElement, {
+    attributes: true,
+    attributeFilter: ["class", "data-theme", "style"],
+    subtree: false,
+  });
+
+  observer.observe(document.body, {
+    attributes: true,
+    attributeFilter: ["class", "data-theme", "style"],
+    subtree: false,
+  });
+});

package/src-tauri/src/lib.rs

@@ -9,8 +9,14 @@ use tauri_plugin_window_state::StateFlags;
 #[cfg(target_os = "macos")]
 use std::time::Duration;
 
+use tauri::menu::{AboutMetadata, Menu, MenuItem, PredefinedMenuItem, Submenu};
+use tauri_plugin_opener::OpenerExt; // Add this
+
 use app::{
-    invoke::{download_file, download_file_by_binary, send_notification},
+    invoke::{
+        clear_cache_and_restart, download_file, download_file_by_binary, send_notification,
+        update_theme_mode,
+    },
     setup::{set_global_shortcut, set_system_tray},
     window::set_window,
 };
@@ -42,7 +48,8 @@ pub fn run_app() {
         .plugin(tauri_plugin_oauth::init())
         .plugin(tauri_plugin_http::init())
         .plugin(tauri_plugin_shell::init())
-        .plugin(tauri_plugin_notification::init());
+        .plugin(tauri_plugin_notification::init())
+        .plugin(tauri_plugin_opener::init()); // Add this
 
     // Only add single instance plugin if multiple instances are not allowed
     if !multi_instance {
@@ -60,8 +67,246 @@ pub fn run_app() {
             download_file,
             download_file_by_binary,
             send_notification,
+            update_theme_mode,
+            clear_cache_and_restart,
         ])
         .setup(move |app| {
+            // --- Menu Construction Start ---
+            let pake_version = env!("CARGO_PKG_VERSION");
+            let pake_menu_item_title = format!("Built with Pake V{}", pake_version);
+
+            // App Menu (macOS specific, e.g., "Pake")
+            let app_menu = Submenu::new(app, "Pake", true)?;
+            let about_metadata = AboutMetadata::default();
+            app_menu.append(&PredefinedMenuItem::about(
+                app,
+                Some("Pake"),
+                Some(about_metadata),
+            )?)?;
+            app_menu.append(&PredefinedMenuItem::separator(app)?)?;
+            app_menu.append(&PredefinedMenuItem::services(app, None)?)?;
+            app_menu.append(&PredefinedMenuItem::separator(app)?)?;
+            app_menu.append(&PredefinedMenuItem::hide(app, None)?)?;
+            app_menu.append(&PredefinedMenuItem::hide_others(app, None)?)?;
+            app_menu.append(&PredefinedMenuItem::show_all(app, None)?)?;
+            app_menu.append(&PredefinedMenuItem::separator(app)?)?;
+            app_menu.append(&PredefinedMenuItem::quit(app, None)?)?;
+
+            // File Menu
+            let file_menu = Submenu::new(app, "File", true)?;
+            file_menu.append(&PredefinedMenuItem::close_window(app, None)?)?;
+            file_menu.append(&PredefinedMenuItem::separator(app)?)?;
+            file_menu.append(&MenuItem::with_id(
+                app,
+                "clear_cache_restart",
+                "Clear Cache & Restart",
+                true,
+                Some("CmdOrCtrl+Shift+Backspace"),
+            )?)?;
+
+            // Edit Menu
+            let edit_menu = Submenu::new(app, "Edit", true)?;
+            edit_menu.append(&PredefinedMenuItem::undo(app, None)?)?;
+            edit_menu.append(&PredefinedMenuItem::redo(app, None)?)?;
+            edit_menu.append(&PredefinedMenuItem::separator(app)?)?;
+            edit_menu.append(&PredefinedMenuItem::cut(app, None)?)?;
+            edit_menu.append(&PredefinedMenuItem::copy(app, None)?)?;
+            edit_menu.append(&PredefinedMenuItem::paste(app, None)?)?;
+            edit_menu.append(&PredefinedMenuItem::select_all(app, None)?)?;
+            edit_menu.append(&PredefinedMenuItem::separator(app)?)?;
+            edit_menu.append(&MenuItem::with_id(
+                app,
+                "copy_url",
+                "Copy URL",
+                true,
+                Some("CmdOrCtrl+L"),
+            )?)?;
+
+            // View Menu
+            let view_menu = Submenu::new(app, "View", true)?;
+            view_menu.append(&MenuItem::with_id(
+                app,
+                "reload",
+                "Reload",
+                true,
+                Some("CmdOrCtrl+R"),
+            )?)?;
+            view_menu.append(&PredefinedMenuItem::separator(app)?)?;
+            view_menu.append(&MenuItem::with_id(
+                app,
+                "zoom_in",
+                "Zoom In",
+                true,
+                Some("CmdOrCtrl+="),
+            )?)?;
+            view_menu.append(&MenuItem::with_id(
+                app,
+                "zoom_out",
+                "Zoom Out",
+                true,
+                Some("CmdOrCtrl+-"),
+            )?)?;
+            view_menu.append(&MenuItem::with_id(
+                app,
+                "zoom_reset",
+                "Actual Size",
+                true,
+                Some("CmdOrCtrl+0"),
+            )?)?;
+            view_menu.append(&PredefinedMenuItem::separator(app)?)?;
+            view_menu.append(&PredefinedMenuItem::fullscreen(app, None)?)?;
+            view_menu.append(&PredefinedMenuItem::separator(app)?)?;
+            view_menu.append(&MenuItem::with_id(
+                app,
+                "toggle_devtools",
+                "Toggle Developer Tools",
+                cfg!(debug_assertions),
+                Some("CmdOrCtrl+Option+I"),
+            )?)?;
+
+            // Navigation Menu
+            let navigation_menu = Submenu::new(app, "Navigation", true)?;
+            navigation_menu.append(&MenuItem::with_id(
+                app,
+                "go_back",
+                "Back",
+                true,
+                Some("CmdOrCtrl+["),
+            )?)?;
+            navigation_menu.append(&MenuItem::with_id(
+                app,
+                "go_forward",
+                "Forward",
+                true,
+                Some("CmdOrCtrl+]"),
+            )?)?;
+            navigation_menu.append(&MenuItem::with_id(
+                app,
+                "go_home",
+                "Go Home",
+                true,
+                Some("CmdOrCtrl+Shift+H"),
+            )?)?;
+
+            // Window Menu
+            let window_menu = Submenu::new(app, "Window", true)?;
+            window_menu.append(&PredefinedMenuItem::minimize(app, None)?)?;
+            window_menu.append(&PredefinedMenuItem::maximize(app, None)?)?;
+            window_menu.append(&PredefinedMenuItem::separator(app)?)?;
+            window_menu.append(&MenuItem::with_id(
+                app,
+                "always_on_top",
+                "Toggle Always on Top",
+                true,
+                None::<&str>,
+            )?)?;
+            window_menu.append(&PredefinedMenuItem::separator(app)?)?;
+            window_menu.append(&PredefinedMenuItem::close_window(app, None)?)?;
+
+            // Help Menu (Custom)
+            let help_menu = Submenu::new(app, "Help", true)?;
+            let github_item = MenuItem::with_id(
+                app,
+                "pake_github_link",
+                &pake_menu_item_title,
+                true,
+                None::<&str>,
+            )?;
+            help_menu.append(&github_item)?;
+
+            // Construct the Menu Bar
+            let menu = Menu::with_items(
+                app,
+                &[
+                    &app_menu,
+                    &file_menu,
+                    &edit_menu,
+                    &view_menu,
+                    &navigation_menu,
+                    &window_menu,
+                    &help_menu,
+                ],
+            )?;
+
+            app.set_menu(menu)?;
+
+            // Event Handling for Custom Menu Item
+            app.on_menu_event(move |app_handle, event| {
+                match event.id().as_ref() {
+                    "pake_github_link" => {
+                        let _ = app_handle
+                            .opener()
+                            .open_url("https://github.com/tw93/Pake", None::<&str>);
+                    }
+                    "reload" => {
+                        if let Some(window) = app_handle.get_webview_window("pake") {
+                            let _ = window.eval("window.location.reload()");
+                        }
+                    }
+                    "toggle_devtools" => {
+                        #[cfg(debug_assertions)] // Only allow in debug builds
+                        if let Some(window) = app_handle.get_webview_window("pake") {
+                            if window.is_devtools_open() {
+                                window.close_devtools();
+                            } else {
+                                window.open_devtools();
+                            }
+                        }
+                    }
+                    "zoom_in" => {
+                        if let Some(window) = app_handle.get_webview_window("pake") {
+                            let _ = window.eval("zoomIn()");
+                        }
+                    }
+                    "zoom_out" => {
+                        if let Some(window) = app_handle.get_webview_window("pake") {
+                            let _ = window.eval("zoomOut()");
+                        }
+                    }
+                    "zoom_reset" => {
+                        if let Some(window) = app_handle.get_webview_window("pake") {
+                            let _ = window.eval("setZoom('100%')");
+                        }
+                    }
+                    "go_back" => {
+                        if let Some(window) = app_handle.get_webview_window("pake") {
+                            let _ = window.eval("window.history.back()");
+                        }
+                    }
+                    "go_forward" => {
+                        if let Some(window) = app_handle.get_webview_window("pake") {
+                            let _ = window.eval("window.history.forward()");
+                        }
+                    }
+                    "go_home" => {
+                        if let Some(window) = app_handle.get_webview_window("pake") {
+                            let _ = window.eval("window.location.href = window.pakeConfig.url");
+                        }
+                    }
+                    "copy_url" => {
+                        if let Some(window) = app_handle.get_webview_window("pake") {
+                            let _ =
+                                window.eval("navigator.clipboard.writeText(window.location.href)");
+                        }
+                    }
+                    "clear_cache_restart" => {
+                        if let Some(window) = app_handle.get_webview_window("pake") {
+                            if let Ok(_) = window.clear_all_browsing_data() {
+                                app_handle.restart();
+                            }
+                        }
+                    }
+                    "always_on_top" => {
+                        if let Some(window) = app_handle.get_webview_window("pake") {
+                            let is_on_top = window.is_always_on_top().unwrap_or(false);
+                            let _ = window.set_always_on_top(!is_on_top);
+                        }
+                    }
+                    _ => {}
+                }
+            });
+            // --- Menu Construction End ---
+
             let window = set_window(app, &pake_config, &tauri_config);
             set_system_tray(
                 app.app_handle(),

package/src-tauri/tauri.conf.json

@@ -10,7 +10,8 @@
       "id": "pake-tray"
     },
     "security": {
-      "headers": {}
+      "headers": {},
+      "csp": null
     }
   },
   "build": {