MaaFw 4.2.0a1__py3-none-macosx_13_0_x86_64.whl → 4.2.1__py3-none-macosx_13_0_x86_64.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.0a1.dist-info → maafw-4.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MaaFw
-Version: 4.2.0a1
+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.1.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=CQpj-q7fj_KT2gDN9czpOwls99B5_2vDkAGtFojEmMM,748216
+maa/bin/libMaaAgentClient.dylib,sha256=nmoBHM5AtPk_W4mcQkzrTLEeNm20NXdmlnE0aNp2Ttw,1412808
+maa/bin/libMaaAgentServer.dylib,sha256=gp0vmCpJXwkeUiy8YccFsfDlW90Ic7TpVQxG9St0MtY,1683232
+maa/bin/libMaaDbgControlUnit.dylib,sha256=eeHlc8ehrvINilXG5vJOenKB45G3nWtSCdXJckhMP1w,347936
+maa/bin/libMaaFramework.dylib,sha256=D5GQ5Zy9v0ym9Nsmwbbxy6y2W4ZVjQDm2nmEymeeZ44,2442328
+maa/bin/libMaaToolkit.dylib,sha256=1hb2OA2WoXkaaXXPiJr5f_hSh7mZ8CLMbU_QCegyCE0,929264
+maa/bin/libMaaUtils.dylib,sha256=IQM-hY1BbskOePlKLQ4s1Kk-5mwLDrpURo3ccW7A3Ec,541208
+maa/bin/libfastdeploy_ppocr.dylib,sha256=kFxpYAawihiGofHIiOe8Q1p-PCdRG7q4PsaCnhohIwg,5828240
+maa/bin/libonnxruntime.1.19.2.dylib,sha256=6FX7LDczOFARpdTe8r2otMXgvlMtkaHcfQSzXMgxT4A,19921160
+maa/bin/libopencv_world4.4.8.0.dylib,sha256=OYyb77pNXcqdUQEVTXE6Nz_iWS7jp9Zr3rZOw2DNpy0,16908328
+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=uH4n7Su0XdKLw9IB_vCifAJxZvl_ChRwTrm1-ddvWvA,102
+maafw-4.2.1.dist-info/RECORD,,

maafw-4.2.0a1.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=ngHw0o-GgP977O58GJnt-Pu23ASazxVmW0n7M4L9Ffg,851200
-maa/bin/libMaaAgentClient.dylib,sha256=IMFyQSct8S1KXprLoSttlZGF1g-QjoBb5AhhovOxpT4,1634720
-maa/bin/libMaaAgentServer.dylib,sha256=QbH_uEcNRxF2_iwK6G5hdUPjREl-nfHFk9NOiSIbDUo,1849168
-maa/bin/libMaaDbgControlUnit.dylib,sha256=TvJIFp4mul1Q-zX0r3Kt4fT0j-_ekCBTgckvEyazv9U,423456
-maa/bin/libMaaFramework.dylib,sha256=IuZFFYhWwMFGMEeksgrZtJwLIbwDdlElkhB5CB1ahrQ,2664240
-maa/bin/libMaaToolkit.dylib,sha256=mCfImslKyPspc8yMh_2bDZY7SmKejZkf9aLv8863uns,1087616
-maa/bin/libMaaUtils.dylib,sha256=RzKZjLXtbw8ORpnqblZnYrFyzP96PbRI3l4axHbPmdY,662720
-maa/bin/libc++.1.dylib,sha256=HegYEmz0WOeWHS8piB7W-Q91tGB9ATlIHn5MuIJfItQ,1176336
-maa/bin/libc++abi.1.dylib,sha256=cxSIuak6msWKozxjmWY64TW8C4kk_55YWx9eYX229R0,368224
-maa/bin/libfastdeploy_ppocr.dylib,sha256=tSvJPzuSveJXfcZKouwhQvU99Mp1WNFJKVvG1Llobqs,5892048
-maa/bin/libonnxruntime.1.19.2.dylib,sha256=f8EBJ8zYzL1YyofthTy0ochZgofp3yrSZxAbFWZXoXk,20095056
-maa/bin/libopencv_world4.4.8.0.dylib,sha256=4p4JxFEzDj3aIjEmwJ5xU6swYWwC-T2hMpwCIosxV7M,17058736
-maa/bin/libunwind.1.dylib,sha256=6v5pc5uXnKT-2LCbojC_r_qy1KLdhm2bYt52IrOv7rw,110656
-maafw-4.2.0a1.dist-info/licenses/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
-maafw-4.2.0a1.dist-info/METADATA,sha256=CDWGIyeyv2-AQ3W8dWT4c6OD-Qk-9dAr3XTO7thDa4o,21233
-maafw-4.2.0a1.dist-info/WHEEL,sha256=uH4n7Su0XdKLw9IB_vCifAJxZvl_ChRwTrm1-ddvWvA,102
-maafw-4.2.0a1.dist-info/RECORD,,