Jarvis-Brain 0.1.8.2__py3-none-any.whl → 0.1.8.4__py3-none-any.whl

{jarvis_brain-0.1.8.2.dist-info → jarvis_brain-0.1.8.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Jarvis_Brain
-Version: 0.1.8.2
+Version: 0.1.8.4
 Summary: Jarvis brain mcp
 Requires-Python: >=3.10
 Requires-Dist: beautifulsoup4

{jarvis_brain-0.1.8.2.dist-info → jarvis_brain-0.1.8.4.dist-info}/RECORD

@@ -1,11 +1,11 @@
 mcp_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_tools/dp_tools.py,sha256=B39pf4GedGnO-7eh1b9hc-qoXrIZEQ7AFsiCLuvVheM,13366
+mcp_tools/dp_tools.py,sha256=t6bIFL2aQffEi0-_LxQyQ85mmqjlL9dKQOkAsXrc8nk,13529
 mcp_tools/main.py,sha256=1oM11IvEfwBvJ4bigIQzr2AigTISX-LIJ63oFtYnwFY,1049
 tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/browser_manager.py,sha256=zeYcWuzxoohMdnYUoZbRH7axFC_VtV8MsncfN8y0yw0,2023
-tools/browser_proxy.py,sha256=cdMRxcUYyaOqGU17lldltHOvt9rxXD5Dwh7hBXEBby4,6780
+tools/browser_proxy.py,sha256=IParxZihWU7IJP9AGJN8tFX_Iy9yI3aEAd0Blfq_oRM,7438
 tools/tools.py,sha256=TaWs-CNXy-py9BFmCnJrQ09ke938xXpImf-N2Qo_Rvc,4708
-jarvis_brain-0.1.8.2.dist-info/METADATA,sha256=aXB8st8XsIwh73JibM2kcgIk5ec6MlPzNQkW3Lt1k4E,241
-jarvis_brain-0.1.8.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-jarvis_brain-0.1.8.2.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
-jarvis_brain-0.1.8.2.dist-info/RECORD,,
+jarvis_brain-0.1.8.4.dist-info/METADATA,sha256=xkJzI314AzlUuappXsbRgBzGj8zythhwKi4cEEVid6Y,241
+jarvis_brain-0.1.8.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+jarvis_brain-0.1.8.4.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
+jarvis_brain-0.1.8.4.dist-info/RECORD,,

mcp_tools/dp_tools.py

@@ -52,11 +52,12 @@ def register_get_new_tab(mcp: FastMCP, browser_manager, client_manager: DPProxyC
 
 def register_pop_first_packet(mcp: FastMCP, browser_manager, client_manager: DPProxyClientManager):
     @mcp.tool(name="pop_first_packet",
-              description="每调用一次就会弹出传入的tab页所监听到的数据包中的第一个packet_message，当一个packet_message的response body过长时会被切分成多个包，具体一个请求是否还有下一个包，可以参考body_completed字段")
-    async def pop_first_packet(browser_port: int, tab_id: str) -> dict[str, Any]:
+              description="每调用一次就会弹出传入的tab页所监听到的数据包中的第一个packet_message，当一个packet_message的response body过长时会被切分成多个包，具体一个请求是否还有下一个包，可以参考body_completed字段"
+                          "同时如果想要以域名对packet进行过滤，可以传入想要过滤的域名列表。")
+    async def pop_first_packet(browser_port: int, tab_id: str, domain_filter: list = None) -> dict[str, Any]:
         _browser = browser_manager.get_browser(browser_port)
         client = client_manager.get_client(tab_id)
-        packet_message = client.pop_first_packet()
+        packet_message = client.pop_first_packet(domain_filter)
         message = f"tab页:【{tab_id}】，暂时没有监听到XHR数据包"
         if packet_message:
             message = f"tab页:【{tab_id}】，监听到XHR数据包",

tools/browser_proxy.py

@@ -6,6 +6,7 @@ from DrissionPage._pages.chromium_tab import ChromiumTab
 from DrissionPage._units.listener import DataPacket
 from typing import Tuple, Optional
 import json
+from urllib.parse import urlparse, urlunparse
 
 one_turn_max_token = 20000
 
@@ -39,10 +40,18 @@ class DPProxyClient:
             pass
 
     # 每次调用函数，都从队列的左端弹出一个数据包
-    def pop_first_packet(self):
+    def pop_first_packet(self, domain_filter: list):
         if self.packet_queue:
             result = self.packet_queue.popleft()
-            return json.dumps(result, ensure_ascii=False)
+            packet_url = result["url"]
+            packet_domain = urlparse(packet_url).netloc
+            # 留两个路径和params的口子，万一后续需要加入这两个的过滤器可以参考domain过滤器的方式
+            packet_path = urlparse(packet_url).path
+            packet_param = urlparse(packet_url).params
+            # 如果没有给domain_filter或者给了domain_filter且包的domain在domain_filter中，都正常返回
+            if domain_filter is None or (domain_filter and packet_domain in domain_filter):
+                return json.dumps(result, ensure_ascii=False)
+            return None
         else:
             return None
 
@@ -60,7 +69,7 @@ class DPProxyClientManager:
     def create_client(self, tab: ChromiumTab, self_kill=False) -> Tuple[str, DPProxyClient, ChromiumTab]:
         """创建新的tab页面代理实例"""
         client = DPProxyClient(tab, self_kill=self_kill)
-        tab = client.get_driver(True)
+        tab = client.get_driver(True, timeout=60 * 10)
         tab_id = tab.tab_id
         self.tab_pool[tab_id] = {"client": client, "driver": tab}
         return tab_id, client, tab