clashofclans.js 2.0.0-dev.30ea324 → 2.0.0-dev.3a1efb5

package/CHANGELOG.md

@@ -8,7 +8,7 @@ This new version is a complete TypeScript rewrite to convert everything from pla
 
 ### Features
 
--   EventManager and Custom Events ([#37](https://github.com/clashperk/clashofclans.js/issues/37)) ([5027ae6](https://github.com/clashperk/clashofclans.js/commit/5027ae663a8e07175e17384c7e5706f4a1a7afb4))
+-   EventManager and Custom Events ([#37](https://github.com/clashperk/clashofclans.js/issues/37)) ([5027ae6](https://github.com/clashperk/clashofclans.js/commit/5027ae663a8e07175e17384c7e5706f4a1a7afb4)) ([984451d](https://github.com/clashperk/clashofclans.js/commit/30ea3240c11866008d0dae514468c0fdbb34ffd0))
 -   Internal Caching Options ([#53](https://github.com/clashperk/clashofclans.js/issues/53))
 -   Email Password Login ([#31](https://github.com/clashperk/clashofclans.js/issues/31)) ([4153cd3](https://github.com/clashperk/clashofclans.js/commit/4153cd37ea0e1c71550b9e892105b84d5a407e23))
 -   API Date Parser and Request Retries ([#26](https://github.com/clashperk/clashofclans.js/issues/26)) ([94585f3](https://github.com/clashperk/clashofclans.js/commit/94585f3a84a7175b2d07872f9eb9e42372b95e12))

package/README.md

@@ -39,14 +39,14 @@ const client = new Client();
 ```js
 const { Client, BatchThrottler } = require('clashofclans.js');
 const client = new Client({
+    cache: true,
     retryLimit: 1,
-    restRequestTimeout: 3000,
-    throttler: new BatchThrottler(30)
+    restRequestTimeout: 5000,
+    throttler: new BatchThrottler(20)
 });
 
-client.events.addClans(['#8P2QG08P']);
-client.events.setEvent({
-    type: 'CLAN',
+client.events.addClans(['#8QU8J9LP', '#8P2QG08P']);
+client.events.setClanEvent({
     name: 'clanDescriptionChange',
     filter: (oldClan, newClan) => {
         return oldClan.description !== newClan.description;

package/dist/client/Client.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { ClanSearchOptions, SearchOptions, ClientOptions, InitOptions, OverrideOptions } from '../rest/RequestHandler';
-import { EVENTS } from '../util/Constants';
+import { EVENTS, CWL_ROUNDS } from '../util/Constants';
 import { RESTManager } from '../rest/RESTManager';
 import { EventManager } from './EventManager';
 import { EventEmitter } from 'events';
@@ -21,6 +21,8 @@ export declare class Client extends EventEmitter {
     constructor(options?: ClientOptions);
     /** Contains various general-purpose utility methods. */
     get util(): typeof Util;
+    /** Whether the API is in maintenance break. */
+    get inMaintenance(): boolean;
     /**
      * Initialize the client to create keys.
      * @example
@@ -40,12 +42,38 @@ export declare class Client extends EventEmitter {
     getClanMembers(clanTag: string, options?: SearchOptions): Promise<ClanMember[]>;
     /** Get clan war log. */
     getClanWarLog(clanTag: string, options?: SearchOptions): Promise<ClanWarLog[]>;
-    /** Get info about currently running war (regular or friendly) in the clan. */
-    getClanWar(clanTag: string, options?: OverrideOptions): Promise<ClanWar | null>;
-    /** Get info about currently running war in the clan. */
-    getCurrentWar(clanTag: string, options?: OverrideOptions): Promise<ClanWar | null>;
-    /** Get info about currently running CWL round. */
-    getLeagueWar(clanTag: string, warState?: keyof typeof CWLRound): Promise<ClanWar | null>;
+    /** Get info about currently running war (normal or friendly) in the clan. */
+    getClanWar(clanTag: string, options?: OverrideOptions): Promise<ClanWar>;
+    /**
+     * Get info about currently running war in the clan.
+     * @example
+     * ```ts
+     * await client.getCurrentWar('#8QU8J9LP');
+     * ```
+     * @example
+     * ```ts
+     * await client.getCurrentWar({ clanTag: '#8QU8J9LP', round: 'PREVIOUS_ROUND' });
+     * ```
+     */
+    getCurrentWar(clanTag: string | {
+        clanTag: string;
+        round?: keyof typeof CWL_ROUNDS;
+    }, options?: OverrideOptions): Promise<ClanWar | null>;
+    /**
+     * Get info about currently running CWL round.
+     * @example
+     * ```ts
+     * await client.getLeagueWar('#8QU8J9LP');
+     * ```
+     * @example
+     * ```ts
+     * await client.getLeagueWar({ clanTag: '#8QU8J9LP', round: 'PREVIOUS_ROUND' });
+     * ```
+     */
+    getLeagueWar(clanTag: string | {
+        clanTag: string;
+        round?: keyof typeof CWL_ROUNDS;
+    }, options?: OverrideOptions): Promise<ClanWar | null>;
     private _getCurrentLeagueWars;
     private _getClanWars;
     /** Get information about clan war league. */
@@ -54,7 +82,7 @@ export declare class Client extends EventEmitter {
     getClanWarLeagueRound(warTag: string | {
         warTag: string;
         clanTag?: string;
-    }, options?: OverrideOptions): Promise<ClanWar | null>;
+    }, options?: OverrideOptions): Promise<ClanWar>;
     /** Get information about a player by tag. */
     getPlayer(playerTag: string, options?: OverrideOptions): Promise<Player>;
     /** Verify Player API token that can be found from the Game settings. */
@@ -88,8 +116,8 @@ export declare class Client extends EventEmitter {
      *
      * **Parameters**
      *
-     * | Name | Type | Description |
-     * | :--: | :--: | :---------: |
+     * | Name |   Type   | Description           |
+     * | :--: | :------: | :-------------------: |
      * | `id` | `string` | Id of the new season. |
      * @public
      * @event
@@ -106,8 +134,8 @@ export declare class Client extends EventEmitter {
      *
      * **Parameters**
      *
-     * | Name | Type | Description |
-     * | :--: | :--: | :---------: |
+     * |    Name    |   Type   |                    Description                     |
+     * | :--------: | :------: | :------------------------------------------------: |
      * | `duration` | `number` | Duration of the maintenance break in milliseconds. |
      * @public
      * @event
@@ -115,15 +143,21 @@ export declare class Client extends EventEmitter {
     private static maintenanceEnd;
     /** @internal */
     on<K extends keyof ClientEvents>(event: K, listeners: (...args: ClientEvents[K]) => void): this;
+    /** @internal */
+    on<S extends keyof CustomEvents>(event: Exclude<S, keyof ClientEvents>, listeners: (...args: CustomEvents[S]) => void): this;
     /** @internal */ on<S extends string | symbol>(event: Exclude<S, keyof ClientEvents>, listeners: (...args: any[]) => void): this;
     /** @internal */
     once<K extends keyof ClientEvents>(event: K, listeners: (...args: ClientEvents[K]) => void): this;
+    /** @internal */
+    once<S extends keyof CustomEvents>(event: Exclude<S, keyof ClientEvents>, listeners: (...args: CustomEvents[S]) => void): this;
     /** @internal */ once<S extends string | symbol>(event: Exclude<S, keyof ClientEvents>, listeners: (...args: any[]) => void): this;
     /** @internal */
     emit<K extends keyof ClientEvents>(event: K, ...args: ClientEvents[K]): boolean;
+    /** @internal */
+    emit<S extends keyof CustomEvents>(event: Exclude<S, keyof ClientEvents>, ...args: CustomEvents[S]): this;
     /** @internal */ emit<S extends string | symbol>(event: Exclude<S, keyof ClientEvents>, ...args: any[]): boolean;
 }
-export interface ClientEvents {
+interface ClientEvents {
     [EVENTS.NEW_SEASON_START]: [id: string];
     [EVENTS.MAINTENANCE_START]: [];
     [EVENTS.MAINTENANCE_END]: [duration: number];
@@ -135,13 +169,9 @@ export interface ClientEvents {
     [EVENTS.WAR_LOOP_END]: [];
     [EVENTS.ERROR]: [error: unknown];
 }
-export interface EventTypes {
-    CLAN: [oldClan: Clan, newClan: Clan];
-    PLAYER: [oldPlayer: Player, newPlayer: Player];
-    CLAN_WAR: [oldWar: ClanWar, newWar: ClanWar];
+interface CustomEvents {
+    [key: `clan${string}`]: [oldClan: Clan, newClan: Clan];
+    [key: `war${string}`]: [oldWar: ClanWar, newWar: ClanWar];
+    [key: `player${string}`]: [oldPlayer: Player, newPlayer: Player];
 }
-export declare const CWLRound: {
-    readonly PREVIOUS_WAR: "warEnded";
-    readonly CURRENT_WAR: "inWar";
-    readonly NEXT_WAR: "preparation";
-};
+export {};

package/dist/client/Client.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CWLRound = exports.Client = void 0;
+exports.Client = void 0;
 const Constants_1 = require("../util/Constants");
+const HTTPError_1 = require("../rest/HTTPError");
 const RESTManager_1 = require("../rest/RESTManager");
 const EventManager_1 = require("./EventManager");
-const HTTPError_1 = require("../rest/HTTPError");
 const events_1 = require("events");
 const Util_1 = require("../util/Util");
 const struct_1 = require("../struct");
@@ -25,6 +25,11 @@ class Client extends events_1.EventEmitter {
     get util() {
         return Util_1.Util;
     }
+    /** Whether the API is in maintenance break. */
+    get inMaintenance() {
+        // @ts-expect-error
+        return this.events._inMaintenance;
+    }
     /**
      * Initialize the client to create keys.
      * @example
@@ -62,30 +67,52 @@ class Client extends events_1.EventEmitter {
         const { data } = await this.rest.getClanWarLog(clanTag, options);
         return data.items.map((entry) => new struct_1.ClanWarLog(this, entry));
     }
-    /** Get info about currently running war (regular or friendly) in the clan. */
+    /** Get info about currently running war (normal or friendly) in the clan. */
     async getClanWar(clanTag, options) {
-        const { data, maxAge } = await this.rest.getCurrentWar(clanTag, options);
-        if (data.state === 'notInWar')
-            return null;
+        const { data, maxAge, path, status } = await this.rest.getCurrentWar(clanTag, options);
+        if (data.state === 'notInWar') {
+            throw new HTTPError_1.HTTPError(HTTPError_1.NotInWarError, status, path, maxAge);
+        }
         return new struct_1.ClanWar(this, data, { clanTag, maxAge });
     }
-    /** Get info about currently running war in the clan. */
+    /**
+     * Get info about currently running war in the clan.
+     * @example
+     * ```ts
+     * await client.getCurrentWar('#8QU8J9LP');
+     * ```
+     * @example
+     * ```ts
+     * await client.getCurrentWar({ clanTag: '#8QU8J9LP', round: 'PREVIOUS_ROUND' });
+     * ```
+     */
     async getCurrentWar(clanTag, options) {
+        const args = typeof clanTag === 'string' ? { clanTag } : { clanTag: clanTag.clanTag, round: clanTag.round };
         try {
-            const data = await this.getClanWar(clanTag, options);
-            return data ?? (await this.getLeagueWar(clanTag));
+            return await this.getClanWar(args.clanTag, options);
         }
         catch (e) {
-            if (e instanceof HTTPError_1.HTTPError && e.status === 403) {
-                return this.getLeagueWar(clanTag);
+            if (e instanceof HTTPError_1.HTTPError && [200, 403].includes(e.status)) {
+                return this.getLeagueWar({ clanTag: args.clanTag, round: args.round }, options);
             }
+            throw e;
         }
-        return null;
     }
-    /** Get info about currently running CWL round. */
-    async getLeagueWar(clanTag, warState) {
-        const state = (warState && exports.CWLRound[warState]) ?? 'inWar'; // eslint-disable-line
-        const data = await this.getClanWarLeagueGroup(clanTag);
+    /**
+     * Get info about currently running CWL round.
+     * @example
+     * ```ts
+     * await client.getLeagueWar('#8QU8J9LP');
+     * ```
+     * @example
+     * ```ts
+     * await client.getLeagueWar({ clanTag: '#8QU8J9LP', round: 'PREVIOUS_ROUND' });
+     * ```
+     */
+    async getLeagueWar(clanTag, options) {
+        const args = typeof clanTag === 'string' ? { clanTag } : { clanTag: clanTag.clanTag, round: clanTag.round };
+        const state = (args.round && Constants_1.CWL_ROUNDS[args.round]) ?? 'inWar'; // eslint-disable-line
+        const data = await this.getClanWarLeagueGroup(args.clanTag, options);
         const rounds = data.rounds.filter((round) => !round.warTags.includes('#0'));
         if (!rounds.length)
             return null;
@@ -95,29 +122,30 @@ class Client extends events_1.EventEmitter {
             .map((round) => round.warTags)
             .flat()
             .reverse();
-        const wars = await this.util.allSettled(warTags.map((warTag) => this.getClanWarLeagueRound({ warTag, clanTag }, { ignoreRateLimit: true })));
-        return wars.find((war) => war?.state === state) ?? wars.at(0) ?? null;
+        const wars = await this.util.allSettled(warTags.map((warTag) => this.getClanWarLeagueRound({ warTag, clanTag: args.clanTag }, { ...options, ignoreRateLimit: true })));
+        if (args.round && args.round in Constants_1.CWL_ROUNDS) {
+            return wars.find((war) => war.state === state) ?? null;
+        }
+        return wars.find((war) => war.state === state) ?? wars.at(0) ?? null;
     }
     async _getCurrentLeagueWars(clanTag, options) {
         const data = await this.getClanWarLeagueGroup(clanTag, options);
         // @ts-expect-error
-        return data._getCurrentWars(clanTag);
+        return data._getCurrentWars(clanTag, options);
     }
     async _getClanWars(clanTag, options) {
-        const date = new Date().getDate();
+        const date = new Date().getUTCDate();
+        if (!(date >= 1 && date <= 10)) {
+            return [await this.getClanWar(clanTag, options)];
+        }
         try {
-            const data = await this.getClanWar(clanTag, options);
-            if (!(date >= 1 && date <= 10))
-                return data ? [data] : [];
-            return data ? [data] : await this._getCurrentLeagueWars(clanTag);
+            return this._getCurrentLeagueWars(clanTag, options);
         }
         catch (e) {
-            if (!(date >= 1 && date <= 10))
-                return [];
-            if (e instanceof HTTPError_1.HTTPError && e.status === 403) {
-                return this._getCurrentLeagueWars(clanTag);
+            if (e instanceof HTTPError_1.HTTPError && [404].includes(e.status)) {
+                return [await this.getClanWar(clanTag, options)];
             }
-            return [];
+            throw e;
         }
     }
     /** Get information about clan war league. */
@@ -128,9 +156,10 @@ class Client extends events_1.EventEmitter {
     /** Get information about CWL round by WarTag. */
     async getClanWarLeagueRound(warTag, options) {
         const args = typeof warTag === 'string' ? { warTag } : { warTag: warTag.warTag, clanTag: warTag.clanTag };
-        const { data, maxAge } = await this.rest.getClanWarLeagueRound(args.warTag, options);
-        if (data.state === 'notInWar')
-            return null;
+        const { data, maxAge, status, path } = await this.rest.getClanWarLeagueRound(args.warTag, options);
+        if (data.state === 'notInWar') {
+            throw new HTTPError_1.HTTPError(HTTPError_1.NotInWarError, status, path, maxAge);
+        }
         return new struct_1.ClanWar(this, data, { warTag: args.warTag, clanTag: args.clanTag, maxAge });
     }
     /** Get information about a player by tag. */
@@ -206,8 +235,3 @@ class Client extends events_1.EventEmitter {
     }
 }
 exports.Client = Client;
-exports.CWLRound = {
-    PREVIOUS_WAR: 'warEnded',
-    CURRENT_WAR: 'inWar',
-    NEXT_WAR: 'preparation'
-};

package/dist/client/EventManager.d.ts

@@ -1,5 +1,6 @@
-import { EventTypes, Client } from './Client';
-/** Represents Event Manager of the {@link Client} class. */
+import { Clan, ClanWar, Player } from '../struct';
+import { Client } from './Client';
+/** Represents Event Manager of the {@link Client}. */
 export declare class EventManager {
     private readonly client;
     private readonly _clanTags;
@@ -13,25 +14,29 @@ export declare class EventManager {
     private _maintenanceStartTime;
     constructor(client: Client);
     /** Initialize the Event Manager to start pulling. */
-    init(): Promise<(string | symbol)[]>;
-    addClans(...tags: string[]): this;
-    deleteClans(...tags: string[]): this;
-    addPlayers(...tags: string[]): this;
-    deletePlayers(...tags: string[]): this;
-    addWars(...tags: string[]): this;
-    deleteWars(...tags: string[]): this;
+    init(): Promise<string[]>;
+    /** Add clan tags to clan events. */
+    addClans(tags: string[] | string): this;
+    /** Delete clan tags from clan events. */
+    deleteClans(tags: string[] | string): this;
+    /** Add player tags for player events. */
+    addPlayers(tags: string[] | string): this;
+    /** Delete player tags from player events. */
+    deletePlayers(tags: string[] | string): this;
+    /** Add clan tags for war events. */
+    addWars(tags: string[] | string): this;
+    /** Delete clan tags from war events. */
+    deleteWars(tags: string[] | string): this;
     /**
-     * Set your own custom event.
-     * @param event.type - `CLAN` | `PLAYER` | `CLAN_WAR`
-     * @param event.name - Name of the event.
-     * @param event.filter - Filter of this event. Must return a boolean value.
+     * Set your own custom clan event.
+     *
+     * In order to emit the custom event, you must have this filter function that returns a boolean.
      *
      * @example
      * ```js
-     * client.events.addClans(['#2PP', '']);
+     * client.events.addClans(['#2PP', '#8QU8J9LP']);
      *
-     * client.events.setEvent({
-     *   type: 'CLAN',
+     * client.events.setClanEvent({
      *   name: 'clanMemberUpdate',
      *   filter: (oldClan, newClan) => {
      *     return oldClan.memberCount !== newClan.memberCount;
@@ -40,14 +45,35 @@ export declare class EventManager {
      *
      * client.on('clanMemberUpdate', (oldClan, newClan) => {
      *   console.log(oldClan.memberCount, newClan.memberCount);
-     * })
+     * });
+     *
+     * (async function () {
+     *   await client.events.init();
+     * })();
      * ```
      * @returns
      */
-    setEvent<K extends keyof EventTypes>(event: {
-        type: K;
+    setClanEvent(event: {
+        name: string;
+        filter: (oldClan: Clan, newClan: Clan) => boolean;
+    }): this;
+    /**
+     * Set your own custom war event.
+     *
+     * In order to emit the custom event, you must have this filter function that returns a boolean.
+     */
+    setWarEvent(event: {
+        name: string;
+        filter: (oldWar: ClanWar, newWar: ClanWar) => boolean;
+    }): this;
+    /**
+     * Set your own custom player event.
+     *
+     * In order to emit the custom event, you must have this filter function that returns a boolean.
+     */
+    setPlayerEvent(event: {
         name: string;
-        filter: (...args: EventTypes[K]) => boolean;
+        filter: (oldPlayer: Player, newPlayer: Player) => boolean;
     }): this;
     private maintenanceHandler;
     private seasonEndHandler;

package/dist/client/EventManager.js

@@ -4,7 +4,7 @@ exports.EventManager = void 0;
 const HTTPError_1 = require("../rest/HTTPError");
 const Constants_1 = require("../util/Constants");
 const Util_1 = require("../util/Util");
-/** Represents Event Manager of the {@link Client} class. */
+/** Represents Event Manager of the {@link Client}. */
 class EventManager {
     constructor(client) {
         this.client = client;
@@ -31,54 +31,65 @@ class EventManager {
         this.warUpdateHandler();
         return Promise.resolve(this.client.eventNames());
     }
-    addClans(...tags) {
-        for (const tag of tags) {
+    /** Add clan tags to clan events. */
+    addClans(tags) {
+        for (const tag of Array.isArray(tags) ? tags : [tags]) {
             this._clanTags.add(this.client.util.parseTag(tag));
         }
         return this;
     }
-    deleteClans(...tags) {
-        for (const tag of tags) {
-            this._warTags.delete(this.client.util.parseTag(tag));
+    /** Delete clan tags from clan events. */
+    deleteClans(tags) {
+        for (const tag of Array.isArray(tags) ? tags : [tags]) {
+            const key = this.client.util.parseTag(tag);
+            this._clans.delete(key);
+            this._clanTags.delete(key);
         }
         return this;
     }
-    addPlayers(...tags) {
-        for (const tag of tags) {
+    /** Add player tags for player events. */
+    addPlayers(tags) {
+        for (const tag of Array.isArray(tags) ? tags : [tags]) {
             this._playerTags.add(this.client.util.parseTag(tag));
         }
         return this;
     }
-    deletePlayers(...tags) {
-        for (const tag of tags) {
-            this._warTags.delete(this.client.util.parseTag(tag));
+    /** Delete player tags from player events. */
+    deletePlayers(tags) {
+        for (const tag of Array.isArray(tags) ? tags : [tags]) {
+            const key = this.client.util.parseTag(tag);
+            this._players.delete(key);
+            this._playerTags.delete(key);
         }
         return this;
     }
-    addWars(...tags) {
-        for (const tag of tags) {
+    /** Add clan tags for war events. */
+    addWars(tags) {
+        for (const tag of Array.isArray(tags) ? tags : [tags]) {
             this._warTags.add(this.client.util.parseTag(tag));
         }
         return this;
     }
-    deleteWars(...tags) {
-        for (const tag of tags) {
-            this._warTags.delete(this.client.util.parseTag(tag));
+    /** Delete clan tags from war events. */
+    deleteWars(tags) {
+        for (const tag of Array.isArray(tags) ? tags : [tags]) {
+            const key = this.client.util.parseTag(tag);
+            this._wars.delete(`${key}:${1}`);
+            this._wars.delete(`${key}:${2}`);
+            this._warTags.delete(key);
         }
         return this;
     }
     /**
-     * Set your own custom event.
-     * @param event.type - `CLAN` | `PLAYER` | `CLAN_WAR`
-     * @param event.name - Name of the event.
-     * @param event.filter - Filter of this event. Must return a boolean value.
+     * Set your own custom clan event.
+     *
+     * In order to emit the custom event, you must have this filter function that returns a boolean.
      *
      * @example
      * ```js
-     * client.events.addClans(['#2PP', '']);
+     * client.events.addClans(['#2PP', '#8QU8J9LP']);
      *
-     * client.events.setEvent({
-     *   type: 'CLAN',
+     * client.events.setClanEvent({
      *   name: 'clanMemberUpdate',
      *   filter: (oldClan, newClan) => {
      *     return oldClan.memberCount !== newClan.memberCount;
@@ -87,27 +98,46 @@ class EventManager {
      *
      * client.on('clanMemberUpdate', (oldClan, newClan) => {
      *   console.log(oldClan.memberCount, newClan.memberCount);
-     * })
+     * });
+     *
+     * (async function () {
+     *   await client.events.init();
+     * })();
      * ```
      * @returns
      */
-    setEvent(event) {
-        switch (event.type) {
-            case 'CLAN':
-                // @ts-expect-error
-                this._events.clans.push(event);
-                break;
-            case 'PLAYER':
-                // @ts-expect-error
-                this._events.players.push(event);
-                break;
-            case 'CLAN_WAR':
-                // @ts-expect-error
-                this._events.wars.push(event);
-                break;
-            default:
-                break;
-        }
+    setClanEvent(event) {
+        if (!event.name)
+            throw new Error('Event name is required.');
+        if (typeof event.filter !== 'function')
+            throw new Error('Filter function is required.');
+        this._events.clans.push(event);
+        return this;
+    }
+    /**
+     * Set your own custom war event.
+     *
+     * In order to emit the custom event, you must have this filter function that returns a boolean.
+     */
+    setWarEvent(event) {
+        if (!event.name)
+            throw new Error('Event name is required.');
+        if (typeof event.filter !== 'function')
+            throw new Error('Filter function is required.');
+        this._events.wars.push(event);
+        return this;
+    }
+    /**
+     * Set your own custom player event.
+     *
+     * In order to emit the custom event, you must have this filter function that returns a boolean.
+     */
+    setPlayerEvent(event) {
+        if (!event.name)
+            throw new Error('Event name is required.');
+        if (typeof event.filter !== 'function')
+            throw new Error('Filter function is required.');
+        this._events.players.push(event);
         return this;
     }
     async maintenanceHandler() {
@@ -116,7 +146,7 @@ class EventManager {
             const res = await this.client.rest.getClans({ maxMembers: Math.floor(Math.random() * 40) + 10, limit: 1 });
             if (res.status === 200 && this._inMaintenance) {
                 this._inMaintenance = Boolean(false);
-                const duration = this._maintenanceStartTime.getTime() - Date.now();
+                const duration = Date.now() - this._maintenanceStartTime.getTime();
                 this._maintenanceStartTime = null;
                 this.client.emit(Constants_1.EVENTS.MAINTENANCE_END, duration);
             }
@@ -153,7 +183,7 @@ class EventManager {
         for (const tag of this._playerTags)
             await this.runPlayerUpdate(tag);
         this.client.emit(Constants_1.EVENTS.PLAYER_LOOP_END);
-        setTimeout(this.playerUpdateHandler.bind(this), 100000);
+        setTimeout(this.playerUpdateHandler.bind(this), 10000);
     }
     async warUpdateHandler() {
         this.client.emit(Constants_1.EVENTS.WAR_LOOP_START);
@@ -171,9 +201,9 @@ class EventManager {
         const cached = this._clans.get(clan.tag);
         if (!cached)
             return this._clans.set(clan.tag, clan);
-        for (const { name, fn } of this._events.clans) {
+        for (const { name, filter } of this._events.clans) {
             try {
-                if (!fn(cached, clan))
+                if (!filter(cached, clan))
                     continue;
                 this.client.emit(name, cached, clan);
             }
@@ -192,9 +222,9 @@ class EventManager {
         const cached = this._players.get(player.tag);
         if (!cached)
             return this._players.set(player.tag, player);
-        for (const { name, fn } of this._events.players) {
+        for (const { name, filter } of this._events.players) {
             try {
-                if (!fn(cached, player))
+                if (!filter(cached, player))
                     continue;
                 this.client.emit(name, cached, player);
             }
@@ -211,14 +241,14 @@ class EventManager {
         const clanWars = await this.client._getClanWars(tag).catch(() => null);
         if (!clanWars?.length)
             return null;
-        clanWars.forEach((war, i) => {
-            const key = `WAR:${i}:${tag}`;
+        clanWars.forEach(async (war, index) => {
+            const key = `${tag}:${index}`;
             const cached = this._wars.get(key);
             if (!cached)
                 return this._wars.set(key, war);
-            for (const { name, fn } of this._events.wars) {
+            for (const { name, filter } of this._events.wars) {
                 try {
-                    if (!fn(cached, war))
+                    if (!filter(cached, war))
                         continue;
                     this.client.emit(name, cached, war);
                 }
@@ -226,6 +256,22 @@ class EventManager {
                     this.client.emit(Constants_1.EVENTS.ERROR, error);
                 }
             }
+            // check for war end
+            if (index === 1 && cached.warTag !== war.warTag) {
+                const data = await this.client.getLeagueWar({ clanTag: tag, round: 'PREVIOUS_ROUND' }).catch(() => null);
+                if (data && data.warTag === cached.warTag) {
+                    for (const { name, filter } of this._events.wars) {
+                        try {
+                            if (!filter(cached, data))
+                                continue;
+                            this.client.emit(name, cached, data);
+                        }
+                        catch (error) {
+                            this.client.emit(Constants_1.EVENTS.ERROR, error);
+                        }
+                    }
+                }
+            }
             return this._wars.set(key, war);
         });
     }