block-proxy 0.1.1 → 0.1.2

package/bin/start.js

@@ -3,43 +3,94 @@
 const { spawn } = require('child_process');
 const path = require('path');
 
-// 获取包根目录和 start.js 路径
 const pkgDir = path.join(__dirname, '..');
 const startScript = path.resolve(pkgDir, 'server/start.js');
+const MAX_RESTARTS = 10000;
+let restartCount = 0;
+let restartTimer = null;
+let currentChild = null; // 👈 全局引用当前子进程
 
-// 构造命令：先运行 npm run cp，再运行 node server/start.js
-const command = `npm run cp && node "${startScript}"`;
+function startApp() {
+  const command = `npm run cp && node "${startScript}"`;
+  console.error(`[💟] Block-Proxy 启动 (第 ${restartCount + 1} 次): ${command}`);
 
-console.error(`[💟] Block-Proxy 启动: ${command}`);
+  currentChild = spawn(command, {
+    cwd: pkgDir,
+    shell: true,
+    stdio: 'pipe'
+  });
 
-// 使用 spawn + shell: true 来支持 && 和管道
-const child = spawn(command, {
-  cwd: pkgDir,
-  shell: true,           // ⭐ 必须启用 shell 才能解析 &&、|、> 等
-  stdio: 'pipe'          // 我们要手动处理流
-});
+  currentChild.stdout.on('data', (data) => {
+    process.stdout.write(data);
+  });
 
-// 实时输出 stdout（流式）
-child.stdout.on('data', (data) => {
-  process.stdout.write(data); // 直接写到父进程 stdout
-});
+  currentChild.stderr.on('data', (data) => {
+    process.stderr.write(data);
+  });
 
-// 实时输出 stderr（流式）
-child.stderr.on('data', (data) => {
-  process.stderr.write(data);
-});
+  currentChild.on('close', (code, signal) => {
+    currentChild = null; // 清空引用
+    if (restartTimer) {
+      clearTimeout(restartTimer);
+      restartTimer = null;
+    }
 
-// 处理子进程退出
-child.on('close', (code, signal) => {
-  console.error(`\n[my_app] Process exited with code ${code}`);
-  process.exit(code || 0);
-});
+    if (code === 0) {
+      console.error('[block proxy] 正常退出，不重启。');
+      process.exit(0);
+      return;
+    }
+
+    if (signal === 'SIGINT' || signal === 'SIGTERM') {
+      console.error('[block-proxy] 被信号终止，不重启。');
+      process.exit(128 + (signal === 'SIGINT' ? 2 : 15));
+      return;
+    }
 
-// 转发 Ctrl+C 信号（重要！）
+    if (restartCount < MAX_RESTARTS) {
+      restartCount++;
+      console.error(`[block proxy] 将在 3 秒后自动重启...（已重启 ${restartCount}/${MAX_RESTARTS} 次）`);
+      restartTimer = setTimeout(() => {
+        restartTimer = null;
+        startApp();
+      }, 3000);
+    } else {
+      console.error(`[block proxy] 已达到最大重启次数 (${MAX_RESTARTS})，停止尝试。`);
+      process.exit(1);
+    }
+  });
+}
+
+// ✅ 只注册一次 SIGINT 监听器（在 startApp 外部！）
 process.on('SIGINT', () => {
-  console.error('\n[my_app] Received SIGINT, shutting down...');
-  child.kill('SIGINT'); // 发送中断信号给子进程
-  setTimeout(() => {
-    child.kill('SIGTERM'); // 2秒后强制终止
-  }, 2000);
+  console.error('\n[block proxy] 收到 SIGINT，正在关闭子进程...');
+  
+  if (restartTimer) {
+    clearTimeout(restartTimer);
+    restartTimer = null;
+  }
+
+  if (currentChild) {
+    currentChild.kill('SIGINT');
+    // 注意：不要在这里 exit，等 close 事件处理
+  } else {
+    // 如果没有子进程，直接退出
+    process.exit(0);
+  }
 });
+
+process.on('SIGTERM', () => {
+  console.error('\n[block proxy] 收到 SIGTERM，正在关闭子进程...');
+  if (restartTimer) {
+    clearTimeout(restartTimer);
+    restartTimer = null;
+  }
+  if (currentChild) {
+    currentChild.kill('SIGTERM');
+  } else {
+    process.exit(0);
+  }
+});
+
+// 启动
+startApp();

package/config.json

@@ -1,5 +1,5 @@
 {
-  "network_scanning_status": "0",
+  "network_scanning_status": "1",
   "progress_time_stamp": "1766571511705",
   "block_hosts": [
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "block-proxy",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Small-scale network proxy filter",
   "bin":{
     "block-proxy": "./bin/start.js"

package/proxy/proxy.js

@@ -207,7 +207,12 @@ async function loadConfig() {
 
 async function updateWanIp() {
   // var ips = await domain.getDomainIP(your_domain);
-  var ip = await wanip.getPublicIp();
+  var ip = "0.0.0.0";
+  try {
+    ip = await wanip.getPublicIp();
+  } catch(e) {
+    ip = "0.0.0.0";
+  }
   if (ip === null) {
     ip = "0.0.0.0";
   }
@@ -398,9 +403,9 @@ function startProxyServer() {
     proxyServerInstance = new AnyProxy.ProxyServer(options);
 
     proxyServerInstance.on('ready', () => {
-      console.log(`✅ Proxy server started on port ${proxyPort}`);
+      console.log(`✅ \x1b[32mHTTP 代理服务启动，端口 ${proxyPort}\x1b[0m`);
       if (enable_webinterface == "1") {
-        console.log(`✅ Web interface available on port ${webInterfacePort}`);
+        console.log(`✅ \x1b[32mAnyProxy 监控面板启动，端口 ${webInterfacePort}\x1b[0m`);
       }
       console.log('Intercepting requests to hosts:', blockHosts.join(', '));
       console.log('All other requests will be passed through without HTTPS interception');

package/server/express.js

@@ -206,7 +206,6 @@ module.exports = {
   init: function() {
     // 启动服务器
     app.listen(PORT, async () => {
-      console.log(`✅ 静态服务器运行在 http://localhost:${PORT}`);
       // 如果是开发环境，则启动SSR服务，开启端口3000
       if (DEV === '1') {
         const child = exec('npm run craco', { cwd: path.join(__dirname,'../') });
@@ -227,6 +226,7 @@ module.exports = {
       }
       // 启动本地代理
       await LocalProxy.init();
+      console.log(`✅ \x1b[32m后台配置面板启动 → http://localhost:${PORT}\x1b[0m`);
     });
   }
 };

package/socks5/server.js

@@ -196,6 +196,12 @@ async function init() {
 
     // 创建 TLS 封装的 SOCKS5 服务器
     const server = tls.createServer(tlsOptions, async (socket) => {
+      // 👇 关键：捕获 socket 级别的错误（包括 ECONNRESET）
+      socket.on('error', (err) => {
+        console.warn('Client socket error (ignored):', err.message);
+        // 不需要手动 destroy()，Node.js 会自动关闭
+      });
+
       try {
         // Step 1: 协商认证方法
         const authMethodsBuf = await new Promise((resolve) => {
@@ -295,6 +301,11 @@ async function init() {
       }
     });
 
+    server.on('clientError', (err, socket) => {
+      console.warn('TLS client error during handshake:', err.message);
+      socket?.end(); // 安全关闭
+    });
+
     // 错误处理
     server.on('tlsClientError', (err, tlsSocket) => {
       console.warn('TLS handshake failed:', err.message);
@@ -307,10 +318,10 @@ async function init() {
 
     // 启动监听
     server.listen(LISTEN_PORT, () => {
-      console.log(`✅ SOCKS5 over TLS server started on port ${LISTEN_PORT}`);
-      console.log(`🔒 Credentials and traffic are encrypted via TLS`);
-      console.log(`➡️  TCP → downstream HTTP proxy at ${DOWNSTREAM_HTTP_PROXY_HOST}:${DOWNSTREAM_HTTP_PROXY_PORT}`);
-      console.log(`➡️  UDP → direct local relay`);
+      console.log(`✅ \x1b[32mSOCKS5 (over TLS) 服务启动，端口 ${LISTEN_PORT}\x1b[0m`);
+      console.log(`🔒 传输加密和认证基于 TLS`);
+      console.log(`➡️  TCP → 流量转发至 HTTP 代理 → ${DOWNSTREAM_HTTP_PROXY_HOST}:${DOWNSTREAM_HTTP_PROXY_PORT}`);
+      console.log(`➡️  UDP → 直接发起请求`);
     });
   } catch (err) {
     console.error('Failed to initialize SOCKS5-TLS proxy:', err);