pake-cli 2.3.6 → 2.3.8

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Tw93
+Copyright (c) 2024 Tw93
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -76,7 +76,7 @@
       </td>
     </tr>
     <tr>
-        <td><img src=https://cdn.fliggy.com/upic/3UREAw.png width=600/></td>
+        <td><img src=https://raw.githubusercontent.com/tw93/static/master/pic/12.png width=600/></td>
         <td><img src=https://gw.alipayobjects.com/zos/k/pn/1.jpg width=600/></td>
     </tr>
     <tr>
@@ -135,7 +135,7 @@
 <br/>
 
 | Mac                         | Windows/Linux                  | Function                      |
-|-----------------------------|--------------------------------|-------------------------------|
+| --------------------------- | ------------------------------ | ----------------------------- |
 | <kbd>⌘</kbd> + <kbd>[</kbd> | <kbd>Ctrl</kbd> + <kbd>←</kbd> | Return to the previous page   |
 | <kbd>⌘</kbd> + <kbd>]</kbd> | <kbd>Ctrl</kbd> + <kbd>→</kbd> | Go to the next page           |
 | <kbd>⌘</kbd> + <kbd>↑</kbd> | <kbd>Ctrl</kbd> + <kbd>↑</kbd> | Auto scroll to top of page    |
@@ -153,7 +153,7 @@ In addition, double-click the title bar to switch to full-screen mode. For Mac u
 
 ## Before starting
 
-1. **For beginners**: Play with Popular Packages to find out Pake's capabilities, or try to pack your application with [GitHub Actions](https://github.com/tw93/Pake/wiki/Online-Compilation-(used-by-ordinary-users)). Don't hesitate to reach for assistance at [Discussion](https://github.com/tw93/Pake/discussions)!
+1. **For beginners**: Play with Popular Packages to find out Pake's capabilities, or try to pack your application with [GitHub Actions](<https://github.com/tw93/Pake/wiki/Online-Compilation-(used-by-ordinary-users)>). Don't hesitate to reach for assistance at [Discussion](https://github.com/tw93/Pake/discussions)!
 2. **For developers**: “Command-Line Packaging” supports macOS fully. For Windows/Linux users, it requires some tinkering. [Configure your environment](https://tauri.app/v1/guides/getting-started/prerequisites) before getting started.
 3. **For hackers**: For people who are good at both front-end development and Rust, how about customizing your apps' function more with the following [Customized Development](#development)?
 
@@ -174,7 +174,7 @@ pake url [OPTIONS]...
 pake https://weekly.tw93.fun --name Weekly --transparent
 ```
 
-If you are new to the command line, you can compile packages online with _GitHub Actions_. See the [Tutorial](https://github.com/tw93/Pake/wiki/Online-Compilation-(used-by-ordinary-users)) for more information.
+If you are new to the command line, you can compile packages online with _GitHub Actions_. See the [Tutorial](<https://github.com/tw93/Pake/wiki/Online-Compilation-(used-by-ordinary-users)>) for more information.
 
 ## Development
 
@@ -196,7 +196,7 @@ npm run build
 ## Advanced Usage
 
 1. You can refer to the [codebase structure](https://github.com/tw93/Pake/wiki/Description-of-Pake's-code-structure) before working on Pake, which will help you much in development.
-2. Modify the `url` and `productName` fields in the `pake.json` file under the src-tauri directory, the "domain" field in the `tauri.config.json` file needs to be modified synchronously, as well as the `icon` and `identifier` fields in the `tauri.xxx.conf.json` file. You can select a `icon` from the `icons` directory or download one from [macOSicons](https://macosicons.com/#/) to match your product needs.
+2. Modify the `url` and `productName` fields in the `pake.json` file under the src-tauri directory, the "domain" field in the `tauri.config.json` file needs to be modified synchronously, as well as the `icon` and `identifier` fields in the `tauri.xxx.conf.json` file. You can select an `icon` from the `icons` directory or download one from [macOSicons](https://macosicons.com/#/) to match your product needs.
 3. For configurations on window properties, you can modify the `pake.json` file to change the value of `width`, `height`, `fullscreen` (or not), `resizable` (or not) of the `windows` property. To adapt to the immersive header on Mac, change `transparent` to `true`, look for the `Header` element, and add the `padding-top` property.
 4. For advanced usages such as style rewriting, advertisement removal, JS injection, container message communication, and user-defined shortcut keys, see [Advanced Usage of Pake](https://github.com/tw93/Pake/wiki/Advanced-Usage-of-Pake).
 
@@ -279,67 +279,74 @@ Pake's development can not be without these Hackers. They contributed a lot of c
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/QingZ11">
-            <img src="https://avatars.githubusercontent.com/u/38887077?v=4" width="90;" alt="QingZ11"/>
+        <a href="https://github.com/exposir">
+            <img src="https://avatars.githubusercontent.com/u/33340988?v=4" width="90;" alt="exposir"/>
             <br />
-            <sub><b>Steam</b></sub>
+            <sub><b>孟世博</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/exposir">
-            <img src="https://avatars.githubusercontent.com/u/33340988?v=4" width="90;" alt="exposir"/>
+        <a href="https://github.com/QingZ11">
+            <img src="https://avatars.githubusercontent.com/u/38887077?v=4" width="90;" alt="QingZ11"/>
             <br />
-            <sub><b>孟世博</b></sub>
+            <sub><b>Steam</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/2nthony">
-            <img src="https://avatars.githubusercontent.com/u/19513289?v=4" width="90;" alt="2nthony"/>
+        <a href="https://github.com/hetz">
+            <img src="https://avatars.githubusercontent.com/u/820141?v=4" width="90;" alt="hetz"/>
             <br />
-            <sub><b>2nthony</b></sub>
+            <sub><b>贺天卓</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/ACGNnsj">
-            <img src="https://avatars.githubusercontent.com/u/22112141?v=4" width="90;" alt="ACGNnsj"/>
+        <a href="https://github.com/piaoyidage">
+            <img src="https://avatars.githubusercontent.com/u/5135405?v=4" width="90;" alt="piaoyidage"/>
             <br />
-            <sub><b>Null</b></sub>
+            <sub><b>Ranger</b></sub>
         </a>
     </td></tr>
 <tr>
     <td align="center">
-        <a href="https://github.com/imabutahersiddik">
-            <img src="https://avatars.githubusercontent.com/u/138387257?v=4" width="90;" alt="imabutahersiddik"/>
+        <a href="https://github.com/liusishan">
+            <img src="https://avatars.githubusercontent.com/u/33129823?v=4" width="90;" alt="liusishan"/>
             <br />
-            <sub><b>Abu Taher Siddik</b></sub>
+            <sub><b>Liusishan</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/kidylee">
-            <img src="https://avatars.githubusercontent.com/u/841310?v=4" width="90;" alt="kidylee"/>
+        <a href="https://github.com/liudonghua123">
+            <img src="https://avatars.githubusercontent.com/u/2276718?v=4" width="90;" alt="liudonghua123"/>
             <br />
-            <sub><b>An Li</b></sub>
+            <sub><b>Liudonghua</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/nekomeowww">
-            <img src="https://avatars.githubusercontent.com/u/11081491?v=4" width="90;" alt="nekomeowww"/>
+        <a href="https://github.com/lakca">
+            <img src="https://avatars.githubusercontent.com/u/16255922?v=4" width="90;" alt="lakca"/>
             <br />
-            <sub><b>Ayaka Neko</b></sub>
+            <sub><b>Null</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/turkyden">
-            <img src="https://avatars.githubusercontent.com/u/24560160?v=4" width="90;" alt="turkyden"/>
+        <a href="https://github.com/houhoz">
+            <img src="https://avatars.githubusercontent.com/u/19684376?v=4" width="90;" alt="houhoz"/>
             <br />
-            <sub><b>Dengju Deng</b></sub>
+            <sub><b>Hyzhao</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/Fechin">
-            <img src="https://avatars.githubusercontent.com/u/2541482?v=4" width="90;" alt="Fechin"/>
+        <a href="https://github.com/geekvest">
+            <img src="https://avatars.githubusercontent.com/u/126322776?v=4" width="90;" alt="geekvest"/>
             <br />
-            <sub><b>Fechin</b></sub>
+            <sub><b>Null</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/princemaple">
+            <img src="https://avatars.githubusercontent.com/u/1329716?v=4" width="90;" alt="princemaple"/>
+            <br />
+            <sub><b>Po Chen</b></sub>
         </a>
     </td>
     <td align="center">
@@ -348,53 +355,72 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <br />
             <sub><b>Milo</b></sub>
         </a>
+    </td></tr>
+<tr>
+    <td align="center">
+        <a href="https://github.com/eltociear">
+            <img src="https://avatars.githubusercontent.com/u/22633385?v=4" width="90;" alt="eltociear"/>
+            <br />
+            <sub><b>Ikko Eltociear Ashimine</b></sub>
+        </a>
     </td>
     <td align="center">
-        <a href="https://github.com/princemaple">
-            <img src="https://avatars.githubusercontent.com/u/1329716?v=4" width="90;" alt="princemaple"/>
+        <a href="https://github.com/Fechin">
+            <img src="https://avatars.githubusercontent.com/u/2541482?v=4" width="90;" alt="Fechin"/>
             <br />
-            <sub><b>Po Chen</b></sub>
+            <sub><b>Fechin</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
-        <a href="https://github.com/houhoz">
-            <img src="https://avatars.githubusercontent.com/u/19684376?v=4" width="90;" alt="houhoz"/>
+        <a href="https://github.com/turkyden">
+            <img src="https://avatars.githubusercontent.com/u/24560160?v=4" width="90;" alt="turkyden"/>
             <br />
-            <sub><b>Hyzhao</b></sub>
+            <sub><b>Dengju Deng</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/lakca">
-            <img src="https://avatars.githubusercontent.com/u/16255922?v=4" width="90;" alt="lakca"/>
+        <a href="https://github.com/nekomeowww">
+            <img src="https://avatars.githubusercontent.com/u/11081491?v=4" width="90;" alt="nekomeowww"/>
             <br />
-            <sub><b>Null</b></sub>
+            <sub><b>Ayaka Neko</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/liusishan">
-            <img src="https://avatars.githubusercontent.com/u/33129823?v=4" width="90;" alt="liusishan"/>
+        <a href="https://github.com/kidylee">
+            <img src="https://avatars.githubusercontent.com/u/841310?v=4" width="90;" alt="kidylee"/>
             <br />
-            <sub><b>Liusishan</b></sub>
+            <sub><b>An Li</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/piaoyidage">
-            <img src="https://avatars.githubusercontent.com/u/5135405?v=4" width="90;" alt="piaoyidage"/>
+        <a href="https://github.com/imabutahersiddik">
+            <img src="https://avatars.githubusercontent.com/u/138387257?v=4" width="90;" alt="imabutahersiddik"/>
             <br />
-            <sub><b>Ranger</b></sub>
+            <sub><b>Abu Taher Siddik</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/hetz">
-            <img src="https://avatars.githubusercontent.com/u/820141?v=4" width="90;" alt="hetz"/>
+        <a href="https://github.com/ACGNnsj">
+            <img src="https://avatars.githubusercontent.com/u/22112141?v=4" width="90;" alt="ACGNnsj"/>
             <br />
-            <sub><b>贺天卓</b></sub>
+            <sub><b>Null</b></sub>
+        </a>
+    </td></tr>
+<tr>
+    <td align="center">
+        <a href="https://github.com/2nthony">
+            <img src="https://avatars.githubusercontent.com/u/19513289?v=4" width="90;" alt="2nthony"/>
+            <br />
+            <sub><b>2nthony</b></sub>
         </a>
     </td></tr>
 </table>
 <!-- readme: contributors -end -->
 
+## Frequently Asked Questions
+
+1. Right-clicking on an image element in the page to open the menu and select download image or other events does not work (common in MacOS systems). This issue is due to the MacOS built-in webview not supporting this feature.
+
 ## Support
 
 1. I have two cats, TangYuan and Coke. If you think Pake delights your life, you can feed them <a href="https://miaoyan.app/cats.html?name=Pake" target="_blank">some canned food 🥩</a>.

package/dist/cli.js

@@ -20,7 +20,7 @@ import psl from 'psl';
 import isUrl from 'is-url';
 
 var name = "pake-cli";
-var version = "2.3.6";
+var version = "2.3.8";
 var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 利用 Rust 轻松构建轻量级多端桌面应用。";
 var engines = {
 	node: ">=16.0.0"
@@ -67,15 +67,15 @@ var type = "module";
 var exports = "./dist/pake.js";
 var license = "MIT";
 var dependencies = {
-	"@tauri-apps/api": "^1.5.1",
-	"@tauri-apps/cli": "^1.5.6",
-	axios: "^1.6.1",
+	"@tauri-apps/api": "^1.5.4",
+	"@tauri-apps/cli": "^1.5.13",
+	axios: "^1.6.8",
 	chalk: "^5.3.0",
 	commander: "^11.1.0",
-	"file-type": "^18.6.0",
-	"fs-extra": "^11.1.1",
+	"file-type": "^18.7.0",
+	"fs-extra": "^11.2.0",
 	"is-url": "^1.2.4",
-	loglevel: "^1.8.1",
+	loglevel: "^1.9.1",
 	ora: "^7.0.1",
 	prompts: "^2.4.2",
 	psl: "^1.9.0",
@@ -84,25 +84,26 @@ var dependencies = {
 	"update-notifier": "^7.0.0"
 };
 var devDependencies = {
-	"@rollup/plugin-alias": "^5.0.1",
+	"@rollup/plugin-alias": "^5.1.0",
 	"@rollup/plugin-commonjs": "^25.0.7",
-	"@rollup/plugin-json": "^6.0.1",
+	"@rollup/plugin-json": "^6.1.0",
 	"@rollup/plugin-replace": "^5.0.5",
 	"@rollup/plugin-terser": "^0.4.4",
 	"@types/fs-extra": "^11.0.4",
 	"@types/is-url": "^1.2.32",
+	"@types/node": "^20.12.10",
 	"@types/page-icon": "^0.3.6",
-	"@types/prompts": "^2.4.8",
+	"@types/prompts": "^2.4.9",
 	"@types/psl": "^1.1.3",
 	"@types/shelljs": "^0.8.15",
 	"@types/tmp": "^0.2.6",
-	"@types/update-notifier": "^6.0.7",
+	"@types/update-notifier": "^6.0.8",
 	"app-root-path": "^3.1.0",
 	"cross-env": "^7.0.3",
-	rollup: "^4.3.0",
+	rollup: "^4.17.2",
 	"rollup-plugin-typescript2": "^0.36.0",
 	tslib: "^2.6.2",
-	typescript: "^5.2.2"
+	typescript: "^5.4.5"
 };
 var packageJson = {
 	name: name,
@@ -138,11 +139,6 @@ var user_agent = {
 	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 menu = {
-	macos: false,
-	linux: false,
-	windows: false
-};
 var system_tray = {
 	macos: false,
 	linux: true,
@@ -153,7 +149,6 @@ var inject = [
 var pakeConf = {
 	windows: windows,
 	user_agent: user_agent,
-	menu: menu,
 	system_tray: system_tray,
 	inject: inject
 };
@@ -176,7 +171,7 @@ var tauri$3 = {
 	},
 	systemTray: {
 		iconPath: "png/icon_512.png",
-		iconAsTemplate: true
+		iconAsTemplate: false
 	},
 	allowlist: {
 		all: true,
@@ -433,7 +428,7 @@ async function isChinaIP(ip, domain) {
     try {
         const delay = await ping(ip);
         logger.debug(`${domain} latency is ${delay} ms`);
-        return delay > 1000;
+        return delay > 500;
     }
     catch (error) {
         logger.debug(`ping ${domain} failed!`);
@@ -476,7 +471,7 @@ async function combineFiles(files, output) {
 }
 
 async function mergeConfig(url, options, tauriConf) {
-    const { width, height, fullscreen, transparent, userAgent, showMenu, showSystemTray, systemTrayIcon, iterCopyFile, identifier, name, resizable = true, inject, safeDomain, } = options;
+    const { width, height, fullscreen, transparent, userAgent, showSystemTray, systemTrayIcon, iterCopyFile, identifier, name, resizable = true, inject, safeDomain, } = options;
     const { platform } = process;
     // Set Windows parameters.
     const tauriConfWindowOptions = {
@@ -543,7 +538,6 @@ async function mergeConfig(url, options, tauriConf) {
     if (userAgent.length > 0) {
         tauriConf.pake.user_agent[currentPlatform] = userAgent;
     }
-    tauriConf.pake.menu[currentPlatform] = showMenu;
     tauriConf.pake.system_tray[currentPlatform] = showSystemTray;
     // Processing targets are currently only open to Linux.
     if (platform === 'linux') {
@@ -831,7 +825,6 @@ const DEFAULT_PAKE_OPTIONS = {
     resizable: true,
     transparent: false,
     userAgent: '',
-    showMenu: false,
     showSystemTray: false,
     multiArch: false,
     targets: 'deb',
@@ -946,7 +939,7 @@ function resolveAppName(name, platform) {
 function isValidName(name, platform) {
     const platformRegexMapping = {
         linux: /^[a-z0-9]+(-[a-z0-9]+)*$/,
-        default: /^[a-zA-Z0-9]+$/,
+        default: /^[a-zA-Z0-9]+([-a-zA-Z0-9])*$/,
     };
     const reg = platformRegexMapping[platform] || platformRegexMapping.default;
     return !!name && reg.test(name);
@@ -964,7 +957,7 @@ async function handleOptions(options, url) {
     }
     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 must contain at least one letter. Examples: 123pan, 123Pan, Pan123, weread, WeRead, WERead.`;
+        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 errorMsg = platform === 'linux' ? LINUX_NAME_ERROR : DEFAULT_NAME_ERROR;
         logger.error(errorMsg);
         if (isActions) {
@@ -1024,7 +1017,6 @@ program
     .option('--transparent', 'Only for Mac, hide title bar', DEFAULT_PAKE_OPTIONS.transparent)
     .option('--fullscreen', 'Start in full screen', DEFAULT_PAKE_OPTIONS.fullscreen)
     .option('--user-agent <string>', 'Custom user agent', DEFAULT_PAKE_OPTIONS.userAgent)
-    .option('--show-menu', 'Show menu in app', DEFAULT_PAKE_OPTIONS.showMenu)
     .option('--show-system-tray', 'Show system tray in app', DEFAULT_PAKE_OPTIONS.showSystemTray)
     .option('--system-tray-icon <string>', 'Custom system tray icon', DEFAULT_PAKE_OPTIONS.systemTrayIcon)
     .option('--iter-copy-file', 'Copy files when URL is a local file', DEFAULT_PAKE_OPTIONS.iterCopyFile)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pake-cli",
-  "version": "2.3.6",
+  "version": "2.3.8",
   "description": "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 利用 Rust 轻松构建轻量级多端桌面应用。",
   "engines": {
     "node": ">=16.0.0"
@@ -47,15 +47,15 @@
   "exports": "./dist/pake.js",
   "license": "MIT",
   "dependencies": {
-    "@tauri-apps/api": "^1.5.1",
-    "@tauri-apps/cli": "^1.5.6",
-    "axios": "^1.6.1",
+    "@tauri-apps/api": "^1.5.4",
+    "@tauri-apps/cli": "^1.5.13",
+    "axios": "^1.6.8",
     "chalk": "^5.3.0",
     "commander": "^11.1.0",
-    "file-type": "^18.6.0",
-    "fs-extra": "^11.1.1",
+    "file-type": "^18.7.0",
+    "fs-extra": "^11.2.0",
     "is-url": "^1.2.4",
-    "loglevel": "^1.8.1",
+    "loglevel": "^1.9.1",
     "ora": "^7.0.1",
     "prompts": "^2.4.2",
     "psl": "^1.9.0",
@@ -64,24 +64,25 @@
     "update-notifier": "^7.0.0"
   },
   "devDependencies": {
-    "@rollup/plugin-alias": "^5.0.1",
+    "@rollup/plugin-alias": "^5.1.0",
     "@rollup/plugin-commonjs": "^25.0.7",
-    "@rollup/plugin-json": "^6.0.1",
+    "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-replace": "^5.0.5",
     "@rollup/plugin-terser": "^0.4.4",
     "@types/fs-extra": "^11.0.4",
     "@types/is-url": "^1.2.32",
+    "@types/node": "^20.12.10",
     "@types/page-icon": "^0.3.6",
-    "@types/prompts": "^2.4.8",
+    "@types/prompts": "^2.4.9",
     "@types/psl": "^1.1.3",
     "@types/shelljs": "^0.8.15",
     "@types/tmp": "^0.2.6",
-    "@types/update-notifier": "^6.0.7",
+    "@types/update-notifier": "^6.0.8",
     "app-root-path": "^3.1.0",
     "cross-env": "^7.0.3",
-    "rollup": "^4.3.0",
+    "rollup": "^4.17.2",
     "rollup-plugin-typescript2": "^0.36.0",
     "tslib": "^2.6.2",
-    "typescript": "^5.2.2"
+    "typescript": "^5.4.5"
   }
 }

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

@@ -0,0 +1,10 @@
+[source.crates-io]
+replace-with = 'rsproxy-sparse'
+[source.rsproxy]
+registry = "https://rsproxy.cn/crates.io-index"
+[source.rsproxy-sparse]
+registry = "sparse+https://rsproxy.cn/index/"
+[registries.rsproxy]
+index = "https://rsproxy.cn/crates.io-index"
+[net]
+git-fetch-with-cli = true