crawlo 1.2.8__py3-none-any.whl → 1.2.9__py3-none-any.whl

crawlo/downloader/cffi_downloader.py

@@ -1,257 +1,246 @@
-#!/usr/bin/python
-# -*- coding: UTF-8 -*-
-import asyncio
-import random
-import time
-from typing import Optional, Dict, Any
-from curl_cffi import CurlError
-from curl_cffi.requests import AsyncSession
-
-from crawlo.network.response import Response
-from crawlo.downloader import DownloaderBase
-
-
-class CurlCffiDownloader(DownloaderBase):
-    """
-    基于 curl-cffi 的高性能异步下载器
-    - 支持真实浏览器指纹模拟，绕过Cloudflare等反爬虫检测
-    - 高性能的异步HTTP客户端，基于libcurl
-    - 内存安全的响应处理
-    - 自动代理和Cookie管理
-    - 支持请求延迟、重试、警告大小检查等高级功能
-    """
-
-    def __init__(self, crawler):
-        super().__init__(crawler)
-        self.session: Optional[AsyncSession] = None
-        self.max_download_size: int = 0
-        self.download_warn_size: int = 0
-        self.download_delay: float = 0
-        self.randomize_delay: bool = False
-        self.default_headers: dict = {}
-        # 使用默认值，但会在 open 中被 settings 覆盖
-        self.browser_type_str: str = "chrome136"
-        self._last_request_time: float = 0
-        self._active_requests: set = set()  # 用于跟踪活跃请求
-
-    def open(self):
-        super().open()
-        self.logger.info("正在打开 CurlCffiDownloader")
-
-        # 读取配置
-        timeout_secs = self.crawler.settings.get_int("DOWNLOAD_TIMEOUT", 30)
-        verify_ssl = self.crawler.settings.get_bool("VERIFY_SSL", True)
-        pool_size = self.crawler.settings.get_int("CONNECTION_POOL_LIMIT", 100)
-        self.max_download_size = self.crawler.settings.get_int("DOWNLOAD_MAXSIZE", 10 * 1024 * 1024)  # 10MB
-        self.download_warn_size = self.crawler.settings.get_int("DOWNLOAD_WARN_SIZE", 1024 * 1024)  # 1MB
-        self.download_delay = self.crawler.settings.get_float("DOWNLOAD_DELAY", 0)
-        self.randomize_delay = self.crawler.settings.get_bool("RANDOMIZE_DOWNLOAD_DELAY",
-                                                              self.crawler.settings.get_bool("RANDOMNESS", False))
-        self.default_headers = self.crawler.settings.get_dict("DEFAULT_REQUEST_HEADERS", {})
-
-        # --- 浏览器指纹模拟配置 ---
-        user_browser_map = self.crawler.settings.get_dict("CURL_BROWSER_VERSION_MAP", {})
-        default_browser_map = self._get_default_browser_map()
-        effective_browser_map = {**default_browser_map, **user_browser_map}
-
-        raw_browser_type_str = self.crawler.settings.get("CURL_BROWSER_TYPE", "chrome")
-        self.browser_type_str = effective_browser_map.get(raw_browser_type_str.lower(), raw_browser_type_str)
-
-        # 创建会话配置
-        session_config = {
-            "timeout": timeout_secs,
-            "verify": verify_ssl,
-            "max_clients": pool_size,
-            "impersonate": self.browser_type_str,
-        }
-
-        # 创建全局 session
-        self.session = AsyncSession(**session_config)
-
-        self.logger.info(f"CurlCffiDownloader 初始化完成 | 浏览器模拟: {self.browser_type_str} | "
-                         f"并发: {pool_size} | 延迟: {self.download_delay}s")
-
-    @staticmethod
-    def _get_default_browser_map() -> Dict[str, str]:
-        """获取代码中硬编码的默认浏览器映射"""
-        return {
-            "chrome": "chrome136",
-            "edge": "edge101",
-            "safari": "safari184",
-            "firefox": "firefox135",
-        }
-
-    async def download(self, request) -> Optional[Response]:
-        if not self.session:
-            raise RuntimeError("CurlCffiDownloader 会话未打开")
-
-        await self._apply_download_delay()
-
-        max_retries = self.crawler.settings.get_int("DOWNLOAD_RETRY_TIMES",
-                                                    self.crawler.settings.get_int("MAX_RETRY_TIMES", 1))
-        last_exception = None
-
-        for attempt in range(max_retries + 1):
-            request_id = id(request)
-            self._active_requests.add(request_id)
-            try:
-                result = await self._execute_request(request)
-                return result
-
-            except (CurlError, asyncio.TimeoutError) as e:
-                last_exception = e
-                if attempt < max_retries:
-                    retry_delay = 2 ** attempt
-                    self.logger.warning(
-                        f"第 {attempt + 1}/{max_retries} 次重试 {request.url}，等待 {retry_delay}s，原因: {type(e).__name__}")
-                    await asyncio.sleep(retry_delay)
-                else:
-                    self.logger.error(
-                        f"请求 {request.url} 在 {max_retries} 次重试后失败: {type(e).__name__}: {e}")
-            except Exception as e:
-                last_exception = e
-                self.logger.critical(f"请求 {request.url} 发生未预期错误: {e}", exc_info=True)
-                break  # 不可恢复错误，不再重试
-            finally:
-                self._active_requests.discard(request_id)
-
-        if last_exception:
-            raise last_exception
-        raise RuntimeError(f"下载 {request.url} 失败，已重试或发生不可重试错误")
-
-    async def _apply_download_delay(self):
-        """应用下载延迟"""
-        if self.download_delay > 0:
-            current_time = time.time()
-            elapsed = current_time - getattr(self, '_last_request_time', float('inf'))
-
-            if elapsed < self.download_delay:
-                delay = self.download_delay - elapsed
-                if self.randomize_delay:
-                    range_tuple = self.crawler.settings.get("RANDOM_RANGE", (0.75, 1.25))
-                    if isinstance(range_tuple, (list, tuple)) and len(range_tuple) == 2:
-                        delay *= random.uniform(range_tuple[0], range_tuple[1])
-                    else:
-                        delay *= random.uniform(0.5, 1.5)
-                await asyncio.sleep(max(0.0, delay))
-            self._last_request_time = time.time()
-
-    async def _execute_request(self, request) -> Response:
-        """执行单个请求"""
-        if not self.session:
-            raise RuntimeError("会话未初始化")
-
-        start_time = None
-        if self.crawler.settings.get_bool("DOWNLOAD_STATS", True):
-            import time
-            start_time = time.time()
-
-        kwargs = self._build_request_kwargs(request)
-        method = request.method.lower()
-
-        if not hasattr(self.session, method):
-            raise ValueError(f"不支持的 HTTP 方法: {request.method}")
-
-        method_func = getattr(self.session, method)
-
-        try:
-            response = await method_func(request.url, **kwargs)
-        except Exception as e:
-            raise  # 由外层处理重试
-
-        # 检查 Content-Length
-        content_length = response.headers.get("Content-Length")
-        if content_length:
-            try:
-                cl = int(content_length)
-                if cl > self.max_download_size:
-                    raise OverflowError(f"响应过大 (Content-Length): {cl} > {self.max_download_size}")
-            except ValueError:
-                self.logger.warning(f"无效的 Content-Length 头部: {content_length}")
-
-        body = response.content
-        actual_size = len(body)
-
-        if actual_size > self.max_download_size:
-            raise OverflowError(f"响应体过大: {actual_size} > {self.max_download_size}")
-
-        if actual_size > self.download_warn_size:
-            self.logger.warning(f"响应体较大: {actual_size} 字节，来自 {request.url}")
-
-        # 记录下载统计
-        if start_time:
-            download_time = time.time() - start_time
-            self.logger.debug(f"Downloaded {request.url} in {download_time:.3f}s, size: {actual_size} bytes")
-
-        return self._structure_response(request, response, body)
-
-    def _build_request_kwargs(self, request) -> Dict[str, Any]:
-        """构造curl-cffi请求参数（支持 str 和 dict 格式 proxy）"""
-        request_headers = getattr(request, 'headers', {}) or {}
-        headers = {**self.default_headers, **request_headers}
-
-        kwargs = {
-            "headers": headers,
-            "cookies": getattr(request, 'cookies', {}) or {},
-            "allow_redirects": getattr(request, 'allow_redirects', True),
-        }
-
-        # 处理代理（兼容 str 和 dict）
-        proxy = getattr(request, 'proxy', None)
-        if proxy is not None:
-            if isinstance(proxy, str):
-                if proxy.startswith(('http://', 'https://', 'socks5://', 'socks4://')):
-                    kwargs["proxies"] = {"http": proxy, "https": proxy}
-                else:
-                    self.logger.warning(f"代理协议未知，尝试直接使用: {proxy}")
-                    kwargs["proxies"] = {"http": proxy, "https": proxy}
-            elif isinstance(proxy, dict):
-                kwargs["proxies"] = proxy
-            else:
-                self.logger.error(f"不支持的 proxy 类型: {type(proxy)}，值: {proxy}")
-
-        # 处理通过meta传递的代理认证信息
-        proxy_auth_header = request.headers.get("Proxy-Authorization") or request.meta.get("proxy_auth_header")
-        if proxy_auth_header:
-            kwargs["headers"]["Proxy-Authorization"] = proxy_auth_header
-
-        # 请求体处理
-        if hasattr(request, "_json_body") and request._json_body is not None:
-            kwargs["json"] = request._json_body
-        elif isinstance(getattr(request, 'body', None), (dict, list)):
-            kwargs["json"] = request.body
-        elif getattr(request, 'body', None) is not None:
-            kwargs["data"] = request.body
-
-        return kwargs
-
-    @staticmethod
-    def _structure_response(request, response, body: bytes) -> Response:
-        """构造框架所需的 Response 对象"""
-        return Response(
-            url=str(response.url),
-            headers=dict(response.headers),
-            status_code=response.status_code,
-            body=body,
-            request=request,
-        )
-
-    async def close(self) -> None:
-        """关闭会话资源"""
-        if self.session:
-            self.logger.info("正在关闭 CurlCffiDownloader 会话...")
-            try:
-                await self.session.close()
-            except Exception as e:
-                self.logger.warning(f"关闭 curl-cffi 会话时出错: {e}")
-            finally:
-                self.session = None
-        self.logger.debug("CurlCffiDownloader 已关闭")
-
-    def idle(self) -> bool:
-        """检查是否空闲"""
-        return len(self._active_requests) == 0
-
-    def __len__(self) -> int:
-        """返回活跃请求数"""
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+import asyncio
+import random
+import time
+from typing import Optional, Dict, Any
+from curl_cffi import CurlError
+from curl_cffi.requests import AsyncSession
+
+from crawlo.network.response import Response
+from crawlo.downloader import DownloaderBase
+from crawlo.utils.log import get_logger
+
+class CurlCffiDownloader(DownloaderBase):
+    """
+    基于 curl-cffi 的高性能异步下载器
+    - 支持真实浏览器指纹模拟，绕过Cloudflare等反爬虫检测
+    - 高性能的异步HTTP客户端，基于libcurl
+    - 内存安全的响应处理
+    - 自动代理和Cookie管理
+    - 支持请求延迟、重试、警告大小检查等高级功能
+    """
+
+    def __init__(self, crawler):
+        self.crawler = crawler
+        self.logger = get_logger(self.__class__.__name__, crawler.settings.get('LOG_LEVEL'))
+        self._active_requests = set()
+
+        # --- 基础配置 ---
+        timeout_secs = crawler.settings.get_int("DOWNLOAD_TIMEOUT", 180)
+        verify_ssl = crawler.settings.get_bool("VERIFY_SSL", True)
+        pool_size = crawler.settings.get_int("CONNECTION_POOL_LIMIT", 20)
+        self.max_download_size = crawler.settings.get_int("DOWNLOAD_MAXSIZE", 10 * 1024 * 1024)  # 10MB
+        self.download_warn_size = crawler.settings.get_int("DOWNLOAD_WARN_SIZE", 1024 * 1024)  # 1MB
+        self.download_delay = crawler.settings.get_float("DOWNLOAD_DELAY", 0)
+        self.randomize_delay = crawler.settings.get_bool("RANDOMIZE_DOWNLOAD_DELAY",
+                                                              crawler.settings.get_bool("RANDOMNESS", False))
+        # 不再使用DEFAULT_REQUEST_HEADERS配置项
+        self.default_headers = {}
+
+        # --- 浏览器指纹模拟配置 ---
+        user_browser_map = crawler.settings.get_dict("CURL_BROWSER_VERSION_MAP", {})
+        default_browser_map = self._get_default_browser_map()
+        effective_browser_map = {**default_browser_map, **user_browser_map}
+
+        raw_browser_type_str = crawler.settings.get("CURL_BROWSER_TYPE", "chrome")
+        self.browser_type_str = effective_browser_map.get(raw_browser_type_str.lower(), raw_browser_type_str)
+
+        # 创建会话配置
+        session_config = {
+            "timeout": timeout_secs,
+            "verify": verify_ssl,
+            "max_clients": pool_size,
+            "impersonate": self.browser_type_str,
+        }
+
+        # 创建全局 session
+        self.session = AsyncSession(**session_config)
+
+        self.logger.info(f"CurlCffiDownloader 初始化完成 | 浏览器模拟: {self.browser_type_str} | "
+                         f"并发: {pool_size} | 延迟: {self.download_delay}s")
+
+    @staticmethod
+    def _get_default_browser_map() -> Dict[str, str]:
+        """获取代码中硬编码的默认浏览器映射"""
+        return {
+            "chrome": "chrome136",
+            "edge": "edge101",
+            "safari": "safari184",
+            "firefox": "firefox135",
+        }
+
+    async def download(self, request) -> Optional[Response]:
+        if not self.session:
+            raise RuntimeError("CurlCffiDownloader 会话未打开")
+
+        await self._apply_download_delay()
+
+        max_retries = self.crawler.settings.get_int("DOWNLOAD_RETRY_TIMES",
+                                                    self.crawler.settings.get_int("MAX_RETRY_TIMES", 1))
+        last_exception = None
+
+        for attempt in range(max_retries + 1):
+            request_id = id(request)
+            self._active_requests.add(request_id)
+            try:
+                result = await self._execute_request(request)
+                return result
+
+            except (CurlError, asyncio.TimeoutError) as e:
+                last_exception = e
+                if attempt < max_retries:
+                    retry_delay = 2 ** attempt
+                    self.logger.warning(
+                        f"第 {attempt + 1}/{max_retries} 次重试 {request.url}，等待 {retry_delay}s，原因: {type(e).__name__}")
+                    await asyncio.sleep(retry_delay)
+                else:
+                    self.logger.error(
+                        f"请求 {request.url} 在 {max_retries} 次重试后失败: {type(e).__name__}: {e}")
+            except Exception as e:
+                last_exception = e
+                self.logger.critical(f"请求 {request.url} 发生未预期错误: {e}", exc_info=True)
+                break  # 不可恢复错误，不再重试
+            finally:
+                self._active_requests.discard(request_id)
+
+        if last_exception:
+            raise last_exception
+        raise RuntimeError(f"下载 {request.url} 失败，已重试或发生不可重试错误")
+
+    async def _apply_download_delay(self):
+        """应用下载延迟"""
+        if self.download_delay > 0:
+            current_time = time.time()
+            elapsed = current_time - getattr(self, '_last_request_time', float('inf'))
+
+            if elapsed < self.download_delay:
+                delay = self.download_delay - elapsed
+                if self.randomize_delay:
+                    range_tuple = self.crawler.settings.get("RANDOM_RANGE", (0.75, 1.25))
+                    if isinstance(range_tuple, (list, tuple)) and len(range_tuple) == 2:
+                        delay *= random.uniform(range_tuple[0], range_tuple[1])
+                    else:
+                        delay *= random.uniform(0.5, 1.5)
+                await asyncio.sleep(max(0.0, delay))
+            self._last_request_time = time.time()
+
+    async def _execute_request(self, request) -> Response:
+        """执行单个请求"""
+        if not self.session:
+            raise RuntimeError("会话未初始化")
+
+        start_time = None
+        if self.crawler.settings.get_bool("DOWNLOAD_STATS", True):
+            import time
+            start_time = time.time()
+
+        kwargs = self._build_request_kwargs(request)
+        method = request.method.lower()
+
+        if not hasattr(self.session, method):
+            raise ValueError(f"不支持的 HTTP 方法: {request.method}")
+
+        method_func = getattr(self.session, method)
+
+        try:
+            response = await method_func(request.url, **kwargs)
+        except Exception as e:
+            raise  # 由外层处理重试
+
+        # 检查 Content-Length
+        content_length = response.headers.get("Content-Length")
+        if content_length:
+            try:
+                cl = int(content_length)
+                if cl > self.max_download_size:
+                    raise OverflowError(f"响应过大 (Content-Length): {cl} > {self.max_download_size}")
+            except ValueError:
+                self.logger.warning(f"无效的 Content-Length 头部: {content_length}")
+
+        body = response.content
+        actual_size = len(body)
+
+        if actual_size > self.max_download_size:
+            raise OverflowError(f"响应体过大: {actual_size} > {self.max_download_size}")
+
+        if actual_size > self.download_warn_size:
+            self.logger.warning(f"响应体较大: {actual_size} 字节，来自 {request.url}")
+
+        # 记录下载统计
+        if start_time:
+            download_time = time.time() - start_time
+            self.logger.debug(f"Downloaded {request.url} in {download_time:.3f}s, size: {actual_size} bytes")
+
+        return self._structure_response(request, response, body)
+
+    def _build_request_kwargs(self, request) -> Dict[str, Any]:
+        """构造curl-cffi请求参数（支持 str 和 dict 格式 proxy）"""
+        request_headers = getattr(request, 'headers', {}) or {}
+        headers = {**self.default_headers, **request_headers}
+
+        kwargs = {
+            "headers": headers,
+            "cookies": getattr(request, 'cookies', {}) or {},
+            "allow_redirects": getattr(request, 'allow_redirects', True),
+        }
+
+        # 处理代理（兼容 str 和 dict）
+        proxy = getattr(request, 'proxy', None)
+        if proxy is not None:
+            if isinstance(proxy, str):
+                if proxy.startswith(('http://', 'https://', 'socks5://', 'socks4://')):
+                    kwargs["proxies"] = {"http": proxy, "https": proxy}
+                else:
+                    self.logger.warning(f"代理协议未知，尝试直接使用: {proxy}")
+                    kwargs["proxies"] = {"http": proxy, "https": proxy}
+            elif isinstance(proxy, dict):
+                kwargs["proxies"] = proxy
+            else:
+                self.logger.error(f"不支持的 proxy 类型: {type(proxy)}，值: {proxy}")
+
+        # 处理通过meta传递的代理认证信息
+        proxy_auth_header = request.headers.get("Proxy-Authorization") or request.meta.get("proxy_auth_header")
+        if proxy_auth_header:
+            kwargs["headers"]["Proxy-Authorization"] = proxy_auth_header
+
+        # 请求体处理
+        if hasattr(request, "_json_body") and request._json_body is not None:
+            kwargs["json"] = request._json_body
+        elif isinstance(getattr(request, 'body', None), (dict, list)):
+            kwargs["json"] = request.body
+        elif getattr(request, 'body', None) is not None:
+            kwargs["data"] = request.body
+
+        return kwargs
+
+    @staticmethod
+    def _structure_response(request, response, body: bytes) -> Response:
+        """构造框架所需的 Response 对象"""
+        return Response(
+            url=str(response.url),
+            headers=dict(response.headers),
+            status_code=response.status_code,
+            body=body,
+            request=request,
+        )
+
+    async def close(self) -> None:
+        """关闭会话资源"""
+        if self.session:
+            self.logger.info("正在关闭 CurlCffiDownloader 会话...")
+            try:
+                await self.session.close()
+            except Exception as e:
+                self.logger.warning(f"关闭 curl-cffi 会话时出错: {e}")
+            finally:
+                self.session = None
+        self.logger.debug("CurlCffiDownloader 已关闭")
+
+    def idle(self) -> bool:
+        """检查是否空闲"""
+        return len(self._active_requests) == 0
+
+    def __len__(self) -> int:
+        """返回活跃请求数"""
         return len(self._active_requests)