npm - pake-cli - Versions diffs - 3.11.5 → 3.11.6 - Mend

pake-cli 3.11.5 → 3.11.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

package/dist/cli.js +6 -1
package/dist/pake-badge-test.html +1 -0
package/dist/test-local.html +1 -0
package/package.json +1 -1
package/src-tauri/Cargo.lock +7 -4
package/src-tauri/Cargo.toml +6 -1
package/src-tauri/build.rs +2 -0
package/src-tauri/pake.json +1 -0
package/src-tauri/src/app/config.rs +2 -0
package/src-tauri/src/app/invoke.rs +85 -0
package/src-tauri/src/app/menu.rs +56 -5
package/src-tauri/src/app/window.rs +1 -0
package/src-tauri/src/inject/event.js +98 -12
package/src-tauri/src/inject/find.js +708 -0
package/src-tauri/src/lib.rs +8 -3
package/src-tauri/tauri.conf.json +1 -1

package/dist/cli.js CHANGED Viewed

@@ -20,7 +20,7 @@ import { InvalidArgumentError, program as program$1, Option } from 'commander';
 import fs$1 from 'fs';
 var name = "pake-cli";
-var version = "3.11.5";
+var version = "3.11.6";
 var description = "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。";
 var engines = {
 	node: ">=18.0.0"
@@ -464,6 +464,7 @@ function buildWindowConfigOverrides(options, platform = asSupportedPlatform(proc
         start_to_tray: options.startToTray && options.showSystemTray,
         force_internal_navigation: options.forceInternalNavigation,
         internal_url_regex: options.internalUrlRegex,
+        enable_find: options.enableFind,
         zoom: options.zoom,
         min_width: options.minWidth,
         min_height: options.minHeight,
@@ -2402,6 +2403,7 @@ const DEFAULT_PAKE_OPTIONS = {
     startToTray: false,
     forceInternalNavigation: false,
     internalUrlRegex: '',
+    enableFind: false,
     iterativeBuild: false,
     zoom: 100,
     minWidth: 0,
@@ -2541,6 +2543,9 @@ ${green('|_|   \\__,_|_|\\_\\___|  can turn any webpage into a desktop app with
         .addOption(new Option('--internal-url-regex <string>', 'Regex pattern to match URLs that should be considered internal')
         .default(DEFAULT_PAKE_OPTIONS.internalUrlRegex)
         .hideHelp())
+        .addOption(new Option('--enable-find', 'Enable in-page Find UI with Cmd/Ctrl+F/G shortcuts')
+        .default(DEFAULT_PAKE_OPTIONS.enableFind)
+        .hideHelp())
         .addOption(new Option('--installer-language <string>', 'Installer language')
         .default(DEFAULT_PAKE_OPTIONS.installerLanguage)
         .hideHelp())

package/dist/pake-badge-test.html ADDED Viewed

@@ -0,0 +1 @@

+ <!doctype html><html><head><meta charset="utf-8"><title>Pake Badge Test</title></head><body><h1>Pake Badge Test</h1><pre id="log"></pre><script>const log=(msg)=>{document.getElementById("log").textContent+=msg+"\n"};async function run(){await new Promise(r=>setTimeout(r,1500));log("setAppBadge(3)");await navigator.setAppBadge(3);setTimeout(async()=>{log("setAppBadge() dot");await navigator.setAppBadge();},7000);setTimeout(async()=>{log("clearAppBadge()");await navigator.clearAppBadge();},14000);}run().catch(e=>log(String(e)));</script></body></html>

package/dist/test-local.html ADDED Viewed

	@@ -0,0 +1 @@
1	+ <html><body><h1>Hello Pake</h1></body></html>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "pake-cli",
-  "version": "3.11.5",
+  "version": "3.11.6",
   "description": "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。",
   "engines": {
     "node": ">=18.0.0"

package/src-tauri/Cargo.lock CHANGED Viewed

@@ -2194,9 +2194,9 @@ dependencies = [
 [[package]]
 name = "muda"
-version = "0.17.1"
+version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01c1738382f66ed56b3b9c8119e794a2e23148ac8ea214eda86622d4cb9d415a"
+checksum = "7c9fec5a4e89860383d778d10563a605838f8f0b2f9303868937e5ff32e86177"
 dependencies = [
  "crossbeam-channel",
  "dpi",
@@ -2564,8 +2564,11 @@ dependencies = [
 [[package]]
 name = "pake"
-version = "3.11.5"
+version = "3.11.6"
 dependencies = [
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
  "serde",
  "serde_json",
  "tauri",
@@ -3066,7 +3069,7 @@ dependencies = [
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.60.2",
+ "windows-sys 0.52.0",
 ]
 [[package]]

package/src-tauri/Cargo.toml CHANGED Viewed

@@ -1,6 +1,6 @@
 [package]
 name = "pake"
-version = "3.11.5"
+version = "3.11.6"
 description = "🤱🏻 Turn any webpage into a desktop app with Rust."
 authors = ["Tw93"]
 license = "MIT"
@@ -36,6 +36,11 @@ tauri-plugin-opener = { version = "2.5.3" }
 tauri-plugin-single-instance = "2.4.0"
 tauri-plugin-notification = "2.3.3"
+[target.'cfg(target_os = "macos")'.dependencies]
+objc2 = "0.6"
+objc2-app-kit = { version = "0.3", features = ["NSApplication", "NSDockTile"] }
+objc2-foundation = { version = "0.3", features = ["NSString"] }
 [features]
 # this feature is used for development builds from development cli
 cli-build = []

package/src-tauri/build.rs CHANGED Viewed

@@ -1,3 +1,5 @@
 fn main() {
+    println!("cargo:rerun-if-changed=.pake/pake.json");
+    println!("cargo:rerun-if-changed=.pake/tauri.conf.json");
     tauri_build::build()
 }

package/src-tauri/pake.json CHANGED Viewed

@@ -20,6 +20,7 @@
       "start_to_tray": false,
       "force_internal_navigation": false,
       "internal_url_regex": "",
+      "enable_find": false,
       "new_window": false
     }
   ],

package/src-tauri/src/app/config.rs CHANGED Viewed

@@ -26,6 +26,8 @@ pub struct WindowConfig {
     pub force_internal_navigation: bool,
     #[serde(default)]
     pub internal_url_regex: String,
+    #[serde(default)]
+    pub enable_find: bool,
     #[serde(default = "default_zoom")]
     pub zoom: u32,
     #[serde(default)]

package/src-tauri/src/app/invoke.rs CHANGED Viewed

@@ -2,6 +2,7 @@ use crate::util::{check_file_or_append, get_download_message_with_lang, show_toa
 use std::fs::{self, File};
 use std::io::Write;
 use std::str::FromStr;
+use std::sync::atomic::{AtomicI64, Ordering};
 use tauri::http::Method;
 use tauri::{command, AppHandle, Manager, Url, WebviewWindow};
 use tauri_plugin_http::reqwest::{ClientBuilder, Request};
@@ -9,6 +10,62 @@ use tauri_plugin_http::reqwest::{ClientBuilder, Request};
 #[cfg(target_os = "macos")]
 use tauri::Theme;
+static BADGE_COUNT: AtomicI64 = AtomicI64::new(0);
+const MAX_BADGE_COUNT: i64 = 99_999;
+const MAX_BADGE_LABEL_CHARS: usize = 16;
+fn normalize_badge_count(count: Option<i64>) -> Option<i64> {
+    count.filter(|n| (1..=MAX_BADGE_COUNT).contains(n))
+}
+fn normalize_badge_label(label: Option<&str>) -> Result<Option<String>, String> {
+    let Some(label) = label.map(str::trim).filter(|label| !label.is_empty()) else {
+        return Ok(None);
+    };
+    if label.chars().count() > MAX_BADGE_LABEL_CHARS {
+        return Err(format!(
+            "Badge label must be {MAX_BADGE_LABEL_CHARS} characters or fewer"
+        ));
+    }
+    Ok(Some(label.to_string()))
+}
+fn apply_badge(app: &AppHandle, count: Option<i64>) -> Result<(), String> {
+    let label = normalize_badge_count(count).map(|n| n.to_string());
+    apply_badge_label(app, label.as_deref())
+}
+#[cfg(target_os = "macos")]
+fn apply_badge_label(app: &AppHandle, label: Option<&str>) -> Result<(), String> {
+    use objc2::MainThreadMarker;
+    use objc2_app_kit::NSApplication;
+    use objc2_foundation::NSString;
+    let label = label.map(str::to_owned);
+    app.run_on_main_thread(move || {
+        let Some(mtm) = MainThreadMarker::new() else {
+            return;
+        };
+        let dock_tile = NSApplication::sharedApplication(mtm).dockTile();
+        let ns_label = label.as_deref().map(NSString::from_str);
+        dock_tile.setBadgeLabel(ns_label.as_deref());
+    })
+    .map_err(|e| format!("Failed to dispatch dock badge update: {e}"))
+}
+#[cfg(not(target_os = "macos"))]
+fn apply_badge_label(app: &AppHandle, label: Option<&str>) -> Result<(), String> {
+    let window = app
+        .get_webview_window("pake")
+        .ok_or("Main window not found")?;
+    let count = label.and_then(|s| s.parse::<i64>().ok());
+    window
+        .set_badge_count(count)
+        .map_err(|e| format!("Failed to set badge count: {e}"))
+}
 #[derive(serde::Deserialize)]
 pub struct DownloadFileParams {
     url: String,
@@ -144,6 +201,34 @@ pub fn send_notification(app: AppHandle, params: NotificationParams) -> Result<(
     Ok(())
 }
+#[command]
+pub fn set_dock_badge(app: AppHandle, count: Option<i64>) -> Result<(), String> {
+    let normalized = normalize_badge_count(count);
+    BADGE_COUNT.store(normalized.unwrap_or(0), Ordering::SeqCst);
+    apply_badge(&app, normalized)
+}
+#[command]
+pub fn increment_dock_badge(app: AppHandle) -> Result<(), String> {
+    let current = BADGE_COUNT.load(Ordering::SeqCst);
+    let next = current.saturating_add(1).clamp(1, MAX_BADGE_COUNT);
+    BADGE_COUNT.store(next, Ordering::SeqCst);
+    apply_badge(&app, Some(next))
+}
+#[command]
+pub fn clear_dock_badge(app: AppHandle) -> Result<(), String> {
+    BADGE_COUNT.store(0, Ordering::SeqCst);
+    apply_badge(&app, None)
+}
+#[command]
+pub fn set_dock_badge_label(app: AppHandle, label: Option<String>) -> Result<(), String> {
+    BADGE_COUNT.store(0, Ordering::SeqCst);
+    let label = normalize_badge_label(label.as_deref())?;
+    apply_badge_label(&app, label.as_deref())
+}
 #[command]
 pub async fn update_theme_mode(app: AppHandle, mode: String) {
     #[cfg(target_os = "macos")]

package/src-tauri/src/app/menu.rs CHANGED Viewed

@@ -6,24 +6,36 @@ use tauri::menu::{AboutMetadata, Menu, MenuItem, PredefinedMenuItem, Submenu};
 use tauri::{AppHandle, Manager, Wry};
 use tauri_plugin_opener::OpenerExt;
-pub fn get_menu(app: &AppHandle<Wry>, allow_multi_window: bool) -> tauri::Result<Menu<Wry>> {
+pub fn set_app_menu(
+    app: &AppHandle<Wry>,
+    allow_multi_window: bool,
+    enable_find: bool,
+) -> tauri::Result<()> {
     let pake_version = env!("CARGO_PKG_VERSION");
     let pake_menu_item_title = format!("Built with Pake V{}", pake_version);
+    let window_submenu = window_menu(app)?;
     let menu = Menu::with_items(
         app,
         &[
             &app_menu(app)?,
             &file_menu(app, allow_multi_window)?,
-            &edit_menu(app)?,
+            &edit_menu(app, enable_find)?,
             &view_menu(app)?,
             &navigation_menu(app)?,
-            &window_menu(app)?,
+            &window_submenu,
             &help_menu(app, &pake_menu_item_title)?,
         ],
     )?;
-    Ok(menu)
+    app.set_menu(menu)?;
+    // AppKit injects Move & Resize, Fill, Center, Full Screen Tile, and
+    // window-cycling once the submenu is registered as the windows menu.
+    window_submenu.set_as_windows_menu_for_nsapp()?;
+    Ok(())
 }
 fn app_menu(app: &AppHandle<Wry>) -> tauri::Result<Submenu<Wry>> {
@@ -69,7 +81,7 @@ fn file_menu(app: &AppHandle<Wry>, allow_multi_window: bool) -> tauri::Result<Su
     Ok(file_menu)
 }
-fn edit_menu(app: &AppHandle<Wry>) -> tauri::Result<Submenu<Wry>> {
+fn edit_menu(app: &AppHandle<Wry>, enable_find: bool) -> tauri::Result<Submenu<Wry>> {
     let edit_menu = Submenu::new(app, "Edit", true)?;
     edit_menu.append(&PredefinedMenuItem::undo(app, None)?)?;
     edit_menu.append(&PredefinedMenuItem::redo(app, None)?)?;
@@ -86,6 +98,30 @@ fn edit_menu(app: &AppHandle<Wry>) -> tauri::Result<Submenu<Wry>> {
     )?)?;
     edit_menu.append(&PredefinedMenuItem::select_all(app, None)?)?;
     edit_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    if enable_find {
+        edit_menu.append(&MenuItem::with_id(
+            app,
+            "find",
+            "Find",
+            true,
+            Some("CmdOrCtrl+F"),
+        )?)?;
+        edit_menu.append(&MenuItem::with_id(
+            app,
+            "find_next",
+            "Find Next",
+            true,
+            Some("CmdOrCtrl+G"),
+        )?)?;
+        edit_menu.append(&MenuItem::with_id(
+            app,
+            "find_previous",
+            "Find Previous",
+            true,
+            Some("CmdOrCtrl+Shift+G"),
+        )?)?;
+        edit_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    }
     edit_menu.append(&MenuItem::with_id(
         app,
         "copy_url",
@@ -255,6 +291,21 @@ pub fn handle_menu_click(app_handle: &AppHandle, id: &str) {
                 let _ = window.eval("triggerPasteAsPlainText()");
             }
         }
+        "find" => {
+            if let Some(window) = app_handle.get_webview_window("pake") {
+                let _ = window.eval("window.pakeFind?.open()");
+            }
+        }
+        "find_next" => {
+            if let Some(window) = app_handle.get_webview_window("pake") {
+                let _ = window.eval("window.pakeFind?.next()");
+            }
+        }
+        "find_previous" => {
+            if let Some(window) = app_handle.get_webview_window("pake") {
+                let _ = window.eval("window.pakeFind?.previous()");
+            }
+        }
         "clear_cache_restart" => {
             if let Some(window) = app_handle.get_webview_window("pake") {
                 if let Ok(_) = window.clear_all_browsing_data() {

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

@@ -287,6 +287,7 @@ fn build_window(
     // calls show_toast().
     window_builder = window_builder
         .initialization_script(&config_script)
+        .initialization_script(include_str!("../inject/find.js"))
         .initialization_script(include_str!("../inject/toast.js"))
         .initialization_script(include_str!("../inject/fullscreen.js"))
         .initialization_script(include_str!("../inject/event.js"))

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

@@ -1025,10 +1025,46 @@ document.addEventListener("DOMContentLoaded", () => {
   });
 });
-document.addEventListener("DOMContentLoaded", function () {
+// Bridge the Web Notification + Web Badging APIs to Pake's Rust commands so
+// pages running inside the webview can drive the macOS dock badge (and
+// taskbar badge on Linux/Windows). Installs synchronously instead of waiting
+// for DOMContentLoaded so feature-detection on Notification/setAppBadge
+// returns the polyfill before site scripts run.
+(function () {
+  const invoke = window.__TAURI__?.core?.invoke;
+  if (!invoke) return;
   let permVal = "granted";
   let lastNotifTime = 0;
   let lastNotif = null;
+  // Pages that drive the badge directly via setAppBadge own its lifecycle;
+  // notifications-driven counts auto-clear on the next user interaction.
+  let pageManagedBadge = false;
+  let autoBadgeActive = false;
+  const normalizeBadgeCount = (count) => {
+    if (typeof count !== "number" || !Number.isFinite(count)) {
+      throw new TypeError("Badge count must be a finite number.");
+    }
+    const normalized = Math.floor(count);
+    return normalized > 0 ? Math.min(normalized, 99999) : null;
+  };
+  const setBadge = (count) => {
+    pageManagedBadge = true;
+    autoBadgeActive = false;
+    return invoke("set_dock_badge", { count }).catch(() => {});
+  };
+  const clearBadge = () => invoke("clear_dock_badge").catch(() => {});
+  const setLabel = (label) => {
+    pageManagedBadge = true;
+    autoBadgeActive = false;
+    return invoke("set_dock_badge_label", { label }).catch(() => {});
+  };
+  const incrementAutoBadge = () => {
+    if (pageManagedBadge) return Promise.resolve();
+    autoBadgeActive = true;
+    return invoke("increment_dock_badge").catch(() => {});
+  };
   window.addEventListener("focus", () => {
     if (lastNotif?.onclick && Date.now() - lastNotifTime < 5000) {
@@ -1037,11 +1073,17 @@ document.addEventListener("DOMContentLoaded", function () {
     }
   });
-  window.Notification = function (title, options) {
-    const { invoke } = window.__TAURI__.core;
+  const clearAutoBadge = () => {
+    if (pageManagedBadge || !autoBadgeActive) return;
+    autoBadgeActive = false;
+    clearBadge();
+  };
+  document.addEventListener("click", clearAutoBadge, true);
+  document.addEventListener("keydown", clearAutoBadge, true);
+  const wrappedNotification = function (title, options) {
     const body = options?.body || "";
     let icon = options?.icon || "";
     if (icon.startsWith("/")) {
       icon = window.location.origin + icon;
     }
@@ -1056,24 +1098,68 @@ document.addEventListener("DOMContentLoaded", function () {
     lastNotifTime = Date.now();
     lastNotif = notif;
-    invoke("send_notification", { params: { title, body, icon } }).then(() => {
-      if (notif.onshow) notif.onshow(new Event("show"));
-    });
+    invoke("send_notification", { params: { title, body, icon } })
+      .then(() => incrementAutoBadge())
+      .then(() => {
+        if (notif.onshow) notif.onshow(new Event("show"));
+      });
     return notif;
   };
-  window.Notification.requestPermission = async () => "granted";
-  Object.defineProperty(window.Notification, "permission", {
+  wrappedNotification.requestPermission = async () => "granted";
+  Object.defineProperty(wrappedNotification, "permission", {
     enumerable: true,
     get: () => permVal,
     set: (v) => {
       permVal = v;
     },
   });
-});
+  try {
+    Object.defineProperty(window, "Notification", {
+      configurable: true,
+      writable: true,
+      value: wrappedNotification,
+    });
+  } catch (_) {}
+  // Web Badging API: https://wicg.github.io/badging/
+  // setAppBadge() with no argument shows an indicator dot; with a number,
+  // shows the count (0 clears). clearAppBadge() removes the badge entirely.
+  const setAppBadge = (count) => {
+    if (count === undefined) return setLabel("•");
+    let normalized;
+    try {
+      normalized = normalizeBadgeCount(count);
+    } catch (error) {
+      return Promise.reject(error);
+    }
+    if (normalized === null) {
+      pageManagedBadge = false;
+      autoBadgeActive = false;
+      return clearBadge();
+    }
+    return setBadge(normalized);
+  };
+  const clearAppBadge = () => {
+    pageManagedBadge = false;
+    autoBadgeActive = false;
+    return clearBadge();
+  };
+  try {
+    Object.defineProperty(navigator, "setAppBadge", {
+      configurable: true,
+      writable: true,
+      value: setAppBadge,
+    });
+    Object.defineProperty(navigator, "clearAppBadge", {
+      configurable: true,
+      writable: true,
+      value: clearAppBadge,
+    });
+  } catch (_) {}
+})();
 function setDefaultZoom() {
   const htmlZoom = window.localStorage.getItem("htmlZoom");

package/src-tauri/src/inject/find.js ADDED Viewed

@@ -0,0 +1,708 @@
+(function () {
+  if (window.__PAKE_FIND_SCRIPT__) {
+    return;
+  }
+  window.__PAKE_FIND_SCRIPT__ = true;
+  const PANEL_ID = "pake-find-panel";
+  const STYLE_ID = "pake-find-style";
+  const MARK_ATTR = "data-pake-find";
+  const ACTIVE_ATTR = "data-pake-find-active";
+  const MATCH_HIGHLIGHT = "pake-find-match";
+  const ACTIVE_HIGHLIGHT = "pake-find-active";
+  const MAX_MATCHES = 1000;
+  const SEARCH_DEBOUNCE_MS = 120;
+  const SKIPPED_TAGS = new Set([
+    "script",
+    "style",
+    "noscript",
+    "input",
+    "textarea",
+    "select",
+    "option",
+  ]);
+  const state = {
+    enabled: window.pakeConfig?.enable_find === true,
+    panel: null,
+    input: null,
+    counter: null,
+    status: null,
+    matches: [],
+    activeIndex: -1,
+    query: "",
+    truncated: false,
+    domMarks: [],
+    observer: null,
+    searchTimer: null,
+    isOpen: false,
+  };
+  function getState() {
+    return {
+      enabled: state.enabled,
+      isOpen: state.isOpen,
+      query: state.query,
+      matchCount: state.matches.length,
+      activeIndex: state.activeIndex,
+      truncated: state.truncated,
+    };
+  }
+  function noop() {
+    return getState();
+  }
+  if (!state.enabled) {
+    window.pakeFind = {
+      open: noop,
+      close: noop,
+      next: noop,
+      previous: noop,
+      search: noop,
+      getState,
+      getFindShortcutAction: () => "",
+    };
+    return;
+  }
+  function getNodeFilter() {
+    return (
+      window.NodeFilter ||
+      globalThis.NodeFilter || {
+        SHOW_TEXT: 4,
+        FILTER_ACCEPT: 1,
+        FILTER_REJECT: 2,
+      }
+    );
+  }
+  function supportsCustomHighlight() {
+    return (
+      typeof CSS !== "undefined" &&
+      CSS.highlights &&
+      typeof Highlight === "function"
+    );
+  }
+  function isFindPanelNode(node) {
+    const element =
+      node?.nodeType === 1 ? node : node?.parentElement || node?.parentNode;
+    if (!element) {
+      return false;
+    }
+    if (element.id === PANEL_ID) {
+      return true;
+    }
+    return element.closest?.(`#${PANEL_ID}`) != null;
+  }
+  function shouldSkipElement(element) {
+    for (let current = element; current; current = current.parentElement) {
+      if (current.id === PANEL_ID) {
+        return true;
+      }
+      const tagName = current.tagName?.toLowerCase();
+      if (tagName && SKIPPED_TAGS.has(tagName)) {
+        return true;
+      }
+      if (
+        current.isContentEditable ||
+        current.getAttribute?.("contenteditable") === "true"
+      ) {
+        return true;
+      }
+      if (current.hidden || current.getAttribute?.("aria-hidden") === "true") {
+        return true;
+      }
+    }
+    return false;
+  }
+  function getSearchableTextNodes(root = document.body) {
+    if (!root || !document.createTreeWalker) {
+      return [];
+    }
+    const nodeFilter = getNodeFilter();
+    const walker = document.createTreeWalker(root, nodeFilter.SHOW_TEXT, {
+      acceptNode(node) {
+        if (!node.nodeValue || node.nodeValue.length === 0) {
+          return nodeFilter.FILTER_REJECT;
+        }
+        if (shouldSkipElement(node.parentElement)) {
+          return nodeFilter.FILTER_REJECT;
+        }
+        return nodeFilter.FILTER_ACCEPT;
+      },
+    });
+    const nodes = [];
+    let current = walker.nextNode();
+    while (current) {
+      nodes.push(current);
+      current = walker.nextNode();
+    }
+    return nodes;
+  }
+  function createRange(node, start, end) {
+    const range = document.createRange();
+    range.setStart(node, start);
+    range.setEnd(node, end);
+    return range;
+  }
+  function collectMatches(query) {
+    const matches = [];
+    const normalizedQuery = query.toLocaleLowerCase();
+    if (!normalizedQuery) {
+      return { matches, truncated: false };
+    }
+    for (const node of getSearchableTextNodes()) {
+      const text = node.nodeValue || "";
+      const normalizedText = text.toLocaleLowerCase();
+      let searchFrom = 0;
+      while (searchFrom <= normalizedText.length) {
+        const index = normalizedText.indexOf(normalizedQuery, searchFrom);
+        if (index === -1) {
+          break;
+        }
+        matches.push({
+          node,
+          start: index,
+          end: index + query.length,
+          range: createRange(node, index, index + query.length),
+          mark: null,
+        });
+        if (matches.length >= MAX_MATCHES) {
+          return { matches, truncated: true };
+        }
+        searchFrom = index + Math.max(query.length, 1);
+      }
+    }
+    return { matches, truncated: false };
+  }
+  function ensureStyle() {
+    if (document.getElementById(STYLE_ID)) {
+      return;
+    }
+    const style = document.createElement("style");
+    style.id = STYLE_ID;
+    style.textContent = `
+      #${PANEL_ID} {
+        position: fixed;
+        top: 14px;
+        right: 14px;
+        z-index: 2147483647;
+        display: none;
+        align-items: center;
+        gap: 6px;
+        box-sizing: border-box;
+        min-width: 278px;
+        max-width: min(420px, calc(100vw - 28px));
+        padding: 8px;
+        border: 1px solid rgba(0, 0, 0, 0.14);
+        border-radius: 8px;
+        background: rgba(255, 255, 255, 0.96);
+        color: #1f2328;
+        box-shadow: 0 10px 26px rgba(0, 0, 0, 0.18);
+        font: 13px/1.4 -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
+        backdrop-filter: blur(16px);
+      }
+      #${PANEL_ID}[data-visible="true"] {
+        display: flex;
+      }
+      #${PANEL_ID} input {
+        min-width: 0;
+        flex: 1 1 auto;
+        height: 28px;
+        box-sizing: border-box;
+        border: 1px solid rgba(0, 0, 0, 0.16);
+        border-radius: 6px;
+        padding: 0 8px;
+        background: #fff;
+        color: #1f2328;
+        font: inherit;
+        outline: none;
+      }
+      #${PANEL_ID} input:focus {
+        border-color: #3b82f6;
+        box-shadow: 0 0 0 2px rgba(59, 130, 246, 0.16);
+      }
+      #${PANEL_ID} [data-pake-find-counter] {
+        flex: 0 0 auto;
+        min-width: 42px;
+        color: #5f6b7a;
+        text-align: center;
+        font-size: 12px;
+        white-space: nowrap;
+      }
+      #${PANEL_ID} button {
+        flex: 0 0 auto;
+        width: 28px;
+        height: 28px;
+        border: 0;
+        border-radius: 6px;
+        background: transparent;
+        color: #30363d;
+        font: 15px/1 -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
+        cursor: pointer;
+      }
+      #${PANEL_ID} button:hover {
+        background: rgba(0, 0, 0, 0.08);
+      }
+      #${PANEL_ID} [data-pake-find-status] {
+        position: absolute;
+        left: 10px;
+        top: calc(100% + 4px);
+        color: #d1242f;
+        font-size: 12px;
+        white-space: nowrap;
+      }
+      @media (prefers-color-scheme: dark) {
+        #${PANEL_ID} {
+          border-color: rgba(255, 255, 255, 0.16);
+          background: rgba(31, 35, 40, 0.94);
+          color: #f0f3f6;
+          box-shadow: 0 10px 26px rgba(0, 0, 0, 0.36);
+        }
+        #${PANEL_ID} input {
+          border-color: rgba(255, 255, 255, 0.18);
+          background: rgba(255, 255, 255, 0.08);
+          color: #f0f3f6;
+        }
+        #${PANEL_ID} [data-pake-find-counter] {
+          color: #b7c0cc;
+        }
+        #${PANEL_ID} button {
+          color: #f0f3f6;
+        }
+        #${PANEL_ID} button:hover {
+          background: rgba(255, 255, 255, 0.12);
+        }
+      }
+      ::highlight(${MATCH_HIGHLIGHT}) {
+        background: rgba(255, 214, 10, 0.58);
+        color: inherit;
+      }
+      ::highlight(${ACTIVE_HIGHLIGHT}) {
+        background: rgba(255, 149, 0, 0.9);
+        color: inherit;
+      }
+      mark[${MARK_ATTR}] {
+        background: rgba(255, 214, 10, 0.58);
+        color: inherit;
+        padding: 0;
+      }
+      mark[${MARK_ATTR}][${ACTIVE_ATTR}] {
+        background: rgba(255, 149, 0, 0.9);
+      }
+    `;
+    (document.head || document.body || document.documentElement)?.appendChild(
+      style,
+    );
+  }
+  function createButton(label, title, onClick) {
+    const button = document.createElement("button");
+    button.type = "button";
+    button.textContent = label;
+    button.title = title;
+    button.setAttribute("aria-label", title);
+    button.addEventListener("click", onClick);
+    return button;
+  }
+  function ensurePanel() {
+    if (state.panel) {
+      return state.panel;
+    }
+    ensureStyle();
+    const panel = document.createElement("div");
+    panel.id = PANEL_ID;
+    panel.setAttribute("role", "search");
+    panel.setAttribute("aria-label", "Find in page");
+    const input = document.createElement("input");
+    input.type = "search";
+    input.autocomplete = "off";
+    input.spellcheck = false;
+    input.placeholder = "Find";
+    input.setAttribute("aria-label", "Find in page");
+    const counter = document.createElement("span");
+    counter.setAttribute("data-pake-find-counter", "");
+    counter.textContent = "0/0";
+    const previousButton = createButton("<", "Find Previous", () => previous());
+    const nextButton = createButton(">", "Find Next", () => next());
+    const closeButton = createButton("x", "Close Find", () => close());
+    const status = document.createElement("span");
+    status.setAttribute("data-pake-find-status", "");
+    input.addEventListener("input", () => {
+      debounceSearch(input.value);
+    });
+    input.addEventListener("keydown", (event) => {
+      if (event.key === "Enter") {
+        event.preventDefault();
+        event.stopPropagation();
+        if (event.shiftKey) {
+          previous();
+        } else {
+          next();
+        }
+        return;
+      }
+      if (event.key === "Escape") {
+        event.preventDefault();
+        event.stopPropagation();
+        close();
+      }
+    });
+    panel.append(
+      input,
+      counter,
+      previousButton,
+      nextButton,
+      closeButton,
+      status,
+    );
+    (document.body || document.documentElement).appendChild(panel);
+    state.panel = panel;
+    state.input = input;
+    state.counter = counter;
+    state.status = status;
+    return panel;
+  }
+  function clearCustomHighlights() {
+    if (!supportsCustomHighlight()) {
+      return;
+    }
+    CSS.highlights.delete(MATCH_HIGHLIGHT);
+    CSS.highlights.delete(ACTIVE_HIGHLIGHT);
+  }
+  function clearDomMarks() {
+    const marks = Array.from(
+      document.querySelectorAll?.(`mark[${MARK_ATTR}]`) || state.domMarks,
+    );
+    for (const mark of marks) {
+      const parent = mark.parentNode;
+      const text = document.createTextNode(mark.textContent || "");
+      mark.replaceWith?.(text);
+      parent?.normalize?.();
+    }
+    state.domMarks = [];
+  }
+  function clearHighlights() {
+    clearCustomHighlights();
+    clearDomMarks();
+  }
+  function applyCustomHighlights() {
+    if (!supportsCustomHighlight()) {
+      return false;
+    }
+    const ranges = state.matches.map((match) => match.range);
+    CSS.highlights.set(MATCH_HIGHLIGHT, new Highlight(...ranges));
+    updateActiveHighlight();
+    return true;
+  }
+  function applyDomHighlights() {
+    const grouped = new Map();
+    for (const match of state.matches) {
+      const nodeMatches = grouped.get(match.node) || [];
+      nodeMatches.push(match);
+      grouped.set(match.node, nodeMatches);
+    }
+    for (const nodeMatches of grouped.values()) {
+      nodeMatches.sort((a, b) => b.start - a.start);
+      for (const match of nodeMatches) {
+        try {
+          const mark = document.createElement("mark");
+          mark.setAttribute(MARK_ATTR, "");
+          match.range.surroundContents(mark);
+          match.mark = mark;
+          state.domMarks.push(mark);
+        } catch (error) {
+          // Some browser-generated text ranges cannot be wrapped safely.
+        }
+      }
+    }
+    updateDomActiveMark();
+  }
+  function updateDomActiveMark() {
+    state.matches.forEach((match, index) => {
+      const mark = match.mark;
+      if (!mark) {
+        return;
+      }
+      if (mark.toggleAttribute) {
+        mark.toggleAttribute(ACTIVE_ATTR, index === state.activeIndex);
+      } else if (index === state.activeIndex) {
+        mark.setAttribute(ACTIVE_ATTR, "");
+      } else {
+        mark.removeAttribute?.(ACTIVE_ATTR);
+      }
+    });
+  }
+  function updateActiveHighlight() {
+    if (!supportsCustomHighlight()) {
+      updateDomActiveMark();
+      return;
+    }
+    CSS.highlights.delete(ACTIVE_HIGHLIGHT);
+    if (state.activeIndex >= 0 && state.matches[state.activeIndex]) {
+      CSS.highlights.set(
+        ACTIVE_HIGHLIGHT,
+        new Highlight(state.matches[state.activeIndex].range),
+      );
+    }
+  }
+  function scrollActiveIntoView() {
+    const active = state.matches[state.activeIndex];
+    if (!active) {
+      return;
+    }
+    const target = active.mark || active.range.startContainer?.parentElement;
+    if (target?.scrollIntoView) {
+      target.scrollIntoView({ block: "center", inline: "nearest" });
+    }
+  }
+  function updateCounter() {
+    if (!state.counter) {
+      return;
+    }
+    const total = state.matches.length;
+    const active = state.activeIndex >= 0 ? state.activeIndex + 1 : 0;
+    state.counter.textContent = `${active}/${total}${state.truncated ? "+" : ""}`;
+    if (state.status) {
+      state.status.textContent = state.query && total === 0 ? "No results" : "";
+    }
+  }
+  function runSearch(query = state.query) {
+    state.query = query;
+    clearHighlights();
+    if (!query) {
+      state.matches = [];
+      state.activeIndex = -1;
+      state.truncated = false;
+      updateCounter();
+      return getState();
+    }
+    const result = collectMatches(query);
+    state.matches = result.matches;
+    state.truncated = result.truncated;
+    state.activeIndex = state.matches.length > 0 ? 0 : -1;
+    if (!applyCustomHighlights()) {
+      applyDomHighlights();
+    }
+    updateCounter();
+    scrollActiveIntoView();
+    return getState();
+  }
+  function debounceSearch(query) {
+    clearTimeout(state.searchTimer);
+    state.searchTimer = setTimeout(() => runSearch(query), SEARCH_DEBOUNCE_MS);
+  }
+  function next() {
+    if (!state.query && state.input?.value) {
+      runSearch(state.input.value);
+    }
+    if (state.matches.length === 0) {
+      return getState();
+    }
+    state.activeIndex = (state.activeIndex + 1) % state.matches.length;
+    updateActiveHighlight();
+    updateCounter();
+    scrollActiveIntoView();
+    return getState();
+  }
+  function previous() {
+    if (!state.query && state.input?.value) {
+      runSearch(state.input.value);
+    }
+    if (state.matches.length === 0) {
+      return getState();
+    }
+    state.activeIndex =
+      (state.activeIndex - 1 + state.matches.length) % state.matches.length;
+    updateActiveHighlight();
+    updateCounter();
+    scrollActiveIntoView();
+    return getState();
+  }
+  function observeDocumentChanges() {
+    if (
+      state.observer ||
+      !document.body ||
+      typeof MutationObserver !== "function"
+    ) {
+      return;
+    }
+    state.observer = new MutationObserver((mutations) => {
+      if (!state.isOpen || !state.query) {
+        return;
+      }
+      if (mutations.every((mutation) => isFindPanelNode(mutation.target))) {
+        return;
+      }
+      debounceSearch(state.query);
+    });
+    state.observer.observe(document.body, {
+      childList: true,
+      characterData: true,
+      subtree: true,
+    });
+  }
+  function stopObservingDocumentChanges() {
+    state.observer?.disconnect();
+    state.observer = null;
+  }
+  function open() {
+    if (!state.enabled) {
+      return getState();
+    }
+    const panel = ensurePanel();
+    panel.setAttribute("data-visible", "true");
+    state.isOpen = true;
+    observeDocumentChanges();
+    requestAnimationFrame(() => {
+      state.input?.focus();
+      state.input?.select();
+    });
+    if (state.input?.value) {
+      runSearch(state.input.value);
+    } else {
+      updateCounter();
+    }
+    return getState();
+  }
+  function close() {
+    clearTimeout(state.searchTimer);
+    state.isOpen = false;
+    state.panel?.removeAttribute("data-visible");
+    clearHighlights();
+    stopObservingDocumentChanges();
+    state.matches = [];
+    state.activeIndex = -1;
+    state.truncated = false;
+    updateCounter();
+    return getState();
+  }
+  function search(query) {
+    if (state.input) {
+      state.input.value = query;
+    }
+    return runSearch(query);
+  }
+  function getFindShortcutAction(event) {
+    const userAgent = navigator.userAgent || "";
+    const isMac = /macintosh|mac os x/i.test(userAgent);
+    const hasModifier = isMac
+      ? event.metaKey && !event.ctrlKey
+      : event.ctrlKey && !event.metaKey;
+    if (!hasModifier || event.altKey) {
+      return "";
+    }
+    const key = event.key?.toLowerCase();
+    if (key === "f" && !event.shiftKey) {
+      return "open";
+    }
+    if (key === "g") {
+      return event.shiftKey ? "previous" : "next";
+    }
+    return "";
+  }
+  function handleFindShortcut(event) {
+    const action = getFindShortcutAction(event);
+    if (!action) {
+      return;
+    }
+    event.preventDefault();
+    event.stopPropagation();
+    window.pakeFind[action]();
+  }
+  window.pakeFind = {
+    open,
+    close,
+    next,
+    previous,
+    search,
+    getState,
+    getFindShortcutAction,
+  };
+  if (state.enabled) {
+    document.addEventListener("keydown", handleFindShortcut, true);
+  }
+})();

package/src-tauri/src/lib.rs CHANGED Viewed

@@ -13,7 +13,8 @@ const WINDOW_SHOW_DELAY: u64 = 50;
 use app::{
     invoke::{
-        clear_cache_and_restart, download_file, download_file_by_binary, send_notification,
+        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,
     },
     setup::{set_global_shortcut, set_system_tray},
@@ -42,6 +43,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 window_state_plugin = WindowStatePlugin::default()
         .with_state_flags(if init_fullscreen {
@@ -81,6 +83,10 @@ pub fn run_app() {
             download_file,
             download_file_by_binary,
             send_notification,
+            increment_dock_badge,
+            set_dock_badge,
+            set_dock_badge_label,
+            clear_dock_badge,
             update_theme_mode,
             clear_cache_and_restart,
         ])
@@ -93,8 +99,7 @@ pub fn run_app() {
             // --- Menu Construction Start ---
             #[cfg(target_os = "macos")]
             {
-                let menu = app::menu::get_menu(app.app_handle(), multi_window)?;
-                app.set_menu(menu)?;
+                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 CHANGED Viewed

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