Refactoring

src/Action/CompleteTaskAction.ts

@@ -5,6 +5,6 @@ import { Task } from '../Queue/TaskQueue';
 @registerAction
 export class CompleteTaskAction extends ActionController {
     async run(args: Args, task: Task): Promise<any> {
-        this.scheduler.completeTask(task.id);
+        this.scheduler.removeTask(task.id);
     }
 }

src/Action/UpgradeResourceToLevel.ts

@@ -22,7 +22,7 @@ export class UpgradeResourceToLevel extends ActionController {
         const allUpgraded = deposits.reduce((memo, dep) => memo && dep.level >= requiredLevel, true);
 
         if (allUpgraded) {
-            this.scheduler.completeTask(task.id);
+            this.scheduler.removeTask(task.id);
             return;
         }
 

src/Executor.ts

@@ -99,7 +99,7 @@ export class Executor {
             await taskController.run(task);
         } else {
             this.logger.warn('TASK NOT FOUND', task.name);
-            this.scheduler.completeTask(task.id);
+            this.scheduler.removeTask(task.id);
         }
     }
 
@@ -108,8 +108,7 @@ export class Executor {
 
         if (err instanceof AbortTaskError) {
             this.logger.warn('ABORT TASK', task.id);
-            this.scheduler.completeTask(task.id);
-            this.scheduler.clearActions();
+            this.scheduler.removeTask(task.id);
             return;
         }
 

src/Scheduler.ts

@@ -70,11 +70,6 @@ export class Scheduler {
         }
     }
 
-    completeTask(taskId: TaskId) {
-        this.taskQueue.remove(taskId);
-        this.actionQueue.clear();
-    }
-
     removeTask(taskId: TaskId) {
         this.taskQueue.remove(taskId);
         this.actionQueue.clear();