clashofclans.js 2.7.0-dev.a33ae73 → 2.8.0-dev.53b06d3

package/CHANGELOG.md

@@ -2,11 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## 2.8.0 (2022-07-22)
+
+### Features
+
+-   Better Throttler with JS generator function. ([#111](https://github.com/clashperk/clashofclans.js/pull/111))
+-   Updated raw data from game files. ([#111](https://github.com/clashperk/clashofclans.js/pull/111))
+-   New method Util#parseArmyLink has been added. ([#110](https://github.com/clashperk/clashofclans.js/pull/110))
+
 ## 2.7.0 (2022-05-22)
 
 ### Features
 
-- Some useful QOL methods have been added. ([#106](https://github.com/clashperk/clashofclans.js/pull/106))
+-   Some useful QOL methods have been added. ([#106](https://github.com/clashperk/clashofclans.js/pull/106))
 
 ## 2.6.1 (2022-02-03)
 

package/dist/client/Client.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { ClanSearchOptions, SearchOptions, ClientOptions, LoginOptions, OverrideOptions } from '../types';
-import { EVENTS, CWL_ROUNDS } from '../util/Constants';
+import { Events, CWLRounds } from '../util/Constants';
 import { RESTManager } from '../rest/RESTManager';
 import { EventManager } from './EventManager';
 import { EventEmitter } from 'events';
@@ -15,9 +15,9 @@ import { Clan, ClanMember, ClanWar, ClanWarLog, League, Location, Player, WarLea
  */
 export declare class Client extends EventEmitter {
     /** Event Manager for the client. */
-    readonly events: EventManager;
+    events: EventManager;
     /** REST Handler of the client. */
-    readonly rest: RESTManager;
+    rest: RESTManager;
     constructor(options?: ClientOptions);
     /** Contains various general-purpose utility methods. */
     get util(): typeof Util;
@@ -57,7 +57,7 @@ export declare class Client extends EventEmitter {
      */
     getCurrentWar(clanTag: string | {
         clanTag: string;
-        round?: keyof typeof CWL_ROUNDS;
+        round?: keyof typeof CWLRounds;
     }, options?: OverrideOptions): Promise<ClanWar | null>;
     /**
      * Get info about currently running CWL round.
@@ -72,10 +72,12 @@ export declare class Client extends EventEmitter {
      */
     getLeagueWar(clanTag: string | {
         clanTag: string;
-        round?: keyof typeof CWL_ROUNDS;
+        round?: keyof typeof CWLRounds;
     }, options?: OverrideOptions): Promise<ClanWar | null>;
-    private _getCurrentLeagueWars;
-    private _getClanWars;
+    /** Returns active wars (last 2) of the CWL group. */
+    getLeagueWars(clanTag: string, options?: OverrideOptions): Promise<ClanWar[]>;
+    /** Returns active wars (last 2 for CWL) of the clan. */
+    getWars(clanTag: string, options?: OverrideOptions): Promise<ClanWar[]>;
     /** Get info about clan war league. */
     getClanWarLeagueGroup(clanTag: string, options?: OverrideOptions): Promise<ClanWarLeagueGroup>;
     /** Get info about a CWL round by WarTag. */
@@ -176,16 +178,17 @@ export declare class Client extends EventEmitter {
     /** @internal */ emit<S extends string | symbol>(event: Exclude<S, keyof ClientEvents>, ...args: any[]): boolean;
 }
 interface ClientEvents {
-    [EVENTS.NEW_SEASON_START]: [id: string];
-    [EVENTS.MAINTENANCE_START]: [];
-    [EVENTS.MAINTENANCE_END]: [duration: number];
-    [EVENTS.CLAN_LOOP_START]: [];
-    [EVENTS.CLAN_LOOP_END]: [];
-    [EVENTS.PLAYER_LOOP_START]: [];
-    [EVENTS.PLAYER_LOOP_END]: [];
-    [EVENTS.WAR_LOOP_START]: [];
-    [EVENTS.WAR_LOOP_END]: [];
-    [EVENTS.ERROR]: [error: unknown];
+    [Events.NewSeasonStart]: [id: string];
+    [Events.MaintenanceStart]: [];
+    [Events.MaintenanceEnd]: [duration: number];
+    [Events.ClanLoopStart]: [];
+    [Events.ClanLoopEnd]: [];
+    [Events.PlayerLoopStart]: [];
+    [Events.PlayerLoopEnd]: [];
+    [Events.WarLoopStart]: [];
+    [Events.WarLoopEnd]: [];
+    [Events.Error]: [error: unknown];
+    [Events.Debug]: [path: string, status: string, message: string];
 }
 interface CustomEvents {
     [key: `clan${string}`]: [oldClan: Clan, newClan: Clan];

package/dist/client/Client.js

@@ -116,7 +116,7 @@ class Client extends events_1.EventEmitter {
      */
     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 state = (args.round && Constants_1.CWLRounds[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)
@@ -128,23 +128,24 @@ class Client extends events_1.EventEmitter {
             .flat()
             .reverse();
         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;
+        if (args.round && args.round in Constants_1.CWLRounds) {
+            return wars.find((war) => war.clan.tag === args.clanTag && war.state === state) ?? null;
         }
-        return wars.find((war) => war.state === state) ?? wars.at(0) ?? null;
+        return wars.find((war) => war.clan.tag === args.clanTag && war.state === state) ?? wars.at(0) ?? null;
     }
-    async _getCurrentLeagueWars(clanTag, options) {
+    /** Returns active wars (last 2) of the CWL group. */
+    async getLeagueWars(clanTag, options) {
         const data = await this.getClanWarLeagueGroup(clanTag, options);
-        // @ts-expect-error
-        return data._getCurrentWars(clanTag, options);
+        return data.getCurrentWars(clanTag, options);
     }
-    async _getClanWars(clanTag, options) {
+    /** Returns active wars (last 2 for CWL) of the clan. */
+    async getWars(clanTag, options) {
         const date = new Date().getUTCDate();
         if (!(date >= 1 && date <= 10)) {
             return [await this.getClanWar(clanTag, options)];
         }
         try {
-            return this._getCurrentLeagueWars(clanTag, options);
+            return this.getLeagueWars(clanTag, options);
         }
         catch (e) {
             if (e instanceof HTTPError_1.HTTPError && [404].includes(e.status)) {
@@ -193,12 +194,12 @@ class Client extends events_1.EventEmitter {
     }
     /** Get Legend League season Ids. */
     async getLeagueSeasons(options) {
-        const { data } = await this.rest.getLeagueSeasons(Constants_1.LEGEND_LEAGUE_ID, options);
+        const { data } = await this.rest.getLeagueSeasons(Constants_1.LegendLeagueId, options);
         return data.items.map((league) => league.id);
     }
     /** Get Legend League season rankings by season Id. */
     async getSeasonRankings(seasonId, options) {
-        const { data } = await this.rest.getSeasonRankings(Constants_1.LEGEND_LEAGUE_ID, seasonId, options);
+        const { data } = await this.rest.getSeasonRankings(Constants_1.LegendLeagueId, seasonId, options);
         return data.items.map((entry) => new struct_1.SeasonRankedPlayer(this, entry));
     }
     /** Get list of Clan War Leagues. */

package/dist/client/EventManager.js

@@ -148,14 +148,14 @@ class EventManager {
                 this._inMaintenance = Boolean(false);
                 const duration = Date.now() - this._maintenanceStartTime.getTime();
                 this._maintenanceStartTime = null;
-                this.client.emit(Constants_1.EVENTS.MAINTENANCE_END, duration);
+                this.client.emit(Constants_1.Events.MaintenanceEnd, duration);
             }
         }
         catch (error) {
             if (error instanceof HTTPError_1.HTTPError && error.status === 503 && !this._inMaintenance) {
                 this._inMaintenance = Boolean(true);
                 this._maintenanceStartTime = new Date();
-                this.client.emit(Constants_1.EVENTS.MAINTENANCE_START);
+                this.client.emit(Constants_1.Events.MaintenanceStart);
             }
         }
     }
@@ -167,29 +167,29 @@ class EventManager {
         }
         else if (end > 0) {
             setTimeout(() => {
-                this.client.emit(Constants_1.EVENTS.NEW_SEASON_START, Util_1.Util.getSeasonId());
+                this.client.emit(Constants_1.Events.NewSeasonStart, Util_1.Util.getSeasonId());
             }, end + 100).unref();
         }
     }
     async clanUpdateHandler() {
-        this.client.emit(Constants_1.EVENTS.CLAN_LOOP_START);
+        this.client.emit(Constants_1.Events.ClanLoopStart);
         for (const tag of this._clanTags)
             await this.runClanUpdate(tag);
-        this.client.emit(Constants_1.EVENTS.CLAN_LOOP_END);
+        this.client.emit(Constants_1.Events.ClanLoopEnd);
         setTimeout(this.clanUpdateHandler.bind(this), 10000);
     }
     async playerUpdateHandler() {
-        this.client.emit(Constants_1.EVENTS.PLAYER_LOOP_START);
+        this.client.emit(Constants_1.Events.PlayerLoopStart);
         for (const tag of this._playerTags)
             await this.runPlayerUpdate(tag);
-        this.client.emit(Constants_1.EVENTS.PLAYER_LOOP_END);
+        this.client.emit(Constants_1.Events.PlayerLoopEnd);
         setTimeout(this.playerUpdateHandler.bind(this), 10000);
     }
     async warUpdateHandler() {
-        this.client.emit(Constants_1.EVENTS.WAR_LOOP_START);
+        this.client.emit(Constants_1.Events.WarLoopStart);
         for (const tag of this._warTags)
             await this.runWarUpdate(tag);
-        this.client.emit(Constants_1.EVENTS.WAR_LOOP_END);
+        this.client.emit(Constants_1.Events.WarLoopEnd);
         setTimeout(this.warUpdateHandler.bind(this), 10000);
     }
     async runClanUpdate(tag) {
@@ -208,7 +208,7 @@ class EventManager {
                 this.client.emit(name, cached, clan);
             }
             catch (error) {
-                this.client.emit(Constants_1.EVENTS.ERROR, error);
+                this.client.emit(Constants_1.Events.Error, error);
             }
         }
         return this._clans.set(clan.tag, clan);
@@ -229,7 +229,7 @@ class EventManager {
                 this.client.emit(name, cached, player);
             }
             catch (error) {
-                this.client.emit(Constants_1.EVENTS.ERROR, error);
+                this.client.emit(Constants_1.Events.Error, error);
             }
         }
         return this._players.set(player.tag, player);
@@ -237,8 +237,7 @@ class EventManager {
     async runWarUpdate(tag) {
         if (this._inMaintenance)
             return null;
-        // @ts-expect-error
-        const clanWars = await this.client._getClanWars(tag).catch(() => null);
+        const clanWars = await this.client.getWars(tag).catch(() => null);
         if (!clanWars?.length)
             return null;
         clanWars.forEach(async (war, index) => {
@@ -253,12 +252,12 @@ class EventManager {
                     this.client.emit(name, cached, war);
                 }
                 catch (error) {
-                    this.client.emit(Constants_1.EVENTS.ERROR, error);
+                    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);
+                const data = await this.client.getLeagueWar({ clanTag: tag, round: 'PreviousRound' }).catch(() => null);
                 if (data && data.warTag === cached.warTag) {
                     for (const { name, filter } of this._events.wars) {
                         try {
@@ -267,7 +266,7 @@ class EventManager {
                             this.client.emit(name, cached, data);
                         }
                         catch (error) {
-                            this.client.emit(Constants_1.EVENTS.ERROR, error);
+                            this.client.emit(Constants_1.Events.Error, error);
                         }
                     }
                 }

package/dist/index.mjs

@@ -1,12 +1,12 @@
 import mod from "./index.js";
 
 export default mod;
-export const API_BASE_URL = mod.API_BASE_URL;
+export const APIBaseURL = mod.APIBaseURL;
 export const Achievement = mod.Achievement;
-export const BUILDER_TROOPS = mod.BUILDER_TROOPS;
 export const Badge = mod.Badge;
 export const BatchThrottler = mod.BatchThrottler;
-export const CWL_ROUNDS = mod.CWL_ROUNDS;
+export const BuilderTroops = mod.BuilderTroops;
+export const CWLRounds = mod.CWLRounds;
 export const CacheStore = mod.CacheStore;
 export const ChatLanguage = mod.ChatLanguage;
 export const Clan = mod.Clan;
@@ -20,25 +20,25 @@ export const ClanWarLeagueRound = mod.ClanWarLeagueRound;
 export const ClanWarLog = mod.ClanWarLog;
 export const ClanWarMember = mod.ClanWarMember;
 export const Client = mod.Client;
-export const DARK_ELIXIR_SPELLS = mod.DARK_ELIXIR_SPELLS;
-export const DARK_ELIXIR_TROOPS = mod.DARK_ELIXIR_TROOPS;
-export const DEV_SITE_API_BASE_URL = mod.DEV_SITE_API_BASE_URL;
-export const ELIXIR_SPELLS = mod.ELIXIR_SPELLS;
-export const ELIXIR_TROOPS = mod.ELIXIR_TROOPS;
-export const EVENTS = mod.EVENTS;
+export const DarkElixirSpells = mod.DarkElixirSpells;
+export const DarkElixirTroops = mod.DarkElixirTroops;
+export const DevSiteAPIBaseURL = mod.DevSiteAPIBaseURL;
+export const ElixirSpells = mod.ElixirSpells;
+export const ElixirTroops = mod.ElixirTroops;
 export const EventManager = mod.EventManager;
-export const FRIENDLY_WAR_PREPARATION_TIMES = mod.FRIENDLY_WAR_PREPARATION_TIMES;
+export const Events = mod.Events;
+export const FriendlyWarPreparationTimes = mod.FriendlyWarPreparationTimes;
 export const GoldPassSeason = mod.GoldPassSeason;
-export const HEROES = mod.HEROES;
-export const HERO_PETS = mod.HERO_PETS;
-export const HOME_TROOPS = mod.HOME_TROOPS;
 export const HTTPError = mod.HTTPError;
 export const Hero = mod.Hero;
+export const HeroPets = mod.HeroPets;
+export const Heroes = mod.Heroes;
+export const HomeTroops = mod.HomeTroops;
 export const Icon = mod.Icon;
-export const LEAGUES = mod.LEAGUES;
-export const LEGEND_LEAGUE_ID = mod.LEGEND_LEAGUE_ID;
 export const Label = mod.Label;
 export const League = mod.League;
+export const Leagues = mod.Leagues;
+export const LegendLeagueId = mod.LegendLeagueId;
 export const LegendStatistics = mod.LegendStatistics;
 export const Location = mod.Location;
 export const NotInWarError = mod.NotInWarError;
@@ -49,18 +49,19 @@ export const QueueThrottler = mod.QueueThrottler;
 export const RESTManager = mod.RESTManager;
 export const RankedClan = mod.RankedClan;
 export const RankedPlayer = mod.RankedPlayer;
+export const RawData = mod.RawData;
 export const RequestHandler = mod.RequestHandler;
-export const SIEGE_MACHINES = mod.SIEGE_MACHINES;
-export const SPELLS = mod.SPELLS;
-export const SUPER_TROOPS = mod.SUPER_TROOPS;
 export const Season = mod.Season;
 export const SeasonRankedPlayer = mod.SeasonRankedPlayer;
+export const SiegeMachines = mod.SiegeMachines;
 export const Spell = mod.Spell;
+export const Spells = mod.Spells;
+export const SuperTroops = mod.SuperTroops;
 export const Troop = mod.Troop;
-export const UNRANKED_LEAGUE_DATA = mod.UNRANKED_LEAGUE_DATA;
 export const Unit = mod.Unit;
+export const UnrankedLeagueData = mod.UnrankedLeagueData;
 export const Util = mod.Util;
-export const WAR_LEAGUES = mod.WAR_LEAGUES;
 export const WarClan = mod.WarClan;
 export const WarLeague = mod.WarLeague;
+export const WarLeagues = mod.WarLeagues;
 export const WarLogClan = mod.WarLogClan;

package/dist/rest/RESTManager.d.ts

@@ -4,7 +4,7 @@ import { APIClan, APIClanList, APIClanMemberList, APIClanRankingList, APIClanVer
 /** Represents a REST Manager of the client. */
 export declare class RESTManager {
     /** Request Handler for the RESTManager. */
-    readonly handler: RequestHandler;
+    handler: RequestHandler;
     constructor(options?: RESTOptions);
     /** Contains various general-purpose utility methods. */
     get util(): typeof Util;

package/dist/rest/RequestHandler.d.ts

@@ -1,4 +1,4 @@
-import { RESTOptions, Response, RequestOptions, LoginOptions } from '../types';
+import { Response, RequestOptions, LoginOptions, RequestHandlerOptions } from '../types';
 /** Represents a Request Handler. */
 export declare class RequestHandler {
     #private;
@@ -14,7 +14,7 @@ export declare class RequestHandler {
     private readonly restRequestTimeout;
     private readonly throttler?;
     private readonly cached;
-    constructor(options?: RESTOptions);
+    constructor(options?: RequestHandlerOptions);
     private get _keys();
     private get _key();
     setKeys(keys: string[]): this;

package/dist/rest/RequestHandler.js

@@ -30,7 +30,7 @@ class RequestHandler {
         this.keys = options?.keys ?? [];
         this.retryLimit = options?.retryLimit ?? 0;
         this.throttler = options?.throttler ?? null;
-        this.baseURL = options?.baseURL ?? Constants_1.API_BASE_URL;
+        this.baseURL = options?.baseURL ?? Constants_1.APIBaseURL;
         this.restRequestTimeout = options?.restRequestTimeout ?? 0;
         this.rejectIfNotValid = options?.rejectIfNotValid ?? true;
         if (typeof options?.cache === 'object')
@@ -54,19 +54,14 @@ class RequestHandler {
         return Boolean(this.email && this.password);
     }
     async request(path, options = {}) {
-        const cached = (await this.cached?.get(path)) ?? null;
+        const cached = this.cached ? (await this.cached.get(path)) ?? null : null;
         if (cached && options.force !== true) {
             return { data: cached.data, maxAge: cached.ttl - Date.now(), status: cached.status, path, ok: cached.status === 200 };
         }
         if (!this.throttler || options.ignoreRateLimit)
             return this.exec(path, options);
         await this.throttler.wait();
-        try {
-            return await this.exec(path, options);
-        }
-        finally {
-            await this.throttler.throttle();
-        }
+        return this.exec(path, options);
     }
     async exec(path, options = {}, retries = 0) {
         const res = await (0, node_fetch_1.default)(`${this.baseURL}${path}`, {
@@ -125,7 +120,7 @@ class RequestHandler {
         }
     }
     async login() {
-        const res = await (0, node_fetch_1.default)(`${Constants_1.DEV_SITE_API_BASE_URL}/login`, {
+        const res = await (0, node_fetch_1.default)(`${Constants_1.DevSiteAPIBaseURL}/login`, {
             method: 'POST',
             timeout: 10000,
             headers: { 'Content-Type': 'application/json' },
@@ -140,7 +135,7 @@ class RequestHandler {
         return this.getKeys(res.headers.get('set-cookie'), ip);
     }
     async getKeys(cookie, ip) {
-        const res = await (0, node_fetch_1.default)(`${Constants_1.DEV_SITE_API_BASE_URL}/apikey/list`, {
+        const res = await (0, node_fetch_1.default)(`${Constants_1.DevSiteAPIBaseURL}/apikey/list`, {
             method: 'POST',
             timeout: 10000,
             headers: { 'Content-Type': 'application/json', cookie }
@@ -182,7 +177,7 @@ class RequestHandler {
         return this.keys;
     }
     async revokeKey(keyId, cookie) {
-        const res = await (0, node_fetch_1.default)(`${Constants_1.DEV_SITE_API_BASE_URL}/apikey/revoke`, {
+        const res = await (0, node_fetch_1.default)(`${Constants_1.DevSiteAPIBaseURL}/apikey/revoke`, {
             method: 'POST',
             timeout: 10000,
             body: JSON.stringify({ id: keyId }),
@@ -191,7 +186,7 @@ class RequestHandler {
         return res.ok;
     }
     async createKey(cookie, ip) {
-        const res = await (0, node_fetch_1.default)(`${Constants_1.DEV_SITE_API_BASE_URL}/apikey/create`, {
+        const res = await (0, node_fetch_1.default)(`${Constants_1.DevSiteAPIBaseURL}/apikey/create`, {
             method: 'POST',
             timeout: 10000,
             headers: { 'Content-Type': 'application/json', cookie },

package/dist/rest/Throttler.d.ts

@@ -6,26 +6,24 @@
  * ```
  */
 export declare class QueueThrottler {
-    private lastRun?;
     private readonly sleepTime;
-    private readonly promises;
+    private readonly generator;
     constructor(sleepTime?: number);
-    get remaining(): number;
-    throttle(): Promise<void>;
-    wait(): Promise<void>;
-    private shift;
+    private init;
+    wait(): Promise<IteratorResult<undefined, void>>;
 }
 /**
  * Represents a throttler that allows x requests per second before sleeping until the next second.
  * ```js
- * const throttler = new BatchThrottler(30);
- * // 30 requests every second.
+ * const throttler = new BatchThrottler(15);
+ * // 15 requests every second.
  * ```
  */
 export declare class BatchThrottler {
-    #private;
     private readonly rateLimit;
-    constructor(rateLimit?: number);
-    wait(): Promise<void>;
-    throttle(): Promise<void>;
+    private readonly sleepTime;
+    private readonly generator;
+    constructor(rateLimit?: number, sleepTime?: number);
+    private init;
+    wait(): Promise<IteratorResult<undefined, void>>;
 }

package/dist/rest/Throttler.js

@@ -1,10 +1,4 @@
 "use strict";
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _BatchThrottler_taskLogs;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BatchThrottler = exports.QueueThrottler = void 0;
 const Util_1 = require("../util/Util");
@@ -17,70 +11,53 @@ const Util_1 = require("../util/Util");
  */
 class QueueThrottler {
     constructor(sleepTime = 100) {
-        this.promises = [];
+        this.generator = this.init();
         this.sleepTime = sleepTime;
     }
-    get remaining() {
-        return this.promises.length;
-    }
-    async throttle() {
-        if (this.lastRun) {
-            const difference = Date.now() - this.lastRun;
+    async *init() {
+        let lastRan = 0;
+        // eslint-disable-next-line
+        while (true) {
+            const difference = Date.now() - lastRan;
             const needToSleep = this.sleepTime - difference;
             if (needToSleep > 0)
                 await Util_1.Util.delay(needToSleep);
+            lastRan = Date.now();
+            yield;
         }
-        this.lastRun = Date.now();
-        return this.shift();
-    }
-    wait() {
-        const next = this.promises.length ? this.promises[this.promises.length - 1].promise : Promise.resolve();
-        let resolve;
-        const promise = new Promise((res) => {
-            resolve = res;
-        });
-        this.promises.push({ resolve: resolve, promise });
-        return next;
     }
-    shift() {
-        const deferred = this.promises.shift();
-        if (typeof deferred !== 'undefined')
-            deferred.resolve();
+    async wait() {
+        return this.generator.next();
     }
 }
 exports.QueueThrottler = QueueThrottler;
 /**
  * Represents a throttler that allows x requests per second before sleeping until the next second.
  * ```js
- * const throttler = new BatchThrottler(30);
- * // 30 requests every second.
+ * const throttler = new BatchThrottler(15);
+ * // 15 requests every second.
  * ```
  */
 class BatchThrottler {
-    constructor(rateLimit = 10) {
-        _BatchThrottler_taskLogs.set(this, []); // eslint-disable-line
+    constructor(rateLimit = 15, sleepTime = 1000) {
+        this.generator = this.init();
         this.rateLimit = rateLimit;
+        this.sleepTime = sleepTime;
     }
-    async wait() {
-        return Promise.resolve();
-    }
-    async throttle() {
-        while (true) { // eslint-disable-line
-            const now = Date.now();
-            while (__classPrivateFieldGet(this, _BatchThrottler_taskLogs, "f").length) {
-                if (now - __classPrivateFieldGet(this, _BatchThrottler_taskLogs, "f")[0] > 1000) {
-                    __classPrivateFieldGet(this, _BatchThrottler_taskLogs, "f").shift();
-                }
-                else {
-                    break;
-                }
+    async *init() {
+        let count = 0;
+        // eslint-disable-next-line
+        while (true) {
+            if (count++ >= this.rateLimit) {
+                if (this.sleepTime > 0)
+                    await Util_1.Util.delay(this.sleepTime);
+                count = 0;
             }
-            if (__classPrivateFieldGet(this, _BatchThrottler_taskLogs, "f").length < this.rateLimit)
-                break;
-            await Util_1.Util.delay(1000);
+            yield;
         }
-        __classPrivateFieldGet(this, _BatchThrottler_taskLogs, "f").push(Date.now());
+    }
+    async wait() {
+        return this.generator.next();
     }
 }
 exports.BatchThrottler = BatchThrottler;
-_BatchThrottler_taskLogs = new WeakMap();

package/dist/struct/ClanMember.js

@@ -12,7 +12,7 @@ class ClanMember {
         this.role = data.role.replace('admin', 'elder');
         this.expLevel = data.expLevel;
         // eslint-disable-next-line
-        this.league = new League_1.League(data.league ?? Constants_1.UNRANKED_LEAGUE_DATA);
+        this.league = new League_1.League(data.league ?? Constants_1.UnrankedLeagueData);
         this.trophies = data.trophies;
         this.versusTrophies = data.versusTrophies ?? null;
         this.clanRank = data.clanRank;

package/dist/struct/ClanWar.js

@@ -201,7 +201,7 @@ class ClanWar {
     /** Whether this is a friendly war. */
     get isFriendly() {
         const preparationTime = this.startTime.getTime() - this.preparationStartTime.getTime();
-        return Constants_1.FRIENDLY_WAR_PREPARATION_TIMES.includes(preparationTime);
+        return Constants_1.FriendlyWarPreparationTimes.includes(preparationTime);
     }
     /** Whether this is a CWL. */
     get isCWL() {

package/dist/struct/ClanWarLeagueGroup.d.ts

@@ -62,7 +62,8 @@ export declare class ClanWarLeagueGroup {
      * @param options Override options for the request.
      */
     getWars(clanTag?: string, options?: OverrideOptions): Promise<ClanWar[]>;
-    private _getCurrentWars;
+    /** Returns active wars (last 2) of the CWL group. */
+    getCurrentWars(clanTag: string, options?: OverrideOptions): Promise<ClanWar[]>;
     /** Returns the index of the round for this specified warTag. */
     getRoundIndex(warTag: string): number | null;
 }

package/dist/struct/ClanWarLeagueGroup.js

@@ -75,7 +75,8 @@ class ClanWarLeagueGroup {
             .map((res) => res.value)
             .filter((war) => (clanTag ? war.clan.tag === clanTag : true));
     }
-    async _getCurrentWars(clanTag, options) {
+    /** Returns active wars (last 2) of the CWL group. */
+    async getCurrentWars(clanTag, options) {
         const rounds = this.rounds.filter((round) => !round.warTags.includes('#0'));
         if (!rounds.length)
             return [];

package/dist/struct/League.js

@@ -12,7 +12,7 @@ class League {
     }
     /** Position of this League. Starting from 0 (Un-ranked) */
     get position() {
-        return Constants_1.LEAGUES.indexOf(this.id);
+        return Constants_1.Leagues.indexOf(this.id);
     }
 }
 exports.League = League;