pake-cli 3.6.2 → 3.6.3

package/dist/cli.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import log from 'loglevel';
+import updateNotifier from 'update-notifier';
 import path from 'path';
 import fsExtra from 'fs-extra';
 import { fileURLToPath } from 'url';
@@ -13,8 +14,6 @@ import dns from 'dns';
 import http from 'http';
 import { promisify } from 'util';
 import fs from 'fs';
-import updateNotifier from 'update-notifier';
-import axios from 'axios';
 import { dir } from 'tmp-promise';
 import { fileTypeFromBuffer } from 'file-type';
 import icongen from 'icon-gen';
@@ -22,6 +21,112 @@ import sharp from 'sharp';
 import * as psl from 'psl';
 import { InvalidArgumentError, program as program$1, Option } from 'commander';
 
+var name = "pake-cli";
+var version = "3.6.3";
+var description = "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。";
+var engines = {
+	node: ">=18.0.0"
+};
+var packageManager = "pnpm@10.15.0";
+var bin = {
+	pake: "./dist/cli.js"
+};
+var repository = {
+	type: "git",
+	url: "https://github.com/tw93/pake.git"
+};
+var author = {
+	name: "Tw93",
+	email: "tw93@qq.com"
+};
+var keywords = [
+	"pake",
+	"pake-cli",
+	"rust",
+	"tauri",
+	"no-electron",
+	"productivity"
+];
+var files = [
+	"dist",
+	"src-tauri"
+];
+var scripts = {
+	start: "pnpm run dev",
+	dev: "pnpm run tauri dev",
+	build: "tauri build",
+	"build:debug": "tauri build --debug",
+	"build:mac": "tauri build --target universal-apple-darwin",
+	analyze: "cd src-tauri && cargo bloat --release --crates",
+	tauri: "tauri",
+	cli: "cross-env NODE_ENV=development rollup -c -w",
+	"cli:build": "cross-env NODE_ENV=production rollup -c",
+	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",
+	update: "pnpm update --verbose && cd src-tauri && cargo update",
+	prepublishOnly: "pnpm run cli:build"
+};
+var type = "module";
+var exports = "./dist/cli.js";
+var license = "MIT";
+var dependencies = {
+	"@tauri-apps/api": "^2.9.0",
+	"@tauri-apps/cli": "^2.9.0",
+	chalk: "^5.6.2",
+	commander: "^12.1.0",
+	execa: "^9.6.0",
+	"file-type": "^18.7.0",
+	"fs-extra": "^11.3.2",
+	"icon-gen": "^5.0.0",
+	loglevel: "^1.9.2",
+	ora: "^8.2.0",
+	prompts: "^2.4.2",
+	psl: "^1.15.0",
+	sharp: "^0.33.5",
+	"tmp-promise": "^3.0.3",
+	"update-notifier": "^7.3.1"
+};
+var devDependencies = {
+	"@rollup/plugin-alias": "^5.1.1",
+	"@rollup/plugin-commonjs": "^28.0.8",
+	"@rollup/plugin-json": "^6.1.0",
+	"@rollup/plugin-replace": "^6.0.2",
+	"@rollup/plugin-terser": "^0.4.4",
+	"@types/fs-extra": "^11.0.4",
+	"@types/node": "^20.19.23",
+	"@types/page-icon": "^0.3.6",
+	"@types/prompts": "^2.4.9",
+	"@types/tmp": "^0.2.6",
+	"@types/update-notifier": "^6.0.8",
+	"app-root-path": "^3.1.0",
+	"cross-env": "^7.0.3",
+	prettier: "^3.6.2",
+	rollup: "^4.52.5",
+	"rollup-plugin-typescript2": "^0.36.0",
+	tslib: "^2.8.1",
+	typescript: "^5.9.3",
+	vitest: "^4.0.15"
+};
+var packageJson = {
+	name: name,
+	version: version,
+	description: description,
+	engines: engines,
+	packageManager: packageManager,
+	bin: bin,
+	repository: repository,
+	author: author,
+	keywords: keywords,
+	files: files,
+	scripts: scripts,
+	type: type,
+	exports: exports,
+	license: license,
+	dependencies: dependencies,
+	devDependencies: devDependencies
+};
+
 // Convert the current module URL to a file path
 const currentModulePath = fileURLToPath(import.meta.url);
 // Resolve the parent directory of the current module
@@ -385,7 +490,7 @@ async function mergeConfig(url, options, tauriConf) {
         disabled_web_shortcuts: disabledWebShortcuts,
         hide_on_close: platformHideOnClose,
         incognito: incognito,
-        title: title || null,
+        title: title,
         enable_wasm: wasm,
         enable_drag_drop: enableDragDrop,
         start_to_tray: startToTray && showSystemTray,
@@ -1249,120 +1354,6 @@ class BuilderProvider {
     }
 }
 
-var name = "pake-cli";
-var version = "3.6.2";
-var description = "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。";
-var engines = {
-	node: ">=18.0.0"
-};
-var packageManager = "pnpm@10.15.0";
-var bin = {
-	pake: "./dist/cli.js"
-};
-var repository = {
-	type: "git",
-	url: "https://github.com/tw93/pake.git"
-};
-var author = {
-	name: "Tw93",
-	email: "tw93@qq.com"
-};
-var keywords = [
-	"pake",
-	"pake-cli",
-	"rust",
-	"tauri",
-	"no-electron",
-	"productivity"
-];
-var files = [
-	"dist",
-	"src-tauri"
-];
-var scripts = {
-	start: "pnpm run dev",
-	dev: "pnpm run tauri dev",
-	build: "tauri build",
-	"build:debug": "tauri build --debug",
-	"build:mac": "tauri build --target universal-apple-darwin",
-	analyze: "cd src-tauri && cargo bloat --release --crates",
-	tauri: "tauri",
-	cli: "cross-env NODE_ENV=development rollup -c -w",
-	"cli:dev": "cross-env NODE_ENV=development rollup -c -w",
-	"cli:build": "cross-env NODE_ENV=production rollup -c",
-	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",
-	update: "pnpm update --verbose && cd src-tauri && cargo update",
-	prepublishOnly: "pnpm run cli:build"
-};
-var type = "module";
-var exports = "./dist/cli.js";
-var license = "MIT";
-var dependencies = {
-	"@tauri-apps/api": "^2.9.0",
-	"@tauri-apps/cli": "^2.9.0",
-	axios: "^1.12.2",
-	chalk: "^5.6.2",
-	commander: "^12.1.0",
-	execa: "^9.6.0",
-	"file-type": "^18.7.0",
-	"fs-extra": "^11.3.2",
-	"icon-gen": "^5.0.0",
-	loglevel: "^1.9.2",
-	ora: "^8.2.0",
-	prompts: "^2.4.2",
-	psl: "^1.15.0",
-	sharp: "^0.33.5",
-	"tmp-promise": "^3.0.3",
-	"update-notifier": "^7.3.1"
-};
-var devDependencies = {
-	"@rollup/plugin-alias": "^5.1.1",
-	"@rollup/plugin-commonjs": "^28.0.8",
-	"@rollup/plugin-json": "^6.1.0",
-	"@rollup/plugin-replace": "^6.0.2",
-	"@rollup/plugin-terser": "^0.4.4",
-	"@types/fs-extra": "^11.0.4",
-	"@types/node": "^20.19.23",
-	"@types/page-icon": "^0.3.6",
-	"@types/prompts": "^2.4.9",
-	"@types/tmp": "^0.2.6",
-	"@types/update-notifier": "^6.0.8",
-	"app-root-path": "^3.1.0",
-	"cross-env": "^7.0.3",
-	prettier: "^3.6.2",
-	rollup: "^4.52.5",
-	"rollup-plugin-typescript2": "^0.36.0",
-	tslib: "^2.8.1",
-	typescript: "^5.9.3",
-	vitest: "^4.0.15"
-};
-var packageJson = {
-	name: name,
-	version: version,
-	description: description,
-	engines: engines,
-	packageManager: packageManager,
-	bin: bin,
-	repository: repository,
-	author: author,
-	keywords: keywords,
-	files: files,
-	scripts: scripts,
-	type: type,
-	exports: exports,
-	license: license,
-	dependencies: dependencies,
-	devDependencies: devDependencies
-};
-
-async function checkUpdateTips() {
-    updateNotifier({ pkg: packageJson, updateCheckInterval: 1000 * 60 }).notify({
-        isGlobal: true,
-    });
-}
-
 const ICON_CONFIG = {
     minFileSize: 100,
     supportedFormats: ['png', 'ico', 'jpeg', 'jpg', 'webp', 'icns'],
@@ -1705,24 +1696,40 @@ async function tryGetFavicon(url, appName) {
  * Downloads icon from URL
  */
 async function downloadIcon(iconUrl, showSpinner = true, customTimeout) {
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => {
+        controller.abort();
+    }, customTimeout || 10000);
     try {
-        const response = await axios.get(iconUrl, {
-            responseType: 'arraybuffer',
-            timeout: customTimeout || 10000,
+        const response = await fetch(iconUrl, {
+            signal: controller.signal,
         });
-        const iconData = response.data;
-        if (!iconData || iconData.byteLength < ICON_CONFIG.minFileSize)
+        clearTimeout(timeoutId);
+        if (!response.ok) {
+            if (response.status === 404 && !showSpinner) {
+                return null;
+            }
+            throw new Error(`HTTP ${response.status} ${response.statusText}`);
+        }
+        const arrayBuffer = await response.arrayBuffer();
+        if (!arrayBuffer || arrayBuffer.byteLength < ICON_CONFIG.minFileSize)
             return null;
-        const fileDetails = await fileTypeFromBuffer(iconData);
+        const fileDetails = await fileTypeFromBuffer(arrayBuffer);
         if (!fileDetails ||
             !ICON_CONFIG.supportedFormats.includes(fileDetails.ext)) {
             return null;
         }
-        return await saveIconFile(iconData, fileDetails.ext);
+        return await saveIconFile(arrayBuffer, fileDetails.ext);
     }
     catch (error) {
-        if (showSpinner && !(error.response?.status === 404)) {
-            logger.error('Icon download failed!', error);
+        clearTimeout(timeoutId);
+        if (showSpinner) {
+            if (error instanceof Error && error.name === 'AbortError') {
+                logger.error('Icon download timed out!');
+            }
+            else {
+                logger.error('Icon download failed!', error instanceof Error ? error.message : String(error));
+            }
         }
         return null;
     }
@@ -2041,6 +2048,11 @@ ${green('|_|   \\__,_|_|\\_\\___|  can turn any webpage into a desktop app with
 }
 
 const program = getCliProgram();
+async function checkUpdateTips() {
+    updateNotifier({ pkg: packageJson, updateCheckInterval: 1000 * 60 }).notify({
+        isGlobal: true,
+    });
+}
 program.action(async (url, options) => {
     await checkUpdateTips();
     if (!url) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pake-cli",
-  "version": "3.6.2",
+  "version": "3.6.3",
   "description": "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。",
   "engines": {
     "node": ">=18.0.0"
@@ -38,7 +38,6 @@
     "analyze": "cd src-tauri && cargo bloat --release --crates",
     "tauri": "tauri",
     "cli": "cross-env NODE_ENV=development rollup -c -w",
-    "cli:dev": "cross-env NODE_ENV=development rollup -c -w",
     "cli:build": "cross-env NODE_ENV=production rollup -c",
     "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",
@@ -52,7 +51,6 @@
   "dependencies": {
     "@tauri-apps/api": "^2.9.0",
     "@tauri-apps/cli": "^2.9.0",
-    "axios": "^1.12.2",
     "chalk": "^5.6.2",
     "commander": "^12.1.0",
     "execa": "^9.6.0",

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

@@ -0,0 +1,10 @@
+[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

package/src-tauri/.pake/pake.json

@@ -1,12 +1,12 @@
 {
     "windows": [
         {
-            "url": "https://github.com",
+            "url": "https://twitter.com/",
             "url_type": "web",
-            "hide_title_bar": true,
+            "hide_title_bar": false,
             "fullscreen": false,
             "width": 1200,
-            "height": 800,
+            "height": 780,
             "resizable": true,
             "always_on_top": false,
             "dark_mode": false,
@@ -19,7 +19,6 @@
             "maximize": false,
             "start_to_tray": false,
             "force_internal_navigation": false,
-            "title": null,
             "zoom": 100,
             "min_width": 0,
             "min_height": 0,

package/src-tauri/.pake/tauri.conf.json

@@ -1,6 +1,6 @@
 {
-    "productName": "GitHubMultiArch",
-    "identifier": "com.pake.3097fc",
+    "productName": "twitter",
+    "identifier": "com.pake.4fd9c9",
     "version": "1.0.0",
     "app": {
         "withGlobalTauri": true,
@@ -14,14 +14,11 @@
     },
     "bundle": {
         "icon": [
-            "icons/githubmultiarch.icns"
+            "icons/icon.icns"
         ],
         "active": true,
         "targets": [
             "app"
-        ],
-        "resources": [
-            "icons/githubmultiarch.icns"
         ]
     }
 }

package/src-tauri/.pake/tauri.macos.conf.json

@@ -1,14 +1,11 @@
 {
     "bundle": {
         "icon": [
-            "icons/githubmultiarch.icns"
+            "icons/icon.icns"
         ],
         "active": true,
         "targets": [
             "app"
-        ],
-        "resources": [
-            "icons/githubmultiarch.icns"
         ]
     }
 }

package/src-tauri/Cargo.lock

@@ -2588,7 +2588,7 @@ dependencies = [
 
 [[package]]
 name = "pake"
-version = "3.6.1"
+version = "3.6.3"
 dependencies = [
  "serde",
  "serde_json",

package/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pake"
-version = "3.6.1"
+version = "3.6.3"
 description = "🤱🏻 Turn any webpage into a desktop app with Rust."
 authors = ["Tw93"]
 license = "MIT"
@@ -21,7 +21,12 @@ tauri-build = { version = "2.5.3", features = [] }
 serde_json = "1.0.145"
 serde = { version = "1.0.228", features = ["derive"] }
 tokio = { version = "1.48.0", features = ["full"] }
-tauri = { version = "2.9.4", features = ["tray-icon", "image-ico", "image-png", "macos-proxy"] }
+tauri = { version = "2.9.4", features = [
+  "tray-icon",
+  "image-ico",
+  "image-png",
+  "macos-proxy",
+] }
 tauri-plugin-window-state = "2.4.1"
 tauri-plugin-oauth = "2.0.0"
 tauri-plugin-http = "2.5.4"

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

@@ -32,29 +32,48 @@ pub struct NotificationParams {
 
 #[command]
 pub async fn download_file(app: AppHandle, params: DownloadFileParams) -> Result<(), String> {
-    let window: WebviewWindow = app.get_webview_window("pake").unwrap();
+    let window: WebviewWindow = app.get_webview_window("pake").ok_or("Window not found")?;
+
     show_toast(
         &window,
         &get_download_message_with_lang(MessageType::Start, params.language.clone()),
     );
 
-    let output_path = app.path().download_dir().unwrap().join(params.filename);
-    let file_path = check_file_or_append(output_path.to_str().unwrap());
-    let client = ClientBuilder::new().build().unwrap();
+    let download_dir = app
+        .path()
+        .download_dir()
+        .map_err(|e| format!("Failed to get download dir: {}", e))?;
+
+    let output_path = download_dir.join(&params.filename);
+
+    let path_str = output_path.to_str().ok_or("Invalid output path")?;
+
+    let file_path = check_file_or_append(path_str);
 
-    let response = client
-        .execute(Request::new(
-            Method::GET,
-            Url::from_str(&params.url).unwrap(),
-        ))
-        .await;
+    let client = ClientBuilder::new()
+        .build()
+        .map_err(|e| format!("Failed to build client: {}", e))?;
+
+    let url = Url::from_str(&params.url).map_err(|e| format!("Invalid URL: {}", e))?;
+
+    let request = Request::new(Method::GET, url);
+
+    let response = client.execute(request).await;
 
     match response {
         Ok(mut res) => {
-            let mut file = File::create(file_path).unwrap();
-            while let Some(chunk) = res.chunk().await.unwrap() {
-                file.write_all(&chunk).unwrap();
+            let mut file =
+                File::create(file_path).map_err(|e| format!("Failed to create file: {}", e))?;
+
+            while let Some(chunk) = res
+                .chunk()
+                .await
+                .map_err(|e| format!("Failed to get chunk: {}", e))?
+            {
+                file.write_all(&chunk)
+                    .map_err(|e| format!("Failed to write chunk: {}", e))?;
             }
+
             show_toast(
                 &window,
                 &get_download_message_with_lang(MessageType::Success, params.language.clone()),
@@ -76,15 +95,25 @@ pub async fn download_file_by_binary(
     app: AppHandle,
     params: BinaryDownloadParams,
 ) -> Result<(), String> {
-    let window: WebviewWindow = app.get_webview_window("pake").unwrap();
+    let window: WebviewWindow = app.get_webview_window("pake").ok_or("Window not found")?;
+
     show_toast(
         &window,
         &get_download_message_with_lang(MessageType::Start, params.language.clone()),
     );
-    let output_path = app.path().download_dir().unwrap().join(params.filename);
-    let file_path = check_file_or_append(output_path.to_str().unwrap());
-    let download_file_result = fs::write(file_path, &params.binary);
-    match download_file_result {
+
+    let download_dir = app
+        .path()
+        .download_dir()
+        .map_err(|e| format!("Failed to get download dir: {}", e))?;
+
+    let output_path = download_dir.join(&params.filename);
+
+    let path_str = output_path.to_str().ok_or("Invalid output path")?;
+
+    let file_path = check_file_or_append(path_str);
+
+    match fs::write(file_path, &params.binary) {
         Ok(_) => {
             show_toast(
                 &window,
@@ -111,7 +140,7 @@ pub fn send_notification(app: AppHandle, params: NotificationParams) -> Result<(
         .body(&params.body)
         .icon(&params.icon)
         .show()
-        .unwrap();
+        .map_err(|e| format!("Failed to show notification: {}", e))?;
     Ok(())
 }
 
@@ -119,13 +148,14 @@ pub fn send_notification(app: AppHandle, params: NotificationParams) -> Result<(
 pub async fn update_theme_mode(app: AppHandle, mode: String) {
     #[cfg(target_os = "macos")]
     {
-        let window = app.get_webview_window("pake").unwrap();
-        let theme = if mode == "dark" {
-            Theme::Dark
-        } else {
-            Theme::Light
-        };
-        let _ = window.set_theme(Some(theme));
+        if let Some(window) = app.get_webview_window("pake") {
+            let theme = if mode == "dark" {
+                Theme::Dark
+            } else {
+                Theme::Light
+            };
+            let _ = window.set_theme(Some(theme));
+        }
     }
     #[cfg(not(target_os = "macos"))]
     {

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

@@ -2,208 +2,171 @@ 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>) -> Menu<Wry> {
+pub fn get_menu(app: &AppHandle<Wry>) -> tauri::Result<Menu<Wry>> {
     let pake_version = env!("CARGO_PKG_VERSION");
     let pake_menu_item_title = format!("Built with Pake V{}", pake_version);
 
-    // App Menu (macOS specific, e.g., "Pake")
-    let app_menu = Submenu::new(app, "Pake", true).unwrap();
-    let about_metadata = AboutMetadata::default();
-    app_menu
-        .append(&PredefinedMenuItem::about(app, Some("Pake"), Some(about_metadata)).unwrap())
-        .unwrap();
-    app_menu
-        .append(&PredefinedMenuItem::separator(app).unwrap())
-        .unwrap();
-    app_menu
-        .append(&PredefinedMenuItem::services(app, None).unwrap())
-        .unwrap();
-    app_menu
-        .append(&PredefinedMenuItem::separator(app).unwrap())
-        .unwrap();
-    app_menu
-        .append(&PredefinedMenuItem::hide(app, None).unwrap())
-        .unwrap();
-    app_menu
-        .append(&PredefinedMenuItem::hide_others(app, None).unwrap())
-        .unwrap();
-    app_menu
-        .append(&PredefinedMenuItem::show_all(app, None).unwrap())
-        .unwrap();
-    app_menu
-        .append(&PredefinedMenuItem::separator(app).unwrap())
-        .unwrap();
-    app_menu
-        .append(&PredefinedMenuItem::quit(app, None).unwrap())
-        .unwrap();
+    let menu = Menu::with_items(
+        app,
+        &[
+            &app_menu(app)?,
+            &file_menu(app)?,
+            &edit_menu(app)?,
+            &view_menu(app)?,
+            &navigation_menu(app)?,
+            &window_menu(app)?,
+            &help_menu(app, &pake_menu_item_title)?,
+        ],
+    )?;
 
-    // File Menu
-    let file_menu = Submenu::new(app, "File", true).unwrap();
-    file_menu
-        .append(&PredefinedMenuItem::close_window(app, None).unwrap())
-        .unwrap();
-    file_menu
-        .append(&PredefinedMenuItem::separator(app).unwrap())
-        .unwrap();
-    file_menu
-        .append(
-            &MenuItem::with_id(
-                app,
-                "clear_cache_restart",
-                "Clear Cache & Restart",
-                true,
-                Some("CmdOrCtrl+Shift+Backspace"),
-            )
-            .unwrap(),
-        )
-        .unwrap();
+    Ok(menu)
+}
 
-    // Edit Menu
-    let edit_menu = Submenu::new(app, "Edit", true).unwrap();
-    edit_menu
-        .append(&PredefinedMenuItem::undo(app, None).unwrap())
-        .unwrap();
-    edit_menu
-        .append(&PredefinedMenuItem::redo(app, None).unwrap())
-        .unwrap();
-    edit_menu
-        .append(&PredefinedMenuItem::separator(app).unwrap())
-        .unwrap();
-    edit_menu
-        .append(&PredefinedMenuItem::cut(app, None).unwrap())
-        .unwrap();
-    edit_menu
-        .append(&PredefinedMenuItem::copy(app, None).unwrap())
-        .unwrap();
-    edit_menu
-        .append(&PredefinedMenuItem::paste(app, None).unwrap())
-        .unwrap();
-    edit_menu
-        .append(&PredefinedMenuItem::select_all(app, None).unwrap())
-        .unwrap();
-    edit_menu
-        .append(&PredefinedMenuItem::separator(app).unwrap())
-        .unwrap();
-    edit_menu
-        .append(&MenuItem::with_id(app, "copy_url", "Copy URL", true, Some("CmdOrCtrl+L")).unwrap())
-        .unwrap();
+fn app_menu(app: &AppHandle<Wry>) -> tauri::Result<Submenu<Wry>> {
+    let app_menu = Submenu::new(app, "Pake", true)?;
+    let about_metadata = AboutMetadata::default();
+    app_menu.append(&PredefinedMenuItem::about(
+        app,
+        Some("Pake"),
+        Some(about_metadata),
+    )?)?;
+    app_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    app_menu.append(&PredefinedMenuItem::services(app, None)?)?;
+    app_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    app_menu.append(&PredefinedMenuItem::hide(app, None)?)?;
+    app_menu.append(&PredefinedMenuItem::hide_others(app, None)?)?;
+    app_menu.append(&PredefinedMenuItem::show_all(app, None)?)?;
+    app_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    app_menu.append(&PredefinedMenuItem::quit(app, None)?)?;
+    Ok(app_menu)
+}
 
-    // View Menu
-    let view_menu = Submenu::new(app, "View", true).unwrap();
-    view_menu
-        .append(&MenuItem::with_id(app, "reload", "Reload", true, Some("CmdOrCtrl+R")).unwrap())
-        .unwrap();
-    view_menu
-        .append(&PredefinedMenuItem::separator(app).unwrap())
-        .unwrap();
-    view_menu
-        .append(&MenuItem::with_id(app, "zoom_in", "Zoom In", true, Some("CmdOrCtrl+=")).unwrap())
-        .unwrap();
-    view_menu
-        .append(&MenuItem::with_id(app, "zoom_out", "Zoom Out", true, Some("CmdOrCtrl+-")).unwrap())
-        .unwrap();
-    view_menu
-        .append(
-            &MenuItem::with_id(app, "zoom_reset", "Actual Size", true, Some("CmdOrCtrl+0"))
-                .unwrap(),
-        )
-        .unwrap();
-    view_menu
-        .append(&PredefinedMenuItem::separator(app).unwrap())
-        .unwrap();
-    view_menu
-        .append(&PredefinedMenuItem::fullscreen(app, None).unwrap())
-        .unwrap();
-    view_menu
-        .append(&PredefinedMenuItem::separator(app).unwrap())
-        .unwrap();
-    view_menu
-        .append(
-            &MenuItem::with_id(
-                app,
-                "toggle_devtools",
-                "Toggle Developer Tools",
-                cfg!(debug_assertions),
-                Some("CmdOrCtrl+Option+I"),
-            )
-            .unwrap(),
-        )
-        .unwrap();
+fn file_menu(app: &AppHandle<Wry>) -> tauri::Result<Submenu<Wry>> {
+    let file_menu = Submenu::new(app, "File", true)?;
+    file_menu.append(&PredefinedMenuItem::close_window(app, None)?)?;
+    file_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    file_menu.append(&MenuItem::with_id(
+        app,
+        "clear_cache_restart",
+        "Clear Cache & Restart",
+        true,
+        Some("CmdOrCtrl+Shift+Backspace"),
+    )?)?;
+    Ok(file_menu)
+}
 
-    // Navigation Menu
-    let navigation_menu = Submenu::new(app, "Navigation", true).unwrap();
-    navigation_menu
-        .append(&MenuItem::with_id(app, "go_back", "Back", true, Some("CmdOrCtrl+[")).unwrap())
-        .unwrap();
-    navigation_menu
-        .append(
-            &MenuItem::with_id(app, "go_forward", "Forward", true, Some("CmdOrCtrl+]")).unwrap(),
-        )
-        .unwrap();
-    navigation_menu
-        .append(
-            &MenuItem::with_id(app, "go_home", "Go Home", true, Some("CmdOrCtrl+Shift+H")).unwrap(),
-        )
-        .unwrap();
+fn edit_menu(app: &AppHandle<Wry>) -> 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)?)?;
+    edit_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    edit_menu.append(&PredefinedMenuItem::cut(app, None)?)?;
+    edit_menu.append(&PredefinedMenuItem::copy(app, None)?)?;
+    edit_menu.append(&PredefinedMenuItem::paste(app, None)?)?;
+    edit_menu.append(&PredefinedMenuItem::select_all(app, None)?)?;
+    edit_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    edit_menu.append(&MenuItem::with_id(
+        app,
+        "copy_url",
+        "Copy URL",
+        true,
+        Some("CmdOrCtrl+L"),
+    )?)?;
+    Ok(edit_menu)
+}
 
-    // Window Menu
-    let window_menu = Submenu::new(app, "Window", true).unwrap();
-    window_menu
-        .append(&PredefinedMenuItem::minimize(app, None).unwrap())
-        .unwrap();
-    window_menu
-        .append(&PredefinedMenuItem::maximize(app, None).unwrap())
-        .unwrap();
-    window_menu
-        .append(&PredefinedMenuItem::separator(app).unwrap())
-        .unwrap();
-    window_menu
-        .append(
-            &MenuItem::with_id(
-                app,
-                "always_on_top",
-                "Toggle Always on Top",
-                true,
-                None::<&str>,
-            )
-            .unwrap(),
-        )
-        .unwrap();
-    window_menu
-        .append(&PredefinedMenuItem::separator(app).unwrap())
-        .unwrap();
-    window_menu
-        .append(&PredefinedMenuItem::close_window(app, None).unwrap())
-        .unwrap();
+fn view_menu(app: &AppHandle<Wry>) -> tauri::Result<Submenu<Wry>> {
+    let view_menu = Submenu::new(app, "View", true)?;
+    view_menu.append(&MenuItem::with_id(
+        app,
+        "reload",
+        "Reload",
+        true,
+        Some("CmdOrCtrl+R"),
+    )?)?;
+    view_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    view_menu.append(&MenuItem::with_id(
+        app,
+        "zoom_in",
+        "Zoom In",
+        true,
+        Some("CmdOrCtrl+="),
+    )?)?;
+    view_menu.append(&MenuItem::with_id(
+        app,
+        "zoom_out",
+        "Zoom Out",
+        true,
+        Some("CmdOrCtrl+-"),
+    )?)?;
+    view_menu.append(&MenuItem::with_id(
+        app,
+        "zoom_reset",
+        "Actual Size",
+        true,
+        Some("CmdOrCtrl+0"),
+    )?)?;
+    view_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    view_menu.append(&PredefinedMenuItem::fullscreen(app, None)?)?;
+    view_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    view_menu.append(&MenuItem::with_id(
+        app,
+        "toggle_devtools",
+        "Toggle Developer Tools",
+        cfg!(debug_assertions),
+        Some("CmdOrCtrl+Option+I"),
+    )?)?;
+    Ok(view_menu)
+}
 
-    // Help Menu (Custom)
-    let help_menu = Submenu::new(app, "Help", true).unwrap();
-    let github_item = MenuItem::with_id(
+fn navigation_menu(app: &AppHandle<Wry>) -> tauri::Result<Submenu<Wry>> {
+    let navigation_menu = Submenu::new(app, "Navigation", true)?;
+    navigation_menu.append(&MenuItem::with_id(
         app,
-        "pake_github_link",
-        &pake_menu_item_title,
+        "go_back",
+        "Back",
         true,
-        None::<&str>,
-    )
-    .unwrap();
-    help_menu.append(&github_item).unwrap();
+        Some("CmdOrCtrl+["),
+    )?)?;
+    navigation_menu.append(&MenuItem::with_id(
+        app,
+        "go_forward",
+        "Forward",
+        true,
+        Some("CmdOrCtrl+]"),
+    )?)?;
+    navigation_menu.append(&MenuItem::with_id(
+        app,
+        "go_home",
+        "Go Home",
+        true,
+        Some("CmdOrCtrl+Shift+H"),
+    )?)?;
+    Ok(navigation_menu)
+}
 
-    // Construct the Menu Bar
-    let menu = Menu::with_items(
+fn window_menu(app: &AppHandle<Wry>) -> tauri::Result<Submenu<Wry>> {
+    let window_menu = Submenu::new(app, "Window", true)?;
+    window_menu.append(&PredefinedMenuItem::minimize(app, None)?)?;
+    window_menu.append(&PredefinedMenuItem::maximize(app, None)?)?;
+    window_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    window_menu.append(&MenuItem::with_id(
         app,
-        &[
-            &app_menu,
-            &file_menu,
-            &edit_menu,
-            &view_menu,
-            &navigation_menu,
-            &window_menu,
-            &help_menu,
-        ],
-    )
-    .unwrap();
+        "always_on_top",
+        "Toggle Always on Top",
+        true,
+        None::<&str>,
+    )?)?;
+    window_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    window_menu.append(&PredefinedMenuItem::close_window(app, None)?)?;
+    Ok(window_menu)
+}
 
-    menu
+fn help_menu(app: &AppHandle<Wry>, title: &str) -> tauri::Result<Submenu<Wry>> {
+    let help_menu = Submenu::new(app, "Help", true)?;
+    let github_item = MenuItem::with_id(app, "pake_github_link", title, true, None::<&str>)?;
+    help_menu.append(&github_item)?;
+    Ok(help_menu)
 }
 
 pub fn handle_menu_click(app_handle: &AppHandle, id: &str) {

package/src-tauri/src/lib.rs

@@ -9,6 +9,8 @@ use tauri_plugin_window_state::StateFlags;
 #[cfg(target_os = "macos")]
 use std::time::Duration;
 
+const WINDOW_SHOW_DELAY: u64 = 50;
+
 use app::{
     invoke::{
         clear_cache_and_restart, download_file, download_file_by_binary, send_notification,
@@ -69,13 +71,16 @@ pub fn run_app() {
         ])
         .setup(move |app| {
             // --- Menu Construction Start ---
-            let menu = app::menu::get_menu(app.app_handle());
-            app.set_menu(menu)?;
+            #[cfg(target_os = "macos")]
+            {
+                let menu = app::menu::get_menu(app.app_handle())?;
+                app.set_menu(menu)?;
 
-            // Event Handling for Custom Menu Item
-            app.on_menu_event(move |app_handle, event| {
-                app::menu::handle_menu_click(app_handle, event.id().as_ref());
-            });
+                // Event Handling for Custom Menu Item
+                app.on_menu_event(move |app_handle, event| {
+                    app::menu::handle_menu_click(app_handle, event.id().as_ref());
+                });
+            }
             // --- Menu Construction End ---
 
             let window = set_window(app, &pake_config, &tauri_config);
@@ -92,7 +97,7 @@ pub fn run_app() {
             if !start_to_tray {
                 let window_clone = window.clone();
                 tauri::async_runtime::spawn(async move {
-                    tokio::time::sleep(tokio::time::Duration::from_millis(50)).await;
+                    tokio::time::sleep(tokio::time::Duration::from_millis(WINDOW_SHOW_DELAY)).await;
                     window_clone.show().unwrap();
                 });
             }