qrpa 1.0.75__tar.gz → 1.0.77__tar.gz

{qrpa-1.0.75 → qrpa-1.0.77}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qrpa
-Version: 1.0.75
+Version: 1.0.77
 Summary: qsir's rpa library
 Author: QSir
 Author-email: QSir <1171725650@qq.com>

{qrpa-1.0.75 → qrpa-1.0.77}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qrpa"
-version = "1.0.75"
+version = "1.0.77"
 description = "qsir's rpa library"
 authors = [{ name = "QSir", email = "1171725650@qq.com" }]
 readme = "README.md"

{qrpa-1.0.75 → qrpa-1.0.77}/qrpa/fun_web.py

@@ -5,6 +5,8 @@ from playwright.sync_api import Page
 from .fun_base import log, send_exception
 from .time_utils import get_current_datetime
 
+import inspect
+
 def fetch(page: Page, url: str, params: Optional[Union[dict, list, str]] = None, headers: Optional[dict] = None, config:
 Optional[dict] = None) -> dict:
     """
@@ -143,3 +145,8 @@ def full_screen_shot(web_page: Page, config):
     full_screenshot_image_path = f'{config.auto_dir}/screenshot/{get_current_datetime()}.png'
     web_page.screenshot(path=full_screenshot_image_path, full_page=True)
     return full_screenshot_image_path
+
+def safe_goto(page, url, **kwargs):
+    caller = inspect.stack()[1]
+    log(f"[DEBUG] goto called from {caller.filename}:{caller.lineno} url={url}")
+    return page.goto(url, **kwargs)

{qrpa-1.0.75 → qrpa-1.0.77}/qrpa/shein_lib.py

@@ -1,6 +1,6 @@
 from .fun_file import read_dict_from_file, write_dict_to_file, read_dict_from_file_ex, write_dict_to_file_ex
 from .fun_base import log, send_exception, md5_string, get_safe_value, NetWorkIdleTimeout
-from .fun_web import fetch, full_screen_shot
+from .fun_web import fetch, full_screen_shot, safe_goto
 from .time_utils import TimeUtils
 from .wxwork import WxWorkBot
 
@@ -50,8 +50,7 @@ class SheinLib:
                         if 'https://sso.geiwohuo.com/#/home' not in web_page.url:
                             log("鉴权确定按钮可见 点击'确定'按钮", web_page.title(), web_page.url, self.store_username, self.store_name)
                             web_page.locator('xpath=//div[@id="container" and @alita-name="gmpsso"]//button[@type="button" and @id]').nth(0).click()
-                            web_page.wait_for_load_state("load")
-                            web_page.wait_for_timeout(1000)
+                            web_page.wait_for_timeout(5000)
 
                     while web_page.locator('//div[text()="验证码"]').is_visible():
                         log(f'等待输入验证码: {wait_count}', self.store_username, self.store_name)
@@ -92,13 +91,12 @@ class SheinLib:
 
                     log('商家后台不可见', web_page.title(), web_page.url, self.store_username, self.store_name)
                     if 'https://sso.geiwohuo.com/#/home' in web_page.url:
-                        web_page.wait_for_timeout(3000)
                         web_page.reload()
-                        web_page.wait_for_load_state("load")
+                        web_page.wait_for_timeout(5000)
 
                     while r'=/CN' in web_page.url:
-                        web_page.goto('https://sso.geiwohuo.com')
-                        web_page.wait_for_load_state("load")
+                        safe_goto(web_page, 'https://sso.geiwohuo.com')
+
                         web_page.wait_for_timeout(5000)
                         if web_page.locator('//input[@name="username"]').is_visible():
                             log("用户名输入框可见 等待5秒点击'登录'按钮", self.store_username, self.store_name)
@@ -115,35 +113,30 @@ class SheinLib:
 
                         if 'SHEIN全球商家中心' in web_page.title() or '后台首页' in web_page.title() or '商家后台' in web_page.title():
                             log(web_page.title(), '中断循环', self.store_username, self.store_name)
-                            web_page.wait_for_load_state("load")
-                            web_page.wait_for_timeout(2000)
+                            web_page.wait_for_timeout(5000)
                             break
 
                     if 'mrs.biz.sheincorp.cn' in web_page.url and '商家后台' in web_page.title():
-                        web_page.goto('https://sso.geiwohuo.com/#/home')
-                        web_page.wait_for_load_state("load")
-                        web_page.wait_for_timeout(3000)
+                        safe_goto(web_page, 'https://sso.geiwohuo.com/#/home')
+                        web_page.wait_for_timeout(5000)
 
                     if web_page.locator('//h1[contains(text(),"鉴权")]').is_visible():
                         log('检测到鉴权 刷新页面', self.store_username, self.store_name)
                         web_page.reload()
-                        web_page.wait_for_load_state('load')
-                        web_page.wait_for_timeout(3000)
+                        web_page.wait_for_timeout(5000)
                         web_page.reload()
-                        web_page.wait_for_timeout(3000)
+                        web_page.wait_for_timeout(5000)
 
                     if web_page.title() == 'SHEIN':
-                        web_page.goto('https://sso.geiwohuo.com/#/home')
-                        web_page.wait_for_load_state("load")
-                        web_page.wait_for_timeout(3000)
+                        safe_goto(web_page, 'https://sso.geiwohuo.com/#/home')
+                        web_page.wait_for_timeout(5000)
 
                 break
             except Exception as e:
                 log(f"错误发生: {e}, 重试中...({self.store_username}, {self.store_name})")
                 log(traceback.format_exc())
                 if 'crashed' in str(e) or 'https://sso.geiwohuo.com//#/auth/SSLS' in web_page.url:
-                    web_page.goto('https://sso.geiwohuo.com')
-                    web_page.wait_for_load_state('load')
+                    safe_goto(web_page, 'https://sso.geiwohuo.com/#/home')
                     web_page.wait_for_timeout(10000)
                 retries += 1
                 if retries >= MAX_RETRIES:

{qrpa-1.0.75 → qrpa-1.0.77}/qrpa/shein_ziniao.py

@@ -258,7 +258,6 @@ class ZiniaoBrowser:
         """打开启动页面并执行业务逻辑"""
         page = browser_context.pages[0]
         page.goto(launcher_page)
-        page.wait_for_load_state('load')
         page.wait_for_timeout(6000)
 
         run_func(page, store_username, store_name, task_key)

{qrpa-1.0.75 → qrpa-1.0.77}/qrpa.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qrpa
-Version: 1.0.75
+Version: 1.0.77
 Summary: qsir's rpa library
 Author: QSir
 Author-email: QSir <1171725650@qq.com>