pake-cli 3.3.5 → 3.3.7-beta

package/README.md

@@ -434,6 +434,13 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Jiaqi Gu</b></sub>
                 </a>
             </td>
+            <td align="center">
+                <a href="https://github.com/JohannLai">
+                    <img src="https://avatars.githubusercontent.com/u/10769405?v=4" width="90;" alt="JohannLai"/>
+                    <br />
+                    <sub><b>Johannlai</b></sub>
+                </a>
+            </td>
             <td align="center">
                 <a href="https://github.com/Jason6987">
                     <img src="https://avatars.githubusercontent.com/u/140222795?v=4" width="90;" alt="Jason6987"/>
@@ -441,6 +448,8 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Luminall</b></sub>
                 </a>
             </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/Milo123459">
                     <img src="https://avatars.githubusercontent.com/u/50248166?v=4" width="90;" alt="Milo123459"/>
@@ -448,8 +457,6 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Milo</b></sub>
                 </a>
             </td>
-		</tr>
-		<tr>
             <td align="center">
                 <a href="https://github.com/princemaple">
                     <img src="https://avatars.githubusercontent.com/u/1329716?v=4" width="90;" alt="princemaple"/>
@@ -492,6 +499,8 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Null</b></sub>
                 </a>
             </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/liudonghua123">
                     <img src="https://avatars.githubusercontent.com/u/2276718?v=4" width="90;" alt="liudonghua123"/>
@@ -499,8 +508,6 @@ Pake's development can not be without these Hackers. They contributed a lot of c
                     <sub><b>Liudonghua</b></sub>
                 </a>
             </td>
-		</tr>
-		<tr>
             <td align="center">
                 <a href="https://github.com/liusishan">
                     <img src="https://avatars.githubusercontent.com/u/33129823?v=4" width="90;" alt="liusishan"/>

package/dist/cli.js

@@ -22,7 +22,7 @@ import sharp from 'sharp';
 import * as psl from 'psl';
 
 var name = "pake-cli";
-var version = "3.3.5";
+var version = "3.3.7-beta";
 var description = "🤱🏻 Turn any webpage into a desktop app with one command. 🤱🏻 一键打包网页生成轻量桌面应用。";
 var engines = {
 	node: ">=18.0.0"
@@ -328,6 +328,40 @@ async function combineFiles(files, output) {
     return files;
 }
 
+function generateSafeFilename(name) {
+    return name
+        .replace(/[<>:"/\\|?*]/g, '_')
+        .replace(/\s+/g, '_')
+        .replace(/\.+$/g, '')
+        .slice(0, 255);
+}
+function generateLinuxPackageName(name) {
+    return name
+        .toLowerCase()
+        .replace(/[^a-z0-9\u4e00-\u9fff]+/g, '-')
+        .replace(/^-+|-+$/g, '')
+        .replace(/-+/g, '-');
+}
+function generateIdentifierSafeName(name) {
+    const cleaned = name
+        .replace(/[^a-zA-Z0-9\u4e00-\u9fff]/g, '')
+        .toLowerCase();
+    if (cleaned === '') {
+        const fallback = Array.from(name)
+            .map(char => {
+            const code = char.charCodeAt(0);
+            if ((code >= 48 && code <= 57) || (code >= 65 && code <= 90) || (code >= 97 && code <= 122)) {
+                return char.toLowerCase();
+            }
+            return code.toString(16);
+        })
+            .join('')
+            .slice(0, 50);
+        return fallback || 'pake-app';
+    }
+    return cleaned;
+}
+
 async function mergeConfig(url, options, tauriConf) {
     // Ensure .pake directory exists and copy source templates if needed
     const srcTauriDir = path.join(npmDirectory, 'src-tauri');
@@ -372,7 +406,7 @@ async function mergeConfig(url, options, tauriConf) {
     tauriConf.identifier = identifier;
     tauriConf.version = appVersion;
     if (platform === 'linux') {
-        tauriConf.mainBinaryName = `pake-${name.toLowerCase()}`;
+        tauriConf.mainBinaryName = `pake-${generateIdentifierSafeName(name)}`;
     }
     if (platform == 'win32') {
         tauriConf.bundle.windows.wix.language[0] = installerLanguage;
@@ -418,8 +452,8 @@ async function mergeConfig(url, options, tauriConf) {
         // Remove hardcoded desktop files and regenerate with correct app name
         delete tauriConf.bundle.linux.deb.files;
         // Generate correct desktop file configuration
-        const appNameLower = name.toLowerCase();
-        const identifier = `com.pake.${appNameLower}`;
+        const appNameSafe = generateSafeFilename(name).toLowerCase();
+        const identifier = `com.pake.${appNameSafe}`;
         const desktopFileName = `${identifier}.desktop`;
         // Create desktop file content
         const desktopContent = `[Desktop Entry]
@@ -427,8 +461,8 @@ Version=1.0
 Type=Application
 Name=${name}
 Comment=${name}
-Exec=pake-${appNameLower}
-Icon=${appNameLower}_512
+Exec=pake-${appNameSafe}
+Icon=${appNameSafe}_512
 Categories=Network;WebBrowser;
 MimeType=text/html;text/xml;application/xhtml_xml;
 StartupNotify=true
@@ -472,28 +506,29 @@ StartupNotify=true
     const platformIconMap = {
         win32: {
             fileExt: '.ico',
-            path: `png/${name.toLowerCase()}_256.ico`,
+            path: `png/${generateSafeFilename(name).toLowerCase()}_256.ico`,
             defaultIcon: 'png/icon_256.ico',
             message: 'Windows icon must be .ico and 256x256px.',
         },
         linux: {
             fileExt: '.png',
-            path: `png/${name.toLowerCase()}_512.png`,
+            path: `png/${generateSafeFilename(name).toLowerCase()}_512.png`,
             defaultIcon: 'png/icon_512.png',
             message: 'Linux icon must be .png and 512x512px.',
         },
         darwin: {
             fileExt: '.icns',
-            path: `icons/${name.toLowerCase()}.icns`,
+            path: `icons/${generateSafeFilename(name).toLowerCase()}.icns`,
             defaultIcon: 'icons/icon.icns',
             message: 'macOS icon must be .icns type.',
         },
     };
     const iconInfo = platformIconMap[platform];
-    const exists = options.icon && (await fsExtra.pathExists(options.icon));
+    const resolvedIconPath = options.icon ? path.resolve(options.icon) : null;
+    const exists = resolvedIconPath && (await fsExtra.pathExists(resolvedIconPath));
     if (exists) {
         let updateIconPath = true;
-        let customIconExt = path.extname(options.icon).toLowerCase();
+        let customIconExt = path.extname(resolvedIconPath).toLowerCase();
         if (customIconExt !== iconInfo.fileExt) {
             updateIconPath = false;
             logger.warn(`✼ ${iconInfo.message}, but you give ${customIconExt}`);
@@ -503,10 +538,9 @@ StartupNotify=true
             const iconPath = path.join(npmDirectory, 'src-tauri/', iconInfo.path);
             tauriConf.bundle.resources = [iconInfo.path];
             // 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 (resolvedIconPath !== absoluteDestPath) {
+                await fsExtra.copy(resolvedIconPath, iconPath);
             }
         }
         if (updateIconPath) {
@@ -528,8 +562,8 @@ StartupNotify=true
             // 需要判断图标格式，默认只支持ico和png两种
             let iconExt = path.extname(systemTrayIcon).toLowerCase();
             if (iconExt == '.png' || iconExt == '.ico') {
-                const trayIcoPath = path.join(npmDirectory, `src-tauri/png/${name.toLowerCase()}${iconExt}`);
-                trayIconPath = `png/${name.toLowerCase()}${iconExt}`;
+                const trayIcoPath = path.join(npmDirectory, `src-tauri/png/${generateSafeFilename(name).toLowerCase()}${iconExt}`);
+                trayIconPath = `png/${generateSafeFilename(name).toLowerCase()}${iconExt}`;
                 await fsExtra.copy(systemTrayIcon, trayIcoPath);
             }
             else {
@@ -854,7 +888,7 @@ class BaseBuilder {
         const extension = process.platform === 'win32' ? '.exe' : '';
         // Linux uses the unique binary name we set in merge.ts
         if (process.platform === 'linux') {
-            return `pake-${appName.toLowerCase()}${extension}`;
+            return `pake-${generateIdentifierSafeName(appName)}${extension}`;
         }
         // Windows and macOS use 'pake' as binary name
         return `pake${extension}`;
@@ -1169,12 +1203,11 @@ 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 = appName.toLowerCase().replace(/[^a-z0-9-_]/g, '_');
-    const baseName = isDefault ? 'icon' : safeName;
+    const safeName = isDefault
+        ? 'icon'
+        : generateSafeFilename(appName).toLowerCase();
+    const baseName = safeName;
     if (IS_WIN) {
         return path.join(npmDirectory, 'src-tauri', 'png', `${baseName}_256.ico`);
     }
@@ -1237,7 +1270,7 @@ async function convertIconFormat(inputPath, appName) {
         const platformOutputDir = path.join(outputDir, 'converted-icons');
         await fsExtra.ensureDir(platformOutputDir);
         const processedInputPath = await preprocessIcon(inputPath);
-        const iconName = appName.toLowerCase();
+        const iconName = generateSafeFilename(appName).toLowerCase();
         // Generate platform-specific format
         if (IS_WIN) {
             // Support multiple sizes for better Windows compatibility
@@ -1513,8 +1546,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\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;
     return !!name && reg.test(name);
@@ -1530,10 +1563,8 @@ 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, '-');
+        name = generateLinuxPackageName(name);
     }
     if (!isValidName(name, platform)) {
         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.`;
@@ -1643,8 +1674,17 @@ program
     .addOption(new Option('--system-tray-icon <string>', 'Custom system tray icon')
     .default(DEFAULT_PAKE_OPTIONS.systemTrayIcon)
     .hideHelp())
-    .addOption(new Option('--hide-on-close', 'Hide window on close instead of exiting (default: true for macOS, false for others)')
+    .addOption(new Option('--hide-on-close [boolean]', 'Hide window on close instead of exiting (default: true for macOS, false for others)')
     .default(DEFAULT_PAKE_OPTIONS.hideOnClose)
+    .argParser((value) => {
+    if (value === undefined)
+        return true; // --hide-on-close without value
+    if (value === 'true')
+        return true;
+    if (value === 'false')
+        return false;
+    throw new Error('--hide-on-close must be true or false');
+})
     .hideHelp())
     .addOption(new Option('--title <string>', 'Window title').hideHelp())
     .addOption(new Option('--incognito', 'Launch app in incognito/private mode')

package/package.json

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

package/src-tauri/.cargo/config.toml

@@ -8,9 +8,3 @@ registry = "sparse+https://rsproxy.cn/index/"
 index = "https://rsproxy.cn/crates.io-index"
 [net]
 git-fetch-with-cli = true
-
-[env]
-# Fix for macOS 26 Beta compatibility issues
-# Forces use of compatible SDK when building on macOS 26 Beta
-MACOSX_DEPLOYMENT_TARGET = "15.5"
-SDKROOT = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.5.sdk"

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

@@ -1,12 +1,12 @@
 {
     "windows": [
         {
-            "url": "https://weekly.tw93.fun",
+            "url": "https://github.com",
             "url_type": "web",
-            "hide_title_bar": false,
+            "hide_title_bar": true,
             "fullscreen": false,
             "width": 1200,
-            "height": 780,
+            "height": 800,
             "resizable": true,
             "always_on_top": false,
             "dark_mode": false,

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

@@ -1,6 +1,6 @@
 {
-    "productName": "TestWorkflow",
-    "identifier": "com.pake.33f03a",
+    "productName": "GitHubMultiArch",
+    "identifier": "com.pake.3097fc",
     "version": "1.0.0",
     "app": {
         "withGlobalTauri": true,
@@ -13,14 +13,14 @@
     },
     "bundle": {
         "icon": [
-            "icons/testworkflow.icns"
+            "icons/githubmultiarch.icns"
         ],
         "active": true,
         "targets": [
-            "dmg"
+            "app"
         ],
         "resources": [
-            "icons/testworkflow.icns"
+            "icons/githubmultiarch.icns"
         ]
     }
 }

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

@@ -1,14 +1,14 @@
 {
     "bundle": {
         "icon": [
-            "icons/testworkflow.icns"
+            "icons/githubmultiarch.icns"
         ],
         "active": true,
         "targets": [
-            "dmg"
+            "app"
         ],
         "resources": [
-            "icons/testworkflow.icns"
+            "icons/githubmultiarch.icns"
         ]
     }
 }

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

@@ -252,40 +252,52 @@ document.addEventListener("DOMContentLoaded", () => {
   }
 
   function downloadFromDataUri(dataURI, filename) {
-    const byteString = atob(dataURI.split(",")[1]);
-    // write the bytes of the string to an ArrayBuffer
-    const bufferArray = new ArrayBuffer(byteString.length);
-
-    // create a view into the buffer
-    const binary = new Uint8Array(bufferArray);
+    try {
+      const byteString = atob(dataURI.split(",")[1]);
+      // write the bytes of the string to an ArrayBuffer
+      const bufferArray = new ArrayBuffer(byteString.length);
 
-    // set the bytes of the buffer to the correct values
-    for (let i = 0; i < byteString.length; i++) {
-      binary[i] = byteString.charCodeAt(i);
-    }
+      // create a view into the buffer
+      const binary = new Uint8Array(bufferArray);
 
-    // write the ArrayBuffer to a binary, and you're done
-    const userLanguage = navigator.language || navigator.userLanguage;
-    invoke("download_file_by_binary", {
-      params: {
-        filename,
-        binary: Array.from(binary),
-        language: userLanguage,
-      },
-    });
-  }
+      // set the bytes of the buffer to the correct values
+      for (let i = 0; i < byteString.length; i++) {
+        binary[i] = byteString.charCodeAt(i);
+      }
 
-  function downloadFromBlobUrl(blobUrl, filename) {
-    convertBlobUrlToBinary(blobUrl).then((binary) => {
+      // write the ArrayBuffer to a binary, and you're done
       const userLanguage = navigator.language || navigator.userLanguage;
       invoke("download_file_by_binary", {
         params: {
           filename,
-          binary,
+          binary: Array.from(binary),
           language: userLanguage,
         },
+      }).catch((error) => {
+        console.error("Failed to download data URI file:", filename, error);
+      });
+    } catch (error) {
+      console.error("Failed to process data URI:", dataURI, error);
+    }
+  }
+
+  function downloadFromBlobUrl(blobUrl, filename) {
+    convertBlobUrlToBinary(blobUrl)
+      .then((binary) => {
+        const userLanguage = navigator.language || navigator.userLanguage;
+        invoke("download_file_by_binary", {
+          params: {
+            filename,
+            binary,
+            language: userLanguage,
+          },
+        }).catch((error) => {
+          console.error("Failed to download blob file:", filename, error);
+        });
+      })
+      .catch((error) => {
+        console.error("Failed to convert blob to binary:", blobUrl, error);
       });
-    });
   }
 
   // detect blob download by createElement("a")
@@ -323,8 +335,16 @@ document.addEventListener("DOMContentLoaded", () => {
     anchorElement.download || e.metaKey || e.ctrlKey || isDownloadableFile(url);
 
   const handleExternalLink = (url) => {
+    // Don't try to open blob: or data: URLs with shell
+    if (isSpecialDownload(url)) {
+      console.warn("Cannot open special URL with shell:", url);
+      return;
+    }
+
     invoke("plugin:shell|open", {
       path: url,
+    }).catch((error) => {
+      console.error("Failed to open URL with shell:", url, error);
     });
   };
 
@@ -351,6 +371,10 @@ document.addEventListener("DOMContentLoaded", () => {
   };
 
   const detectAnchorElementClick = (e) => {
+    // Safety check: ensure e.target exists and is an Element with closest method
+    if (!e.target || typeof e.target.closest !== "function") {
+      return;
+    }
     const anchorElement = e.target.closest("a");
 
     if (anchorElement && anchorElement.href) {
@@ -701,7 +725,10 @@ document.addEventListener("DOMContentLoaded", () => {
     }
 
     // Check for parent elements with background images
-    const parentWithBg = target.closest('[style*="background-image"]');
+    const parentWithBg =
+      target && typeof target.closest === "function"
+        ? target.closest('[style*="background-image"]')
+        : null;
     if (parentWithBg) {
       const bgImage = parentWithBg.style.backgroundImage;
       const urlMatch = bgImage.match(/url\(["']?([^"')]+)["']?\)/);
@@ -770,7 +797,10 @@ document.addEventListener("DOMContentLoaded", () => {
       const mediaInfo = getMediaInfo(target);
 
       // Check for links (but not if it's media)
-      const linkElement = target.closest("a");
+      const linkElement =
+        target && typeof target.closest === "function"
+          ? target.closest("a")
+          : null;
       const isLink = linkElement && linkElement.href && !mediaInfo.isMedia;
 
       // Only show custom menu for media or links