Optimize network latency acquisition and improve the judgment threshold of Chinese users

bin/utils/ip_addr.ts

@@ -1,6 +1,28 @@
 import { exec } from 'child_process';
 import { promisify } from 'util';
+import logger from '@/options/logger.js';
 import dns from 'dns';
+import http from 'http';
+
+
+const ping = async (host: string) => {
+  const lookup = promisify(dns.lookup);
+  const ip = await lookup(host);
+  const start = new Date();
+
+  return new Promise<number>((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);
 
@@ -8,27 +30,28 @@ async function isChinaDomain(domain: string): Promise<boolean> {
   try {
     // 解析域名为IP地址
     const [ip] = await resolve(domain);
-    return await isChinaIP(ip);
+    return await isChinaIP(ip, domain);
   } catch (error) {
     // 域名无法解析，返回false
+    logger.info(`${domain} can't be parse, is not in China!`);
     return false;
   }
 }
 
-async function isChinaIP(ip: string): Promise<boolean> {
+async function isChinaIP(ip: string, domain: string): Promise<boolean> {
   return new Promise((resolve, reject) => {
-    exec(`ping -c 1 -w 1 ${ip}`, (error, stdout, stderr) => {
+    // exec(`ping -c -w 1 ${ip}`, (error, stdout, stderr) => {
-      if (error) {
+    ping(ip)
+      .then((declay)=>{
+        logger.info(`${domain} latency is ${declay} ms`);
+        // 判断延迟是否超过500ms
+        resolve(declay > 500);
+      })
+      .catch((error)=>{
         // 命令执行出错，返回false
+       logger.info(`ping ${domain} failed!, is not in China!`);
         resolve(false);
-      } else {
+      })
-        // 解析输出信息，提取延迟值
-        const match = stdout.match(/time=(\d+\.\d+) ms/);
-        const latency = match ? parseFloat(match[1]) : 0;
-        // 判断延迟是否超过100ms
-        resolve(latency > 100);
-      }
-    });
   });
 }
 

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,35 +2019,50 @@ 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) => {
+            // exec(`ping -c -w 1 ${ip}`, (error, stdout, stderr) => {
-                if (error) {
+            ping(ip)
+                .then((declay) => {
+                logger.info(`${domain} latency is ${declay} ms`);
+                // 判断延迟是否超过500ms
+                resolve(declay > 500);
+            })
+                .catch((error) => {
                 // 命令执行出错，返回false
+                logger.info(`ping ${domain} failed!, is not in China!`);
                 resolve(false);
-                }
-                else {
-                    // 解析输出信息，提取延迟值
-                    const match = stdout.match(/time=(\d+\.\d+) ms/);
-                    const latency = match ? parseFloat(match[1]) : 0;
-                    // 判断延迟是否超过100ms
-                    resolve(latency > 100);
-                }
             });
         });
     });

package.json

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