MaaFw 4.2.0b1__py3-none-manylinux2014_aarch64.whl → 4.2.1__py3-none-manylinux2014_aarch64.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
@@ -14,17 +14,17 @@ 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.so,sha256=i-lyBCqeK5TWk4b7FDCGTmeXqG5HYByyvP4aT9P9clQ,15557984
-maa/bin/libMaaAgentClient.so,sha256=4pjg12-EoARrqWskl21SH-udbgfChqfI6ZhhqWMIfRc,7992208
-maa/bin/libMaaAgentServer.so,sha256=ua-TgZrzudvjaW9lorSnGOKXtnR4N1X3Xx602XYmeBs,14496320
-maa/bin/libMaaDbgControlUnit.so,sha256=OI4QqP8ckJwMcLa3BBhSNjOjWbAbZFOU9I2zAP7NBX0,4400712
-maa/bin/libMaaFramework.so,sha256=iLcMGWrMgmw6mfIDG5g_4UlkR1ME2T8WNONkUL30djM,41524808
-maa/bin/libMaaToolkit.so,sha256=zhDVR7IOEgbwgh4gI3jLt5KtML6CZekoGSg1PFhHbts,14209568
-maa/bin/libMaaUtils.so,sha256=hUuGi974znGN-zFXMs-UXzm2RMrzZrQRvKAlvSWEjao,6199904
+maa/bin/libMaaAdbControlUnit.so,sha256=1XQY92x0unAwh4_1BzQlojjEuFQuuHe-XPi4Qx6SPnw,925392
+maa/bin/libMaaAgentClient.so,sha256=vXS2896swsV4FrcZquITA82TkBs_baRrb49mYZbSua8,2063184
+maa/bin/libMaaAgentServer.so,sha256=PLBl2_qLilTJBS5PEA0ZmYN3-aAb4sHcQ5fUkx-rcSQ,2239776
+maa/bin/libMaaDbgControlUnit.so,sha256=PV5QwoPtQhEb-tOJ1Sq0kf_zAy_zOcOqPXEXncRrfjQ,415056
+maa/bin/libMaaFramework.so,sha256=QOCJ_uyreymY2beeSa5NyUKmp2oeLib8_aaJOGosL2c,2723072
+maa/bin/libMaaToolkit.so,sha256=CFPW-Are8f9QZhQOR4U7yTTbpFxRckmnukOV19oIGXY,1363120
+maa/bin/libMaaUtils.so,sha256=2tuxLpaJz_Pczz9iRd_ShKP6kZHPh_byGdkwHPggJHw,888272
 maa/bin/libfastdeploy_ppocr.so,sha256=OPB9oG0O7ZGNZUuY9U0nPsWcWnIN9xu1s0PRvXkmUEY,5815536
 maa/bin/libonnxruntime.so.1,sha256=LiAUFtvZ6eh6yGCoDoqSdN1fWR6LCyscxjQbOpdo14w,19769616
 maa/bin/libopencv_world4.so.408,sha256=fb-nh6oI32qImBiK1hRu7gSoe1u7r2aRbXxyCIgxPaA,16272176
-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=8rPUfYBEmDdlgJUoJH6dpknsfcdCdyH-ZatJmZBsaqM,105
-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=8rPUfYBEmDdlgJUoJH6dpknsfcdCdyH-ZatJmZBsaqM,105
+maafw-4.2.1.dist-info/RECORD,,