pake-cli 3.7.8 → 3.8.2

package/README.md

@@ -137,21 +137,22 @@
 
 <br/>
 
-| Mac                                        | Windows/Linux                                       | Function                            |
-| ------------------------------------------ | --------------------------------------------------- | ----------------------------------- |
-| <kbd>⌘</kbd> + <kbd>[</kbd>                | <kbd>Ctrl</kbd> + <kbd>←</kbd>                      | Return to the previous page         |
-| <kbd>⌘</kbd> + <kbd>]</kbd>                | <kbd>Ctrl</kbd> + <kbd>→</kbd>                      | Go to the next page                 |
-| <kbd>⌘</kbd> + <kbd>↑</kbd>                | <kbd>Ctrl</kbd> + <kbd>↑</kbd>                      | Auto scroll to top of page          |
-| <kbd>⌘</kbd> + <kbd>↓</kbd>                | <kbd>Ctrl</kbd> + <kbd>↓</kbd>                      | Auto scroll to bottom of page       |
-| <kbd>⌘</kbd> + <kbd>r</kbd>                | <kbd>Ctrl</kbd> + <kbd>r</kbd>                      | Refresh Page                        |
-| <kbd>⌘</kbd> + <kbd>w</kbd>                | <kbd>Ctrl</kbd> + <kbd>w</kbd>                      | Hide window, not quit               |
-| <kbd>⌘</kbd> + <kbd>-</kbd>                | <kbd>Ctrl</kbd> + <kbd>-</kbd>                      | Zoom out the page                   |
-| <kbd>⌘</kbd> + <kbd>=</kbd>                | <kbd>Ctrl</kbd> + <kbd>=</kbd>                      | Zoom in the Page                    |
-| <kbd>⌘</kbd> + <kbd>0</kbd>                | <kbd>Ctrl</kbd> + <kbd>0</kbd>                      | Reset the page zoom                 |
-| <kbd>⌘</kbd> + <kbd>L</kbd>                | <kbd>Ctrl</kbd> + <kbd>L</kbd>                      | Copy Current Page URL               |
-| <kbd>⌘</kbd> + <kbd>⇧</kbd> + <kbd>H</kbd> | <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>H</kbd>   | Go to Home Page                     |
-| <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>I</kbd> | <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>I</kbd>   | Toggle Developer Tools (Debug Only) |
-| <kbd>⌘</kbd> + <kbd>⇧</kbd> + <kbd>⌫</kbd> | <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Del</kbd> | Clear Cache & Restart               |
+| Mac                                                       | Windows/Linux                                       | Function                            |
+| --------------------------------------------------------- | --------------------------------------------------- | ----------------------------------- |
+| <kbd>⌘</kbd> + <kbd>[</kbd>                               | <kbd>Ctrl</kbd> + <kbd>←</kbd>                      | Return to the previous page         |
+| <kbd>⌘</kbd> + <kbd>]</kbd>                               | <kbd>Ctrl</kbd> + <kbd>→</kbd>                      | Go to the next page                 |
+| <kbd>⌘</kbd> + <kbd>↑</kbd>                               | <kbd>Ctrl</kbd> + <kbd>↑</kbd>                      | Auto scroll to top of page          |
+| <kbd>⌘</kbd> + <kbd>↓</kbd>                               | <kbd>Ctrl</kbd> + <kbd>↓</kbd>                      | Auto scroll to bottom of page       |
+| <kbd>⌘</kbd> + <kbd>r</kbd>                               | <kbd>Ctrl</kbd> + <kbd>r</kbd>                      | Refresh Page                        |
+| <kbd>⌘</kbd> + <kbd>w</kbd>                               | <kbd>Ctrl</kbd> + <kbd>w</kbd>                      | Hide window, not quit               |
+| <kbd>⌘</kbd> + <kbd>-</kbd>                               | <kbd>Ctrl</kbd> + <kbd>-</kbd>                      | Zoom out the page                   |
+| <kbd>⌘</kbd> + <kbd>=</kbd>                               | <kbd>Ctrl</kbd> + <kbd>=</kbd>                      | Zoom in the Page                    |
+| <kbd>⌘</kbd> + <kbd>0</kbd>                               | <kbd>Ctrl</kbd> + <kbd>0</kbd>                      | Reset the page zoom                 |
+| <kbd>⌘</kbd> + <kbd>L</kbd>                               | <kbd>Ctrl</kbd> + <kbd>L</kbd>                      | Copy Current Page URL               |
+| <kbd>⌘</kbd> + <kbd>⇧</kbd> + <kbd>⌥</kbd> + <kbd>V</kbd> | <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>V</kbd>   | Paste and Match Style               |
+| <kbd>⌘</kbd> + <kbd>⇧</kbd> + <kbd>H</kbd>                | <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>H</kbd>   | Go to Home Page                     |
+| <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>I</kbd>                | <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>I</kbd>   | Toggle Developer Tools (Debug Only) |
+| <kbd>⌘</kbd> + <kbd>⇧</kbd> + <kbd>⌫</kbd>                | <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Del</kbd> | Clear Cache & Restart               |
 
 In addition, double-click the title bar to switch to full-screen mode. For Mac users, you can also use the gesture to go to the previous or next page and drag the title bar to move the window. The new menu also offers options for navigation, zoom, and window controls.
 

package/dist/cli.js

@@ -22,7 +22,7 @@ import * as psl from 'psl';
 import { InvalidArgumentError, program as program$1, Option } from 'commander';
 
 var name = "pake-cli";
-var version = "3.7.8";
+var version = "3.8.2";
 var description = "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。";
 var engines = {
 	node: ">=18.0.0"
@@ -914,7 +914,7 @@ class BaseBuilder {
         // Warn users about potential AppImage build failures on modern Linux systems.
         // The linuxdeploy tool bundled in Tauri uses an older strip tool that doesn't
         // recognize the .relr.dyn section introduced in glibc 2.38+.
-        if (process.platform === 'linux' && this.options.targets === 'appimage') {
+        if (process.platform === 'linux' && target === 'appimage') {
             if (!buildEnv.NO_STRIP) {
                 logger.warn('⚠ Building AppImage on Linux may fail due to strip incompatibility with glibc 2.38+');
                 logger.warn('⚠ If build fails, retry with: NO_STRIP=1 pake <url> --targets appimage');
@@ -927,7 +927,7 @@ class BaseBuilder {
         }
         catch (error) {
             const shouldRetryWithoutStrip = process.platform === 'linux' &&
-                this.options.targets === 'appimage' &&
+                target === 'appimage' &&
                 !buildEnv.NO_STRIP &&
                 this.isLinuxDeployStripError(error);
             if (shouldRetryWithoutStrip) {
@@ -1291,18 +1291,20 @@ class LinuxBuilder extends BaseBuilder {
     getFileName() {
         const { name = 'pake-app', targets } = this.options;
         const version = tauriConfig.version;
+        const buildType = this.currentBuildType || targets.split(',').map((t) => t.trim())[0];
         let arch;
         if (this.buildArch === 'arm64') {
-            arch = targets === 'rpm' || targets === 'appimage' ? 'aarch64' : 'arm64';
+            arch =
+                buildType === 'rpm' || buildType === 'appimage' ? 'aarch64' : 'arm64';
         }
         else {
             if (this.buildArch === 'x64') {
-                arch = targets === 'rpm' ? 'x86_64' : 'amd64';
+                arch = buildType === 'rpm' ? 'x86_64' : 'amd64';
             }
             else {
                 arch = this.buildArch;
                 if (this.buildArch === 'arm64' &&
-                    (targets === 'rpm' || targets === 'appimage')) {
+                    (buildType === 'rpm' || buildType === 'appimage')) {
                     arch = 'aarch64';
                 }
             }

package/package.json

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

package/src-tauri/Cargo.lock

@@ -2526,7 +2526,7 @@ dependencies = [
 
 [[package]]
 name = "pake"
-version = "3.7.8"
+version = "3.8.2"
 dependencies = [
  "serde",
  "serde_json",

package/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pake"
-version = "3.7.8"
+version = "3.8.2"
 description = "🤱🏻 Turn any webpage into a desktop app with Rust."
 authors = ["Tw93"]
 license = "MIT"

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

@@ -19,6 +19,7 @@ pub struct WindowConfig {
     pub title: Option<String>,
     pub enable_wasm: bool,
     pub enable_drag_drop: bool,
+    #[serde(default)]
     pub new_window: bool,
     pub start_to_tray: bool,
     #[serde(default)]

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

@@ -66,6 +66,13 @@ fn edit_menu(app: &AppHandle<Wry>) -> tauri::Result<Submenu<Wry>> {
     edit_menu.append(&PredefinedMenuItem::cut(app, None)?)?;
     edit_menu.append(&PredefinedMenuItem::copy(app, None)?)?;
     edit_menu.append(&PredefinedMenuItem::paste(app, None)?)?;
+    edit_menu.append(&MenuItem::with_id(
+        app,
+        "paste_and_match_style",
+        "Paste and Match Style",
+        true,
+        Some("CmdOrCtrl+Shift+Option+V"),
+    )?)?;
     edit_menu.append(&PredefinedMenuItem::select_all(app, None)?)?;
     edit_menu.append(&PredefinedMenuItem::separator(app)?)?;
     edit_menu.append(&MenuItem::with_id(
@@ -229,6 +236,11 @@ pub fn handle_menu_click(app_handle: &AppHandle, id: &str) {
                 let _ = window.eval("navigator.clipboard.writeText(window.location.href)");
             }
         }
+        "paste_and_match_style" => {
+            if let Some(window) = app_handle.get_webview_window("pake") {
+                let _ = window.eval("triggerPasteAsPlainText()");
+            }
+        }
         "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/setup.rs

@@ -13,6 +13,7 @@ pub fn set_system_tray(
     app: &AppHandle,
     show_system_tray: bool,
     tray_icon_path: &str,
+    _init_fullscreen: bool,
 ) -> tauri::Result<()> {
     if !show_system_tray {
         app.remove_tray_by_id("pake-tray");
@@ -40,6 +41,11 @@ pub fn set_system_tray(
             "show_app" => {
                 if let Some(window) = app.get_webview_window("pake") {
                     window.show().unwrap();
+                    #[cfg(target_os = "linux")]
+                    if _init_fullscreen && !window.is_fullscreen().unwrap_or(false) {
+                        let _ = window.set_fullscreen(true);
+                        let _ = window.set_focus();
+                    }
                 }
             }
             "quit" => {
@@ -48,7 +54,7 @@ pub fn set_system_tray(
             }
             _ => (),
         })
-        .on_tray_icon_event(|tray, event| match event {
+        .on_tray_icon_event(move |tray, event| match event {
             TrayIconEvent::Click { button, .. } => {
                 if button == tauri::tray::MouseButton::Left {
                     if let Some(window) = tray.app_handle().get_webview_window("pake") {
@@ -58,6 +64,10 @@ pub fn set_system_tray(
                         } else {
                             window.show().unwrap();
                             window.set_focus().unwrap();
+                            #[cfg(target_os = "linux")]
+                            if _init_fullscreen && !window.is_fullscreen().unwrap_or(false) {
+                                let _ = window.set_fullscreen(true);
+                            }
                         }
                     }
                 }
@@ -82,7 +92,11 @@ pub fn set_system_tray(
     Ok(())
 }
 
-pub fn set_global_shortcut(app: &AppHandle, shortcut: String) -> tauri::Result<()> {
+pub fn set_global_shortcut(
+    app: &AppHandle,
+    shortcut: String,
+    _init_fullscreen: bool,
+) -> tauri::Result<()> {
     if shortcut.is_empty() {
         return Ok(());
     }
@@ -113,6 +127,11 @@ pub fn set_global_shortcut(app: &AppHandle, shortcut: String) -> tauri::Result<(
                                 } else {
                                     window.show().unwrap();
                                     window.set_focus().unwrap();
+                                    #[cfg(target_os = "linux")]
+                                    if _init_fullscreen && !window.is_fullscreen().unwrap_or(false)
+                                    {
+                                        let _ = window.set_fullscreen(true);
+                                    }
                                 }
                             }
                         }

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

@@ -24,6 +24,9 @@ document.addEventListener("DOMContentLoaded", () => {
 // This bridges the HTML5 Fullscreen API to Tauri's native window fullscreen
 // Works for all video sites (YouTube, Vimeo, Bilibili, etc.)
 (function () {
+  if (window.__PAKE_FULLSCREEN_POLYFILL__) return;
+  window.__PAKE_FULLSCREEN_POLYFILL__ = true;
+
   function initFullscreenPolyfill() {
     if (!window.__TAURI__ || !document.head) {
       setTimeout(initFullscreenPolyfill, 100);
@@ -37,11 +40,13 @@ document.addEventListener("DOMContentLoaded", () => {
     let originalParent = null;
     let originalNextSibling = null;
     let wasInBody = false;
+    let monitorId = null;
 
     // Inject fullscreen styles
-    const styleEl = document.createElement("style");
-    styleEl.id = "pake-fullscreen-style";
-    styleEl.textContent = `
+    if (!document.getElementById("pake-fullscreen-style")) {
+      const styleEl = document.createElement("style");
+      styleEl.id = "pake-fullscreen-style";
+      styleEl.textContent = `
       body.pake-fullscreen-active {
         overflow: hidden !important;
       }
@@ -65,7 +70,28 @@ document.addEventListener("DOMContentLoaded", () => {
         object-fit: contain !important;
       }
     `;
-    document.head.appendChild(styleEl);
+      document.head.appendChild(styleEl);
+    }
+
+    function startFullscreenMonitor() {
+      if (monitorId) return;
+      monitorId = setInterval(() => {
+        appWindow
+          .isFullscreen()
+          .then((isFullscreen) => {
+            if (fullscreenElement && !isFullscreen) {
+              exitFullscreen();
+            }
+          })
+          .catch(() => {});
+      }, 500);
+    }
+
+    function stopFullscreenMonitor() {
+      if (!monitorId) return;
+      clearInterval(monitorId);
+      monitorId = null;
+    }
 
     // Find the actual video element
     function findMediaElement() {
@@ -136,6 +162,7 @@ document.addEventListener("DOMContentLoaded", () => {
 
       // Fullscreen window
       appWindow.setFullscreen(true).then(() => {
+        startFullscreenMonitor();
         const event = new Event("fullscreenchange", { bubbles: true });
         document.dispatchEvent(event);
         element.dispatchEvent(event);
@@ -156,6 +183,8 @@ document.addEventListener("DOMContentLoaded", () => {
         return Promise.resolve();
       }
 
+      stopFullscreenMonitor();
+
       const exitingElement = fullscreenElement;
       const targetElement = actualFullscreenElement;
 
@@ -252,20 +281,6 @@ document.addEventListener("DOMContentLoaded", () => {
       },
       true,
     );
-
-    // Monitor window fullscreen changes
-    let lastFullscreenState = false;
-    setInterval(() => {
-      appWindow
-        .isFullscreen()
-        .then((isFullscreen) => {
-          if (lastFullscreenState && !isFullscreen && fullscreenElement) {
-            exitFullscreen();
-          }
-          lastFullscreenState = isFullscreen;
-        })
-        .catch(() => {});
-    }, 500);
   }
 
   initFullscreenPolyfill();

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

@@ -29,6 +29,16 @@ function zoomOut() {
   zoomCommon((currentZoom) => `${Math.max(parseInt(currentZoom) - 10, 30)}%`);
 }
 
+let pasteAsPlainTextPending = false;
+
+function triggerPasteAsPlainText() {
+  pasteAsPlainTextPending = true;
+  document.execCommand("paste");
+  setTimeout(() => {
+    pasteAsPlainTextPending = false;
+  }, 100);
+}
+
 function handleShortcut(event) {
   if (shortcuts[event.key]) {
     event.preventDefault();
@@ -36,7 +46,6 @@ function handleShortcut(event) {
   }
 }
 
-// Configuration constants
 const DOWNLOADABLE_FILE_EXTENSIONS = {
   documents: [
     "pdf",
@@ -278,6 +287,22 @@ document.addEventListener("DOMContentLoaded", () => {
     });
   }
 
+  document.addEventListener(
+    "paste",
+    (event) => {
+      if (pasteAsPlainTextPending) {
+        event.preventDefault();
+        event.stopImmediatePropagation();
+
+        const text = event.clipboardData?.getData("text/plain") || "";
+        if (text) {
+          document.execCommand("insertText", false, text);
+        }
+      }
+    },
+    true,
+  );
+
   // Collect blob urls to blob by overriding window.URL.createObjectURL
   function collectUrlToBlobs() {
     const backupCreateObjectURL = window.URL.createObjectURL;

package/src-tauri/src/lib.rs

@@ -95,9 +95,10 @@ pub fn run_app() {
                 app.app_handle(),
                 show_system_tray,
                 &pake_config.system_tray_path,
+                init_fullscreen,
             )
             .unwrap();
-            set_global_shortcut(app.app_handle(), activation_shortcut).unwrap();
+            set_global_shortcut(app.app_handle(), activation_shortcut, init_fullscreen).unwrap();
 
             // Show window after state restoration to prevent position flashing
             // Unless start_to_tray is enabled, then keep it hidden
@@ -114,6 +115,12 @@ pub fn run_app() {
                             window_clone.set_fullscreen(true).unwrap();
                             // Ensure webview maintains focus for input after fullscreen
                             let _ = window_clone.set_focus();
+                        } else {
+                            // Fix: Ubuntu 24.04/GNOME window buttons non-functional until resize (#1122)
+                            // The window manager needs time to process the MapWindow event before
+                            // accepting focus requests. Without this, decorations remain non-interactive.
+                            tokio::time::sleep(tokio::time::Duration::from_millis(30)).await;
+                            let _ = window_clone.set_focus();
                         }
                     }
                 });
@@ -156,16 +163,16 @@ pub fn run_app() {
         })
         .build(tauri::generate_context!())
         .expect("error while building tauri application")
-        .run(|app, event| {
+        .run(|_app, _event| {
             // Handle macOS dock icon click to reopen hidden window
             #[cfg(target_os = "macos")]
             if let tauri::RunEvent::Reopen {
                 has_visible_windows,
                 ..
-            } = event
+            } = _event
             {
                 if !has_visible_windows {
-                    if let Some(window) = app.get_webview_window("pake") {
+                    if let Some(window) = _app.get_webview_window("pake") {
                         let _ = window.show();
                         let _ = window.set_focus();
                     }

package/dist/test-local.html

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

package/src-tauri/.cargo/config.toml

@@ -1,10 +0,0 @@
-[source.crates-io]
-replace-with = 'rsproxy-sparse'
-[source.rsproxy]
-registry = "https://rsproxy.cn/crates.io-index"
-[source.rsproxy-sparse]
-registry = "sparse+https://rsproxy.cn/index/"
-[registries.rsproxy]
-index = "https://rsproxy.cn/crates.io-index"
-[net]
-git-fetch-with-cli = true