pake-cli 2.6.0 → 3.0.0-beta

package/dist/dev.js

@@ -9,7 +9,7 @@ import crypto from 'crypto';
 import prompts from 'prompts';
 import ora from 'ora';
 import { fileTypeFromBuffer } from 'file-type';
-import psl from 'psl';
+import * as psl from 'psl';
 import 'is-url';
 import shelljs from 'shelljs';
 import dns from 'dns';
@@ -23,27 +23,28 @@ const DEFAULT_PAKE_OPTIONS = {
     width: 1200,
     fullscreen: false,
     resizable: true,
-    transparent: false,
+    hideTitleBar: false,
     alwaysOnTop: false,
+    darkMode: false,
     disabledWebShortcuts: false,
     activationShortcut: '',
     userAgent: '',
     showSystemTray: false,
     multiArch: false,
     targets: 'deb',
-    iterCopyFile: false,
+    useLocalFile: false,
     systemTrayIcon: '',
+    proxyUrl: "",
     debug: false,
     inject: [],
-    safeDomain: [],
+    installerLanguage: 'en-US',
 };
 // Just for cli development
 const DEFAULT_DEV_PAKE_OPTIONS = {
     ...DEFAULT_PAKE_OPTIONS,
     url: 'https://weread.qq.com',
     name: 'WeRead',
-    safeDomain: ['weread.qq.com'],
-    transparent: true,
+    hideTitleBar: true,
 };
 
 const logger = {
@@ -68,7 +69,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');
 
 const { platform: platform$2 } = process;
 const IS_MAC = platform$2 === 'darwin';
@@ -226,12 +227,13 @@ var windows = [
 	{
 		url: "https://weread.qq.com",
 		url_type: "web",
-		transparent: true,
+		hide_title_bar: true,
 		fullscreen: false,
 		width: 1200,
 		height: 780,
 		resizable: true,
 		always_on_top: false,
+		dark_mode: false,
 		activation_shortcut: "",
 		disabled_web_shortcuts: false
 	}
@@ -246,139 +248,121 @@ var system_tray = {
 	linux: true,
 	windows: true
 };
+var system_tray_path = "icons/icon.png";
 var inject = [
 ];
+var proxy_url = "";
 var pakeConf = {
 	windows: windows,
 	user_agent: user_agent,
 	system_tray: system_tray,
-	inject: inject
+	system_tray_path: system_tray_path,
+	inject: inject,
+	proxy_url: proxy_url
 };
 
-var tauri$3 = {
+var productName$1 = "WeRead";
+var identifier = "com.pake.weread";
+var version = "2.0.0";
+var plugins = {
+};
+var app = {
 	security: {
-		csp: null,
-		dangerousRemoteDomainIpcAccess: [
-			{
-				domain: "weread.qq.com",
-				windows: [
-					"pake"
-				],
-				enableTauriAPI: true
-			}
-		]
+		csp: null
 	},
-	updater: {
-		active: false
+	trayIcon: {
+		iconPath: "png/weread_512.png",
+		iconAsTemplate: false,
+		id: "pake-tray"
 	},
-	systemTray: {
-		iconPath: "png/icon_512.png",
-		iconAsTemplate: false
-	},
-	allowlist: {
-		all: true,
-		fs: {
-			all: true,
-			scope: [
-				"$DOWNLOAD/*"
-			]
-		}
-	}
+	withGlobalTauri: true
 };
 var build = {
-	withGlobalTauri: true,
-	devPath: "../dist",
-	distDir: "../dist",
 	beforeBuildCommand: "",
+	frontendDist: "../dist",
 	beforeDevCommand: ""
 };
 var CommonConf = {
-	"package": {
-	productName: "WeRead",
-	version: "1.0.0"
-},
-	tauri: tauri$3,
+	productName: productName$1,
+	identifier: identifier,
+	version: version,
+	plugins: plugins,
+	app: app,
 	build: build
 };
 
-var tauri$2 = {
-	bundle: {
-		icon: [
-			"png/weread_256.ico",
-			"png/weread_32.ico"
-		],
-		identifier: "com.pake.weread",
-		active: true,
-		category: "DeveloperTool",
-		copyright: "",
-		externalBin: [
-		],
-		longDescription: "",
-		resources: [
-			"png/weread_32.ico"
-		],
-		shortDescription: "",
-		targets: [
-			"msi"
-		],
-		windows: {
-			certificateThumbprint: null,
-			digestAlgorithm: "sha256",
-			timestampUrl: "",
-			wix: {
-				language: [
-					"en-US"
-				],
-				template: "assets/main.wxs"
-			}
+var bundle$2 = {
+	icon: [
+		"png/weread_256.ico",
+		"png/weread_32.ico"
+	],
+	active: true,
+	category: "DeveloperTool",
+	copyright: "",
+	externalBin: [
+	],
+	longDescription: "",
+	resources: [
+		"png/weread_32.ico"
+	],
+	shortDescription: "",
+	targets: [
+		"msi"
+	],
+	windows: {
+		certificateThumbprint: null,
+		digestAlgorithm: "sha256",
+		timestampUrl: "",
+		wix: {
+			language: [
+				"en-US"
+			],
+			template: "assets/main.wxs"
 		}
 	}
 };
 var WinConf = {
-	tauri: tauri$2
+	bundle: bundle$2
 };
 
-var tauri$1 = {
-	bundle: {
-		icon: [
-			"icons/weread.icns"
-		],
-		identifier: "com.pake.weread",
-		active: true,
-		category: "DeveloperTool",
-		copyright: "",
-		externalBin: [
+var bundle$1 = {
+	icon: [
+		"icons/weread.icns"
+	],
+	active: true,
+	category: "DeveloperTool",
+	copyright: "",
+	externalBin: [
+	],
+	longDescription: "",
+	macOS: {
+		entitlements: null,
+		exceptionDomain: null,
+		frameworks: [
 		],
-		longDescription: "",
-		macOS: {
-			entitlements: null,
-			exceptionDomain: "",
-			frameworks: [
-			],
-			providerShortName: null,
-			signingIdentity: null
-		},
-		resources: [
-		],
-		shortDescription: "",
-		targets: [
-			"dmg"
-		]
-	}
+		providerShortName: null,
+		signingIdentity: null
+	},
+	resources: [
+	],
+	shortDescription: "",
+	targets: [
+		"dmg"
+	]
 };
 var MacConf = {
-	tauri: tauri$1
+	bundle: bundle$1
 };
 
-var tauri = {
-	bundle: {
-		icon: [
-			"png/weread_512.png"
-		],
-		identifier: "com.pake.weread",
-		active: true,
-		category: "DeveloperTool",
-		copyright: "",
+var productName = "weread";
+var bundle = {
+	icon: [
+		"png/weread_512.png"
+	],
+	active: true,
+	category: "DeveloperTool",
+	copyright: "",
+	linux: {
 		deb: {
 			depends: [
 				"curl",
@@ -387,21 +371,22 @@ var tauri = {
 			files: {
 				"/usr/share/applications/com-pake-weread.desktop": "assets/com-pake-weread.desktop"
 			}
-		},
-		externalBin: [
-		],
-		longDescription: "",
-		resources: [
-		],
-		shortDescription: "",
-		targets: [
-			"deb",
-			"appimage"
-		]
-	}
+		}
+	},
+	externalBin: [
+	],
+	longDescription: "",
+	resources: [
+	],
+	shortDescription: "",
+	targets: [
+		"deb",
+		"appimage"
+	]
 };
 var LinuxConf = {
-	tauri: tauri
+	productName: productName,
+	bundle: bundle
 };
 
 const platformConfigs = {
@@ -413,11 +398,15 @@ const { platform: platform$1 } = process;
 // @ts-ignore
 const platformConfig = platformConfigs[platform$1];
 let tauriConfig = {
-    tauri: {
-        ...CommonConf.tauri,
-        bundle: platformConfig.tauri.bundle,
+    ...CommonConf,
+    bundle: platformConfig.bundle,
+    app: {
+        ...CommonConf.app,
+        trayIcon: {
+            ...CommonConf.app.trayIcon,
+            ...(platformConfig?.app?.trayIcon ?? {}),
+        },
     },
-    package: CommonConf.package,
     build: CommonConf.build,
     pake: pakeConf,
 };
@@ -506,30 +495,37 @@ 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) => { 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, transparent, alwaysOnTop, disabledWebShortcuts, userAgent, showSystemTray, systemTrayIcon, iterCopyFile, identifier, name, resizable = true, inject, safeDomain, } = options;
+    const { width, height, fullscreen, hideTitleBar, alwaysOnTop, darkMode, disabledWebShortcuts, activationShortcut, userAgent, showSystemTray, systemTrayIcon, useLocalFile, identifier, name, resizable = true, inject, proxyUrl, installerLanguage, } = options;
     const { platform } = process;
     // Set Windows parameters.
     const tauriConfWindowOptions = {
         width,
         height,
         fullscreen,
-        transparent,
-        alwaysOnTop,
-        disabledWebShortcuts,
         resizable,
+        hide_title_bar: hideTitleBar,
+        activation_shortcut: activationShortcut,
+        always_on_top: alwaysOnTop,
+        dark_mode: darkMode,
+        disabled_web_shortcuts: disabledWebShortcuts,
     };
     Object.assign(tauriConf.pake.windows[0], { url, ...tauriConfWindowOptions });
     tauriConf.package.productName = name;
     tauriConf.tauri.bundle.identifier = identifier;
+    if (platform == "win32") {
+        tauriConf.tauri.bundle.windows.wix.language[0] = installerLanguage;
+    }
     //Judge the type of URL, whether it is a file or a website.
     const pathExists = await fsExtra.pathExists(url);
     if (pathExists) {
@@ -539,7 +535,7 @@ async function mergeConfig(url, options, tauriConf) {
         const dirName = path.dirname(url);
         const distDir = path.join(npmDirectory, 'dist');
         const distBakDir = path.join(npmDirectory, 'dist_bak');
-        if (!iterCopyFile) {
+        if (!useLocalFile) {
             const urlPath = path.join(distDir, fileName);
             await fsExtra.copy(url, urlPath);
         }
@@ -556,24 +552,6 @@ 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 = [
-            {
-                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',
@@ -587,10 +565,10 @@ async function mergeConfig(url, options, tauriConf) {
     tauriConf.pake.system_tray[currentPlatform] = showSystemTray;
     // Processing targets are currently only open to Linux.
     if (platform === 'linux') {
-        delete tauriConf.tauri.bundle.deb.files;
-        const validTargets = ['all', 'deb', 'appimage'];
+        delete tauriConf.bundle.linux.deb.files;
+        const validTargets = ['all', 'deb', 'appimage', 'rpm'];
         if (validTargets.includes(options.targets)) {
-            tauriConf.tauri.bundle.targets = options.targets === 'all' ? ['deb', 'appimage'] : [options.targets];
+            tauriConf.bundle.targets = options.targets === 'all' ? ['deb', 'appimage', 'rpm'] : [options.targets];
         }
         else {
             logger.warn(`✼ The target must be one of ${validTargets.join(', ')}, the default 'deb' will be used.`);
@@ -625,15 +603,15 @@ async function mergeConfig(url, options, tauriConf) {
         if (customIconExt !== iconInfo.fileExt) {
             updateIconPath = false;
             logger.warn(`✼ ${iconInfo.message}, but you give ${customIconExt}`);
-            tauriConf.tauri.bundle.icon = [iconInfo.defaultIcon];
+            tauriConf.bundle.icon = [iconInfo.defaultIcon];
         }
         else {
             const iconPath = path.join(npmDirectory, 'src-tauri/', iconInfo.path);
-            tauriConf.tauri.bundle.resources = [iconInfo.path];
+            tauriConf.bundle.resources = [iconInfo.path];
             await fsExtra.copy(options.icon, iconPath);
         }
         if (updateIconPath) {
-            tauriConf.tauri.bundle.icon = [options.icon];
+            tauriConf.bundle.icon = [options.icon];
         }
         else {
             logger.warn(`✼ Icon will remain as default.`);
@@ -641,10 +619,10 @@ async function mergeConfig(url, options, tauriConf) {
     }
     else {
         logger.warn('✼ Custom icon path may be invalid, default icon will be used instead.');
-        tauriConf.tauri.bundle.icon = [iconInfo.defaultIcon];
+        tauriConf.bundle.icon = [iconInfo.defaultIcon];
     }
     // Set tray icon path.
-    let trayIconPath = platform === 'darwin' ? 'png/icon_512.png' : tauriConf.tauri.bundle.icon[0];
+    let trayIconPath = platform === 'darwin' ? 'png/icon_512.png' : tauriConf.bundle.icon[0];
     if (systemTrayIcon.length > 0) {
         try {
             await fsExtra.pathExists(systemTrayIcon);
@@ -665,7 +643,9 @@ async function mergeConfig(url, options, tauriConf) {
             logger.warn(`✼ Default system tray icon will remain unchanged.`);
         }
     }
-    tauriConf.tauri.systemTray.iconPath = trayIconPath;
+    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
     if (inject?.length > 0) {
@@ -673,7 +653,7 @@ async function mergeConfig(url, options, tauriConf) {
             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);
     }
@@ -681,6 +661,7 @@ async function mergeConfig(url, options, tauriConf) {
         tauriConf.pake.inject = [];
         await fsExtra.writeFile(injectFilePath, '');
     }
+    tauriConf.pake.proxy_url = proxyUrl || "";
     // Save config file.
     const platformConfigPaths = {
         win32: 'tauri.windows.conf.json',
@@ -688,16 +669,13 @@ async function mergeConfig(url, options, tauriConf) {
         linux: 'tauri.linux.conf.json',
     };
     const configPath = path.join(tauriConfigDirectory, platformConfigPaths[platform]);
-    const bundleConf = { tauri: { bundle: tauriConf.tauri.bundle } };
+    const bundleConf = { bundle: tauriConf.bundle };
+    console.log('pakeConfig', tauriConf.pake);
     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;
-    {
-        tauriConf2.tauri.bundle = bundleConf.tauri.bundle;
-    }
     const configJsonPath = path.join(tauriConfigDirectory, 'tauri.conf.json');
     await fsExtra.outputJSON(configJsonPath, tauriConf2, { spaces: 4 });
 }
@@ -712,7 +690,7 @@ class BaseBuilder {
         const tauriTargetPathExists = await fsExtra.pathExists(tauriTargetPath);
         if (!IS_MAC && !tauriTargetPathExists) {
             logger.warn('✼ The first use requires installing system dependencies.');
-            logger.warn('✼ See more in https://tauri.app/v1/guides/getting-started/prerequisites.');
+            logger.warn('✼ See more in https://tauri.app/guides/getting-started/prerequisites.');
         }
         if (!checkRustInstalled()) {
             const res = await prompts({
@@ -778,7 +756,8 @@ class BaseBuilder {
         return this.options.debug ? 'npm run build:debug' : 'npm run build';
     }
     getBasePath() {
-        return 'src-tauri/target/release/bundle/';
+        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}`);
@@ -799,7 +778,7 @@ class MacBuilder extends BaseBuilder {
         else {
             arch = process.arch === 'arm64' ? 'aarch64' : process.arch;
         }
-        return `${name}_${tauriConfig.package.version}_${arch}`;
+        return `${name}_${tauriConfig.version}_${arch}`;
     }
     getBuildCommand() {
         return this.options.multiArch ? 'npm run build:mac' : super.getBuildCommand();
@@ -819,8 +798,8 @@ class WinBuilder extends BaseBuilder {
     getFileName() {
         const { name } = this.options;
         const { arch } = process;
-        const language = tauriConfig.tauri.bundle.windows.wix.language[0];
-        return `${name}_${tauriConfig.package.version}_${arch}_${language}`;
+        const language = tauriConfig.bundle.windows.wix.language[0];
+        return `${name}_${tauriConfig.version}_${arch}_${language}`;
     }
 }
 
@@ -831,7 +810,7 @@ class LinuxBuilder extends BaseBuilder {
     getFileName() {
         const { name } = this.options;
         const arch = process.arch === 'x64' ? 'amd64' : process.arch;
-        return `${name}_${tauriConfig.package.version}_${arch}`;
+        return `${name}_${tauriConfig.version}_${arch}`;
     }
     // Customize it, considering that there are all targets.
     async build(url) {