MaaFw 4.1.1__py3-none-win_amd64.whl → 4.2.0__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,15 @@ class AgentClient:
         if self._handle:
             Library.agent_client().MaaAgentClientDestroy(self._handle)
 
+    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 +46,15 @@ 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))
 
+    def connected(self) -> bool:
+        return bool(Library.agent_client().MaaAgentClientConnected(self._handle))
+
     _api_properties_initialized: bool = False
 
     @staticmethod
@@ -62,8 +67,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 +87,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 +96,8 @@ class AgentClient:
         Library.agent_client().MaaAgentClientDisconnect.argtypes = [
             MaaAgentClientHandle,
         ]
+
+        Library.agent_client().MaaAgentClientConnected.restype = MaaBool
+        Library.agent_client().MaaAgentClientConnected.argtypes = [
+            MaaAgentClientHandle,
+        ]

maa/resource.py

@@ -1,5 +1,6 @@
 import ctypes
 import pathlib
+import json
 from typing import Any, Optional, Union
 
 from .notification_handler import NotificationHandler
@@ -49,6 +50,24 @@ class Resource:
         )
         return Job(resid, self._status, self._wait)
 
+    def override_pipeline(self, pipeline_override: Dict) -> bool:
+        return bool(
+            Library.framework().MaaResourceOverridePipeline(
+                self._handle,
+                json.dumps(pipeline_override, ensure_ascii=False).encode(),
+            )
+        )
+
+    def override_next(self, name: str, next_list: List[str]) -> bool:
+        list_buffer = StringListBuffer()
+        list_buffer.set(next_list)
+
+        return bool(
+            Library.framework().MaaResourceOverrideNext(
+                self._handle, name.encode(), list_buffer._handle
+            )
+        )
+
     @property
     def loaded(self) -> bool:
         return bool(Library.framework().MaaResourceLoaded(self._handle))
@@ -264,6 +283,19 @@ class Resource:
         Library.framework().MaaResourceClear.restype = MaaBool
         Library.framework().MaaResourceClear.argtypes = [MaaResourceHandle]
 
+        Library.framework().MaaResourceOverridePipeline.restype = MaaBool
+        Library.framework().MaaResourceOverridePipeline.argtypes = [
+            MaaResourceHandle,
+            ctypes.c_char_p,
+        ]
+
+        Library.framework().MaaResourceOverrideNext.restype = MaaBool
+        Library.framework().MaaResourceOverrideNext.argtypes = [
+            MaaResourceHandle,
+            ctypes.c_char_p,
+            MaaStringBufferHandle,
+        ]
+
         Library.framework().MaaResourceGetHash.restype = MaaBool
         Library.framework().MaaResourceGetHash.argtypes = [
             MaaResourceHandle,

{maafw-4.1.1.dist-info → maafw-4.2.0.dist-info}/METADATA

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

{maafw-4.1.1.dist-info → maafw-4.2.0.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=_3FDk9YBhqhSL8WzkyPbs5W5y2uLJ5iaosW48N1xWkw,3337
 maa/buffer.py,sha256=XFr1MnWt-xmZkhQ_2ZzGfiqSJJwmphY4U07EEzMNYQc,16544
 maa/context.py,sha256=hOxo7GArAmdBwMGHPqM1I2rtNE5N6WR1QwPOLxZgSvU,5754
 maa/controller.py,sha256=V9ALn24vQX-mWngZbuapBcv-_HNHCtUwHXa3Em2X13s,22517
@@ -9,24 +9,24 @@ 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=1dRadrja3qgyU8-tIL5C8P-YaZyH-uHKEbysxKIAj_U,10468
+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/DirectML.dll,sha256=nJ5tgiVhxsQbkOaZSz6IV88dZtv7HgxMeZx8ibTpLaE,18527776
-maa/bin/MaaAdbControlUnit.dll,sha256=tmPEqUeFnna1yg1nd6Bi0rvQ1cvlmDngIAX3IHV7ZFQ,742400
-maa/bin/MaaAgentClient.dll,sha256=iSvtjU-7rEPhtS1_2ImynnXguPj833YjSQjXGMro3lw,948736
-maa/bin/MaaAgentServer.dll,sha256=JOTUWitBV0yWDgUh11MjGfFFrkqerAtqfMy5ZYLNViI,1123840
-maa/bin/MaaDbgControlUnit.dll,sha256=Uqt2ji0v06mNtWXH_c5i4n1cTXKZlcTFGdevzumSiHM,399872
-maa/bin/MaaFramework.dll,sha256=la1_hLPc79qazRWTQ5YkWOosVBYc-EjSkp_Ng5YD5nE,1526784
-maa/bin/MaaToolkit.dll,sha256=8eCiR-AmGxVa2EiH3VDPQFU96In87fIc4KYikMOgJUs,720384
-maa/bin/MaaUtils.dll,sha256=0YykeVtSFjS_u2kBBxYM-5JUdkt3fI1FXOJ9ESaDP8k,547840
-maa/bin/MaaWin32ControlUnit.dll,sha256=W90lfjSLUjMNemIKSZoeDUAbvpClK3GClX_EhYMGHm0,335360
+maa/bin/MaaAdbControlUnit.dll,sha256=INHQyrrnSBKS58rLFIyN2wxrOo5U2bfjEt9dIj0Exx8,742400
+maa/bin/MaaAgentClient.dll,sha256=aGDfPehYcPtPmD5aPHsBRTfhbSwQJpHGLazDIBSgeh8,963072
+maa/bin/MaaAgentServer.dll,sha256=GMkwgIJ75fDsWnQa3dJLWZfK3V48meYy7veDK7xFVss,1138176
+maa/bin/MaaDbgControlUnit.dll,sha256=XdlLEhkWxFbJOVU6V34Tg_8ZxKuwK537vfydhxVsk_8,399872
+maa/bin/MaaFramework.dll,sha256=9FyQBElZdt1WOsz13JEPIUTKgfozgpv_Bv6j9KddO_U,1535488
+maa/bin/MaaToolkit.dll,sha256=z20pxkCb1DKOVLSn-yF0CrAhJx6aHp74cj4ynoVmLus,720384
+maa/bin/MaaUtils.dll,sha256=ZI3GS8m6KF6vw9CDQKC0M4klPg7VGB0DiIHDdQ3JFac,547840
+maa/bin/MaaWin32ControlUnit.dll,sha256=SHNL5mVQ8lhPLAuhtLOLOfNbFT7tOCpDj2HlJ-bcQaY,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.1.1.dist-info/licenses/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
-maafw-4.1.1.dist-info/METADATA,sha256=nA2mFCnuy8tTbYRvltba0k3nUrD8T2fQumG_oyH1QnE,21231
-maafw-4.1.1.dist-info/WHEEL,sha256=k6hccRrl6UmjGsv-l-15TwZnTH21KqjgBTXuBtbSCtM,93
-maafw-4.1.1.dist-info/RECORD,,
+maafw-4.2.0.dist-info/licenses/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
+maafw-4.2.0.dist-info/METADATA,sha256=bCdtl_eUewt7RMm48Exp1jtt07LJnjSfmI-HUg2QsOU,21231
+maafw-4.2.0.dist-info/WHEEL,sha256=k6hccRrl6UmjGsv-l-15TwZnTH21KqjgBTXuBtbSCtM,93
+maafw-4.2.0.dist-info/RECORD,,