Simplify work with errors

src/Action/ActionController.ts

@@ -31,12 +31,12 @@ export class ActionController {
     ensureSameVillage(args: Args, task: Task) {
         let villageId = args.villageId;
         if (villageId === undefined) {
-            throw new ActionError(task.id, 'Undefined village id');
+            throw new ActionError('Undefined village id');
         }
 
         const activeVillageId = grabActiveVillageId();
         if (villageId !== activeVillageId) {
-            throw new TryLaterError(task.id, aroundMinutes(1), 'Not same village');
+            throw new TryLaterError(aroundMinutes(1), 'Not same village');
         }
     }
 }

src/Action/BuildBuildingAction.ts

@@ -12,14 +12,14 @@ export class BuildBuildingAction extends ActionController {
 
         const buildTypeId = args.buildTypeId;
         if (buildTypeId === undefined) {
-            throw new ActionError(task.id, 'Undefined build type id');
+            throw new ActionError('Undefined build type id');
         }
 
         try {
             clickBuildButton(buildTypeId);
         } catch (e) {
             if (e instanceof GrabError) {
-                throw new TryLaterError(task.id, aroundMinutes(5), 'No upgrade button, try later');
+                throw new TryLaterError(aroundMinutes(5), 'No upgrade button, try later');
             }
             throw e;
         }

src/Action/CheckBuildingRemainingTimeAction.ts

@@ -10,7 +10,7 @@ export class CheckBuildingRemainingTimeAction extends ActionController {
     async run(args: Args, task: Task): Promise<any> {
         const info = this.grabBuildingQueueInfoOrDefault();
         if (info.seconds > 0) {
-            throw new TryLaterError(task.id, info.seconds + 1, 'Building queue is full');
+            throw new TryLaterError(info.seconds + 1, 'Building queue is full');
         }
     }
 

src/Action/SendOnAdventureAction.ts

@@ -37,7 +37,7 @@ export class SendOnAdventureAction extends ActionController {
             this.checkConfig(easiest, Number(hero.health));
         }
 
-        throw new AbortTaskError(task.id, 'No suitable adventure');
+        throw new AbortTaskError('No suitable adventure');
     }
 
     private checkConfig(adventure: Adventure, health: number) {

src/Action/TrainTrooperAction.ts

@@ -7,50 +7,50 @@ import { getNumber, toNumber } from '../utils';
 @registerAction
 export class TrainTrooperAction extends ActionController {
     async run(args: Args, task: Task): Promise<any> {
-        const troopId = this.getTroopId(args, task);
-        const trainCount = this.getTrainCount(args, task);
+        const troopId = this.getTroopId(args);
+        const trainCount = this.getTrainCount(args);
 
         const block = jQuery(`#nonFavouriteTroops .innerTroopWrapper.troop${troopId}`);
         if (block.length !== 1) {
-            throw new ActionError(task.id, `Troop block not found`);
+            throw new ActionError(`Troop block not found`);
         }
 
         const countLink = block.find('.cta a');
         if (countLink.length !== 1) {
-            throw new ActionError(task.id, `Link with max count not found`);
+            throw new ActionError(`Link with max count not found`);
         }
 
         const maxCount = getNumber(countLink.text());
         if (maxCount < trainCount) {
-            throw new TryLaterError(task.id, 20 * 60, `Max count ${maxCount} less then need ${trainCount}`);
+            throw new TryLaterError(20 * 60, `Max count ${maxCount} less then need ${trainCount}`);
         }
 
         const input = block.find(`input[name="t${troopId}"]`);
         if (input.length !== 1) {
-            throw new ActionError(task.id, `Input element not found`);
+            throw new ActionError(`Input element not found`);
         }
 
         const trainButton = jQuery('.startTraining.green').first();
         if (trainButton.length !== 1) {
-            throw new ActionError(task.id, 'Train button not found');
+            throw new ActionError('Train button not found');
         }
 
         input.val(trainCount);
         trainButton.trigger('click');
     }
 
-    private getTroopId(args: Args, task: Task): number {
+    private getTroopId(args: Args): number {
         const troopId = toNumber(args.troopId);
         if (troopId === undefined) {
-            throw new ActionError(task.id, `Troop id must be a number, given "${args.troopId}"`);
+            throw new ActionError(`Troop id must be a number, given "${args.troopId}"`);
         }
         return troopId;
     }
 
-    private getTrainCount(args: Args, task: Task): number {
+    private getTrainCount(args: Args): number {
         const trainCount = toNumber(args.trainCount);
         if (trainCount === undefined) {
-            throw new ActionError(task.id, `Train count must be a number, given "${args.trainCount}"`);
+            throw new ActionError(`Train count must be a number, given "${args.trainCount}"`);
         }
         return trainCount;
     }

src/Action/UpgradeBuildingAction.ts

@@ -14,7 +14,7 @@ export class UpgradeBuildingAction extends ActionController {
             clickUpgradeButton();
         } catch (e) {
             if (e instanceof GrabError) {
-                throw new TryLaterError(task.id, aroundMinutes(5), 'No upgrade button, try later');
+                throw new TryLaterError(aroundMinutes(5), 'No upgrade button, try later');
             }
             throw e;
         }

src/Action/UpgradeResourceToLevel.ts

@@ -1,8 +1,7 @@
 import { ActionController, registerAction } from './ActionController';
 import { Args } from '../Command';
-import { ActionError, GrabError, TryLaterError } from '../Errors';
+import { ActionError, TryLaterError } from '../Errors';
 import { Task } from '../Queue/TaskQueue';
-import { clickUpgradeButton } from '../Page/BuildingPage';
 import { grabResourceDeposits } from '../Page/SlotBlock';
 import { UpgradeBuildingTask } from '../Task/UpgradeBuildingTask';
 import { ResourceDeposit } from '../Game';
@@ -13,7 +12,7 @@ export class UpgradeResourceToLevel extends ActionController {
     async run(args: Args, task: Task): Promise<any> {
         const deposits = grabResourceDeposits();
         if (deposits.length === 0) {
-            throw new ActionError(task.id, 'No deposits');
+            throw new ActionError('No deposits');
         }
 
         const villageId = args.villageId;
@@ -39,13 +38,13 @@ export class UpgradeResourceToLevel extends ActionController {
         const notUpgraded = deposits.sort((x, y) => x.level - y.level).filter(isDepositTaskNotInQueue);
 
         if (notUpgraded.length === 0) {
-            throw new TryLaterError(task.id, aroundMinutes(10), 'No available deposits');
+            throw new TryLaterError(aroundMinutes(10), 'No available deposits');
         }
 
         for (let dep of notUpgraded) {
             this.scheduler.scheduleTask(UpgradeBuildingTask.name, { villageId, buildId: dep.buildId });
         }
 
-        throw new TryLaterError(task.id, aroundMinutes(10), 'Sleep for next round');
+        throw new TryLaterError(aroundMinutes(10), 'Sleep for next round');
     }
 }