refactor: 整理Task体系，修正部分Action相关返回逻辑 (#853)

Author: MistEO

docs/en_us/2.3-CallbackProtocol.md

@@ -201,7 +201,6 @@ Sent when a node begins executing an action.
 ```
 
 - `task_id`: Task ID (number)
-- `node_id`: Node ID (number)
 - `action_id`: Action ID (number)
 - `name`: Node name (string)
 - `focus`: Focus-related data (any type)

docs/en_us/3.1-PipelineProtocol.md

@@ -957,7 +957,6 @@ When MaaFW sends a callback message, it provides the following information:
   "message": "Node.Action.Starting",
   "details_json": {
     "task_id": 12345,
-    "node_id": 67890,
     "action_id": 11111,
     "name": "NodeA",
     "focus": {

docs/zh_cn/2.3-回调协议.md

@@ -201,7 +201,6 @@ typedef void(MAA_CALL* MaaEventCallback)(void* handle, const char* message, cons
 ```
 
 - `task_id`: 任务 ID（数字）
-- `node_id`: 节点 ID（数字）
 - `action_id`: 操作 ID（数字）
 - `name`: 节点名称（字符串）
 - `focus`: 焦点相关数据（任意类型）

docs/zh_cn/3.1-任务流水线协议.md

@@ -962,7 +962,6 @@ C:/MaaXXX/resource/my_exec/my_exec.exe
   "message": "Node.Action.Starting",
   "details_json": {
     "task_id": 12345,
-    "node_id": 67890,
     "action_id": 11111,
     "name": "NodeA",
     "focus": {

include/MaaFramework/MaaMsg.h

@@ -103,7 +103,6 @@
  *
  * details_json: {
  *     task_id: number,
- *     node_id: number,
  *     action_id: number,
  *     name: string,
  *     focus: any,

source/MaaFramework/Task/ActionTask.cpp

@@ -10,13 +10,6 @@
 
 MAA_TASK_NS_BEGIN
 
-bool ActionTask::run()
-{
-    LogFunc << VAR(entry_);
-
-    return run_with_param({}, {}) != MaaInvalidId;
-}
-
 MaaActId ActionTask::run_with_param(const cv::Rect& box, const json::value& reco_detail)
 {
     LogFunc << VAR(entry_);
@@ -26,17 +19,30 @@ MaaActId ActionTask::run_with_param(const cv::Rect& box, const json::value& reco
         return MaaInvalidId;
     }
 
+    auto node_opt = context_->get_pipeline_data(entry_);
+    if (!node_opt) {
+        LogError << "get_pipeline_data failed, task not exist" << VAR(entry_);
+        return MaaInvalidId;
+    }
+
     RecoResult fake_reco {
-        .reco_id = MAA_VISION_NS::VisionBase::generate_uid(),
-        .name = entry_,
-        .algorithm = "DirectHit",
+        .reco_id = MaaInvalidId,
         .box = box,
         .detail = reco_detail,
     };
 
-    tasker_->runtime_cache().set_reco_detail(fake_reco.reco_id, fake_reco);
+    auto act = run_action(fake_reco, *node_opt);
+
+    NodeDetail result {
+        .node_id = generate_node_id(),
+        .name = entry_,
+        .reco_id = fake_reco.reco_id,
+        .action_id = act.action_id,
+        .completed = act.success,
+    };
+    set_node_detail(result.node_id, result);
 
-    return run_action(fake_reco).action_id;
+    return act.action_id;
 }
 
 MAA_TASK_NS_END

source/MaaFramework/Task/ActionTask.h

@@ -14,10 +14,6 @@ class ActionTask : public TaskBase
 
     virtual ~ActionTask() override = default;
 
-    virtual bool run() override;
-
-    virtual void post_stop() override {}
-
 public:
     MaaActId run_with_param(const cv::Rect& box, const json::value& reco_detail);
 };

source/MaaFramework/Task/EmptyTask.h

@@ -2,8 +2,6 @@
 
 #include "TaskBase.h"
 
-#include "Common/Conf.h"
-
 MAA_TASK_NS_BEGIN
 
 // for MaaTaskerPostStop, as a stop mark

source/MaaFramework/Task/PipelineTask.cpp

@@ -41,7 +41,7 @@ bool PipelineTask::run()
         PipelineData::NextList list = std::move(next);
         list.insert(list.end(), std::make_move_iterator(interrupt.begin()), std::make_move_iterator(interrupt.end()));
 
-        auto node_detail = run_reco_and_action(list, node);
+        auto node_detail = run_next(list, node);
 
         if (context_->need_to_stop()) {
             LogWarn << "need_to_stop" << VAR(node.name);
@@ -119,7 +119,7 @@ void PipelineTask::post_stop()
     context_->need_to_stop() = true;
 }
 
-NodeDetail PipelineTask::run_reco_and_action(const PipelineData::NextList& list, const PipelineData& pretask)
+NodeDetail PipelineTask::run_next(const PipelineData::NextList& list, const PipelineData& pretask)
 {
     if (!tasker_) {
         LogError << "tasker is null";
@@ -148,7 +148,7 @@ NodeDetail PipelineTask::run_reco_and_action(const PipelineData::NextList& list,
         current_clock = std::chrono::steady_clock::now();
         cv::Mat image = screencap();
 
-        reco = run_recognition(image, list);
+        reco = recognize_list(image, list);
         if (reco.box) { // hit
             break;
         }
@@ -167,8 +167,85 @@ NodeDetail PipelineTask::run_reco_and_action(const PipelineData::NextList& list,
         std::this_thread::sleep_until(current_clock + pretask.rate_limit);
     }
 
-    auto node_detail = run_action(reco);
-    return node_detail;
+    auto hit_opt = context_->get_pipeline_data(reco.name);
+    if (!hit_opt) {
+        LogError << "get_pipeline_data failed, node not exist" << VAR(reco.name);
+        return {};
+    }
+
+    auto act = run_action(reco, *hit_opt);
+
+    NodeDetail result {
+        .node_id = generate_node_id(),
+        .name = hit_opt->name,
+        .reco_id = reco.reco_id,
+        .action_id = act.action_id,
+        .completed = act.success,
+    };
+    set_node_detail(result.node_id, result);
+
+    return result;
+}
+
+RecoResult PipelineTask::recognize_list(const cv::Mat& image, const PipelineData::NextList& list)
+{
+    LogFunc << VAR(cur_node_) << VAR(list);
+
+    if (!context_) {
+        LogError << "context is null";
+        return {};
+    }
+
+    if (image.empty()) {
+        LogError << "Image is empty";
+        return {};
+    }
+
+    auto cur_opt = context_->get_pipeline_data(cur_node_);
+    if (!cur_opt) {
+        LogError << "get_pipeline_data failed, node not exist" << VAR(cur_node_);
+        return {};
+    }
+
+    const auto& cur_node = *cur_opt;
+
+    const json::value reco_list_cb_detail {
+        { "task_id", task_id() },
+        { "name", cur_node_ },
+        { "list", json::array(list) },
+        { "focus", cur_node.focus },
+    };
+
+    if (debug_mode() || !cur_node.focus.is_null()) {
+        notify(MaaMsg_Node_NextList_Starting, reco_list_cb_detail);
+    }
+
+    for (const auto& node : list) {
+        auto node_opt = context_->get_pipeline_data(node);
+        if (!node_opt) {
+            LogError << "get_pipeline_data failed, node not exist" << VAR(node);
+            continue;
+        }
+        const auto& pipeline_data = *node_opt;
+
+        RecoResult result = run_recognition(image, pipeline_data);
+
+        if (!result.box) {
+            continue;
+        }
+
+        if (debug_mode() || !cur_node.focus.is_null()) {
+            notify(MaaMsg_Node_NextList_Succeeded, reco_list_cb_detail);
+        }
+
+        return result;
+    }
+
+    if (debug_mode() || !cur_node.focus.is_null()) {
+        notify(MaaMsg_Node_NextList_Failed, reco_list_cb_detail);
+    }
+
+    return {};
 }
 
 MAA_TASK_NS_END

source/MaaFramework/Task/PipelineTask.h

@@ -17,7 +17,8 @@ class PipelineTask : public TaskBase
     virtual void post_stop() override;
 
 private:
-    NodeDetail run_reco_and_action(const PipelineData::NextList& list, const PipelineData& pretask);
+    NodeDetail run_next(const PipelineData::NextList& list, const PipelineData& pretask);
+    RecoResult recognize_list(const cv::Mat& image, const PipelineData::NextList& list);
 };
 
 MAA_TASK_NS_END