clashofclans.js 2.0.0-dev.0a8e422 → 2.0.0-dev.75d755c

package/README.md

@@ -44,7 +44,7 @@ const client = new Client({
     throttler: new BatchThrottler(30)
 });
 
-client.events.addClans(['#8P2QG08P']);
+client.events.addClans(['#8QU8J9LP', '#8P2QG08P']);
 client.events.setClanEvent({
     name: 'clanDescriptionChange',
     filter: (oldClan, newClan) => {

package/dist/client/Client.d.ts

@@ -155,8 +155,7 @@ export declare class Client extends EventEmitter {
     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;
 }
-/** Client events that can be emitted by the client. */
-export interface ClientEvents {
+interface ClientEvents {
     [EVENTS.NEW_SEASON_START]: [id: string];
     [EVENTS.MAINTENANCE_START]: [];
     [EVENTS.MAINTENANCE_END]: [duration: number];
@@ -168,13 +167,9 @@ export interface ClientEvents {
     [EVENTS.WAR_LOOP_END]: [];
     [EVENTS.ERROR]: [error: unknown];
 }
-/**
- * Custom events that can be emitted by the client.
- *
- * TypeScript 4.5 now can narrow values that have template string types, and also recognizes template string types as discriminants.
- */
-export interface CustomEvents {
+interface CustomEvents {
     [key: `clan${string}`]: [oldClan: Clan, newClan: Clan];
-    [key: `player${string}`]: [oldClan: Player, newClan: Player];
-    [key: `war${string}`]: [oldClan: ClanWar, newClan: ClanWar];
+    [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;
@@ -15,18 +15,18 @@ export declare class EventManager {
     constructor(client: Client);
     /** Initialize the Event Manager to start pulling. */
     init(): Promise<string[]>;
-    /** Add a clan tag to clan events. */
-    addClans(...tags: string[]): this;
-    /** Delete a clan tag from clan events. */
-    deleteClans(...tags: string[]): this;
-    /** Add a player tag for player events. */
-    addPlayers(...tags: string[]): this;
-    /** Delete a player tag from player events. */
-    deletePlayers(...tags: string[]): this;
-    /** Add a clan tag for war events. */
-    addWars(...tags: string[]): this;
-    /** Delete a clan tag from war events. */
-    deleteWars(...tags: string[]): this;
+    /** 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 clan event.
      *

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,45 +31,52 @@ class EventManager {
         this.warUpdateHandler();
         return Promise.resolve(this.client.eventNames());
     }
-    /** Add a clan tag to clan events. */
-    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;
     }
-    /** Delete a clan tag from clan events. */
-    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;
     }
-    /** Add a player tag for player events. */
-    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;
     }
-    /** Delete a player tag from player events. */
-    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;
     }
-    /** Add a clan tag for war events. */
-    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;
     }
-    /** Delete a clan tag from war events. */
-    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;
     }
@@ -100,7 +107,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 +116,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 +125,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 +171,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 +189,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 +210,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 +229,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 +244,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.d.ts

@@ -11,9 +11,9 @@ export declare class RequestHandler {
     private keys;
     private readonly baseURL;
     private readonly retryLimit;
-    private readonly cached;
     private readonly restRequestTimeout;
     private readonly throttler?;
+    private readonly cached;
     constructor(options?: ClientOptions);
     private get _keys();
     private get _key();

package/dist/rest/RequestHandler.js

@@ -51,7 +51,7 @@ class RequestHandler {
     async request(path, options = {}) {
         const cached = (await this.cached?.get(path)) ?? null;
         if (cached && options.force !== true)
-            return { data: cached, maxAge: 0, status: 200, path };
+            return { data: cached.data, maxAge: cached.ttl - Date.now(), status: 200, path };
         if (!this.throttler || options.ignoreRateLimit)
             return this.exec(path, options);
         await this.throttler.wait();
@@ -79,11 +79,12 @@ 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)
-            await this.cached.set(path, data, maxAge);
+        if (this.cached && maxAge > 0 && options.cache !== false) {
+            await this.cached.set(path, { data, ttl: Date.now() + maxAge }, maxAge);
+        }
         return { data, maxAge, status: res.status, path };
     }
     async init(options) {

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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "clashofclans.js",
-	"version": "2.0.0-dev.0a8e422",
+	"version": "2.0.0-dev.75d755c",
 	"description": "JavaScript library for interacting with the Clash of Clans API",
 	"author": "SUVAJIT <suvajit.me@gmail.com>",
 	"license": "MIT",