MaaFw 4.2.0b1__py3-none-win_amd64.whl → 4.2.1__py3-none-win_amd64.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.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MaaFw
-Version: 4.2.0b1
+Version: 4.2.1
 Summary: An automation black-box testing framework based on image recognition
 Project-URL: Homepage, https://github.com/MaaXYZ/MaaFramework
 Author: MaaXYZ

{maafw-4.2.0b1.dist-info → maafw-4.2.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 maa/__init__.py,sha256=t2Z9yJWrSZfH16xYN67bKpiPEHDf7iaiw4wi0PjmU8U,250
-maa/agent_client.py,sha256=MGjwVCM_Y60O2pJJn5iCxh0ymg-ebOWlDw2euSaZSu0,2855
+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
@@ -15,18 +15,18 @@ 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/DirectML.dll,sha256=nJ5tgiVhxsQbkOaZSz6IV88dZtv7HgxMeZx8ibTpLaE,18527776
-maa/bin/MaaAdbControlUnit.dll,sha256=Dd9KZZFlhiVW5ngiEtU7ppKZdxPGl0SMjQ6ioEysWpo,1319936
-maa/bin/MaaAgentClient.dll,sha256=fKv3RO906UbtQIHHm7KqJdehEOB1XNEzEJxtz4UVzGg,1937920
-maa/bin/MaaAgentServer.dll,sha256=ehThFWVyU-5YUgmFryw_VmmAKALSk_fVYlsyL28itHg,2192384
-maa/bin/MaaDbgControlUnit.dll,sha256=AZxS5sl6bxDbZVbjsBotz4fnqAAtm96TGLsa93lBrMo,775168
-maa/bin/MaaFramework.dll,sha256=hRPkhk1PBSKSgTIBCL0GcF0JXk_pNd1BY_02tDpQTQw,2519552
-maa/bin/MaaToolkit.dll,sha256=QX_fZJuJW7fsH-foddj_PLaGe_VUSSFOWuWlQURV82k,1280512
-maa/bin/MaaUtils.dll,sha256=m9cwOrwS2oA0TvFhALNK4rIF9BEh5kD2BFZzk_MwyAs,1009664
-maa/bin/MaaWin32ControlUnit.dll,sha256=gqKnI_tAn7IYBG8dre9NoW1vDUNaIn_Uuao945b-hWA,1557504
+maa/bin/MaaAdbControlUnit.dll,sha256=fOHPjhsbCDr_Wqu0jvHu5l_dW1W_Jfu8OUifHllksNw,742400
+maa/bin/MaaAgentClient.dll,sha256=3-hNDtkr0FZk4VV6tmIQbaSGm9_Psop30XcCO9lwKhg,963072
+maa/bin/MaaAgentServer.dll,sha256=JzN_X25ql0tq1jOnl92jafrVl70c4xPyO54qELsgcxc,1138176
+maa/bin/MaaDbgControlUnit.dll,sha256=KesWEWIxhmC0SbzUrn30kCyd7jRa_67ERcYRIeprLL0,399872
+maa/bin/MaaFramework.dll,sha256=EgF5oLYhDD8Np_InVRtnFix9cNXc6fEU5Yb9s0P6RuA,1535488
+maa/bin/MaaToolkit.dll,sha256=gOQIdlbHI4T2hMCAzTBIerr0qaO3Fyq866XzoApEl2U,720384
+maa/bin/MaaUtils.dll,sha256=NVWT7B9M50NLOoYLVbRO79rOWZqwS5j8YTnhe-ThpuM,547840
+maa/bin/MaaWin32ControlUnit.dll,sha256=4z8bAKdLiu8rDjcyQnzwcrvbvFjHCmkM2zUwXbumQUU,335360
 maa/bin/fastdeploy_ppocr_maa.dll,sha256=HowKaHyB31cTK8ZoPAgxlPQOEKUM_jEJoCvyku5hj6k,1168384
 maa/bin/onnxruntime_maa.dll,sha256=rlFVEdC1cB6Yc4EbYuvoyGOr9o941NbLaOzwkaghAVo,19161600
 maa/bin/opencv_world4_maa.dll,sha256=-RoYA6M1PHqnM0Yc-SpKY07rk1mx7PNH6CuxkutS9yw,18250752
-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=k6hccRrl6UmjGsv-l-15TwZnTH21KqjgBTXuBtbSCtM,93
-maafw-4.2.0b1.dist-info/RECORD,,
+maafw-4.2.1.dist-info/licenses/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
+maafw-4.2.1.dist-info/METADATA,sha256=wXL5_ve6TIvhZC7Cik5f-Jb8PF8UxJoEfYYirv5Le80,21231
+maafw-4.2.1.dist-info/WHEEL,sha256=k6hccRrl6UmjGsv-l-15TwZnTH21KqjgBTXuBtbSCtM,93
+maafw-4.2.1.dist-info/RECORD,,