Jarvis-Brain 0.1.8.5__py3-none-any.whl → 0.1.9.2__py3-none-any.whl

{jarvis_brain-0.1.8.5.dist-info → jarvis_brain-0.1.9.2.dist-info}/METADATA

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

jarvis_brain-0.1.9.2.dist-info/RECORD

@@ -0,0 +1,11 @@
+mcp_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mcp_tools/dp_tools.py,sha256=BNpFOhHNhJ-CePzMf_RaUzbRVmZg21ihrUi4nwaAU1M,16241
+mcp_tools/main.py,sha256=84sv39oOw9vqr2MPxKy9pFVrevJ9nQJWFffpfg0s6iA,1098
+tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tools/browser_manager.py,sha256=zeYcWuzxoohMdnYUoZbRH7axFC_VtV8MsncfN8y0yw0,2023
+tools/browser_proxy.py,sha256=dXNG9g0wqyiLE-t8mSe_uLxZDxIl_HY8tY9znSj_k64,7718
+tools/tools.py,sha256=TaWs-CNXy-py9BFmCnJrQ09ke938xXpImf-N2Qo_Rvc,4708
+jarvis_brain-0.1.9.2.dist-info/METADATA,sha256=LSndFyZUD61amGNhFh381NRM6HNpFdlRFY45nYPqmso,241
+jarvis_brain-0.1.9.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+jarvis_brain-0.1.9.2.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
+jarvis_brain-0.1.9.2.dist-info/RECORD,,

mcp_tools/dp_tools.py

@@ -53,19 +53,24 @@ 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字段"
-                          "同时如果想要以域名对packet进行过滤，可以传入想要过滤的域名列表。")
-    async def pop_first_packet(browser_port: int, tab_id: str, domain_filter: list = None) -> dict[str, Any]:
+                          "如果想要以域名对packet进行过滤，可以传入想要过滤的域名列表。"
+                          "如果想要以method对packet进行过滤，可以传入想要过滤的method列表，默认是：['GET', 'POST']")
+    async def pop_first_packet(browser_port: int, tab_id: str, domain_filter: list = None,
+                               method: list = ["GET", "POST"]) -> dict[str, Any]:
         _browser = browser_manager.get_browser(browser_port)
         client = client_manager.get_client(tab_id)
-        packet_message = client.pop_first_packet(domain_filter)
+        current_queue_size, packet_message = client.pop_first_packet(domain_filter, method)
         message = f"tab页:【{tab_id}】，暂时没有监听到XHR数据包"
         if packet_message:
-            message = f"tab页:【{tab_id}】，监听到XHR数据包",
+            message = f"tab页:【{tab_id}】，监听到XHR数据包，当前数据包队列中还剩 {current_queue_size} 条数据"
+        if current_queue_size:
+            message = f"tab页:【{tab_id}】，当前弹出的第一个数据包不符合过滤条件，当前数据包队列中还剩 {current_queue_size} 条数据，请不要改变条件，继续弹出下一个数据包"
         return dp_mcp_message_pack(
             message,
             browser_port=browser_port,
             tab_id=tab_id,
-            packet_message=packet_message
+            packet_message=packet_message,
+            current_queue_size=current_queue_size,
         )
 
 
@@ -231,9 +236,9 @@ def register_click_action(mcp: FastMCP, browser_manager):
                 click_success = True
             except Exception as e:
                 click_success = False
-            message = f"点击【{css_selector}】 {'成功' if click_success else '失败'}"
+            message = f"tab页:【{tab_id}】点击【{css_selector}】 {'成功' if click_success else '失败'} 了"
         else:
-            message = f"传入的css_selector找到了{len(target_eles)}个元素，请确保传入的css_selector可以找到唯一的一个元素"
+            message = f"tab页:【{tab_id}】传入的css_selector找到了{len(target_eles)}个元素，请确保传入的css_selector可以找到唯一的一个元素"
         return dp_mcp_message_pack(
             message=message,
             browser_port=browser_port,
@@ -243,3 +248,42 @@ def register_click_action(mcp: FastMCP, browser_manager):
             click_success=click_success,
             extra_message="点击成功，页面可能有更新，请重新获取页面html，并重新分析页面Selector" if click_success else ""
         )
+
+
+def register_scroll_action(mcp: FastMCP, browser_manager):
+    @mcp.tool(name="scroll_action", description="尝试滚动tab页"
+                                                "forward参数是滚动的方向：down、up、left、right"
+                                                "pixel参数是滚动的像素值，默认为None。"
+                                                "当forward为down且pixel为None，则将页面滚动到垂直中间位置，水平位置不变"
+                                                "当forward为up且pixel为None，则将页面滚动到顶部，水平位置不变"
+                                                "当forward为left且pixel为None，则将页面滚动到最左边，垂直位置不变"
+                                                "当forward为right且pixel为None，则将页面滚动到最右边，垂直位置不变")
+    async def scroll_action(browser_port: int, tab_id: str, forward: str = "down", pixel: int = None) -> dict[str, Any]:
+        _browser = browser_manager.get_browser(browser_port)
+        target_tab = _browser.get_tab(tab_id)
+        if forward == "down":
+            if pixel is None:
+                target_tab.scroll.to_half()
+            target_tab.scroll.down(pixel)
+        elif forward == "up":
+            if pixel is None:
+                target_tab.scroll.to_top()
+            target_tab.scroll.up(pixel)
+        elif forward == "left":
+            if pixel is None:
+                target_tab.scroll.to_leftmost()
+            target_tab.scroll.left(pixel)
+        elif forward == "right":
+            if pixel is None:
+                target_tab.scroll.to_rightmost()
+            target_tab.scroll.right(pixel)
+        else:
+            if pixel is None:
+                target_tab.scroll.to_half()
+            target_tab.scroll.down()
+        message = f"已完成对tab页:【{tab_id}】forward={forward} 的滑动"
+        return dp_mcp_message_pack(
+            message=message,
+            browser_port=browser_port,
+            tab_id=tab_id,
+        )

mcp_tools/main.py

@@ -22,6 +22,7 @@ if "TeamNode-Dp" in enabled_modules:
     register_pop_first_packet(mcp, browser_manager, client_manager)
     # 页面交互
     register_click_action(mcp, browser_manager)
+    register_scroll_action(mcp, browser_manager)
 
 if "JarvisNode" in enabled_modules:
     register_assert_waf(mcp, browser_manager)

tools/browser_proxy.py

@@ -40,20 +40,23 @@ class DPProxyClient:
             pass
 
     # 每次调用函数，都从队列的左端弹出一个数据包
-    def pop_first_packet(self, domain_filter: list):
+    def pop_first_packet(self, domain_filter: list, method: list = ["GET", "POST"]):
         if self.packet_queue:
             result = self.packet_queue.popleft()
+            current_queue_size = len(self.packet_queue)
             packet_url = result["url"]
+            packet_method = result["method"]
             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
+                if packet_method in method:
+                    return current_queue_size, json.dumps(result, ensure_ascii=False)
+            return current_queue_size, None
         else:
-            return None
+            return 0, None
 
 
 class DPProxyClientManager:

jarvis_brain-0.1.8.5.dist-info/RECORD

@@ -1,11 +0,0 @@
-mcp_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-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=FIAEK6SMYK6uv5rg7x9Mm4NhnIfh11IHQcrzL1YkuNQ,7494
-tools/tools.py,sha256=TaWs-CNXy-py9BFmCnJrQ09ke938xXpImf-N2Qo_Rvc,4708
-jarvis_brain-0.1.8.5.dist-info/METADATA,sha256=RSehOA3vVRnHO1fhZzPwn_o6OycSkT4l_FQCsRGrQ_4,241
-jarvis_brain-0.1.8.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-jarvis_brain-0.1.8.5.dist-info/entry_points.txt,sha256=YFQT4xpkUqt5dM5wlKPQQOqcjMuFrT9iuRAzIpAyH7U,51
-jarvis_brain-0.1.8.5.dist-info/RECORD,,