qrpa 1.0.84__tar.gz → 1.0.86__tar.gz

{qrpa-1.0.84 → qrpa-1.0.86}/PKG-INFO

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

{qrpa-1.0.84 → qrpa-1.0.86}/pyproject.toml

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

{qrpa-1.0.84 → qrpa-1.0.86}/qrpa/shein_lib.py

@@ -27,37 +27,39 @@ class SheinLib:
 
         self.deal_auth()
 
-    # 处理鉴权 - 优化版本
+    # 处理鉴权
     def deal_auth(self):
         web_page = self.web_page
 
+        # 等待页面稳定
+        try:
+            web_page.wait_for_load_state("networkidle", timeout=10000)
+        except Exception as e:
+            log(f"等待页面稳定超时: {e}", self.store_username, self.store_name)
+        
+        web_page.wait_for_timeout(2000)
+
         # 定义最大重试次数
-        MAX_RETRIES = 3  # 减少重试次数，避免过度重试
+        MAX_RETRIES = 5
         retries = 0
         wait_count = 0
         is_send = False
 
+        # close_modal(web_page) # 不能开启 需要勾选协议弹窗
+
         while retries < MAX_RETRIES:
             try:
-                # 检查页面是否已崩溃，如果是则重新创建页面
-                if self.is_page_crashed():
-                    self.recreate_page()
-                    web_page = self.web_page
 
-                # 等待页面稳定加载
-                self.wait_for_page_stable()
+                retries += 1
 
                 while not web_page.locator('//div[contains(text(),"商家后台")]').nth(1).is_visible():
 
-                    # 处理鉴权确定按钮
                     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:
                             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()
-                            # 等待导航完成
-                            self.wait_for_navigation()
+                            web_page.wait_for_timeout(5000)
 
-                    # 处理验证码
                     while web_page.locator('//div[text()="验证码"]').is_visible():
                         log(f'等待输入验证码: {wait_count}', self.store_username, self.store_name)
                         if not is_send:
@@ -68,223 +70,116 @@ class SheinLib:
                         time.sleep(5)
                         wait_count += 1
 
-                    # 处理协议签署
-                    self.handle_agreement()
+                    if web_page.locator('//div[contains(text(),"同意签署协议")]').count() > 0:
+                        while web_page.locator('//div[contains(text(),"同意签署协议")]').count() == 0:
+                            log('等待协议内容出现')
+                            web_page.wait_for_timeout(1000)
+
+                    if web_page.locator('//div[contains(text(),"同意签署协议")]').count() > 0:
+                        log('检测到同意签署协议')
+                        web_page.wait_for_timeout(1000)
+                        log('点击同意复选框')
+                        web_page.locator('//i[@class="so-checkinput-indicator so-checkinput-checkbox"]').click()
+                        web_page.wait_for_timeout(1000)
+                        log('点击同意按钮')
+                        web_page.locator('//button[span[text()="同意"]]').click()
 
-                    # 处理登录按钮
                     if web_page.locator('//input[@name="username"]').is_visible():
                         log("用户名输入框可见 等待5秒点击'登录'按钮", self.store_username, self.store_name)
                         web_page.wait_for_timeout(5000)
                         log('点击"登录"', self.store_username, self.store_name)
                         web_page.locator('//button[contains(@class,"login_btn")]').click()
-                        # 等待登录完成
-                        self.wait_for_navigation()
 
-                    # 检查是否已成功进入商品管理
+                        log('再延时5秒', self.store_username, self.store_name)
+                        web_page.wait_for_timeout(5000)
+
                     if web_page.locator('//span[contains(text(),"商品管理")]').nth(1).is_visible():
                         log('商品管理菜单可见 退出鉴权处理', self.store_username, self.store_name)
                         return
 
-                    # 处理各种页面状态
-                    self.handle_page_states()
+                    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(5000)
+                        web_page.reload()
+
+                    # while r'=/CN' in web_page.url:
+                    #     safe_goto(web_page, 'https://sso.geiwohuo.com/#/home?q=0')
+                    #
+                    #     web_page.wait_for_timeout(5000)
+                    #     if web_page.locator('//input[@name="username"]').is_visible():
+                    #         log("用户名输入框可见 等待5秒点击'登录'按钮", self.store_username, self.store_name)
+                    #         web_page.wait_for_timeout(5000)
+                    #         log('点击"登录"', self.store_username, self.store_name)
+                    #         web_page.locator('//button[contains(@class,"login_btn")]').click()
+                    #
+                    #         log('再延时5秒', self.store_username, self.store_name)
+                    #         web_page.wait_for_timeout(5000)
 
                     web_page.wait_for_timeout(3000)
 
-                    # 检查成功条件
-                    if self.is_auth_successful():
-                        break
+                    if 'https://sso.geiwohuo.com/#/home' in web_page.url:
+
+                        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_timeout(5000)
+                            break
+
+                    if 'mrs.biz.sheincorp.cn' in web_page.url and '商家后台' in web_page.title():
+                        try:
+                            web_page.goto('https://sso.geiwohuo.com/#/home?q=1', wait_until='domcontentloaded', timeout=10000)
+                            web_page.wait_for_timeout(3000)
+                        except Exception as nav_error:
+                            log(f"导航失败，尝试重新加载: {nav_error}", self.store_username, self.store_name)
+                            web_page.reload(wait_until='domcontentloaded', timeout=10000)
+                            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_timeout(5000)
+                        web_page.reload()
+                        web_page.wait_for_timeout(5000)
 
-                break
+                    if web_page.title() == 'SHEIN':
+                        try:
+                            web_page.goto('https://sso.geiwohuo.com/#/home?q=2', wait_until='domcontentloaded', timeout=10000)
+                            web_page.wait_for_timeout(3000)
+                        except Exception as nav_error:
+                            log(f"导航失败，尝试重新加载: {nav_error}", self.store_username, self.store_name)
+                            web_page.reload(wait_until='domcontentloaded', timeout=10000)
+                            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):
-                    log("检测到页面崩溃，尝试恢复...")
-                    self.handle_page_crash()
-
+                    try:
+                        log("检测到页面崩溃，尝试重建页面", self.store_username, self.store_name)
+                        context = web_page.context
+                        web_page.close()
+                        web_page = context.new_page()
+                        self.web_page = web_page
+                        web_page.goto('https://sso.geiwohuo.com/#/home', wait_until='domcontentloaded', timeout=15000)
+                        web_page.wait_for_timeout(3000)
+                        log("页面重建成功", self.store_username, self.store_name)
+                    except Exception as recovery_error:
+                        log(f"页面重建失败: {recovery_error}", self.store_username, self.store_name)
+                        try:
+                            web_page.reload(wait_until='domcontentloaded', timeout=10000)
+                            web_page.wait_for_timeout(3000)
+                        except:
+                            web_page.wait_for_timeout(5000)
                 retries += 1
                 if retries >= MAX_RETRIES:
                     log(f"达到最大重试次数，停止尝试({self.store_username}, {self.store_name})")
-                    raise e  # 重新抛出异常以便上层处理
-
-                # 指数退避等待
-                time.sleep(2 ** retries)
-
-    # 辅助方法
-    def is_page_crashed(self):
-        """检查页面是否已崩溃"""
-        try:
-            # 尝试访问页面基本属性
-            self.web_page.url
-            self.web_page.title()
-            return False
-        except Exception as e:
-            if 'crashed' in str(e):
-                return True
-            return False
-
-    def recreate_page(self):
-        """重新创建页面实例"""
-        try:
-            # 关闭当前页面
-            if hasattr(self, 'web_page') and self.web_page:
-                try:
-                    self.web_page.close()
-                except:
-                    pass
-
-            # 重新创建页面
-            self.web_page = self.browser.new_page()
-
-            # 设置页面选项
-            self.web_page.set_default_timeout(30000)  # 30秒超时
-            self.web_page.set_default_navigation_timeout(30000)
-
-            # 导航到目标页面
-            self.safe_goto('https://sso.geiwohuo.com/#/home')
-
-        except Exception as e:
-            log(f"重新创建页面失败: {e}")
-            raise
+                    break
+                time.sleep(2)  # 错误时等待2秒后重试
 
-    def wait_for_page_stable(self, timeout=10000):
-        """等待页面稳定加载"""
-        try:
-            # 等待网络空闲
-            self.web_page.wait_for_load_state('networkidle', timeout=timeout)
-            # 额外等待一下确保JavaScript执行完成
-            self.web_page.wait_for_timeout(2000)
-        except Exception as e:
-            log(f"等待页面稳定超时: {e}")
-
-    def wait_for_navigation(self, timeout=30000):
-        """等待导航完成"""
-        try:
-            self.web_page.wait_for_load_state('networkidle', timeout=timeout)
-            self.web_page.wait_for_timeout(2000)
-        except Exception as e:
-            log(f"等待导航完成超时: {e}")
-
-    def safe_goto(self, url, retries=3):
-        """安全的页面导航"""
-        for i in range(retries):
-            try:
-                # 设置较长的超时时间处理302重定向
-                response = self.web_page.goto(url, wait_until='networkidle', timeout=60000)
-
-                # 检查响应状态
-                if response and response.status >= 400:
-                    log(f"页面返回错误状态: {response.status}")
-                    if i < retries - 1:
-                        time.sleep(2)
-                        continue
-
-                # 等待页面稳定
-                self.wait_for_page_stable()
-                return
-
-            except Exception as e:
-                log(f"导航到 {url} 失败 (尝试 {i + 1}/{retries}): {e}")
-                if 'crashed' in str(e):
-                    # 页面崩溃，需要重新创建
-                    if i < retries - 1:
-                        self.recreate_page()
-                        continue
-                    else:
-                        raise
-
-                if i < retries - 1:
-                    time.sleep(2 ** i)  # 指数退避
-                    continue
-                raise
-
-    def handle_agreement(self):
-        """处理协议签署"""
-        if self.web_page.locator('//div[contains(text(),"同意签署协议")]').count() > 0:
-            # 等待协议内容完全加载
-            self.web_page.wait_for_selector('//div[contains(text(),"同意签署协议")]', timeout=10000)
-            log('检测到同意签署协议')
-            self.web_page.wait_for_timeout(1000)
-            log('点击同意复选框')
-            self.web_page.locator('//i[@class="so-checkinput-indicator so-checkinput-checkbox"]').click()
-            self.web_page.wait_for_timeout(1000)
-            log('点击同意按钮')
-            self.web_page.locator('//button[span[text()="同意"]]').click()
-            # 等待处理完成
-            self.wait_for_navigation()
-
-    def handle_page_states(self):
-        """处理各种页面状态"""
-        current_url = self.web_page.url
-        current_title = self.web_page.title()
-
-        log(f'当前页面状态 - URL: {current_url}, Title: {current_title}', self.store_username, self.store_name)
-
-        if 'https://sso.geiwohuo.com/#/home' in current_url:
-            if current_title == 'SHEIN' or '后台首页' in current_title or '商家后台' in current_title:
-                log(f'{current_title} 页面加载完成', self.store_username, self.store_name)
-                self.web_page.wait_for_timeout(5000)
-            else:
-                # 页面可能还在加载，刷新一下
-                self.web_page.reload()
-                self.wait_for_page_stable()
-
-        elif 'mrs.biz.sheincorp.cn' in current_url and '商家后台' in current_title:
-            self.safe_goto('https://sso.geiwohuo.com/#/home?q=1')
-
-        elif self.web_page.locator('//h1[contains(text(),"鉴权")]').is_visible():
-            log('检测到鉴权页面，刷新页面', self.store_username, self.store_name)
-            self.web_page.reload()
-            self.wait_for_page_stable()
-
-        elif current_title == 'SHEIN' and 'sso.geiwohuo.com' not in current_url:
-            self.safe_goto('https://sso.geiwohuo.com/#/home?q=2')
-
-    def is_auth_successful(self):
-        """检查鉴权是否成功"""
-        try:
-            current_url = self.web_page.url
-            current_title = self.web_page.title()
-
-            success_conditions = [
-                'SHEIN全球商家中心' in current_title,
-                '后台首页' in current_title,
-                '商家后台' in current_title,
-                self.web_page.locator('//span[contains(text(),"商品管理")]').nth(1).is_visible()
-            ]
-
-            return any(success_conditions)
-        except:
-            return False
-
-    def handle_page_crash(self):
-        """处理页面崩溃"""
-        try:
-            log("处理页面崩溃...")
-
-            # 如果是特定URL的崩溃，直接导航到安全页面
-            if hasattr(self, 'web_page'):
-                try:
-                    current_url = self.web_page.url
-                    if 'https://sso.geiwohuo.com//#/auth/SSLS' in current_url:
-                        self.safe_goto('https://sso.geiwohuo.com/#/home?q=3')
-                        return
-                except:
-                    pass
-
-            # 重新创建页面
-            self.recreate_page()
-
-        except Exception as e:
-            log(f"处理页面崩溃失败: {e}")
-            raise
         log('鉴权处理结束')
         # web_page.wait_for_load_state("load")
         # web_page.wait_for_load_state("networkidle")
-        self.web_page.wait_for_timeout(3000)
+        web_page.wait_for_timeout(3000)
 
     # 获取质检报告pdf地址
     def get_qc_report_url(self, deliverCode, purchaseCode):

{qrpa-1.0.84 → qrpa-1.0.86}/qrpa.egg-info/PKG-INFO

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