Upload 16 files

src/ProxyServer.js

@@ -1,169 +1,169 @@
-import { spawn } from 'child_process';
-import { fileURLToPath } from 'url';
-import { dirname, join } from 'path';
-import fs from 'fs';
-import os from 'os';
-import dotenv from 'dotenv';
-import chalk from 'chalk';
-
-// 获取当前文件的目录路径
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-// 加载环境变量
-dotenv.config({ path: join(dirname(__dirname), '.env') });
-
-// 日志配置
-const logger = {
-  info: (message) => console.log(chalk.blue(`[ProxyServer] ${message}`)),
-  error: (message) => console.error(chalk.red(`[ProxyServer] ${message}`)),
-  warning: (message) => console.warn(chalk.yellow(`[ProxyServer] ${message}`)),
-  success: (message) => console.log(chalk.green(`[ProxyServer] ${message}`)),
-};
-
-class ProxyServer {
-  constructor() {
-    this.proxyProcess = null;
-    this.platform = process.env.PROXY_SERVER_PLATFORM || 'auto';
-    this.port = process.env.PROXY_SERVER_PORT || 10655;
-    this.enabled = process.env.ENABLE_PROXY_SERVER === 'true';
-    this.proxyAuthToken = process.env.PROXY_AUTH_TOKEN || 'default_token';
-  }
-
-  // 获取当前系统平台
-  detectPlatform() {
-    if (this.platform !== 'auto') {
-      return this.platform;
-    }
-
-    const platform = os.platform();
-    const arch = os.arch();
-
-    if (platform === 'win32') {
-      return 'windows';
-    } else if (platform === 'linux') {
-      if (arch === 'arm64') {
-        return 'android';
-      } else {
-        return 'linux';
-      }
-    } else if (platform === 'android') {
-      return 'android';
-    } else {
-      logger.warning(`未知平台: ${platform}, ${arch}, 默认使用linux版本`);
-      return 'linux';
-    }
-  }
-
-  // 获取代理服务器可执行文件路径
-  getProxyServerPath() {
-    const platform = this.detectPlatform();
-    const proxyDir = join(__dirname, 'proxy');
-
-    switch (platform) {
-      case 'windows':
-        return join(proxyDir, 'chrome_proxy_server_windows_amd64.exe');
-      case 'linux':
-        return join(proxyDir, 'chrome_proxy_server_linux_amd64');
-      case 'android':
-        return join(proxyDir, 'chrome_proxy_server_android_arm64');
-      default:
-        logger.error(`不支持的平台: ${platform}`);
-        return null;
-    }
-  }
-
-  // 启动代理服务器
-  async start() {
-    if (!this.enabled) {
-      logger.info('代理服务器未启用，跳过启动');
-      return;
-    }
-
-    if (this.proxyProcess) {
-      logger.warning('代理服务器已经在运行中');
-      return;
-    }
-
-    const proxyServerPath = this.getProxyServerPath();
-    if (!proxyServerPath) {
-      logger.error('无法获取代理服务器路径');
-      return;
-    }
-
-    try {
-      // 启动代理服务器进程
-      this.proxyProcess = spawn(proxyServerPath, [
-        '--port', this.port.toString(),
-        '--token', this.proxyAuthToken
-      ], {
-        stdio: ['ignore', 'pipe', 'pipe'], // 使用pipe而不是直接传递流
-        detached: false
-      });
-
-      // 将进程的输出重定向到主进程
-      if (this.proxyProcess.stdout) {
-        this.proxyProcess.stdout.pipe(process.stdout);
-      }
-      
-      if (this.proxyProcess.stderr) {
-        this.proxyProcess.stderr.pipe(process.stderr);
-      }
-
-      // 设置进程事件处理
-      this.proxyProcess.on('error', (err) => {
-        logger.error(`代理服务器启动失败: ${err.message}`);
-        this.proxyProcess = null;
-      });
-
-      this.proxyProcess.on('exit', (code, signal) => {
-        logger.info(`代理服务器已退出，退出码: ${code}, 信号: ${signal}`);
-        this.proxyProcess = null;
-      });
-
-      // 等待一段时间，确保服务器启动
-      await new Promise(resolve => setTimeout(resolve, 1000));
-      
-      if (this.proxyProcess && this.proxyProcess.exitCode === null) {
-        logger.success(`代理服务器已启动，端口: ${this.port}`);
-        return true;
-      } else {
-        logger.error('代理服务器启动失败');
-        return false;
-      }
-    } catch (error) {
-      logger.error(`启动代理服务器时出错: ${error.message}`);
-      return false;
-    }
-  }
-
-  // 停止代理服务器
-  stop() {
-    if (!this.proxyProcess) {
-      //logger.info('代理服务器已关闭');
-      return;
-    }
-
-    try {
-      // 在Windows上使用taskkill确保子进程也被终止
-      if (this.detectPlatform() === 'windows' && this.proxyProcess.pid) {
-        spawn('taskkill', ['/pid', this.proxyProcess.pid, '/f', '/t']);
-      } else {
-        // 在Linux/Android上使用kill信号
-        this.proxyProcess.kill('SIGTERM');
-      }
-
-      logger.success('代理服务器已停止');
-    } catch (error) {
-      logger.error(`停止代理服务器时出错: ${error.message}`);
-    } finally {
-      this.proxyProcess = null;
-    }
-  }
-}
-
-// 创建单例
-const proxyServer = new ProxyServer();
-
-// 导出
+import { spawn } from 'child_process';
+import { fileURLToPath } from 'url';
+import { dirname, join } from 'path';
+import fs from 'fs';
+import os from 'os';
+import dotenv from 'dotenv';
+import chalk from 'chalk';
+
+// 获取当前文件的目录路径
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+// 加载环境变量
+dotenv.config({ path: join(dirname(__dirname), '.env') });
+
+// 日志配置
+const logger = {
+  info: (message) => console.log(chalk.blue(`[ProxyServer] ${message}`)),
+  error: (message) => console.error(chalk.red(`[ProxyServer] ${message}`)),
+  warning: (message) => console.warn(chalk.yellow(`[ProxyServer] ${message}`)),
+  success: (message) => console.log(chalk.green(`[ProxyServer] ${message}`)),
+};
+
+class ProxyServer {
+  constructor() {
+    this.proxyProcess = null;
+    this.platform = process.env.PROXY_SERVER_PLATFORM || 'auto';
+    this.port = process.env.PROXY_SERVER_PORT || 10655;
+    this.enabled = process.env.ENABLE_PROXY_SERVER === 'true';
+    this.proxyAuthToken = process.env.PROXY_AUTH_TOKEN || 'default_token';
+  }
+
+  // 获取当前系统平台
+  detectPlatform() {
+    if (this.platform !== 'auto') {
+      return this.platform;
+    }
+
+    const platform = os.platform();
+    const arch = os.arch();
+
+    if (platform === 'win32') {
+      return 'windows';
+    } else if (platform === 'linux') {
+      if (arch === 'arm64') {
+        return 'android';
+      } else {
+        return 'linux';
+      }
+    } else if (platform === 'android') {
+      return 'android';
+    } else {
+      logger.warning(`未知平台: ${platform}, ${arch}, 默认使用linux版本`);
+      return 'linux';
+    }
+  }
+
+  // 获取代理服务器可执行文件路径
+  getProxyServerPath() {
+    const platform = this.detectPlatform();
+    const proxyDir = join(__dirname, 'proxy');
+
+    switch (platform) {
+      case 'windows':
+        return join(proxyDir, 'chrome_proxy_server_windows_amd64.exe');
+      case 'linux':
+        return join(proxyDir, 'chrome_proxy_server_linux_amd64');
+      case 'android':
+        return join(proxyDir, 'chrome_proxy_server_android_arm64');
+      default:
+        logger.error(`不支持的平台: ${platform}`);
+        return null;
+    }
+  }
+
+  // 启动代理服务器
+  async start() {
+    if (!this.enabled) {
+      logger.info('代理服务器未启用，跳过启动');
+      return;
+    }
+
+    if (this.proxyProcess) {
+      logger.warning('代理服务器已经在运行中');
+      return;
+    }
+
+    const proxyServerPath = this.getProxyServerPath();
+    if (!proxyServerPath) {
+      logger.error('无法获取代理服务器路径');
+      return;
+    }
+
+    try {
+      // 启动代理服务器进程
+      this.proxyProcess = spawn(proxyServerPath, [
+        '--port', this.port.toString(),
+        '--token', this.proxyAuthToken
+      ], {
+        stdio: ['ignore', 'pipe', 'pipe'], // 使用pipe而不是直接传递流
+        detached: false
+      });
+
+      // 将进程的输出重定向到主进程
+      if (this.proxyProcess.stdout) {
+        this.proxyProcess.stdout.pipe(process.stdout);
+      }
+      
+      if (this.proxyProcess.stderr) {
+        this.proxyProcess.stderr.pipe(process.stderr);
+      }
+
+      // 设置进程事件处理
+      this.proxyProcess.on('error', (err) => {
+        logger.error(`代理服务器启动失败: ${err.message}`);
+        this.proxyProcess = null;
+      });
+
+      this.proxyProcess.on('exit', (code, signal) => {
+        logger.info(`代理服务器已退出，退出码: ${code}, 信号: ${signal}`);
+        this.proxyProcess = null;
+      });
+
+      // 等待一段时间，确保服务器启动
+      await new Promise(resolve => setTimeout(resolve, 1000));
+      
+      if (this.proxyProcess && this.proxyProcess.exitCode === null) {
+        logger.success(`代理服务器已启动，端口: ${this.port}`);
+        return true;
+      } else {
+        logger.error('代理服务器启动失败');
+        return false;
+      }
+    } catch (error) {
+      logger.error(`启动代理服务器时出错: ${error.message}`);
+      return false;
+    }
+  }
+
+  // 停止代理服务器
+  stop() {
+    if (!this.proxyProcess) {
+      //logger.info('代理服务器已关闭');
+      return;
+    }
+
+    try {
+      // 在Windows上使用taskkill确保子进程也被终止
+      if (this.detectPlatform() === 'windows' && this.proxyProcess.pid) {
+        spawn('taskkill', ['/pid', this.proxyProcess.pid, '/f', '/t']);
+      } else {
+        // 在Linux/Android上使用kill信号
+        this.proxyProcess.kill('SIGTERM');
+      }
+
+      logger.success('代理服务器已停止');
+    } catch (error) {
+      logger.error(`停止代理服务器时出错: ${error.message}`);
+    } finally {
+      this.proxyProcess = null;
+    }
+  }
+}
+
+// 创建单例
+const proxyServer = new ProxyServer();
+
+// 导出
 export { proxyServer }; 

src/lightweight-client.js

@@ -14,6 +14,8 @@ import {
 import { proxyPool } from './ProxyPool.js';
 import { proxyServer } from './ProxyServer.js';
 import { cookieManager } from './CookieManager.js';
+import { HttpsProxyAgent } from 'https-proxy-agent';
+import dns from 'dns';
 
 // 获取当前文件的目录路径
 const __filename = fileURLToPath(import.meta.url);
@@ -380,34 +382,50 @@ async function fetchNotionResponse(chunkQueue, notionRequestBody, headers, notio
     // 创建fetch选项
     const fetchOptions = {
       method: 'POST',
-      headers: {
-        ...headers,
-        'user-agent': window.navigator.userAgent,
-        'Cookie': notionCookie
-      },
+      headers: headers,
       body: JSON.stringify(notionRequestBody),
+      timeout: 120000 // 120s
     };
     
-    // 添加代理配置（如果有）
+    // 根据条件添加代理
     if (USE_NATIVE_PROXY_POOL && ENABLE_PROXY_SERVER && !PROXY_URL) {
-      proxy = proxyPool.getProxy();
-      if (proxy !== null)
-      {
-        logger.info(`使用代理: ${proxy.full}`);
-      }
-      else{
-        logger.warning(`没有可用代理`);
+      const proxy = await proxyPool.getProxy();
+      if (proxy) {
+        fetchOptions.agent = new HttpsProxyAgent(proxy.url);
+        logger.info(`使用原生代理池: ${proxy.url} (来自 ${proxy.source})`);
+      } else {
+        logger.warning("原生代理池已启用但没有可用的代理，将不使用代理");
       }
     } else if(USE_NATIVE_PROXY_POOL&&!PROXY_URL&&!ENABLE_PROXY_SERVER) {
-      const { HttpsProxyAgent } = await import('https-proxy-agent');
-      proxy = proxyPool.getProxy();
-      fetchOptions.agent = new HttpsProxyAgent(proxy.full);
-      logger.info(`使用代理: ${proxy.full}`);
+      const proxy = await proxyPool.getProxy();
+      if (proxy) {
+        fetchOptions.agent = new HttpsProxyAgent(proxy.url);
+        logger.info(`使用原生代理池: ${proxy.url} (来自 ${proxy.source})`);
+      } else {
+        logger.warning("原生代理池已启用但没有可用的代理，将不使用代理");
+      }
     }else if(PROXY_URL){
-      const { HttpsProxyAgent } = await import('https-proxy-agent');
-      fetchOptions.agent = new HttpsProxyAgent(PROXY_URL);
+      // IPv6 优先
+      const customLookup = (hostname, options, callback) => {
+        dns.lookup(hostname, { family: 6 }, (err, address, family) => {
+          if (err) {
+            // 如果 IPv6 查询失败，则回退到 IPv4
+            dns.lookup(hostname, { family: 4 }, (err, address, family) => {
+              callback(err, address, family);
+            });
+          } else {
+            callback(err, address, family);
+          }
+        });
+      };
+      fetchOptions.agent = new HttpsProxyAgent(PROXY_URL, { lookup: customLookup });
       logger.info(`使用代理: ${PROXY_URL}`);
     }
+    else if (ENABLE_PROXY_SERVER && !USE_NATIVE_PROXY_POOL && !PROXY_URL){
+      const proxy = await proxyPool.getProxy();
+      fetchOptions.agent = new HttpsProxyAgent(proxy.url);
+      logger.info(`使用代理: ${proxy.url} (来自 ${proxy.source})`);
+    }
     let response = null;
     // 发送请求
     if (ENABLE_PROXY_SERVER && USE_NATIVE_PROXY_POOL){