From d5f780197f996fec34c516f6bb3ae457529a23d4 Mon Sep 17 00:00:00 2001 From: Anton Vakhrushev Date: Wed, 29 Apr 2020 19:05:58 +0300 Subject: [PATCH] Args refactoring --- src/Action/ActionController.ts | 2 +- src/Action/BalanceHeroResourcesAction.ts | 2 +- src/Action/BuildBuildingAction.ts | 2 +- src/Action/CheckBuildingRemainingTimeAction.ts | 2 +- src/Action/ClickButtonAction.ts | 2 +- src/Action/CompleteTaskAction.ts | 2 +- src/Action/GoToHeroVillageAction.ts | 2 +- src/Action/GoToPageAction.ts | 2 +- src/Action/SendOnAdventureAction.ts | 2 +- src/Action/SendResourcesAction.ts | 2 +- src/Action/TrainTrooperAction.ts | 2 +- src/Action/UpdateBuildingTaskResourcesAction.ts | 2 +- src/Action/UpgradeBuildingAction.ts | 2 +- src/Action/UpgradeResourceToLevel.ts | 2 +- src/Queue/ActionQueue.ts | 2 +- src/{ => Queue}/Args.ts | 6 +++--- src/Queue/TaskQueue.ts | 2 +- src/Scheduler.ts | 2 +- src/Task/BalanceHeroResourcesTask.ts | 2 +- src/Task/BuildBuildingTask.ts | 2 +- src/Task/ResourcesToLevel.ts | 2 +- src/Task/SendOnAdventureTask.ts | 2 +- src/Task/SendResourcesTask.ts | 2 +- src/Task/TaskController.ts | 2 +- src/Task/TrainTroopTask.ts | 2 +- src/Task/UpdateResourceContracts.ts | 2 +- src/Task/UpgradeBuildingTask.ts | 2 +- 27 files changed, 29 insertions(+), 29 deletions(-) rename src/{ => Queue}/Args.ts (72%) diff --git a/src/Action/ActionController.ts b/src/Action/ActionController.ts index a1bbf3f..52c8c93 100644 --- a/src/Action/ActionController.ts +++ b/src/Action/ActionController.ts @@ -3,7 +3,7 @@ import { Scheduler } from '../Scheduler'; import { ActionError, TryLaterError } from '../Errors'; import { grabActiveVillageId } from '../Page/VillageBlock'; import { aroundMinutes } from '../utils'; -import { Args } from '../Args'; +import { Args } from '../Queue/Args'; const actionMap: { [name: string]: Function | undefined } = {}; diff --git a/src/Action/BalanceHeroResourcesAction.ts b/src/Action/BalanceHeroResourcesAction.ts index bc39e45..bb9b8db 100644 --- a/src/Action/BalanceHeroResourcesAction.ts +++ b/src/Action/BalanceHeroResourcesAction.ts @@ -6,7 +6,7 @@ import { grabActiveVillageId } from '../Page/VillageBlock'; import { HeroState } from '../State/HeroState'; import { calcHeroResource } from '../Core/HeroBalance'; import { HeroAllResources } from '../Core/Hero'; -import { Args } from '../Args'; +import { Args } from '../Queue/Args'; @registerAction export class BalanceHeroResourcesAction extends ActionController { diff --git a/src/Action/BuildBuildingAction.ts b/src/Action/BuildBuildingAction.ts index 218cefd..9492df1 100644 --- a/src/Action/BuildBuildingAction.ts +++ b/src/Action/BuildBuildingAction.ts @@ -3,7 +3,7 @@ import { ActionError, GrabError, TryLaterError } from '../Errors'; import { Task } from '../Queue/TaskQueue'; import { clickBuildButton } from '../Page/BuildingPage'; import { aroundMinutes } from '../utils'; -import { Args } from '../Args'; +import { Args } from '../Queue/Args'; @registerAction export class BuildBuildingAction extends ActionController { diff --git a/src/Action/CheckBuildingRemainingTimeAction.ts b/src/Action/CheckBuildingRemainingTimeAction.ts index a3ad1f0..5bd8f39 100644 --- a/src/Action/CheckBuildingRemainingTimeAction.ts +++ b/src/Action/CheckBuildingRemainingTimeAction.ts @@ -3,7 +3,7 @@ import { Task } from '../Queue/TaskQueue'; import { GrabError, TryLaterError } from '../Errors'; import { grabBuildingQueueInfo } from '../Page/VillageBlock'; import { BuildingQueueInfo } from '../Game'; -import { Args } from '../Args'; +import { Args } from '../Queue/Args'; @registerAction export class CheckBuildingRemainingTimeAction extends ActionController { diff --git a/src/Action/ClickButtonAction.ts b/src/Action/ClickButtonAction.ts index c5210b4..35671de 100644 --- a/src/Action/ClickButtonAction.ts +++ b/src/Action/ClickButtonAction.ts @@ -1,7 +1,7 @@ import { ActionController, registerAction } from './ActionController'; import { Task } from '../Queue/TaskQueue'; import { AbortTaskError } from '../Errors'; -import { Args } from '../Args'; +import { Args } from '../Queue/Args'; @registerAction export class ClickButtonAction extends ActionController { diff --git a/src/Action/CompleteTaskAction.ts b/src/Action/CompleteTaskAction.ts index 8922d42..366ef2c 100644 --- a/src/Action/CompleteTaskAction.ts +++ b/src/Action/CompleteTaskAction.ts @@ -1,6 +1,6 @@ import { ActionController, registerAction } from './ActionController'; import { Task } from '../Queue/TaskQueue'; -import { Args } from '../Args'; +import { Args } from '../Queue/Args'; @registerAction export class CompleteTaskAction extends ActionController { diff --git a/src/Action/GoToHeroVillageAction.ts b/src/Action/GoToHeroVillageAction.ts index 6a6c4aa..c8777fa 100644 --- a/src/Action/GoToHeroVillageAction.ts +++ b/src/Action/GoToHeroVillageAction.ts @@ -4,7 +4,7 @@ import { grabVillageList } from '../Page/VillageBlock'; import { grabHeroVillage } from '../Page/HeroPage'; import { path } from '../utils'; import { HeroState } from '../State/HeroState'; -import { Args } from '../Args'; +import { Args } from '../Queue/Args'; @registerAction export class GoToHeroVillageAction extends ActionController { diff --git a/src/Action/GoToPageAction.ts b/src/Action/GoToPageAction.ts index d6a7465..9f438fa 100644 --- a/src/Action/GoToPageAction.ts +++ b/src/Action/GoToPageAction.ts @@ -1,7 +1,7 @@ import { ActionController, registerAction } from './ActionController'; import { Task } from '../Queue/TaskQueue'; import { AbortTaskError } from '../Errors'; -import { Args } from '../Args'; +import { Args } from '../Queue/Args'; @registerAction export class GoToPageAction extends ActionController { diff --git a/src/Action/SendOnAdventureAction.ts b/src/Action/SendOnAdventureAction.ts index 3f578fc..5efb0cc 100644 --- a/src/Action/SendOnAdventureAction.ts +++ b/src/Action/SendOnAdventureAction.ts @@ -2,7 +2,7 @@ import { ActionController, registerAction } from './ActionController'; import { Task } from '../Queue/TaskQueue'; import { trimPrefix } from '../utils'; import { AbortTaskError } from '../Errors'; -import { Args } from '../Args'; +import { Args } from '../Queue/Args'; const CONFIG = [ { level: 0, health: 60 }, diff --git a/src/Action/SendResourcesAction.ts b/src/Action/SendResourcesAction.ts index 163353a..e87f65f 100644 --- a/src/Action/SendResourcesAction.ts +++ b/src/Action/SendResourcesAction.ts @@ -9,7 +9,7 @@ import { grabActiveVillageId, grabVillageList } from '../Page/VillageBlock'; import { SendResourcesTask } from '../Task/SendResourcesTask'; import { aroundMinutes, timestamp } from '../utils'; import { VillageState } from '../State/VillageState'; -import { Args } from '../Args'; +import { Args } from '../Queue/Args'; function err(msg): never { throw new ActionError(msg); diff --git a/src/Action/TrainTrooperAction.ts b/src/Action/TrainTrooperAction.ts index 98d4500..4ff9be6 100644 --- a/src/Action/TrainTrooperAction.ts +++ b/src/Action/TrainTrooperAction.ts @@ -2,7 +2,7 @@ import { ActionController, registerAction } from './ActionController'; import { ActionError, TryLaterError } from '../Errors'; import { Task } from '../Queue/TaskQueue'; import { getNumber, toNumber } from '../utils'; -import { Args } from '../Args'; +import { Args } from '../Queue/Args'; @registerAction export class TrainTrooperAction extends ActionController { diff --git a/src/Action/UpdateBuildingTaskResourcesAction.ts b/src/Action/UpdateBuildingTaskResourcesAction.ts index ea38b24..ffec8dd 100644 --- a/src/Action/UpdateBuildingTaskResourcesAction.ts +++ b/src/Action/UpdateBuildingTaskResourcesAction.ts @@ -1,7 +1,7 @@ import { ActionController, registerAction } from './ActionController'; import { Task } from '../Queue/TaskQueue'; import { grabContractResources } from '../Page/BuildingPage'; -import { Args } from '../Args'; +import { Args } from '../Queue/Args'; @registerAction export class UpdateBuildingTaskResourcesAction extends ActionController { diff --git a/src/Action/UpgradeBuildingAction.ts b/src/Action/UpgradeBuildingAction.ts index a08da69..7c5b96c 100644 --- a/src/Action/UpgradeBuildingAction.ts +++ b/src/Action/UpgradeBuildingAction.ts @@ -3,7 +3,7 @@ import { GrabError, TryLaterError } from '../Errors'; import { Task } from '../Queue/TaskQueue'; import { clickUpgradeButton } from '../Page/BuildingPage'; import { aroundMinutes } from '../utils'; -import { Args } from '../Args'; +import { Args } from '../Queue/Args'; @registerAction export class UpgradeBuildingAction extends ActionController { diff --git a/src/Action/UpgradeResourceToLevel.ts b/src/Action/UpgradeResourceToLevel.ts index 0cc08a7..adfd445 100644 --- a/src/Action/UpgradeResourceToLevel.ts +++ b/src/Action/UpgradeResourceToLevel.ts @@ -5,7 +5,7 @@ import { grabResourceDeposits } from '../Page/SlotBlock'; import { UpgradeBuildingTask } from '../Task/UpgradeBuildingTask'; import { ResourceDeposit } from '../Game'; import { aroundMinutes, getNumber } from '../utils'; -import { Args } from '../Args'; +import { Args } from '../Queue/Args'; @registerAction export class UpgradeResourceToLevel extends ActionController { diff --git a/src/Queue/ActionQueue.ts b/src/Queue/ActionQueue.ts index 47edecf..d46e7ca 100644 --- a/src/Queue/ActionQueue.ts +++ b/src/Queue/ActionQueue.ts @@ -1,6 +1,6 @@ import { ConsoleLogger, Logger } from '../Logger'; import { DataStorage } from '../DataStorage'; -import { Args } from '../Args'; +import { Args } from './Args'; const NAMESPACE = 'actions.v1'; const QUEUE_NAME = 'queue'; diff --git a/src/Args.ts b/src/Queue/Args.ts similarity index 72% rename from src/Args.ts rename to src/Queue/Args.ts index 1bb5390..7d32950 100644 --- a/src/Args.ts +++ b/src/Queue/Args.ts @@ -1,6 +1,6 @@ -import { TaskId } from './Queue/TaskQueue'; -import { ResourcesInterface } from './Core/Resources'; -import { CoordinatesInterface } from './Core/Village'; +import { TaskId } from './TaskQueue'; +import { ResourcesInterface } from '../Core/Resources'; +import { CoordinatesInterface } from '../Core/Village'; export interface Args { taskId?: TaskId; diff --git a/src/Queue/TaskQueue.ts b/src/Queue/TaskQueue.ts index 4c9a576..4133495 100644 --- a/src/Queue/TaskQueue.ts +++ b/src/Queue/TaskQueue.ts @@ -1,7 +1,7 @@ import { uniqId } from '../utils'; import { ConsoleLogger, Logger } from '../Logger'; import { DataStorage } from '../DataStorage'; -import { Args } from '../Args'; +import { Args } from './Args'; const NAMESPACE = 'tasks:v1'; const QUEUE_NAME = 'queue'; diff --git a/src/Scheduler.ts b/src/Scheduler.ts index 923b3d8..fbc5c61 100644 --- a/src/Scheduler.ts +++ b/src/Scheduler.ts @@ -11,7 +11,7 @@ import { UpdateResourceContracts } from './Task/UpdateResourceContracts'; import { TrainTroopTask } from './Task/TrainTroopTask'; import { Resources, ResourcesInterface } from './Core/Resources'; import { SendResourcesTask } from './Task/SendResourcesTask'; -import { Args } from './Args'; +import { Args } from './Queue/Args'; export class Scheduler { private taskQueue: TaskQueue; diff --git a/src/Task/BalanceHeroResourcesTask.ts b/src/Task/BalanceHeroResourcesTask.ts index 4a499df..c02f1a2 100644 --- a/src/Task/BalanceHeroResourcesTask.ts +++ b/src/Task/BalanceHeroResourcesTask.ts @@ -6,7 +6,7 @@ import { BalanceHeroResourcesAction } from '../Action/BalanceHeroResourcesAction import { path } from '../utils'; import { GoToHeroVillageAction } from '../Action/GoToHeroVillageAction'; import { Action } from '../Queue/ActionQueue'; -import { Args } from '../Args'; +import { Args } from '../Queue/Args'; @registerTask export class BalanceHeroResourcesTask extends TaskController { diff --git a/src/Task/BuildBuildingTask.ts b/src/Task/BuildBuildingTask.ts index b7c0789..dabfd20 100644 --- a/src/Task/BuildBuildingTask.ts +++ b/src/Task/BuildBuildingTask.ts @@ -6,7 +6,7 @@ import { path } from '../utils'; import { Task } from '../Queue/TaskQueue'; import { TaskController, registerTask } from './TaskController'; import { Action } from '../Queue/ActionQueue'; -import { Args } from '../Args'; +import { Args } from '../Queue/Args'; @registerTask export class BuildBuildingTask extends TaskController { diff --git a/src/Task/ResourcesToLevel.ts b/src/Task/ResourcesToLevel.ts index 4da1529..2d53571 100644 --- a/src/Task/ResourcesToLevel.ts +++ b/src/Task/ResourcesToLevel.ts @@ -5,7 +5,7 @@ import { CompleteTaskAction } from '../Action/CompleteTaskAction'; import { path } from '../utils'; import { UpgradeResourceToLevel } from '../Action/UpgradeResourceToLevel'; import { Action } from '../Queue/ActionQueue'; -import { Args } from '../Args'; +import { Args } from '../Queue/Args'; @registerTask export class ResourcesToLevel extends TaskController { diff --git a/src/Task/SendOnAdventureTask.ts b/src/Task/SendOnAdventureTask.ts index ea6380a..3baf49e 100644 --- a/src/Task/SendOnAdventureTask.ts +++ b/src/Task/SendOnAdventureTask.ts @@ -6,7 +6,7 @@ import { SendOnAdventureAction } from '../Action/SendOnAdventureAction'; import { ClickButtonAction } from '../Action/ClickButtonAction'; import { path } from '../utils'; import { Action } from '../Queue/ActionQueue'; -import { Args } from '../Args'; +import { Args } from '../Queue/Args'; @registerTask export class SendOnAdventureTask extends TaskController { diff --git a/src/Task/SendResourcesTask.ts b/src/Task/SendResourcesTask.ts index 2091aa9..8e0feb0 100644 --- a/src/Task/SendResourcesTask.ts +++ b/src/Task/SendResourcesTask.ts @@ -6,7 +6,7 @@ import { path } from '../utils'; import { SendResourcesAction } from '../Action/SendResourcesAction'; import { ClickButtonAction } from '../Action/ClickButtonAction'; import { scanAllVillagesBundle } from './ActionBundles'; -import { Args } from '../Args'; +import { Args } from '../Queue/Args'; @registerTask export class SendResourcesTask extends TaskController { diff --git a/src/Task/TaskController.ts b/src/Task/TaskController.ts index 8ce3e80..98f0eb2 100644 --- a/src/Task/TaskController.ts +++ b/src/Task/TaskController.ts @@ -2,7 +2,7 @@ import { Task } from '../Queue/TaskQueue'; import { Scheduler } from '../Scheduler'; import { CompleteTaskAction } from '../Action/CompleteTaskAction'; import { Action } from '../Queue/ActionQueue'; -import { Args } from '../Args'; +import { Args } from '../Queue/Args'; const taskMap: { [name: string]: Function | undefined } = {}; diff --git a/src/Task/TrainTroopTask.ts b/src/Task/TrainTroopTask.ts index 1730127..1aa4975 100644 --- a/src/Task/TrainTroopTask.ts +++ b/src/Task/TrainTroopTask.ts @@ -5,7 +5,7 @@ import { CompleteTaskAction } from '../Action/CompleteTaskAction'; import { TrainTrooperAction } from '../Action/TrainTrooperAction'; import { path } from '../utils'; import { Action } from '../Queue/ActionQueue'; -import { Args } from '../Args'; +import { Args } from '../Queue/Args'; @registerTask export class TrainTroopTask extends TaskController { diff --git a/src/Task/UpdateResourceContracts.ts b/src/Task/UpdateResourceContracts.ts index 6a2b2d1..39fb395 100644 --- a/src/Task/UpdateResourceContracts.ts +++ b/src/Task/UpdateResourceContracts.ts @@ -6,7 +6,7 @@ import { UpgradeBuildingTask } from './UpgradeBuildingTask'; import { UpdateBuildingTaskResourcesAction } from '../Action/UpdateBuildingTaskResourcesAction'; import { CompleteTaskAction } from '../Action/CompleteTaskAction'; import { Action } from '../Queue/ActionQueue'; -import { Args } from '../Args'; +import { Args } from '../Queue/Args'; @registerTask export class UpdateResourceContracts extends TaskController { diff --git a/src/Task/UpgradeBuildingTask.ts b/src/Task/UpgradeBuildingTask.ts index 8bfd3ff..5ee04bc 100644 --- a/src/Task/UpgradeBuildingTask.ts +++ b/src/Task/UpgradeBuildingTask.ts @@ -6,7 +6,7 @@ import { CheckBuildingRemainingTimeAction } from '../Action/CheckBuildingRemaini import { CompleteTaskAction } from '../Action/CompleteTaskAction'; import { path } from '../utils'; import { Action } from '../Queue/ActionQueue'; -import { Args } from '../Args'; +import { Args } from '../Queue/Args'; @registerTask export class UpgradeBuildingTask extends TaskController {