qrpa 1.0.87__tar.gz → 1.0.89__tar.gz

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

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

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

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

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

@@ -31,19 +31,43 @@ 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)
+        # 等待页面稳定并处理导航
+        for attempt in range(3):
             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)
+                current_url = web_page.url
+                log(f"尝试获取页面信息 - URL: {current_url}", self.store_username, self.store_name)
+                
+                # 检查是否在认证页面，如果是则直接跳转到目标页面
+                if '/auth/SSLS' in current_url:
+                    log("检测到SSLS认证页面，直接跳转到首页", self.store_username, self.store_name)
+                    web_page.goto('https://sso.geiwohuo.com/#/home', wait_until='domcontentloaded', timeout=15000)
+                    web_page.wait_for_timeout(3000)
+                    current_url = web_page.url
+                    log(f"跳转后URL: {current_url}", self.store_username, self.store_name)
+                
+                # 等待导航完成
+                web_page.wait_for_load_state("domcontentloaded", timeout=6000)
+                
+                final_url = web_page.url
+                final_title = web_page.title()
+                log(f"页面稳定 - URL: {final_url}, 标题: {final_title}", self.store_username, self.store_name)
+                break
+                
+            except Exception as e:
+                log(f"第{attempt+1}次等待页面稳定失败: {e}", self.store_username, self.store_name)
+                if "crashed" in str(e) or "Target" in str(e):
+                    log("页面稳定检查时崩溃，直接继续", self.store_username, self.store_name)
+                    break
+                elif "destroyed" in str(e) or "navigation" in str(e):
+                    log("检测到导航中断，等待导航完成", self.store_username, self.store_name)
+                    web_page.wait_for_timeout(4000)
+                    continue
+                elif attempt == 2:
+                    log("页面稳定等待最终失败，继续执行", self.store_username, self.store_name)
+                    break
+                web_page.wait_for_timeout(2000)
         
-        web_page.wait_for_timeout(3000)
+        web_page.wait_for_timeout(2000)
 
         # 定义最大重试次数
         MAX_RETRIES = 5
@@ -64,8 +88,18 @@ class SheinLib:
                         current_url = web_page.url
                         current_title = web_page.title()
                         log(f"循环检查 - URL: {current_url}, 标题: {current_title}", self.store_username, self.store_name)
+                        
+                        # 如果在认证页面且出现问题，直接跳转
+                        if '/auth/SSLS' in current_url:
+                            log("在主循环中检测到SSLS认证页面，跳转到首页", self.store_username, self.store_name)
+                            web_page.goto('https://sso.geiwohuo.com/#/home', wait_until='domcontentloaded', timeout=15000)
+                            web_page.wait_for_timeout(3000)
+                            continue
+                            
                     except Exception as status_error:
                         log(f"获取页面状态失败: {status_error}", self.store_username, self.store_name)
+                        if "crashed" in str(status_error):
+                            break
 
                     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:
@@ -184,10 +218,15 @@ class SheinLib:
                 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 "destroyed" in str(e) or "navigation" in str(e):
+                    log("检测到导航中断，等待页面稳定后重试", self.store_username, self.store_name)
+                    web_page.wait_for_timeout(5000)
+                    continue
+                
                 if 'crashed' in str(e) or 'Target' in str(e):
                     log("检测到页面或目标崩溃，直接退出当前循环", self.store_username, self.store_name)
                     raise e

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

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