pake-cli 3.5.0 → 3.5.2

package/README.md

@@ -400,6 +400,13 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             </td>
 		</tr>
 		<tr>
+            <td align="center">
+                <a href="https://github.com/claude">
+                    <img src="https://avatars.githubusercontent.com/u/81847?v=4" width="90;" alt="claude"/>
+                    <br />
+                    <sub><b>Claude</b></sub>
+                </a>
+            </td>
             <td align="center">
                 <a href="https://github.com/turkyden">
                     <img src="https://avatars.githubusercontent.com/u/24560160?v=4" width="90;" alt="turkyden"/>
@@ -442,6 +449,8 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Johannlai</b></sub>
                 </a>
             </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/Jason6987">
                     <img src="https://avatars.githubusercontent.com/u/140222795?v=4" width="90;" alt="Jason6987"/>
@@ -449,8 +458,6 @@ 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"/>
@@ -493,6 +500,8 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Hyzhao</b></sub>
                 </a>
             </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/lakca">
                     <img src="https://avatars.githubusercontent.com/u/16255922?v=4" width="90;" alt="lakca"/>
@@ -500,8 +509,6 @@ 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"/>

package/dist/cli.js

@@ -23,7 +23,7 @@ import sharp from 'sharp';
 import * as psl from 'psl';
 
 var name = "pake-cli";
-var version = "3.5.0";
+var version = "3.5.2";
 var description = "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。";
 var engines = {
 	node: ">=18.0.0"
@@ -730,7 +730,8 @@ class BaseBuilder {
             : undefined;
     }
     getInstallTimeout() {
-        return process.platform === 'win32' ? 600000 : 300000;
+        // Windows needs more time due to native compilation and antivirus scanning
+        return process.platform === 'win32' ? 900000 : 600000;
     }
     getBuildTimeout() {
         return 900000;
@@ -786,25 +787,54 @@ class BaseBuilder {
         const rustProjectDir = path.join(tauriSrcPath, '.cargo');
         const projectConf = path.join(rustProjectDir, 'config.toml');
         await fsExtra.ensureDir(rustProjectDir);
-        // 智能检测可用的包管理器
+        // Detect available package manager
         const packageManager = await this.detectPackageManager();
-        const registryOption = isChina
-            ? ' --registry=https://registry.npmmirror.com'
-            : '';
-        // 根据包管理器类型设置依赖冲突解决选项
+        const registryOption = ' --registry=https://registry.npmmirror.com';
         const peerDepsOption = packageManager === 'npm' ? ' --legacy-peer-deps' : '';
         const timeout = this.getInstallTimeout();
         const buildEnv = this.getBuildEnvironment();
-        if (isChina) {
-            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}`, timeout, buildEnv);
+        // Show helpful message for first-time users
+        if (!tauriTargetPathExists) {
+            logger.info(process.platform === 'win32'
+                ? '✺ First-time setup may take 10-15 minutes on Windows (compiling dependencies)...'
+                : '✺ First-time setup may take 5-10 minutes (installing dependencies)...');
         }
-        else {
-            await shellExec(`cd "${npmDirectory}" && ${packageManager} install${peerDepsOption}`, timeout, buildEnv);
+        let usedMirror = isChina;
+        try {
+            if (isChina) {
+                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}`, timeout, buildEnv);
+            }
+            else {
+                await shellExec(`cd "${npmDirectory}" && ${packageManager} install${peerDepsOption}`, timeout, buildEnv);
+            }
+            spinner.succeed(chalk.green('Package installed!'));
+        }
+        catch (error) {
+            // If installation times out and we haven't tried the mirror yet, retry with mirror
+            if (error.message?.includes('timed out') && !usedMirror) {
+                spinner.fail(chalk.yellow('Installation timed out, retrying with CN mirror...'));
+                logger.info('✺ Retrying installation with CN mirror for better speed...');
+                const retrySpinner = getSpinner('Retrying installation...');
+                usedMirror = true;
+                try {
+                    const projectCnConf = path.join(tauriSrcPath, 'rust_proxy.toml');
+                    await fsExtra.copy(projectCnConf, projectConf);
+                    await shellExec(`cd "${npmDirectory}" && ${packageManager} install${registryOption}${peerDepsOption}`, timeout, buildEnv);
+                    retrySpinner.succeed(chalk.green('Package installed with CN mirror!'));
+                }
+                catch (retryError) {
+                    retrySpinner.fail(chalk.red('Installation failed'));
+                    throw retryError;
+                }
+            }
+            else {
+                spinner.fail(chalk.red('Installation failed'));
+                throw error;
+            }
         }
-        spinner.succeed(chalk.green('Package installed!'));
         if (!tauriTargetPathExists) {
             logger.warn('✼ The first packaging may be slow, please be patient and wait, it will be faster afterwards.');
         }

package/package.json

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

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

@@ -422,6 +422,9 @@ document.addEventListener("DOMContentLoaded", () => {
 
       if (target === "_new") {
         if (forceInternalNavigation) {
+          e.preventDefault();
+          e.stopImmediatePropagation();
+          window.location.href = absoluteUrl;
           return;
         }