pake-cli 3.11.5 → 3.11.7

package/dist/cli.js

@@ -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.7";
 var description = "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。";
 var engines = {
 	node: ">=18.0.0"
@@ -31,7 +31,7 @@ var bin = {
 };
 var repository = {
 	type: "git",
-	url: "git+https://github.com/tw93/pake.git"
+	url: "git+https://github.com/tw93/Pake.git"
 };
 var author = {
 	name: "Tw93",
@@ -62,6 +62,7 @@ var scripts = {
 	test: "pnpm run cli:build && cross-env PAKE_CREATE_APP=1 node tests/index.js",
 	format: "prettier --write . --ignore-unknown && find tests -name '*.js' -exec sed -i '' 's/[[:space:]]*$//' {} \\; && cd src-tauri && cargo fmt --verbose",
 	"format:check": "prettier --check . --ignore-unknown",
+	"release:check": "node scripts/check-release-version.mjs && pnpm run format:check && npx vitest run && pnpm run cli:build && npm pack --dry-run --ignore-scripts",
 	update: "pnpm update --verbose && cd src-tauri && cargo update",
 	prepublishOnly: "pnpm run cli:build"
 };
@@ -464,6 +465,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,
@@ -805,6 +807,24 @@ function getBuildTimeout() {
     return 900000;
 }
 let packageManagerCache = null;
+function parseMajorVersion(version) {
+    const match = version.match(/^(\d+)/);
+    return match ? Number(match[1]) : null;
+}
+function getPinnedPnpmMajorVersion() {
+    const packageManager = packageJson.packageManager;
+    const match = packageManager?.match(/^pnpm@(\d+)/);
+    return match ? Number(match[1]) : null;
+}
+async function detectNpm(execa) {
+    try {
+        await execa('npm', ['--version'], { stdio: 'ignore' });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 /**
  * Returns 'pnpm' when available, otherwise 'npm'. Throws if neither is found.
  * Cached after the first successful detection so tests can call repeatedly.
@@ -815,21 +835,28 @@ async function detectPackageManager() {
     }
     const { execa } = await import('execa');
     try {
-        await execa('pnpm', ['--version'], { stdio: 'ignore' });
+        const { stdout } = await execa('pnpm', ['--version']);
+        const pnpmMajor = parseMajorVersion(stdout.trim());
+        const pinnedPnpmMajor = getPinnedPnpmMajorVersion();
+        if (pnpmMajor !== null &&
+            pinnedPnpmMajor !== null &&
+            pnpmMajor !== pinnedPnpmMajor &&
+            (await detectNpm(execa))) {
+            logger.warn(`✼ Detected pnpm v${stdout.trim()}, but Pake is pinned to ${packageJson.packageManager}; using npm for package installation instead.`);
+            packageManagerCache = 'npm';
+            return 'npm';
+        }
         logger.info('✺ Using pnpm for package management.');
         packageManagerCache = 'pnpm';
         return 'pnpm';
     }
     catch {
-        try {
-            await execa('npm', ['--version'], { stdio: 'ignore' });
+        if (await detectNpm(execa)) {
             logger.info('✺ pnpm not available, using npm for package management.');
             packageManagerCache = 'npm';
             return 'npm';
         }
-        catch {
-            throw new Error('Neither pnpm nor npm is available. Please install a package manager.');
-        }
+        throw new Error('Neither pnpm nor npm is available. Please install a package manager.');
     }
 }
 function getInstallCommand(packageManager, useCnMirror) {
@@ -2402,6 +2429,7 @@ const DEFAULT_PAKE_OPTIONS = {
     startToTray: false,
     forceInternalNavigation: false,
     internalUrlRegex: '',
+    enableFind: false,
     iterativeBuild: false,
     zoom: 100,
     minWidth: 0,
@@ -2541,6 +2569,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pake-cli",
-  "version": "3.11.5",
+  "version": "3.11.7",
   "description": "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。",
   "engines": {
     "node": ">=18.0.0"
@@ -11,7 +11,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/tw93/pake.git"
+    "url": "git+https://github.com/tw93/Pake.git"
   },
   "author": {
     "name": "Tw93",
@@ -42,6 +42,7 @@
     "test": "pnpm run cli:build && cross-env PAKE_CREATE_APP=1 node tests/index.js",
     "format": "prettier --write . --ignore-unknown && find tests -name '*.js' -exec sed -i '' 's/[[:space:]]*$//' {} \\; && cd src-tauri && cargo fmt --verbose",
     "format:check": "prettier --check . --ignore-unknown",
+    "release:check": "node scripts/check-release-version.mjs && pnpm run format:check && npx vitest run && pnpm run cli:build && npm pack --dry-run --ignore-scripts",
     "update": "pnpm update --verbose && cd src-tauri && cargo update",
     "prepublishOnly": "pnpm run cli:build"
   },

package/src-tauri/Cargo.lock

@@ -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.7"
 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

@@ -1,6 +1,6 @@
 [package]
 name = "pake"
-version = "3.11.5"
+version = "3.11.7"
 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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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");