From 0a4bf30b7942f552b686b90755aa83e122581dca Mon Sep 17 00:00:00 2001 From: jxxghp Date: Tue, 23 Apr 2024 11:21:30 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=AB=99=E7=82=B9=E7=AD=BE?= =?UTF-8?q?=E5=88=B0=E6=97=B6=E6=9B=B4=E6=96=B0=E7=AB=99=E7=82=B9=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=BB=9F=E8=AE=A1=E4=BF=A1=E6=81=AF=EF=BC=8C=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E4=B8=BB=E7=A8=8B=E5=BA=8F=E5=8D=87=E7=BA=A7=E8=87=B3?= =?UTF-8?q?v1.8.3+=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 5 ++-- plugins/autosignin/__init__.py | 49 +++++++++++++++++++++------------- 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 8fa1438..c58213b 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,13 @@ { "AutoSignIn": { "name": "站点自动签到", - "description": "自动模拟登录站点、签到。", - "version": "1.9", + "description": "自动模拟登录、签到站点。", + "version": "2.0", "icon": "signin.png", "author": "thsrite", "level": 2, "history": { + "v2.0": "站点签到时更新站点使用统计信息，需要主程序升级至v1.8.3+版本", "v1.9": "支持馒头新架构自动签到" } }, diff --git a/plugins/autosignin/__init__.py b/plugins/autosignin/__init__.py index 7916052..cc116df 100644 --- a/plugins/autosignin/__init__.py +++ b/plugins/autosignin/__init__.py @@ -16,6 +16,7 @@ from app.chain.site import SiteChain from app.core.config import settings from app.core.event import EventManager, eventmanager, Event from app.db.site_oper import SiteOper +from app.db.sitestatistic_oper import SiteStatisticOper from app.helper.browser import PlaywrightHelper from app.helper.cloudflare import under_challenge from app.helper.module import ModuleHelper @@ -33,11 +34,11 @@ class AutoSignIn(_PluginBase): # 插件名称 plugin_name = "站点自动签到" # 插件描述 - plugin_desc = "自动模拟登录站点、签到。" + plugin_desc = "自动模拟登录、签到站点。" # 插件图标 plugin_icon = "signin.png" # 插件版本 - plugin_version = "1.9" + plugin_version = "2.0" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -53,6 +54,7 @@ class AutoSignIn(_PluginBase): sites: SitesHelper = None siteoper: SiteOper = None sitechain: SiteChain = None + sitestatistic: SiteStatisticOper = None # 事件管理器 event: EventManager = None # 定时器 @@ -87,6 +89,7 @@ class AutoSignIn(_PluginBase): self.siteoper = SiteOper() self.event = EventManager() self.sitechain = SiteChain() + self.sitestatistic = SiteStatisticOper() # 停止现有任务 self.stop_service() @@ -871,26 +874,34 @@ class AutoSignIn(_PluginBase): 签到一个站点 """ site_module = self.__build_class(site_info.get("url")) + # 开始记时 + start_time = datetime.now() if site_module and hasattr(site_module, "signin"): try: - _, msg = site_module().signin(site_info) - # 特殊站点直接返回签到信息，防止仿真签到、模拟登录有歧义 - return site_info.get("name"), msg or "" + state, message = site_module().signin(site_info) except Exception as e: traceback.print_exc() - return site_info.get("name"), f"签到失败：{str(e)}" + state, message = False, f"签到失败：{str(e)}" else: - return site_info.get("name"), self.__signin_base(site_info) + state, message = self.__signin_base(site_info) + # 统计 + seconds = (datetime.now() - start_time).seconds + domain = StringUtils.get_url_domain(site_info.get('url')) + if state: + self.sitestatistic.success(domain=domain, seconds=seconds) + else: + self.sitestatistic.fail(domain) + return site_info.get("name"), message @staticmethod - def __signin_base(site_info: CommentedMap) -> str: + def __signin_base(site_info: CommentedMap) -> Tuple[bool, str]: """ 通用签到处理 :param site_info: 站点信息 :return: 签到结果信息 """ if not site_info: - return "" + return False, "" site = site_info.get("name") site_url = site_info.get("url") site_cookie = site_info.get("cookie") @@ -900,7 +911,7 @@ class AutoSignIn(_PluginBase): proxy_server = settings.PROXY_SERVER if site_info.get("proxy") else None if not site_url or not site_cookie: logger.warn(f"未配置 {site} 的站点地址或Cookie，无法签到") - return "" + return False, "" # 模拟登录 try: # 访问链接 @@ -916,14 +927,14 @@ class AutoSignIn(_PluginBase): proxies=proxy_server) if not SiteUtils.is_logged_in(page_source): if under_challenge(page_source): - return f"无法通过Cloudflare！" - return f"仿真登录失败，Cookie已失效！" + return False, f"无法通过Cloudflare！" + return False, f"仿真登录失败，Cookie已失效！" else: # 判断是否已签到 if re.search(r'已签|签到已得', page_source, re.IGNORECASE) \ or SiteUtils.is_checkin(page_source): - return f"签到成功" - return "仿真签到成功" + return True, f"签到成功" + return True, "仿真签到成功" else: res = RequestUtils(cookies=site_cookie, ua=ua, @@ -945,20 +956,20 @@ class AutoSignIn(_PluginBase): else: msg = f"状态码：{res.status_code}" logger.warn(f"{site} 签到失败，{msg}") - return f"签到失败，{msg}！" + return False, f"签到失败，{msg}！" else: logger.info(f"{site} 签到成功") - return f"签到成功" + return True, f"签到成功" elif res is not None: logger.warn(f"{site} 签到失败，状态码：{res.status_code}") - return f"签到失败，状态码：{res.status_code}！" + return False, f"签到失败，状态码：{res.status_code}！" else: logger.warn(f"{site} 签到失败，无法打开网站") - return f"签到失败，无法打开网站！" + return False, f"签到失败，无法打开网站！" except Exception as e: logger.warn("%s 签到失败：%s" % (site, str(e))) traceback.print_exc() - return f"签到失败：{str(e)}！" + return False, f"签到失败：{str(e)}！" def login_site(self, site_info: CommentedMap) -> Tuple[str, str]: """