MaaFw 4.4.1__py3-none-macosx_13_0_arm64.whl → 4.5.0__py3-none-macosx_13_0_arm64.whl

maa/controller.py

@@ -56,7 +56,21 @@ class Controller:
         return self._gen_ctrl_job(ctrl_id)
 
     def post_press_key(self, key: int) -> Job:
-        ctrl_id = Library.framework().MaaControllerPostPressKey(self._handle, key)
+        """
+        Deprecated: Use post_click_key instead.
+        """
+        return self.post_click_key(key)
+
+    def post_click_key(self, key: int) -> Job:
+        ctrl_id = Library.framework().MaaControllerPostClickKey(self._handle, key)
+        return self._gen_ctrl_job(ctrl_id)
+
+    def post_key_down(self, key: int) -> Job:
+        ctrl_id = Library.framework().MaaControllerPostKeyDown(self._handle, key)
+        return self._gen_ctrl_job(ctrl_id)
+
+    def post_key_up(self, key: int) -> Job:
+        ctrl_id = Library.framework().MaaControllerPostKeyUp(self._handle, key)
         return self._gen_ctrl_job(ctrl_id)
 
     def post_input_text(self, text: str) -> Job:
@@ -216,12 +230,22 @@ class Controller:
             c_int32,
         ]
 
-        Library.framework().MaaControllerPostPressKey.restype = MaaCtrlId
-        Library.framework().MaaControllerPostPressKey.argtypes = [
+        Library.framework().MaaControllerPostClickKey.restype = MaaCtrlId
+        Library.framework().MaaControllerPostClickKey.argtypes = [
             MaaControllerHandle,
             c_int32,
         ]
 
+        Library.framework().MaaControllerPostKeyDown.restype = MaaCtrlId
+        Library.framework().MaaControllerPostKeyDown.argtypes = [
+            MaaControllerHandle,
+            c_int32,
+        ]
+        Library.framework().MaaControllerPostKeyUp.restype = MaaCtrlId
+        Library.framework().MaaControllerPostKeyUp.argtypes = [
+            MaaControllerHandle,
+            c_int32,
+        ]
         Library.framework().MaaControllerPostInputText.restype = MaaCtrlId
         Library.framework().MaaControllerPostInputText.argtypes = [
             MaaControllerHandle,
@@ -440,8 +464,10 @@ class CustomController(Controller):
             CustomController._c_touch_down_agent,
             CustomController._c_touch_move_agent,
             CustomController._c_touch_up_agent,
-            CustomController._c_press_key_agent,
+            CustomController._c_click_key_agent,
             CustomController._c_input_text_agent,
+            CustomController._c_key_down_agent,
+            CustomController._c_key_up_agent,
         )
 
         self._handle = Library.framework().MaaCustomControllerCreate(
@@ -514,13 +540,21 @@ class CustomController(Controller):
         raise NotImplementedError
 
     @abstractmethod
-    def press_key(self, keycode: int) -> bool:
+    def click_key(self, keycode: int) -> bool:
         raise NotImplementedError
 
     @abstractmethod
     def input_text(self, text: str) -> bool:
         raise NotImplementedError
 
+    @abstractmethod
+    def key_down(self, keycode: int) -> bool:
+        raise NotImplementedError
+
+    @abstractmethod
+    def key_up(self, keycode: int) -> bool:
+        raise NotImplementedError
+
     @staticmethod
     @MaaCustomControllerCallbacks.ConnectFunc
     def _c_connect_agent(
@@ -703,8 +737,40 @@ class CustomController(Controller):
         return int(self.touch_up(int(c_contact)))
 
     @staticmethod
-    @MaaCustomControllerCallbacks.PressKeyFunc
-    def _c_press_key_agent(
+    @MaaCustomControllerCallbacks.ClickKeyFunc
+    def _c_click_key_agent(
+        c_keycode: ctypes.c_int32,
+        trans_arg: ctypes.c_void_p,
+    ) -> int:
+        if not trans_arg:
+            return int(False)
+
+        self: CustomController = ctypes.cast(
+            trans_arg,
+            ctypes.py_object,
+        ).value
+
+        return int(self.click_key(int(c_keycode)))
+
+    @staticmethod
+    @MaaCustomControllerCallbacks.KeyDownFunc
+    def _c_key_down_agent(
+        c_keycode: ctypes.c_int32,
+        trans_arg: ctypes.c_void_p,
+    ) -> int:
+        if not trans_arg:
+            return int(False)
+
+        self: CustomController = ctypes.cast(
+            trans_arg,
+            ctypes.py_object,
+        ).value
+
+        return int(self.key_down(int(c_keycode)))
+
+    @staticmethod
+    @MaaCustomControllerCallbacks.KeyUpFunc
+    def _c_key_up_agent(
         c_keycode: ctypes.c_int32,
         trans_arg: ctypes.c_void_p,
     ) -> int:
@@ -716,7 +782,7 @@ class CustomController(Controller):
             ctypes.py_object,
         ).value
 
-        return int(self.press_key(int(c_keycode)))
+        return int(self.key_up(int(c_keycode)))
 
     @staticmethod
     @MaaCustomControllerCallbacks.InputTextFunc

maa/define.py

@@ -66,11 +66,12 @@ class MaaGlobalOptionEnum(IntEnum):
     # value: bool, eg: true; val_size: sizeof(bool)
     SaveDraw = 2
 
+    # Deprecated
     # Dump all screenshots and actions
     #
     # Recording will evaluate to true if any of this or MaaCtrlOptionEnum::MaaCtrlOption_Recording
     # is true. value: bool, eg: true; val_size: sizeof(bool)
-    Recording = 3
+    # Recording = 3
 
     # The level of log output to stdout
     #
@@ -105,10 +106,11 @@ class MaaCtrlOptionEnum(IntEnum):
     # value: bool, eg: true; val_size: sizeof(bool)
     ScreenshotUseRawSize = 3
 
+    # Deprecated
     # Dump all screenshots and actions
     # this option will || with MaaGlobalOptionEnum.Recording
     # value: bool, eg: true; val_size: sizeof(bool)
-    Recording = 5
+    # Recording = 5
 
 
 class MaaInferenceDeviceEnum(IntEnum):
@@ -338,7 +340,7 @@ class MaaCustomControllerCallbacks(ctypes.Structure):
         ctypes.c_int32,
         ctypes.c_void_p,
     )
-    PressKeyFunc = FUNCTYPE(
+    ClickKeyFunc = FUNCTYPE(
         MaaBool,
         ctypes.c_int32,
         ctypes.c_void_p,
@@ -348,6 +350,16 @@ class MaaCustomControllerCallbacks(ctypes.Structure):
         ctypes.c_char_p,
         ctypes.c_void_p,
     )
+    KeyDownFunc = FUNCTYPE(
+        MaaBool,
+        ctypes.c_int32,
+        ctypes.c_void_p,
+    )
+    KeyUpFunc = FUNCTYPE(
+        MaaBool,
+        ctypes.c_int32,
+        ctypes.c_void_p,
+    )
     _fields_ = [
         ("connect", ConnectFunc),
         ("request_uuid", RequestUuidFunc),
@@ -359,8 +371,10 @@ class MaaCustomControllerCallbacks(ctypes.Structure):
         ("touch_down", TouchDownFunc),
         ("touch_move", TouchMoveFunc),
         ("touch_up", TouchUpFunc),
-        ("press_key", PressKeyFunc),
+        ("click_key", ClickKeyFunc),
         ("input_text", InputTextFunc),
+        ("key_down", KeyDownFunc),
+        ("key_up", KeyUpFunc),
     ]
 
 

maa/notification_handler.py

@@ -42,6 +42,7 @@ class NotificationHandler(ABC):
         ctrl_id: int
         uuid: str
         action: str
+        param: dict
 
     def on_controller_action(
         self, noti_type: NotificationType, detail: ControllerActionDetail
@@ -112,6 +113,7 @@ class NotificationHandler(ABC):
                 ctrl_id=details["ctrl_id"],
                 uuid=details["uuid"],
                 action=details["action"],
+                param=details["param"],
             )
             self.on_controller_action(noti_type, detail)
 

maa/tasker.py

@@ -136,14 +136,10 @@ class Tasker:
 
     @staticmethod
     def set_recording(recording: bool) -> bool:
-        cbool = ctypes.c_bool(recording)
-        return bool(
-            Library.framework().MaaSetGlobalOption(
-                MaaOption(MaaGlobalOptionEnum.Recording),
-                ctypes.pointer(cbool),
-                ctypes.sizeof(ctypes.c_bool),
-            )
-        )
+        """
+        Deprecated
+        """
+        return False
 
     @staticmethod
     def set_stdout_level(level: LoggingLevelEnum) -> bool:

{maafw-4.4.1.dist-info → maafw-4.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MaaFw
-Version: 4.4.1
+Version: 4.5.0
 Summary: An automation black-box testing framework based on image recognition
 Project-URL: Homepage, https://github.com/MaaXYZ/MaaFramework
 Author: MaaXYZ
@@ -83,8 +83,8 @@ _✨ 基于图像识别的自动化黑盒测试框架 ✨_
 - [MFATools](https://github.com/SweetSmellFox/MFATools) ![csharp](https://img.shields.io/badge/C%23-239120?logo=csharp&logoColor=white) ![license](https://img.shields.io/github/license/SweetSmellFox/MFATools) ![activity](https://img.shields.io/github/commit-activity/m/SweetSmellFox/MFATools?color=%23ff69b4) ![stars](https://img.shields.io/github/stars/SweetSmellFox/MFATools?style=social)  
   基于WPF框架开发的工具界面，旨在提供类似于截图工具的功能
 
-- [YAMaaPE](https://github.com/kqcoxn/YAMaaPE) ![vue](https://img.shields.io/badge/vue-268923?logo=vue.js) ![js](https://img.shields.io/badge/Javascript-yellow?logo=Javascript) ![activity](https://img.shields.io/github/commit-activity/m/kqcoxn/YAMaaPE?color=%23ff69b4) ![stars](https://img.shields.io/github/stars/kqcoxn/YAMaaPE?style=social)  
-  基于 vue-flow 的 Pipeline 编辑器。由 MaaFramework 强力驱动！
+- [MaaPipelineEditor](https://github.com/kqcoxn/MaaPipelineEditor) ![Typescript](https://img.shields.io/badge/Typescript-8A2BE2?logo=typescript) ![activity](https://img.shields.io/github/commit-activity/m/kqcoxn/MaaPipelineEditor?color=%23ff69b4) ![stars](https://img.shields.io/github/stars/kqcoxn/MaaPipelineEditor?style=social)  
+  基于 react-flow 的 MaaFramework Pipeline 工作流式可视化编辑器，使用“无代码”流程图构建您的 Pipeline！
 
 ### 应用程序
 

maafw-4.5.0.dist-info/RECORD

@@ -0,0 +1,31 @@
+maa/__init__.py,sha256=t2Z9yJWrSZfH16xYN67bKpiPEHDf7iaiw4wi0PjmU8U,250
+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=pyVPwRnpGcGCoWAa2FOPBvwIY5jY2kqmRtd-V16bPyU,24507
+maa/custom_action.py,sha256=honGd28UaKWzApYBHO9_Cka8hPfzZUy6HBUfIdfQiaU,2554
+maa/custom_recognition.py,sha256=nfNgPKq9a6t2eoXwKMJRvZMXTh31Jn0JfxUMsfGI33Y,3384
+maa/define.py,sha256=EHTbELEAf4vXuCLyNM6Xhp9MM6iigSA6b9QE3m-B3DE,13643
+maa/job.py,sha256=MUI5T2X9ON9c7Dl6yo_0pp8Ulpn25XOD_uEdGm2k-TA,1231
+maa/library.py,sha256=u6gbEHDV3I0y69-ZoBo1p6-bAtP4jqSQa4FICuzaw3U,3961
+maa/notification_handler.py,sha256=dpbIEKTqCvW9mj6am49Fd9ntoM39OCadhOGrvkmhyyI,5502
+maa/resource.py,sha256=sCGAK1FFjZCaf01t_FPdtl4pMDQsybhEjmafp9XfITA,12222
+maa/tasker.py,sha256=8eGK83RhsVXh1Px2_eHhUBd6epaubIGDN0FG4soi4xM,14232
+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=SispWjylayOTlMW5uqA98cYFQAgKaJkfY-Vo3fRVZmc,680600
+maa/bin/libMaaAgentClient.dylib,sha256=8YJpmnXF75FvjTH_tXAtrpuCh3Ay6xEk32Up-TEc_sE,1421720
+maa/bin/libMaaAgentServer.dylib,sha256=1sIndghwzJu-HoZphpA_RYejbA2z8W8lwrGL8Kmh834,1580712
+maa/bin/libMaaCustomControlUnit.dylib,sha256=7i65MhchttF7wa8fiVGFRqAEhot-_9-c7CBYbbEt_7A,176944
+maa/bin/libMaaDbgControlUnit.dylib,sha256=DtJp8hP22AdqyNWAVQ28YjLi5bHg6DONu5Z6WXb45Z0,340360
+maa/bin/libMaaFramework.dylib,sha256=sQAdI7lfHt0nwnllCdeMVLB15voqYVQphQ0Mpsrd94Q,2695256
+maa/bin/libMaaToolkit.dylib,sha256=nKST3ClnQG9f4nSeXtfOhyccUALmLK1qxCAh39GtOZs,955440
+maa/bin/libMaaUtils.dylib,sha256=rReftAXg1O6rbWh8OIdMOGXJCbpf-Wk1xYPM3gd4AIw,540720
+maa/bin/libfastdeploy_ppocr.dylib,sha256=t9pepwGXL6xDV7tK28netjA8kjT80oicWrzRxtuXgCc,4174488
+maa/bin/libonnxruntime.1.19.2.dylib,sha256=qRzKADfkqDoOkhFLmOmQzCuLFWguENlZtpeCaD7fsq0,16757336
+maa/bin/libopencv_world4.4.11.0.dylib,sha256=V7teNMbLiYeq9bHADIfIsEHQ578zxfMsGh3ZALjuY0g,11504128
+maafw-4.5.0.dist-info/licenses/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
+maafw-4.5.0.dist-info/METADATA,sha256=hhoysPJbNY3LbQ4PX2zAXqpA1c84Zqoy6VklnBtLPww,24481
+maafw-4.5.0.dist-info/WHEEL,sha256=SqRtGdpuogbgKRVwFY1Ga4NP7T5_9qclWQUlsSHr8Hw,101
+maafw-4.5.0.dist-info/RECORD,,

maafw-4.4.1.dist-info/RECORD

@@ -1,30 +0,0 @@
-maa/__init__.py,sha256=t2Z9yJWrSZfH16xYN67bKpiPEHDf7iaiw4wi0PjmU8U,250
-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=honGd28UaKWzApYBHO9_Cka8hPfzZUy6HBUfIdfQiaU,2554
-maa/custom_recognition.py,sha256=nfNgPKq9a6t2eoXwKMJRvZMXTh31Jn0JfxUMsfGI33Y,3384
-maa/define.py,sha256=qec4GQkYi6AtorJ1ix880Fz67bpZULJOV3VpZEDd2Es,13341
-maa/job.py,sha256=MUI5T2X9ON9c7Dl6yo_0pp8Ulpn25XOD_uEdGm2k-TA,1231
-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=FDZwh9ai9Z-1hytRUFAiEwXGhruvHMCKPrbGSAOWxmY,14449
-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=OC-qcS4tttz4YvRIf8rBySTS_qPkVb-NfPTl4nUYgAo,727096
-maa/bin/libMaaAgentClient.dylib,sha256=5xBKJhvZflcz6Gp_vcajA0StJ_u1y63qAgFtfAynowM,1439304
-maa/bin/libMaaAgentServer.dylib,sha256=V5-j-08PzNUCVSVvaP2cdXsnpkim5VQieSCwSc1p3Ps,1698856
-maa/bin/libMaaDbgControlUnit.dylib,sha256=MHE8-sQbImdgKkwX7gid5vF04jxVmNMZYyvc4CX_dSA,339624
-maa/bin/libMaaFramework.dylib,sha256=N1NfhoKeby2vquvqfSHSyftTmdWoO986hG4SdsLB2IA,2721880
-maa/bin/libMaaToolkit.dylib,sha256=sit0PkPm5Uw6X-6lI8ifLfV79mBpE9g8qVHYSTUIR-E,947808
-maa/bin/libMaaUtils.dylib,sha256=IILBmdbczkHvL8WeDA48cnkUAiX_kT5pQOWjjbrAgF4,540480
-maa/bin/libfastdeploy_ppocr.dylib,sha256=wWEWPmOW1r012wBZsL6XGdIxeQrJpu-F5RVaW_POiYo,4588712
-maa/bin/libonnxruntime.1.19.2.dylib,sha256=6Zli7s5WaiJ1Qi0Xq6ar-TYZO9MYJTV02IIQUVRFLRA,17341832
-maa/bin/libopencv_world4.4.11.0.dylib,sha256=IGNSWJYqxqVH4td07Hisg2YVNZXfJjCBslFLX7Q2pTk,11587712
-maafw-4.4.1.dist-info/licenses/LICENSE.md,sha256=RG51X65V_wNLuyG-RGcLXxFsKyZnlH5wNvK_5mMlOag,7560
-maafw-4.4.1.dist-info/METADATA,sha256=EjAy1dUkGwkbs7Xe_VU9TqPLD0lBOp412sIct4XUd5g,24435
-maafw-4.4.1.dist-info/WHEEL,sha256=SqRtGdpuogbgKRVwFY1Ga4NP7T5_9qclWQUlsSHr8Hw,101
-maafw-4.4.1.dist-info/RECORD,,