block-proxy 0.1.9 → 0.1.10

package/config.json

@@ -147,4 +147,4 @@
       "mac": "FA:27:3C:E5:31:5F"
     }
   ]
-}
+}

package/example/rule.js

@@ -37,3 +37,4 @@ module.exports = {
     }
   ]
 };
+

package/hack-of-anyproxy/lib/requestHandler.js

@@ -46,6 +46,28 @@ function normalizeSocketKey(ip, port) {
   return ip + ":" + port
 }
 
+// 判断是否命中 responseRules
+function matchResponseRule(responseRules, userConfig) {
+  try {
+    var hostname = userConfig.requestOptions.hostname.split(":")[0].toLowerCase();
+    var pathname = userConfig.requestOptions.path; // 带query
+    var url = `${userConfig.protocol}://${hostname}${pathname}`
+    var matched = false;
+    for (const item of responseRules) {
+      if (hostname.endsWith(item["host"]) && new RegExp(item['regexp']).test(url)) {
+        matched = true;
+        break;
+      } else {
+        continue;
+      }
+    }
+    return matched;
+  } catch (e) {
+    console.log(e);
+    return false;
+  }
+}
+
 class CommonReadableStream extends Readable {
   constructor(config) {
     super({
@@ -467,6 +489,15 @@ function getUserReqHandler(userRule, recorder) {
 
       // route user config
       .then(co.wrap(function *(userConfig) {
+        // Modified 2026-1-15
+        // 增加了对 responseRules 的判断，如果需要对 BeforeResponse 进行拦截
+        // 则让 chunkSizeThreshold 为很大的值（默认20M），以便让 response 一次性返回，方便BeforeResponse处理
+        // 否则以 512k 为上线，只要返回的数据达到阈值，就直接返回给调用端，以提高性能
+        if (userRule.responseRules && matchResponseRule(userRule.responseRules, userConfig)) {
+          var _chunkSizeThreshold = chunkSizeThreshold;
+        } else {
+          var _chunkSizeThreshold = 0.5 * 1024 * 1024; // 512K
+        }
         if (userConfig.response) {
           // user-assigned local response
           userConfig._directlyPassToRespond = true;
@@ -474,7 +505,7 @@ function getUserReqHandler(userRule, recorder) {
         } else if (userConfig.requestOptions) {
           const remoteResponse = yield fetchRemoteResponse(userConfig.protocol, userConfig.requestOptions, userConfig.requestData, {
             dangerouslyIgnoreUnauthorized: reqHandlerCtx.dangerouslyIgnoreUnauthorized,
-            chunkSizeThreshold,
+            chunkSizeThreshold: _chunkSizeThreshold,
           });
           return {
             response: {
@@ -1026,3 +1057,4 @@ class RequestHandler {
 }
 
 module.exports = RequestHandler;
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "block-proxy",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "Small-scale network mitm proxy filter",
   "bin": {
     "block-proxy": "bin/start.js"
@@ -16,7 +16,7 @@
     "url": "git+https://github.com/jayli/block-proxy.git"
   },
   "scripts": {
-    "cp": "echo '---- program start ----'",
+    "cp": "echo '----- program start -----'",
     "craco": "craco start",
     "dev": "BLOCK_PROXY_DEV=1 npm run express",
     "start": "npm run express",

package/proxy/proxy.js

@@ -29,11 +29,12 @@ var   Rule = require("./mitm/rule.js");
 // 启用全局 keep-alive，使 AnyProxy 内部转发也复用连接
 http.globalAgent.keepAlive = true;
 https.globalAgent.keepAlive = true;
-http.globalAgent.maxSockets = 50;
-https.globalAgent.maxSockets = 50;
+// 连接上限 50 应该足够了，设置 100 留足 buffer
+http.globalAgent.maxSockets = 100;
+https.globalAgent.maxSockets = 100;
 
-const httpAgent = new http.Agent({ keepAlive: true, maxSockets: 50 });
-const httpsAgent = new https.Agent({ keepAlive: true, maxSockets: 50 });
+const httpAgent = new http.Agent({ keepAlive: true, maxSockets: 100 });
+const httpsAgent = new https.Agent({ keepAlive: true, maxSockets: 100 });
 
 // 全局参数
 const configPath = path.join(__dirname, '../config.json');
@@ -90,6 +91,8 @@ function authPass(protocol, host, url) {
     "weixin.qq.com",
     // xiaohongshu.com:443，小红书App和知乎 App 里发起带端口的请求，收到 407 后第二次
     "xiaohongshu.com:443",
+    "xiaohongshu.com",
+    "xhscdn.com",
     "zhihu.com:443",
     ...filtered_mitm_domains
   ];

package/proxy/scan.js

@@ -78,6 +78,46 @@ async function getScanStatus() {
   return loadedConfig.network_scanning_status;
 }
 
+// 并发控制器，限制同时进行的 ping 数量
+class ConcurrentPingController {
+  constructor(maxConcurrent = 32, batchDelay = 50) {
+    this.maxConcurrent = maxConcurrent;
+    this.batchDelay = batchDelay; // 批次之间的延迟（毫秒）
+  }
+
+  // 批量执行 ping，控制并发数（真正的批次并发）
+  async batchPing(ips, timeout = 1) {
+    const results = [];
+
+    // 将IP列表分成多个批次
+    for (let i = 0; i < ips.length; i += this.maxConcurrent) {
+      const batch = ips.slice(i, i + this.maxConcurrent);
+
+      // 并发执行当前批次的所有ping
+      const batchPromises = batch.map(ip =>
+        ping.promise.probe(ip, { timeout })
+      );
+
+      const batchResults = await Promise.allSettled(batchPromises);
+
+      // 将批次结果添加到总结果中
+      batch.forEach((ip, index) => {
+        results.push({
+          ip,
+          result: batchResults[index]
+        });
+      });
+
+      // 如果不是最后一个批次，则添加延迟
+      if (i + this.maxConcurrent < ips.length) {
+        await new Promise(resolve => setTimeout(resolve, this.batchDelay));
+      }
+    }
+
+    return results;
+  }
+}
+
 async function doScan() {
   const subnet = getLocalSubnet();
   // 如果是 30 网段，直接返回空
@@ -86,11 +126,17 @@ async function doScan() {
   }
   console.log(`正在扫描网段: ${subnet}.0/24`);
 
-  // Ping all IPs to populate ARP cache
+  // 创建并发控制器，限制同时进行32个ping，批次间延迟50ms
+  const controller = new ConcurrentPingController(32, 50);
+
+  // 生成所有IP地址
   const ips = Array.from({ length: 254 }, (_, i) => `${subnet}.${i + 1}`);
-  await Promise.allSettled(ips.map(ip => ping.promise.probe(ip, { timeout: 1 })));
 
-  // Read ARP table via system command
+  // 使用并发控制器分批ping所有IP
+  console.log(`开始并发ping扫描，最大并发数: 32，批次延迟: 50ms`);
+  await controller.batchPing(ips, 1); // 使用1秒超时，ping结果仅用于填充ARP缓存
+
+  // 读取ARP表以获取MAC地址
   const cmd = process.platform === 'win32' ? 'arp -a' : 'arp -a';
   const arpOutput = await new Promise((resolve, reject) => {
     exec(cmd, async (error, stdout) => {

package/server/express.js

@@ -232,3 +232,4 @@ module.exports = {
     });
   }
 };
+

package/socks5/test_tls_reuse.js

@@ -38,3 +38,4 @@ sock1.on('secureConnect', () => {
   };
   setTimeout(trySecond, 5);
 });
+

package/src/setupTests.js

@@ -3,3 +3,4 @@
 // expect(element).toHaveTextContent(/react/i)
 // learn more: https://github.com/testing-library/jest-dom
 import '@testing-library/jest-dom';
+

package/tools/speed_test.sh

@@ -119,3 +119,4 @@ if [ -n "$real_time" ]; then
 else
     echo "⚠️  无法获取耗时（shell 不支持 time 内置命令的格式）"
 fi
+