Upload proxy_pool.py

proxy_pool.py

@@ -16,6 +16,40 @@ class ProxyPool:
         self.last_fetch_time = datetime.min
         self.fetch_interval = 300  # 5分钟更新一次代理池
         
+    def _parse_proxy_list(self, text):
+        """解析代理列表文本"""
+        proxies = []
+        for line in text.strip().split(','):
+            line = line.strip()
+            if not line:
+                continue
+            
+            try:
+                if line.startswith('http://'):
+                    proxy_type = 'http'
+                    proxy = line[7:]
+                elif line.startswith('socks4://'):
+                    proxy_type = 'socks4'
+                    proxy = line[9:]
+                elif line.startswith('socks5://'):
+                    proxy_type = 'socks5'
+                    proxy = line[9:]
+                else:
+                    continue
+                
+                if ':' in proxy:
+                    ip, port = proxy.split(':')
+                    proxies.append({
+                        'type': proxy_type,
+                        'ip': ip,
+                        'port': int(port)
+                    })
+            except Exception as e:
+                logger.error(f"解析代理失败: {line}, 错误: {e}")
+                continue
+                
+        return proxies
+
     def _fetch_proxies(self):
         """从API获取代理列表"""
         try:
@@ -29,8 +63,9 @@ class ProxyPool:
             for url in urls:
                 response = requests.get(url, timeout=10)
                 if response.status_code == 200:
-                    proxies = response.json()
+                    proxies = self._parse_proxy_list(response.text)
                     new_proxies.extend(proxies)
+                    logger.info(f"成功获取 {len(proxies)} 个代理从 {url}")
             
             return new_proxies
         except Exception as e:
@@ -82,7 +117,7 @@ class ProxyPool:
                     proxy_str = f"{proxy_type}://{proxy_ip}:{proxy.get('port')}"
                     return {
                         'http': proxy_str,
-                        'https': proxy_str
+                        'https': proxy_str if proxy_type == 'http' else None
                     }
             
             return None
@@ -92,4 +127,4 @@ class ProxyPool:
         with self.lock:
             if proxy in self.proxies:
                 self.proxies.remove(proxy)
-                logger.info(f"移除无效代理: {proxy}") 
+                logger.info(f"移除无效代理: {proxy}")