MaaFw 4.2.0b1__py3-none-macosx_13_0_arm64.whl → 4.2.2__py3-none-macosx_13_0_arm64.whl

maa/agent_client.py

@@ -9,10 +9,17 @@ from .buffer import StringBuffer
 class AgentClient:
     _handle: MaaAgentClientHandle
 
-    def __init__(self):
+    def __init__(self, identifier: Optional[str] = None):
         self._set_api_properties()
 
-        self._handle = Library.agent_client().MaaAgentClientCreate()
+        if identifier:
+            id_buffer = StringBuffer()
+            id_buffer.set(identifier)
+            id_buffer_handle = id_buffer._handle
+        else:
+            id_buffer_handle = None
+
+        self._handle = Library.agent_client().MaaAgentClientCreateV2(id_buffer_handle)
         if not self._handle:
             raise RuntimeError("Failed to create agent client.")
 
@@ -20,6 +27,16 @@ class AgentClient:
         if self._handle:
             Library.agent_client().MaaAgentClientDestroy(self._handle)
 
+    @property
+    def identifier(self) -> Optional[str]:
+        id_buffer = StringBuffer()
+        if not Library.agent_client().MaaAgentClientIdentifier(
+            self._handle, id_buffer._handle
+        ):
+            return None
+
+        return id_buffer.get()
+
     def bind(self, resource: Resource) -> bool:
         # avoid gc
         self._resource = resource
@@ -30,26 +47,16 @@ class AgentClient:
             )
         )
 
-    def create_socket(self, identifier: str = "") -> Optional[str]:
-        id_buffer = StringBuffer()
-        id_buffer.set(identifier)
-
-        ret = bool(
-            Library.agent_client().MaaAgentClientCreateSocket(
-                self._handle, id_buffer._handle
-            )
-        )
-        if not ret:
-            return None
-
-        return id_buffer.get()
-
     def connect(self) -> bool:
         return bool(Library.agent_client().MaaAgentClientConnect(self._handle))
 
     def disconnect(self) -> bool:
         return bool(Library.agent_client().MaaAgentClientDisconnect(self._handle))
 
+    @property
+    def connected(self) -> bool:
+        return bool(Library.agent_client().MaaAgentClientConnected(self._handle))
+
     _api_properties_initialized: bool = False
 
     @staticmethod
@@ -62,8 +69,16 @@ class AgentClient:
 
         AgentClient._api_properties_initialized = True
 
-        Library.agent_client().MaaAgentClientCreate.restype = MaaAgentClientHandle
-        Library.agent_client().MaaAgentClientCreate.argtypes = []
+        Library.agent_client().MaaAgentClientCreateV2.restype = MaaAgentClientHandle
+        Library.agent_client().MaaAgentClientCreateV2.argtypes = [
+            MaaStringBufferHandle,
+        ]
+
+        Library.agent_client().MaaAgentClientIdentifier.restype = MaaBool
+        Library.agent_client().MaaAgentClientIdentifier.argtypes = [
+            MaaAgentClientHandle,
+            MaaStringBufferHandle,
+        ]
 
         Library.agent_client().MaaAgentClientDestroy.restype = None
         Library.agent_client().MaaAgentClientDestroy.argtypes = [MaaAgentClientHandle]
@@ -74,12 +89,6 @@ class AgentClient:
             MaaResourceHandle,
         ]
 
-        Library.agent_client().MaaAgentClientCreateSocket.restype = MaaBool
-        Library.agent_client().MaaAgentClientCreateSocket.argtypes = [
-            MaaAgentClientHandle,
-            MaaStringBufferHandle,
-        ]
-
         Library.agent_client().MaaAgentClientConnect.restype = MaaBool
         Library.agent_client().MaaAgentClientConnect.argtypes = [
             MaaAgentClientHandle,
@@ -89,3 +98,8 @@ class AgentClient:
         Library.agent_client().MaaAgentClientDisconnect.argtypes = [
             MaaAgentClientHandle,
         ]
+
+        Library.agent_client().MaaAgentClientConnected.restype = MaaBool
+        Library.agent_client().MaaAgentClientConnected.argtypes = [
+            MaaAgentClientHandle,
+        ]

{maafw-4.2.0b1.dist-info → maafw-4.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MaaFw
-Version: 4.2.0b1
+Version: 4.2.2
 Summary: An automation black-box testing framework based on image recognition
 Project-URL: Homepage, https://github.com/MaaXYZ/MaaFramework
 Author: MaaXYZ
@@ -142,6 +142,9 @@ _✨ 基于图像识别的自动化黑盒测试框架 ✨_
 - [MaaTOT](https://github.com/Coxwtwo/MaaTOT) ![Pipeline](https://img.shields.io/badge/Pipeline-%23876f69?logo=paddypower&logoColor=%23FFFFFF) ![license](https://img.shields.io/github/license/Coxwtwo/MaaTOT) ![activity](https://img.shields.io/github/commit-activity/m/Coxwtwo/MaaTOT?color=%23ff69b4) ![stars](https://img.shields.io/github/stars/Coxwtwo/MaaTOT?style=social)  
   未定事件簿 小助手。图像技术 + 模拟控制，解放双手！由 MaaFramework 强力驱动！
 
+- [MaaGumballs](https://github.com/KhazixW2/MaaGumballs) ![Pipeline](https://img.shields.io/badge/Pipeline-%23876f69?logo=paddypower&logoColor=%23FFFFFF) ![Python](https://img.shields.io/badge/Python-3776AB?logo=python&logoColor=white) ![license](https://img.shields.io/github/license/KhazixW2/MaaGumballs) ![activity](https://img.shields.io/github/commit-activity/m/KhazixW2/MaaGumballs?color=%23ff69b4) ![stars](https://img.shields.io/github/stars/KhazixW2/MaaGumballs?style=social)  
+  不思议迷宫小助手是一款由图像识别与模拟控制技术驱动的辅助工具。它能够帮助大家解放双手，一键开启敲砖大冒险，由 MaaFramework 强力支持。
+
 ## 生态共建
 
 MAA 正计划建设为一类项目，而非舟的单一软件。  
@@ -150,16 +153,46 @@ MAA 正计划建设为一类项目，而非舟的单一软件。
 
 同时，我们也非常欢迎您提出 PR ，在上方的社区项目列表中添加上您的项目！
 
-## 许可证
+## 声明与许可
 
-### MaaFramework
+### 开源许可
 
 本项目采用 [`LGPL-3.0`](./LICENSE.md) 许可证进行开源。
 
-### DirectML
+### 分发说明
 
 本项目支持 GPU 加速功能，其在 Windows 平台上依赖于 Microsoft 提供的独立组件 [DirectML](https://learn.microsoft.com/en-us/windows/ai/directml/)。DirectML 并非本项目的开源部分，也不受 LGPL-3.0 的约束。为方便用户，我们随安装包附带了一个未经修改的 DirectML.dll 文件。如果您无需 GPU 加速功能，可安全删除该 DLL 文件，软件的核心功能仍可正常运行。
 
+### 免责声明
+
+#### 预期用途
+
+本项目旨在为软件开发提供**自动化黑盒测试工具**，包括图像识别、界面操作模拟等合法技术场景。开发者应确保其使用方式符合所有适用法律法规及目标软件的服务条款。
+
+#### 禁止滥用
+
+禁止将本项目用于以下用途（包括但不限于）：
+
+- 破坏、绕过或干扰任何软件、游戏、服务的正常功能（如反作弊机制、授权验证系统）。
+- 开发或分发违反第三方服务条款的工具（如游戏外挂、作弊器、自动化脚本）。
+- 任何侵犯他人合法权益或违反法律的行为（如数据窃取、网络攻击）。
+
+#### 责任豁免
+
+本项目按“原样”提供，作者**不承担**因以下行为导致的任何直接、间接或衍生责任：
+
+- 使用者违反本声明或法律法规的行为。
+- 第三方利用本项目开发的工具造成的损害（如账号封禁、法律纠纷）。
+- 因使用本项目导致的任何技术或经济损失。
+
+#### 用户义务
+
+使用本项目即表示您同意：
+
+- 自行承担所有使用风险。
+- 确保您的应用场景合法，并已获得相关授权（如目标软件厂商的许可）。
+- 若您的行为导致法律纠纷，您应独立承担责任并免除本项目作者的一切责任。
+
 ## 开发
 
 _请留意，仅当您准备开发 MaaFramework 本身时，才需要阅读本章节内容。若您仅希望基于 MaaFramework 开发自己的应用，则请参考 [即刻开始](#即刻开始)。_

maafw-4.2.2.dist-info/RECORD

@@ -0,0 +1,30 @@
+maa/__init__.py,sha256=t2Z9yJWrSZfH16xYN67bKpiPEHDf7iaiw4wi0PjmU8U,250
+maa/agent_client.py,sha256=vrL1pyqYyK2CQePbMbCQraZnzx0rPaYWK4G8D9qU__Y,3365
+maa/buffer.py,sha256=XFr1MnWt-xmZkhQ_2ZzGfiqSJJwmphY4U07EEzMNYQc,16544
+maa/context.py,sha256=hOxo7GArAmdBwMGHPqM1I2rtNE5N6WR1QwPOLxZgSvU,5754
+maa/controller.py,sha256=V9ALn24vQX-mWngZbuapBcv-_HNHCtUwHXa3Em2X13s,22517
+maa/custom_action.py,sha256=V-kJ-5ahcImnzrZBbAH_RJqoiQ7RjBT39ffdSOi9_c4,2495
+maa/custom_recognition.py,sha256=P8Kfh4PWoQXyw7loE-9zv_VCD2HUcE6qkIXCK_Ye9a4,3372
+maa/define.py,sha256=qec4GQkYi6AtorJ1ix880Fz67bpZULJOV3VpZEDd2Es,13341
+maa/job.py,sha256=MUI5T2X9ON9c7Dl6yo_0pp8Ulpn25XOD_uEdGm2k-TA,1231
+maa/library.py,sha256=9af7ncHUk33N5JcacaAk87JLKkP3atu-J8wf-CvfYhw,3891
+maa/notification_handler.py,sha256=LFJY6YqF9fJSkRsvpmj6ZL5DexMN_cEOj-HmpWpB9o0,5442
+maa/resource.py,sha256=gjcYnhaLzR11jM9nd-QfUeVEsBDgJkubOQ3YiMZN5ic,11529
+maa/tasker.py,sha256=cAkYW8Mu5rAgsPlSGacTjJ830sF2yFtvlmXRvIJt-A4,14811
+maa/toolkit.py,sha256=H7P58dPLKzEm_aZMsDJ98IaMZnTE-hcFgK8MKnN0F6g,11381
+maa/agent/__init__.py,sha256=K4vyyD6YgLR6PEQl86t4oKP4eViCdNr3Br94dNk8YjM,257
+maa/agent/agent_server.py,sha256=e0yE_ffWJlTPydJbYLK9OhCM5fVVlZQIcvEQMjB5V68,3636
+maa/bin/libMaaAdbControlUnit.dylib,sha256=LJeyyHK34iQN7AaD316iAXFgc_KDJVpsW55LD-9z3EQ,722712
+maa/bin/libMaaAgentClient.dylib,sha256=er8xoNzJ8cPBxq96aVGQpoYQTfu8lbdZaQ0eZ_1XXTw,1402792
+maa/bin/libMaaAgentServer.dylib,sha256=bK7tCBNDd9EEWiyjjvJ0_Xm05jbth_0uTmN_jHSdnAQ,1665624
+maa/bin/libMaaDbgControlUnit.dylib,sha256=ToxsoPqPTxsWqYlMzmrZzfp_jl83jViBPOF21Z2iCPM,353560
+maa/bin/libMaaFramework.dylib,sha256=HQSDuzmEmo_k2MAM-37GICuD01Ru3eqYiD5PTFwvkwI,2338344
+maa/bin/libMaaToolkit.dylib,sha256=WstpDM1CI0FfJE79MgeeboomDztCowHiy4YLYkDdAC4,918800
+maa/bin/libMaaUtils.dylib,sha256=uZaWjypiqCfi5JsZK53Kpjd3BRmrbAe2NkSyqg5DZpE,540480
+maa/bin/libfastdeploy_ppocr.dylib,sha256=HAneULevDZ_uuI-rAYJ18hiV9ERkojA05u2M1jIXt_c,4588632
+maa/bin/libonnxruntime.1.19.2.dylib,sha256=12pPNEJbyCk7FN7wR2-ijm_yH5IbD7h81z3NUiK32OU,17341832
+maa/bin/libopencv_world4.4.8.0.dylib,sha256=a258ojx3MPVIJEUopsaDnLVInfUHh12qjsIM_8j5P_s,13193344
+maafw-4.2.2.dist-info/licenses/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
+maafw-4.2.2.dist-info/METADATA,sha256=6wGUMSp-7G3Ag4AOtjcsm-T1Dc5Xm5sWqUsS6TTXPVk,23245
+maafw-4.2.2.dist-info/WHEEL,sha256=SqRtGdpuogbgKRVwFY1Ga4NP7T5_9qclWQUlsSHr8Hw,101
+maafw-4.2.2.dist-info/RECORD,,

maafw-4.2.0b1.dist-info/RECORD

@@ -1,33 +0,0 @@
-maa/__init__.py,sha256=t2Z9yJWrSZfH16xYN67bKpiPEHDf7iaiw4wi0PjmU8U,250
-maa/agent_client.py,sha256=MGjwVCM_Y60O2pJJn5iCxh0ymg-ebOWlDw2euSaZSu0,2855
-maa/buffer.py,sha256=XFr1MnWt-xmZkhQ_2ZzGfiqSJJwmphY4U07EEzMNYQc,16544
-maa/context.py,sha256=hOxo7GArAmdBwMGHPqM1I2rtNE5N6WR1QwPOLxZgSvU,5754
-maa/controller.py,sha256=V9ALn24vQX-mWngZbuapBcv-_HNHCtUwHXa3Em2X13s,22517
-maa/custom_action.py,sha256=V-kJ-5ahcImnzrZBbAH_RJqoiQ7RjBT39ffdSOi9_c4,2495
-maa/custom_recognition.py,sha256=P8Kfh4PWoQXyw7loE-9zv_VCD2HUcE6qkIXCK_Ye9a4,3372
-maa/define.py,sha256=qec4GQkYi6AtorJ1ix880Fz67bpZULJOV3VpZEDd2Es,13341
-maa/job.py,sha256=MUI5T2X9ON9c7Dl6yo_0pp8Ulpn25XOD_uEdGm2k-TA,1231
-maa/library.py,sha256=9af7ncHUk33N5JcacaAk87JLKkP3atu-J8wf-CvfYhw,3891
-maa/notification_handler.py,sha256=LFJY6YqF9fJSkRsvpmj6ZL5DexMN_cEOj-HmpWpB9o0,5442
-maa/resource.py,sha256=gjcYnhaLzR11jM9nd-QfUeVEsBDgJkubOQ3YiMZN5ic,11529
-maa/tasker.py,sha256=cAkYW8Mu5rAgsPlSGacTjJ830sF2yFtvlmXRvIJt-A4,14811
-maa/toolkit.py,sha256=H7P58dPLKzEm_aZMsDJ98IaMZnTE-hcFgK8MKnN0F6g,11381
-maa/agent/__init__.py,sha256=K4vyyD6YgLR6PEQl86t4oKP4eViCdNr3Br94dNk8YjM,257
-maa/agent/agent_server.py,sha256=e0yE_ffWJlTPydJbYLK9OhCM5fVVlZQIcvEQMjB5V68,3636
-maa/bin/libMaaAdbControlUnit.dylib,sha256=a5smUxlPgQ0sthYHnzGHL4Lw1aDMEFgvxIlExZlrLbc,807856
-maa/bin/libMaaAgentClient.dylib,sha256=EyOYY1Uu5Cq1-3sxxhiEJSmPlxqx-lVNhw8nrcSTDRY,1586736
-maa/bin/libMaaAgentServer.dylib,sha256=_Qe-niiTJXg8PO8KlnicUYOT5MpH2l1a2mzJvyfznSg,1789936
-maa/bin/libMaaDbgControlUnit.dylib,sha256=Y3Dr7rmhbVXWXguTWndOKb6L86j5bTIKWjHai1gsSik,405664
-maa/bin/libMaaFramework.dylib,sha256=ULPmKiS93ZoCaykAnuq9Uz6zSJ_mXo2lNlj5TCyVaG0,2506160
-maa/bin/libMaaToolkit.dylib,sha256=GUszlAepBuvVsDF-QdZWALEjU2rC3O25_XWc7EMc3Yg,1037696
-maa/bin/libMaaUtils.dylib,sha256=x88qqSm35PuVtsXdnmIWhfiH-9cpGGw0yKuQDrVJnZs,628384
-maa/bin/libc++.1.dylib,sha256=RHah_LF7leyR2CC9zUa0XLqdgXtH2u3SG3mUSg3n9Vw,1152800
-maa/bin/libc++abi.1.dylib,sha256=x6n9EFpcG0q_hNuexvhnwETG2jk7Jpils-k_bvxr0RE,368288
-maa/bin/libfastdeploy_ppocr.dylib,sha256=Y7j-9roLd1CrfESEYbsO48MLRVOHiQZ0RHtkmwuTWeQ,4606768
-maa/bin/libonnxruntime.1.19.2.dylib,sha256=BGXAmUNxe9WOxZNUl-GHge3begS9EVYS3L5wnOyUMkc,17359936
-maa/bin/libopencv_world4.4.8.0.dylib,sha256=SxL2FZyQCyFqwE3cubrGcdBN9M3uZQFD9DQ4x0Tr5HU,13211472
-maa/bin/libunwind.1.dylib,sha256=h7_pW5cVGaH0tIk3o69oCc7MffvySuya21iqeovqXwk,110528
-maafw-4.2.0b1.dist-info/licenses/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
-maafw-4.2.0b1.dist-info/METADATA,sha256=xjFgpCZkKoSimBS3OZL9XWm53uI6Q0Zh9rMUTfEr4ag,21233
-maafw-4.2.0b1.dist-info/WHEEL,sha256=SqRtGdpuogbgKRVwFY1Ga4NP7T5_9qclWQUlsSHr8Hw,101
-maafw-4.2.0b1.dist-info/RECORD,,