pake-cli 3.3.0 → 3.3.2

package/README.md

@@ -3,7 +3,7 @@
     <img src=https://gw.alipayobjects.com/zos/k/fa/logo-modified.png width=138/>
 </p>
 <h1 align="center">Pake</h1>
-<p align="center"><strong>Turn any webpage into a desktop app with Rust <em>with ease</em>.</strong></p>
+<p align="center"><strong>Turn any webpage into a desktop app with one command, supports macOS, Windows, and Linux</strong></p>
 <div align="center">
     <a href="https://twitter.com/HiTw93" target="_blank">
     <img alt="twitter" src="https://img.shields.io/badge/follow-Tw93-red?style=flat-square&logo=Twitter"></a>
@@ -15,19 +15,20 @@
     <img alt="GitHub commit" src="https://img.shields.io/github/commit-activity/m/tw93/Pake?style=flat-square"></a>
     <a href="https://github.com/tw93/Pake/issues?q=is%3Aissue+is%3Aclosed" target="_blank">
     <img alt="GitHub closed issues" src="https://img.shields.io/github/issues-closed/tw93/Pake.svg?style=flat-square"></a>
-    <a href="https://colab.research.google.com/drive/1bX345znvDZ30848xjRtpgtU8eypWwXrp?usp=sharing" target="_blank">
-    <img alt="Open in Colab" src="https://colab.research.google.com/assets/colab-badge.svg"></a>
 </div>
 
-<div align="left">Pake supports Mac, Windows, and Linux. Check out README for <a href="#popular-packages">Popular Packages</a>, <a href="#command-line-packaging">Command-Line Packaging</a>, and <a href="#development">Customized Development</a> information. Feel free to share your suggestions in <a href=https://github.com/tw93/Pake/discussions>Discussions</a>.</div>
-
 ## Features
 
-- 🎐 Nearly 20 times smaller than an Electron package (around 5M!)
-- 🚀 With Rust Tauri, Pake is much more lightweight and faster than JS-based frameworks.
-- 📦 Battery-included package — shortcut pass-through, immersive windows, and minimalist customization.
-- 🖱️ Smart right-click context menus with download support for images, videos, and files.
-- 👻 Pake is just a simple tool — replaces the old bundle approach with Tauri (though PWA is also a good alternative).
+- 🎐 **Lightweight**: Nearly 20 times smaller than Electron packages, typically around 5M
+- 🚀 **Fast**: Built with Rust Tauri, much faster than traditional JS frameworks with lower memory usage
+- ⚡ **Easy to use**: One-command packaging via CLI or online building, no complex configuration needed
+- 📦 **Feature-rich**: Supports shortcut pass-through, immersive windows, drag & drop, style customization, ad removal
+
+## Getting Started
+
+- **Beginners**: Download ready-made [Popular Packages](#popular-packages) or use [Online Building](docs/github-actions-usage.md) with no environment setup required
+- **Developers**: Install [CLI Tool](docs/cli-usage.md) for one-command packaging of any website with customizable icons, window settings, and more
+- **Advanced Users**: Clone the project locally for [Custom Development](#development), or check [Advanced Usage](docs/advanced-usage.md) for style customization and feature enhancement
 
 ## Popular Packages
 
@@ -152,58 +153,39 @@ In addition, double-click the title bar to switch to full-screen mode. For Mac u
 
 </details>
 
-## Before starting
-
-1. **For beginners**: Play with Popular Packages to find out Pake's capabilities, or try to pack your application with [GitHub Actions](docs/github-actions-usage.md). Don't hesitate to reach for assistance at [Discussion](https://github.com/tw93/Pake/discussions)!
-2. **For developers**: “Command-Line Packaging” supports macOS fully. For Windows/Linux users, it requires some tinkering. [Configure your environment](https://tauri.app/start/prerequisites/) before getting started.
-3. **For hackers**: For people who are good at both front-end development and Rust, how about customizing your apps' function more with the following [Customized Development](#development)?
-
 ## Command-Line Packaging
 
 ![Pake](https://raw.githubusercontent.com/tw93/static/main/pake/pake.gif)
 
-**Pake provides a command line tool, making the flow of package customization quicker and easier. See the [CLI usage guide](docs/cli-usage.md) for more information.**
-
 ```bash
-# Recommended (pnpm)
+# Install
 pnpm install -g pake-cli
 
-# Alternative (npm)
-npm install -g pake-cli
-
-# Command usage
-pake url [OPTIONS]...
+# Basic usage (auto-fetch website icon)
+pake https://weekly.tw93.fun --name Weekly
 
-# Feel free to play with Pake! It might take a while to prepare the environment the first time you launch Pake.
-pake https://weekly.tw93.fun --name Weekly --hide-title-bar
+# Common options: --name app name, --icon custom icon, --width/--height window size, --hide-title-bar macOS immersive
+pake https://weekly.tw93.fun --name Weekly --icon https://cdn.tw93.fun/pake/weekly.icns --hide-title-bar
 ```
 
-If you are new to the command line, you can compile packages online with _GitHub Actions_. See our [documentation](#documentation) for detailed guides.
+First-time packaging requires environment setup and may be slower, subsequent builds are fast. For complete parameter documentation, see [CLI Usage Guide](docs/cli-usage.md). Don't want to use CLI? Try [GitHub Actions Online Building](docs/github-actions-usage.md).
 
 ## Development
 
-Prepare your environment before starting. Make sure you have Rust `>=1.89` and Node `>=18` (e.g., `22.11.0`) installed on your computer. _Note: Latest stable versions are recommended._ For installation guidance, see [Tauri documentation](https://tauri.app/start/prerequisites/).
+Requires Rust `>=1.89` and Node `>=22`. For detailed installation guide, see [Tauri documentation](https://tauri.app/start/prerequisites/). If unfamiliar with development environment, use the CLI tool instead.
 
-If you are unfamiliar with these, it is better to try out the above tool to pack with one click.
-
-```sh
+```bash
 # Install dependencies
 pnpm i
 
-# Local development (right-click to open debug mode)
+# Local development [right-click to open debug mode]
 pnpm run dev
 
 # Build application
 pnpm run build
 ```
 
-## Documentation
-
-- **[CLI Usage](docs/cli-usage.md)** | [中文](docs/cli-usage_CN.md) - Command-line interface reference
-- **[Advanced Usage](docs/advanced-usage.md)** | [中文](docs/advanced-usage_CN.md) - Customization and advanced features
-- **[GitHub Actions](docs/github-actions-usage.md)** | [中文](docs/github-actions-usage_CN.md) - Build apps online
-- **[Pake Action](docs/pake-action.md)** - Use Pake as GitHub Action in your projects
-- **[Contributing](CONTRIBUTING.md)** - How to contribute to development
+For style customization, feature enhancement, container communication and other advanced features, see [Advanced Usage Documentation](docs/advanced-usage.md).
 
 ## Developers
 
@@ -306,6 +288,15 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>GoodbyeNJN</b></sub>
                 </a>
             </td>
+            <td align="center">
+                <a href="https://github.com/eltociear">
+                    <img src="https://avatars.githubusercontent.com/u/22633385?v=4" width="90;" alt="eltociear"/>
+                    <br />
+                    <sub><b>Ikko Eltociear Ashimine</b></sub>
+                </a>
+            </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/kittizz">
                     <img src="https://avatars.githubusercontent.com/u/62899732?v=4" width="90;" alt="kittizz"/>
@@ -313,8 +304,6 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Kittizz</b></sub>
                 </a>
             </td>
-		</tr>
-		<tr>
             <td align="center">
                 <a href="https://github.com/mattbajorek">
                     <img src="https://avatars.githubusercontent.com/u/17235301?v=4" width="90;" alt="mattbajorek"/>
@@ -357,6 +346,8 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Yue Yang</b></sub>
                 </a>
             </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/lkieryan">
                     <img src="https://avatars.githubusercontent.com/u/187804088?v=4" width="90;" alt="lkieryan"/>
@@ -364,8 +355,6 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Kieran</b></sub>
                 </a>
             </td>
-		</tr>
-		<tr>
             <td align="center">
                 <a href="https://github.com/exposir">
                     <img src="https://avatars.githubusercontent.com/u/33340988?v=4" width="90;" alt="exposir"/>
@@ -408,6 +397,8 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Ayaka Neko</b></sub>
                 </a>
             </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/turkyden">
                     <img src="https://avatars.githubusercontent.com/u/24560160?v=4" width="90;" alt="turkyden"/>
@@ -415,8 +406,6 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Dengju Deng</b></sub>
                 </a>
             </td>
-		</tr>
-		<tr>
             <td align="center">
                 <a href="https://github.com/fvn-elmy">
                     <img src="https://avatars.githubusercontent.com/u/71275745?v=4" width="90;" alt="fvn-elmy"/>
@@ -459,6 +448,8 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Milo</b></sub>
                 </a>
             </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/princemaple">
                     <img src="https://avatars.githubusercontent.com/u/1329716?v=4" width="90;" alt="princemaple"/>
@@ -466,8 +457,6 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Po Chen</b></sub>
                 </a>
             </td>
-		</tr>
-		<tr>
             <td align="center">
                 <a href="https://github.com/beautifulrem">
                     <img src="https://avatars.githubusercontent.com/u/98527099?v=4" width="90;" alt="beautifulrem"/>
@@ -510,6 +499,8 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Liudonghua</b></sub>
                 </a>
             </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/liusishan">
                     <img src="https://avatars.githubusercontent.com/u/33129823?v=4" width="90;" alt="liusishan"/>
@@ -517,8 +508,6 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Liusishan</b></sub>
                 </a>
             </td>
-		</tr>
-		<tr>
             <td align="center">
                 <a href="https://github.com/piaoyidage">
                     <img src="https://avatars.githubusercontent.com/u/5135405?v=4" width="90;" alt="piaoyidage"/>
@@ -541,6 +530,6 @@ Pake's development can not be without these Hackers. They contributed a lot of c
 ## Support
 
 1. I have two cats, TangYuan and Coke. If you think Pake delights your life, you can feed them <a href="https://miaoyan.app/cats.html?name=Pake" target="_blank">some canned food 🥩</a>.
-2. If you like Pake, you can star it on GitHub. Also, welcome to [recommend Pake](https://twitter.com/intent/tweet?url=https://github.com/tw93/Pake&text=%23Pake%20-%20A%20simple%20Rust%20packaged%20web%20pages%20to%20generate%20Mac%20App%20tool,%20compared%20to%20traditional%20Electron%20package,%20the%20size%20of%20nearly%2040%20times%20smaller,%20generally%20about%202M,%20the%20underlying%20use%20of%20Tauri,%20performance%20experience%20than%20the%20JS%20framework%20is%20much%20lighter~) to your friends.
+2. If you like Pake, you can star it on GitHub. Also, welcome to [recommend Pake](https://twitter.com/intent/tweet?url=https://github.com/tw93/Pake&text=Pake%20-%20Turn%20any%20webpage%20into%20a%20desktop%20app%20with%20one%20command.%20Nearly%2020x%20smaller%20than%20Electron%20packages,%20supports%20macOS%20Windows%20Linux) to your friends.
 3. You can follow my [Twitter](https://twitter.com/HiTw93) to get the latest news of Pake or join our [Telegram](https://t.me/+GclQS9ZnxyI2ODQ1) chat group.
 4. I hope that you enjoy playing with it. Let us know if you find a website that would be great for a Mac App!

package/dist/cli.js

@@ -22,8 +22,8 @@ import sharp from 'sharp';
 import * as psl from 'psl';
 
 var name = "pake-cli";
-var version = "3.3.0";
-var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 利用 Rust 轻松构建轻量级多端桌面应用。";
+var version = "3.3.2";
+var description = "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。";
 var engines = {
 	node: ">=18.0.0"
 };
@@ -73,7 +73,7 @@ var exports = "./dist/cli.js";
 var license = "MIT";
 var dependencies = {
 	"@tauri-apps/api": "^2.8.0",
-	"@tauri-apps/cli": "^2.8.3",
+	"@tauri-apps/cli": "^2.8.4",
 	axios: "^1.11.0",
 	chalk: "^5.6.0",
 	commander: "^12.1.0",
@@ -85,7 +85,7 @@ var dependencies = {
 	ora: "^8.2.0",
 	prompts: "^2.4.2",
 	psl: "^1.15.0",
-	sharp: "^0.34.3",
+	sharp: "^0.33.5",
 	"tmp-promise": "^3.0.3",
 	"update-notifier": "^7.3.1"
 };
@@ -96,7 +96,7 @@ var devDependencies = {
 	"@rollup/plugin-replace": "^6.0.2",
 	"@rollup/plugin-terser": "^0.4.4",
 	"@types/fs-extra": "^11.0.4",
-	"@types/node": "^20.19.11",
+	"@types/node": "^20.19.13",
 	"@types/page-icon": "^0.3.6",
 	"@types/prompts": "^2.4.9",
 	"@types/tmp": "^0.2.6",
@@ -104,7 +104,7 @@ var devDependencies = {
 	"app-root-path": "^3.1.0",
 	"cross-env": "^7.0.3",
 	prettier: "^3.6.2",
-	rollup: "^4.49.0",
+	rollup: "^4.50.0",
 	"rollup-plugin-typescript2": "^0.36.0",
 	tslib: "^2.8.1",
 	typescript: "^5.9.2"
@@ -1150,20 +1150,54 @@ async function checkUpdateTips() {
     });
 }
 
-// Constants
 const ICON_CONFIG = {
     minFileSize: 100,
-    downloadTimeout: 10000,
-    supportedFormats: ['png', 'ico', 'jpeg', 'jpg', 'webp'],
+    supportedFormats: ['png', 'ico', 'jpeg', 'jpg', 'webp', 'icns'],
     whiteBackground: { r: 255, g: 255, b: 255 },
+    transparentBackground: { r: 255, g: 255, b: 255, alpha: 0 },
+    downloadTimeout: {
+        ci: 5000,
+        default: 15000,
+    },
+};
+const PLATFORM_CONFIG = {
+    win: { format: '.ico', sizes: [16, 32, 48, 64, 128, 256] },
+    linux: { format: '.png', size: 512 },
+    macos: { format: '.icns', sizes: [16, 32, 64, 128, 256, 512, 1024] },
 };
-// API Configuration
-const API_TOKENS = {
-    // cspell:disable-next-line
+const API_KEYS = {
     logoDev: ['pk_JLLMUKGZRpaG5YclhXaTkg', 'pk_Ph745P8mQSeYFfW2Wk039A'],
-    // cspell:disable-next-line
     brandfetch: ['1idqvJC0CeFSeyp3Yf7', '1idej-yhU_ThggIHFyG'],
 };
+/**
+ * Generates platform-specific icon paths and handles copying for Windows
+ */
+function generateIconPath(appName, isDefault = false) {
+    const safeName = appName.toLowerCase().replace(/[^a-z0-9-_]/g, '_');
+    const baseName = isDefault ? 'icon' : safeName;
+    if (IS_WIN) {
+        return path.join(npmDirectory, 'src-tauri', 'png', `${baseName}_256.ico`);
+    }
+    if (IS_LINUX) {
+        return path.join(npmDirectory, 'src-tauri', 'png', `${baseName}_512.png`);
+    }
+    return path.join(npmDirectory, 'src-tauri', 'icons', `${baseName}.icns`);
+}
+async function copyWindowsIconIfNeeded(convertedPath, appName) {
+    if (!IS_WIN || !convertedPath.endsWith('.ico')) {
+        return convertedPath;
+    }
+    try {
+        const finalIconPath = generateIconPath(appName);
+        await fsExtra.ensureDir(path.dirname(finalIconPath));
+        await fsExtra.copy(convertedPath, finalIconPath);
+        return finalIconPath;
+    }
+    catch (error) {
+        logger.warn(`Failed to copy Windows icon: ${error instanceof Error ? error.message : 'Unknown error'}`);
+        return convertedPath;
+    }
+}
 /**
  * Adds white background to transparent icons only
  */
@@ -1206,23 +1240,34 @@ async function convertIconFormat(inputPath, appName) {
         const iconName = appName.toLowerCase();
         // Generate platform-specific format
         if (IS_WIN) {
+            // Support multiple sizes for better Windows compatibility
             await icongen(processedInputPath, platformOutputDir, {
                 report: false,
-                ico: { name: `${iconName}_256`, sizes: [256] },
+                ico: {
+                    name: `${iconName}_256`,
+                    sizes: PLATFORM_CONFIG.win.sizes,
+                },
             });
-            return path.join(platformOutputDir, `${iconName}_256.ico`);
+            return path.join(platformOutputDir, `${iconName}_256${PLATFORM_CONFIG.win.format}`);
         }
         if (IS_LINUX) {
-            const outputPath = path.join(platformOutputDir, `${iconName}_512.png`);
-            await fsExtra.copy(processedInputPath, outputPath);
+            const outputPath = path.join(platformOutputDir, `${iconName}_${PLATFORM_CONFIG.linux.size}${PLATFORM_CONFIG.linux.format}`);
+            // Ensure we convert to proper PNG format with correct size
+            await sharp(processedInputPath)
+                .resize(PLATFORM_CONFIG.linux.size, PLATFORM_CONFIG.linux.size, {
+                fit: 'contain',
+                background: ICON_CONFIG.transparentBackground,
+            })
+                .png()
+                .toFile(outputPath);
             return outputPath;
         }
         // macOS
         await icongen(processedInputPath, platformOutputDir, {
             report: false,
-            icns: { name: iconName, sizes: [16, 32, 64, 128, 256, 512, 1024] },
+            icns: { name: iconName, sizes: PLATFORM_CONFIG.macos.sizes },
         });
-        const outputPath = path.join(platformOutputDir, `${iconName}.icns`);
+        const outputPath = path.join(platformOutputDir, `${iconName}${PLATFORM_CONFIG.macos.format}`);
         return (await fsExtra.pathExists(outputPath)) ? outputPath : null;
     }
     catch (error) {
@@ -1230,97 +1275,113 @@ async function convertIconFormat(inputPath, appName) {
         return null;
     }
 }
-async function handleIcon(options, url) {
-    if (options.icon) {
-        if (options.icon.startsWith('http')) {
-            const downloadedPath = await downloadIcon(options.icon);
-            if (downloadedPath && options.name) {
-                // Convert downloaded icon to platform-specific format
-                const convertedPath = await convertIconFormat(downloadedPath, options.name);
-                if (convertedPath) {
-                    // For Windows, copy the converted ico to the expected location
-                    if (IS_WIN && convertedPath.endsWith('.ico')) {
-                        const finalIconPath = path.join(npmDirectory, `src-tauri/png/${options.name.toLowerCase()}_256.ico`);
-                        await fsExtra.ensureDir(path.dirname(finalIconPath));
-                        await fsExtra.copy(convertedPath, finalIconPath);
-                        return finalIconPath;
-                    }
-                    return convertedPath;
-                }
-            }
-            return downloadedPath;
-        }
-        return path.resolve(options.icon);
-    }
-    // Try to get favicon from website if URL is provided
-    if (url && url.startsWith('http') && options.name) {
-        const faviconPath = await tryGetFavicon(url, options.name);
-        if (faviconPath)
-            return faviconPath;
+/**
+ * Processes downloaded or local icon for platform-specific format
+ */
+async function processIcon(iconPath, appName) {
+    if (!iconPath || !appName)
+        return iconPath;
+    // Check if already in correct platform format
+    const ext = path.extname(iconPath).toLowerCase();
+    const isCorrectFormat = (IS_WIN && ext === '.ico') ||
+        (IS_LINUX && ext === '.png') ||
+        (!IS_WIN && !IS_LINUX && ext === '.icns');
+    if (isCorrectFormat) {
+        return await copyWindowsIconIfNeeded(iconPath, appName);
+    }
+    // Convert to platform format
+    const convertedPath = await convertIconFormat(iconPath, appName);
+    if (convertedPath) {
+        return await copyWindowsIconIfNeeded(convertedPath, appName);
     }
+    return iconPath;
+}
+/**
+ * Gets default icon with platform-specific fallback logic
+ */
+async function getDefaultIcon() {
     logger.info('✼ No icon provided, using default icon.');
-    // For Windows, ensure we have proper fallback handling
     if (IS_WIN) {
-        const defaultIcoPath = path.join(npmDirectory, 'src-tauri/png/icon_256.ico');
+        const defaultIcoPath = generateIconPath('icon', true);
         const defaultPngPath = path.join(npmDirectory, 'src-tauri/png/icon_512.png');
-        // First try default ico
+        // Try default ico first
         if (await fsExtra.pathExists(defaultIcoPath)) {
             return defaultIcoPath;
         }
-        // If ico doesn't exist, try to convert from png
+        // Convert from png if ico doesn't exist
         if (await fsExtra.pathExists(defaultPngPath)) {
             logger.info('✼ Default ico not found, converting from png...');
             try {
                 const convertedPath = await convertIconFormat(defaultPngPath, 'icon');
                 if (convertedPath && (await fsExtra.pathExists(convertedPath))) {
-                    // Copy converted icon to the expected location for Windows
-                    const finalIconPath = path.join(npmDirectory, 'src-tauri/png/icon_256.ico');
-                    await fsExtra.ensureDir(path.dirname(finalIconPath));
-                    await fsExtra.copy(convertedPath, finalIconPath);
-                    return finalIconPath;
+                    return await copyWindowsIconIfNeeded(convertedPath, 'icon');
                 }
             }
             catch (error) {
-                logger.warn(`Failed to convert default png to ico: ${error.message}`);
+                logger.warn(`Failed to convert default png to ico: ${error instanceof Error ? error.message : 'Unknown error'}`);
             }
         }
-        // Last resort: return png path if it exists (Windows can handle png in some cases)
+        // Fallback to png or empty
         if (await fsExtra.pathExists(defaultPngPath)) {
             logger.warn('✼ Using png as fallback for Windows (may cause issues).');
             return defaultPngPath;
         }
-        // If nothing exists, return empty string to let merge.ts handle default icon
         logger.warn('✼ No default icon found, will use pake default.');
         return '';
     }
+    // Linux and macOS defaults
     const iconPath = IS_LINUX
         ? 'src-tauri/png/icon_512.png'
         : 'src-tauri/icons/icon.icns';
     return path.join(npmDirectory, iconPath);
 }
+/**
+ * Main icon handling function with simplified logic flow
+ */
+async function handleIcon(options, url) {
+    // Handle custom icon (local file or remote URL)
+    if (options.icon) {
+        if (options.icon.startsWith('http')) {
+            const downloadedPath = await downloadIcon(options.icon);
+            if (downloadedPath) {
+                const result = await processIcon(downloadedPath, options.name || '');
+                if (result)
+                    return result;
+            }
+            return '';
+        }
+        // Local file path
+        const resolvedPath = path.resolve(options.icon);
+        const result = await processIcon(resolvedPath, options.name || '');
+        return result || resolvedPath;
+    }
+    // Try favicon from website
+    if (url && options.name) {
+        const faviconPath = await tryGetFavicon(url, options.name);
+        if (faviconPath)
+            return faviconPath;
+    }
+    // Use default icon
+    return await getDefaultIcon();
+}
 /**
  * Generates icon service URLs for a domain
  */
 function generateIconServiceUrls(domain) {
-    const logoDevUrls = API_TOKENS.logoDev
+    const logoDevUrls = API_KEYS.logoDev
         .sort(() => Math.random() - 0.5)
         .map((token) => `https://img.logo.dev/${domain}?token=${token}&format=png&size=256`);
-    const brandfetchUrls = API_TOKENS.brandfetch
+    const brandfetchUrls = API_KEYS.brandfetch
         .sort(() => Math.random() - 0.5)
         .map((key) => `https://cdn.brandfetch.io/${domain}/w/400/h/400?c=${key}`);
     return [
         ...logoDevUrls,
         ...brandfetchUrls,
         `https://logo.clearbit.com/${domain}?size=256`,
-        `https://logo.uplead.com/${domain}`,
         `https://www.google.com/s2/favicons?domain=${domain}&sz=256`,
         `https://favicon.is/${domain}`,
-        `https://icons.duckduckgo.com/ip3/${domain}.ico`,
-        `https://icon.horse/icon/${domain}`,
         `https://${domain}/favicon.ico`,
         `https://www.${domain}/favicon.ico`,
-        `https://${domain}/apple-touch-icon.png`,
-        `https://${domain}/apple-touch-icon-precomposed.png`,
     ];
 }
 /**
@@ -1331,9 +1392,10 @@ async function tryGetFavicon(url, appName) {
         const domain = new URL(url).hostname;
         const spinner = getSpinner(`Fetching icon from ${domain}...`);
         const serviceUrls = generateIconServiceUrls(domain);
-        // Use shorter timeout for CI environments
         const isCI = process.env.CI === 'true' || process.env.GITHUB_ACTIONS === 'true';
-        const downloadTimeout = isCI ? 5000 : ICON_CONFIG.downloadTimeout;
+        const downloadTimeout = isCI
+            ? ICON_CONFIG.downloadTimeout.ci
+            : ICON_CONFIG.downloadTimeout.default;
         for (const serviceUrl of serviceUrls) {
             try {
                 const faviconPath = await downloadIcon(serviceUrl, false, downloadTimeout);
@@ -1341,22 +1403,20 @@ async function tryGetFavicon(url, appName) {
                     continue;
                 const convertedPath = await convertIconFormat(faviconPath, appName);
                 if (convertedPath) {
-                    // For Windows, copy the converted ico to the expected location
-                    if (IS_WIN && convertedPath.endsWith('.ico')) {
-                        const finalIconPath = path.join(npmDirectory, `src-tauri/png/${appName.toLowerCase()}_256.ico`);
-                        await fsExtra.ensureDir(path.dirname(finalIconPath));
-                        await fsExtra.copy(convertedPath, finalIconPath);
-                        spinner.succeed(chalk.green('Icon fetched and converted successfully!'));
-                        return finalIconPath;
-                    }
+                    const finalPath = await copyWindowsIconIfNeeded(convertedPath, appName);
                     spinner.succeed(chalk.green('Icon fetched and converted successfully!'));
-                    return convertedPath;
+                    return finalPath;
                 }
             }
             catch (error) {
-                // Log specific errors in CI for debugging
-                if (isCI) {
-                    logger.debug(`Icon service ${serviceUrl} failed: ${error.message}`);
+                logger.debug(`Icon service ${serviceUrl} failed: ${error.message}`);
+                // Platform-specific error handling
+                if ((IS_LINUX || IS_WIN) && error.code === 'ENOTFOUND') {
+                    logger.debug(`DNS resolution failed for ${serviceUrl}, trying next service...`);
+                }
+                // Windows-specific icon conversion errors
+                if (IS_WIN && error.message.includes('icongen')) {
+                    logger.debug(`Windows icon conversion failed for ${serviceUrl}, trying next service...`);
                 }
                 continue;
             }
@@ -1376,7 +1436,7 @@ async function downloadIcon(iconUrl, showSpinner = true, customTimeout) {
     try {
         const response = await axios.get(iconUrl, {
             responseType: 'arraybuffer',
-            timeout: customTimeout || ICON_CONFIG.downloadTimeout,
+            timeout: customTimeout || 10000,
         });
         const iconData = response.data;
         if (!iconData || iconData.byteLength < ICON_CONFIG.minFileSize)
@@ -1400,15 +1460,11 @@ async function downloadIcon(iconUrl, showSpinner = true, customTimeout) {
  */
 async function saveIconFile(iconData, extension) {
     const buffer = Buffer.from(iconData);
-    if (IS_LINUX) {
-        const iconPath = 'png/linux_temp.png';
-        await fsExtra.outputFile(`${npmDirectory}/src-tauri/${iconPath}`, buffer);
-        return iconPath;
-    }
     const { path: tempPath } = await dir();
-    const iconPath = `${tempPath}/icon.${extension}`;
-    await fsExtra.outputFile(iconPath, buffer);
-    return iconPath;
+    // Always save with the original extension first
+    const originalIconPath = path.join(tempPath, `icon.${extension}`);
+    await fsExtra.outputFile(originalIconPath, buffer);
+    return originalIconPath;
 }
 
 // Extracts the domain from a given URL.
@@ -1546,7 +1602,7 @@ program
     .option('--fullscreen', 'Start in full screen', DEFAULT_PAKE_OPTIONS.fullscreen)
     .option('--hide-title-bar', 'For Mac, hide title bar', DEFAULT_PAKE_OPTIONS.hideTitleBar)
     .option('--multi-arch', 'For Mac, both Intel and M1', DEFAULT_PAKE_OPTIONS.multiArch)
-    .option('--inject <./style.css,./script.js,...>', 'Injection of .js or .css files', (val, previous) => {
+    .option('--inject <files>', 'Inject local CSS/JS files into the page', (val, previous) => {
     if (!val)
         return DEFAULT_PAKE_OPTIONS.inject;
     // Split by comma and trim whitespace, filter out empty strings
@@ -1564,7 +1620,7 @@ program
     .addOption(new Option('--user-agent <string>', 'Custom user agent')
     .default(DEFAULT_PAKE_OPTIONS.userAgent)
     .hideHelp())
-    .addOption(new Option('--targets <string>', 'Build target: Linux: "deb", "rpm", "appimage", "deb-arm64", "rpm-arm64", "appimage-arm64"; Windows: "x64", "arm64"; macOS: "intel", "apple", "universal"').default(DEFAULT_PAKE_OPTIONS.targets))
+    .addOption(new Option('--targets <string>', 'Build target format for your system').default(DEFAULT_PAKE_OPTIONS.targets))
     .addOption(new Option('--app-version <string>', 'App version, the same as package.json version')
     .default(DEFAULT_PAKE_OPTIONS.appVersion)
     .hideHelp())