pake-cli 3.2.0-beta15 → 3.2.12

package/dist/cli.js

@@ -4,11 +4,11 @@ import { InvalidArgumentError, program, Option } from 'commander';
 import log from 'loglevel';
 import path from 'path';
 import fsExtra from 'fs-extra';
+import { fileURLToPath } from 'url';
 import prompts from 'prompts';
 import { execa, execaSync } from 'execa';
 import crypto from 'crypto';
 import ora from 'ora';
-import { fileURLToPath } from 'url';
 import dns from 'dns';
 import http from 'http';
 import { promisify } from 'util';
@@ -22,7 +22,7 @@ import sharp from 'sharp';
 import * as psl from 'psl';
 
 var name = "pake-cli";
-var version$1 = "3.2.0-beta15";
+var version = "3.2.12";
 var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 利用 Rust 轻松构建轻量级多端桌面应用。";
 var engines = {
 	node: ">=16.0.0"
@@ -56,15 +56,13 @@ var scripts = {
 	build: "npm run tauri build --",
 	"build:debug": "npm run tauri build -- --debug",
 	"build:mac": "npm run tauri build -- --target universal-apple-darwin",
-	"build:config": "chmod +x script/app_config.mjs && node script/app_config.mjs",
+	"build:config": "chmod +x scripts/configure-tauri.mjs && node scripts/configure-tauri.mjs",
 	analyze: "cd src-tauri && cargo bloat --release --crates",
 	tauri: "tauri",
-	cli: "rollup -c rollup.config.js --watch",
-	"cli:dev": "cross-env NODE_ENV=development rollup -c rollup.config.js -w",
-	"cli:build": "cross-env NODE_ENV=production rollup -c rollup.config.js",
-	test: "npm run cli:build && PAKE_CREATE_APP=1 node tests/index.js",
-	format: "prettier --write . --ignore-unknown && cd src-tauri && cargo fmt --verbose",
-	"hooks:setup": "bash .githooks/setup.sh",
+	cli: "cross-env NODE_ENV=development rollup -c -w",
+	"cli:build": "cross-env NODE_ENV=production rollup -c",
+	test: "npm 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",
 	prepublishOnly: "npm run cli:build"
 };
 var type = "module";
@@ -110,7 +108,7 @@ var devDependencies = {
 };
 var packageJson = {
 	name: name,
-	version: version$1,
+	version: version,
 	description: description,
 	engines: engines,
 	bin: bin,
@@ -126,136 +124,19 @@ var packageJson = {
 	devDependencies: devDependencies
 };
 
-var windows = [
-	{
-		url: "https://weekly.tw93.fun/",
-		url_type: "web",
-		hide_title_bar: true,
-		fullscreen: false,
-		width: 1200,
-		height: 780,
-		resizable: true,
-		always_on_top: false,
-		dark_mode: false,
-		activation_shortcut: "",
-		disabled_web_shortcuts: false,
-		hide_on_close: true,
-		incognito: false
-	}
-];
-var user_agent = {
-	macos: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.1 Safari/605.1.15",
-	linux: "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36",
-	windows: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"
-};
-var system_tray = {
-	macos: false,
-	linux: true,
-	windows: true
-};
-var system_tray_path = "icons/icon.png";
-var inject = [
-];
-var proxy_url = "";
-var pakeConf = {
-	windows: windows,
-	user_agent: user_agent,
-	system_tray: system_tray,
-	system_tray_path: system_tray_path,
-	inject: inject,
-	proxy_url: proxy_url
-};
-
-var productName$1 = "Weekly";
-var identifier = "com.pake.weekly";
-var version = "1.0.0";
-var app = {
-	withGlobalTauri: true,
-	trayIcon: {
-		iconPath: "png/weekly_512.png",
-		iconAsTemplate: false,
-		id: "pake-tray"
-	}
-};
-var build = {
-	frontendDist: "../dist"
-};
-var CommonConf = {
-	productName: productName$1,
-	identifier: identifier,
-	version: version,
-	app: app,
-	build: build
-};
-
-var bundle$2 = {
-	icon: [
-		"png/weekly_256.ico",
-		"png/weekly_32.ico"
-	],
-	active: true,
-	resources: [
-		"png/weekly_32.ico"
-	],
-	targets: [
-		"msi"
-	],
-	windows: {
-		digestAlgorithm: "sha256",
-		wix: {
-			language: [
-				"en-US"
-			],
-			template: "assets/main.wxs"
-		}
-	}
-};
-var WinConf = {
-	bundle: bundle$2
-};
-
-var bundle$1 = {
-	icon: [
-		"icons/weekly.icns"
-	],
-	active: true,
-	macOS: {
-	},
-	targets: [
-		"dmg"
-	]
-};
-var MacConf = {
-	bundle: bundle$1
-};
-
-var productName = "weekly";
-var bundle = {
-	icon: [
-		"png/weekly_512.png"
-	],
-	active: true,
-	linux: {
-		deb: {
-			depends: [
-				"curl",
-				"wget"
-			],
-			files: {
-				"/usr/share/applications/com-pake-weekly.desktop": "assets/com-pake-weekly.desktop"
-			}
-		}
-	},
-	targets: [
-		"deb",
-		"appimage"
-	]
-};
-var LinuxConf = {
-	productName: productName,
-	bundle: bundle
-};
+// Convert the current module URL to a file path
+const currentModulePath = fileURLToPath(import.meta.url);
+// Resolve the parent directory of the current module
+const npmDirectory = path.join(path.dirname(currentModulePath), '..');
+const tauriConfigDirectory = path.join(npmDirectory, 'src-tauri', '.pake');
 
+// Load configs from npm package directory, not from project source
+const tauriSrcDir = path.join(npmDirectory, 'src-tauri');
+const pakeConf = fsExtra.readJSONSync(path.join(tauriSrcDir, 'pake.json'));
+const CommonConf = fsExtra.readJSONSync(path.join(tauriSrcDir, 'tauri.conf.json'));
+const WinConf = fsExtra.readJSONSync(path.join(tauriSrcDir, 'tauri.windows.conf.json'));
+const MacConf = fsExtra.readJSONSync(path.join(tauriSrcDir, 'tauri.macos.conf.json'));
+const LinuxConf = fsExtra.readJSONSync(path.join(tauriSrcDir, 'tauri.linux.conf.json'));
 const platformConfigs = {
     win32: WinConf,
     darwin: MacConf,
@@ -315,12 +196,6 @@ const IS_MAC = platform$1 === 'darwin';
 const IS_WIN = platform$1 === 'win32';
 const IS_LINUX = platform$1 === 'linux';
 
-// Convert the current module URL to a file path
-const currentModulePath = fileURLToPath(import.meta.url);
-// Resolve the parent directory of the current module
-const npmDirectory = path.join(path.dirname(currentModulePath), '..');
-const tauriConfigDirectory = path.join(npmDirectory, 'src-tauri', '.pake');
-
 async function shellExec(command, timeout = 300000, env) {
     try {
         const { exitCode } = await execa(command, {
@@ -532,7 +407,34 @@ async function mergeConfig(url, options, tauriConf) {
     tauriConf.pake.system_tray[currentPlatform] = showSystemTray;
     // Processing targets are currently only open to Linux.
     if (platform === 'linux') {
+        // Remove hardcoded desktop files and regenerate with correct app name
         delete tauriConf.bundle.linux.deb.files;
+        // Generate correct desktop file configuration
+        const appNameLower = name.toLowerCase();
+        const identifier = `com.pake.${appNameLower}`;
+        const desktopFileName = `${identifier}.desktop`;
+        // Create desktop file content
+        const desktopContent = `[Desktop Entry]
+Version=1.0
+Type=Application
+Name=${name}
+Comment=${name}
+Exec=${appNameLower}
+Icon=${appNameLower}
+Categories=Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml_xml;
+StartupNotify=true
+`;
+        // Write desktop file to src-tauri/assets directory where Tauri expects it
+        const srcAssetsDir = path.join(npmDirectory, 'src-tauri/assets');
+        const srcDesktopFilePath = path.join(srcAssetsDir, desktopFileName);
+        await fsExtra.ensureDir(srcAssetsDir);
+        await fsExtra.writeFile(srcDesktopFilePath, desktopContent);
+        // Set up desktop file in bundle configuration
+        // Use absolute path from src-tauri directory to assets
+        tauriConf.bundle.linux.deb.files = {
+            [`/usr/share/applications/${desktopFileName}`]: `assets/${desktopFileName}`,
+        };
         const validTargets = ['deb', 'appimage', 'rpm'];
         if (validTargets.includes(options.targets)) {
             tauriConf.bundle.targets = [options.targets];
@@ -541,6 +443,13 @@ async function mergeConfig(url, options, tauriConf) {
             logger.warn(`✼ The target must be one of ${validTargets.join(', ')}, the default 'deb' will be used.`);
         }
     }
+    // Set macOS bundle targets (for app vs dmg)
+    if (platform === 'darwin') {
+        const validMacTargets = ['app', 'dmg'];
+        if (validMacTargets.includes(options.targets)) {
+            tauriConf.bundle.targets = [options.targets];
+        }
+    }
     // Set icon.
     const platformIconMap = {
         win32: {
@@ -563,7 +472,7 @@ async function mergeConfig(url, options, tauriConf) {
         },
     };
     const iconInfo = platformIconMap[platform];
-    const exists = await fsExtra.pathExists(options.icon);
+    const exists = options.icon && (await fsExtra.pathExists(options.icon));
     if (exists) {
         let updateIconPath = true;
         let customIconExt = path.extname(options.icon).toLowerCase();
@@ -575,7 +484,12 @@ async function mergeConfig(url, options, tauriConf) {
         else {
             const iconPath = path.join(npmDirectory, 'src-tauri/', iconInfo.path);
             tauriConf.bundle.resources = [iconInfo.path];
-            await fsExtra.copy(options.icon, iconPath);
+            // Avoid copying if source and destination are the same
+            const absoluteIconPath = path.resolve(options.icon);
+            const absoluteDestPath = path.resolve(iconPath);
+            if (absoluteIconPath !== absoluteDestPath) {
+                await fsExtra.copy(options.icon, iconPath);
+            }
         }
         if (updateIconPath) {
             tauriConf.bundle.icon = [options.icon];
@@ -651,17 +565,19 @@ class BaseBuilder {
         this.options = options;
     }
     getBuildEnvironment() {
-        return IS_MAC ? {
-            'CFLAGS': '-fno-modules',
-            'CXXFLAGS': '-fno-modules',
-            'MACOSX_DEPLOYMENT_TARGET': '14.0'
-        } : undefined;
+        return IS_MAC
+            ? {
+                CFLAGS: '-fno-modules',
+                CXXFLAGS: '-fno-modules',
+                MACOSX_DEPLOYMENT_TARGET: '14.0',
+            }
+            : undefined;
     }
     getInstallTimeout() {
         return process.platform === 'win32' ? 600000 : 300000;
     }
     getBuildTimeout() {
-        return 300000; // 5 minutes for build process
+        return 900000; // 15 minutes for all builds
     }
     async prepare() {
         const tauriSrcPath = path.join(npmDirectory, 'src-tauri');
@@ -692,7 +608,9 @@ class BaseBuilder {
         await fsExtra.ensureDir(rustProjectDir);
         // 统一使用npm，简单可靠
         const packageManager = 'npm';
-        const registryOption = isChina ? ' --registry=https://registry.npmmirror.com' : '';
+        const registryOption = isChina
+            ? ' --registry=https://registry.npmmirror.com'
+            : '';
         const legacyPeerDeps = ' --legacy-peer-deps'; // 解决dependency conflicts
         const timeout = this.getInstallTimeout();
         const buildEnv = this.getBuildEnvironment();
@@ -722,7 +640,7 @@ class BaseBuilder {
         // Build app
         const buildSpinner = getSpinner('Building app...');
         // Let spinner run for a moment so user can see it, then stop before npm command
-        await new Promise(resolve => setTimeout(resolve, 500));
+        await new Promise((resolve) => setTimeout(resolve, 500));
         buildSpinner.stop();
         // Show static message to keep the status visible
         logger.warn('✸ Building app...');
@@ -752,13 +670,18 @@ class BaseBuilder {
         if (IS_MAC && this.options.targets === 'app') {
             fullCommand += ' --bundles app';
         }
+        // Add features
+        const features = ['cli-build'];
         // Add macos-proxy feature for modern macOS (Darwin 23+ = macOS 14+)
         if (IS_MAC) {
             const macOSVersion = this.getMacOSMajorVersion();
             if (macOSVersion >= 23) {
-                fullCommand += ' --features macos-proxy';
+                features.push('macos-proxy');
             }
         }
+        if (features.length > 0) {
+            fullCommand += ` --features ${features.join(',')}`;
+        }
         return fullCommand;
     }
     getMacOSMajorVersion() {
@@ -812,9 +735,26 @@ class MacBuilder extends BaseBuilder {
         return `${name}_${tauriConfig.version}_${arch}`;
     }
     getBuildCommand() {
-        return this.options.multiArch
-            ? 'npm run build:mac'
-            : super.getBuildCommand();
+        if (this.options.multiArch) {
+            const baseCommand = this.options.debug
+                ? 'npm run tauri build -- --debug'
+                : 'npm run tauri build --';
+            // Use temporary config directory to avoid modifying source files
+            const configPath = path.join('src-tauri', '.pake', 'tauri.conf.json');
+            let fullCommand = `${baseCommand} --target universal-apple-darwin -c "${configPath}"`;
+            // Add features
+            const features = ['cli-build'];
+            // Add macos-proxy feature for modern macOS (Darwin 23+ = macOS 14+)
+            const macOSVersion = this.getMacOSMajorVersion();
+            if (macOSVersion >= 23) {
+                features.push('macos-proxy');
+            }
+            if (features.length > 0) {
+                fullCommand += ` --features ${features.join(',')}`;
+            }
+            return fullCommand;
+        }
+        return super.getBuildCommand();
     }
     getBasePath() {
         return this.options.multiArch
@@ -1000,7 +940,22 @@ async function convertIconFormat(inputPath, appName) {
 async function handleIcon(options, url) {
     if (options.icon) {
         if (options.icon.startsWith('http')) {
-            return downloadIcon(options.icon);
+            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);
     }
@@ -1011,11 +966,43 @@ async function handleIcon(options, url) {
             return faviconPath;
     }
     logger.info('✼ No icon provided, using default icon.');
-    const iconPath = IS_WIN
-        ? 'src-tauri/png/icon_256.ico'
-        : IS_LINUX
-            ? 'src-tauri/png/icon_512.png'
-            : 'src-tauri/icons/icon.icns';
+    // For Windows, ensure we have proper fallback handling
+    if (IS_WIN) {
+        const defaultIcoPath = path.join(npmDirectory, 'src-tauri/png/icon_256.ico');
+        const defaultPngPath = path.join(npmDirectory, 'src-tauri/png/icon_512.png');
+        // First try default ico
+        if (await fsExtra.pathExists(defaultIcoPath)) {
+            return defaultIcoPath;
+        }
+        // If ico doesn't exist, try to convert from png
+        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;
+                }
+            }
+            catch (error) {
+                logger.warn(`Failed to convert default png to ico: ${error.message}`);
+            }
+        }
+        // Last resort: return png path if it exists (Windows can handle png in some cases)
+        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 '';
+    }
+    const iconPath = IS_LINUX
+        ? 'src-tauri/png/icon_512.png'
+        : 'src-tauri/icons/icon.icns';
     return path.join(npmDirectory, iconPath);
 }
 /**
@@ -1024,10 +1011,10 @@ async function handleIcon(options, url) {
 function generateIconServiceUrls(domain) {
     const logoDevUrls = API_TOKENS.logoDev
         .sort(() => Math.random() - 0.5)
-        .map(token => `https://img.logo.dev/${domain}?token=${token}&format=png&size=256`);
+        .map((token) => `https://img.logo.dev/${domain}?token=${token}&format=png&size=256`);
     const brandfetchUrls = API_TOKENS.brandfetch
         .sort(() => Math.random() - 0.5)
-        .map(key => `https://cdn.brandfetch.io/${domain}/w/400/h/400?c=${key}`);
+        .map((key) => `https://cdn.brandfetch.io/${domain}/w/400/h/400?c=${key}`);
     return [
         ...logoDevUrls,
         ...brandfetchUrls,
@@ -1051,18 +1038,33 @@ 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;
         for (const serviceUrl of serviceUrls) {
             try {
-                const faviconPath = await downloadIcon(serviceUrl, false);
+                const faviconPath = await downloadIcon(serviceUrl, false, downloadTimeout);
                 if (!faviconPath)
                     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;
+                    }
                     spinner.succeed(chalk.green('Icon fetched and converted successfully!'));
                     return convertedPath;
                 }
             }
-            catch {
+            catch (error) {
+                // Log specific errors in CI for debugging
+                if (isCI) {
+                    logger.debug(`Icon service ${serviceUrl} failed: ${error.message}`);
+                }
                 continue;
             }
         }
@@ -1077,17 +1079,18 @@ async function tryGetFavicon(url, appName) {
 /**
  * Downloads icon from URL
  */
-async function downloadIcon(iconUrl, showSpinner = true) {
+async function downloadIcon(iconUrl, showSpinner = true, customTimeout) {
     try {
         const response = await axios.get(iconUrl, {
             responseType: 'arraybuffer',
-            timeout: ICON_CONFIG.downloadTimeout,
+            timeout: customTimeout || ICON_CONFIG.downloadTimeout,
         });
         const iconData = response.data;
         if (!iconData || iconData.byteLength < ICON_CONFIG.minFileSize)
             return null;
         const fileDetails = await fileTypeFromBuffer(iconData);
-        if (!fileDetails || !ICON_CONFIG.supportedFormats.includes(fileDetails.ext)) {
+        if (!fileDetails ||
+            !ICON_CONFIG.supportedFormats.includes(fileDetails.ext)) {
             return null;
         }
         return await saveIconFile(iconData, fileDetails.ext);
@@ -1201,7 +1204,8 @@ async function handleOptions(options, url) {
         name,
         identifier: getIdentifier(url),
     };
-    appOptions.icon = await handleIcon(appOptions, url);
+    const iconPath = await handleIcon(appOptions, url);
+    appOptions.icon = iconPath || undefined;
     return appOptions;
 }