pake-cli 2.2.6 → 2.3.0

package/README.md

@@ -226,6 +226,13 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <sub><b>Pan93412</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/jeasonnow">
+            <img src="https://avatars.githubusercontent.com/u/16950207?v=4" width="90;" alt="jeasonnow"/>
+            <br />
+            <sub><b>Santree</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/wanghanzhen">
             <img src="https://avatars.githubusercontent.com/u/25301012?v=4" width="90;" alt="wanghanzhen"/>
@@ -246,15 +253,15 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <br />
             <sub><b>Essesoul</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/AielloChan">
             <img src="https://avatars.githubusercontent.com/u/7900765?v=4" width="90;" alt="AielloChan"/>
             <br />
             <sub><b>Aiello</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
         <a href="https://github.com/m1911star">
             <img src="https://avatars.githubusercontent.com/u/4948120?v=4" width="90;" alt="m1911star"/>
@@ -269,13 +276,6 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <sub><b>Pake Actions</b></sub>
         </a>
     </td>
-    <td align="center">
-        <a href="https://github.com/jeasonnow">
-            <img src="https://avatars.githubusercontent.com/u/16950207?v=4" width="90;" alt="jeasonnow"/>
-            <br />
-            <sub><b>Santree</b></sub>
-        </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"/>

package/dist/cli.js

@@ -11,17 +11,17 @@ import { fileURLToPath } from 'url';
 import dns from 'dns';
 import http from 'http';
 import { promisify } from 'util';
+import fs from 'fs';
 import updateNotifier from 'update-notifier';
 import axios from 'axios';
 import { dir } from 'tmp-promise';
 import { fileTypeFromBuffer } from 'file-type';
 import psl from 'psl';
 import isUrl from 'is-url';
-import fs from 'fs';
 
 var name = "pake-cli";
-var version = "2.2.6";
-var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App。";
+var version = "2.3.0";
+var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 利用 Rust 轻松构建轻量级多端桌面应用。";
 var engines = {
 	node: ">=16.0.0"
 };
@@ -53,12 +53,14 @@ var scripts = {
 	start: "npm run dev",
 	dev: "npm run tauri dev",
 	build: "npm run tauri build --release",
+	"build:debug": "npm run tauri build -- --debug",
 	"build:mac": "npm run tauri build -- --target universal-apple-darwin",
 	"build:all-unix": "chmod +x ./script/build.sh && ./script/build.sh",
 	"build:all-windows": "pwsh ./script/build.ps1",
 	analyze: "cd src-tauri && cargo bloat --release --crates",
 	tauri: "tauri",
 	cli: "rollup -c rollup.config.js --watch",
+	"cli:dev": "cross-env NODE_ENV=development rollup -c rollup.config.js -w",
 	"cli:build": "cross-env NODE_ENV=production rollup -c rollup.config.js",
 	prepublishOnly: "npm run cli:build"
 };
@@ -86,6 +88,7 @@ var devDependencies = {
 	"@rollup/plugin-alias": "^4.0.2",
 	"@rollup/plugin-commonjs": "^23.0.2",
 	"@rollup/plugin-json": "^5.0.2",
+	"@rollup/plugin-replace": "^5.0.2",
 	"@rollup/plugin-terser": "^0.1.0",
 	"@types/fs-extra": "^9.0.13",
 	"@types/is-url": "^1.2.30",
@@ -137,7 +140,7 @@ var user_agent = {
 	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: true,
+	macos: false,
 	linux: false,
 	windows: false
 };
@@ -146,11 +149,14 @@ var system_tray = {
 	linux: true,
 	windows: true
 };
+var inject = [
+];
 var pakeConf = {
 	windows: windows,
 	user_agent: user_agent,
 	menu: menu,
-	system_tray: system_tray
+	system_tray: system_tray,
+	inject: inject
 };
 
 var tauri$3 = {
@@ -170,7 +176,7 @@ var tauri$3 = {
 		active: false
 	},
 	systemTray: {
-		iconPath: "png/weread_512.png",
+		iconPath: "png/icon_512.png",
 		iconAsTemplate: true
 	},
 	allowlist: {
@@ -357,7 +363,8 @@ const IS_LINUX = platform$1 === 'linux';
 // Convert the current module URL to a file path
 const currentModulePath = fileURLToPath(import.meta.url);
 // Resolve the parent directory of the current module
-const npmDirectory = path.join(path.dirname(currentModulePath), '..');
+const npmDirectory = path.join(path.dirname(currentModulePath), '..');
+const tauriConfigDirectory = path.join(npmDirectory, 'src-tauri');
 
 function shellExec(command) {
     return new Promise((resolve, reject) => {
@@ -457,8 +464,20 @@ function checkRustInstalled() {
     return shelljs.exec('rustc --version', { silent: true }).code === 0;
 }
 
+async function combineFiles(files, output) {
+    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 + " });";
+    });
+    fs.writeFileSync(output, contents.join('\n'));
+    return files;
+}
+
 async function mergeConfig(url, options, tauriConf) {
-    const { width, height, fullscreen, transparent, userAgent, showMenu, showSystemTray, systemTrayIcon, iterCopyFile, identifier, name, resizable = true, } = options;
+    const { width, height, fullscreen, transparent, userAgent, showMenu, showSystemTray, systemTrayIcon, iterCopyFile, identifier, name, resizable = true, inject, safeDomain, } = options;
     const { platform } = process;
     // Set Windows parameters.
     const tauriConfWindowOptions = {
@@ -496,7 +515,23 @@ async function mergeConfig(url, options, tauriConf) {
     else {
         tauriConf.pake.windows[0].url_type = 'web';
         // Set the secure domain for calling window.__TAURI__ to the application domain that has been set.
-        tauriConf.tauri.security.dangerousRemoteDomainIpcAccess[0].domain = new URL(url).hostname;
+        tauriConf.tauri.security.dangerousRemoteDomainIpcAccess = [
+            {
+                domain: new URL(url).hostname,
+                windows: ['pake'],
+                enableTauriAPI: true,
+            },
+        ];
+    }
+    if (safeDomain.length > 0) {
+        tauriConf.tauri.security.dangerousRemoteDomainIpcAccess = [
+            ...tauriConf.tauri.security.dangerousRemoteDomainIpcAccess,
+            ...safeDomain.map(domain => ({
+                domain,
+                windows: ['pake'],
+                enableTauriAPI: true,
+            })),
+        ];
     }
     const platformMap = {
         win32: 'windows',
@@ -514,8 +549,7 @@ async function mergeConfig(url, options, tauriConf) {
         delete tauriConf.tauri.bundle.deb.files;
         const validTargets = ['all', 'deb', 'appimage'];
         if (validTargets.includes(options.targets)) {
-            tauriConf.tauri.bundle.targets =
-                options.targets === 'all' ? ['deb', 'appimage'] : [options.targets];
+            tauriConf.tauri.bundle.targets = options.targets === 'all' ? ['deb', 'appimage'] : [options.targets];
         }
         else {
             logger.warn(`✼ The target must be one of ${validTargets.join(', ')}, the default 'deb' will be used.`);
@@ -591,22 +625,37 @@ async function mergeConfig(url, options, tauriConf) {
         }
     }
     tauriConf.tauri.systemTray.iconPath = trayIconPath;
+    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'))) {
+            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));
+        tauriConf.pake.inject = files;
+        await combineFiles(files, injectFilePath);
+    }
+    else {
+        tauriConf.pake.inject = [];
+        await fsExtra.writeFile(injectFilePath, '');
+    }
     // Save config file.
     const platformConfigPaths = {
-        win32: 'src-tauri/tauri.windows.conf.json',
-        darwin: 'src-tauri/tauri.macos.conf.json',
-        linux: 'src-tauri/tauri.linux.conf.json',
+        win32: 'tauri.windows.conf.json',
+        darwin: 'tauri.macos.conf.json',
+        linux: 'tauri.linux.conf.json',
     };
-    const configPath = path.join(npmDirectory, platformConfigPaths[platform]);
+    const configPath = path.join(tauriConfigDirectory, platformConfigPaths[platform]);
     const bundleConf = { tauri: { bundle: tauriConf.tauri.bundle } };
-    await fsExtra.writeJson(configPath, bundleConf, { spaces: 4 });
-    const pakeConfigPath = path.join(npmDirectory, 'src-tauri/pake.json');
-    await fsExtra.writeJson(pakeConfigPath, tauriConf.pake, { spaces: 4 });
+    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));
     delete tauriConf2.pake;
     delete tauriConf2.tauri.bundle;
-    const configJsonPath = path.join(npmDirectory, 'src-tauri/tauri.conf.json');
-    await fsExtra.writeJson(configJsonPath, tauriConf2, { spaces: 4 });
+    const configJsonPath = path.join(tauriConfigDirectory, 'tauri.conf.json');
+    await fsExtra.outputJSON(configJsonPath, tauriConf2, { spaces: 4 });
 }
 
 class BaseBuilder {
@@ -657,6 +706,9 @@ class BaseBuilder {
     async build(url) {
         await this.buildAndCopy(url, this.options.targets);
     }
+    async start(url) {
+        await mergeConfig(url, this.options, tauriConfig);
+    }
     async buildAndCopy(url, target) {
         const { name } = this.options;
         await mergeConfig(url, this.options, tauriConfig);
@@ -678,7 +730,8 @@ class BaseBuilder {
         return target;
     }
     getBuildCommand() {
-        return 'npm run build';
+        // the debug option should support `--debug` and `--release`
+        return this.options.debug ? 'npm run build:debug' : 'npm run build';
     }
     getBasePath() {
         return 'src-tauri/target/release/bundle/';
@@ -784,6 +837,8 @@ const DEFAULT_PAKE_OPTIONS = {
     iterCopyFile: false,
     systemTrayIcon: '',
     debug: false,
+    inject: [],
+    safeDomain: [],
 };
 
 async function checkUpdateTips() {
@@ -825,8 +880,8 @@ async function downloadIcon(iconUrl) {
         let iconPath = `${tempPath}/icon.${fileDetails.ext}`;
         // Fix this for linux
         if (IS_LINUX) {
-            iconPath = 'icon.png';
-            await fsExtra.outputFile(`${npmDirectory}/${iconPath}`, iconData);
+            iconPath = 'png/linux_temp.png';
+            await fsExtra.outputFile(`${npmDirectory}/src-tauri/${iconPath}`, iconData);
         }
         else {
             await fsExtra.outputFile(iconPath, iconData);
@@ -974,6 +1029,8 @@ program
     .option('--iter-copy-file', 'Copy files when URL is a local file', DEFAULT_PAKE_OPTIONS.iterCopyFile)
     .option('--multi-arch', 'Only for Mac, supports both Intel and M1', DEFAULT_PAKE_OPTIONS.multiArch)
     .option('--targets <string>', 'Only for Linux, option "deb" or "appimage"', DEFAULT_PAKE_OPTIONS.targets)
+    .option('--inject [injects...]', 'Injection of .js or .css Files', DEFAULT_PAKE_OPTIONS.inject)
+    .option('--safe-domain [domains...]', 'Domains that Require Security Configuration"', DEFAULT_PAKE_OPTIONS.safeDomain)
     .option('--debug', 'Debug mode', DEFAULT_PAKE_OPTIONS.debug)
     .version(packageJson.version, '-v, --version', 'Output the current version')
     .action(async (url, options) => {

package/dist/dev.js

@@ -35,12 +35,13 @@ const DEFAULT_PAKE_OPTIONS = {
     inject: [],
     safeDomain: [],
 };
-// just for cli development
+// Just for cli development
 const DEFAULT_DEV_PAKE_OPTIONS = {
     ...DEFAULT_PAKE_OPTIONS,
-    url: 'https://zbook.lol',
-    name: 'Zbook',
-    safeDomain: ['zbook.eu.org']
+    url: 'https://weread.qq.com',
+    name: 'WeRead',
+    safeDomain: ['weread.qq.com'],
+    transparent: true,
 };
 
 const logger = {
@@ -133,7 +134,15 @@ async function downloadIcon(iconUrl) {
             return null;
         }
         const { path: tempPath } = await dir();
-        const iconPath = `${tempPath}/icon.${fileDetails.ext}`;
+        let iconPath = `${tempPath}/icon.${fileDetails.ext}`;
+        // Fix this for linux
+        if (IS_LINUX) {
+            iconPath = 'png/linux_temp.png';
+            await fsExtra.outputFile(`${npmDirectory}/src-tauri/${iconPath}`, iconData);
+        }
+        else {
+            await fsExtra.outputFile(iconPath, iconData);
+        }
         await fsExtra.outputFile(iconPath, iconData);
         spinner.succeed(chalk.green('Icon downloaded successfully!'));
         return iconPath;
@@ -213,8 +222,8 @@ async function handleOptions(options, url) {
 
 var windows = [
 	{
-		url: "https://zbook.lol",
-		transparent: false,
+		url: "https://weread.qq.com/",
+		transparent: true,
 		fullscreen: false,
 		width: 1200,
 		height: 780,
@@ -252,14 +261,7 @@ var tauri$3 = {
 		csp: null,
 		dangerousRemoteDomainIpcAccess: [
 			{
-				domain: "zbook.lol",
-				windows: [
-					"pake"
-				],
-				enableTauriAPI: true
-			},
-			{
-				domain: "zbook.eu.org",
+				domain: "weread.qq.com",
 				windows: [
 					"pake"
 				],
@@ -292,11 +294,11 @@ var build = {
 	beforeDevCommand: ""
 };
 var CommonConf = {
-	tauri: tauri$3,
 	"package": {
-	productName: "Zbook",
+	productName: "WeRead",
 	version: "1.0.0"
 },
+	tauri: tauri$3,
 	build: build
 };
 
@@ -340,9 +342,9 @@ var WinConf = {
 var tauri$1 = {
 	bundle: {
 		icon: [
-			"/Users/tw93/www/pake/src-tauri/icons/icon.icns"
+			"icons/weread.icns"
 		],
-		identifier: "com.pake.79ba20",
+		identifier: "com.pake.weread",
 		active: true,
 		category: "DeveloperTool",
 		copyright: "",
@@ -358,7 +360,6 @@ var tauri$1 = {
 			signingIdentity: null
 		},
 		resources: [
-			"icons/zbook.icns"
 		],
 		shortDescription: "",
 		targets: [
@@ -481,8 +482,9 @@ async function isChinaIP(ip, domain) {
 }
 
 async function installRust() {
+    const isActions = process.env.GITHUB_ACTIONS;
     const isInChina = await isChinaDomain('sh.rustup.rs');
-    const rustInstallScriptForMac = isInChina
+    const rustInstallScriptForMac = isInChina && !isActions
         ? 'export RUSTUP_DIST_SERVER="https://rsproxy.cn" && export RUSTUP_UPDATE_ROOT="https://rsproxy.cn/rustup" && curl --proto "=https" --tlsv1.2 -sSf https://rsproxy.cn/rustup-init.sh | sh'
         : "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y";
     const rustInstallScriptForWindows = 'winget install --id Rustlang.Rustup';
@@ -662,7 +664,7 @@ async function mergeConfig(url, options, tauriConf) {
         }
     }
     tauriConf.tauri.systemTray.iconPath = trayIconPath;
-    const injectFilePath = path.join(npmDirectory, `src-tauri/src/inject/_INJECT_.js`);
+    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'))) {