blackteay/DrissionPage
1
0
Fork 0
mirror of https://gitee.com/g1879/DrissionPage.git synced 2024-12-10 04:00:23 +08:00
Code Issues Projects Releases Wiki Activity

修复ChromiumPage重试访问时导致丢失document的问题

Browse Source
This commit is contained in:
g1879 2022-11-26 20:09:20 +08:00
parent 314e7d1989
commit d2e8bfb20e
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
DrissionPage/chromium_base.py
View File

@ -32,6 +32,7 @@ class ChromiumBase(BasePage):
super().__init__(timeout) super().__init__(timeout)
self._is_loading = None self._is_loading = None
self._root_id = None self._root_id = None
self._debug = False
self._connect_browser(address, tab_id) self._connect_browser(address, tab_id)
def _connect_browser(self, def _connect_browser(self,
@ -77,6 +78,8 @@ class ChromiumBase(BasePage):
def _get_document(self) -> None: def _get_document(self) -> None:
"""刷新cdp使用的document数据""" """刷新cdp使用的document数据"""
if not self._is_reading: if not self._is_reading:
if self._debug:
print('getDoc')
self._is_reading = True self._is_reading = True
self._wait_loading() self._wait_loading()
root_id = self._tab_obj.DOM.getDocument()['root']['nodeId'] root_id = self._tab_obj.DOM.getDocument()['root']['nodeId']
@ -94,6 +97,8 @@ class ChromiumBase(BasePage):
end_time = perf_counter() + timeout end_time = perf_counter() + timeout
while perf_counter() < end_time: while perf_counter() < end_time:
state = self.ready_state state = self.ready_state
if self._debug:
print(f'{state=}')
if state == 'complete': if state == 'complete':
return True return True
elif self.page_load_strategy == 'eager' and state in ('interactive', 'complete'): elif self.page_load_strategy == 'eager' and state in ('interactive', 'complete'):
@ -110,11 +115,15 @@ class ChromiumBase(BasePage):
def _onLoadEventFired(self, **kwargs): def _onLoadEventFired(self, **kwargs):
"""在页面刷新、变化后重新读取页面内容""" """在页面刷新、变化后重新读取页面内容"""
if self._first_run is False and self._is_loading: if self._first_run is False and self._is_loading:
if self._debug:
print('loadComplete')
self._get_document() self._get_document()
def _onFrameNavigated(self, **kwargs): def _onFrameNavigated(self, **kwargs):
"""页面跳转时触发""" """页面跳转时触发"""
if not kwargs['frame'].get('parentId', None): if not kwargs['frame'].get('parentId', None):
if self._debug:
print('nav')
self._is_loading = True self._is_loading = True
def _set_options(self) -> None: def _set_options(self) -> None:
@ -437,6 +446,8 @@ class ChromiumBase(BasePage):
def stop_loading(self) -> None: def stop_loading(self) -> None:
"""页面停止加载""" """页面停止加载"""
if self._debug:
print('stopLoading')
self._driver.Page.stopLoading() self._driver.Page.stopLoading()
self._get_document() self._get_document()
@ -546,6 +557,10 @@ class ChromiumBase(BasePage):
if _ < times: if _ < times:
sleep(interval) sleep(interval)
while self.is_loading:
sleep(.1)
if self._debug:
print('重试')
if show_errmsg: if show_errmsg:
print(f'重试 {to_url}') print(f'重试 {to_url}')

1
DrissionPage/web_page.py
View File

@ -34,6 +34,7 @@ class WebPage(SessionPage, ChromiumPage, BasePage):
self._mode = mode.lower() self._mode = mode.lower()
if self._mode not in ('s', 'd'): if self._mode not in ('s', 'd'):
raise ValueError('mode参数只能是s或d。') raise ValueError('mode参数只能是s或d。')
self._debug = False
super(ChromiumBase, self).__init__(timeout) # 调用Base的__init__() super(ChromiumBase, self).__init__(timeout) # 调用Base的__init__()
self._session = None self._session = None