close tsdm popup

_playwright/tsdm.py

@@ -24,10 +24,18 @@ from __init__ import (
 )
 
 
+# on 监听弹窗事件
+async def close_popup(popup):
+    # await popup.wait_for_load_state()
+    print(await popup.title())
+    await popup.close()
+
+
 # 判断登录状态
 async def is_login(page):
     await page.goto(tsdm_url)
-    if await page.get_by_role("link", name="设置").is_enabled():
+    await page.wait_for_load_state()
+    if await page.get_by_role("link", name="签到领奖!").is_visible():
         tsdm_logger.info("登录成功")
         return True
     else:
@@ -44,13 +52,9 @@ async def sign(page):
     if not await is_login(page):
         return "tsdm_not_login"
 
-    # 签到
     await page.goto(tsdm_sign_url)
-    # 加载太快跳转回首页说明也已经完成打工任务
-    if (
-        page.get_by_text("今天已签到")
-        or await page.get_by_role("link", name="设置").is_enabled()
-    ):
+
+    if await page.get_by_text("今天已签到").is_visible():
         sign_res = "今天已签到"
         tsdm_logger.info(sign_res)
         msg.append(sign_res)
@@ -69,31 +73,30 @@ async def sign(page):
     return "\n".join(msg)
 
 
+# 打工
 async def cliwork(page):
     msg = []
 
     if not await is_login(page):
         return "tsdm_not_login"
 
-    # 打工
-    # await page.pause()
-
     await page.goto(tsdm_url)  # 切换回电脑版
-
+    await page.wait_for_load_state()
     await page.goto(tsdm_cliwork_url)
 
-    if await page.get_by_text("您需要等待").is_visible(timeout=2000):
-        has_work = "今天已打工"
-        tsdm_logger.info(has_work)
-        msg.append(has_work)
-    else:
+    if await page.locator("#workstart").is_enabled():
         for pid in tsdm_plugin_id:
             await page.locator(f"#np_advid{pid}").get_by_role("link").click()
-            await page.bring_to_front()  # 激活第一个标签页
+            page.on("popup", close_popup)  # handle popup 不能 await
+            # await page.bring_to_front()  # 回到第一个标签页
         await page.locator("#workstart").click()  # 领取奖励
         work_res = "打工成功"
         tsdm_logger.info(work_res)
         msg.append(work_res)
+    else:
+        has_work = "今天已打工"
+        tsdm_logger.info(has_work)
+        msg.append(has_work)
 
     return "\n".join(msg)
 
@@ -107,7 +110,7 @@ async def tsdm_sign():
         sign_task = asyncio.create_task(sign(sign_page))
         await asyncio.gather(sign_task)
         await sign_page.close()
-        # 打工
+        # # 打工
         cliwork_page = await context.new_page()
         cliwork_task = asyncio.create_task(cliwork(cliwork_page))
         await asyncio.gather(cliwork_task)

utils.py

@@ -98,7 +98,9 @@ def get_pi_ip(host: str) -> str:
 
 
 # gotify 推送
-def push_msg(title: str = "无标题", message: str = "无内容", img_url: str = gotify_img) -> dict:
+def push_msg(
+    title: str = "无标题", message: str = "无内容", img_url: str = gotify_img
+) -> dict:
     gotify_ip = get_pi_ip(gotify_host)
     url = f"http://{gotify_ip}:{gotify_port}/message?token={gotify_token}"
     data = {