Jarvis-Brain 0.1.5.10__py3-none-any.whl → 0.1.7.14__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {jarvis_brain-0.1.5.10.dist-info → jarvis_brain-0.1.7.14.dist-info}/METADATA +1 -1
- jarvis_brain-0.1.7.14.dist-info/RECORD +11 -0
- mcp_tools/dp_tools.py +73 -38
- mcp_tools/main.py +9 -7
- tools/browser_manager.py +3 -1
- tools/browser_proxy.py +171 -0
- jarvis_brain-0.1.5.10.dist-info/RECORD +0 -10
- {jarvis_brain-0.1.5.10.dist-info → jarvis_brain-0.1.7.14.dist-info}/WHEEL +0 -0
- {jarvis_brain-0.1.5.10.dist-info → jarvis_brain-0.1.7.14.dist-info}/entry_points.txt +0 -0
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
mcp_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
2
|
+
mcp_tools/dp_tools.py,sha256=OcjehVegZ8hRtJunbGkhUPcTHS7BXFdewBU5mbaQX9M,11927
|
|
3
|
+
mcp_tools/main.py,sha256=Fdt2N3oKGwvruuno_ywnuWSlm1BexE9ZY669H2LTo9w,1056
|
|
4
|
+
tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
5
|
+
tools/browser_manager.py,sha256=EXM7n-sDOtdQGpWkVTAZHWhepVU-7PAoUTDNgGF9_fQ,1938
|
|
6
|
+
tools/browser_proxy.py,sha256=cdMRxcUYyaOqGU17lldltHOvt9rxXD5Dwh7hBXEBby4,6780
|
|
7
|
+
tools/tools.py,sha256=TaWs-CNXy-py9BFmCnJrQ09ke938xXpImf-N2Qo_Rvc,4708
|
|
8
|
+
jarvis_brain-0.1.7.14.dist-info/METADATA,sha256=IU02nMa7R0JTNZJJLfczDzoArZruSKFyajqUG-3Wvf8,242
|
|
9
|
+
jarvis_brain-0.1.7.14.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
|
|
10
|
+
jarvis_brain-0.1.7.14.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
|
|
11
|
+
jarvis_brain-0.1.7.14.dist-info/RECORD,,
|
mcp_tools/dp_tools.py
CHANGED
|
@@ -5,7 +5,9 @@ from typing import Any
|
|
|
5
5
|
|
|
6
6
|
from fastmcp import FastMCP
|
|
7
7
|
|
|
8
|
+
from tools.browser_manager import BrowserManager
|
|
8
9
|
from tools.tools import compress_html, requests_html, dp_headless_html, assert_waf_cookie, dp_mcp_message_pack
|
|
10
|
+
from tools.browser_proxy import DPProxyClient, DPProxyClientManager
|
|
9
11
|
|
|
10
12
|
html_source_code_local_save_path = os.path.join(os.getcwd(), "html-source-code")
|
|
11
13
|
waf_status_code_dict = {
|
|
@@ -13,36 +15,41 @@ waf_status_code_dict = {
|
|
|
13
15
|
521: "加速乐"
|
|
14
16
|
}
|
|
15
17
|
# 一轮最大输入,以免单个html最大长度超过ai最大输入
|
|
16
|
-
|
|
18
|
+
one_turn_max_token = 20000
|
|
17
19
|
|
|
18
20
|
|
|
19
|
-
def register_visit_url(mcp: FastMCP, browser_manager):
|
|
20
|
-
@mcp.tool(name="visit_url",
|
|
21
|
-
|
|
22
|
-
|
|
21
|
+
def register_visit_url(mcp: FastMCP, browser_manager: BrowserManager, client_manager: DPProxyClientManager):
|
|
22
|
+
@mcp.tool(name="visit_url",
|
|
23
|
+
description="使用Drissionpage打开url访问某个网站,并开始监听初始tab页的所有的XHR请求,当需要使用手机版浏览器Ua时use_mobile_user_agent为True")
|
|
24
|
+
async def visit_url(url: str, use_mobile_user_agent=False) -> dict[str, Any]:
|
|
25
|
+
mobile_user_agent = None
|
|
26
|
+
if use_mobile_user_agent:
|
|
27
|
+
mobile_user_agent = "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/143.0.0.0 Mobile Safari/537.36"
|
|
28
|
+
port, _browser = browser_manager.create_browser(mobile_user_agent)
|
|
23
29
|
tab = _browser.get_tab()
|
|
30
|
+
client_manager.create_client(tab)
|
|
24
31
|
tab.get(url)
|
|
25
32
|
tab_id = tab.tab_id
|
|
26
33
|
return dp_mcp_message_pack(
|
|
27
|
-
f"已在[{port}]端口创建浏览器对象,并已打开链接:{url}",
|
|
34
|
+
f"已在[{port}]端口创建浏览器对象,并已打开链接:{url},打开的模式是:{'手机版' if use_mobile_user_agent else '电脑版'}",
|
|
28
35
|
tab_id=tab_id,
|
|
29
36
|
browser_port=port
|
|
30
37
|
)
|
|
31
38
|
|
|
32
39
|
|
|
33
|
-
def register_get_html(mcp: FastMCP, browser_manager):
|
|
40
|
+
def register_get_html(mcp: FastMCP, browser_manager, client_manager: DPProxyClientManager):
|
|
34
41
|
@mcp.tool(name="get_html", description="使用Drissionpage获取某一个tab页的html")
|
|
35
42
|
async def get_html(browser_port: int, tab_id: str) -> dict[str, Any]:
|
|
36
43
|
_browser = browser_manager.get_browser(browser_port)
|
|
37
44
|
tab = _browser.get_tab(tab_id)
|
|
38
|
-
|
|
45
|
+
file_name_prefix = hashlib.md5(str(tab.title).encode('utf-8')).hexdigest()
|
|
39
46
|
if not os.path.exists(html_source_code_local_save_path):
|
|
40
47
|
os.makedirs(html_source_code_local_save_path)
|
|
41
48
|
min_html, compress_rate = compress_html(tab.html)
|
|
42
|
-
html_str_list = [min_html[i:i +
|
|
49
|
+
html_str_list = [min_html[i:i + one_turn_max_token] for i in range(0, len(min_html), one_turn_max_token)]
|
|
43
50
|
html_file_list = []
|
|
44
51
|
for index, html_str in enumerate(html_str_list):
|
|
45
|
-
file_name =
|
|
52
|
+
file_name = file_name_prefix + f"_{tab_id}_segment{index}.html"
|
|
46
53
|
abs_path = os.path.join(html_source_code_local_save_path, file_name)
|
|
47
54
|
with open(abs_path, "w", encoding="utf-8") as f:
|
|
48
55
|
f.write(html_str)
|
|
@@ -50,32 +57,43 @@ def register_get_html(mcp: FastMCP, browser_manager):
|
|
|
50
57
|
message = f"已保存tab页:【{tab_id}】的html源码片段共{len(html_file_list)}个"
|
|
51
58
|
return dp_mcp_message_pack(message, tab_id=tab_id, htmls_local_path=html_file_list)
|
|
52
59
|
|
|
53
|
-
|
|
54
|
-
|
|
60
|
+
|
|
61
|
+
def register_get_new_tab(mcp: FastMCP, browser_manager, client_manager: DPProxyClientManager):
|
|
62
|
+
@mcp.tool(name="get_new_tab",
|
|
63
|
+
description="使用Drissionpage创建一个新的tab页,在新的tab页中打开url,并开始监听新的tab页的所有XHR请求")
|
|
55
64
|
async def get_new_tab(browser_port: int, url: str) -> dict[str, Any]:
|
|
56
65
|
_browser = browser_manager.get_browser(browser_port)
|
|
57
|
-
tab = _browser.new_tab(
|
|
66
|
+
tab = _browser.new_tab()
|
|
67
|
+
client_manager.create_client(tab)
|
|
68
|
+
tab.get(url)
|
|
58
69
|
_browser.activate_tab(tab)
|
|
59
70
|
tab_id = tab.tab_id
|
|
60
71
|
return dp_mcp_message_pack(f"已创建新的tab页,并打开链接:{url}", tab_id=tab_id)
|
|
61
72
|
|
|
62
|
-
|
|
73
|
+
|
|
74
|
+
def register_switch_tab(mcp: FastMCP, browser_manager, client_manager: DPProxyClientManager):
|
|
63
75
|
@mcp.tool(name="switch_tab", description="根据传入的tab_id切换到对应的tab页", )
|
|
64
76
|
async def switch_tab(browser_port: int, tab_id: str) -> dict[str, Any]:
|
|
65
77
|
_browser = browser_manager.get_browser(browser_port)
|
|
66
78
|
_browser.activate_tab(tab_id)
|
|
67
79
|
return dp_mcp_message_pack(f"已将tab页:【{tab_id}】切换至最前端")
|
|
68
80
|
|
|
69
|
-
|
|
81
|
+
|
|
82
|
+
def register_close_tab(mcp: FastMCP, browser_manager, client_manager: DPProxyClientManager):
|
|
70
83
|
@mcp.tool(name="close_tab", description="根据传入的tab_id关闭tab页", )
|
|
71
84
|
async def close_tab(browser_port, tab_id) -> dict[str, Any]:
|
|
72
85
|
_browser = browser_manager.get_browser(browser_port)
|
|
73
86
|
_browser.close_tabs(tab_id)
|
|
74
87
|
return dp_mcp_message_pack(f"已将tab页:【{tab_id}】关闭")
|
|
75
88
|
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
89
|
+
|
|
90
|
+
def register_check_selector(mcp: FastMCP, browser_manager, client_manager: DPProxyClientManager):
|
|
91
|
+
@mcp.tool(name="check_selector",
|
|
92
|
+
description="查找tab页中是否包含元素,并返回元素attr_name所对应的值。"
|
|
93
|
+
"当要选择的元素包含过多元素时,需要传入offset和page_size来分批查看元素,一般不建议调整page_size,更推荐你调整offset"
|
|
94
|
+
"同时如果单个元素属性值太长,函数会进行截断。一般的单个元素的属性值超过300个字符的就会触发截断,截断后会在最后拼接'...'")
|
|
95
|
+
async def check_selector(browser_port: int, tab_id: str, css_selector: str, attr_name: str = "text",
|
|
96
|
+
offset: int = 0, page_size: int = 10) -> dict[
|
|
79
97
|
str, Any]:
|
|
80
98
|
_browser = browser_manager.get_browser(browser_port)
|
|
81
99
|
target_tab = _browser.get_tab(tab_id)
|
|
@@ -86,20 +104,33 @@ def register_check_selector(mcp: FastMCP, browser_manager):
|
|
|
86
104
|
exist_flag = False
|
|
87
105
|
if len(target_eles) != 0:
|
|
88
106
|
exist_flag = True
|
|
107
|
+
if len(target_eles) > page_size:
|
|
108
|
+
target_eles = target_eles[offset:offset + page_size]
|
|
109
|
+
slice_seg = max(300, one_turn_max_token // (page_size + 6))
|
|
89
110
|
if attr_name == "text":
|
|
90
|
-
|
|
91
|
-
|
|
111
|
+
ele_attr_list = [i.text.replace("\n", "") for i in target_eles]
|
|
112
|
+
ele_attr_list = [attr_str[:slice_seg] for attr_str in ele_attr_list]
|
|
113
|
+
# 如果经过截断遍历后的字符串长度与截断长度相等,则默认截断了
|
|
114
|
+
ele_attr_list = [attr_str + "..." for attr_str in ele_attr_list if len(attr_str) == slice_seg]
|
|
115
|
+
attr_output = "\n".join(ele_attr_list)
|
|
92
116
|
else:
|
|
93
|
-
|
|
117
|
+
ele_attr_list = [i.attr(attr_name) for i in target_eles]
|
|
118
|
+
ele_attr_list = [attr_str[:slice_seg] for attr_str in ele_attr_list]
|
|
119
|
+
ele_attr_list = [attr_str + "..." for attr_str in ele_attr_list if len(attr_str) == slice_seg]
|
|
120
|
+
attr_output = json.dumps(ele_attr_list)
|
|
121
|
+
# 对attr_output逐个截断,截断的长度为:一轮最大token除以元素个数+3个点+两个引号和逗号
|
|
94
122
|
return dp_mcp_message_pack(
|
|
95
123
|
f"已完成tab页:【{tab_id}】对:【{css_selector}】的检查",
|
|
96
124
|
tab_id=tab_id,
|
|
97
125
|
selector=css_selector,
|
|
98
126
|
selector_ele_exist=exist_flag,
|
|
127
|
+
page_size=page_size,
|
|
128
|
+
offset=offset,
|
|
99
129
|
attr_output=attr_output
|
|
100
130
|
)
|
|
101
131
|
|
|
102
|
-
|
|
132
|
+
|
|
133
|
+
def register_quit_browser(mcp: FastMCP, browser_manager, client_manager: DPProxyClientManager):
|
|
103
134
|
@mcp.tool(name="quit_browser", description="退出浏览器会话,关闭浏览器")
|
|
104
135
|
async def quit_browser(browser_port: int) -> dict[str, Any]:
|
|
105
136
|
flag, _browser = browser_manager.remove_page(browser_port)
|
|
@@ -111,7 +142,26 @@ def register_quit_browser(mcp: FastMCP, browser_manager):
|
|
|
111
142
|
quit_flag=flag
|
|
112
143
|
)
|
|
113
144
|
|
|
114
|
-
|
|
145
|
+
|
|
146
|
+
def register_pop_first_packet(mcp: FastMCP, browser_manager, client_manager: DPProxyClientManager):
|
|
147
|
+
@mcp.tool(name="pop_first_packet",
|
|
148
|
+
description="每调用一次就会弹出传入的tab页所监听到的数据包中的第一个packet_message,当一个packet_message的response body过长时会被切分成多个包,具体一个请求是否还有下一个包,可以参考body_completed字段")
|
|
149
|
+
async def pop_first_packet(browser_port: int, tab_id: str) -> dict[str, Any]:
|
|
150
|
+
_browser = browser_manager.get_browser(browser_port)
|
|
151
|
+
client = client_manager.get_client(tab_id)
|
|
152
|
+
packet_message = client.pop_first_packet()
|
|
153
|
+
message = f"tab页:【{tab_id}】,暂时没有监听到XHR数据包"
|
|
154
|
+
if packet_message:
|
|
155
|
+
message = f"tab页:【{tab_id}】,监听到XHR数据包",
|
|
156
|
+
return dp_mcp_message_pack(
|
|
157
|
+
message,
|
|
158
|
+
browser_port=browser_port,
|
|
159
|
+
tab_id=tab_id,
|
|
160
|
+
packet_message=packet_message
|
|
161
|
+
)
|
|
162
|
+
|
|
163
|
+
|
|
164
|
+
def register_assert_waf(mcp: FastMCP, browser_manager, client_manager: DPProxyClientManager):
|
|
115
165
|
@mcp.tool(name="assert_waf",
|
|
116
166
|
description="通过对比requests、有头浏览器、无头浏览器获取到的html,判断网页是否使用了waf以及是否为动态渲染的网页")
|
|
117
167
|
async def assert_waf(browser_port: int, tab_id: str) -> dict[str, Any]:
|
|
@@ -159,18 +209,3 @@ def register_assert_waf(mcp: FastMCP, browser_manager):
|
|
|
159
209
|
raw_headless_rate_difference=h_hless_rate_diff,
|
|
160
210
|
head_headless_rate_difference=h_hless_rate_diff
|
|
161
211
|
)
|
|
162
|
-
|
|
163
|
-
def register_highlight_element_captcha(mcp: FastMCP, browser_manager):
|
|
164
|
-
@mcp.tool(name="highlight_element_captcha", description="将传入的Selector在页面上高亮,并截屏")
|
|
165
|
-
async def highlight_element_captcha(browser_port: int, tab_id: str, css_selector: str) -> dict[str, Any]:
|
|
166
|
-
_browser = browser_manager.get_browser(browser_port)
|
|
167
|
-
tab = _browser.get_tab(tab_id)
|
|
168
|
-
highlight_style = 'background-color: rgba(255, 255, 0, 0.2); outline: 2px solid yellow !important; outline-offset: 2px'
|
|
169
|
-
css_selector = css_selector
|
|
170
|
-
if "css:" not in css_selector:
|
|
171
|
-
css_selector = "css:" + css_selector
|
|
172
|
-
|
|
173
|
-
target_eles = tab.eles(css_selector)
|
|
174
|
-
exist_flag = False
|
|
175
|
-
if len(target_eles) != 0:
|
|
176
|
-
exist_flag = True
|
mcp_tools/main.py
CHANGED
|
@@ -2,6 +2,7 @@ from fastmcp import FastMCP
|
|
|
2
2
|
|
|
3
3
|
from mcp_tools.dp_tools import *
|
|
4
4
|
from tools.browser_manager import browser_manager
|
|
5
|
+
from tools.browser_proxy import client_manager
|
|
5
6
|
|
|
6
7
|
mcp = FastMCP("Jarvis Brain Mcp Tools")
|
|
7
8
|
|
|
@@ -11,16 +12,17 @@ base_cwd = os.getenv("BASE_CWD", os.path.expanduser('~'))
|
|
|
11
12
|
|
|
12
13
|
if "TeamNode-Dp" in enabled_modules:
|
|
13
14
|
# 页面管理
|
|
14
|
-
register_close_tab(mcp, browser_manager)
|
|
15
|
-
register_switch_tab(mcp, browser_manager)
|
|
16
|
-
register_get_new_tab(mcp, browser_manager)
|
|
15
|
+
register_close_tab(mcp, browser_manager, client_manager)
|
|
16
|
+
register_switch_tab(mcp, browser_manager, client_manager)
|
|
17
|
+
register_get_new_tab(mcp, browser_manager, client_manager)
|
|
17
18
|
# 功能
|
|
18
|
-
register_visit_url(mcp, browser_manager)
|
|
19
|
-
register_get_html(mcp, browser_manager)
|
|
20
|
-
register_check_selector(mcp, browser_manager)
|
|
19
|
+
register_visit_url(mcp, browser_manager, client_manager)
|
|
20
|
+
register_get_html(mcp, browser_manager, client_manager)
|
|
21
|
+
register_check_selector(mcp, browser_manager, client_manager)
|
|
22
|
+
register_pop_first_packet(mcp, browser_manager, client_manager)
|
|
21
23
|
|
|
22
24
|
if "JarvisNode" in enabled_modules:
|
|
23
|
-
register_assert_waf(mcp, browser_manager)
|
|
25
|
+
register_assert_waf(mcp, browser_manager, client_manager)
|
|
24
26
|
|
|
25
27
|
|
|
26
28
|
def main():
|
tools/browser_manager.py
CHANGED
|
@@ -16,13 +16,15 @@ class BrowserManager:
|
|
|
16
16
|
cls._instance.browser_pool = {}
|
|
17
17
|
return cls._instance
|
|
18
18
|
|
|
19
|
-
def create_browser(self) -> Tuple[int, ChromiumPage]:
|
|
19
|
+
def create_browser(self, user_agent: str = None) -> Tuple[int, ChromiumPage]:
|
|
20
20
|
"""创建新的浏览器实例"""
|
|
21
21
|
random_port = random.randint(9223, 9934)
|
|
22
22
|
while random_port in self.browser_pool:
|
|
23
23
|
random_port = random.randint(9223, 9934)
|
|
24
24
|
|
|
25
25
|
co = ChromiumOptions().set_local_port(random_port)
|
|
26
|
+
if user_agent:
|
|
27
|
+
co.set_user_agent(user_agent)
|
|
26
28
|
if platform.system() != 'Windows':
|
|
27
29
|
co.set_argument('--no-sandbox')
|
|
28
30
|
custom_data_dir = os.path.join(os.path.expanduser('~'), 'DrissionPage', "userData", f"{random_port}")
|
tools/browser_proxy.py
ADDED
|
@@ -0,0 +1,171 @@
|
|
|
1
|
+
import threading
|
|
2
|
+
from collections import deque
|
|
3
|
+
import time
|
|
4
|
+
from DrissionPage import ChromiumPage, ChromiumOptions
|
|
5
|
+
from DrissionPage._pages.chromium_tab import ChromiumTab
|
|
6
|
+
from DrissionPage._units.listener import DataPacket
|
|
7
|
+
from typing import Tuple, Optional
|
|
8
|
+
import json
|
|
9
|
+
|
|
10
|
+
one_turn_max_token = 20000
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
class DPProxyClient:
|
|
14
|
+
def __init__(self, driver: ChromiumTab, self_kill=False):
|
|
15
|
+
self.tab_id = driver.tab_id
|
|
16
|
+
self.driver = ChromePageProxy(driver, self)
|
|
17
|
+
self.thread = None
|
|
18
|
+
self.self_kill = self_kill
|
|
19
|
+
# self.packet_list = []
|
|
20
|
+
self.packet_queue = deque()
|
|
21
|
+
|
|
22
|
+
def get_driver(self, start_listen, count=None, timeout=10) -> ChromiumTab:
|
|
23
|
+
"""
|
|
24
|
+
获取代理后的driver、tab
|
|
25
|
+
:param start_listen: 若你自己写的代码里已经使用自动化框架监听发包的功能了,则该值应该置为False。若没监听,则必须将该值置为True
|
|
26
|
+
:param count: 需捕获的数据包总数,为None表示无限
|
|
27
|
+
:param timeout: 两个数据包之间等待的最大时长(秒),为None表示无限,默认为10秒
|
|
28
|
+
:return:
|
|
29
|
+
"""
|
|
30
|
+
if start_listen:
|
|
31
|
+
self.driver.listen.set_targets(res_type="XHR")
|
|
32
|
+
self.driver.listen.start()
|
|
33
|
+
self.thread = threading.Thread(target=self.start_listen, args=(count, timeout,))
|
|
34
|
+
self.thread.start()
|
|
35
|
+
return self.driver
|
|
36
|
+
|
|
37
|
+
def start_listen(self, count=None, timeout=10):
|
|
38
|
+
for _ in self.driver.listen.steps(count=count, timeout=timeout, gap=1):
|
|
39
|
+
pass
|
|
40
|
+
|
|
41
|
+
# 每次调用函数,都从队列的左端弹出一个数据包
|
|
42
|
+
def pop_first_packet(self):
|
|
43
|
+
if self.packet_queue:
|
|
44
|
+
result = self.packet_queue.popleft()
|
|
45
|
+
return json.dumps(result, ensure_ascii=False)
|
|
46
|
+
else:
|
|
47
|
+
return None
|
|
48
|
+
|
|
49
|
+
|
|
50
|
+
class DPProxyClientManager:
|
|
51
|
+
"""浏览器池管理器 - 使用单例模式"""
|
|
52
|
+
_instance = None
|
|
53
|
+
|
|
54
|
+
def __new__(cls):
|
|
55
|
+
if cls._instance is None:
|
|
56
|
+
cls._instance = super().__new__(cls)
|
|
57
|
+
cls._instance.tab_pool = {}
|
|
58
|
+
return cls._instance
|
|
59
|
+
|
|
60
|
+
def create_client(self, tab: ChromiumTab, self_kill=False) -> Tuple[str, DPProxyClient, ChromiumTab]:
|
|
61
|
+
"""创建新的tab页面代理实例"""
|
|
62
|
+
client = DPProxyClient(tab, self_kill=self_kill)
|
|
63
|
+
tab = client.get_driver(True)
|
|
64
|
+
tab_id = tab.tab_id
|
|
65
|
+
self.tab_pool[tab_id] = {"client": client, "driver": tab}
|
|
66
|
+
return tab_id, client, tab
|
|
67
|
+
|
|
68
|
+
def get_client(self, tab_id: str) -> Optional[DPProxyClient]:
|
|
69
|
+
"""根据端口获取浏览器实例"""
|
|
70
|
+
return self.tab_pool.get(tab_id).get("client", None)
|
|
71
|
+
|
|
72
|
+
def remove_client(self, tab_id: str) -> Tuple[bool, Optional[ChromiumPage]]:
|
|
73
|
+
"""根据端口移除浏览器实例"""
|
|
74
|
+
client = self.tab_pool.pop(tab_id, None)
|
|
75
|
+
return client is not None, client
|
|
76
|
+
|
|
77
|
+
def list_clients(self) -> list[int]:
|
|
78
|
+
"""列出所有活跃的浏览器端口"""
|
|
79
|
+
return list(self.tab_pool.keys())
|
|
80
|
+
|
|
81
|
+
|
|
82
|
+
class ChromePageProxy:
|
|
83
|
+
def __init__(self, page, client=None):
|
|
84
|
+
self.__dict__['page'] = page
|
|
85
|
+
self.__dict__['client'] = client
|
|
86
|
+
|
|
87
|
+
def __getattr__(self, item):
|
|
88
|
+
attr = getattr(self.page, item)
|
|
89
|
+
print(item, attr)
|
|
90
|
+
if item == 'listen':
|
|
91
|
+
listen_proxy = DrissionPageListenerProxy(attr, self.__dict__['client'])
|
|
92
|
+
return listen_proxy
|
|
93
|
+
return attr
|
|
94
|
+
|
|
95
|
+
|
|
96
|
+
class DrissionPageListenerProxy:
|
|
97
|
+
def __init__(self, listener, client=None):
|
|
98
|
+
self.listener = listener
|
|
99
|
+
self.client = client
|
|
100
|
+
|
|
101
|
+
def __getattr__(self, item):
|
|
102
|
+
attr = getattr(self.listener, item)
|
|
103
|
+
# 当监听到wait被调用的时候
|
|
104
|
+
if item == "wait":
|
|
105
|
+
def wrapper(*args, **kwargs):
|
|
106
|
+
result = attr(*args, **kwargs)
|
|
107
|
+
check_data_packet(result, self.client)
|
|
108
|
+
return result
|
|
109
|
+
|
|
110
|
+
return wrapper
|
|
111
|
+
# 当监听到steps被调用的时候
|
|
112
|
+
if item == "steps":
|
|
113
|
+
def wrapper(*args, **kwargs):
|
|
114
|
+
if kwargs.get("gap", 1) > 1:
|
|
115
|
+
raise Exception("暂不支持多包监控")
|
|
116
|
+
result = attr(*args, **kwargs)
|
|
117
|
+
if attr.__name__ == "steps":
|
|
118
|
+
for step in result:
|
|
119
|
+
check_data_packet(step, self.client)
|
|
120
|
+
yield step
|
|
121
|
+
|
|
122
|
+
return wrapper
|
|
123
|
+
return attr
|
|
124
|
+
|
|
125
|
+
|
|
126
|
+
def check_data_packet(packet: DataPacket, client: DPProxyClient):
|
|
127
|
+
"""
|
|
128
|
+
封装监听到的数据包,并将其存放在client的packet_queue中
|
|
129
|
+
:param packet:
|
|
130
|
+
:param client:
|
|
131
|
+
:return:
|
|
132
|
+
"""
|
|
133
|
+
url = packet.url
|
|
134
|
+
method = packet.request.method
|
|
135
|
+
data = None
|
|
136
|
+
if packet.request.hasPostData:
|
|
137
|
+
data = packet.request.postData
|
|
138
|
+
body = packet.response.body
|
|
139
|
+
body_str = json.dumps(body, ensure_ascii=False)
|
|
140
|
+
body_str_list = [body_str[i:i + one_turn_max_token] for i in range(0, len(body_str), one_turn_max_token)]
|
|
141
|
+
body_completed = True
|
|
142
|
+
for index, body_str in enumerate(body_str_list):
|
|
143
|
+
if (index + 1) != len(body_str_list):
|
|
144
|
+
body_completed = False
|
|
145
|
+
temp_dict = {
|
|
146
|
+
"url": url,
|
|
147
|
+
"body_completed": body_completed,
|
|
148
|
+
"method": method,
|
|
149
|
+
"request_data": data,
|
|
150
|
+
"request_headers": dict(packet.request.headers),
|
|
151
|
+
"response_headers": dict(packet.response.headers),
|
|
152
|
+
"response_body_segment": body_str,
|
|
153
|
+
}
|
|
154
|
+
client.packet_queue.append(temp_dict)
|
|
155
|
+
|
|
156
|
+
|
|
157
|
+
client_manager = DPProxyClientManager()
|
|
158
|
+
|
|
159
|
+
# if __name__ == '__main__':
|
|
160
|
+
# co = ChromiumOptions().set_user_agent(
|
|
161
|
+
# "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/143.0.0.0 Mobile Safari/537.36")
|
|
162
|
+
# tab = ChromiumPage(co).latest_tab
|
|
163
|
+
# client = DPProxyClient(tab, self_kill=False)
|
|
164
|
+
# # client = CaptchaClient(tab, self_kill=True)
|
|
165
|
+
# tab = client.get_driver(True)
|
|
166
|
+
# url = "https://api.toutiaoapi.com/feoffline/hotspot_and_local/html/hot_list/index.html?client_extra_params=%7B%22custom_log_pb%22%3A%22%7B%5C%22style_id%5C%22%3A%5C%2240030%5C%22%2C%5C%22entrance_hotspot%5C%22%3A%5C%22search%5C%22%2C%5C%22location%5C%22%3A%5C%22hot_board%5C%22%2C%5C%22category_name%5C%22%3A%5C%22hotboard_light%5C%22%7D%22%7D&count=50&log_pb=%7B%22style_id%22%3A%2240030%22%2C%22entrance_hotspot%22%3A%22search%22%2C%22location%22%3A%22hot_board%22%2C%22category_name%22%3A%22hotboard_light%22%7D&only_hot_list=1&tab_name=stream&enter_keyword=%23%E7%BE%8E%E5%9B%BD%E9%80%80%E5%87%BA66%E4%B8%AA%E5%9B%BD%E9%99%85%E7%BB%84%E7%BB%87%23"
|
|
167
|
+
# tab.get(url)
|
|
168
|
+
# for _ in range(5056):
|
|
169
|
+
# new_packet = client.pop_first_packet()
|
|
170
|
+
# print(new_packet, "23")
|
|
171
|
+
# time.sleep(1)
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
mcp_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
2
|
-
mcp_tools/dp_tools.py,sha256=TqHQRFKKIImXKnGpuCQ8TatARLpezos3iV9nCcdEzrY,9224
|
|
3
|
-
mcp_tools/main.py,sha256=SiLF-tcEdApkzMjTZJEpVYX5d-LPW7aqy6A6lCBA7YQ,829
|
|
4
|
-
tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
5
|
-
tools/browser_manager.py,sha256=J8aNQECiQvucsUjLJQ9N-3f2xoyoCIxjV-kJ7YcoHv4,1849
|
|
6
|
-
tools/tools.py,sha256=TaWs-CNXy-py9BFmCnJrQ09ke938xXpImf-N2Qo_Rvc,4708
|
|
7
|
-
jarvis_brain-0.1.5.10.dist-info/METADATA,sha256=LfotsulMPGBk8opa0nS4ZZPrQi0S8UynJ-0F-KTrWfY,242
|
|
8
|
-
jarvis_brain-0.1.5.10.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
|
|
9
|
-
jarvis_brain-0.1.5.10.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
|
|
10
|
-
jarvis_brain-0.1.5.10.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|