refactor:适配maafw5.0 sink

Author: overflow65537

app/utils/maa_sink.py

@@ -0,0 +1,86 @@
+from maa.controller import ControllerEventSink, Controller, NotificationType
+from maa.resource import ResourceEventSink, Resource
+from maa.tasker import TaskerEventSink, Tasker
+from maa.context import ContextEventSink, Context
+
+from app.common.signal_bus import signalBus
+
+
+class MaaSink(
+    ControllerEventSink, ResourceEventSink, TaskerEventSink, ContextEventSink
+):
+
+    def on_raw_notification(self, *args, **kwargs):
+        print(f"[MaaSink] 原始数据: {type(args)}, kwargs: {kwargs}")
+
+    def on_controller_action(
+        self,
+        controller: Controller,
+        noti_type: NotificationType,
+        detail: ControllerEventSink.ControllerActionDetail,
+    ):
+        signalBus.callback.emit(
+            {"name": "on_controller_action", "status": noti_type.value}
+        )
+
+    def on_resource_loading(
+        self,
+        resource: Resource,
+        noti_type: NotificationType,
+        detail: ResourceEventSink.ResourceLoadingDetail,
+    ):
+        pass
+
+    def on_tasker_task(
+        self,
+        tasker: Tasker,
+        noti_type: NotificationType,
+        detail: TaskerEventSink.TaskerTaskDetail,
+    ):
+        signalBus.callback.emit(
+            {"name": "on_tasker_task", "task": detail.entry, "status": noti_type.value}
+        )
+
+    def on_node_next_list(
+        self,
+        context: Context,
+        noti_type: NotificationType,
+        detail: ContextEventSink.NodeNextListDetail,
+    ):
+        pass
+
+    def on_node_recognition(
+        self,
+        context: Context,
+        noti_type: NotificationType,
+        detail: ContextEventSink.NodeRecognitionDetail,
+    ):
+        focus_mapping = {
+            1: "start",
+            2: "succeeded",
+            3: "failed",
+        }
+        send_msg = {
+            "name": "on_task_recognition",
+            "task": detail.name,
+            "status": noti_type.value,
+            "focus": detail.focus.get(focus_mapping[noti_type.value], ""),
+        }
+        if (
+            detail.focus.get("aborted")
+            and not detail.focus.get(focus_mapping[1])
+            and not detail.focus.get(focus_mapping[2])
+            and not detail.focus.get(focus_mapping[3])
+        ):
+            send_msg["aborted"] = True
+        signalBus.callback.emit(send_msg)
+
+    def on_node_action(
+        self,
+        context: Context,
+        noti_type: NotificationType,
+        detail: ContextEventSink.NodeActionDetail,
+    ):
+        print(
+            f"[MaaSink] Node Action - Context: {context}, Type: {noti_type}, Detail: {detail}"
+        )

app/utils/maafw.py

@@ -54,14 +54,14 @@
 
 from asyncify import asyncify
 import maa
-from maa.context import Context
+from maa.context import Context, ContextEventSink
 from maa.custom_action import CustomAction
 from maa.custom_recognition import CustomRecognition
 
-from maa.controller import AdbController, Win32Controller
-from maa.tasker import Tasker, NotificationHandler
+from maa.controller import AdbController, Win32Controller, ControllerEventSink
+from maa.tasker import Tasker, TaskerEventSink
 from maa.agent_client import AgentClient
-from maa.resource import Resource
+from maa.resource import Resource, ResourceEventSink
 from maa.toolkit import Toolkit, AdbDevice, DesktopWindow
 from maa.define import MaaAdbScreencapMethodEnum, MaaAdbInputMethodEnum
 
@@ -71,6 +71,7 @@
 from ..common.config import cfg
 from ..utils.tool import Read_Config, path_to_list
 from ..utils.tool import ProcessThread
+from ..utils.maa_sink import MaaSink
 
 
 # 以下代码引用自 MaaDebugger 项目的 ./src/MaaDebugger/maafw/__init__.py 文件，用于生成maafw实例
@@ -79,8 +80,8 @@ class MaaFW:
     resource: Resource | None
     controller: AdbController | Win32Controller | None
     tasker: Tasker | None
-    notification_handler: NotificationHandler | None
     agent: AgentClient | None
+    maa_sink : MaaSink|None
 
     def __init__(self):
 
@@ -90,7 +91,8 @@ def __init__(self):
         self.resource = None
         self.controller = None
         self.tasker = None
-        self.notification_handler = None
+        self.maa_sink = None
+
         self.agent = None
         self.agent_thread = None
 
@@ -101,8 +103,11 @@ def change_log_path(self, new_path: str):
         Args:
             new_path (str): 新的用户目录路径。
         """
-        if not self.tasker:
-            self.tasker = Tasker(notification_handler=self.notification_handler)
+        if self.tasker is None:
+            self.tasker = Tasker()
+        if self.maa_sink is not None:
+            self.tasker.add_context_sink(self.maa_sink)
+            self.tasker.add_sink(self.maa_sink)
         logger.info(f"更改日志路径为{new_path}")
         if new_path:
             self.tasker.set_log_dir(new_path)
@@ -206,6 +211,8 @@ def connect_adb(
         self.controller = AdbController(
             adb_path, address, screencap_method, input_method, config
         )
+        if self.maa_sink is not None:
+            self.controller.add_sink(self.maa_sink)
         connected = self.controller.post_connection().wait().succeeded
         if not connected:
             print(f"Failed to connect {adb_path} {address}")
@@ -227,6 +234,9 @@ def connect_win32hwnd(
         self.controller = Win32Controller(
             hwnd, screencap_method=screencap_method, input_method=input_method  # type: ignore
         )
+        if self.maa_sink is not None:
+            self.controller.add_sink(self.maa_sink)
+
         connected = self.controller.post_connection().wait().succeeded
         if not connected:
             print(f"Failed to connect {hwnd}")
@@ -238,6 +248,8 @@ def connect_win32hwnd(
     def load_resource(self, dir: str) -> bool:
         if not self.resource:
             self.resource = Resource()
+        if self.maa_sink is not None:
+            self.resource.add_sink(self.maa_sink)
         gpu_index = maa_config_data.config.get("gpu", -1)
         if not isinstance(gpu_index, int):
             logger.warning("gpu_index 不是 int 类型，使用默认值 -1")
@@ -256,7 +268,10 @@ def load_resource(self, dir: str) -> bool:
     @asyncify
     def run_task(self, entry: str, pipeline_override: dict = {}) -> bool:
         if not self.tasker:
-            self.tasker = Tasker(notification_handler=self.notification_handler)
+            self.tasker = Tasker()
+        if self.maa_sink is not None:
+            self.tasker.add_context_sink(self.maa_sink)
+            self.tasker.add_sink(self.maa_sink)
 
         if not self.resource or not self.controller:
             signalBus.custom_info.emit({"type": "error_r"})

app/utils/tool.py

@@ -40,7 +40,6 @@
 import base64
 import logging
 from datetime import datetime, timedelta
-from maa.notification_handler import NotificationHandler, NotificationType
 
 from PySide6.QtCore import QThread
 from PySide6.QtGui import QIcon
@@ -1210,53 +1209,6 @@ def replace_placeholder(obj):
         "entry":entry,
         "pipeline_override":override_options
     }
-class MyNotificationHandler(NotificationHandler):
-
-    def __init__(self, parent=None):
-        self.callbackSignal = signalBus
-
-    def on_controller_action(
-        self,
-        noti_type: NotificationType,
-        detail: NotificationHandler.ControllerActionDetail,
-    ):
-        self.callbackSignal.callback.emit(
-            {"name": "on_controller_action", "status": noti_type.value}
-        )
-
-    def on_tasker_task(
-        self, noti_type: NotificationType, detail: NotificationHandler.TaskerTaskDetail
-    ):
-
-        self.callbackSignal.callback.emit(
-            {"name": "on_tasker_task", "task": detail.entry, "status": noti_type.value}
-        )
-
-    def on_node_recognition(
-        self,
-        noti_type: NotificationType,
-        detail: NotificationHandler.NodeRecognitionDetail,
-    ):
-        focus_mapping = {
-            1: "start",
-            2: "succeeded",
-            3: "failed",
-        }
-        send_msg = {
-            "name": "on_task_recognition",
-            "task": detail.name,
-            "status": noti_type.value,
-            "focus": detail.focus.get(focus_mapping[noti_type.value], ""),
-        }
-        if (
-            detail.focus.get("aborted")
-            and not detail.focus.get(focus_mapping[1])
-            and not detail.focus.get(focus_mapping[2])
-            and not detail.focus.get(focus_mapping[3])
-        ):
-            send_msg["aborted"] = True
-        self.callbackSignal.callback.emit(send_msg)
-
 
 class ProcessThread(QThread):
     output_signal = signalBus.agent_info

app/utils/widget.py

@@ -76,7 +76,6 @@
 )
 from qfluentwidgets import FluentIcon as FIF
 
-import traceback
 import os
 from typing import Union, Dict, List
 

app/view/task_interface.py

@@ -57,6 +57,8 @@
     ToolTipFilter,
     ToolTipPosition,
 )
+from datetime import datetime, timedelta
+from maa.toolkit import AdbDevice
 
 from ..view.UI_task_interface import Ui_Task_Interface
 
@@ -78,11 +80,10 @@
     get_console_path,
     find_executable_path_by_port,
     get_override,
-    MyNotificationHandler,
 )
 from ..utils.maafw import maafw
 from ..common.config import cfg
-from maa.toolkit import AdbDevice
+
 from ..utils.logger import logger
 from ..common.maa_config_data import maa_config_data
 from ..common.typeddict import (
@@ -93,7 +94,8 @@
     InterfaceData,
 )
 from ..utils.notice import send_thread
-from datetime import datetime, timedelta
+from ..utils.maa_sink import MaaSink
+
 
 
 class TaskInterface(Ui_Task_Interface, QWidget):
@@ -108,7 +110,7 @@ def __init__(self, parent=None):
         super().__init__(parent=parent)
         self.setupUi(self)
 
-        maafw.notification_handler = MyNotificationHandler()
+        maafw.maa_sink = MaaSink()
         self.bind_signals()
         self.init_widget_text()
         if cfg.get(cfg.resource_exist):