MaaFw 4.4.0a1__py3-none-win_amd64.whl → 4.4.0a4__py3-none-win_amd64.whl

maa/agent_client.py

@@ -57,6 +57,13 @@ class AgentClient:
     def connected(self) -> bool:
         return bool(Library.agent_client().MaaAgentClientConnected(self._handle))
 
+    @property
+    def alive(self) -> bool:
+        return bool(Library.agent_client().MaaAgentClientAlive(self._handle))
+
+    def set_timeout(self, milliseconds: int) -> bool:
+        return bool(Library.agent_client().MaaAgentClientSetTimeout(self._handle, ctypes.c_int64(milliseconds)))
+
     _api_properties_initialized: bool = False
 
     @staticmethod
@@ -103,3 +110,14 @@ class AgentClient:
         Library.agent_client().MaaAgentClientConnected.argtypes = [
             MaaAgentClientHandle,
         ]
+
+        Library.agent_client().MaaAgentClientAlive.restype = MaaBool
+        Library.agent_client().MaaAgentClientAlive.argtypes = [
+            MaaAgentClientHandle,
+        ]
+
+        Library.agent_client().MaaAgentClientSetTimeout.restype = MaaBool
+        Library.agent_client().MaaAgentClientSetTimeout.argtypes = [
+            MaaAgentClientHandle,
+            ctypes.c_int64,
+        ]

maa/custom_action.py

@@ -65,8 +65,6 @@ class CustomAction(ABC):
         context = Context(c_context)
         task_detail = context.tasker.get_task_detail(int(c_task_id))
         reco_detail = context.tasker.get_recognition_detail(int(c_reco_id))
-        if not task_detail or not reco_detail:
-            return int(False)
 
         box = RectBuffer(c_box).get()
 

maa/custom_recognition.py

@@ -67,8 +67,6 @@ class CustomRecognition(ABC):
 
         context = Context(c_context)
         task_detail = context.tasker.get_task_detail(int(c_task_id))
-        if not task_detail:
-            return int(False)
 
         image = ImageBuffer(c_image).get()
 

maa/library.py

@@ -2,6 +2,7 @@ import ctypes
 import ctypes.util
 import pathlib
 import platform
+from typing import Optional
 
 from .define import *
 
@@ -9,10 +10,10 @@ from .define import *
 class Library:
     _is_agent_server: bool = False
 
-    _framework: ctypes.CDLL = None
-    _toolkit: ctypes.CDLL = None
-    _agent_client: ctypes.CDLL = None
-    _agent_server: ctypes.CDLL = None
+    _framework: Optional[ctypes.CDLL] = None
+    _toolkit: Optional[ctypes.CDLL] = None
+    _agent_client: Optional[ctypes.CDLL] = None
+    _agent_server: Optional[ctypes.CDLL] = None
     _lib_type = None
 
     @staticmethod
@@ -55,7 +56,7 @@ class Library:
 
         platform_type = platform.system().lower()
 
-        if platform_type == "windows":
+        if platform_type == WINDOWS:
             Library._lib_type = ctypes.WinDLL
         else:
             Library._lib_type = ctypes.CDLL
@@ -72,7 +73,7 @@ class Library:
     def framework() -> ctypes.CDLL:
         if not Library.is_agent_server():
             if not Library._framework:
-                Library._framework = Library._lib_type(str(Library.framework_libpath))
+                Library._framework = Library._lib_type(str(Library.framework_libpath))  # type: ignore
 
             return Library._framework
         else:
@@ -81,7 +82,7 @@ class Library:
     @staticmethod
     def toolkit() -> ctypes.CDLL:
         if not Library._toolkit:
-            Library._toolkit = Library._lib_type(str(Library.toolkit_libpath))
+            Library._toolkit = Library._lib_type(str(Library.toolkit_libpath))  # type: ignore
 
         return Library._toolkit
 
@@ -91,9 +92,7 @@ class Library:
             raise ValueError("Agent server is not available in the current context.")
 
         if not Library._agent_client:
-            Library._agent_client = Library._lib_type(
-                str(Library.agent_client_libpath)
-            )
+            Library._agent_client = Library._lib_type(str(Library.agent_client_libpath))  # type: ignore
 
         return Library._agent_client
 
@@ -103,9 +102,7 @@ class Library:
             raise ValueError("Agent client is not available in the current context.")
 
         if not Library._agent_server:
-            Library._agent_server = Library._lib_type(
-                str(Library.agent_server_libpath)
-            )
+            Library._agent_server = Library._lib_type(str(Library.agent_server_libpath))  # type: ignore
 
         return Library._agent_server
 

{maafw-4.4.0a1.dist-info → maafw-4.4.0a4.dist-info}/METADATA

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

{maafw-4.4.0a1.dist-info → maafw-4.4.0a4.dist-info}/RECORD

@@ -1,13 +1,13 @@
 maa/__init__.py,sha256=t2Z9yJWrSZfH16xYN67bKpiPEHDf7iaiw4wi0PjmU8U,250
-maa/agent_client.py,sha256=vrL1pyqYyK2CQePbMbCQraZnzx0rPaYWK4G8D9qU__Y,3365
+maa/agent_client.py,sha256=qx1-3VGp97JB_UMlbkvK-O_GTigbdqD6U4gGKi2yQW4,4049
 maa/buffer.py,sha256=XFr1MnWt-xmZkhQ_2ZzGfiqSJJwmphY4U07EEzMNYQc,16544
 maa/context.py,sha256=dYCvRNqq2iCL8lIyp2TkZorGB5KNI34L3pGzlpdL7co,6454
 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/custom_action.py,sha256=Jn4W1Jc8E35R6l_z2Co7cgNVYBQm0Xi_XD8uLvZI93A,2418
+maa/custom_recognition.py,sha256=llIVKsFtqA-J6pAOMSlROWpM6ZZfKc69I_ORWTnjIqg,3314
 maa/define.py,sha256=qec4GQkYi6AtorJ1ix880Fz67bpZULJOV3VpZEDd2Es,13341
 maa/job.py,sha256=MUI5T2X9ON9c7Dl6yo_0pp8Ulpn25XOD_uEdGm2k-TA,1231
-maa/library.py,sha256=9af7ncHUk33N5JcacaAk87JLKkP3atu-J8wf-CvfYhw,3891
+maa/library.py,sha256=u6gbEHDV3I0y69-ZoBo1p6-bAtP4jqSQa4FICuzaw3U,3961
 maa/notification_handler.py,sha256=LFJY6YqF9fJSkRsvpmj6ZL5DexMN_cEOj-HmpWpB9o0,5442
 maa/resource.py,sha256=sCGAK1FFjZCaf01t_FPdtl4pMDQsybhEjmafp9XfITA,12222
 maa/tasker.py,sha256=cAkYW8Mu5rAgsPlSGacTjJ830sF2yFtvlmXRvIJt-A4,14811
@@ -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=fGwCNEUlKRmdMecHmEVT7fh5tKRREm9ftl_m2egNy2c,1326080
-maa/bin/MaaAgentClient.dll,sha256=Mx4AEhHmfKhzd3bvw2U5izQv4Qp4okB-tWf3s0U-CU8,1967616
-maa/bin/MaaAgentServer.dll,sha256=HqnVxoLfnFd3rbq8gCcER2tznA9GEf9Rp9MAF21hZp4,2221056
-maa/bin/MaaDbgControlUnit.dll,sha256=M9zC8Bo-2jYTB8ikf3Bmvm_qwQLFqfHBHkC258T4HA8,775680
-maa/bin/MaaFramework.dll,sha256=FvGZKQretqg7z5wFcvF0dDyI3fQrMAUNvX6OS973owk,2813952
-maa/bin/MaaToolkit.dll,sha256=1kKWw5XZERGZRodzlYQ321V48tqq6KQcGqdwj63az-A,1308672
-maa/bin/MaaUtils.dll,sha256=Bie31fDgQQRUW9PWgQs75hyW-dbWLF2GnMz-xu29QoU,1008640
-maa/bin/MaaWin32ControlUnit.dll,sha256=kT08E2A7nRaIFTPDljnkYc8akDo76mbbU7tGsstYoXE,1558016
+maa/bin/MaaAdbControlUnit.dll,sha256=OldGWw-VXTDxQQbVT2B1sfPVy_RkODW8nyTyHuKI4AM,1326080
+maa/bin/MaaAgentClient.dll,sha256=n5qg6J6tXULM5Y3edU7iekPDsKg-Jxh8Msv-O7rqlGU,1973760
+maa/bin/MaaAgentServer.dll,sha256=JmbG5V48RigggnqR_eG5NqdKZlO0HyQEM6zVfA1YtIA,2224640
+maa/bin/MaaDbgControlUnit.dll,sha256=O_TqJr5jgosh9z3DvoaiKpPUwDcV3LEuSnJOPASVGY8,775680
+maa/bin/MaaFramework.dll,sha256=EqDsD-WUSWJxjA0LeD3GLyQvg2x9NaKzMimWkDRDGAk,2802688
+maa/bin/MaaToolkit.dll,sha256=uLSfiaWE_bV1rfYHHi1VLkZScuZGQcKsi4izv__DgOw,1308672
+maa/bin/MaaUtils.dll,sha256=8-6D7cg-xXZ5cPRaxD32N1-Zj8EqxNW8fShKAiCraZ0,1008640
+maa/bin/MaaWin32ControlUnit.dll,sha256=HLIyLU3o2BpvMqrDsKyoWF6WZfRCZcl54gTsWljOXt8,1558016
 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.4.0a1.dist-info/licenses/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
-maafw-4.4.0a1.dist-info/METADATA,sha256=xa4JvFXgE_yE54gdMqBLEL464Zrm9GGoHlCSk5144yE,24356
-maafw-4.4.0a1.dist-info/WHEEL,sha256=k6hccRrl6UmjGsv-l-15TwZnTH21KqjgBTXuBtbSCtM,93
-maafw-4.4.0a1.dist-info/RECORD,,
+maafw-4.4.0a4.dist-info/licenses/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
+maafw-4.4.0a4.dist-info/METADATA,sha256=cdASCKwmYXGrTcWLSD0CQgfsNX2bknZyrCl-nhydmLA,24356
+maafw-4.4.0a4.dist-info/WHEEL,sha256=k6hccRrl6UmjGsv-l-15TwZnTH21KqjgBTXuBtbSCtM,93
+maafw-4.4.0a4.dist-info/RECORD,,