From 153e31463c32a3a6b2abf308524832e60ee809d6 Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Sat, 4 Apr 2020 15:50:56 +0300
Subject: [PATCH] Add uniq task scheduler

---
 src/Scheduler.ts         | 27 +++++++++++----------------
 src/Storage/TaskQueue.ts |  7 ++-----
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/Scheduler.ts b/src/Scheduler.ts
index 7976750..c4b91b2 100644
--- a/src/Scheduler.ts
+++ b/src/Scheduler.ts
@@ -3,7 +3,7 @@ import { UpgradeBuildingTask } from './Task/UpgradeBuildingTask';
 import { AbortTaskError, ActionError, BuildingQueueFullError, TryLaterError } from './Errors';
 import { Task, TaskId, TaskList, TaskQueue } from './Storage/TaskQueue';
 import { ActionQueue } from './Storage/ActionQueue';
-import { Command } from './Common';
+import { Args, Command } from './Common';
 import { TaskQueueRenderer } from './TaskQueueRenderer';
 import { createAction } from './Action/ActionController';
 import { createTask } from './Task/TaskController';
@@ -31,11 +31,8 @@ export class Scheduler {
         this.renderTaskQueue();
         setInterval(() => this.renderTaskQueue(), 5 * 1000);
 
-        this.scheduleHeroAdventure();
-        setInterval(() => this.scheduleHeroAdventure(), 3600 * 1000);
-
-        this.scheduleResGrab();
-        setInterval(() => this.scheduleResGrab(), 600 * 1000);
+        this.scheduleUniqTask(3600, SendOnAdventureTask.name);
+        this.scheduleUniqTask(1200, BalanceHeroResourcesTask.name);
 
         while (true) {
             await this.doTaskProcessingStep();
@@ -47,16 +44,14 @@ export class Scheduler {
         new TaskQueueRenderer().render(this.taskQueue.seeItems());
     }
 
-    private scheduleHeroAdventure() {
-        if (!this.taskQueue.hasNamed(SendOnAdventureTask.name)) {
-            this.taskQueue.push(new Command(SendOnAdventureTask.name, {}), timestamp());
-        }
-    }
-
-    private scheduleResGrab() {
-        if (!this.taskQueue.hasNamed(BalanceHeroResourcesTask.name)) {
-            this.taskQueue.push(new Command(BalanceHeroResourcesTask.name, {}), timestamp());
-        }
+    private scheduleUniqTask(seconds: number, name: string, args: Args = {}) {
+        const taskScheduler = () => {
+            if (!this.taskQueue.hasNamed(name)) {
+                this.taskQueue.push(new Command(name, args), timestamp());
+            }
+        };
+        taskScheduler();
+        setInterval(taskScheduler, seconds * 1000);
     }
 
     private async doTaskProcessingStep() {
diff --git a/src/Storage/TaskQueue.ts b/src/Storage/TaskQueue.ts
index 403a829..5d77333 100644
--- a/src/Storage/TaskQueue.ts
+++ b/src/Storage/TaskQueue.ts
@@ -27,10 +27,6 @@ export class Task {
 export type TaskList = Array<Task>;
 
 export class TaskQueue {
-    private static normalize(items: TaskList): TaskList {
-        return items.sort((x, y) => x.ts - y.ts);
-    }
-
     push(cmd: Command, ts: number): Task {
         const id = uniqTaskId();
         const task = new Task(id, ts, cmd);
@@ -111,7 +107,8 @@ export class TaskQueue {
     }
 
     private flushItems(items: TaskList): void {
-        localStorage.setItem(QUEUE_NAME, JSON.stringify(TaskQueue.normalize(items)));
+        const normalized = items.sort((x, y) => x.ts - y.ts);
+        localStorage.setItem(QUEUE_NAME, JSON.stringify(normalized));
     }
 
     private log(...args) {