diff --git a/src/Action/StoreVillageState.ts b/src/Action/StoreVillageState.ts deleted file mode 100644 index 9e1a1bf..0000000 --- a/src/Action/StoreVillageState.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { ActionController, registerAction } from './ActionController'; -import { Args } from '../Command'; -import { Task } from '../Queue/TaskQueue'; -import { StateGrabberManager } from '../Grabber/StateGrabberManager'; - -@registerAction -export class StoreVillageState extends ActionController { - async run(args: Args, task: Task): Promise<any> { - const manager = new StateGrabberManager(); - manager.grab(); - } -} diff --git a/src/Executor.ts b/src/Executor.ts index 68f5ec9..1115453 100644 --- a/src/Executor.ts +++ b/src/Executor.ts @@ -55,6 +55,8 @@ export class Executor { this.logger.log('CURRENT JOB', 'TASK', taskCommand, 'ACTION', actionCommand); + this.runGrabbers(); + try { if (actionCommand) { return await this.processActionCommand(actionCommand, taskCommand); @@ -69,7 +71,6 @@ export class Executor { } private async processActionCommand(cmd: Command, task: Task) { - this.runGrabbers(); const actionController = createAction(cmd.name, this.scheduler); this.logger.log('PROCESS ACTION', cmd.name, actionController); if (actionController) { diff --git a/src/Scheduler.ts b/src/Scheduler.ts index 23b7a58..7c1d87a 100644 --- a/src/Scheduler.ts +++ b/src/Scheduler.ts @@ -26,7 +26,7 @@ export class Scheduler { // this.taskQueue.push(UpdateResourceContracts.name, {}, timestamp()); // this.taskQueue.push(BalanceHeroResourcesTask.name, {}, timestamp()); - this.createUniqTaskTimer(3 * 60, GrabVillageState.name); + this.createUniqTaskTimer(2 * 60, GrabVillageState.name); this.createUniqTaskTimer(10 * 60, UpdateResourceContracts.name); this.createUniqTaskTimer(20 * 60, BalanceHeroResourcesTask.name); this.createUniqTaskTimer(60 * 60, SendOnAdventureTask.name); diff --git a/src/Task/GrabVillageState.ts b/src/Task/GrabVillageState.ts index 9bbfb09..8804963 100644 --- a/src/Task/GrabVillageState.ts +++ b/src/Task/GrabVillageState.ts @@ -5,7 +5,6 @@ import { path } from '../utils'; import { Task } from '../Queue/TaskQueue'; import { TaskController, registerTask } from './TaskController'; import { grabVillageList } from '../Page/VillageBlock'; -import { StoreVillageState } from '../Action/StoreVillageState'; @registerTask export class GrabVillageState extends TaskController { @@ -22,7 +21,6 @@ export class GrabVillageState extends TaskController { path: path('/dorf1.php', { newdid: village.id }), }) ); - actions.push(new Command(StoreVillageState.name, args)); } actions.push(new Command(CompleteTaskAction.name, args));