增强TMWebDriver会话超时与无会话错误提示
This commit is contained in:
@@ -199,7 +199,7 @@ class TMWebDriver:
|
|||||||
print(f"会话 {session_id} 未连接,自动切换到最新活动会话: {session.id}")
|
print(f"会话 {session_id} 未连接,自动切换到最新活动会话: {session.id}")
|
||||||
session_id = self.default_session_id = session.id
|
session_id = self.default_session_id = session.id
|
||||||
if not session or not session.is_active():
|
if not session or not session.is_active():
|
||||||
breakpoint()
|
#breakpoint()
|
||||||
raise ValueError(f"会话ID {session_id} 未连接")
|
raise ValueError(f"会话ID {session_id} 未连接")
|
||||||
|
|
||||||
tp = session.type
|
tp = session.type
|
||||||
|
|||||||
7
ga.py
7
ga.py
@@ -105,10 +105,11 @@ def first_init_driver():
|
|||||||
global driver
|
global driver
|
||||||
from TMWebDriver import TMWebDriver
|
from TMWebDriver import TMWebDriver
|
||||||
driver = TMWebDriver()
|
driver = TMWebDriver()
|
||||||
while True:
|
for i in range(20):
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
sess = driver.get_all_sessions()
|
sess = driver.get_all_sessions()
|
||||||
if len(sess) > 0: break
|
if len(sess) > 0: break
|
||||||
|
if len(sess) == 0: return
|
||||||
if len(sess) == 1:
|
if len(sess) == 1:
|
||||||
driver.newtab()
|
driver.newtab()
|
||||||
time.sleep(5)
|
time.sleep(5)
|
||||||
@@ -122,6 +123,8 @@ def web_scan(focus_item="", switch_tab_id=None):
|
|||||||
"""
|
"""
|
||||||
global driver
|
global driver
|
||||||
if driver is None: first_init_driver()
|
if driver is None: first_init_driver()
|
||||||
|
if len(driver.get_all_sessions()) == 0:
|
||||||
|
return {"status": "error", "msg": "没有可用的浏览器标签页,请先打开一个浏览器标签页,且确认TMWebDriver浏览器tempermonkey插件已安装并启用。"}
|
||||||
try:
|
try:
|
||||||
tabs = []
|
tabs = []
|
||||||
for sess in driver.get_all_sessions():
|
for sess in driver.get_all_sessions():
|
||||||
@@ -171,6 +174,8 @@ def web_execute_js(script: str):
|
|||||||
"""
|
"""
|
||||||
global driver
|
global driver
|
||||||
if driver is None: first_init_driver()
|
if driver is None: first_init_driver()
|
||||||
|
if len(driver.get_all_sessions()) == 0:
|
||||||
|
return {"status": "error", "msg": "没有可用的浏览器标签页,请先打开一个浏览器标签页,且确认TMWebDriver浏览器tempermonkey插件已安装并启用。"}
|
||||||
try:
|
try:
|
||||||
result = execute_js_rich(script, driver)
|
result = execute_js_rich(script, driver)
|
||||||
return result
|
return result
|
||||||
|
|||||||
Reference in New Issue
Block a user