diff --git a/app/chain/site.py b/app/chain/site.py index 9786bae6..9282dd5c 100644 --- a/app/chain/site.py +++ b/app/chain/site.py @@ -330,7 +330,8 @@ class SiteChain(ChainBase): url=site_info.url, cookie=cookie, ua=site_info.ua or settings.USER_AGENT, - proxy=True if site_info.proxy else False + proxy=True if site_info.proxy else False, + timeout=site_info.timeout ) if rss_url: logger.info(f"更新站点 {domain} RSS地址 ...") @@ -558,13 +559,15 @@ class SiteChain(ChainBase): public = site_info.public proxies = settings.PROXY if site_info.proxy else None proxy_server = settings.PROXY_SERVER if site_info.proxy else None + timeout = site_info.timeout or 60 # 访问链接 if render: page_source = PlaywrightHelper().get_page_source(url=site_url, cookies=site_cookie, ua=ua, - proxies=proxy_server) + proxies=proxy_server, + timeout=timeout) if not public and not SiteUtils.is_logged_in(page_source): if under_challenge(page_source): return False, f"无法通过Cloudflare！" @@ -697,7 +700,8 @@ class SiteChain(ChainBase): username=username, password=password, two_step_code=two_step_code, - proxies=settings.PROXY_SERVER if site_info.proxy else None + proxies=settings.PROXY_SERVER if site_info.proxy else None, + timeout=site_info.timeout or 60 ) if result: cookie, ua, msg = result diff --git a/app/chain/torrents.py b/app/chain/torrents.py index f15c9f58..93a799c4 100644 --- a/app/chain/torrents.py +++ b/app/chain/torrents.py @@ -340,7 +340,8 @@ class TorrentsChain(ChainBase): url=site.get("url"), cookie=site.get("cookie"), ua=site.get("ua") or settings.USER_AGENT, - proxy=True if site.get("proxy") else False + proxy=True if site.get("proxy") else False, + timeout=site.get("timeout"), ) if rss_url: # 获取新的日期的passkey diff --git a/app/helper/browser.py b/app/helper/browser.py index 6563ff6c..c98b4726 100644 --- a/app/helper/browser.py +++ b/app/helper/browser.py @@ -31,7 +31,7 @@ class PlaywrightHelper: def __flaresolverr_request(url: str, cookies: Optional[str] = None, proxy_url: Optional[str] = None, - timeout: Optional[int] = 30) -> Optional[dict]: + timeout: Optional[int] = 60) -> Optional[dict]: """ 调用 FlareSolverr 解决 Cloudflare 并返回 solution 结果 参考: https://github.com/FlareSolverr/FlareSolverr @@ -43,7 +43,7 @@ class PlaywrightHelper: payload = { "cmd": "request.get", "url": url, - "maxTimeout": max(10, int(timeout or 30)) * 1000, + "maxTimeout": int(timeout or 60) * 1000, } # 将 cookies 以数组形式传递给 FlareSolverr if cookies: @@ -56,7 +56,8 @@ class PlaywrightHelper: try: fs_api = settings.FLARESOLVERR_URL.rstrip("/") + "/v1" - data = RequestUtils(content_type="application/json").post_json(url=fs_api, json=payload) + data = RequestUtils(content_type="application/json", + timeout=timeout).post_json(url=fs_api, json=payload) if not data: logger.error("FlareSolverr 返回空响应") return None @@ -74,7 +75,7 @@ class PlaywrightHelper: ua: Optional[str] = None, proxies: Optional[dict] = None, headless: Optional[bool] = False, - timeout: Optional[int] = 30) -> Any: + timeout: Optional[int] = 60) -> Any: """ 访问网页，接收Page对象并执行操作 :param url: 网页地址 @@ -143,7 +144,7 @@ class PlaywrightHelper: ua: Optional[str] = None, proxies: Optional[dict] = None, headless: Optional[bool] = False, - timeout: Optional[int] = 30) -> Optional[str]: + timeout: Optional[int] = 60) -> Optional[str]: """ 获取网页源码 :param url: 网页地址 @@ -200,13 +201,3 @@ class PlaywrightHelper: logger.error(f"Playwright初始化失败: {str(e)}") return source - - -# 示例用法 -if __name__ == "__main__": - utils = PlaywrightHelper() - test_url = "https://piggo.me" - test_cookies = "" - test_user_agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.4577.63 Safari/537.36" - source_code = utils.get_page_source(test_url, cookies=test_cookies, ua=test_user_agent) - print(source_code) diff --git a/app/helper/cookie.py b/app/helper/cookie.py index f57104d1..6afe8f6e 100644 --- a/app/helper/cookie.py +++ b/app/helper/cookie.py @@ -74,7 +74,8 @@ class CookieHelper: username: str, password: str, two_step_code: Optional[str] = None, - proxies: Optional[dict] = None) -> Tuple[Optional[str], Optional[str], str]: + proxies: Optional[dict] = None, + timeout: int = None) -> Tuple[Optional[str], Optional[str], str]: """ 获取站点cookie和ua :param url: 站点地址 @@ -82,6 +83,7 @@ class CookieHelper: :param password: 密码 :param two_step_code: 二步验证码或密钥 :param proxies: 代理 + :param timeout: 超时时间 :return: cookie、ua、message """ @@ -230,7 +232,8 @@ class CookieHelper: return PlaywrightHelper().action(url=url, callback=__page_handler, - proxies=proxies) + proxies=proxies, + timeout=timeout) @staticmethod def __get_captcha_text(cookie: str, ua: str, code_url: str) -> str: diff --git a/app/helper/rss.py b/app/helper/rss.py index 83ee4a57..829995a7 100644 --- a/app/helper/rss.py +++ b/app/helper/rss.py @@ -429,13 +429,14 @@ class RssHelper: return ret_array - def get_rss_link(self, url: str, cookie: str, ua: str, proxy: bool = False) -> Tuple[str, str]: + def get_rss_link(self, url: str, cookie: str, ua: str, proxy: bool = False, timeout: int = None) -> Tuple[str, str]: """ 获取站点rss地址 :param url: 站点地址 :param cookie: 站点cookie :param ua: 站点ua :param proxy: 是否使用代理 + :param timeout: 请求超时时间 :return: rss地址、错误信息 """ try: @@ -453,12 +454,13 @@ class RssHelper: url=rss_url, cookies=cookie, ua=ua, - proxies=settings.PROXY if proxy else None + proxies=settings.PROXY_SERVER if proxy else None, + timeout=timeout or 60 ) else: res = RequestUtils( cookies=cookie, - timeout=60, + timeout=timeout or 30, ua=ua, proxies=settings.PROXY if proxy else None ).post_res(url=rss_url, data=rss_params)