clashofclans.js 3.1.3-dev.aa3a114 → 3.1.4-dev.68bb5bc

package/dist/client/Client.js

@@ -49,34 +49,34 @@ class Client extends node_events_1.EventEmitter {
                 .filter((res) => res.status === 'fulfilled')
                 .map((res) => res.value);
         }
-        const { data } = await this.rest.getClans(query, options);
+        const { body } = await this.rest.getClans(query, options);
         // @ts-expect-error
-        return data.items.map((clan) => new struct_1.Clan(this, clan));
+        return body.items.map((clan) => new struct_1.Clan(this, clan));
     }
     /** Get info about a clan. */
     async getClan(clanTag, options) {
-        const { data } = await this.rest.getClan(clanTag, options);
-        return new struct_1.Clan(this, data);
+        const { body } = await this.rest.getClan(clanTag, options);
+        return new struct_1.Clan(this, body);
     }
     /** Get list of clan members. */
     async getClanMembers(clanTag, options) {
-        const { data } = await this.rest.getClanMembers(clanTag, options);
-        return data.items.map((entry) => new struct_1.ClanMember(this, entry));
+        const { body } = await this.rest.getClanMembers(clanTag, options);
+        return body.items.map((entry) => new struct_1.ClanMember(this, entry));
     }
     /** Get capital raid seasons. */
     async getCapitalRaidSeasons(tag, options) {
-        const { data } = await this.rest.getCapitalRaidSeasons(tag, options);
-        return data.items.map((entry) => new CapitalRaidSeason_1.CapitalRaidSeason(this, entry));
+        const { body } = await this.rest.getCapitalRaidSeasons(tag, options);
+        return body.items.map((entry) => new CapitalRaidSeason_1.CapitalRaidSeason(this, entry));
     }
     /** Get clan war log. */
     async getClanWarLog(clanTag, options) {
-        const { data } = await this.rest.getClanWarLog(clanTag, options);
-        return data.items.map((entry) => new struct_1.ClanWarLog(this, entry));
+        const { body } = await this.rest.getClanWarLog(clanTag, options);
+        return body.items.map((entry) => new struct_1.ClanWarLog(this, entry));
     }
     /** 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);
-        return new struct_1.ClanWar(this, data, { clanTag, maxAge });
+        const { body } = await this.rest.getCurrentWar(clanTag, options);
+        return new struct_1.ClanWar(this, body, { clanTag });
     }
     /**
      * Get info about currently running war in the clan.
@@ -92,11 +92,11 @@ class Client extends node_events_1.EventEmitter {
     async getCurrentWar(clanTag, options) {
         const args = typeof clanTag === 'string' ? { clanTag } : { clanTag: clanTag.clanTag, round: clanTag.round };
         try {
-            const data = await this.getClanWar(args.clanTag, options);
-            if (data.state === 'notInWar') {
+            const body = await this.getClanWar(args.clanTag, options);
+            if (body.state === 'notInWar') {
                 return await this.getLeagueWar({ clanTag: args.clanTag, round: args.round }, options);
             }
-            return data;
+            return body;
         }
         catch (err) {
             if (err instanceof HTTPError_1.HTTPError && err.status === 403) {
@@ -119,8 +119,8 @@ class Client extends node_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.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'));
+        const body = await this.getClanWarLeagueGroup(args.clanTag, options);
+        const rounds = body.rounds.filter((round) => !round.warTags.includes('#0'));
         if (!rounds.length)
             return null;
         const num = state === 'preparation' ? -1 : state === 'warEnded' ? -3 : -2;
@@ -139,8 +139,8 @@ class Client extends node_events_1.EventEmitter {
     }
     /** Returns active wars (last 2) of the CWL group. */
     async getLeagueWars(clanTag, options) {
-        const data = await this.getClanWarLeagueGroup(clanTag, options);
-        return data.getCurrentWars(clanTag, options);
+        const body = await this.getClanWarLeagueGroup(clanTag, options);
+        return body.getCurrentWars(clanTag, options);
     }
     /** Returns active wars (last 2 for CWL) of the clan. */
     async getWars(clanTag, options) {
@@ -160,19 +160,19 @@ class Client extends node_events_1.EventEmitter {
     }
     /** Get info about clan war league. */
     async getClanWarLeagueGroup(clanTag, options) {
-        const { data } = await this.rest.getClanWarLeagueGroup(clanTag, options);
-        return new struct_1.ClanWarLeagueGroup(this, data);
+        const { body } = await this.rest.getClanWarLeagueGroup(clanTag, options);
+        return new struct_1.ClanWarLeagueGroup(this, body);
     }
     /** Get info about a 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);
-        return new struct_1.ClanWar(this, data, { warTag: args.warTag, clanTag: args.clanTag, maxAge });
+        const { body } = await this.rest.getClanWarLeagueRound(args.warTag, options);
+        return new struct_1.ClanWar(this, body, { warTag: args.warTag, clanTag: args.clanTag });
     }
     /** Get info about a player by tag. */
     async getPlayer(playerTag, options) {
-        const { data } = await this.rest.getPlayer(playerTag, options);
-        return new struct_1.Player(this, data);
+        const { body } = await this.rest.getPlayer(playerTag, options);
+        return new struct_1.Player(this, body);
     }
     /** Get info about some players by their tags (fetches in parallel). */
     async getPlayers(playerTags, options) {
@@ -182,43 +182,43 @@ class Client extends node_events_1.EventEmitter {
     }
     /** Verify Player API token that can be found from the Game settings. */
     async verifyPlayerToken(playerTag, token, options) {
-        const { data } = await this.rest.verifyPlayerToken(playerTag, token, options);
-        return data.status === 'ok';
+        const { body } = await this.rest.verifyPlayerToken(playerTag, token, options);
+        return body.status === 'ok';
     }
     /** Get a list of Leagues. */
     async getLeagues(options) {
-        const { data } = await this.rest.getLeagues(options);
-        return data.items;
+        const { body } = await this.rest.getLeagues(options);
+        return body.items;
     }
     /** Get a list of Leagues. */
     async getBuilderBaseLeagues(options) {
-        const { data } = await this.rest.getBuilderBaseLeagues(options);
-        return data.items;
+        const { body } = await this.rest.getBuilderBaseLeagues(options);
+        return body.items;
     }
     /** Get a list of Capital Leagues. */
     async getCapitalLeagues(options) {
-        const { data } = await this.rest.getCapitalLeagues(options);
-        return data.items;
+        const { body } = await this.rest.getCapitalLeagues(options);
+        return body.items;
     }
     /** Get Legend League season Ids. */
     async getLeagueSeasons(options) {
-        const { data } = await this.rest.getLeagueSeasons(Constants_1.LegendLeagueId, options);
-        return data.items.map((league) => league.id);
+        const { body } = await this.rest.getLeagueSeasons(Constants_1.LegendLeagueId, options);
+        return body.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.LegendLeagueId, seasonId, options);
-        return data.items.map((entry) => new struct_1.SeasonRankedPlayer(this, entry));
+        const { body } = await this.rest.getSeasonRankings(Constants_1.LegendLeagueId, seasonId, options);
+        return body.items.map((entry) => new struct_1.SeasonRankedPlayer(this, entry));
     }
     /** Get list of Clan War Leagues. */
     async getWarLeagues(options) {
-        const { data } = await this.rest.getWarLeagues(options);
-        return data.items;
+        const { body } = await this.rest.getWarLeagues(options);
+        return body.items;
     }
     /** Get list of Locations. */
     async getLocations(options) {
-        const { data } = await this.rest.getLocations(options);
-        return data.items.map((entry) => new struct_1.Location(entry));
+        const { body } = await this.rest.getLocations(options);
+        return body.items.map((entry) => new struct_1.Location(entry));
     }
     /**
      * Get clan rankings for a specific location.
@@ -226,8 +226,8 @@ class Client extends node_events_1.EventEmitter {
      * For global ranking, use `global` as `locationId`.
      */
     async getClanRanks(locationId, options) {
-        const { data } = await this.rest.getClanRanks(locationId, options);
-        return data.items.map((entry) => new struct_1.RankedClan(entry));
+        const { body } = await this.rest.getClanRanks(locationId, options);
+        return body.items.map((entry) => new struct_1.RankedClan(entry));
     }
     /**
      * Get player rankings for a specific location.
@@ -235,8 +235,8 @@ class Client extends node_events_1.EventEmitter {
      * For global ranking, use `global` as `locationId`.
      */
     async getPlayerRanks(locationId, options) {
-        const { data } = await this.rest.getPlayerRanks(locationId, options);
-        return data.items.map((entry) => new struct_1.RankedPlayer(this, entry));
+        const { body } = await this.rest.getPlayerRanks(locationId, options);
+        return body.items.map((entry) => new struct_1.RankedPlayer(this, entry));
     }
     /**
      * Get clan builder base rankings for a specific location.
@@ -244,8 +244,8 @@ class Client extends node_events_1.EventEmitter {
      * For global ranking, use `global` as `locationId`.
      */
     async getBuilderBaseClanRanks(locationId, options) {
-        const { data } = await this.rest.getBuilderBaseClanRanks(locationId, options);
-        return data.items.map((entry) => new struct_1.RankedClan(entry));
+        const { body } = await this.rest.getBuilderBaseClanRanks(locationId, options);
+        return body.items.map((entry) => new struct_1.RankedClan(entry));
     }
     /**
      * Get player builder base rankings for a specific location.
@@ -253,8 +253,8 @@ class Client extends node_events_1.EventEmitter {
      * For global ranking, use `global` as `locationId`.
      */
     async getBuilderBasePlayerRanks(locationId, options) {
-        const { data } = await this.rest.getBuilderBasePlayerRanks(locationId, options);
-        return data.items.map((entry) => new struct_1.RankedPlayer(this, entry));
+        const { body } = await this.rest.getBuilderBasePlayerRanks(locationId, options);
+        return body.items.map((entry) => new struct_1.RankedPlayer(this, entry));
     }
     /**
      * Get clan capital rankings for a specific location.
@@ -262,23 +262,23 @@ class Client extends node_events_1.EventEmitter {
      * For global ranking, use `global` as `locationId`.
      */
     async getClanCapitalRanks(locationId, options) {
-        const { data } = await this.rest.getClanCapitalRanks(locationId, options);
-        return data.items;
+        const { body } = await this.rest.getClanCapitalRanks(locationId, options);
+        return body.items;
     }
     /** Get list of clan labels. */
     async getClanLabels(options) {
-        const { data } = await this.rest.getClanLabels(options);
-        return data.items;
+        const { body } = await this.rest.getClanLabels(options);
+        return body.items;
     }
     /** Get list of player labels. */
     async getPlayerLabels(options) {
-        const { data } = await this.rest.getPlayerLabels(options);
-        return data.items;
+        const { body } = await this.rest.getPlayerLabels(options);
+        return body.items;
     }
     /** Get info about gold pass season. */
     async getGoldPassSeason(options) {
-        const { data } = await this.rest.getGoldPassSeason(options);
-        return new struct_1.GoldPassSeason(data);
+        const { body } = await this.rest.getGoldPassSeason(options);
+        return new struct_1.GoldPassSeason(body);
     }
 }
 exports.Client = Client;

package/dist/client/PollingClient.js

@@ -155,7 +155,7 @@ class PollingClient extends Client_1.Client {
         if (!(this.listenerCount(Constants_1.PollingEvents.MaintenanceStart) && this.listenerCount(Constants_1.PollingEvents.MaintenanceEnd)))
             return;
         try {
-            const res = await this.rest.getClans({ maxMembers: Math.floor(Math.random() * 40) + 10, limit: 1 });
+            const { res } = await this.rest.getClans({ maxMembers: Math.floor(Math.random() * 40) + 10, limit: 1 });
             if (res.status === 200 && this.inMaintenance) {
                 this.inMaintenance = Boolean(false);
                 const duration = Date.now() - this._maintenanceStartTime.getTime();

package/dist/rest/RESTManager.d.ts

@@ -53,63 +53,63 @@ export declare class RESTManager extends EventEmitter {
     /** Set Clash of Clans API keys. */
     setKeys(keys: string[]): this;
     /** Search all clans by name and/or filtering the results using various criteria. */
-    getClans(query: ClanSearchOptions, options?: OverrideOptions): Promise<import("../types").Response<APIClanList>>;
+    getClans(query: ClanSearchOptions, options?: OverrideOptions): Promise<import("../types").Result<APIClanList>>;
     /** Get info about a clan. */
-    getClan(clanTag: string, options?: OverrideOptions): Promise<import("../types").Response<APIClan>>;
+    getClan(clanTag: string, options?: OverrideOptions): Promise<import("../types").Result<APIClan>>;
     /** Get list of clan members. */
-    getClanMembers(clanTag: string, options?: SearchOptions): Promise<import("../types").Response<APIClanMemberList>>;
+    getClanMembers(clanTag: string, options?: SearchOptions): Promise<import("../types").Result<APIClanMemberList>>;
     /** Get clan war log. */
-    getClanWarLog(clanTag: string, options?: SearchOptions): Promise<import("../types").Response<APIClanWarLog>>;
+    getClanWarLog(clanTag: string, options?: SearchOptions): Promise<import("../types").Result<APIClanWarLog>>;
     /** Get info about currently running war in the clan. */
-    getCurrentWar(clanTag: string, options?: OverrideOptions): Promise<import("../types").Response<APIClanWar>>;
+    getCurrentWar(clanTag: string, options?: OverrideOptions): Promise<import("../types").Result<APIClanWar>>;
     /** Get info about clan war league. */
-    getClanWarLeagueGroup(clanTag: string, options?: OverrideOptions): Promise<import("../types").Response<APIClanWarLeagueGroup>>;
+    getClanWarLeagueGroup(clanTag: string, options?: OverrideOptions): Promise<import("../types").Result<APIClanWarLeagueGroup>>;
     /** Get info about a CWL round by WarTag. */
-    getClanWarLeagueRound(warTag: string, options?: OverrideOptions): Promise<import("../types").Response<APIClanWar>>;
+    getClanWarLeagueRound(warTag: string, options?: OverrideOptions): Promise<import("../types").Result<APIClanWar>>;
     /** Retrieve clan's capital raid seasons. */
-    getCapitalRaidSeasons(tag: string, options?: SearchOptions): Promise<import("../types").Response<APICapitalRaidSeasons>>;
+    getCapitalRaidSeasons(tag: string, options?: SearchOptions): Promise<import("../types").Result<APICapitalRaidSeasons>>;
     /** Get info about a player by tag. */
-    getPlayer(playerTag: string, options?: OverrideOptions): Promise<import("../types").Response<APIPlayer>>;
+    getPlayer(playerTag: string, options?: OverrideOptions): Promise<import("../types").Result<APIPlayer>>;
     /** Verify Player API token that can be found from the Game settings. */
-    verifyPlayerToken(playerTag: string, token: string, options?: OverrideOptions): Promise<import("../types").Response<APIVerifyToken>>;
+    verifyPlayerToken(playerTag: string, token: string, options?: OverrideOptions): Promise<import("../types").Result<APIVerifyToken>>;
     /** Get a list of Leagues. */
-    getLeagues(options?: SearchOptions): Promise<import("../types").Response<APILeagueList>>;
+    getLeagues(options?: SearchOptions): Promise<import("../types").Result<APILeagueList>>;
     /** Get a League info. */
-    getLeague(leagueId: string | number, options?: OverrideOptions): Promise<import("../types").Response<APILeague>>;
+    getLeague(leagueId: string | number, options?: OverrideOptions): Promise<import("../types").Result<APILeague>>;
     /** Get a list of builder base leagues. */
-    getBuilderBaseLeagues(options?: SearchOptions): Promise<import("../types").Response<APIBuilderBaseLeagueList>>;
+    getBuilderBaseLeagues(options?: SearchOptions): Promise<import("../types").Result<APIBuilderBaseLeagueList>>;
     /** Get a builder base league info. */
-    getBuilderBaseLeague(leagueId: string | number, options?: OverrideOptions): Promise<import("../types").Response<APIBuilderBaseLeague>>;
+    getBuilderBaseLeague(leagueId: string | number, options?: OverrideOptions): Promise<import("../types").Result<APIBuilderBaseLeague>>;
     /** Get a list of Capital leagues. */
-    getCapitalLeagues(options?: SearchOptions): Promise<import("../types").Response<APICapitalLeagueList>>;
+    getCapitalLeagues(options?: SearchOptions): Promise<import("../types").Result<APICapitalLeagueList>>;
     /** Get a Capital League info. */
-    getCapitalLeague(leagueId: string | number, options?: OverrideOptions): Promise<import("../types").Response<APICapitalLeague>>;
+    getCapitalLeague(leagueId: string | number, options?: OverrideOptions): Promise<import("../types").Result<APICapitalLeague>>;
     /** Get Legend League season Ids. */
-    getLeagueSeasons(leagueId: number, options?: SearchOptions): Promise<import("../types").Response<APILeagueSeasonList>>;
+    getLeagueSeasons(leagueId: number, options?: SearchOptions): Promise<import("../types").Result<APILeagueSeasonList>>;
     /** Get Legend League season rankings by season Id. */
-    getSeasonRankings(leagueId: number, seasonId: string, options?: SearchOptions): Promise<import("../types").Response<APIPlayerSeasonRankingList>>;
+    getSeasonRankings(leagueId: number, seasonId: string, options?: SearchOptions): Promise<import("../types").Result<APIPlayerSeasonRankingList>>;
     /** Get list of Clan War Leagues. */
-    getWarLeagues(options?: SearchOptions): Promise<import("../types").Response<APIWarLeagueList>>;
+    getWarLeagues(options?: SearchOptions): Promise<import("../types").Result<APIWarLeagueList>>;
     /** Get info about a Clan War League. */
-    getWarLeague(leagueId: number, options?: OverrideOptions): Promise<import("../types").Response<APIWarLeague>>;
+    getWarLeague(leagueId: number, options?: OverrideOptions): Promise<import("../types").Result<APIWarLeague>>;
     /** Get list of Locations. */
-    getLocations(options?: SearchOptions): Promise<import("../types").Response<APILocationList>>;
+    getLocations(options?: SearchOptions): Promise<import("../types").Result<APILocationList>>;
     /** Get info about a Location. */
-    getLocation(locationId: number, options?: OverrideOptions): Promise<import("../types").Response<APILocation>>;
+    getLocation(locationId: number, options?: OverrideOptions): Promise<import("../types").Result<APILocation>>;
     /** Get clan rankings for a specific location. */
-    getClanRanks(locationId: number | string, options?: SearchOptions): Promise<import("../types").Response<APIClanRankingList>>;
+    getClanRanks(locationId: number | string, options?: SearchOptions): Promise<import("../types").Result<APIClanRankingList>>;
     /** Get player rankings for a specific location. */
-    getPlayerRanks(locationId: number | string, options?: SearchOptions): Promise<import("../types").Response<APIPlayerRankingList>>;
+    getPlayerRanks(locationId: number | string, options?: SearchOptions): Promise<import("../types").Result<APIPlayerRankingList>>;
     /** Get clan builder base rankings for a specific location. */
-    getBuilderBaseClanRanks(locationId: number | string, options?: SearchOptions): Promise<import("../types").Response<APIClanBuilderBaseRankingList>>;
+    getBuilderBaseClanRanks(locationId: number | string, options?: SearchOptions): Promise<import("../types").Result<APIClanBuilderBaseRankingList>>;
     /** Get player builder base rankings for a specific location. */
-    getBuilderBasePlayerRanks(locationId: number | string, options?: SearchOptions): Promise<import("../types").Response<APIPlayerBuilderBaseRankingList>>;
+    getBuilderBasePlayerRanks(locationId: number | string, options?: SearchOptions): Promise<import("../types").Result<APIPlayerBuilderBaseRankingList>>;
     /** Get clan capital rankings for a specific location. */
-    getClanCapitalRanks(locationId: number | string, options?: SearchOptions): Promise<import("../types").Response<APIClanCapitalRankingList>>;
+    getClanCapitalRanks(locationId: number | string, options?: SearchOptions): Promise<import("../types").Result<APIClanCapitalRankingList>>;
     /** Get list of clan labels. */
-    getClanLabels(options?: SearchOptions): Promise<import("../types").Response<APILabelList>>;
+    getClanLabels(options?: SearchOptions): Promise<import("../types").Result<APILabelList>>;
     /** Get list of player labels. */
-    getPlayerLabels(options?: SearchOptions): Promise<import("../types").Response<APILabelList>>;
+    getPlayerLabels(options?: SearchOptions): Promise<import("../types").Result<APILabelList>>;
     /** Get info about gold pass season. */
-    getGoldPassSeason(options?: OverrideOptions): Promise<import("../types").Response<APIGoldPassSeason>>;
+    getGoldPassSeason(options?: OverrideOptions): Promise<import("../types").Result<APIGoldPassSeason>>;
 }

package/dist/rest/RESTManager.js

@@ -75,8 +75,11 @@ class RESTManager extends node_events_1.EventEmitter {
     }
     /** Verify Player API token that can be found from the Game settings. */
     verifyPlayerToken(playerTag, token, options) {
-        const opts = { method: 'POST', body: JSON.stringify({ token }), ...options };
-        return this.requestHandler.request(`/players/${Util_1.Util.encodeURI(playerTag)}/verifytoken`, opts);
+        return this.requestHandler.request(`/players/${Util_1.Util.encodeURI(playerTag)}/verifytoken`, {
+            body: JSON.stringify({ token }),
+            method: 'POST',
+            ...options
+        });
     }
     /** Get a list of Leagues. */
     getLeagues(options) {

package/dist/rest/RequestHandler.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { EventEmitter } from 'node:events';
-import { LoginOptions, RequestHandlerOptions, RequestOptions, Response } from '../types';
+import { LoginOptions, RequestHandlerOptions, RequestOptions, Result } from '../types';
 import { IRestEvents } from './RESTManager';
 export interface RequestHandler {
     emit: (<K extends keyof IRestEvents>(event: K, ...args: IRestEvents[K]) => boolean) & (<S extends string | symbol>(event: Exclude<S, keyof IRestEvents>, ...args: any[]) => boolean);
@@ -48,8 +48,9 @@ export declare class RequestHandler extends EventEmitter {
     private get _keys();
     private get _key();
     setKeys(keys: string[]): this;
-    private get creds();
-    request<T>(path: string, options?: RequestOptions): Promise<Response<T>>;
+    private get credentials();
+    request<T>(path: string, options?: RequestOptions): Promise<Result<T>>;
+    rawRequest<T>(path: string, options?: RequestOptions): Promise<T>;
     private exec;
     init(options: LoginOptions): Promise<string[]>;
     private reValidateKeys;

package/dist/rest/RequestHandler.js

@@ -52,51 +52,67 @@ class RequestHandler extends node_events_1.EventEmitter {
         this.keys = keys;
         return this;
     }
-    get creds() {
+    get credentials() {
         return Boolean(this.email && this.password);
     }
     async request(path, options = {}) {
         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 };
+            return {
+                body: cached.body,
+                res: { 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();
         return this.exec(path, options);
     }
+    async rawRequest(path, options = {}) {
+        const cached = this.cached ? (await this.cached.get(path)) ?? null : null;
+        if (cached && options.force !== true) {
+            return cached.body;
+        }
+        if (!this.throttler || options.ignoreRateLimit)
+            return this.exec(path, options).then((res) => res.body);
+        await this.throttler.wait();
+        return this.exec(path, options).then((res) => res.body);
+    }
     async exec(path, options = {}, retries = 0) {
         try {
             const res = await this.dispatcher.request({
                 path: `/v1${path}`,
                 body: options.body,
-                method: 'GET',
+                method: options.method ?? 'GET',
                 signal: (0, Util_1.timeoutSignal)(options.restRequestTimeout ?? this.restRequestTimeout),
                 headers: { 'Authorization': `Bearer ${this._key}`, 'Content-Type': 'application/json' }
             });
             if (res.statusCode === 504 && retries < (options.retryLimit ?? this.retryLimit)) {
                 return await this.exec(path, options, ++retries);
             }
-            const data = (await res.body.json());
-            if (this.creds &&
+            const body = (await res.body.json());
+            if (this.credentials &&
                 res.statusCode === 403 &&
-                data?.reason === 'accessDenied.invalidIp' &&
+                body?.reason === 'accessDenied.invalidIp' &&
                 retries < (options.retryLimit ?? this.retryLimit)) {
-                const keys = await this.reValidateKeys().then(() => () => this.login());
+                const keys = await this.reValidateKeys().then(() => this.login());
                 if (keys.length)
                     return await this.exec(path, options, ++retries);
             }
             const maxAge = Number(res.headers['cache-control']?.split('=')?.[1] ?? 0) * 1000;
-            if (res.statusCode === 403 && !data?.message && this.rejectIfNotValid) {
+            if (res.statusCode === 403 && !body?.message && this.rejectIfNotValid) {
                 throw new HTTPError_1.HTTPError(HTTPError_1.PrivateWarLogError, res.statusCode, path, maxAge);
             }
             if (res.statusCode !== 200 && this.rejectIfNotValid) {
-                throw new HTTPError_1.HTTPError(data, res.statusCode, path, maxAge, options.method);
+                throw new HTTPError_1.HTTPError(body, res.statusCode, path, maxAge, options.method);
             }
             if (this.cached && maxAge > 0 && options.cache !== false && res.statusCode === 200) {
-                await this.cached.set(path, { data, ttl: Date.now() + maxAge, status: res.statusCode }, maxAge);
+                await this.cached.set(path, { body, ttl: Date.now() + maxAge, status: res.statusCode }, maxAge);
             }
-            return { data: data, maxAge, status: res.statusCode, path, ok: res.statusCode === 200 };
+            return {
+                body: body,
+                res: { maxAge, status: res.statusCode, path, ok: res.statusCode === 200 }
+            };
         }
         catch (error) {
             if (error.code === 'UND_ERR_ABORTED' && retries < (options.retryLimit ?? this.retryLimit)) {
@@ -104,7 +120,10 @@ class RequestHandler extends node_events_1.EventEmitter {
             }
             if (this.rejectIfNotValid)
                 throw error;
-            return { data: { message: error.message }, maxAge: 0, status: 500, path, ok: false };
+            return {
+                body: { message: error.message },
+                res: { maxAge: 0, status: 500, path, ok: false }
+            };
         }
     }
     async init(options) {
@@ -115,8 +134,7 @@ class RequestHandler extends node_events_1.EventEmitter {
         this.keyCount = Math.min(options.keyCount ?? 1, 10);
         this.password = options.password;
         this.email = options.email;
-        await this.reValidateKeys();
-        return this.login();
+        return this.reValidateKeys().then(() => this.login());
     }
     async reValidateKeys() {
         for (const key of this.keys) {

package/dist/struct/ClanWar.d.ts

@@ -132,12 +132,9 @@ export declare class ClanWar {
     opponent: WarClan;
     /** The war's unique tag. This is `null` unless this is a CWL.  */
     warTag: string | null;
-    /** Maximum number of milliseconds the results can be cached. */
-    maxAge: number;
     constructor(client: Client, data: APIClanWar, extra: {
         clanTag?: string;
         warTag?: string;
-        maxAge: number;
     });
     /** Return a {@link ClanWarMember} with the tag provided. */
     getMember(tag: string): ClanWarMember | null;

package/dist/struct/ClanWar.js

@@ -164,7 +164,6 @@ class ClanWar {
             this.clan = new WarClan(this, clan);
             this.opponent = new WarClan(this, opponent);
         }
-        this.maxAge = extra.maxAge;
     }
     /** Return a {@link ClanWarMember} with the tag provided. */
     getMember(tag) {

package/dist/types/lib.d.ts

@@ -1,3 +1,4 @@
+import { Dispatcher } from 'undici';
 import { BatchThrottler, QueueThrottler } from '../rest/Throttler';
 export interface Store<T = any> {
     set: (key: string, value: T, ttl?: number) => boolean | Promise<boolean>;
@@ -89,19 +90,21 @@ export interface RequestOptions extends OverrideOptions {
     /** The request body. */
     body?: string;
     /** The request method. */
-    method?: string;
+    method?: Dispatcher.HttpMethod;
 }
-export interface Response<T> {
-    /** Whether the response is ok. */
-    ok: boolean;
+export interface Result<T> {
     /** The response body. */
-    data: T;
-    /** Path of the request for this response. */
-    path: string;
-    /** HTTP status code of this response. */
-    status: number;
-    /** The maxAge of this response. */
-    maxAge: number;
+    body: T;
+    res: {
+        /** Whether the response is ok. */
+        ok: boolean;
+        /** Path of the request for this response. */
+        path: string;
+        /** HTTP status code of this response. */
+        status: number;
+        /** The maxAge of this response. */
+        maxAge: number;
+    };
 }
 /**
  * Clan search options for a request.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "clashofclans.js",
-	"version": "3.1.3-dev.aa3a114",
+	"version": "3.1.4-dev.68bb5bc",
 	"description": "JavaScript library for interacting with the Clash of Clans API",
 	"author": "https://clashofclans.js.org",
 	"license": "MIT",