qrpa 1.0.85__tar.gz → 1.0.87__tar.gz

{qrpa-1.0.85 → qrpa-1.0.87}/PKG-INFO

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

{qrpa-1.0.85 → qrpa-1.0.87}/pyproject.toml

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

{qrpa-1.0.85 → qrpa-1.0.87}/qrpa/shein_lib.py

@@ -31,6 +31,20 @@ class SheinLib:
     def deal_auth(self):
         web_page = self.web_page
 
+        # 等待页面稳定并收集诊断信息
+        try:
+            log(f"当前页面URL: {web_page.url}, 标题: {web_page.title()}", self.store_username, self.store_name)
+            web_page.wait_for_load_state("domcontentloaded", timeout=5000)
+            log("页面DOM加载完成", self.store_username, self.store_name)
+        except Exception as e:
+            log(f"等待页面DOM加载超时: {e}, URL: {web_page.url}", self.store_username, self.store_name)
+            try:
+                log(f"页面状态检查 - 标题: {web_page.title()}, URL: {web_page.url}", self.store_username, self.store_name)
+            except Exception as check_error:
+                log(f"页面状态检查失败: {check_error}", self.store_username, self.store_name)
+        
+        web_page.wait_for_timeout(3000)
+
         # 定义最大重试次数
         MAX_RETRIES = 5
         retries = 0
@@ -45,6 +59,13 @@ class SheinLib:
                 retries += 1
 
                 while not web_page.locator('//div[contains(text(),"商家后台")]').nth(1).is_visible():
+                    
+                    try:
+                        current_url = web_page.url
+                        current_title = web_page.title()
+                        log(f"循环检查 - URL: {current_url}, 标题: {current_title}", self.store_username, self.store_name)
+                    except Exception as status_error:
+                        log(f"获取页面状态失败: {status_error}", self.store_username, self.store_name)
 
                     if web_page.locator('xpath=//div[@id="container" and @alita-name="gmpsso"]//button[@type="button" and @id]').nth(0).is_visible():
                         if 'https://sso.geiwohuo.com/#/home' not in web_page.url:
@@ -145,19 +166,31 @@ class SheinLib:
             except Exception as e:
                 log(f"错误发生: {e}, 重试中...({self.store_username}, {self.store_name})")
                 log(traceback.format_exc())
-                if 'crashed' in str(e):
+                
+                # 收集崩溃时的详细信息
+                try:
+                    crash_url = web_page.url
+                    crash_title = web_page.title()
+                    log(f"崩溃时页面信息 - URL: {crash_url}, 标题: {crash_title}", self.store_username, self.store_name)
+                    
+                    # 尝试截图保存崩溃现场
                     try:
-                        if 'https://sso.geiwohuo.com//#/auth/SSLS' in web_page.url:
-                            log("检测到页面崩溃，尝试恢复到首页", self.store_username, self.store_name)
-                            web_page.wait_for_load_state("networkidle", timeout=5000)
-                            web_page.goto('https://sso.geiwohuo.com/#/home', wait_until='domcontentloaded', timeout=10000)
-                        else:
-                            log("页面崩溃，尝试重新加载当前页面", self.store_username, self.store_name)
-                            web_page.reload(wait_until='domcontentloaded', timeout=10000)
-                        web_page.wait_for_timeout(3000)
-                    except Exception as recovery_error:
-                        log(f"页面恢复失败: {recovery_error}", self.store_username, self.store_name)
-                        web_page.wait_for_timeout(5000)
+                        screenshot_path = f"crash_screenshot_{self.store_username}_{int(time.time())}.png"
+                        web_page.screenshot(path=screenshot_path)
+                        log(f"已保存崩溃截图: {screenshot_path}", self.store_username, self.store_name)
+                    except:
+                        log("无法截取崩溃时的页面截图", self.store_username, self.store_name)
+                        
+                except:
+                    log("无法获取崩溃时的页面信息", self.store_username, self.store_name)
+                
+                # 检查是否是内存相关崩溃
+                if any(keyword in str(e).lower() for keyword in ['memory', 'out of memory', 'oom']):
+                    log("检测到内存相关崩溃", self.store_username, self.store_name)
+                
+                if 'crashed' in str(e) or 'Target' in str(e):
+                    log("检测到页面或目标崩溃，直接退出当前循环", self.store_username, self.store_name)
+                    raise e
                 retries += 1
                 if retries >= MAX_RETRIES:
                     log(f"达到最大重试次数，停止尝试({self.store_username}, {self.store_name})")

{qrpa-1.0.85 → qrpa-1.0.87}/qrpa/shein_ziniao.py

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

{qrpa-1.0.85 → qrpa-1.0.87}/qrpa.egg-info/PKG-INFO

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