Generalize "run_until()" beyond just "BotBaseContext".

Author: Mysticial

ClientSource/Connection/BotBase.cpp

@@ -22,7 +22,16 @@ BotBaseContext::BotBaseContext(CancellableScope& parent, BotBase& botbase)
 {
     attach(parent);
 }
+BotBaseContext::BotBaseContext(CancellableScope& parent, BotBaseContext& context)
+    : m_botbase(context.botbase())
+{
+    attach(parent);
+}
 BotBaseContext::~BotBaseContext(){
+    m_lifetime_sanitizer.check_usage();
+    try{
+        m_botbase.wait_for_all_requests(this);
+    }catch (...){}
     detach();
 }
 

ClientSource/Connection/BotBase.h

@@ -75,6 +75,7 @@ class BotBaseContext final : public CancellableScope{
 public:
     BotBaseContext(BotBase& botbase);
     BotBaseContext(CancellableScope& parent, BotBase& botbase);
+    BotBaseContext(CancellableScope& parent, BotBaseContext& context);
     virtual ~BotBaseContext();
 
 

SerialPrograms/Source/CommonFramework/InferenceInfra/InferenceRoutines.cpp

@@ -5,7 +5,7 @@
  */
 
 #include "Common/Cpp/Exceptions.h"
-#include "ClientSource/Connection/BotBase.h"
+#include "Common/Cpp/CancellableScope.h"
 #include "InferenceSession.h"
 #include "InferenceRoutines.h"
 
@@ -69,6 +69,7 @@ int run_until(
 
     return session.triggered_index();
 }
+#if 0
 int run_until(
     VideoStream& stream, BotBaseContext& context,
     std::function<void(BotBaseContext& context)>&& command,
@@ -95,6 +96,7 @@ int run_until(
 
     return session.triggered_index();
 }
+#endif
 
 
 

SerialPrograms/Source/CommonFramework/InferenceInfra/InferenceRoutines.h

@@ -16,7 +16,6 @@
 
 namespace PokemonAutomation{
 
-class BotBaseContext;
 class ProgramEnvironment;
 
 
@@ -67,13 +66,25 @@ int run_until(
     std::chrono::milliseconds default_video_period = std::chrono::milliseconds(50),
     std::chrono::milliseconds default_audio_period = std::chrono::milliseconds(20)
 );
+template <typename ContextType>
 int run_until(
-    VideoStream& stream, BotBaseContext& context,
-    std::function<void(BotBaseContext& context)>&& command,
+    VideoStream& stream, ContextType& context,
+    std::function<void(ContextType& context)>&& command,
     const std::vector<PeriodicInferenceCallback>& callbacks,
     std::chrono::milliseconds default_video_period = std::chrono::milliseconds(50),
     std::chrono::milliseconds default_audio_period = std::chrono::milliseconds(20)
-);
+){
+    return run_until(
+        stream, context,
+        [&](CancellableScope& scope){
+            ContextType subcontext(scope, context);
+            command(subcontext);
+        },
+        callbacks,
+        default_video_period,
+        default_audio_period
+    );
+}
 
 
 #if 0

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -1058,7 +1058,7 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
         NormalBattleMenuWatcher battle_menu(COLOR_RED);
         AreaZeroSkyTracker sky_tracker(overlay);
         context.wait_for_all_requests();
-        int ret = run_until(
+        int ret = run_until<BotBaseContext>(
             console, context,
             [&](BotBaseContext& context){
                 while (true){

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.cpp

@@ -100,7 +100,7 @@ void start_game_from_home_with_inference(
     context.wait_for_all_requests();
     {
         HomeWatcher detector;
-        int ret = run_until(
+        int ret = run_until<BotBaseContext>(
             console, context,
             [](BotBaseContext& context){
                 pbf_mash_button(context, BUTTON_B, 10 * TICKS_PER_SECOND);

SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.cpp

@@ -310,7 +310,7 @@ void EggAutonomousState::fetch_egg(){
     m_console.log("Attempting to fetch an egg.");
     {
         ShortDialogWatcher dialog;
-        int ret = run_until(
+        int ret = run_until<BotBaseContext>(
             m_console, m_context,
             [](BotBaseContext& context){
                 pbf_move_left_joystick(context, 0, 255, 125, 0);
@@ -333,7 +333,7 @@ void EggAutonomousState::fetch_egg(){
     m_console.log("Going to daycare man.");
     {
         ShortDialogWatcher dialog;
-        int ret = run_until(
+        int ret = run_until<BotBaseContext>(
             m_console, m_context,
             [](BotBaseContext& context){
                 pbf_move_left_joystick(context, 0, 255, 30, 0);
@@ -350,7 +350,7 @@ void EggAutonomousState::fetch_egg(){
     //  Talk to daycare man.
     {
         ShortDialogWatcher dialog;
-        int ret = run_until(
+        int ret = run_until<BotBaseContext>(
             m_console, m_context,
             [](BotBaseContext& context){
                 pbf_press_button(context, BUTTON_ZL, 20, 230);
@@ -365,7 +365,7 @@ void EggAutonomousState::fetch_egg(){
 
     {
         EggReceivedDetector received;
-        run_until(
+        run_until<BotBaseContext>(
             m_console, m_context,
             [](BotBaseContext& context){
                 pbf_mash_button(context, BUTTON_ZL, 500);
@@ -454,7 +454,7 @@ void EggAutonomousState::hatch_rest_of_party(){
         dump();
         ShortDialogWatcher dialog;
         FrozenImageDetector frozen(COLOR_CYAN, {0, 0, 1, 0.5}, std::chrono::seconds(60), 20);
-        int ret = run_until(
+        int ret = run_until<BotBaseContext>(
             m_console, m_context,
             [&](BotBaseContext& context){
                 egg_spin(context, 480 * TICKS_PER_SECOND);
@@ -483,7 +483,7 @@ void EggAutonomousState::spin_until_fetch_or_hatch(){
     m_context.wait_for_all_requests();
     m_console.log("Looking for more eggs...");
     ShortDialogWatcher dialog;
-    int ret = run_until(
+    int ret = run_until<BotBaseContext>(
         m_console, m_context,
         [&](BotBaseContext& context){
             egg_spin(context, m_travel_time_per_fetch);

SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.cpp

@@ -33,7 +33,7 @@ void hatch_egg(ConsoleHandle& console, BotBaseContext& context){
             break;
         }
 
-        int ret = run_until(
+        int ret = run_until<BotBaseContext>(
             console, context,
             [](BotBaseContext& context){
                 egg_spin(context, 480 * TICKS_PER_SECOND);

SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp

@@ -104,7 +104,7 @@ bool DoublesLeveling::battle(SingleSwitchProgramEnvironment& env, BotBaseContext
         EndBattleWatcher end_battle;
         SelectionArrowFinder learn_move(env.console, {0.50, 0.62, 0.40, 0.18}, COLOR_YELLOW);
         FrozenImageDetector overworld(std::chrono::seconds(5), 10);
-        int ret = run_until(
+        int ret = run_until<BotBaseContext>(
             env.console, context,
             [](BotBaseContext& context){
                 pbf_mash_button(context, BUTTON_B, 120 * TICKS_PER_SECOND);

SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute210.cpp

@@ -117,7 +117,7 @@ bool MoneyFarmerRoute210::battle(SingleSwitchProgramEnvironment& env, BotBaseCon
 
     {
         StartBattleDetector detector(env.console);
-        int ret = run_until(
+        int ret = run_until<BotBaseContext>(
             env.console, context,
             [](BotBaseContext& context){
                 pbf_press_button(context, BUTTON_ZL, 10, 10);
@@ -149,7 +149,7 @@ bool MoneyFarmerRoute210::battle(SingleSwitchProgramEnvironment& env, BotBaseCon
         BattleMenuWatcher battle_menu(BattleType::TRAINER);
         EndBattleWatcher end_battle;
         SelectionArrowFinder learn_move(env.console, {0.50, 0.62, 0.40, 0.18}, COLOR_YELLOW);
-        int ret = run_until(
+        int ret = run_until<BotBaseContext>(
             env.console, context,
             [](BotBaseContext& context){
                 pbf_mash_button(context, BUTTON_B, 120 * TICKS_PER_SECOND);
@@ -380,7 +380,7 @@ void MoneyFarmerRoute210::program(SingleSwitchProgramEnvironment& env, BotBaseCo
         std::vector<ImagePixelBox> bubbles;
         {
             VSSeekerReactionTracker tracker(env.console, {0.20, 0.20, 0.60, 0.60});
-            run_until(
+            run_until<BotBaseContext>(
                 env.console, context,
                 [this](BotBaseContext& context){
                     SHORTCUT.run(context, TICKS_PER_SECOND);