Rewrite task queue

src/Action/Action.ts

@@ -1,3 +0,0 @@
-export default abstract class Action {
-    abstract async run(args);
-}

src/Action/ActionController.ts

@@ -0,0 +1,6 @@
+import { Args } from '../Common';
+import { Task } from '../Storage/TaskQueue';
+
+export default abstract class ActionController {
+    abstract async run(args: Args, task: Task);
+}

src/Action/GoToBuildingAction.ts

@@ -1,9 +1,11 @@
-import Action from './Action';
+import ActionController from './ActionController';
+import { Args } from '../Common';
+import { Task } from '../Storage/TaskQueue';
 
-export default class GoToBuildingAction extends Action {
+export default class GoToBuildingAction extends ActionController {
     static NAME = 'go_to_building';
 
-    async run(args): Promise<any> {
+    async run(args: Args, task: Task): Promise<any> {
         window.location.assign('/build.php?id=' + args.id);
         return null;
     }

src/Action/GoToResourceFieldsAction.ts

@@ -1,8 +1,10 @@
-import Action from './Action';
+import ActionController from './ActionController';
+import { Args } from '../Common';
+import { Task } from '../Storage/TaskQueue';
 
-export default class GoToResourceFieldsAction extends Action {
+export default class GoToResourceFieldsAction extends ActionController {
     static NAME = 'go_to_resource_fields';
-    async run(): Promise<any> {
+    async run(args: Args, task: Task): Promise<any> {
         window.location.assign('/dorf1.php');
     }
 }

src/Action/StoreRemainingBuildTimeAction.ts

@@ -1,10 +1,11 @@
-import Action from './Action';
+import ActionController from './ActionController';
 import { Args } from '../Common';
+import { Task } from '../Storage/TaskQueue';
 
-export default class StoreRemainingBuildTimeAction extends Action {
+export default class StoreRemainingBuildTimeAction extends ActionController {
     static NAME = 'store_remaining_build_time';
 
-    async run(args: Args): Promise<any> {
+    async run(args: Args, task: Task): Promise<any> {
         const timer = jQuery('.buildDuration .timer');
         // if (timer.length === 1) {
         //     const remainingSeconds = +timer.val();

src/Action/UpgradeBuildingAction.ts

@@ -1,9 +1,10 @@
-import Action from './Action';
+import ActionController from './ActionController';
 import { Args } from '../Common';
 import { TryLaterError } from '../Errors';
 import Scheduler from '../Scheduler';
+import { Task } from '../Storage/TaskQueue';
 
-export default class UpgradeBuildingAction extends Action {
+export default class UpgradeBuildingAction extends ActionController {
     static NAME = 'upgrade_building';
     private scheduler: Scheduler;
 
@@ -12,12 +13,12 @@ export default class UpgradeBuildingAction extends Action {
         this.scheduler = scheduler;
     }
 
-    async run(args: Args): Promise<any> {
+    async run(args: Args, task: Task): Promise<any> {
         const btn = jQuery(
             '.upgradeButtonsContainer .section1 button.green.build'
         );
         if (btn.length === 1) {
-            this.scheduler.completeCurrentTask();
+            this.scheduler.completeTask(task.id);
             btn.trigger('click');
         } else {
             throw new TryLaterError(60, 'No upgrade button, try later');