pake-cli 3.11.1 → 3.11.3

package/dist/cli.js

@@ -13,16 +13,17 @@ import ora from 'ora';
 import dns from 'dns';
 import http from 'http';
 import { promisify } from 'util';
-import fs from 'fs';
+import fs from 'fs/promises';
 import { dir } from 'tmp-promise';
 import { fileTypeFromBuffer } from 'file-type';
 import icongen from 'icon-gen';
 import sharp from 'sharp';
 import * as psl from 'psl';
 import { InvalidArgumentError, program as program$1, Option } from 'commander';
+import fs$1 from 'fs';
 
 var name = "pake-cli";
-var version = "3.11.1";
+var version = "3.11.3";
 var description = "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。";
 var engines = {
 	node: ">=18.0.0"
@@ -95,7 +96,6 @@ var devDependencies = {
 	"@rollup/plugin-terser": "^0.4.4",
 	"@types/fs-extra": "^11.0.4",
 	"@types/node": "^25.3.2",
-	"@types/page-icon": "^0.3.6",
 	"@types/prompts": "^2.4.9",
 	"@types/tmp": "^0.2.6",
 	"@types/update-notifier": "^6.0.8",
@@ -110,7 +110,8 @@ var devDependencies = {
 };
 var pnpm = {
 	overrides: {
-		sharp: "^0.34.5"
+		sharp: "^0.34.5",
+		"@img/sharp-libvips-darwin-arm64": "1.2.4"
 	},
 	onlyBuiltDependencies: [
 		"esbuild",
@@ -289,7 +290,7 @@ const logger = {
         log.error(...msg.map((m) => chalk.red(m)));
     },
     warn(...msg) {
-        log.info(...msg.map((m) => chalk.yellow(m)));
+        log.warn(...msg.map((m) => chalk.yellow(m)));
     },
     success(...msg) {
         log.info(...msg.map((m) => chalk.green(m)));
@@ -423,22 +424,22 @@ function checkRustInstalled() {
 }
 
 async function combineFiles(files, output) {
-    const contents = files.map((file) => {
+    const contents = await Promise.all(files.map(async (file) => {
         if (file.endsWith('.css')) {
-            const fileContent = fs.readFileSync(file, 'utf-8');
+            const fileContent = await fs.readFile(file, 'utf-8');
             return `window.addEventListener('DOMContentLoaded', (_event) => {
         const css = ${JSON.stringify(fileContent)};
         const style = document.createElement('style');
-        style.innerHTML = css;
+        style.textContent = css;
         document.head.appendChild(style);
       });`;
         }
-        const fileContent = fs.readFileSync(file);
+        const fileContent = await fs.readFile(file);
         return ("window.addEventListener('DOMContentLoaded', (_event) => { " +
             fileContent +
             ' });');
-    });
-    fs.writeFileSync(output, contents.join('\n'));
+    }));
+    await fs.writeFile(output, contents.join('\n'));
     return files;
 }
 
@@ -479,11 +480,15 @@ function generateIdentifierSafeName(name) {
     return cleaned;
 }
 
-async function mergeConfig(url, options, tauriConf) {
-    // Ensure .pake directory exists and copy source templates if needed
+function asSupportedPlatform(platform) {
+    if (platform !== 'win32' && platform !== 'darwin' && platform !== 'linux') {
+        throw new Error(`Pake only supports win32, darwin, and linux; detected '${platform}'.`);
+    }
+    return platform;
+}
+async function copyTemplateConfigs() {
     const srcTauriDir = path.join(npmDirectory, 'src-tauri');
     await fsExtra.ensureDir(tauriConfigDirectory);
-    // Copy source config files to .pake directory (as templates)
     const sourceFiles = [
         'tauri.conf.json',
         'tauri.macos.conf.json',
@@ -499,51 +504,11 @@ async function mergeConfig(url, options, tauriConf) {
             await fsExtra.copy(sourcePath, destPath);
         }
     }));
-    const { width, height, fullscreen, maximize, hideTitleBar, alwaysOnTop, appVersion, darkMode, disabledWebShortcuts, activationShortcut, userAgent, showSystemTray, systemTrayIcon, useLocalFile, identifier, name = 'pake-app', resizable = true, inject, proxyUrl, installerLanguage, hideOnClose, incognito, title, wasm, enableDragDrop, multiInstance, multiWindow, startToTray, forceInternalNavigation, internalUrlRegex, zoom, minWidth, minHeight, ignoreCertificateErrors, newWindow, camera, microphone, } = options;
-    const { platform } = process;
-    const platformHideOnClose = hideOnClose ?? platform === 'darwin';
-    const tauriConfWindowOptions = {
-        width,
-        height,
-        fullscreen,
-        maximize,
-        resizable,
-        hide_title_bar: hideTitleBar,
-        activation_shortcut: activationShortcut,
-        always_on_top: alwaysOnTop,
-        dark_mode: darkMode,
-        disabled_web_shortcuts: disabledWebShortcuts,
-        hide_on_close: platformHideOnClose,
-        incognito: incognito,
-        title: title,
-        enable_wasm: wasm,
-        enable_drag_drop: enableDragDrop,
-        start_to_tray: startToTray && showSystemTray,
-        force_internal_navigation: forceInternalNavigation,
-        internal_url_regex: internalUrlRegex,
-        zoom,
-        min_width: minWidth,
-        min_height: minHeight,
-        ignore_certificate_errors: ignoreCertificateErrors,
-        new_window: newWindow,
-    };
-    Object.assign(tauriConf.pake.windows[0], { url, ...tauriConfWindowOptions });
-    tauriConf.productName = name;
-    tauriConf.identifier = identifier;
-    tauriConf.version = appVersion;
-    // Always set mainBinaryName to ensure binary uniqueness
-    const linuxBinaryName = `pake-${generateLinuxPackageName(name)}`;
-    tauriConf.mainBinaryName =
-        platform === 'linux'
-            ? linuxBinaryName
-            : `pake-${generateIdentifierSafeName(name)}`;
-    if (platform == 'win32') {
-        tauriConf.bundle.windows.wix.language[0] = installerLanguage;
-    }
+}
+async function handleLocalFile(url, useLocalFile, tauriConf) {
     const pathExists = await fsExtra.pathExists(url);
     if (pathExists) {
         logger.warn('✼ Your input might be a local file.');
-        tauriConf.pake.windows[0].url_type = 'local';
         const fileName = path.basename(url);
         const dirName = path.dirname(url);
         const distDir = path.join(npmDirectory, 'dist');
@@ -555,8 +520,6 @@ async function mergeConfig(url, options, tauriConf) {
         else {
             fsExtra.moveSync(distDir, distBakDir, { overwrite: true });
             fsExtra.copySync(dirName, distDir, { overwrite: true });
-            // ignore it, because about_pake.html have be erased.
-            // const filesToCopyBack = ['cli.js', 'about_pake.html'];
             const filesToCopyBack = ['cli.js'];
             await Promise.all(filesToCopyBack.map((file) => fsExtra.copy(path.join(distBakDir, file), path.join(distDir, file))));
         }
@@ -566,28 +529,19 @@ async function mergeConfig(url, options, tauriConf) {
     else {
         tauriConf.pake.windows[0].url_type = 'web';
     }
-    const platformMap = {
-        win32: 'windows',
-        linux: 'linux',
-        darwin: 'macos',
-    };
-    const currentPlatform = platformMap[platform];
-    if (userAgent.length > 0) {
-        tauriConf.pake.user_agent[currentPlatform] = userAgent;
-    }
-    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 linuxName = generateLinuxPackageName(name);
-        const desktopFileName = `com.pake.${linuxName}.desktop`;
-        const iconName = `${linuxName}_512`;
-        // Create desktop file content
-        // Determine if title contains Chinese characters for Name[zh_CN]
-        const chineseName = title && /[\u4e00-\u9fa5]/.test(title) ? title : null;
-        const desktopContent = `[Desktop Entry]
+}
+async function mergeLinuxConfig(options, name, tauriConf, linuxBinaryName) {
+    const linuxBundle = tauriConf.bundle.linux;
+    if (!linuxBundle) {
+        throw new Error('Linux bundle configuration is missing from tauri.linux.conf.json; cannot build Linux target.');
+    }
+    delete linuxBundle.deb.files;
+    const linuxName = generateLinuxPackageName(name);
+    const desktopFileName = `com.pake.${linuxName}.desktop`;
+    const iconName = `${linuxName}_512`;
+    const { title } = options;
+    const chineseName = title && /[\u4e00-\u9fa5]/.test(title) ? title : null;
+    const desktopContent = `[Desktop Entry]
 Version=1.0
 Type=Application
 Name=${name}
@@ -600,51 +554,39 @@ MimeType=text/html;text/xml;application/xhtml_xml;
 StartupNotify=true
 Terminal=false
 `;
-        // 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
-        const desktopInstallPath = `/usr/share/applications/${desktopFileName}`;
-        tauriConf.bundle.linux.deb.files = {
-            [desktopInstallPath]: `assets/${desktopFileName}`,
-        };
-        // Add desktop file support for RPM
-        if (!tauriConf.bundle.linux.rpm) {
-            tauriConf.bundle.linux.rpm = {};
-        }
-        tauriConf.bundle.linux.rpm.files = {
-            [desktopInstallPath]: `assets/${desktopFileName}`,
-        };
-        const validTargets = [
-            'deb',
-            'appimage',
-            'rpm',
-            'deb-arm64',
-            'appimage-arm64',
-            'rpm-arm64',
-        ];
-        const baseTarget = options.targets.includes('-arm64')
-            ? options.targets.replace('-arm64', '')
-            : options.targets;
-        if (validTargets.includes(options.targets)) {
-            tauriConf.bundle.targets = [baseTarget];
-        }
-        else {
-            logger.warn(`✼ The target must be one of ${validTargets.join(', ')}, the default 'deb' will be used.`);
-        }
+    const srcAssetsDir = path.join(npmDirectory, 'src-tauri/assets');
+    const srcDesktopFilePath = path.join(srcAssetsDir, desktopFileName);
+    await fsExtra.ensureDir(srcAssetsDir);
+    await fsExtra.writeFile(srcDesktopFilePath, desktopContent);
+    const desktopInstallPath = `/usr/share/applications/${desktopFileName}`;
+    linuxBundle.deb.files = {
+        [desktopInstallPath]: `assets/${desktopFileName}`,
+    };
+    if (!linuxBundle.rpm) {
+        linuxBundle.rpm = {};
     }
-    // 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];
-        }
+    linuxBundle.rpm.files = {
+        [desktopInstallPath]: `assets/${desktopFileName}`,
+    };
+    const validTargets = [
+        'deb',
+        'appimage',
+        'rpm',
+        'deb-arm64',
+        'appimage-arm64',
+        'rpm-arm64',
+    ];
+    const baseTarget = options.targets.includes('-arm64')
+        ? options.targets.replace('-arm64', '')
+        : options.targets;
+    if (validTargets.includes(options.targets)) {
+        tauriConf.bundle.targets = [baseTarget];
     }
-    // Set icon.
-    const safeAppName = getSafeAppName(name);
+    else {
+        logger.warn(`✼ The target must be one of ${validTargets.join(', ')}, the default 'deb' will be used.`);
+    }
+}
+async function mergeIcons(options, name, tauriConf, platform, safeAppName) {
     const platformIconMap = {
         win32: {
             fileExt: '.ico',
@@ -670,7 +612,7 @@ Terminal=false
     const exists = resolvedIconPath && (await fsExtra.pathExists(resolvedIconPath));
     if (exists) {
         let updateIconPath = true;
-        let customIconExt = path.extname(resolvedIconPath).toLowerCase();
+        const customIconExt = path.extname(resolvedIconPath).toLowerCase();
         if (customIconExt !== iconInfo.fileExt) {
             updateIconPath = false;
             logger.warn(`✼ ${iconInfo.message}, but you give ${customIconExt}`);
@@ -679,7 +621,6 @@ Terminal=false
         else {
             const iconPath = path.join(npmDirectory, 'src-tauri/', iconInfo.path);
             tauriConf.bundle.resources = [iconInfo.path];
-            // Avoid copying if source and destination are the same
             const absoluteDestPath = path.resolve(iconPath);
             if (resolvedIconPath !== absoluteDestPath) {
                 try {
@@ -706,37 +647,32 @@ Terminal=false
     }
     // Set tray icon path.
     let trayIconPath = platform === 'darwin' ? 'png/icon_512.png' : tauriConf.bundle.icon[0];
-    if (systemTrayIcon.length > 0) {
+    if (options.systemTrayIcon.length > 0) {
         try {
-            await fsExtra.pathExists(systemTrayIcon);
-            // 需要判断图标格式，默认只支持ico和png两种
-            let iconExt = path.extname(systemTrayIcon).toLowerCase();
-            if (iconExt == '.png' || iconExt == '.ico') {
+            await fsExtra.pathExists(options.systemTrayIcon);
+            const iconExt = path.extname(options.systemTrayIcon).toLowerCase();
+            if (iconExt === '.png' || iconExt === '.ico') {
                 const trayIcoPath = path.join(npmDirectory, `src-tauri/png/${safeAppName}${iconExt}`);
                 trayIconPath = `png/${safeAppName}${iconExt}`;
-                await fsExtra.copy(systemTrayIcon, trayIcoPath);
+                await fsExtra.copy(options.systemTrayIcon, trayIcoPath);
             }
             else {
                 logger.warn(`✼ System tray icon must be .ico or .png, but you provided ${iconExt}.`);
                 logger.warn(`✼ Default system tray icon will be used.`);
             }
         }
-        catch {
-            logger.warn(`✼ ${systemTrayIcon} not exists!`);
+        catch (err) {
+            logger.warn(`✼ Failed to apply system tray icon "${options.systemTrayIcon}": ${err instanceof Error ? err.message : String(err)}`);
             logger.warn(`✼ Default system tray icon will remain unchanged.`);
         }
     }
-    // Ensure trayIcon object exists before setting iconPath
-    if (!tauriConf.app.trayIcon) {
-        tauriConf.app.trayIcon = {};
-    }
-    tauriConf.app.trayIcon.iconPath = trayIconPath;
     tauriConf.pake.system_tray_path = trayIconPath;
     delete tauriConf.app.trayIcon;
-    const injectFilePath = path.join(npmDirectory, `src-tauri/src/inject/custom.js`);
-    // inject js or css files
+}
+async function injectCustomCode(options, tauriConf) {
+    const { inject, proxyUrl, multiInstance, multiWindow, wasm } = options;
+    const injectFilePath = path.join(npmDirectory, 'src-tauri/src/inject/custom.js');
     if (inject?.length > 0) {
-        // Ensure inject is an array before calling .every()
         const injectArray = Array.isArray(inject) ? inject : [inject];
         if (!injectArray.every((item) => item.endsWith('.css') || item.endsWith('.js'))) {
             logger.error('The injected file must be in either CSS or JS format.');
@@ -753,7 +689,6 @@ Terminal=false
     tauriConf.pake.proxy_url = proxyUrl || '';
     tauriConf.pake.multi_instance = multiInstance;
     tauriConf.pake.multi_window = multiWindow;
-    // Configure WASM support with required HTTP headers
     if (wasm) {
         tauriConf.app.security = {
             headers: {
@@ -762,16 +697,16 @@ Terminal=false
             },
         };
     }
-    // Write entitlements dynamically on macOS so camera/microphone are opt-in
-    if (platform === 'darwin') {
-        const entitlementEntries = [];
-        if (camera) {
-            entitlementEntries.push('    <key>com.apple.security.device.camera</key>\n    <true/>');
-        }
-        if (microphone) {
-            entitlementEntries.push('    <key>com.apple.security.device.audio-input</key>\n    <true/>');
-        }
-        const entitlementsContent = `<?xml version="1.0" encoding="UTF-8"?>
+}
+async function generateMacEntitlements(camera, microphone) {
+    const entitlementEntries = [];
+    if (camera) {
+        entitlementEntries.push('    <key>com.apple.security.device.camera</key>\n    <true/>');
+    }
+    if (microphone) {
+        entitlementEntries.push('    <key>com.apple.security.device.audio-input</key>\n    <true/>');
+    }
+    const entitlementsContent = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
   <dict>
@@ -779,10 +714,10 @@ ${entitlementEntries.join('\n')}
   </dict>
 </plist>
 `;
-        const entitlementsPath = path.join(npmDirectory, 'src-tauri', 'entitlements.plist');
-        await fsExtra.writeFile(entitlementsPath, entitlementsContent);
-    }
-    // Save config file.
+    const entitlementsPath = path.join(npmDirectory, 'src-tauri', 'entitlements.plist');
+    await fsExtra.writeFile(entitlementsPath, entitlementsContent);
+}
+async function writeAllConfigs(tauriConf, platform) {
     const platformConfigPaths = {
         win32: 'tauri.windows.conf.json',
         darwin: 'tauri.macos.conf.json',
@@ -793,11 +728,85 @@ ${entitlementEntries.join('\n')}
     await fsExtra.outputJSON(configPath, bundleConf, { spaces: 4 });
     const pakeConfigPath = path.join(tauriConfigDirectory, 'pake.json');
     await fsExtra.outputJSON(pakeConfigPath, tauriConf.pake, { spaces: 4 });
-    let tauriConf2 = JSON.parse(JSON.stringify(tauriConf));
+    const tauriConf2 = JSON.parse(JSON.stringify(tauriConf));
     delete tauriConf2.pake;
     const configJsonPath = path.join(tauriConfigDirectory, 'tauri.conf.json');
     await fsExtra.outputJSON(configJsonPath, tauriConf2, { spaces: 4 });
 }
+async function mergeConfig(url, options, tauriConf) {
+    await copyTemplateConfigs();
+    const { width, height, fullscreen, maximize, hideTitleBar, alwaysOnTop, appVersion, darkMode, disabledWebShortcuts, activationShortcut, userAgent, showSystemTray, useLocalFile, identifier, name = 'pake-app', resizable = true, installerLanguage, hideOnClose, incognito, title, wasm, enableDragDrop, startToTray, forceInternalNavigation, internalUrlRegex, zoom, minWidth, minHeight, ignoreCertificateErrors, newWindow, camera, microphone, } = options;
+    const platform = asSupportedPlatform(process.platform);
+    const platformHideOnClose = hideOnClose ?? platform === 'darwin';
+    const tauriConfWindowOptions = {
+        width,
+        height,
+        fullscreen,
+        maximize,
+        resizable,
+        hide_title_bar: hideTitleBar,
+        activation_shortcut: activationShortcut,
+        always_on_top: alwaysOnTop,
+        dark_mode: darkMode,
+        disabled_web_shortcuts: disabledWebShortcuts,
+        hide_on_close: platformHideOnClose,
+        incognito,
+        title,
+        enable_wasm: wasm,
+        enable_drag_drop: enableDragDrop,
+        start_to_tray: startToTray && showSystemTray,
+        force_internal_navigation: forceInternalNavigation,
+        internal_url_regex: internalUrlRegex,
+        zoom,
+        min_width: minWidth,
+        min_height: minHeight,
+        ignore_certificate_errors: ignoreCertificateErrors,
+        new_window: newWindow,
+    };
+    Object.assign(tauriConf.pake.windows[0], { url, ...tauriConfWindowOptions });
+    tauriConf.productName = name;
+    tauriConf.identifier = identifier;
+    tauriConf.version = appVersion;
+    const linuxBinaryName = `pake-${generateLinuxPackageName(name)}`;
+    tauriConf.mainBinaryName =
+        platform === 'linux'
+            ? linuxBinaryName
+            : `pake-${generateIdentifierSafeName(name)}`;
+    if (platform === 'win32') {
+        const windowsBundle = tauriConf.bundle.windows;
+        if (!windowsBundle) {
+            throw new Error('Windows bundle configuration is missing from tauri.windows.conf.json; cannot build Windows target.');
+        }
+        windowsBundle.wix.language[0] = installerLanguage;
+    }
+    await handleLocalFile(url, useLocalFile, tauriConf);
+    const platformMap = {
+        win32: 'windows',
+        linux: 'linux',
+        darwin: 'macos',
+    };
+    const currentPlatform = platformMap[platform];
+    if (userAgent.length > 0) {
+        tauriConf.pake.user_agent[currentPlatform] = userAgent;
+    }
+    tauriConf.pake.system_tray[currentPlatform] = showSystemTray;
+    if (platform === 'linux') {
+        await mergeLinuxConfig(options, name, tauriConf, linuxBinaryName);
+    }
+    if (platform === 'darwin') {
+        const validMacTargets = ['app', 'dmg'];
+        if (validMacTargets.includes(options.targets)) {
+            tauriConf.bundle.targets = [options.targets];
+        }
+    }
+    const safeAppName = getSafeAppName(name);
+    await mergeIcons(options, name, tauriConf, platform, safeAppName);
+    await injectCustomCode(options, tauriConf);
+    if (platform === 'darwin') {
+        await generateMacEntitlements(camera, microphone);
+    }
+    await writeAllConfigs(tauriConf, platform);
+}
 
 class BaseBuilder {
     constructor(options) {
@@ -884,7 +893,7 @@ class BaseBuilder {
             }
             else {
                 logger.error('✕ Rust required to package your webapp.');
-                process.exit(0);
+                process.exit(1);
             }
         }
         const isChina = await isChinaDomain('www.npmjs.com');
@@ -1093,6 +1102,10 @@ class BaseBuilder {
         if (this.options.debug) {
             fullCommand += ' --verbose';
         }
+        const features = this.getBuildFeatures();
+        if (features.length > 0) {
+            fullCommand += ` --features ${features.join(',')}`;
+        }
         return fullCommand;
     }
     getBuildFeatures() {
@@ -1114,11 +1127,6 @@ class BaseBuilder {
         if (IS_MAC && this.options.targets === 'app') {
             fullCommand += ' --bundles app';
         }
-        // Add features
-        const features = this.getBuildFeatures();
-        if (features.length > 0) {
-            fullCommand += ` --features ${features.join(',')}`;
-        }
         return fullCommand;
     }
     getMacOSMajorVersion() {
@@ -1280,12 +1288,7 @@ class MacBuilder extends BaseBuilder {
         if (!buildTarget) {
             throw new Error(`Unsupported architecture: ${actualArch} for macOS`);
         }
-        let fullCommand = this.buildBaseCommand(packageManager, configPath, buildTarget);
-        const features = this.getBuildFeatures();
-        if (features.length > 0) {
-            fullCommand += ` --features ${features.join(',')}`;
-        }
-        return fullCommand;
+        return this.buildBaseCommand(packageManager, configPath, buildTarget);
     }
     getBasePath() {
         const basePath = this.options.debug ? 'debug' : 'release';
@@ -1325,12 +1328,7 @@ class WinBuilder extends BaseBuilder {
         if (!buildTarget) {
             throw new Error(`Unsupported architecture: ${this.buildArch} for Windows`);
         }
-        let fullCommand = this.buildBaseCommand(packageManager, configPath, buildTarget);
-        const features = this.getBuildFeatures();
-        if (features.length > 0) {
-            fullCommand += ` --features ${features.join(',')}`;
-        }
-        return fullCommand;
+        return this.buildBaseCommand(packageManager, configPath, buildTarget);
     }
     getBasePath() {
         const basePath = this.options.debug ? 'debug' : 'release';
@@ -1410,10 +1408,6 @@ class LinuxBuilder extends BaseBuilder {
             ? (this.getTauriTarget(this.buildArch, 'linux') ?? undefined)
             : undefined;
         let fullCommand = this.buildBaseCommand(packageManager, configPath, buildTarget);
-        const features = this.getBuildFeatures();
-        if (features.length > 0) {
-            fullCommand += ` --features ${features.join(',')}`;
-        }
         if (this.currentBuildType) {
             fullCommand += ` --bundles ${this.currentBuildType}`;
         }
@@ -1470,6 +1464,85 @@ class BuilderProvider {
     }
 }
 
+const LOCAL_HOST_SUFFIXES = [
+    '.local',
+    '.lan',
+    '.internal',
+    '.home',
+    '.localdomain',
+];
+const IPV4_ADDRESS_PATTERN = /^(\d{1,3}\.){3}\d{1,3}$/;
+function normalize(value) {
+    return value.trim().toLowerCase();
+}
+function simplify(value) {
+    return normalize(value).replace(/[\s._-]+/g, '');
+}
+function generateDashboardIconSlugs(appName) {
+    const normalizedName = normalize(appName);
+    if (!normalizedName) {
+        return [];
+    }
+    const slugs = new Set([
+        normalizedName,
+        normalizedName.replace(/\s+/g, '-'),
+    ]);
+    return [...slugs].filter(Boolean);
+}
+function isLikelyLocalHostname(hostname) {
+    const normalizedHostname = normalize(hostname);
+    if (!normalizedHostname) {
+        return false;
+    }
+    return (normalizedHostname === 'localhost' ||
+        IPV4_ADDRESS_PATTERN.test(normalizedHostname) ||
+        normalizedHostname.includes(':') ||
+        !normalizedHostname.includes('.') ||
+        LOCAL_HOST_SUFFIXES.some((suffix) => normalizedHostname.endsWith(suffix)));
+}
+function shouldPreferDashboardIcons(url, appName) {
+    if (!appName) {
+        return false;
+    }
+    try {
+        const hostname = new URL(url).hostname.toLowerCase();
+        if (!hostname) {
+            return false;
+        }
+        if (isLikelyLocalHostname(hostname)) {
+            return true;
+        }
+        const parsed = psl.parse(hostname);
+        if (!('domain' in parsed) || !parsed.domain) {
+            return true;
+        }
+        const registrableDomain = parsed.domain.toLowerCase();
+        if (hostname === registrableDomain) {
+            return false;
+        }
+        const subdomain = 'subdomain' in parsed && typeof parsed.subdomain === 'string'
+            ? parsed.subdomain
+            : '';
+        if (!subdomain) {
+            return false;
+        }
+        const productLabel = subdomain.split('.').pop() || '';
+        const rootLabel = registrableDomain.split('.')[0] || '';
+        const normalizedAppName = simplify(appName);
+        return (normalizedAppName.length > 0 &&
+            simplify(productLabel) === normalizedAppName &&
+            simplify(rootLabel) !== normalizedAppName);
+    }
+    catch {
+        return false;
+    }
+}
+function getIconSourcePriority(url, appName) {
+    return shouldPreferDashboardIcons(url, appName)
+        ? ['dashboard', 'domain']
+        : ['domain', 'dashboard'];
+}
+
 const ICO_HEADER_SIZE = 6;
 const ICO_DIR_ENTRY_SIZE = 16;
 const ICO_TYPE_ICON = 1;
@@ -1571,11 +1644,48 @@ async function writeIcoWithPreferredSize(sourcePath, outputPath, preferredSize)
         return false;
     }
 }
+/**
+ * Builds an ICO file from an array of PNG buffers using the PNG-in-ICO format
+ * (supported since Windows Vista). This preserves alpha transparency.
+ */
+function buildIcoFromPngBuffers(frames) {
+    const count = frames.length;
+    const headerSize = ICO_HEADER_SIZE + count * ICO_DIR_ENTRY_SIZE;
+    const totalPayload = frames.reduce((acc, f) => acc + f.png.length, 0);
+    const output = Buffer.alloc(headerSize + totalPayload);
+    output.writeUInt16LE(0, 0);
+    output.writeUInt16LE(ICO_TYPE_ICON, 2);
+    output.writeUInt16LE(count, 4);
+    let currentOffset = headerSize;
+    for (let i = 0; i < count; i++) {
+        const { size, png } = frames[i];
+        const entryOffset = ICO_HEADER_SIZE + i * ICO_DIR_ENTRY_SIZE;
+        const sizeByte = size >= 256 ? 0 : size;
+        output.writeUInt8(sizeByte, entryOffset);
+        output.writeUInt8(sizeByte, entryOffset + 1);
+        output.writeUInt8(0, entryOffset + 2);
+        output.writeUInt8(0, entryOffset + 3);
+        output.writeUInt16LE(1, entryOffset + 4);
+        output.writeUInt16LE(32, entryOffset + 6);
+        output.writeUInt32LE(png.length, entryOffset + 8);
+        output.writeUInt32LE(currentOffset, entryOffset + 12);
+        png.copy(output, currentOffset);
+        currentOffset += png.length;
+    }
+    return output;
+}
 
 const ICON_CONFIG = {
     minFileSize: 100,
-    supportedFormats: ['png', 'ico', 'jpeg', 'jpg', 'webp', 'icns'],
-    whiteBackground: { r: 255, g: 255, b: 255 },
+    supportedFormats: [
+        'png',
+        'ico',
+        'jpeg',
+        'jpg',
+        'webp',
+        'icns',
+        'svg',
+    ],
     transparentBackground: { r: 255, g: 255, b: 255, alpha: 0 },
     downloadTimeout: {
         ci: 5000,
@@ -1591,6 +1701,9 @@ const API_KEYS = {
     logoDev: ['pk_JLLMUKGZRpaG5YclhXaTkg', 'pk_Ph745P8mQSeYFfW2Wk039A'],
     brandfetch: ['1idqvJC0CeFSeyp3Yf7', '1idej-yhU_ThggIHFyG'],
 };
+/**
+ * Generates platform-specific icon paths and handles copying for Windows
+ */
 function generateIconPath(appName, isDefault = false) {
     const safeName = isDefault ? 'icon' : getIconBaseName(appName);
     const baseName = safeName;
@@ -1605,7 +1718,7 @@ function generateIconPath(appName, isDefault = false) {
 function getIconBaseName(appName) {
     const baseName = IS_LINUX
         ? generateLinuxPackageName(appName)
-        : generateSafeFilename(appName).toLowerCase();
+        : getSafeAppName(appName);
     return baseName || 'pake-app';
 }
 async function copyWindowsIconIfNeeded(convertedPath, appName) {
@@ -1628,31 +1741,23 @@ async function copyWindowsIconIfNeeded(convertedPath, appName) {
     }
 }
 /**
- * Adds white background to transparent icons only
+ * Normalizes icon inputs to PNG while preserving alpha.
  */
 async function preprocessIcon(inputPath) {
     try {
-        const metadata = await sharp(inputPath).metadata();
-        if (metadata.channels !== 4)
-            return inputPath; // No transparency
+        const extension = path.extname(inputPath).toLowerCase();
+        const shouldNormalize = ['.png', '.jpeg', '.jpg', '.webp', '.svg'].includes(extension);
+        if (!shouldNormalize) {
+            return inputPath;
+        }
         const { path: tempDir } = await dir();
-        const outputPath = path.join(tempDir, 'icon-with-background.png');
-        await sharp({
-            create: {
-                width: metadata.width || 512,
-                height: metadata.height || 512,
-                channels: 4,
-                background: { ...ICON_CONFIG.whiteBackground, alpha: 1 },
-            },
-        })
-            .composite([{ input: inputPath }])
-            .png()
-            .toFile(outputPath);
+        const outputPath = path.join(tempDir, 'icon-normalized.png');
+        await sharp(inputPath).ensureAlpha().png().toFile(outputPath);
         return outputPath;
     }
     catch (error) {
         if (error instanceof Error) {
-            logger.warn(`Failed to add background to icon: ${error.message}`);
+            logger.warn(`Failed to normalize icon: ${error.message}`);
         }
         return inputPath;
     }
@@ -1719,15 +1824,22 @@ async function convertIconFormat(inputPath, appName) {
         const iconName = getIconBaseName(appName);
         // 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: PLATFORM_CONFIG.win.sizes,
-                },
-            });
-            return path.join(platformOutputDir, `${iconName}_256${PLATFORM_CONFIG.win.format}`);
+            const icoPath = path.join(platformOutputDir, `${iconName}_256${PLATFORM_CONFIG.win.format}`);
+            const sourceBuffer = await fsExtra.readFile(processedInputPath);
+            const frames = await Promise.all(PLATFORM_CONFIG.win.sizes.map(async (size) => {
+                const png = await sharp(sourceBuffer)
+                    .resize(size, size, {
+                    fit: 'contain',
+                    background: { r: 0, g: 0, b: 0, alpha: 0 },
+                })
+                    .ensureAlpha()
+                    .png()
+                    .toBuffer();
+                return { size, png };
+            }));
+            const icoBuffer = buildIcoFromPngBuffers(frames);
+            await fsExtra.outputFile(icoPath, icoBuffer);
+            return icoPath;
         }
         if (IS_LINUX) {
             const outputPath = path.join(platformOutputDir, `${iconName}_${PLATFORM_CONFIG.linux.size}${PLATFORM_CONFIG.linux.format}`);
@@ -1882,15 +1994,74 @@ function generateIconServiceUrls(domain) {
  */
 function generateDashboardIconUrls(appName) {
     const baseUrl = 'https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons/png';
-    const name = appName.toLowerCase().trim();
-    const slugs = new Set();
-    // Exact name
-    slugs.add(name);
-    // Replace spaces with hyphens
-    slugs.add(name.replace(/\s+/g, '-'));
-    return [...slugs]
-        .filter((s) => s.length > 0)
-        .map((slug) => `${baseUrl}/${slug}.png`);
+    return generateDashboardIconSlugs(appName).map((slug) => `${baseUrl}/${slug}.png`);
+}
+function isSupportedIconFormat(extension) {
+    return ICON_CONFIG.supportedFormats.includes(extension);
+}
+function looksLikeSvg(arrayBuffer) {
+    const sample = Buffer.from(arrayBuffer)
+        .toString('utf-8', 0, Math.min(arrayBuffer.byteLength, 512))
+        .trimStart()
+        .toLowerCase();
+    return (sample.startsWith('<svg') ||
+        (sample.startsWith('<?xml') && sample.includes('<svg')));
+}
+function getUrlExtension(iconUrl) {
+    try {
+        return path.extname(new URL(iconUrl).pathname).slice(1).toLowerCase();
+    }
+    catch {
+        return path.extname(iconUrl).slice(1).toLowerCase();
+    }
+}
+async function detectDownloadedIconExtension(response, arrayBuffer, iconUrl) {
+    const fileDetails = await fileTypeFromBuffer(arrayBuffer);
+    if (fileDetails && isSupportedIconFormat(fileDetails.ext)) {
+        return fileDetails.ext;
+    }
+    const contentType = response.headers
+        .get('content-type')
+        ?.split(';')[0]
+        .trim();
+    if (contentType === 'image/svg+xml' && looksLikeSvg(arrayBuffer)) {
+        return 'svg';
+    }
+    if (getUrlExtension(iconUrl) === 'svg' && looksLikeSvg(arrayBuffer)) {
+        return 'svg';
+    }
+    return null;
+}
+async function resolveIconFromUrl(iconUrl, appName, downloadTimeout) {
+    const iconPath = await downloadIcon(iconUrl, false, downloadTimeout);
+    if (!iconPath) {
+        return null;
+    }
+    const convertedPath = await convertIconFormat(iconPath, appName);
+    if (!convertedPath) {
+        return null;
+    }
+    return await copyWindowsIconIfNeeded(convertedPath, appName);
+}
+async function tryResolveIconSource(source, domain, appName, downloadTimeout) {
+    const iconUrls = source === 'dashboard'
+        ? generateDashboardIconUrls(appName)
+        : generateIconServiceUrls(domain);
+    for (const iconUrl of iconUrls) {
+        try {
+            const resolvedPath = await resolveIconFromUrl(iconUrl, appName, downloadTimeout);
+            if (resolvedPath) {
+                return resolvedPath;
+            }
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                const label = source === 'dashboard' ? 'Dashboard icon' : 'Icon service';
+                logger.debug(`${label} ${iconUrl} failed: ${error.message}`);
+            }
+        }
+    }
+    return null;
 }
 /**
  * Attempts to fetch favicon from website
@@ -1903,49 +2074,16 @@ async function tryGetFavicon(url, appName) {
         const downloadTimeout = isCI
             ? ICON_CONFIG.downloadTimeout.ci
             : ICON_CONFIG.downloadTimeout.default;
-        const serviceUrls = generateIconServiceUrls(domain);
-        for (const serviceUrl of serviceUrls) {
-            try {
-                const faviconPath = await downloadIcon(serviceUrl, false, downloadTimeout);
-                if (!faviconPath)
-                    continue;
-                const convertedPath = await convertIconFormat(faviconPath, appName);
-                if (convertedPath) {
-                    const finalPath = await copyWindowsIconIfNeeded(convertedPath, appName);
-                    spinner.succeed(chalk.green('Icon fetched and converted successfully!'));
-                    return finalPath;
-                }
-            }
-            catch (error) {
-                if (error instanceof Error) {
-                    logger.debug(`Icon service ${serviceUrl} failed: ${error.message}`);
-                }
+        const sourcePriority = getIconSourcePriority(url, appName);
+        for (const source of sourcePriority) {
+            const resolvedIconPath = await tryResolveIconSource(source, domain, appName, downloadTimeout);
+            if (!resolvedIconPath) {
                 continue;
             }
-        }
-        // Final fallback for selfhosted apps behind auth where domain-based
-        // services cannot access the site favicon.
-        if (appName) {
-            const dashboardIconUrls = generateDashboardIconUrls(appName);
-            for (const iconUrl of dashboardIconUrls) {
-                try {
-                    const iconPath = await downloadIcon(iconUrl, false, downloadTimeout);
-                    if (!iconPath)
-                        continue;
-                    const convertedPath = await convertIconFormat(iconPath, appName);
-                    if (convertedPath) {
-                        const finalPath = await copyWindowsIconIfNeeded(convertedPath, appName);
-                        spinner.succeed(chalk.green(`Icon found via dashboard-icons fallback for "${appName}"!`));
-                        return finalPath;
-                    }
-                }
-                catch (error) {
-                    if (error instanceof Error) {
-                        logger.debug(`Dashboard icon ${iconUrl} failed: ${error.message}`);
-                    }
-                    continue;
-                }
-            }
+            spinner.succeed(chalk.green(source === 'dashboard'
+                ? `Icon found via dashboard-icons for "${appName}"!`
+                : 'Icon fetched and converted successfully!'));
+            return resolvedIconPath;
         }
         spinner.warn(`No favicon found for ${domain}. Using default.`);
         return null;
@@ -1979,12 +2117,11 @@ async function downloadIcon(iconUrl, showSpinner = true, customTimeout) {
         const arrayBuffer = await response.arrayBuffer();
         if (!arrayBuffer || arrayBuffer.byteLength < ICON_CONFIG.minFileSize)
             return null;
-        const fileDetails = await fileTypeFromBuffer(arrayBuffer);
-        if (!fileDetails ||
-            !ICON_CONFIG.supportedFormats.includes(fileDetails.ext)) {
+        const extension = await detectDownloadedIconExtension(response, arrayBuffer, iconUrl);
+        if (!extension) {
             return null;
         }
-        return await saveIconFile(arrayBuffer, fileDetails.ext);
+        return await saveIconFile(arrayBuffer, extension);
     }
     catch (error) {
         clearTimeout(timeoutId);
@@ -2068,11 +2205,9 @@ function resolveLocalAppName(filePath, platform) {
     return normalized || 'pake-app';
 }
 function isValidName(name, platform) {
-    const platformRegexMapping = {
-        linux: /^[a-z0-9\u4e00-\u9fff][a-z0-9\u4e00-\u9fff-]*$/,
-        default: /^[a-zA-Z0-9\u4e00-\u9fff][a-zA-Z0-9\u4e00-\u9fff- ]*$/,
-    };
-    const reg = platformRegexMapping[platform] || platformRegexMapping.default;
+    const reg = platform === 'linux'
+        ? /^[a-z0-9\u4e00-\u9fff][a-z0-9\u4e00-\u9fff-]*$/
+        : /^[a-zA-Z0-9\u4e00-\u9fff][a-zA-Z0-9\u4e00-\u9fff- ]*$/;
     return !!name && reg.test(name);
 }
 async function handleOptions(options, url) {
@@ -2177,7 +2312,7 @@ function validateNumberInput(value) {
     return parsedValue;
 }
 function validateUrlInput(url) {
-    const isFile = fs.existsSync(url);
+    const isFile = fs$1.existsSync(url);
     if (!isFile) {
         try {
             return normalizeUrl(url);
@@ -2327,7 +2462,9 @@ ${green('|_|   \\__,_|_|\\_\\___|  can turn any webpage into a desktop app with
         .addOption(new Option('--new-window', 'Allow sites to open new windows (for auth flows, tabs, branches)')
         .default(DEFAULT_PAKE_OPTIONS.newWindow)
         .hideHelp())
-        .option('--install', 'Auto-install app to /Applications (macOS) after build and remove local bundle', DEFAULT_PAKE_OPTIONS.install)
+        .addOption(new Option('--install', 'Auto-install app to /Applications (macOS) after build and remove local bundle')
+        .default(DEFAULT_PAKE_OPTIONS.install)
+        .hideHelp())
         .addOption(new Option('--camera', 'Request camera permission on macOS')
         .default(DEFAULT_PAKE_OPTIONS.camera)
         .hideHelp())