pake-cli 3.11.2 → 3.11.4

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "pake-cli",
-  "version": "3.11.2",
+  "version": "3.11.4",
   "description": "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。",
   "engines": {
     "node": ">=18.0.0"
   },
   "packageManager": "pnpm@10.26.2",
   "bin": {
-    "pake": "./dist/cli.js"
+    "pake": "dist/cli.js"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/tw93/pake.git"
+    "url": "git+https://github.com/tw93/pake.git"
   },
   "author": {
     "name": "Tw93",
@@ -73,7 +73,6 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^25.3.2",
-    "@types/page-icon": "^0.3.6",
     "@types/prompts": "^2.4.9",
     "@types/tmp": "^0.2.6",
     "@types/update-notifier": "^6.0.8",
@@ -88,7 +87,8 @@
   },
   "pnpm": {
     "overrides": {
-      "sharp": "^0.34.5"
+      "sharp": "^0.34.5",
+      "@img/sharp-libvips-darwin-arm64": "1.2.4"
     },
     "onlyBuiltDependencies": [
       "esbuild",

package/src-tauri/Cargo.lock

@@ -2564,7 +2564,7 @@ dependencies = [
 
 [[package]]
 name = "pake"
-version = "3.11.2"
+version = "3.11.3"
 dependencies = [
  "serde",
  "serde_json",
@@ -4575,9 +4575,7 @@ dependencies = [
  "bytes",
  "libc",
  "mio",
- "parking_lot",
  "pin-project-lite",
- "signal-hook-registry",
  "socket2",
  "tokio-macros",
  "windows-sys 0.61.2",

package/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pake"
-version = "3.11.2"
+version = "3.11.4"
 description = "🤱🏻 Turn any webpage into a desktop app with Rust."
 authors = ["Tw93"]
 license = "MIT"
@@ -20,7 +20,7 @@ tauri-build = { version = "2.5.5", features = [] }
 [dependencies]
 serde_json = "1.0.149"
 serde = { version = "1.0.228", features = ["derive"] }
-tokio = { version = "1.49.0", features = ["full"] }
+tokio = { version = "1.49.0", features = ["time"] }
 tauri = { version = "2.10.2", features = [
   "tray-icon",
   "image-ico",
@@ -48,7 +48,7 @@ custom-protocol = ["tauri/custom-protocol"]
 
 [profile.release]
 panic = "abort"
-codegen-units = 16
+codegen-units = 1
 lto = "thin"
 opt-level = "z"
 strip = true

package/src-tauri/pake.json

@@ -24,9 +24,9 @@
     }
   ],
   "user_agent": {
-    "macos": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.2 Safari/605.1.15",
-    "linux": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36",
-    "windows": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36"
+    "macos": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Safari/605.1.15",
+    "linux": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/147.0.0.0 Safari/537.36",
+    "windows": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/147.0.0.0 Safari/537.36"
   },
   "system_tray": {
     "macos": false,

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

@@ -39,7 +39,7 @@ pub fn set_system_tray(
 
     app.app_handle().remove_tray_by_id("pake-tray");
 
-    let tray = TrayIconBuilder::new()
+    let mut tray_builder = TrayIconBuilder::new()
         .menu(&menu)
         .on_menu_event(move |app, event| match event.id().as_ref() {
             "new_window" => {
@@ -47,12 +47,12 @@ pub fn set_system_tray(
             }
             "hide_app" => {
                 if let Some(window) = app.get_webview_window("pake") {
-                    window.minimize().unwrap();
+                    let _ = window.minimize();
                 }
             }
             "show_app" => {
                 if let Some(window) = app.get_webview_window("pake") {
-                    window.show().unwrap();
+                    let _ = window.show();
                     #[cfg(target_os = "linux")]
                     if _init_fullscreen && !window.is_fullscreen().unwrap_or(false) {
                         let _ = window.set_fullscreen(true);
@@ -61,8 +61,8 @@ pub fn set_system_tray(
                 }
             }
             "quit" => {
-                app.save_window_state(StateFlags::all()).unwrap();
-                std::process::exit(0);
+                let _ = app.save_window_state(StateFlags::all());
+                app.exit(0);
             }
             _ => (),
         })
@@ -72,10 +72,10 @@ pub fn set_system_tray(
                     if let Some(window) = tray.app_handle().get_webview_window("pake") {
                         let is_visible = window.is_visible().unwrap_or(false);
                         if is_visible {
-                            window.hide().unwrap();
+                            let _ = window.hide();
                         } else {
-                            window.show().unwrap();
-                            window.set_focus().unwrap();
+                            let _ = window.show();
+                            let _ = window.set_focus();
                             #[cfg(target_os = "linux")]
                             if _init_fullscreen && !window.is_fullscreen().unwrap_or(false) {
                                 let _ = window.set_fullscreen(true);
@@ -85,20 +85,23 @@ pub fn set_system_tray(
                 }
             }
             _ => {}
-        })
-        .icon(if tray_icon_path.is_empty() {
-            app.default_window_icon()
-                .unwrap_or_else(|| panic!("Failed to get default window icon"))
-                .clone()
-        } else {
-            tauri::image::Image::from_path(tray_icon_path).unwrap_or_else(|_| {
-                // If custom tray icon fails to load, fallback to default
-                app.default_window_icon()
-                    .unwrap_or_else(|| panic!("Failed to get default window icon"))
-                    .clone()
-            })
-        })
-        .build(app)?;
+        });
+
+    let resolved_icon = if tray_icon_path.is_empty() {
+        app.default_window_icon().cloned()
+    } else {
+        tauri::image::Image::from_path(tray_icon_path)
+            .ok()
+            .or_else(|| app.default_window_icon().cloned())
+    };
+
+    if let Some(icon) = resolved_icon {
+        tray_builder = tray_builder.icon(icon);
+    } else {
+        eprintln!("[Pake] No tray icon available; tray will build without an icon.");
+    }
+
+    let tray = tray_builder.build(app)?;
 
     tray.set_icon_as_template(false)?;
     Ok(())
@@ -114,7 +117,10 @@ pub fn set_global_shortcut(
     }
 
     let app_handle = app.clone();
-    let shortcut_hotkey = Shortcut::from_str(&shortcut).unwrap();
+    let shortcut_hotkey = match Shortcut::from_str(&shortcut) {
+        Ok(s) => s,
+        Err(_) => return Ok(()),
+    };
     let last_triggered = Arc::new(Mutex::new(Instant::now()));
 
     app_handle
@@ -123,7 +129,9 @@ pub fn set_global_shortcut(
                 .with_handler({
                     let last_triggered = Arc::clone(&last_triggered);
                     move |app, event, _shortcut| {
-                        let mut last_triggered = last_triggered.lock().unwrap();
+                        let Ok(mut last_triggered) = last_triggered.lock() else {
+                            return;
+                        };
                         if Instant::now().duration_since(*last_triggered)
                             < Duration::from_millis(300)
                         {
@@ -133,12 +141,12 @@ pub fn set_global_shortcut(
 
                         if shortcut_hotkey.eq(event) {
                             if let Some(window) = app.get_webview_window("pake") {
-                                let is_visible = window.is_visible().unwrap();
+                                let is_visible = window.is_visible().unwrap_or(false);
                                 if is_visible {
-                                    window.hide().unwrap();
+                                    let _ = window.hide();
                                 } else {
-                                    window.show().unwrap();
-                                    window.set_focus().unwrap();
+                                    let _ = window.show();
+                                    let _ = window.set_focus();
                                     #[cfg(target_os = "linux")]
                                     if _init_fullscreen && !window.is_fullscreen().unwrap_or(false)
                                     {
@@ -153,7 +161,7 @@ pub fn set_global_shortcut(
         )
         .expect("Failed to set global shortcut");
 
-    app.global_shortcut().register(shortcut_hotkey).unwrap();
+    let _ = app.global_shortcut().register(shortcut_hotkey);
 
     Ok(())
 }

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

@@ -1,6 +1,10 @@
 use crate::app::config::PakeConfig;
 use crate::util::get_data_dir;
-use std::{path::PathBuf, str::FromStr, sync::Mutex};
+use std::{
+    path::PathBuf,
+    str::FromStr,
+    sync::atomic::{AtomicU32, Ordering},
+};
 use tauri::{
     webview::{NewWindowFeatures, NewWindowResponse},
     AppHandle, Config, Manager, Url, WebviewUrl, WebviewWindow, WebviewWindowBuilder,
@@ -28,7 +32,7 @@ fn build_proxy_browser_arg(url: &Url) -> Option<String> {
 pub struct MultiWindowState {
     pub pake_config: PakeConfig,
     pub tauri_config: Config,
-    next_window_index: Mutex<u32>,
+    next_window_index: AtomicU32,
 }
 
 impl MultiWindowState {
@@ -36,14 +40,13 @@ impl MultiWindowState {
         Self {
             pake_config,
             tauri_config,
-            next_window_index: Mutex::new(0),
+            next_window_index: AtomicU32::new(0),
         }
     }
 
     fn next_window_label(&self) -> String {
-        let mut index = self.next_window_index.lock().unwrap();
-        *index += 1;
-        format!("pake-{}", *index)
+        let index = self.next_window_index.fetch_add(1, Ordering::Relaxed) + 1;
+        format!("pake-{index}")
     }
 }
 
@@ -124,9 +127,25 @@ fn build_window_with_label(
         .first()
         .expect("At least one window configuration is required");
     let url = match window_config.url_type.as_str() {
-        "web" => WebviewUrl::App(window_config.url.parse().unwrap()),
+        "web" => {
+            let parsed = window_config.url.parse().map_err(|err| {
+                tauri::Error::Io(std::io::Error::new(
+                    std::io::ErrorKind::InvalidInput,
+                    format!(
+                        "Invalid 'web' url '{}' in pake.json: {err}",
+                        window_config.url
+                    ),
+                ))
+            })?;
+            WebviewUrl::App(parsed)
+        }
         "local" => WebviewUrl::App(PathBuf::from(&window_config.url)),
-        _ => panic!("url type can only be web or local"),
+        other => {
+            return Err(tauri::Error::Io(std::io::Error::new(
+                std::io::ErrorKind::InvalidInput,
+                format!("url_type must be 'web' or 'local', got '{other}'"),
+            )));
+        }
     };
 
     build_window(
@@ -154,7 +173,10 @@ fn build_window(
         visible,
         new_window_features,
     } = opts;
-    let package_name = tauri_config.clone().product_name.unwrap();
+    let package_name = tauri_config
+        .product_name
+        .clone()
+        .unwrap_or_else(|| "pake".to_string());
     let _data_dir = get_data_dir(app, package_name);
 
     let window_config = config
@@ -166,7 +188,7 @@ fn build_window(
 
     let config_script = format!(
         "window.pakeConfig = {}",
-        serde_json::to_string(&window_config).unwrap()
+        serde_json::to_string(&window_config).unwrap_or_else(|_| "{}".to_string())
     );
 
     // Platform-specific title: macOS prefers empty, others fallback to product name

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

@@ -257,6 +257,21 @@ function isDownloadableFile(url) {
   }
 }
 
+function normalizeAnchorHref(rawHref) {
+  return typeof rawHref === "string" ? rawHref.trim() : "";
+}
+
+function shouldBypassPakeLinkHandling(rawHref) {
+  const normalizedHref = normalizeAnchorHref(rawHref).toLowerCase();
+  if (!normalizedHref) {
+    return false;
+  }
+
+  return (
+    normalizedHref.startsWith("javascript:") || normalizedHref.startsWith("#")
+  );
+}
+
 document.addEventListener("DOMContentLoaded", () => {
   const tauri = window.__TAURI__;
   const appWindow = tauri.window.getCurrentWindow();
@@ -506,6 +521,11 @@ document.addEventListener("DOMContentLoaded", () => {
     const anchorElement = e.target.closest("a");
 
     if (anchorElement && anchorElement.href) {
+      const rawHref = anchorElement.getAttribute("href") || "";
+      if (shouldBypassPakeLinkHandling(rawHref)) {
+        return;
+      }
+
       const target = anchorElement.target;
       const hrefUrl = new URL(anchorElement.href);
       const absoluteUrl = hrefUrl.href;
@@ -611,6 +631,16 @@ document.addEventListener("DOMContentLoaded", () => {
   // Rewrite the window.open function.
   const originalWindowOpen = window.open;
   window.open = function (url, name, specs) {
+    const normalizedUrl = normalizeAnchorHref(url);
+    if (normalizedUrl.startsWith("#")) {
+      window.location.href = new URL(normalizedUrl, window.location.href).href;
+      return window;
+    }
+
+    if (shouldBypassPakeLinkHandling(url)) {
+      return originalWindowOpen.call(window, url, name, specs);
+    }
+
     // Allow authentication popups to open normally
     if (window.isAuthPopup(url, name)) {
       return originalWindowOpen.call(window, url, name, specs);
@@ -997,23 +1027,41 @@ document.addEventListener("DOMContentLoaded", () => {
 
 document.addEventListener("DOMContentLoaded", function () {
   let permVal = "granted";
+  let lastNotifTime = 0;
+  let lastNotif = null;
+
+  window.addEventListener("focus", () => {
+    if (lastNotif?.onclick && Date.now() - lastNotifTime < 5000) {
+      lastNotif.onclick(new Event("click"));
+      lastNotif = null;
+    }
+  });
+
   window.Notification = function (title, options) {
     const { invoke } = window.__TAURI__.core;
     const body = options?.body || "";
     let icon = options?.icon || "";
 
-    // If the icon is a relative path, convert to full path using URI
     if (icon.startsWith("/")) {
       icon = window.location.origin + icon;
     }
 
-    invoke("send_notification", {
-      params: {
-        title,
-        body,
-        icon,
-      },
+    const notif = {
+      onclick: null,
+      onclose: null,
+      onshow: null,
+      onerror: null,
+      close: () => {},
+    };
+
+    lastNotifTime = Date.now();
+    lastNotif = notif;
+
+    invoke("send_notification", { params: { title, body, icon } }).then(() => {
+      if (notif.onshow) notif.onshow(new Event("show"));
     });
+
+    return notif;
   };
 
   window.Notification.requestPermission = async () => "granted";

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

@@ -119,15 +119,18 @@ window.addEventListener("DOMContentLoaded", (_event) => {
 
     #react-root [data-testid="placementTracking"] article,
     #react-root a[href*="quick_promote_web"],
-    #react-root [data-testid="AppTabBar_Explore_Link"],
     #react-root a[href*="/lists"][role="link"][aria-label],
     #react-root a[href*="/i/communitynotes"][role="link"][aria-label],
     #react-root a[role="link"][aria-label="Communities"],
+    #react-root a[role="link"][aria-label="Premium"],
+    #react-root a[role="link"][aria-label="SuperGrok"],
     #react-root a[href*="/i/verified-orgs-signup"][role="link"][aria-label] {
       display: none !important;
     }
 
     #react-root [data-testid="DMDrawer"],
+    #react-root [data-testid="GrokDrawer"],
+    #react-root [data-testid="chat-drawer-root"],
     #root > main > footer.justify-center.ease-in {
       visibility: hidden !important;
     }
@@ -231,6 +234,28 @@ window.addEventListener("DOMContentLoaded", (_event) => {
       }
     }
 
+    @media only screen and (min-width: 1000px) and (max-width: 1264px) {
+      #react-root [data-testid="sidebarColumn"] form[role="search"] {
+        visibility: visible !important;
+        position: fixed !important;
+        top: 12px !important;
+        right: 16px !important;
+      }
+
+      #react-root [data-testid="sidebarColumn"] input[placeholder="Search"] {
+        width: 150px;
+      }
+
+      #react-root [data-testid="sidebarColumn"] form[role="search"]:focus-within {
+        width: 280px !important;
+        backdrop-filter: blur(12px) !important;
+      }
+
+      #react-root [data-testid="sidebarColumn"] input[placeholder="Search"]:focus {
+        width: 234px !important;
+      }
+    }
+
     @media only screen and (min-width: 1265px) {
       #react-root [data-testid="sidebarColumn"] form[role="search"] {
         visibility: visible !important;
@@ -239,7 +264,7 @@ window.addEventListener("DOMContentLoaded", (_event) => {
         right: 16px !important;
       }
 
-      #react-root [data-testid="sidebarColumn"] input[placeholder="Search Twitter"] {
+      #react-root [data-testid="sidebarColumn"] input[placeholder="Search"] {
         width: 150px;
       }
 
@@ -248,7 +273,7 @@ window.addEventListener("DOMContentLoaded", (_event) => {
         backdrop-filter: blur(12px) !important;
       }
 
-      #react-root [data-testid="sidebarColumn"] input[placeholder="Search Twitter"]:focus {
+      #react-root [data-testid="sidebarColumn"] input[placeholder="Search"]:focus {
         width: 328px !important;
       }
 
@@ -300,7 +325,7 @@ window.addEventListener("DOMContentLoaded", (_event) => {
     }
   `;
   const contentStyleElement = document.createElement("style");
-  contentStyleElement.innerHTML = contentCSS;
+  contentStyleElement.textContent = contentCSS;
   document.head.appendChild(contentStyleElement);
 
   // Top spacing adapts to head-hiding scenarios
@@ -471,10 +496,10 @@ window.addEventListener("DOMContentLoaded", (_event) => {
       }
     }
   `;
-  const isMac = navigator.platform.toUpperCase().indexOf("MAC") >= 0;
+  const isMac = /Mac/i.test(navigator.userAgent);
   if (window["pakeConfig"]?.hide_title_bar && isMac) {
     const topPaddingStyleElement = document.createElement("style");
-    topPaddingStyleElement.innerHTML = topPaddingCSS;
+    topPaddingStyleElement.textContent = topPaddingCSS;
     document.head.appendChild(topPaddingStyleElement);
   }
 });

package/src-tauri/src/lib.rs

@@ -27,6 +27,9 @@ pub fn run_app() {
         if std::env::var("WEBKIT_DISABLE_DMABUF_RENDERER").is_err() {
             std::env::set_var("WEBKIT_DISABLE_DMABUF_RENDERER", "1");
         }
+        if std::env::var("WEBKIT_DISABLE_COMPOSITING_MODE").is_err() {
+            std::env::set_var("WEBKIT_DISABLE_COMPOSITING_MODE", "1");
+        }
     }
 
     let (pake_config, tauri_config) = get_pake_config();
@@ -107,9 +110,8 @@ pub fn run_app() {
                 &pake_config.system_tray_path,
                 init_fullscreen,
                 multi_window,
-            )
-            .unwrap();
-            set_global_shortcut(app.app_handle(), activation_shortcut, init_fullscreen).unwrap();
+            )?;
+            set_global_shortcut(app.app_handle(), activation_shortcut, init_fullscreen)?;
 
             // Show window after state restoration to prevent position flashing
             // Unless start_to_tray is enabled, then keep it hidden
@@ -117,13 +119,13 @@ pub fn run_app() {
                 let window_clone = window.clone();
                 tauri::async_runtime::spawn(async move {
                     tokio::time::sleep(tokio::time::Duration::from_millis(WINDOW_SHOW_DELAY)).await;
-                    window_clone.show().unwrap();
+                    let _ = window_clone.show();
 
                     // Fixed: Linux fullscreen issue with virtual keyboard
                     #[cfg(target_os = "linux")]
                     {
                         if init_fullscreen {
-                            window_clone.set_fullscreen(true).unwrap();
+                            let _ = window_clone.set_fullscreen(true);
                             // Ensure webview maintains focus for input after fullscreen
                             let _ = window_clone.set_focus();
                         } else {
@@ -148,22 +150,22 @@ pub fn run_app() {
                         #[cfg(target_os = "macos")]
                         {
                             if window.is_fullscreen().unwrap_or(false) {
-                                window.set_fullscreen(false).unwrap();
+                                let _ = window.set_fullscreen(false);
                                 tokio::time::sleep(Duration::from_millis(900)).await;
                             }
                         }
                         #[cfg(target_os = "linux")]
                         {
                             if window.is_fullscreen().unwrap_or(false) {
-                                window.set_fullscreen(false).unwrap();
+                                let _ = window.set_fullscreen(false);
                                 // Restore focus after exiting fullscreen to fix input issues
                                 let _ = window.set_focus();
                             }
                         }
                         // On macOS, directly hide without minimize to avoid duplicate Dock icons
                         #[cfg(not(target_os = "macos"))]
-                        window.minimize().unwrap();
-                        window.hide().unwrap();
+                        let _ = window.minimize();
+                        let _ = window.hide();
                     });
                     api.prevent_close();
                 }

package/src-tauri/src/util.rs

@@ -1,6 +1,6 @@
 use crate::app::config::PakeConfig;
 use std::env;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use tauri::{AppHandle, Config, Manager, WebviewWindow};
 
 pub fn get_pake_config() -> (PakeConfig, Config) {
@@ -107,9 +107,14 @@ pub fn check_file_or_append(file_path: &str) -> String {
     let mut counter = 0;
 
     while new_path.exists() {
-        let file_stem = new_path.file_stem().unwrap().to_string_lossy().to_string();
-        let extension = new_path.extension().unwrap().to_string_lossy().to_string();
-        let parent_dir = new_path.parent().unwrap();
+        let file_stem = new_path
+            .file_stem()
+            .map(|s| s.to_string_lossy().to_string())
+            .unwrap_or_default();
+        let extension = new_path
+            .extension()
+            .map(|e| e.to_string_lossy().to_string());
+        let parent_dir = new_path.parent().unwrap_or(Path::new(""));
 
         let new_file_stem = match file_stem.rfind('-') {
             Some(index) if file_stem[index + 1..].parse::<u32>().is_ok() => {
@@ -123,7 +128,10 @@ pub fn check_file_or_append(file_path: &str) -> String {
             }
         };
 
-        new_path = parent_dir.join(format!("{new_file_stem}.{extension}"));
+        new_path = match &extension {
+            Some(ext) => parent_dir.join(format!("{new_file_stem}.{ext}")),
+            None => parent_dir.join(new_file_stem),
+        };
     }
 
     new_path.to_string_lossy().into_owned()

package/src-tauri/tauri.conf.json

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