修复同域iframe不自动断开问题

DrissionPage/chromium_driver.py

@@ -121,8 +121,7 @@ class ChromiumDriver(object):
             except WebSocketTimeoutException:
                 continue
             except (WebSocketException, OSError, WebSocketConnectionClosedException):
-                if not self._stopped.is_set():
-                    self.stop()
+                self.stop()
                 return
 
             if self.debug:
@@ -150,8 +149,7 @@ class ChromiumDriver(object):
                 try:
                     self.event_handlers[event['method']](**event['params'])
                 except Exception as e:
-                    # pass
-                    raise RuntimeError(f"\n回调函数 {self.event_handlers[event['method']].__name__} 错误：\n{e}")
+                    raise RuntimeError(f"\n回调函数错误：\n{e}")
 
             self.event_queue.task_done()
 

DrissionPage/chromium_frame.py

@@ -4,6 +4,7 @@
 @Contact :   g1879@qq.com
 """
 from re import search
+from threading import Thread
 from time import sleep, perf_counter
 from warnings import warn
 
@@ -37,6 +38,7 @@ class ChromiumFrame(ChromiumBase):
         end_time = perf_counter() + 2
         while perf_counter() < end_time and self.url == 'about:blank':
             sleep(.1)
+        Thread(target=self._check_alive).start()
 
     def __call__(self, loc_or_str, timeout=None):
         """在内部查找元素
@@ -109,8 +111,8 @@ class ChromiumFrame(ChromiumBase):
             if self._debug:
                 print('---获取document')
 
-            end_time = perf_counter() + 10
-            while perf_counter() < end_time:
+            end_time = perf_counter() + 3
+            while self.is_alive and perf_counter() < end_time:
                 try:
                     if self._is_diff_domain is False:
                         node = self.page.run_cdp('DOM.describeNode', backendNodeId=self.ids.backend_id)['node']
@@ -125,8 +127,8 @@ class ChromiumFrame(ChromiumBase):
                 except Exception:
                     sleep(.1)
 
-            else:
-                raise RuntimeError('获取document失败。')
+            # else:
+            #     raise RuntimeError('获取document失败。')
 
             if self._debug:
                 print('---获取document结束')
@@ -276,8 +278,8 @@ class ChromiumFrame(ChromiumBase):
                 return 'complete'
 
         else:
-            end_time = perf_counter() + 10
-            while perf_counter() < end_time:
+            end_time = perf_counter() + 3
+            while self.is_alive and perf_counter() < end_time:
                 try:
                     return self.doc_ele.run_js('return this.readyState;')
                 except ContextLossError:
@@ -290,7 +292,12 @@ class ChromiumFrame(ChromiumBase):
 
                 sleep(.1)
 
-            raise RuntimeError('获取document失败。')
+            # raise RuntimeError('获取document失败。')
+
+    @property
+    def is_alive(self):
+        """返回是否仍可用"""
+        return self.states.is_alive
 
     @property
     def scroll(self):
@@ -588,6 +595,12 @@ class ChromiumFrame(ChromiumBase):
         """返回当前frame是否同域"""
         return self.frame_id in str(self.page.run_cdp('Page.getFrameTree')['frameTree'])
 
+    def _check_alive(self):
+        """检测iframe是否有效线程方法"""
+        while self.is_alive:
+            sleep(1)
+        self.driver.stop()
+
     # -------------准备废弃------------
     def set_attr(self, attr, value):
         """设置frame元素attribute属性

DrissionPage/chromium_frame.pyi

@@ -28,6 +28,8 @@ class ChromiumFrame(ChromiumBase):
                  loc_or_str: Union[Tuple[str, str], str],
                  timeout: float = None) -> Union[ChromiumElement, str]: ...
 
+    def _check_alive(self) -> None: ...
+
     def __repr__(self) -> str: ...
 
     def _runtime_settings(self) -> None: ...
@@ -95,6 +97,9 @@ class ChromiumFrame(ChromiumBase):
     @property
     def ready_state(self) -> str: ...
 
+    @property
+    def is_alive(self) -> bool: ...
+
     @property
     def scroll(self) -> ChromiumFrameScroll: ...