crawlo 1.4.6__py3-none-any.whl → 1.4.7__py3-none-any.whl

crawlo/middleware/proxy.py

@@ -1,209 +1,209 @@
-#!/usr/bin/python
-# -*- coding: UTF-8 -*-
-"""
-通用代理中间件
-支持静态代理列表和动态代理API两种模式
-"""
-import random
-from urllib.parse import urlparse
-from typing import Optional, List
-
-from crawlo.network import Request, Response
-from crawlo.utils.log import get_logger
-
-
-class ProxyMiddleware:
-    """通用代理中间件"""
-
-    def __init__(self, settings, log_level):
-        self.logger = get_logger(self.__class__.__name__, log_level)
-
-        # 获取代理列表和API URL
-        self.proxies: List[str] = settings.get("PROXY_LIST", [])
-        self.api_url = settings.get("PROXY_API_URL")
-        # 获取代理提取配置
-        self.proxy_extractor = settings.get("PROXY_EXTRACTOR", "proxy")  # 默认从"proxy"字段提取
-        
-        # 记录失败的代理，避免重复使用
-        self.failed_proxies = set()
-        # 最大失败次数，超过这个次数的代理将被标记为失效
-        self.max_failed_attempts = settings.get("PROXY_MAX_FAILED_ATTEMPTS", 3)
-        # 失效代理记录
-        self.proxy_failure_count = {}
-        
-        # 根据配置决定启用哪种模式
-        if self.proxies:
-            self.mode = "static"  # 静态代理模式
-            self.enabled = True
-            self.logger.info(f"ProxyMiddleware enabled (static mode) with {len(self.proxies)} proxies")
-        elif self.api_url:
-            self.mode = "dynamic"  # 动态代理模式
-            self.enabled = True
-            self.logger.info(f"ProxyMiddleware enabled (dynamic mode) | API: {self.api_url}")
-        else:
-            self.mode = None
-            self.enabled = False
-            self.logger.info("ProxyMiddleware disabled (no proxy configuration)")
-
-    @classmethod
-    def create_instance(cls, crawler):
-        return cls(settings=crawler.settings, log_level=crawler.settings.get("LOG_LEVEL"))
-
-    async def _fetch_proxy_from_api(self) -> Optional[str]:
-        """从代理API获取代理"""
-        try:
-            import aiohttp
-            async with aiohttp.ClientSession() as session:
-                async with session.get(self.api_url) as resp:
-                    if resp.status == 200:
-                        data = await resp.json()
-                        # 支持多种代理提取方式
-                        proxy = self._extract_proxy_from_data(data)
-                        if proxy and isinstance(proxy, str) and (proxy.startswith("http://") or proxy.startswith("https://")):
-                            return proxy
-                    else:
-                        self.logger.warning(f"Proxy API returned status {resp.status}")
-        except Exception as e:
-            self.logger.warning(f"Failed to fetch proxy from API: {repr(e)}")
-        return None
-
-    def _extract_proxy_from_data(self, data) -> Optional[str]:
-        """
-        从API返回的数据中提取代理
-        
-        支持多种提取方式：
-        1. 字符串: 直接作为字段名使用
-        2. 字典: 包含type和value字段，type支持"field"和"jsonpath"
-        3. 函数: 用户自定义提取函数
-        """
-        if isinstance(self.proxy_extractor, str):
-            # 简单字段名提取（向后兼容）
-            if self.proxy_extractor in data:
-                proxy_value = data[self.proxy_extractor]
-                # 如果返回的是字典，尝试提取http或https字段
-                if isinstance(proxy_value, dict):
-                    if "http" in proxy_value:
-                        return proxy_value["http"]
-                    elif "https" in proxy_value:
-                        return proxy_value["https"]
-                return proxy_value
-        elif isinstance(self.proxy_extractor, dict):
-            # 复杂提取规则
-            extractor_type = self.proxy_extractor.get("type", "field")
-            extractor_value = self.proxy_extractor.get("value", "proxy")
-            
-            if extractor_type == "field":
-                # 字段提取
-                if extractor_value in data:
-                    proxy_value = data[extractor_value]
-                    # 如果返回的是字典，尝试提取http或https字段
-                    if isinstance(proxy_value, dict):
-                        if "http" in proxy_value:
-                            return proxy_value["http"]
-                        elif "https" in proxy_value:
-                            return proxy_value["https"]
-                    return proxy_value
-            elif extractor_type == "jsonpath":
-                # JSON路径提取（需要安装jsonpath库）
-                try:
-                    import jsonpath
-                    matches = jsonpath.jsonpath(data, extractor_value)
-                    if matches:
-                        return matches[0]
-                except ImportError:
-                    self.logger.warning("jsonpath library not installed, falling back to default extraction")
-                    if "proxy" in data:
-                        proxy_value = data["proxy"]
-                        if isinstance(proxy_value, dict):
-                            if "http" in proxy_value:
-                                return proxy_value["http"]
-                            elif "https" in proxy_value:
-                                return proxy_value["https"]
-                        return proxy_value
-            elif extractor_type == "custom":
-                # 自定义提取函数（需要用户提供）
-                custom_func = self.proxy_extractor.get("function")
-                if callable(custom_func):
-                    return custom_func(data)
-        elif callable(self.proxy_extractor):
-            # 直接调用用户提供的函数
-            return self.proxy_extractor(data)
-        
-        # 默认提取方式（向后兼容）
-        if "proxy" in data:
-            proxy_value = data["proxy"]
-            # 如果返回的是字典，尝试提取http或https字段
-            if isinstance(proxy_value, dict):
-                if "http" in proxy_value:
-                    return proxy_value["http"]
-                elif "https" in proxy_value:
-                    return proxy_value["https"]
-            return proxy_value
-        
-        return None
-
-    async def process_request(self, request: Request, spider) -> Optional[Request]:
-        """为请求分配代理"""
-        if not self.enabled:
-            return None
-
-        if request.proxy:
-            # 请求已指定代理，不覆盖
-            return None
-
-        proxy = None
-        if self.mode == "static" and self.proxies:
-            # 静态代理模式：随机选择一个代理，排除已知失败的代理
-            available_proxies = [p for p in self.proxies if p not in self.failed_proxies]
-            if available_proxies:
-                proxy = random.choice(available_proxies)
-            else:
-                self.logger.warning("所有静态代理都已失效，将使用直连")
-        elif self.mode == "dynamic" and self.api_url:
-            # 动态代理模式：从API获取代理
-            proxy = await self._fetch_proxy_from_api()
-
-        if proxy:
-            # 检查代理是否在失败列表中
-            if proxy in self.failed_proxies:
-                self.logger.warning(f"尝试使用已知失败的代理: {proxy}，但仍会尝试")
-            
-            request.proxy = proxy
-            self.logger.debug(f"Assigned proxy {proxy} to {request.url}")
-        else:
-            self.logger.warning(f"No proxy available, request connecting directly: {request.url}")
-
-        return None
-
-    def process_response(self, request: Request, response: Response, spider) -> Response:
-        """处理响应"""
-        if request.proxy:
-            self.logger.debug(f"Proxy request successful: {request.proxy} | {request.url}")
-            # 代理请求成功，从失败列表中移除（如果存在）
-            self.failed_proxies.discard(request.proxy)
-            # 重置失败计数
-            if request.proxy in self.proxy_failure_count:
-                del self.proxy_failure_count[request.proxy]
-        return response
-
-    def process_exception(self, request: Request, exception: Exception, spider) -> Optional[Request]:
-        """处理异常"""
-        if request.proxy:
-            error_msg = f"Proxy request failed: {request.proxy} | {request.url} | {repr(exception)}"
-            self.logger.warning(error_msg)
-            
-            # 记录代理失败次数
-            if request.proxy not in self.proxy_failure_count:
-                self.proxy_failure_count[request.proxy] = 0
-            self.proxy_failure_count[request.proxy] += 1
-            
-            # 如果失败次数超过阈值，将代理标记为失效
-            if self.proxy_failure_count[request.proxy] >= self.max_failed_attempts:
-                self.failed_proxies.add(request.proxy)
-                self.logger.warning(f"代理 {request.proxy} 已失败 {self.max_failed_attempts} 次，标记为失效")
-                
-                # 从代理列表中移除（仅适用于静态代理模式）
-                if self.mode == "static" and request.proxy in self.proxies:
-                    self.proxies.remove(request.proxy)
-                    self.logger.info(f"已从静态代理列表中移除失效代理: {request.proxy}")
-        return None
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+"""
+通用代理中间件
+支持静态代理列表和动态代理API两种模式
+"""
+import random
+from urllib.parse import urlparse
+from typing import Optional, List
+
+from crawlo.network import Request, Response
+from crawlo.logging import get_logger
+
+
+class ProxyMiddleware:
+    """通用代理中间件"""
+
+    def __init__(self, settings, log_level):
+        self.logger = get_logger(self.__class__.__name__)
+
+        # 获取代理列表和API URL
+        self.proxies: List[str] = settings.get("PROXY_LIST", [])
+        self.api_url = settings.get("PROXY_API_URL")
+        # 获取代理提取配置
+        self.proxy_extractor = settings.get("PROXY_EXTRACTOR", "proxy")  # 默认从"proxy"字段提取
+        
+        # 记录失败的代理，避免重复使用
+        self.failed_proxies = set()
+        # 最大失败次数，超过这个次数的代理将被标记为失效
+        self.max_failed_attempts = settings.get("PROXY_MAX_FAILED_ATTEMPTS", 3)
+        # 失效代理记录
+        self.proxy_failure_count = {}
+        
+        # 根据配置决定启用哪种模式
+        if self.proxies:
+            self.mode = "static"  # 静态代理模式
+            self.enabled = True
+            self.logger.info(f"ProxyMiddleware enabled (static mode) with {len(self.proxies)} proxies")
+        elif self.api_url:
+            self.mode = "dynamic"  # 动态代理模式
+            self.enabled = True
+            self.logger.info(f"ProxyMiddleware enabled (dynamic mode) | API: {self.api_url}")
+        else:
+            self.mode = None
+            self.enabled = False
+            self.logger.info("ProxyMiddleware disabled (no proxy configuration)")
+
+    @classmethod
+    def create_instance(cls, crawler):
+        return cls(settings=crawler.settings, log_level=crawler.settings.get("LOG_LEVEL"))
+
+    async def _fetch_proxy_from_api(self) -> Optional[str]:
+        """从代理API获取代理"""
+        try:
+            import aiohttp
+            async with aiohttp.ClientSession() as session:
+                async with session.get(self.api_url) as resp:
+                    if resp.status == 200:
+                        data = await resp.json()
+                        # 支持多种代理提取方式
+                        proxy = self._extract_proxy_from_data(data)
+                        if proxy and isinstance(proxy, str) and (proxy.startswith("http://") or proxy.startswith("https://")):
+                            return proxy
+                    else:
+                        self.logger.warning(f"Proxy API returned status {resp.status}")
+        except Exception as e:
+            self.logger.warning(f"Failed to fetch proxy from API: {repr(e)}")
+        return None
+
+    def _extract_proxy_from_data(self, data) -> Optional[str]:
+        """
+        从API返回的数据中提取代理
+        
+        支持多种提取方式：
+        1. 字符串: 直接作为字段名使用
+        2. 字典: 包含type和value字段，type支持"field"和"jsonpath"
+        3. 函数: 用户自定义提取函数
+        """
+        if isinstance(self.proxy_extractor, str):
+            # 简单字段名提取（向后兼容）
+            if self.proxy_extractor in data:
+                proxy_value = data[self.proxy_extractor]
+                # 如果返回的是字典，尝试提取http或https字段
+                if isinstance(proxy_value, dict):
+                    if "http" in proxy_value:
+                        return proxy_value["http"]
+                    elif "https" in proxy_value:
+                        return proxy_value["https"]
+                return proxy_value
+        elif isinstance(self.proxy_extractor, dict):
+            # 复杂提取规则
+            extractor_type = self.proxy_extractor.get("type", "field")
+            extractor_value = self.proxy_extractor.get("value", "proxy")
+            
+            if extractor_type == "field":
+                # 字段提取
+                if extractor_value in data:
+                    proxy_value = data[extractor_value]
+                    # 如果返回的是字典，尝试提取http或https字段
+                    if isinstance(proxy_value, dict):
+                        if "http" in proxy_value:
+                            return proxy_value["http"]
+                        elif "https" in proxy_value:
+                            return proxy_value["https"]
+                    return proxy_value
+            elif extractor_type == "jsonpath":
+                # JSON路径提取（需要安装jsonpath库）
+                try:
+                    import jsonpath
+                    matches = jsonpath.jsonpath(data, extractor_value)
+                    if matches:
+                        return matches[0]
+                except ImportError:
+                    self.logger.warning("jsonpath library not installed, falling back to default extraction")
+                    if "proxy" in data:
+                        proxy_value = data["proxy"]
+                        if isinstance(proxy_value, dict):
+                            if "http" in proxy_value:
+                                return proxy_value["http"]
+                            elif "https" in proxy_value:
+                                return proxy_value["https"]
+                        return proxy_value
+            elif extractor_type == "custom":
+                # 自定义提取函数（需要用户提供）
+                custom_func = self.proxy_extractor.get("function")
+                if callable(custom_func):
+                    return custom_func(data)
+        elif callable(self.proxy_extractor):
+            # 直接调用用户提供的函数
+            return self.proxy_extractor(data)
+        
+        # 默认提取方式（向后兼容）
+        if "proxy" in data:
+            proxy_value = data["proxy"]
+            # 如果返回的是字典，尝试提取http或https字段
+            if isinstance(proxy_value, dict):
+                if "http" in proxy_value:
+                    return proxy_value["http"]
+                elif "https" in proxy_value:
+                    return proxy_value["https"]
+            return proxy_value
+        
+        return None
+
+    async def process_request(self, request: Request, spider) -> Optional[Request]:
+        """为请求分配代理"""
+        if not self.enabled:
+            return None
+
+        if request.proxy:
+            # 请求已指定代理，不覆盖
+            return None
+
+        proxy = None
+        if self.mode == "static" and self.proxies:
+            # 静态代理模式：随机选择一个代理，排除已知失败的代理
+            available_proxies = [p for p in self.proxies if p not in self.failed_proxies]
+            if available_proxies:
+                proxy = random.choice(available_proxies)
+            else:
+                self.logger.warning("所有静态代理都已失效，将使用直连")
+        elif self.mode == "dynamic" and self.api_url:
+            # 动态代理模式：从API获取代理
+            proxy = await self._fetch_proxy_from_api()
+
+        if proxy:
+            # 检查代理是否在失败列表中
+            if proxy in self.failed_proxies:
+                self.logger.warning(f"尝试使用已知失败的代理: {proxy}，但仍会尝试")
+            
+            request.proxy = proxy
+            self.logger.debug(f"Assigned proxy {proxy} to {request.url}")
+        else:
+            self.logger.warning(f"No proxy available, request connecting directly: {request.url}")
+
+        return None
+
+    def process_response(self, request: Request, response: Response, spider) -> Response:
+        """处理响应"""
+        if request.proxy:
+            self.logger.debug(f"Proxy request successful: {request.proxy} | {request.url}")
+            # 代理请求成功，从失败列表中移除（如果存在）
+            self.failed_proxies.discard(request.proxy)
+            # 重置失败计数
+            if request.proxy in self.proxy_failure_count:
+                del self.proxy_failure_count[request.proxy]
+        return response
+
+    def process_exception(self, request: Request, exception: Exception, spider) -> Optional[Request]:
+        """处理异常"""
+        if request.proxy:
+            error_msg = f"Proxy request failed: {request.proxy} | {request.url} | {repr(exception)}"
+            self.logger.warning(error_msg)
+            
+            # 记录代理失败次数
+            if request.proxy not in self.proxy_failure_count:
+                self.proxy_failure_count[request.proxy] = 0
+            self.proxy_failure_count[request.proxy] += 1
+            
+            # 如果失败次数超过阈值，将代理标记为失效
+            if self.proxy_failure_count[request.proxy] >= self.max_failed_attempts:
+                self.failed_proxies.add(request.proxy)
+                self.logger.warning(f"代理 {request.proxy} 已失败 {self.max_failed_attempts} 次，标记为失效")
+                
+                # 从代理列表中移除（仅适用于静态代理模式）
+                if self.mode == "static" and request.proxy in self.proxies:
+                    self.proxies.remove(request.proxy)
+                    self.logger.info(f"已从静态代理列表中移除失效代理: {request.proxy}")
+        return None

crawlo/middleware/request_ignore.py

@@ -1,87 +1,87 @@
-#!/usr/bin/python
-# -*- coding:UTF-8 -*-
-"""
-RequestIgnoreMiddleware 中间件
-用于处理和记录被忽略的请求
-"""
-from crawlo.utils.log import get_logger
-from crawlo.exceptions import IgnoreRequestError
-from crawlo.event import ignore_request
-
-
-class RequestIgnoreMiddleware(object):
-    """
-    RequestIgnoreMiddleware 中间件
-    用于处理和记录被忽略的请求，提供详细的统计信息
-    """
-
-    def __init__(self, stats, log_level):
-        """
-        初始化中间件
-        
-        Args:
-            stats: 统计信息收集器
-            log_level: 日志级别
-        """
-        self.logger = get_logger(self.__class__.__name__, log_level)
-        self.stats = stats
-
-    @classmethod
-    def create_instance(cls, crawler):
-        """
-        创建中间件实例
-        
-        Args:
-            crawler: 爬虫实例
-            
-        Returns:
-            RequestIgnoreMiddleware: 中间件实例
-        """
-        o = cls(stats=crawler.stats, log_level=crawler.settings.get('LOG_LEVEL'))
-        crawler.subscriber.subscribe(o.request_ignore, event=ignore_request)
-        return o
-
-    async def request_ignore(self, exc, request, _spider):
-        """
-        处理被忽略的请求事件
-        
-        Args:
-            exc: 异常对象
-            request: 被忽略的请求
-            _spider: 爬虫实例
-        """
-        # 记录被忽略的请求
-        self.logger.info(f'请求被忽略: {request.url}')
-        self.stats.inc_value('request_ignore_count')
-        
-        # 记录忽略原因
-        reason = getattr(exc, 'msg', 'unknown')
-        if reason:
-            self.stats.inc_value(f'request_ignore_count/reason/{reason}')
-            
-        # 记录请求的域名分布
-        try:
-            from urllib.parse import urlparse
-            parsed_url = urlparse(request.url)
-            domain = parsed_url.netloc
-            if domain:
-                self.stats.inc_value(f'request_ignore_count/domain/{domain}')
-        except Exception:
-            self.stats.inc_value('request_ignore_count/domain/invalid_url')
-
-    @staticmethod
-    def process_exception(_request, exc, _spider):
-        """
-        处理异常，识别IgnoreRequestError
-        
-        Args:
-            _request: 请求对象
-            exc: 异常对象
-            _spider: 爬虫实例
-            
-        Returns:
-            bool: 如果是IgnoreRequestError则返回True，否则返回None
-        """
-        if isinstance(exc, IgnoreRequestError):
-            return True
+#!/usr/bin/python
+# -*- coding:UTF-8 -*-
+"""
+RequestIgnoreMiddleware 中间件
+用于处理和记录被忽略的请求
+"""
+from crawlo.logging import get_logger
+from crawlo.exceptions import IgnoreRequestError
+from crawlo.event import CrawlerEvent
+
+
+class RequestIgnoreMiddleware(object):
+    """
+    RequestIgnoreMiddleware 中间件
+    用于处理和记录被忽略的请求，提供详细的统计信息
+    """
+
+    def __init__(self, stats, log_level):
+        """
+        初始化中间件
+        
+        Args:
+            stats: 统计信息收集器
+            log_level: 日志级别
+        """
+        self.logger = get_logger(self.__class__.__name__)
+        self.stats = stats
+
+    @classmethod
+    def create_instance(cls, crawler):
+        """
+        创建中间件实例
+        
+        Args:
+            crawler: 爬虫实例
+            
+        Returns:
+            RequestIgnoreMiddleware: 中间件实例
+        """
+        o = cls(stats=crawler.stats, log_level=crawler.settings.get('LOG_LEVEL'))
+        crawler.subscriber.subscribe(o.request_ignore, event=CrawlerEvent.IGNORE_REQUEST)
+        return o
+
+    async def request_ignore(self, exc, request, _spider):
+        """
+        处理被忽略的请求事件
+        
+        Args:
+            exc: 异常对象
+            request: 被忽略的请求
+            _spider: 爬虫实例
+        """
+        # 记录被忽略的请求
+        self.logger.info(f'请求被忽略: {request.url}')
+        self.stats.inc_value('request_ignore_count')
+        
+        # 记录忽略原因
+        reason = getattr(exc, 'msg', 'unknown')
+        if reason:
+            self.stats.inc_value(f'request_ignore_count/reason/{reason}')
+            
+        # 记录请求的域名分布
+        try:
+            from urllib.parse import urlparse
+            parsed_url = urlparse(request.url)
+            domain = parsed_url.netloc
+            if domain:
+                self.stats.inc_value(f'request_ignore_count/domain/{domain}')
+        except Exception:
+            self.stats.inc_value('request_ignore_count/domain/invalid_url')
+
+    @staticmethod
+    def process_exception(_request, exc, _spider):
+        """
+        处理异常，识别IgnoreRequestError
+        
+        Args:
+            _request: 请求对象
+            exc: 异常对象
+            _spider: 爬虫实例
+            
+        Returns:
+            bool: 如果是IgnoreRequestError则返回True，否则返回None
+        """
+        if isinstance(exc, IgnoreRequestError):
+            return True
         return None