MaaFw 4.4.0a1__py3-none-macosx_13_0_arm64.whl → 4.4.0a3__py3-none-macosx_13_0_arm64.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/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.0a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MaaFw
-Version: 4.4.0a1
+Version: 4.4.0a3
 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.0a3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 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
@@ -7,24 +7,24 @@ 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/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
 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=pnZ9aR50ADAUMe-Kx_QEa_BWCnOS-47NAfOQHHS1T8M,752120
-maa/bin/libMaaAgentClient.dylib,sha256=RQM24fijcY62dImVN9abu-Uub5GE7_xqBp8knOwARYM,1449384
-maa/bin/libMaaAgentServer.dylib,sha256=olazUxCt9tKMKuiBcBE1KZnYMfg2r8Yw_yxupWfZwt0,1675256
-maa/bin/libMaaDbgControlUnit.dylib,sha256=T0C0qLDaa6oT2bOHD-mtnovynIOi9nTQ2bZqb-6XYjQ,361336
-maa/bin/libMaaFramework.dylib,sha256=yGwQTZf1wXNoHhPayz6qsSxbFPsKjFi3QMYwWwhp6P8,2791656
-maa/bin/libMaaToolkit.dylib,sha256=um1KcCZQRf2_nf_td3Wj5gw9x-wB4krmyySPMS29DJs,965056
-maa/bin/libMaaUtils.dylib,sha256=tk3kq_lh3PJ7aOi-UmZ6BO2GYVW81pSc9kmLxBufGLQ,582384
+maa/bin/libMaaAdbControlUnit.dylib,sha256=nOh1mGOVf1fXg0llgkfOqZ6Ru5h7cAosJnO1lO2zQIs,752120
+maa/bin/libMaaAgentClient.dylib,sha256=2Jiy8zSoHzdQaOS66SyTPJmrt4sXGk9bV7bUZyFQ8iA,1450792
+maa/bin/libMaaAgentServer.dylib,sha256=vPF5Mizn_A_rYJaYKlb-0b0vRNeFbg61u0Mkt-yhDtE,1692664
+maa/bin/libMaaDbgControlUnit.dylib,sha256=VHm33KyCgf1ymSyYRu5frv9ZJ-cBLeGXKmUZrs3Snq4,361336
+maa/bin/libMaaFramework.dylib,sha256=Y-G3SVT5cQOMQdLvRJbcJCzISTw4yrP9JgH41XuXxo4,2790632
+maa/bin/libMaaToolkit.dylib,sha256=aGFwP3QIA1J3qkI5bjmD9lsXdj9SOEg6pY1VchgFQSw,965056
+maa/bin/libMaaUtils.dylib,sha256=0m9P9tl8OorydyGEBQtAjA_kVR3_BSnQZ6IAEtb47IU,582384
 maa/bin/libfastdeploy_ppocr.dylib,sha256=HAneULevDZ_uuI-rAYJ18hiV9ERkojA05u2M1jIXt_c,4588632
 maa/bin/libonnxruntime.1.19.2.dylib,sha256=12pPNEJbyCk7FN7wR2-ijm_yH5IbD7h81z3NUiK32OU,17341832
 maa/bin/libopencv_world4.4.8.0.dylib,sha256=a258ojx3MPVIJEUopsaDnLVInfUHh12qjsIM_8j5P_s,13193344
-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=SqRtGdpuogbgKRVwFY1Ga4NP7T5_9qclWQUlsSHr8Hw,101
-maafw-4.4.0a1.dist-info/RECORD,,
+maafw-4.4.0a3.dist-info/licenses/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
+maafw-4.4.0a3.dist-info/METADATA,sha256=4dS40Y5B1IBIoTvam93LHPeTGPUSOUCKq7btWX8Nz1s,24356
+maafw-4.4.0a3.dist-info/WHEEL,sha256=SqRtGdpuogbgKRVwFY1Ga4NP7T5_9qclWQUlsSHr8Hw,101
+maafw-4.4.0a3.dist-info/RECORD,,