pake-cli 3.2.0-beta1 → 3.2.0-beta11

package/dist/dev.js

@@ -10,7 +10,7 @@ import prompts from 'prompts';
 import ora from 'ora';
 import { fileTypeFromBuffer } from 'file-type';
 import * as psl from 'psl';
-import 'is-url';
+import icongen from 'icon-gen';
 import { execa, execaSync } from 'execa';
 import dns from 'dns';
 import http from 'http';
@@ -35,34 +35,36 @@ const DEFAULT_PAKE_OPTIONS = {
     targets: 'deb',
     useLocalFile: false,
     systemTrayIcon: '',
-    proxyUrl: "",
+    proxyUrl: '',
     debug: false,
     inject: [],
     installerLanguage: 'en-US',
+    hideOnClose: true,
+    incognito: false,
 };
 // Just for cli development
 const DEFAULT_DEV_PAKE_OPTIONS = {
     ...DEFAULT_PAKE_OPTIONS,
-    url: 'https://weread.qq.com',
-    name: 'WeRead',
+    url: 'https://weekly.tw93.fun/',
+    name: 'Weekly',
     hideTitleBar: true,
 };
 
 const logger = {
     info(...msg) {
-        log.info(...msg.map(m => chalk.white(m)));
+        log.info(...msg.map((m) => chalk.white(m)));
     },
     debug(...msg) {
         log.debug(...msg);
     },
     error(...msg) {
-        log.error(...msg.map(m => chalk.red(m)));
+        log.error(...msg.map((m) => chalk.red(m)));
     },
     warn(...msg) {
-        log.info(...msg.map(m => chalk.yellow(m)));
+        log.info(...msg.map((m) => chalk.yellow(m)));
     },
     success(...msg) {
-        log.info(...msg.map(m => chalk.green(m)));
+        log.info(...msg.map((m) => chalk.green(m)));
     },
 };
 
@@ -70,8 +72,7 @@ const logger = {
 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')
-    ;
+const tauriConfigDirectory = path.join(npmDirectory, 'src-tauri', '.pake');
 
 const { platform: platform$2 } = process;
 const IS_MAC = platform$2 === 'darwin';
@@ -80,7 +81,11 @@ const IS_LINUX = platform$2 === 'linux';
 
 // Generates an identifier based on the given URL.
 function getIdentifier(url) {
-    const postFixHash = crypto.createHash('md5').update(url).digest('hex').substring(0, 6);
+    const postFixHash = crypto
+        .createHash('md5')
+        .update(url)
+        .digest('hex')
+        .substring(0, 6);
     return `com.pake.${postFixHash}`;
 }
 async function promptText(message, initial) {
@@ -107,7 +112,70 @@ function getSpinner(text) {
     }).start();
 }
 
-async function handleIcon(options) {
+// Extracts the domain from a given URL.
+function getDomain(inputUrl) {
+    try {
+        const url = new URL(inputUrl);
+        // Use PSL to parse domain names.
+        const parsed = psl.parse(url.hostname);
+        // If domain is available, split it and return the SLD.
+        if ('domain' in parsed && parsed.domain) {
+            return parsed.domain.split('.')[0];
+        }
+        else {
+            return null;
+        }
+    }
+    catch (error) {
+        return null;
+    }
+}
+
+// Helper function to convert icon to required platform format
+async function convertIconFormat(inputPath, appName) {
+    try {
+        const { path: outputDir } = await dir();
+        const platformOutputDir = path.join(outputDir, 'converted-icons');
+        await fsExtra.ensureDir(platformOutputDir);
+        // Get the required format based on current platform
+        const requiredFormat = IS_WIN ? 'ico' : IS_LINUX ? 'png' : 'icns';
+        const outputFileName = IS_WIN
+            ? `${appName.toLowerCase()}_256.ico`
+            : IS_LINUX
+                ? `${appName.toLowerCase()}_512.png`
+                : `${appName.toLowerCase()}.icns`;
+        const outputPath = path.join(platformOutputDir, outputFileName);
+        // Convert using icon-gen
+        if (requiredFormat === 'icns') {
+            await icongen(inputPath, platformOutputDir, {
+                report: false,
+                icns: {
+                    name: appName.toLowerCase(),
+                    sizes: [16, 32, 64, 128, 256, 512, 1024]
+                }
+            });
+        }
+        else if (requiredFormat === 'ico') {
+            await icongen(inputPath, platformOutputDir, {
+                report: false,
+                ico: {
+                    name: `${appName.toLowerCase()}_256`,
+                    sizes: [16, 24, 32, 48, 64, 128, 256]
+                }
+            });
+        }
+        else {
+            // For Linux, just copy the PNG file
+            await fsExtra.copy(inputPath, outputPath);
+        }
+        return outputPath;
+    }
+    catch (error) {
+        logger.warn(`✼ Icon format conversion failed: ${error.message}`);
+        return null;
+    }
+}
+async function handleIcon(options, url) {
     if (options.icon) {
         if (options.icon.startsWith('http')) {
             return downloadIcon(options.icon);
@@ -117,6 +185,13 @@ async function handleIcon(options) {
         }
     }
     else {
+        // Try to get favicon from website if URL is provided and it's a web URL
+        if (url && url.startsWith('http') && options.name) {
+            const faviconPath = await tryGetFavicon(url, options.name);
+            if (faviconPath) {
+                return faviconPath;
+            }
+        }
         logger.warn('✼ No icon given, default in use. For a custom icon, use --icon option.');
         const iconPath = IS_WIN
             ? 'src-tauri/png/icon_256.ico'
@@ -126,16 +201,69 @@ async function handleIcon(options) {
         return path.join(npmDirectory, iconPath);
     }
 }
-async function downloadIcon(iconUrl) {
-    const spinner = getSpinner('Downloading icon...');
+async function tryGetFavicon(url, appName) {
+    const domain = getDomain(url);
+    if (!domain) {
+        return null;
+    }
+    const spinner = getSpinner('Fetching website favicon...');
+    // List of logo/favicon services to try in order of preference
+    const logoServices = [
+        // Professional Logo APIs (free tier, higher quality)
+        `https://logo.clearbit.com/${domain}?size=256`,
+        `https://logo.uplead.com/${domain}`,
+        // Google's reliable service with larger size
+        `https://www.google.com/s2/favicons?domain=${domain}&sz=256`,
+        // Other favicon services
+        `https://favicon.is/${domain}`,
+        `https://icons.duckduckgo.com/ip3/${domain}.ico`,
+        `https://icon.horse/icon/${domain}`,
+        // Direct favicon checks
+        `https://${domain}/favicon.ico`,
+        `https://www.${domain}/favicon.ico`,
+        `https://${domain}/apple-touch-icon.png`,
+        `https://${domain}/apple-touch-icon-precomposed.png`,
+    ];
+    for (const logoUrl of logoServices) {
+        try {
+            const faviconPath = await downloadIcon(logoUrl, false);
+            if (faviconPath) {
+                spinner.text = 'Converting favicon to platform format...';
+                // Convert to the correct format for the current platform
+                const convertedPath = await convertIconFormat(faviconPath, appName);
+                if (convertedPath) {
+                    spinner.succeed(chalk.green(`Favicon downloaded and converted for ${domain}!`));
+                    return convertedPath;
+                }
+                else {
+                    // If conversion fails, try the next service
+                    continue;
+                }
+            }
+        }
+        catch (error) {
+            // Continue to next service
+            continue;
+        }
+    }
+    spinner.fail(chalk.yellow(`No favicon found for ${domain}, using default icon.`));
+    return null;
+}
+async function downloadIcon(iconUrl, showSpinner = true) {
+    const spinner = showSpinner ? getSpinner('Downloading icon...') : null;
     try {
-        const iconResponse = await axios.get(iconUrl, { responseType: 'arraybuffer' });
+        const iconResponse = await axios.get(iconUrl, {
+            responseType: 'arraybuffer',
+            timeout: 10000, // 10 second timeout
+        });
         const iconData = await iconResponse.data;
-        if (!iconData) {
+        if (!iconData || iconData.byteLength < 100) {
+            // Skip very small responses (likely error pages)
             return null;
         }
         const fileDetails = await fileTypeFromBuffer(iconData);
-        if (!fileDetails) {
+        if (!fileDetails || !['png', 'ico', 'jpeg', 'jpg', 'gif', 'webp'].includes(fileDetails.ext)) {
+            // Only accept common image formats
             return null;
         }
         const { path: tempPath } = await dir();
@@ -149,33 +277,21 @@ async function downloadIcon(iconUrl) {
             await fsExtra.outputFile(iconPath, iconData);
         }
         await fsExtra.outputFile(iconPath, iconData);
-        spinner.succeed(chalk.green('Icon downloaded successfully!'));
+        if (spinner) {
+            spinner.succeed(chalk.green('Icon downloaded successfully!'));
+        }
         return iconPath;
     }
     catch (error) {
-        spinner.fail(chalk.red('Icon download failed!'));
+        if (spinner) {
+            spinner.fail(chalk.red('Icon download failed!'));
+        }
         if (error.response && error.response.status === 404) {
             return null;
         }
-        throw error;
-    }
-}
-
-// Extracts the domain from a given URL.
-function getDomain(inputUrl) {
-    try {
-        const url = new URL(inputUrl);
-        // Use PSL to parse domain names.
-        const parsed = psl.parse(url.hostname);
-        // If domain is available, split it and return the SLD.
-        if ('domain' in parsed && parsed.domain) {
-            return parsed.domain.split('.')[0];
-        }
-        else {
-            return null;
+        if (showSpinner) {
+            throw error;
         }
-    }
-    catch (error) {
         return null;
     }
 }
@@ -186,8 +302,8 @@ function resolveAppName(name, platform) {
 }
 function isValidName(name, platform) {
     const platformRegexMapping = {
-        linux: /^[a-z0-9]+(-[a-z0-9]+)*$/,
-        default: /^[a-zA-Z0-9]+([-a-zA-Z0-9])*$/,
+        linux: /^[a-z0-9][a-z0-9-]*$/,
+        default: /^[a-zA-Z0-9][a-zA-Z0-9- ]*$/,
     };
     const reg = platformRegexMapping[platform] || platformRegexMapping.default;
     return !!name && reg.test(name);
@@ -203,9 +319,14 @@ async function handleOptions(options, url) {
         const namePrompt = await promptText(promptMessage, defaultName);
         name = namePrompt || defaultName;
     }
+    // Handle platform-specific name formatting
+    if (name && platform === 'linux') {
+        // Convert to lowercase and replace spaces with dashes for Linux
+        name = name.toLowerCase().replace(/\s+/g, '-');
+    }
     if (!isValidName(name, platform)) {
-        const LINUX_NAME_ERROR = `✕ name should only include lowercase letters, numbers, and dashes, and must contain at least one lowercase letter. Examples: com-123-xxx, 123pan, pan123, weread, we-read.`;
-        const DEFAULT_NAME_ERROR = `✕ Name should only include letters and numbers, and dashes (dashes must not at the beginning), and must contain at least one letter. Examples: 123pan, 123Pan, Pan123, weread, WeRead, WERead, we-read.`;
+        const LINUX_NAME_ERROR = `✕ Name should only include lowercase letters, numbers, and dashes (not leading dashes). Examples: com-123-xxx, 123pan, pan123, weread, we-read, 123.`;
+        const DEFAULT_NAME_ERROR = `✕ Name should only include letters, numbers, dashes, and spaces (not leading dashes and spaces). Examples: 123pan, 123Pan, Pan123, weread, WeRead, WERead, we-read, We Read, 123.`;
         const errorMsg = platform === 'linux' ? LINUX_NAME_ERROR : DEFAULT_NAME_ERROR;
         logger.error(errorMsg);
         if (isActions) {
@@ -221,13 +342,13 @@ async function handleOptions(options, url) {
         name,
         identifier: getIdentifier(url),
     };
-    appOptions.icon = await handleIcon(appOptions);
+    appOptions.icon = await handleIcon(appOptions, url);
     return appOptions;
 }
 
 var windows = [
 	{
-		url: "https://weread.qq.com",
+		url: "https://weekly.tw93.fun/",
 		url_type: "web",
 		hide_title_bar: true,
 		fullscreen: false,
@@ -237,7 +358,9 @@ var windows = [
 		always_on_top: false,
 		dark_mode: false,
 		activation_shortcut: "",
-		disabled_web_shortcuts: false
+		disabled_web_shortcuts: false,
+		hide_on_close: true,
+		incognito: false
 	}
 ];
 var user_agent = {
@@ -263,13 +386,13 @@ var pakeConf = {
 	proxy_url: proxy_url
 };
 
-var productName$1 = "WeRead";
-var identifier = "com.pake.weread";
+var productName$1 = "Weekly";
+var identifier = "com.pake.weekly";
 var version = "1.0.0";
 var app = {
 	withGlobalTauri: true,
 	trayIcon: {
-		iconPath: "png/weread_512.png",
+		iconPath: "png/weekly_512.png",
 		iconAsTemplate: false,
 		id: "pake-tray"
 	}
@@ -287,12 +410,12 @@ var CommonConf = {
 
 var bundle$2 = {
 	icon: [
-		"png/weread_256.ico",
-		"png/weread_32.ico"
+		"png/weekly_256.ico",
+		"png/weekly_32.ico"
 	],
 	active: true,
 	resources: [
-		"png/weread_32.ico"
+		"png/weekly_32.ico"
 	],
 	targets: [
 		"msi"
@@ -313,7 +436,7 @@ var WinConf = {
 
 var bundle$1 = {
 	icon: [
-		"icons/weread.icns"
+		"icons/weekly.icns"
 	],
 	active: true,
 	macOS: {
@@ -326,10 +449,10 @@ var MacConf = {
 	bundle: bundle$1
 };
 
-var productName = "we-read";
+var productName = "weekly";
 var bundle = {
 	icon: [
-		"png/weread_512.png"
+		"png/weekly_512.png"
 	],
 	active: true,
 	linux: {
@@ -339,7 +462,7 @@ var bundle = {
 				"wget"
 			],
 			files: {
-				"/usr/share/applications/com-pake-weread.desktop": "assets/com-pake-weread.desktop"
+				"/usr/share/applications/com-pake-weekly.desktop": "assets/com-pake-weekly.desktop"
 			}
 		}
 	},
@@ -374,16 +497,23 @@ let tauriConfig = {
     pake: pakeConf,
 };
 
-async function shellExec(command) {
+async function shellExec(command, timeout = 300000) {
     try {
         const { exitCode } = await execa(command, {
             cwd: npmDirectory,
-            stdio: 'inherit'
+            stdio: 'inherit',
+            shell: true,
+            timeout,
         });
         return exitCode;
     }
     catch (error) {
-        throw new Error(`Error occurred while executing command "${command}". Exit code: ${error.exitCode}`);
+        const exitCode = error.exitCode ?? 'unknown';
+        const errorMessage = error.message || 'Unknown error occurred';
+        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}`);
     }
 }
 
@@ -394,12 +524,12 @@ const ping = async (host) => {
     const start = new Date();
     // Prevent timeouts from affecting user experience.
     const requestPromise = new Promise((resolve, reject) => {
-        const req = http.get(`http://${ip.address}`, res => {
+        const req = http.get(`http://${ip.address}`, (res) => {
             const delay = new Date().getTime() - start.getTime();
             res.resume();
             resolve(delay);
         });
-        req.on('error', err => {
+        req.on('error', (err) => {
             reject(err);
         });
     });
@@ -461,21 +591,42 @@ function checkRustInstalled() {
 }
 
 async function combineFiles(files, output) {
-    const contents = files.map(file => {
+    const contents = files.map((file) => {
         const fileContent = fs.readFileSync(file);
         if (file.endsWith('.css')) {
             return ("window.addEventListener('DOMContentLoaded', (_event) => { const css = `" +
                 fileContent +
                 "`; const style = document.createElement('style'); style.innerHTML = css; document.head.appendChild(style); });");
         }
-        return "window.addEventListener('DOMContentLoaded', (_event) => { " + fileContent + ' });';
+        return ("window.addEventListener('DOMContentLoaded', (_event) => { " +
+            fileContent +
+            ' });');
     });
     fs.writeFileSync(output, contents.join('\n'));
     return files;
 }
 
 async function mergeConfig(url, options, tauriConf) {
-    const { width, height, fullscreen, hideTitleBar, alwaysOnTop, appVersion, darkMode, disabledWebShortcuts, activationShortcut, userAgent, showSystemTray, systemTrayIcon, useLocalFile, identifier, name, resizable = true, inject, proxyUrl, installerLanguage, } = options;
+    // Ensure .pake directory exists and copy source templates if needed
+    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',
+        'tauri.windows.conf.json',
+        'tauri.linux.conf.json',
+        'pake.json',
+    ];
+    await Promise.all(sourceFiles.map(async (file) => {
+        const sourcePath = path.join(srcTauriDir, file);
+        const destPath = path.join(tauriConfigDirectory, file);
+        if ((await fsExtra.pathExists(sourcePath)) &&
+            !(await fsExtra.pathExists(destPath))) {
+            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, } = options;
     const { platform } = process;
     // Set Windows parameters.
     const tauriConfWindowOptions = {
@@ -488,6 +639,9 @@ async function mergeConfig(url, options, tauriConf) {
         always_on_top: alwaysOnTop,
         dark_mode: darkMode,
         disabled_web_shortcuts: disabledWebShortcuts,
+        hide_on_close: hideOnClose,
+        incognito: incognito,
+        title: title || null,
     };
     Object.assign(tauriConf.pake.windows[0], { url, ...tauriConfWindowOptions });
     tauriConf.productName = name;
@@ -515,7 +669,7 @@ async function mergeConfig(url, options, tauriConf) {
             // 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))));
+            await Promise.all(filesToCopyBack.map((file) => fsExtra.copy(path.join(distBakDir, file), path.join(distDir, file))));
         }
         tauriConf.pake.windows[0].url = fileName;
         tauriConf.pake.windows[0].url_type = 'local';
@@ -619,11 +773,11 @@ async function mergeConfig(url, options, tauriConf) {
     const injectFilePath = path.join(npmDirectory, `src-tauri/src/inject/custom.js`);
     // inject js or css files
     if (inject?.length > 0) {
-        if (!inject.every(item => item.endsWith('.css') || item.endsWith('.js'))) {
+        if (!inject.every((item) => item.endsWith('.css') || item.endsWith('.js'))) {
             logger.error('The injected file must be in either CSS or JS format.');
             return;
         }
-        const files = inject.map(filepath => (path.isAbsolute(filepath) ? filepath : path.join(process.cwd(), filepath)));
+        const files = inject.map((filepath) => path.isAbsolute(filepath) ? filepath : path.join(process.cwd(), filepath));
         tauriConf.pake.inject = files;
         await combineFiles(files, injectFilePath);
     }
@@ -685,14 +839,21 @@ class BaseBuilder {
         const rustProjectDir = path.join(tauriSrcPath, '.cargo');
         const projectConf = path.join(rustProjectDir, 'config.toml');
         await fsExtra.ensureDir(rustProjectDir);
+        // For global CLI installation, always use npm
+        const packageManager = 'npm';
+        const registryOption = isChina
+            ? ' --registry=https://registry.npmmirror.com'
+            : '';
+        // Windows环境下需要更长的超时时间
+        const timeout = process.platform === 'win32' ? 600000 : 300000;
         if (isChina) {
             logger.info('✺ Located in China, using npm/rsProxy CN mirror.');
             const projectCnConf = path.join(tauriSrcPath, 'rust_proxy.toml');
             await fsExtra.copy(projectCnConf, projectConf);
-            await shellExec(`cd "${npmDirectory}" && npm install --registry=https://registry.npmmirror.com`);
+            await shellExec(`cd "${npmDirectory}" && ${packageManager} install${registryOption}`, timeout);
         }
         else {
-            await shellExec(`cd "${npmDirectory}" && npm install`);
+            await shellExec(`cd "${npmDirectory}" && ${packageManager} install`, timeout);
         }
         spinner.succeed(chalk.green('Package installed!'));
         if (!tauriTargetPathExists) {
@@ -726,25 +887,66 @@ class BaseBuilder {
         return target;
     }
     getBuildCommand() {
-        // the debug option should support `--debug` and `--release`
-        return this.options.debug ? 'npm run build:debug' : 'npm run build';
+        const baseCommand = this.options.debug
+            ? 'npm run build:debug'
+            : 'npm run build';
+        // Use temporary config directory to avoid modifying source files
+        const configPath = path.join(npmDirectory, 'src-tauri', '.pake', 'tauri.conf.json');
+        let fullCommand = `${baseCommand} -- -c "${configPath}"`;
+        // For macOS, use app bundles by default unless DMG is explicitly requested
+        if (IS_MAC && this.options.targets === 'app') {
+            fullCommand += ' --bundles app';
+        }
+        // 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';
+            }
+        }
+        return fullCommand;
+    }
+    getMacOSMajorVersion() {
+        try {
+            const os = require('os');
+            const release = os.release();
+            const majorVersion = parseInt(release.split('.')[0], 10);
+            return majorVersion;
+        }
+        catch (error) {
+            return 0; // Disable proxy feature if version detection fails
+        }
     }
     getBasePath() {
         const basePath = this.options.debug ? 'debug' : 'release';
         return `src-tauri/target/${basePath}/bundle/`;
     }
     getBuildAppPath(npmDirectory, fileName, fileType) {
-        return path.join(npmDirectory, this.getBasePath(), fileType.toLowerCase(), `${fileName}.${fileType}`);
+        // For app bundles on macOS, the directory is 'macos', not 'app'
+        const bundleDir = fileType.toLowerCase() === 'app' ? 'macos' : fileType.toLowerCase();
+        return path.join(npmDirectory, this.getBasePath(), bundleDir, `${fileName}.${fileType}`);
     }
 }
 
 class MacBuilder extends BaseBuilder {
     constructor(options) {
         super(options);
-        this.options.targets = 'dmg';
+        // Use DMG by default for distribution
+        // Only create app bundles for testing to avoid user interaction
+        if (process.env.PAKE_CREATE_APP === '1') {
+            this.options.targets = 'app';
+        }
+        else {
+            this.options.targets = 'dmg';
+        }
     }
     getFileName() {
         const { name } = this.options;
+        // For app bundles, use simple name without version/arch
+        if (this.options.targets === 'app') {
+            return name;
+        }
+        // For DMG files, use versioned filename
         let arch;
         if (this.options.multiArch) {
             arch = 'universal';
@@ -755,7 +957,9 @@ class MacBuilder extends BaseBuilder {
         return `${name}_${tauriConfig.version}_${arch}`;
     }
     getBuildCommand() {
-        return this.options.multiArch ? 'npm run build:mac' : super.getBuildCommand();
+        return this.options.multiArch
+            ? 'npm run build:mac'
+            : super.getBuildCommand();
     }
     getBasePath() {
         return this.options.multiArch