pake-cli 2.0.0-alpha7 → 2.0.0-alpha9

package/README.md

@@ -180,7 +180,7 @@ npm run build
 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, 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.
 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 Make](https://github.com/tw93/Pake/wiki/Advanced-Usage-of-Pake).
+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).
 
 ## Developer
 

package/dist/cli.js

@@ -15,9 +15,9 @@ import { fileTypeFromBuffer } from 'file-type';
 import { dir } from 'tmp-promise';
 import ora from 'ora';
 import shelljs from 'shelljs';
-import { exec } from 'child_process';
 import { promisify } from 'util';
 import dns from 'dns';
+import http from 'http';
 import updateNotifier from 'update-notifier';
 
 /******************************************************************************
@@ -2019,53 +2019,66 @@ function shellExec(command) {
     });
 }
 
+const ping = (host) => __awaiter(void 0, void 0, void 0, function* () {
+    const lookup = promisify(dns.lookup);
+    const ip = yield lookup(host);
+    const start = new Date();
+    return new Promise((resolve, reject) => {
+        const req = http.get(`http://${ip.address}`, (res) => {
+            const delay = new Date().getTime() - start.getTime();
+            res.resume();
+            resolve(delay);
+        });
+        req.on('error', (err) => {
+            reject(err);
+        });
+    });
+});
 const resolve = promisify(dns.resolve);
 function isChinaDomain(domain) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             // 解析域名为IP地址
             const [ip] = yield resolve(domain);
-            return yield isChinaIP(ip);
+            return yield isChinaIP(ip, domain);
         }
         catch (error) {
             // 域名无法解析，返回false
+            logger.info(`${domain} can't be parse, is not in China!`);
             return false;
         }
     });
 }
-function isChinaIP(ip) {
+function isChinaIP(ip, domain) {
     return __awaiter(this, void 0, void 0, function* () {
-        return new Promise((resolve, reject) => {
-            exec(`ping -c 1 -w 1 ${ip}`, (error, stdout, stderr) => {
-                if (error) {
-                    // 命令执行出错，返回false
-                    resolve(false);
-                }
-                else {
-                    // 解析输出信息，提取延迟值
-                    const match = stdout.match(/time=(\d+\.\d+) ms/);
-                    const latency = match ? parseFloat(match[1]) : 0;
-                    // 判断延迟是否超过100ms
-                    resolve(latency > 100);
-                }
-            });
-        });
+        try {
+            const delay = yield ping(ip);
+            logger.info(`${domain} latency is ${delay} ms`);
+            // 判断延迟是否超过500ms
+            return delay > 500;
+        }
+        catch (error) {
+            // 命令执行出错，返回false
+            logger.info(`ping ${domain} failed!, is not in China!`);
+            return false;
+        }
     });
 }
 
-const is_china = isChinaDomain("sh.rustup.rs");
-let RustInstallScriptFocMac = "";
-if (is_china) {
-    RustInstallScriptFocMac =
-        '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';
-}
-else {
-    RustInstallScriptFocMac =
-        "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y";
-}
-const RustInstallScriptForWin = 'winget install --id Rustlang.Rustup';
 function installRust() {
     return __awaiter(this, void 0, void 0, function* () {
+        const is_china = yield isChinaDomain("sh.rustup.rs");
+        let RustInstallScriptFocMac = "";
+        if (is_china) {
+            logger.info("it's in China, use rust cn mirror to install rust");
+            RustInstallScriptFocMac =
+                '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';
+        }
+        else {
+            RustInstallScriptFocMac =
+                "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y";
+        }
+        const RustInstallScriptForWin = 'winget install --id Rustlang.Rustup';
         const spinner = ora('Downloading Rust').start();
         try {
             yield shellExec(IS_WIN ? RustInstallScriptForWin : RustInstallScriptFocMac);
@@ -2298,11 +2311,15 @@ class MacBuilder {
             yield mergeTauriConfig(url, options, tauriConf);
             let dmgName;
             if (options.multiArch) {
-                const isChina = isChinaDomain("www.npmjs.com");
+                const isChina = yield isChinaDomain("www.npmjs.com");
                 if (isChina) {
-                    // crates.io也顺便换源
+                    logger.info("it's in China, use npm/rust cn mirror");
                     const rust_project_dir = path.join(npmDirectory, 'src-tauri', ".cargo");
-                    const project_cn_conf = path.join(rust_project_dir, "cn_config.bak");
+                    const e1 = fs$1.access(rust_project_dir);
+                    if (e1) {
+                        yield fs$1.mkdir(rust_project_dir, { recursive: true });
+                    }
+                    const project_cn_conf = path.join(npmDirectory, "src-tauri", "cn_config.bak");
                     const project_conf = path.join(rust_project_dir, "config");
                     fs$1.copyFile(project_cn_conf, project_conf);
                     yield shellExec(`cd "${npmDirectory}" && npm install --registry=https://registry.npmmirror.com && npm run build:mac`);
@@ -2377,11 +2394,15 @@ class WinBuilder {
             logger.debug('PakeAppOptions', options);
             const { name } = options;
             yield mergeTauriConfig(url, options, tauriConf);
-            const isChina = isChinaDomain("www.npmjs.com");
+            const isChina = yield isChinaDomain("www.npmjs.com");
             if (isChina) {
-                // crates.io也顺便换源
+                logger.info("it's in China, use npm/rust cn mirror");
                 const rust_project_dir = path.join(npmDirectory, 'src-tauri', ".cargo");
-                const project_cn_conf = path.join(rust_project_dir, "cn_config.bak");
+                const e1 = fs$1.access(rust_project_dir);
+                if (e1) {
+                    yield fs$1.mkdir(rust_project_dir, { recursive: true });
+                }
+                const project_cn_conf = path.join(npmDirectory, "src-tauri", "cn_config.bak");
                 const project_conf = path.join(rust_project_dir, "config");
                 fs$1.copyFile(project_cn_conf, project_conf);
                 yield shellExec(`cd "${npmDirectory}" && npm install --registry=https://registry.npmmirror.com && npm run build`);
@@ -2433,11 +2454,15 @@ class LinuxBuilder {
             logger.debug('PakeAppOptions', options);
             const { name } = options;
             yield mergeTauriConfig(url, options, tauriConf);
-            const isChina = isChinaDomain("www.npmjs.com");
+            const isChina = yield isChinaDomain("www.npmjs.com");
             if (isChina) {
-                // crates.io也顺便换源
+                logger.info("it's in China, use npm/rust cn mirror");
                 const rust_project_dir = path.join(npmDirectory, 'src-tauri', ".cargo");
-                const project_cn_conf = path.join(rust_project_dir, "cn_config.bak");
+                const e1 = fs$1.access(rust_project_dir);
+                if (e1) {
+                    yield fs$1.mkdir(rust_project_dir, { recursive: true });
+                }
+                const project_cn_conf = path.join(npmDirectory, "src-tauri", "cn_config.bak");
                 const project_conf = path.join(rust_project_dir, "config");
                 fs$1.copyFile(project_cn_conf, project_conf);
                 yield shellExec(`cd "${npmDirectory}" && npm install --registry=https://registry.npmmirror.com && npm run build`);
@@ -2493,7 +2518,7 @@ class BuilderFactory {
 }
 
 var name = "pake-cli";
-var version = "2.0.0-alpha7";
+var version = "2.0.0-alpha9";
 var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App。";
 var engines = {
 	node: ">=16.0.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pake-cli",
-  "version": "2.0.0-alpha7",
+  "version": "2.0.0-alpha9",
   "description": "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App。",
   "engines": {
     "node": ">=16.0.0"

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

@@ -60,6 +60,10 @@ window.addEventListener('DOMContentLoaded', (_event) => {
       visibility: hidden;
     }
 
+    #__next > div.overflow-hidden.w-full.h-full.relative.flex > div.dark.hidden.flex-shrink-0.bg-gray-900.md\\:flex.md\\:w-\\[260px\\].md\\:flex-col > div > div > nav {
+      width: 100%;
+    }
+
     .lark > .dashboard-sidebar, .lark > .dashboard-sidebar > .sidebar-user-info , .lark > .dashboard-sidebar .index-module_wrapper_F-Wbq{
       padding-top:15px;
     }
@@ -111,7 +115,7 @@ window.addEventListener('DOMContentLoaded', (_event) => {
     #react-root a[href*="quick_promote_web"],
     #react-root [data-testid="AppTabBar_Explore_Link"],
     #react-root a[href*="/lists"][role="link"][aria-label],
-    #react-root a[href="/i/bookmarks"] {
+    #react-root a[href*="/i/verified-orgs-signup"][role="link"][aria-label] {
       display: none !important;
     }
 
@@ -159,6 +163,7 @@ window.addEventListener('DOMContentLoaded', (_event) => {
       #react-root header[role="banner"] > div > div > div {
         justify-content: center !important;
         padding-top: 0;
+        overflow-x: hidden;
       }
 
       #react-root form[role="search"] > div:nth-child(1) > div {