pake-cli 3.7.8 → 3.8.1

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.1";
 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.1",
   "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.1"
 dependencies = [
  "serde",
  "serde_json",

package/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pake"
-version = "3.7.8"
+version = "3.8.1"
 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/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/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
@@ -156,16 +157,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();
                     }