fix: delay等逻辑移出action (#1190)

Author: MistEO

docs/en_us/3.1-PipelineProtocol.md

@@ -456,7 +456,7 @@ This algorithm property requires additional fields:
 - `roi`: *array<int, 4>* | *string*  
     Region of Interest (ROI), defining the image recognition boundary; related image processing is performed only within this area. Optional, default [0, 0, 0, 0], i.e. full screen.
   - *array<int, 4>*: Recognition area coordinates [x, y, w, h]. Supports negative values **💡 v5.6**: negative x/y means calculating from right/bottom edge; w/h of 0 means extending to edge, negative means taking absolute value and treating (x, y) as bottom-right corner.
-  - *string*: Fill in the node name, and identify within the target range identified by a previously executed node. Also supports `[Anchor]AnchorName` format to reference the node corresponding to an anchor **💡 v5.9**. If the referenced pre-task or anchor has no recognition result, the recognition is treated as failed.  
+  - *string*: Fill in the node name to perform recognition within the target range produced by a previously executed node. Also supports `[Anchor]AnchorName` format to reference the node corresponding to an anchor **💡 v5.9**. If the referenced pre-task or anchor has no recognition result, the recognition is treated as failed.  
 
 - `roi_offset`: *array<int, 4>*  
     Move additionally based on `roi` as the range, and add the four values separately. Optional, default [0, 0, 0, 0].
@@ -1079,7 +1079,7 @@ Additional properties for this action:
 - `target`: *true* | *string* | *array<int, 2>* | *array<int, 4>* **💡 v5.5**  
     Position of the scroll target. The mouse will first move to this position before scrolling. Optional, default is `true`.  
   - *true*: Target is the position just recognized in this node (i.e., itself).  
-  - *string*: Fill in a node name; the target is the position recognized by a previously executed node. Also supports `[Anchor]AnchorName` format to reference the node corresponding to an anchor **💡 v5.9**.  
+  - *string*: Fill in a node name; the target is the position recognized by a previously executed node. Also supports `[Anchor]AnchorName` format to reference the node corresponding to an anchor **💡 v5.9**. If the referenced pre-task or anchor has no recognition result, the action is treated as failed.  
   - *array<int, 2>*: Fixed coordinate point `[x, y]`.  
   - *array<int, 4>*: Fixed coordinate area `[x, y, w, h]`, a random point will be selected within the rectangle (with higher probability towards the center and lower probability at the edges). Use [0, 0, 0, 0] for full screen.
 

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

@@ -1088,7 +1088,7 @@ Pipeline v2 时，将这些字段放到 `recognition.param` 中即可。
 - `target`: *true* | *string* | *array<int, 2>* | *array<int, 4>* **💡 v5.5**  
     滚动目标的位置，鼠标会先移动到该位置再进行滚动。可选，默认 true 。  
   - *true*: 目标为本节点中刚刚识别到的位置（即自身）。  
-  - *string*: 填写节点名，目标为之前执行过的某节点识别到的位置。也支持 `[Anchor]锚点名` 格式引用锚点对应的节点 **💡 v5.9**。  
+  - *string*: 填写节点名，目标为之前执行过的某节点识别到的位置。也支持 `[Anchor]锚点名` 格式引用锚点对应的节点 **💡 v5.9**。若引用的前置节点或锚点识别结果为空，则视为动作失败。  
   - *array<int, 2>*: 固定坐标点 `[x, y]`。  
   - *array<int, 4>*: 固定坐标区域 `[x, y, w, h]`，会在矩形内随机选取一点（越靠近中心概率越高，边缘概率相对较低），若希望全屏可设为 [0, 0, 0, 0] 。
 

source/MaaFramework/Task/Component/ActionHelper.cpp

@@ -14,12 +14,18 @@ ActionHelper::ActionHelper(Context* context)
 {
 }
 
-bool ActionHelper::wait_freezes(const MAA_RES_NS::WaitFreezesParam& param, const cv::Rect& box, const std::string& name)
+bool ActionHelper::wait_freezes(const MAA_RES_NS::WaitFreezesParam& param, const cv::Rect& ref_box, const std::string& name)
 {
     if (param.time <= std::chrono::milliseconds(0)) {
         return true;
     }
 
+    auto roi = get_target_rect(param.target, ref_box);
+    if (roi.empty()) {
+        LogError << "failed to get target rect for wait_freezes" << VAR(name);
+        return false;
+    }
+
     if (!controller()) {
         LogError << "Controller is null";
         return false;
@@ -35,9 +41,9 @@ bool ActionHelper::wait_freezes(const MAA_RES_NS::WaitFreezesParam& param, const
     auto screencap_clock = std::chrono::steady_clock::now();
     cv::Mat pre_image = controller()->screencap();
 
-    auto corrected_box = correct_roi(box, pre_image);
-    if (!corrected_box) {
-        LogError << "corrected box is empty" << VAR(box);
+    auto corrected_roi = correct_roi(roi, pre_image);
+    if (!corrected_roi) {
+        LogError << "corrected roi is empty" << VAR(roi);
         return false;
     }
 
@@ -68,7 +74,7 @@ bool ActionHelper::wait_freezes(const MAA_RES_NS::WaitFreezesParam& param, const
         }
 
         std::string draw_name = name.empty() ? "wait_freezes" : std::format("{}_wait_freezes", name);
-        TemplateComparator comparator(pre_image, cur_image, { *corrected_box }, comp_param, draw_name);
+        TemplateComparator comparator(pre_image, cur_image, { *corrected_roi }, comp_param, draw_name);
 
         VisionBase::save_draws(draw_name, comparator.draws());
 
@@ -104,6 +110,10 @@ cv::Rect ActionHelper::get_target_rect(const MAA_RES_NS::Action::Target& target,
     case Target::Type::PreTask: {
         const auto& name = std::get<std::string>(target.param);
         raw = get_rect_from_node(name);
+        if (raw.empty()) {
+            LogWarn << "pre task has no rect" << VAR(name);
+            return { };
+        }
         LogDebug << "pre task" << VAR(name) << VAR(raw);
     } break;
 
@@ -115,6 +125,10 @@ cv::Rect ActionHelper::get_target_rect(const MAA_RES_NS::Action::Target& target,
             return { };
         }
         raw = get_rect_from_node(*node_name);
+        if (raw.empty()) {
+            LogWarn << "anchor node has no rect" << VAR(anchor_name) << VAR(*node_name);
+            return { };
+        }
         LogDebug << "anchor" << VAR(anchor_name) << VAR(*node_name) << VAR(raw);
     } break;
 

source/MaaFramework/Task/Component/ActionHelper.h

@@ -14,7 +14,7 @@ class ActionHelper : public NonCopyable
 public:
     explicit ActionHelper(Context* context);
 
-    bool wait_freezes(const MAA_RES_NS::WaitFreezesParam& param, const cv::Rect& box, const std::string& name = "");
+    bool wait_freezes(const MAA_RES_NS::WaitFreezesParam& param, const cv::Rect& ref_box, const std::string& name = "");
 
     cv::Rect get_target_rect(const MAA_RES_NS::Action::Target& target, const cv::Rect& box = { });
 

source/MaaFramework/Task/Component/Actuator.cpp

@@ -36,110 +36,101 @@ ActionResult Actuator::run(const cv::Rect& reco_hit, MaaRecoId reco_id, const Pi
         return { };
     }
 
-    wait_freezes(pipeline_data.pre_wait_freezes, reco_hit, pipeline_data.name);
-    sleep(pipeline_data.pre_delay);
-
-    auto& rt_cache = tasker_->runtime_cache();
     ActionResult result;
 
-    for (uint i = 0; i < pipeline_data.repeat; ++i) {
-        if (i > 0) {
-            wait_freezes(pipeline_data.repeat_wait_freezes, reco_hit, pipeline_data.name);
-            sleep(pipeline_data.repeat_delay);
-        }
-
-        if (context_.need_to_stop()) {
-            return { };
-        }
-
-        result = execute_action(reco_hit, reco_id, pipeline_data, entry);
-        LogInfo << "action" << VAR(i) << VAR(pipeline_data.repeat) << VAR(result);
-        rt_cache.set_action_detail(result.action_id, result);
-
-        if (context_.need_to_stop()) {
-            return { };
-        }
-    }
-
-    wait_freezes(pipeline_data.post_wait_freezes, reco_hit, pipeline_data.name);
-    sleep(pipeline_data.post_delay);
-
-    return result;
-}
-
-ActionResult
-    Actuator::execute_action(const cv::Rect& reco_hit, MaaRecoId reco_id, const PipelineData& pipeline_data, const std::string& entry)
-{
-    using namespace MAA_RES_NS::Action;
-
     switch (pipeline_data.action_type) {
     case Type::DoNothing:
-        return do_nothing(pipeline_data.name);
+        result = do_nothing(pipeline_data.name);
+        break;
 
     case Type::Click:
-        return click(std::get<ClickParam>(pipeline_data.action_param), reco_hit, pipeline_data.name);
+        result = click(std::get<ClickParam>(pipeline_data.action_param), reco_hit, pipeline_data.name);
+        break;
 
     case Type::LongPress:
-        return long_press(std::get<LongPressParam>(pipeline_data.action_param), reco_hit, pipeline_data.name);
+        result = long_press(std::get<LongPressParam>(pipeline_data.action_param), reco_hit, pipeline_data.name);
+        break;
 
     case Type::Swipe:
-        return swipe(std::get<SwipeParam>(pipeline_data.action_param), reco_hit, pipeline_data.name);
+        result = swipe(std::get<SwipeParam>(pipeline_data.action_param), reco_hit, pipeline_data.name);
+        break;
 
     case Type::MultiSwipe:
-        return multi_swipe(std::get<MultiSwipeParam>(pipeline_data.action_param), reco_hit, pipeline_data.name);
+        result = multi_swipe(std::get<MultiSwipeParam>(pipeline_data.action_param), reco_hit, pipeline_data.name);
+        break;
 
     case Type::TouchDown:
-        return touch_down(std::get<TouchParam>(pipeline_data.action_param), reco_hit, pipeline_data.name);
+        result = touch_down(std::get<TouchParam>(pipeline_data.action_param), reco_hit, pipeline_data.name);
+        break;
 
     case Type::TouchMove:
-        return touch_move(std::get<TouchParam>(pipeline_data.action_param), reco_hit, pipeline_data.name);
+        result = touch_move(std::get<TouchParam>(pipeline_data.action_param), reco_hit, pipeline_data.name);
+        break;
 
     case Type::TouchUp:
-        return touch_up(std::get<TouchUpParam>(pipeline_data.action_param), pipeline_data.name);
+        result = touch_up(std::get<TouchUpParam>(pipeline_data.action_param), pipeline_data.name);
+        break;
 
     case Type::ClickKey:
-        return click_key(std::get<ClickKeyParam>(pipeline_data.action_param), pipeline_data.name);
+        result = click_key(std::get<ClickKeyParam>(pipeline_data.action_param), pipeline_data.name);
+        break;
 
     case Type::LongPressKey:
-        return long_press_key(std::get<LongPressKeyParam>(pipeline_data.action_param), pipeline_data.name);
+        result = long_press_key(std::get<LongPressKeyParam>(pipeline_data.action_param), pipeline_data.name);
+        break;
 
     case Type::KeyDown:
-        return key_down(std::get<KeyParam>(pipeline_data.action_param), pipeline_data.name);
+        result = key_down(std::get<KeyParam>(pipeline_data.action_param), pipeline_data.name);
+        break;
 
     case Type::KeyUp:
-        return key_up(std::get<KeyParam>(pipeline_data.action_param), pipeline_data.name);
+        result = key_up(std::get<KeyParam>(pipeline_data.action_param), pipeline_data.name);
+        break;
 
     case Type::InputText:
-        return input_text(std::get<InputTextParam>(pipeline_data.action_param), pipeline_data.name);
+        result = input_text(std::get<InputTextParam>(pipeline_data.action_param), pipeline_data.name);
+        break;
 
     case Type::StartApp:
-        return start_app(std::get<AppParam>(pipeline_data.action_param), pipeline_data.name);
+        result = start_app(std::get<AppParam>(pipeline_data.action_param), pipeline_data.name);
+        break;
 
     case Type::StopApp:
-        return stop_app(std::get<AppParam>(pipeline_data.action_param), pipeline_data.name);
+        result = stop_app(std::get<AppParam>(pipeline_data.action_param), pipeline_data.name);
+        break;
 
     case Type::Scroll:
-        return scroll(std::get<ScrollParam>(pipeline_data.action_param), reco_hit, pipeline_data.name);
+        result = scroll(std::get<ScrollParam>(pipeline_data.action_param), reco_hit, pipeline_data.name);
+        break;
 
     case Type::StopTask:
-        return stop_task(pipeline_data.name);
+        result = stop_task(pipeline_data.name);
+        break;
 
     case Type::Command:
-        return command(std::get<CommandParam>(pipeline_data.action_param), reco_hit, pipeline_data.name, entry);
+        result = command(std::get<CommandParam>(pipeline_data.action_param), reco_hit, pipeline_data.name, entry);
+        break;
 
     case Type::Shell:
-        return shell(std::get<ShellParam>(pipeline_data.action_param), pipeline_data.name);
+        result = shell(std::get<ShellParam>(pipeline_data.action_param), pipeline_data.name);
+        break;
 
     case Type::Screencap:
-        return screencap(std::get<ScreencapParam>(pipeline_data.action_param), pipeline_data.name);
+        result = screencap(std::get<ScreencapParam>(pipeline_data.action_param), pipeline_data.name);
+        break;
 
     case Type::Custom:
-        return custom_action(std::get<CustomParam>(pipeline_data.action_param), reco_hit, reco_id, pipeline_data.name);
+        result = custom_action(std::get<CustomParam>(pipeline_data.action_param), reco_hit, reco_id, pipeline_data.name);
+        break;
 
     default:
         LogError << "Unknown action" << VAR(static_cast<int>(pipeline_data.action_type));
         return { };
     }
+
+    tasker_->runtime_cache().set_action_detail(result.action_id, result);
+
+    return result;
 }
 
 cv::Point Actuator::rand_point(const cv::Rect& r)
@@ -602,20 +593,6 @@ ActionResult Actuator::screencap(const MAA_RES_NS::Action::ScreencapParam& param
     };
 }
 
-void Actuator::wait_freezes(const MAA_RES_NS::WaitFreezesParam& param, const cv::Rect& box, const std::string& name)
-{
-    if (param.time <= std::chrono::milliseconds(0)) {
-        return;
-    }
-
-    auto roi = helper_.get_target_rect(param.target, box);
-    if (roi.empty()) {
-        LogError << "failed to get target rect for wait_freezes" << VAR(name);
-        return;
-    }
-    helper_.wait_freezes(param, roi, name);
-}
-
 ActionResult Actuator::start_app(const MAA_RES_NS::Action::AppParam& param, const std::string& name)
 {
     if (!controller()) {
@@ -749,16 +726,4 @@ MAA_CTRL_NS::ControllerAgent* Actuator::controller()
     return tasker_ ? tasker_->controller() : nullptr;
 }
 
-void Actuator::sleep(unsigned ms) const
-{
-    sleep(std::chrono::milliseconds(ms));
-}
-
-void Actuator::sleep(std::chrono::milliseconds ms) const
-{
-    LogDebug << ms;
-
-    std::this_thread::sleep_for(ms);
-}
-
 MAA_TASK_NS_END

source/MaaFramework/Task/Component/Actuator.h

@@ -34,8 +34,6 @@ class Actuator : public NonCopyable
     inline static std::atomic<MaaActId> s_global_action_id = kActIdBase;
 
 private:
-    ActionResult execute_action(const cv::Rect& reco_hit, MaaRecoId reco_id, const PipelineData& pipeline_data, const std::string& entry);
-
     ActionResult click(const MAA_RES_NS::Action::ClickParam& param, const cv::Rect& box, const std::string& name);
     ActionResult long_press(const MAA_RES_NS::Action::LongPressParam& param, const cv::Rect& box, const std::string& name);
     ActionResult swipe(const MAA_RES_NS::Action::SwipeParam& param, const cv::Rect& box, const std::string& name);
@@ -62,14 +60,9 @@ class Actuator : public NonCopyable
     ActionResult do_nothing(const std::string& name);
     ActionResult stop_task(const std::string& name);
 
-    void wait_freezes(const MAA_RES_NS::WaitFreezesParam& param, const cv::Rect& box, const std::string& name);
-
 private:
     MAA_CTRL_NS::ControllerAgent* controller();
 
-    void sleep(unsigned ms) const;
-    void sleep(std::chrono::milliseconds ms) const;
-
 private:
     Tasker* tasker_ = nullptr;
     Context& context_;

source/MaaFramework/Task/Component/Recognizer.cpp

@@ -603,9 +603,12 @@ std::vector<cv::Rect> Recognizer::get_rois_from_pretask(const std::string& name,
     }
     NodeDetail node_detail = cache.get_node_detail(*node_id).value_or(NodeDetail { });
     RecoResult reco_result = cache.get_reco_result(node_detail.reco_id).value_or(RecoResult { });
-    cv::Rect raw = reco_result.box.value_or(cv::Rect { });
-    LogDebug << "pre task from cache" << VAR(name) << VAR(raw);
-    return std::vector { raw };
+    if (!reco_result.box) {
+        LogWarn << "node has no recognition box" << VAR(name);
+        return { };
+    }
+    LogDebug << "pre task from cache" << VAR(name) << VAR(*reco_result.box);
+    return { *reco_result.box };
 }
 
 void Recognizer::save_draws(const std::string& node_name, const RecoResult& result) const

source/MaaFramework/Task/Context.cpp

@@ -187,13 +187,7 @@ bool Context::wait_freezes(std::chrono::milliseconds time, const cv::Rect& box,
     }
 
     ActionHelper helper(this);
-    auto roi = helper.get_target_rect(param.target, box);
-    if (roi.empty()) {
-        LogError << "failed to get target rect for wait_freezes";
-        return false;
-    }
-
-    return helper.wait_freezes(param, roi);
+    return helper.wait_freezes(param, box);
 }
 
 bool Context::override_pipeline(const json::value& pipeline_override)