Jarvis-Brain 0.1.8.3__tar.gz → 0.1.8.5__tar.gz

{jarvis_brain-0.1.8.3 → jarvis_brain-0.1.8.5}/PKG-INFO

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

{jarvis_brain-0.1.8.3 → jarvis_brain-0.1.8.5}/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数据包",

{jarvis_brain-0.1.8.3 → jarvis_brain-0.1.8.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "Jarvis_Brain"  # 别人下载时用的名字，必须在 PyPI 上唯一
-version = "0.1.8.3"
+version = "0.1.8.5"
 description = "Jarvis brain mcp"
 dependencies = [
     "fastmcp",

{jarvis_brain-0.1.8.3 → jarvis_brain-0.1.8.5}/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
 
@@ -28,7 +29,7 @@ class DPProxyClient:
         :return:
         """
         if start_listen:
-            self.driver.listen.set_targets(res_type="XHR")
+            self.driver.listen.set_targets(targets="api|jsonp|callback", is_regex=True, res_type=('xhr', 'fetch'))
             self.driver.listen.start()
             self.thread = threading.Thread(target=self.start_listen, args=(count, timeout,))
             self.thread.start()
@@ -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