clashofclans.js 2.0.0-dev.86dfaef → 2.0.0-dev.dedb83d

package/dist/client/Client.d.ts

@@ -141,15 +141,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];
@@ -161,3 +167,9 @@ export interface ClientEvents {
     [EVENTS.WAR_LOOP_END]: [];
     [EVENTS.ERROR]: [error: unknown];
 }
+interface CustomEvents {
+    [key: `clan${string}`]: [oldClan: Clan, newClan: Clan];
+    [key: `war${string}`]: [oldWar: ClanWar, newWar: ClanWar];
+    [key: `player${string}`]: [oldPlayer: Player, newPlayer: Player];
+}
+export {};

package/dist/client/Client.js

@@ -66,7 +66,7 @@ class Client extends events_1.EventEmitter {
     async getClanWar(clanTag, options) {
         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);
+            throw new HTTPError_1.HTTPError(HTTPError_1.NotInWarError, status, path, maxAge);
         }
         return new struct_1.ClanWar(this, data, { clanTag, maxAge });
     }
@@ -87,11 +87,11 @@ class Client extends events_1.EventEmitter {
             return await this.getClanWar(args.clanTag, options);
         }
         catch (e) {
-            if (e instanceof HTTPError_1.HTTPError && e.status === 403) {
+            if (e instanceof HTTPError_1.HTTPError && [200, 403].includes(e.status)) {
                 return this.getLeagueWar({ clanTag: args.clanTag, round: args.round });
             }
+            throw e;
         }
-        return null;
     }
     /**
      * Get info about currently running CWL round.
@@ -129,17 +129,18 @@ class Client extends events_1.EventEmitter {
         return data._getCurrentWars(clanTag);
     }
     async _getClanWars(clanTag, options) {
-        const date = new Date().getDate();
-        try {
+        const date = new Date().getUTCDate();
+        if (!(date >= 1 && date <= 10)) {
             return [await this.getClanWar(clanTag, options)];
         }
+        try {
+            return this._getCurrentLeagueWars(clanTag);
+        }
         catch (e) {
-            if (!(date >= 1 && date <= 10))
-                return [];
-            if (e instanceof HTTPError_1.HTTPError && [200, 403].includes(e.status)) {
-                return this._getCurrentLeagueWars(clanTag);
+            if (e instanceof HTTPError_1.HTTPError && [404].includes(e.status)) {
+                return [await this.getClanWar(clanTag)];
             }
-            return [];
+            throw e;
         }
     }
     /** Get information about clan war league. */
@@ -152,7 +153,7 @@ class Client extends events_1.EventEmitter {
         const args = typeof warTag === 'string' ? { warTag } : { warTag: warTag.warTag, clanTag: warTag.clanTag };
         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);
+            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 });
     }

package/dist/client/EventManager.d.ts

@@ -1,6 +1,6 @@
 import { Clan, ClanWar, Player } from '../struct';
 import { Client } from './Client';
-/** Represents Event Manager of the {@link Client} class. */
+/** Represents Event Manager of the {@link Client}. */
 export declare class EventManager {
     private readonly client;
     private readonly _clanTags;

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;
@@ -100,7 +100,7 @@ class EventManager {
      * @returns
      */
     setClanEvent(event) {
-        this._events.clans.push({ name: event.name, fn: event.filter });
+        this._events.clans.push(event);
         return this;
     }
     /**
@@ -109,7 +109,7 @@ class EventManager {
      * In order to emit the custom event, you must have this filter function that returns a boolean.
      */
     setWarEvent(event) {
-        this._events.wars.push({ name: event.name, fn: event.filter });
+        this._events.wars.push(event);
         return this;
     }
     /**
@@ -118,7 +118,7 @@ class EventManager {
      * In order to emit the custom event, you must have this filter function that returns a boolean.
      */
     setPlayerEvent(event) {
-        this._events.players.push({ name: event.name, fn: event.filter });
+        this._events.players.push(event);
         return this;
     }
     async maintenanceHandler() {
@@ -164,7 +164,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);
@@ -182,9 +182,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);
             }
@@ -203,9 +203,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);
             }
@@ -222,14 +222,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, state) => {
+            const key = `${tag}:${state}`;
             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);
                 }
@@ -237,6 +237,22 @@ class EventManager {
                     this.client.emit(Constants_1.EVENTS.ERROR, error);
                 }
             }
+            // check for war end
+            if (state === 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);
         });
     }

package/dist/rest/HTTPError.d.ts

@@ -16,11 +16,11 @@ export declare class HTTPError extends Error {
     maxAge: number;
     constructor(error: any, status: number, path: string, maxAge: number, method?: string);
 }
-export declare const notInWarError: {
+export declare const NotInWarError: {
     message: string;
     reason: string;
 };
-export declare const privateWarLogError: {
+export declare const PrivateWarLogError: {
     message: string;
     reason: string;
 };

package/dist/rest/HTTPError.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.privateWarLogError = exports.notInWarError = exports.HTTPError = void 0;
+exports.PrivateWarLogError = exports.NotInWarError = exports.HTTPError = void 0;
 const messages = {
     500: 'Unknown error happened when handling the request.',
     504: 'The user aborted this request.',
@@ -34,11 +34,11 @@ class HTTPError extends Error {
     }
 }
 exports.HTTPError = HTTPError;
-exports.notInWarError = {
+exports.NotInWarError = {
     message: 'Clan is not in war at this moment.',
     reason: 'notInWar'
 };
-exports.privateWarLogError = {
+exports.PrivateWarLogError = {
     message: 'Access denied, clan war log is private.',
     reason: 'privateWarLog'
 };

package/dist/rest/RequestHandler.js

@@ -79,7 +79,7 @@ class RequestHandler {
         }
         const maxAge = Number(res?.headers.get('cache-control')?.split('=')?.[1] ?? 0) * 1000;
         if (res?.status === 403 && !data?.message)
-            throw new HTTPError_1.HTTPError(HTTPError_1.privateWarLogError, res.status, path, maxAge);
+            throw new HTTPError_1.HTTPError(HTTPError_1.PrivateWarLogError, res.status, path, maxAge);
         if (!res?.ok)
             throw new HTTPError_1.HTTPError(data, res?.status ?? 504, path, maxAge, options.method);
         if (this.cached && maxAge > 0 && options.cache !== false)

package/dist/struct/ClanWarLeagueGroup.js

@@ -68,7 +68,8 @@ class ClanWarLeagueGroup {
         const warTags = rounds
             .slice(-2)
             .map((round) => round.warTags)
-            .flat();
+            .flat()
+            .reverse();
         const wars = await Promise.allSettled(warTags.map((warTag) => this.client.getClanWarLeagueRound({ warTag, clanTag }, { ignoreRateLimit: true })));
         return wars
             .filter((res) => res.status === 'fulfilled')

package/dist/util/Util.js

@@ -18,6 +18,8 @@ class Util extends null {
     /** Get URL search params. */
     static queryString(options = {}) {
         const query = new URLSearchParams(options);
+        for (const key of ['cache', 'force', 'retryLimit', 'ignoreRateLimit', 'restRequestTimeout'])
+            query.delete(key);
         return query.toString();
     }
     static getSeasonEnd(month, autoFix = true) {
@@ -41,7 +43,7 @@ class Util extends null {
     }
     static async allSettled(values) {
         return (await Promise.allSettled(values))
-            .filter((res) => res.status === 'fulfilled' && res.value)
+            .filter((res) => res.status === 'fulfilled')
             .map((res) => res.value);
     }
     static async delay(ms) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "clashofclans.js",
-	"version": "2.0.0-dev.86dfaef",
+	"version": "2.0.0-dev.dedb83d",
 	"description": "JavaScript library for interacting with the Clash of Clans API",
 	"author": "SUVAJIT <suvajit.me@gmail.com>",
 	"license": "MIT",
@@ -95,15 +95,15 @@
 		"@types/keyv": "^3.1.3",
 		"@types/node": "^16.10.3",
 		"@types/node-fetch": "^2.5.12",
-		"@typescript-eslint/eslint-plugin": "^5.0.0",
-		"@typescript-eslint/parser": "^5.0.0",
-		"eslint": "^7.28.0",
+		"@typescript-eslint/eslint-plugin": "^5.4.0",
+		"@typescript-eslint/parser": "^5.4.0",
+		"eslint": "^8.3.0",
 		"eslint-config-marine": "^9.0.6",
 		"eslint-config-prettier": "^8.3.0",
 		"eslint-plugin-prettier": "^4.0.0",
 		"prettier": "^2.4.1",
 		"rimraf": "^3.0.2",
-		"typescript": "^4.4.3"
+		"typescript": "^4.5.2"
 	},
 	"engines": {
 		"node": ">=14.x"