fix: ensure foreground tasks stop immediately when scheduler stops

Author: Aues6uen11Z

backend/app/app.go

@@ -16,7 +16,7 @@ import (
 )
 
 // Define version constant
-const Version = "1.2.4"
+const Version = "1.2.6"
 
 // var wailsContext *context.Context
 

backend/model/scheduler.go

@@ -87,15 +87,17 @@ func GetScheduler() *Scheduler {
 	return scheduler
 }
 
+func (s *Scheduler) TriggerCloseFunc() {
+	if s.AutoClose && s.CloseFunc != nil {
+		s.CloseFunc()
+	}
+}
+
 // Stop halts the scheduler
 func (s *Scheduler) Stop() {
 	s.mu.Lock()
 	s.IsRunning = false
 	s.mu.Unlock()
-
-	if s.AutoClose && s.CloseFunc != nil {
-		s.CloseFunc()
-	}
 }
 
 // Start activates the scheduler

backend/service/scheduler.go

@@ -348,6 +348,7 @@ func (s *SchedulerService) StartAll() {
 		wg.Wait()
 		utils.Logger.Info("All tasks completed, stopping scheduler")
 		scheduler.Stop()
+		scheduler.TriggerCloseFunc()
 		s.wsService.BroadcastState("", model.StatusPending)
 	}()
 }
@@ -448,30 +449,29 @@ func (s *SchedulerService) runForegroundTasks(tasks []string) {
 // StopAll stops the scheduler and all tasks
 func (s *SchedulerService) StopAll() {
 	utils.Logger.Info("Stopping all running instances...")
+	scheduler := model.GetScheduler()
+	if !scheduler.IsRunning {
+		utils.Logger.Info("Scheduler is not running")
+		return
+	}
+
+	// Stop the scheduler
+	scheduler.Stop()
+	s.wsService.BroadcastState("", model.StatusPending)
 
 	// Get all instances
 	var instances []model.InstanceInfo
 	if err := model.GetAllInstances(&instances); err != nil {
 		utils.Logger.Error("Failed to get all instances:", err)
 		return
 	}
-
 	// Stop all running instances
-	scheduler := model.GetScheduler()
 	for _, ist := range instances {
 		tm := scheduler.GetTaskManager(ist.Name)
 		if tm != nil && tm.Status == model.StatusRunning {
 			s.stopOne(ist.Name, nil)
 		}
 	}
 
-	// Prevent loop calls in CloseApp
-	if !scheduler.IsRunning {
-		utils.Logger.Info("Scheduler is not running")
-		return
-	}
-
-	// Stop the scheduler
-	scheduler.Stop()
-	s.wsService.BroadcastState("", model.StatusPending)
+	scheduler.TriggerCloseFunc()
 }

wails.json

@@ -7,7 +7,7 @@
     "frontend:dev:watcher": "npm run dev",
     "frontend:dev:serverUrl": "http://localhost:33204",
     "info": {
-        "productVersion": "1.2.4",
+        "productVersion": "1.2.6",
         "copyright": "Copyright © 2024 DaCapo Aues6uen11Z",
         "comments": "A graphical script manager driven by configuration files"
     }