pake-cli 3.3.6 → 3.4.0

package/README.md

@@ -29,6 +29,7 @@
 - **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
+- **Troubleshooting**: Check [FAQ](docs/faq.md) for common issues and solutions
 
 ## Popular Packages
 
@@ -434,6 +435,13 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Jiaqi Gu</b></sub>
                 </a>
             </td>
+            <td align="center">
+                <a href="https://github.com/JohannLai">
+                    <img src="https://avatars.githubusercontent.com/u/10769405?v=4" width="90;" alt="JohannLai"/>
+                    <br />
+                    <sub><b>Johannlai</b></sub>
+                </a>
+            </td>
             <td align="center">
                 <a href="https://github.com/Jason6987">
                     <img src="https://avatars.githubusercontent.com/u/140222795?v=4" width="90;" alt="Jason6987"/>
@@ -441,6 +449,8 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Luminall</b></sub>
                 </a>
             </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/Milo123459">
                     <img src="https://avatars.githubusercontent.com/u/50248166?v=4" width="90;" alt="Milo123459"/>
@@ -448,8 +458,6 @@ 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"/>
@@ -492,6 +500,8 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Null</b></sub>
                 </a>
             </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/liudonghua123">
                     <img src="https://avatars.githubusercontent.com/u/2276718?v=4" width="90;" alt="liudonghua123"/>
@@ -499,8 +509,6 @@ 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"/>

package/dist/cli.js

@@ -6,6 +6,7 @@ import path from 'path';
 import fsExtra from 'fs-extra';
 import { fileURLToPath } from 'url';
 import prompts from 'prompts';
+import os from 'os';
 import { execa, execaSync } from 'execa';
 import crypto from 'crypto';
 import ora from 'ora';
@@ -22,7 +23,7 @@ import sharp from 'sharp';
 import * as psl from 'psl';
 
 var name = "pake-cli";
-var version = "3.3.6";
+var version = "3.4.0";
 var description = "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。";
 var engines = {
 	node: ">=18.0.0"
@@ -74,12 +75,12 @@ var license = "MIT";
 var dependencies = {
 	"@tauri-apps/api": "^2.8.0",
 	"@tauri-apps/cli": "^2.8.4",
-	axios: "^1.11.0",
-	chalk: "^5.6.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.1",
+	"fs-extra": "^11.3.2",
 	"icon-gen": "^5.0.0",
 	loglevel: "^1.9.2",
 	ora: "^8.2.0",
@@ -96,7 +97,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.13",
+	"@types/node": "^20.19.21",
 	"@types/page-icon": "^0.3.6",
 	"@types/prompts": "^2.4.9",
 	"@types/tmp": "^0.2.6",
@@ -104,10 +105,10 @@ var devDependencies = {
 	"app-root-path": "^3.1.0",
 	"cross-env": "^7.0.3",
 	prettier: "^3.6.2",
-	rollup: "^4.50.0",
+	rollup: "^4.52.4",
 	"rollup-plugin-typescript2": "^0.36.0",
 	tslib: "^2.8.1",
-	typescript: "^5.9.2"
+	typescript: "^5.9.3"
 };
 var packageJson = {
 	name: name,
@@ -200,11 +201,11 @@ const IS_MAC = platform$1 === 'darwin';
 const IS_WIN = platform$1 === 'win32';
 const IS_LINUX = platform$1 === 'linux';
 
-async function shellExec(command, timeout = 300000, env) {
+async function shellExec(command, timeout = 300000, env, showOutput = false) {
     try {
         const { exitCode } = await execa(command, {
             cwd: npmDirectory,
-            stdio: ['inherit', 'pipe', 'inherit'], // Hide stdout verbose, keep stderr
+            stdio: showOutput ? 'inherit' : ['inherit', 'pipe', 'inherit'],
             shell: true,
             timeout,
             env: env ? { ...process.env, ...env } : process.env,
@@ -217,7 +218,18 @@ async function shellExec(command, timeout = 300000, env) {
         if (error.timedOut) {
             throw new Error(`Command timed out after ${timeout}ms: "${command}". Try increasing timeout or check network connectivity.`);
         }
-        throw new Error(`Error occurred while executing command "${command}". Exit code: ${exitCode}. Details: ${errorMessage}`);
+        let errorMsg = `Error occurred while executing command "${command}". Exit code: ${exitCode}. Details: ${errorMessage}`;
+        if (process.platform === 'linux' &&
+            (errorMessage.includes('linuxdeploy') ||
+                errorMessage.includes('appimage') ||
+                errorMessage.includes('strip'))) {
+            errorMsg +=
+                '\n\nLinux AppImage build error. Try one of these solutions:\n' +
+                    '  1. Run with: NO_STRIP=true pake <url> --targets appimage\n' +
+                    '  2. Use DEB format instead: pake <url> --targets deb\n' +
+                    '  3. See detailed solutions: https://github.com/tw93/Pake/blob/main/docs/faq.md';
+        }
+        throw new Error(errorMsg);
     }
 }
 
@@ -284,6 +296,52 @@ async function isChinaIP(ip, domain) {
     }
 }
 
+function normalizePathForComparison(targetPath) {
+    const normalized = path.normalize(targetPath);
+    return IS_WIN ? normalized.toLowerCase() : normalized;
+}
+function getCargoHomeCandidates() {
+    const candidates = new Set();
+    if (process.env.CARGO_HOME) {
+        candidates.add(process.env.CARGO_HOME);
+    }
+    const homeDir = os.homedir();
+    if (homeDir) {
+        candidates.add(path.join(homeDir, '.cargo'));
+    }
+    if (IS_WIN && process.env.USERPROFILE) {
+        candidates.add(path.join(process.env.USERPROFILE, '.cargo'));
+    }
+    return Array.from(candidates).filter(Boolean);
+}
+function ensureCargoBinOnPath() {
+    const currentPath = process.env.PATH || '';
+    const segments = currentPath.split(path.delimiter).filter(Boolean);
+    const normalizedSegments = new Set(segments.map((segment) => normalizePathForComparison(segment)));
+    const additions = [];
+    let cargoHomeSet = Boolean(process.env.CARGO_HOME);
+    for (const cargoHome of getCargoHomeCandidates()) {
+        const binDir = path.join(cargoHome, 'bin');
+        if (fsExtra.pathExistsSync(binDir) &&
+            !normalizedSegments.has(normalizePathForComparison(binDir))) {
+            additions.push(binDir);
+            normalizedSegments.add(normalizePathForComparison(binDir));
+        }
+        if (!cargoHomeSet && fsExtra.pathExistsSync(cargoHome)) {
+            process.env.CARGO_HOME = cargoHome;
+            cargoHomeSet = true;
+        }
+    }
+    if (additions.length) {
+        const prefix = additions.join(path.delimiter);
+        process.env.PATH = segments.length
+            ? `${prefix}${path.delimiter}${segments.join(path.delimiter)}`
+            : prefix;
+    }
+}
+function ensureRustEnv() {
+    ensureCargoBinOnPath();
+}
 async function installRust() {
     const isActions = process.env.GITHUB_ACTIONS;
     const isInChina = await isChinaDomain('sh.rustup.rs');
@@ -293,8 +351,9 @@ async function installRust() {
     const rustInstallScriptForWindows = 'winget install --id Rustlang.Rustup';
     const spinner = getSpinner('Downloading Rust...');
     try {
-        await shellExec(IS_WIN ? rustInstallScriptForWindows : rustInstallScriptForMac);
+        await shellExec(IS_WIN ? rustInstallScriptForWindows : rustInstallScriptForMac, 300000, undefined, true);
         spinner.succeed(chalk.green('✔ Rust installed successfully!'));
+        ensureRustEnv();
     }
     catch (error) {
         spinner.fail(chalk.red('✕ Rust installation failed!'));
@@ -303,6 +362,7 @@ async function installRust() {
     }
 }
 function checkRustInstalled() {
+    ensureCargoBinOnPath();
     try {
         execaSync('rustc', ['--version']);
         return true;
@@ -343,11 +403,31 @@ function generateLinuxPackageName(name) {
         .replace(/-+/g, '-');
 }
 function generateIdentifierSafeName(name) {
-    return name
-        .replace(/[^a-zA-Z0-9]/g, '')
-        .toLowerCase();
+    const cleaned = name.replace(/[^a-zA-Z0-9\u4e00-\u9fff]/g, '').toLowerCase();
+    if (cleaned === '') {
+        const fallback = Array.from(name)
+            .map((char) => {
+            const code = char.charCodeAt(0);
+            if ((code >= 48 && code <= 57) ||
+                (code >= 65 && code <= 90) ||
+                (code >= 97 && code <= 122)) {
+                return char.toLowerCase();
+            }
+            return code.toString(16);
+        })
+            .join('')
+            .slice(0, 50);
+        return fallback || 'pake-app';
+    }
+    return cleaned;
 }
 
+/**
+ * Helper function to generate safe lowercase app name for file paths
+ */
+function getSafeAppName(name) {
+    return generateSafeFilename(name).toLowerCase();
+}
 async function mergeConfig(url, options, tauriConf) {
     // Ensure .pake directory exists and copy source templates if needed
     const srcTauriDir = path.join(npmDirectory, 'src-tauri');
@@ -368,7 +448,7 @@ async function mergeConfig(url, options, tauriConf) {
             await fsExtra.copy(sourcePath, destPath);
         }
     }));
-    const { width, height, fullscreen, hideTitleBar, alwaysOnTop, appVersion, darkMode, disabledWebShortcuts, activationShortcut, userAgent, showSystemTray, systemTrayIcon, useLocalFile, identifier, name, resizable = true, inject, proxyUrl, installerLanguage, hideOnClose, incognito, title, wasm, enableDragDrop, } = options;
+    const { width, height, fullscreen, hideTitleBar, alwaysOnTop, appVersion, darkMode, disabledWebShortcuts, activationShortcut, userAgent, showSystemTray, systemTrayIcon, useLocalFile, identifier, name, resizable = true, inject, proxyUrl, installerLanguage, hideOnClose, incognito, title, wasm, enableDragDrop, multiInstance, } = options;
     const { platform } = process;
     const platformHideOnClose = hideOnClose ?? platform === 'darwin';
     const tauriConfWindowOptions = {
@@ -438,7 +518,7 @@ async function mergeConfig(url, options, tauriConf) {
         // Remove hardcoded desktop files and regenerate with correct app name
         delete tauriConf.bundle.linux.deb.files;
         // Generate correct desktop file configuration
-        const appNameSafe = generateSafeFilename(name).toLowerCase();
+        const appNameSafe = getSafeAppName(name);
         const identifier = `com.pake.${appNameSafe}`;
         const desktopFileName = `${identifier}.desktop`;
         // Create desktop file content
@@ -489,22 +569,23 @@ StartupNotify=true
         }
     }
     // Set icon.
+    const safeAppName = getSafeAppName(name);
     const platformIconMap = {
         win32: {
             fileExt: '.ico',
-            path: `png/${generateSafeFilename(name).toLowerCase()}_256.ico`,
+            path: `png/${safeAppName}_256.ico`,
             defaultIcon: 'png/icon_256.ico',
             message: 'Windows icon must be .ico and 256x256px.',
         },
         linux: {
             fileExt: '.png',
-            path: `png/${generateSafeFilename(name).toLowerCase()}_512.png`,
+            path: `png/${safeAppName}_512.png`,
             defaultIcon: 'png/icon_512.png',
             message: 'Linux icon must be .png and 512x512px.',
         },
         darwin: {
             fileExt: '.icns',
-            path: `icons/${generateSafeFilename(name).toLowerCase()}.icns`,
+            path: `icons/${safeAppName}.icns`,
             defaultIcon: 'icons/icon.icns',
             message: 'macOS icon must be .icns type.',
         },
@@ -548,8 +629,8 @@ StartupNotify=true
             // 需要判断图标格式，默认只支持ico和png两种
             let iconExt = path.extname(systemTrayIcon).toLowerCase();
             if (iconExt == '.png' || iconExt == '.ico') {
-                const trayIcoPath = path.join(npmDirectory, `src-tauri/png/${generateSafeFilename(name).toLowerCase()}${iconExt}`);
-                trayIconPath = `png/${generateSafeFilename(name).toLowerCase()}${iconExt}`;
+                const trayIcoPath = path.join(npmDirectory, `src-tauri/png/${safeAppName}${iconExt}`);
+                trayIconPath = `png/${safeAppName}${iconExt}`;
                 await fsExtra.copy(systemTrayIcon, trayIcoPath);
             }
             else {
@@ -583,6 +664,7 @@ StartupNotify=true
         await fsExtra.writeFile(injectFilePath, '');
     }
     tauriConf.pake.proxy_url = proxyUrl || '';
+    tauriConf.pake.multi_instance = multiInstance;
     // Configure WASM support with required HTTP headers
     if (wasm) {
         tauriConf.app.security = {
@@ -659,6 +741,7 @@ class BaseBuilder {
             logger.warn('✼ The first use requires installing system dependencies.');
             logger.warn('✼ See more in https://tauri.app/start/prerequisites/.');
         }
+        ensureRustEnv();
         if (!checkRustInstalled()) {
             const res = await prompts({
                 type: 'confirm',
@@ -691,10 +774,10 @@ class BaseBuilder {
             logger.info(`✺ Located in China, using ${packageManager}/rsProxy CN mirror.`);
             const projectCnConf = path.join(tauriSrcPath, 'rust_proxy.toml');
             await fsExtra.copy(projectCnConf, projectConf);
-            await shellExec(`cd "${npmDirectory}" && ${packageManager} install${registryOption}${peerDepsOption} --silent`, timeout, buildEnv);
+            await shellExec(`cd "${npmDirectory}" && ${packageManager} install${registryOption}${peerDepsOption}`, timeout, buildEnv, this.options.debug);
         }
         else {
-            await shellExec(`cd "${npmDirectory}" && ${packageManager} install${peerDepsOption} --silent`, timeout, buildEnv);
+            await shellExec(`cd "${npmDirectory}" && ${packageManager} install${peerDepsOption}`, timeout, buildEnv, this.options.debug);
         }
         spinner.succeed(chalk.green('Package installed!'));
         if (!tauriTargetPathExists) {
@@ -719,8 +802,11 @@ class BaseBuilder {
         buildSpinner.stop();
         // Show static message to keep the status visible
         logger.warn('✸ Building app...');
-        const buildEnv = this.getBuildEnvironment();
-        await shellExec(`cd "${npmDirectory}" && ${this.getBuildCommand(packageManager)}`, this.getBuildTimeout(), buildEnv);
+        const buildEnv = {
+            ...this.getBuildEnvironment(),
+            ...(process.env.NO_STRIP && { NO_STRIP: process.env.NO_STRIP }),
+        };
+        await shellExec(`cd "${npmDirectory}" && ${this.getBuildCommand(packageManager)}`, this.getBuildTimeout(), buildEnv, this.options.debug);
         // Copy app
         const fileName = this.getFileName();
         const fileType = this.getFileType(target);
@@ -1162,6 +1248,7 @@ const DEFAULT_PAKE_OPTIONS = {
     wasm: false,
     enableDragDrop: false,
     keepBinary: false,
+    multiInstance: false,
 };
 
 async function checkUpdateTips() {
@@ -1190,7 +1277,9 @@ const API_KEYS = {
     brandfetch: ['1idqvJC0CeFSeyp3Yf7', '1idej-yhU_ThggIHFyG'],
 };
 function generateIconPath(appName, isDefault = false) {
-    const safeName = isDefault ? 'icon' : generateSafeFilename(appName).toLowerCase();
+    const safeName = isDefault
+        ? 'icon'
+        : generateSafeFilename(appName).toLowerCase();
     const baseName = safeName;
     if (IS_WIN) {
         return path.join(npmDirectory, 'src-tauri', 'png', `${baseName}_256.ico`);
@@ -1603,8 +1692,7 @@ ${green('|_|   \\__,_|_|\\_\\___|  can turn any webpage into a desktop app with
 program
     .addHelpText('beforeAll', logo)
     .usage(`[url] [options]`)
-    .showHelpAfterError()
-    .helpOption(false);
+    .showHelpAfterError();
 program
     .argument('[url]', 'The web URL you want to package', validateUrlInput)
     // Refer to https://github.com/tj/commander.js#custom-option-processing, turn string array into a string connected with custom connectors.
@@ -1683,6 +1771,9 @@ program
     .addOption(new Option('--keep-binary', 'Keep raw binary file alongside installer')
     .default(DEFAULT_PAKE_OPTIONS.keepBinary)
     .hideHelp())
+    .addOption(new Option('--multi-instance', 'Allow multiple app instances')
+    .default(DEFAULT_PAKE_OPTIONS.multiInstance)
+    .hideHelp())
     .addOption(new Option('--installer-language <string>', 'Installer language')
     .default(DEFAULT_PAKE_OPTIONS.installerLanguage)
     .hideHelp())
@@ -1690,12 +1781,12 @@ program
     .configureHelp({
     sortSubcommands: true,
     optionTerm: (option) => {
-        if (option.flags === '-v, --version')
+        if (option.flags === '-v, --version' || option.flags === '-h, --help')
             return '';
         return option.flags;
     },
     optionDescription: (option) => {
-        if (option.flags === '-v, --version')
+        if (option.flags === '-v, --version' || option.flags === '-h, --help')
             return '';
         return option.description;
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pake-cli",
-  "version": "3.3.6",
+  "version": "3.4.0",
   "description": "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。",
   "engines": {
     "node": ">=18.0.0"
@@ -52,12 +52,12 @@
   "dependencies": {
     "@tauri-apps/api": "^2.8.0",
     "@tauri-apps/cli": "^2.8.4",
-    "axios": "^1.11.0",
-    "chalk": "^5.6.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.1",
+    "fs-extra": "^11.3.2",
     "icon-gen": "^5.0.0",
     "loglevel": "^1.9.2",
     "ora": "^8.2.0",
@@ -74,7 +74,7 @@
     "@rollup/plugin-replace": "^6.0.2",
     "@rollup/plugin-terser": "^0.4.4",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^20.19.13",
+    "@types/node": "^20.19.21",
     "@types/page-icon": "^0.3.6",
     "@types/prompts": "^2.4.9",
     "@types/tmp": "^0.2.6",
@@ -82,9 +82,9 @@
     "app-root-path": "^3.1.0",
     "cross-env": "^7.0.3",
     "prettier": "^3.6.2",
-    "rollup": "^4.50.0",
+    "rollup": "^4.52.4",
     "rollup-plugin-typescript2": "^0.36.0",
     "tslib": "^2.8.1",
-    "typescript": "^5.9.2"
+    "typescript": "^5.9.3"
   }
 }

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

@@ -31,5 +31,6 @@
     },
     "system_tray_path": "png/icon_512.png",
     "inject": [],
-    "proxy_url": ""
+    "proxy_url": "",
+    "multi_instance": false
 }

package/src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
@@ -3546,10 +3546,11 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 dependencies = [
+ "serde_core",
  "serde_derive",
 ]
 
@@ -3564,11 +3565,20 @@ dependencies = [
  "typeid",
 ]
 
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
 [[package]]
 name = "serde_derive"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3588,14 +3598,15 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.143"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
  "itoa",
  "memchr",
  "ryu",
  "serde",
+ "serde_core",
 ]
 
 [[package]]

package/src-tauri/Cargo.toml

@@ -15,19 +15,19 @@ crate-type = ["staticlib", "cdylib", "lib"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "2.4.0", features = [] }
+tauri-build = { version = "2.4.1", features = [] }
 
 [dependencies]
-serde_json = "1.0.143"
-serde = { version = "1.0.219", features = ["derive"] }
+serde_json = "1.0.145"
+serde = { version = "1.0.228", features = ["derive"] }
 tokio = { version = "1.47.1", features = ["full"] }
-tauri = { version = "2.8.4", features = ["tray-icon", "image-ico", "image-png", "macos-proxy"] }
+tauri = { version = "2.8.5", features = ["tray-icon", "image-ico", "image-png", "macos-proxy"] }
 tauri-plugin-window-state = "2.4.0"
 tauri-plugin-oauth = "2.0.0"
 tauri-plugin-http = "2.5.2"
 tauri-plugin-global-shortcut = { version = "2.3.0" }
 tauri-plugin-shell = "2.3.1"
-tauri-plugin-single-instance = "2.3.3"
+tauri-plugin-single-instance = "2.3.4"
 tauri-plugin-notification = "2.3.1"
 
 [features]

package/src-tauri/pake.json

@@ -30,5 +30,6 @@
   },
   "system_tray_path": "icons/icon.png",
   "inject": [],
-  "proxy_url": ""
+  "proxy_url": "",
+  "multi_instance": false
 }

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

@@ -59,6 +59,8 @@ pub struct PakeConfig {
     pub system_tray: FunctionON,
     pub system_tray_path: String,
     pub proxy_url: String,
+    #[serde(default)]
+    pub multi_instance: bool,
 }
 
 impl PakeConfig {

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

@@ -100,21 +100,6 @@ const DOWNLOADABLE_FILE_EXTENSIONS = {
     "scss",
     "sass",
     "less",
-    "html",
-    "htm",
-    "php",
-    "py",
-    "java",
-    "cpp",
-    "c",
-    "h",
-    "cs",
-    "rb",
-    "go",
-    "rs",
-    "swift",
-    "kt",
-    "scala",
     "sh",
     "bat",
     "ps1",
@@ -163,6 +148,22 @@ function isChineseLanguage(language = getUserLanguage()) {
   );
 }
 
+// User notification helper
+function showDownloadError(filename) {
+  const isChinese = isChineseLanguage();
+  const message = isChinese
+    ? `下载失败: ${filename}`
+    : `Download failed: ${filename}`;
+
+  if (window.Notification && Notification.permission === "granted") {
+    new Notification(isChinese ? "下载错误" : "Download Error", {
+      body: message,
+    });
+  } else {
+    console.error(message);
+  }
+}
+
 // Unified file detection - replaces both isDownloadLink and isFileLink
 function isDownloadableFile(url) {
   try {
@@ -266,36 +267,42 @@ document.addEventListener("DOMContentLoaded", () => {
       }
 
       // write the ArrayBuffer to a binary, and you're done
-      const userLanguage = navigator.language || navigator.userLanguage;
+      const userLanguage = getUserLanguage();
       invoke("download_file_by_binary", {
         params: {
           filename,
           binary: Array.from(binary),
           language: userLanguage,
         },
-      }).catch(error => {
-        console.error('Failed to download data URI file:', filename, error);
+      }).catch((error) => {
+        console.error("Failed to download data URI file:", filename, error);
+        showDownloadError(filename);
       });
     } catch (error) {
-      console.error('Failed to process data URI:', dataURI, error);
+      console.error("Failed to process data URI:", dataURI, error);
+      showDownloadError(filename || "file");
     }
   }
 
   function downloadFromBlobUrl(blobUrl, filename) {
-    convertBlobUrlToBinary(blobUrl).then((binary) => {
-      const userLanguage = navigator.language || navigator.userLanguage;
-      invoke("download_file_by_binary", {
-        params: {
-          filename,
-          binary,
-          language: userLanguage,
-        },
-      }).catch(error => {
-        console.error('Failed to download blob file:', filename, error);
+    convertBlobUrlToBinary(blobUrl)
+      .then((binary) => {
+        const userLanguage = getUserLanguage();
+        invoke("download_file_by_binary", {
+          params: {
+            filename,
+            binary,
+            language: userLanguage,
+          },
+        }).catch((error) => {
+          console.error("Failed to download blob file:", filename, error);
+          showDownloadError(filename);
+        });
+      })
+      .catch((error) => {
+        console.error("Failed to convert blob to binary:", blobUrl, error);
+        showDownloadError(filename);
       });
-    }).catch(error => {
-      console.error('Failed to convert blob to binary:', blobUrl, error);
-    });
   }
 
   // detect blob download by createElement("a")
@@ -335,14 +342,14 @@ document.addEventListener("DOMContentLoaded", () => {
   const handleExternalLink = (url) => {
     // Don't try to open blob: or data: URLs with shell
     if (isSpecialDownload(url)) {
-      console.warn('Cannot open special URL with shell:', url);
+      console.warn("Cannot open special URL with shell:", url);
       return;
     }
 
     invoke("plugin:shell|open", {
       path: url,
-    }).catch(error => {
-      console.error('Failed to open URL with shell:', url, error);
+    }).catch((error) => {
+      console.error("Failed to open URL with shell:", url, error);
     });
   };
 
@@ -370,7 +377,7 @@ document.addEventListener("DOMContentLoaded", () => {
 
   const detectAnchorElementClick = (e) => {
     // Safety check: ensure e.target exists and is an Element with closest method
-    if (!e.target || typeof e.target.closest !== 'function') {
+    if (!e.target || typeof e.target.closest !== "function") {
       return;
     }
     const anchorElement = e.target.closest("a");
@@ -383,20 +390,21 @@ document.addEventListener("DOMContentLoaded", () => {
 
       // Handle _blank links: same domain navigates in-app, cross-domain opens new window
       if (target === "_blank") {
-        e.preventDefault();
-        e.stopImmediatePropagation();
-
         if (isSameDomain(absoluteUrl)) {
-          window.location.href = absoluteUrl;
-        } else {
-          const newWindow = originalWindowOpen.call(
-            window,
-            absoluteUrl,
-            "_blank",
-            "width=1200,height=800,scrollbars=yes,resizable=yes",
-          );
-          if (!newWindow) handleExternalLink(absoluteUrl);
+          // For same-domain links, let the browser/SPA handle it naturally
+          // This prevents full page reload in SPA apps like Discord
+          return;
         }
+
+        e.preventDefault();
+        e.stopImmediatePropagation();
+        const newWindow = originalWindowOpen.call(
+          window,
+          absoluteUrl,
+          "_blank",
+          "width=1200,height=800,scrollbars=yes,resizable=yes",
+        );
+        if (!newWindow) handleExternalLink(absoluteUrl);
         return;
       }
 
@@ -446,39 +454,24 @@ document.addEventListener("DOMContentLoaded", () => {
   // Rewrite the window.open function.
   const originalWindowOpen = window.open;
   window.open = function (url, name, specs) {
-    // Apple login and google login
     if (name === "AppleAuthentication") {
-      //do nothing
-    } else if (
-      specs &&
-      (specs.includes("height=") || specs.includes("width="))
-    ) {
-      location.href = url;
-    } else {
+      return originalWindowOpen.call(window, url, name, specs);
+    }
+
+    try {
       const baseUrl = window.location.origin + window.location.pathname;
       const hrefUrl = new URL(url, baseUrl);
       const absoluteUrl = hrefUrl.href;
 
-      // Apply same domain logic as anchor links
-      if (isSameDomain(absoluteUrl)) {
-        // Same domain: navigate in app or open new window based on specs
-        if (name === "_blank" || !name) {
-          return originalWindowOpen.call(
-            window,
-            absoluteUrl,
-            "_blank",
-            "width=1200,height=800,scrollbars=yes,resizable=yes",
-          );
-        } else {
-          location.href = absoluteUrl;
-        }
-      } else {
-        // Cross domain: open in external browser
+      if (!isSameDomain(absoluteUrl)) {
         handleExternalLink(absoluteUrl);
+        return null;
       }
+
+      return originalWindowOpen.call(window, absoluteUrl, name, specs);
+    } catch (error) {
+      return originalWindowOpen.call(window, url, name, specs);
     }
-    // Call the original window.open function to maintain its normal functionality.
-    return originalWindowOpen.call(window, url, name, specs);
   };
 
   // Set the default zoom, There are problems with Loop without using try-catch.
@@ -686,13 +679,16 @@ document.addEventListener("DOMContentLoaded", () => {
       }
     } else {
       // Regular HTTP(S) image
-      const userLanguage = navigator.language || navigator.userLanguage;
+      const userLanguage = getUserLanguage();
       invoke("download_file", {
         params: {
           url: imageUrl,
           filename: filename,
           language: userLanguage,
         },
+      }).catch((error) => {
+        console.error("Failed to download image:", filename, error);
+        showDownloadError(filename);
       });
     }
   }
@@ -723,7 +719,10 @@ document.addEventListener("DOMContentLoaded", () => {
     }
 
     // Check for parent elements with background images
-    const parentWithBg = target && typeof target.closest === 'function' ? target.closest('[style*="background-image"]') : null;
+    const parentWithBg =
+      target && typeof target.closest === "function"
+        ? target.closest('[style*="background-image"]')
+        : null;
     if (parentWithBg) {
       const bgImage = parentWithBg.style.backgroundImage;
       const urlMatch = bgImage.match(/url\(["']?([^"')]+)["']?\)/);
@@ -737,7 +736,7 @@ document.addEventListener("DOMContentLoaded", () => {
 
   // Simplified menu builder
   function buildMenuItems(type, data) {
-    const userLanguage = navigator.language || navigator.userLanguage;
+    const userLanguage = getUserLanguage();
     const items = [];
 
     switch (type) {
@@ -764,6 +763,9 @@ document.addEventListener("DOMContentLoaded", () => {
               const filename = getFilenameFromUrl(data.url);
               invoke("download_file", {
                 params: { url: data.url, filename, language: userLanguage },
+              }).catch((error) => {
+                console.error("Failed to download file:", filename, error);
+                showDownloadError(filename);
               });
             }),
           );
@@ -792,7 +794,10 @@ document.addEventListener("DOMContentLoaded", () => {
       const mediaInfo = getMediaInfo(target);
 
       // Check for links (but not if it's media)
-      const linkElement = target && typeof target.closest === 'function' ? target.closest("a") : null;
+      const linkElement =
+        target && typeof target.closest === "function"
+          ? target.closest("a")
+          : null;
       const isLink = linkElement && linkElement.href && !mediaInfo.isMedia;
 
       // Only show custom menu for media or links

package/src-tauri/src/lib.rs

@@ -24,6 +24,7 @@ pub fn run_app() {
     let hide_on_close = pake_config.windows[0].hide_on_close;
     let activation_shortcut = pake_config.windows[0].activation_shortcut.clone();
     let init_fullscreen = pake_config.windows[0].fullscreen;
+    let multi_instance = pake_config.multi_instance;
 
     let window_state_plugin = WindowStatePlugin::default()
         .with_state_flags(if init_fullscreen {
@@ -35,19 +36,25 @@ pub fn run_app() {
         .build();
 
     #[allow(deprecated)]
-    tauri_app
+    let mut app_builder = tauri_app
         .plugin(window_state_plugin)
         .plugin(tauri_plugin_oauth::init())
         .plugin(tauri_plugin_http::init())
         .plugin(tauri_plugin_shell::init())
-        .plugin(tauri_plugin_notification::init())
-        .plugin(tauri_plugin_single_instance::init(|app, _args, _cwd| {
+        .plugin(tauri_plugin_notification::init());
+
+    // Only add single instance plugin if multiple instances are not allowed
+    if !multi_instance {
+        app_builder = app_builder.plugin(tauri_plugin_single_instance::init(|app, _args, _cwd| {
             if let Some(window) = app.get_webview_window("pake") {
                 let _ = window.unminimize();
                 let _ = window.show();
                 let _ = window.set_focus();
             }
-        }))
+        }));
+    }
+
+    app_builder
         .invoke_handler(tauri::generate_handler![
             download_file,
             download_file_by_binary,

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