clashofclans.js 3.1.2 → 3.1.3-dev.048e4b9

package/README.md

@@ -12,7 +12,7 @@
 ### Installation
 
 -   **`npm i clashofclans.js`**
--   **Node.js v14 or newer is required.**
+-   **Node.js v16 or newer is required.**
 
 ### Links
 

package/dist/client/Client.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="node" />
 import { EventEmitter } from 'node:events';
-import { ClanSearchOptions, SearchOptions, ClientOptions, LoginOptions, OverrideOptions } from '../types';
-import { CWLRounds, ClientEvents } from '../util/Constants';
 import { RESTManager } from '../rest/RESTManager';
+import { ClanSearchOptions, ClientOptions, LoginOptions, OverrideOptions, SearchOptions } from '../types';
+import { CWLRounds, ClientEvents } from '../util/Constants';
 import { Util } from '../util/Util';
-import { Clan, ClanMember, ClanWar, ClanWarLog, Location, Player, RankedClan, RankedPlayer, SeasonRankedPlayer, GoldPassSeason, ClanWarLeagueGroup } from '../struct';
+import { Clan, ClanMember, ClanWar, ClanWarLeagueGroup, ClanWarLog, GoldPassSeason, Location, Player, RankedClan, RankedPlayer, SeasonRankedPlayer } from '../struct';
 import { CapitalRaidSeason } from '../struct/CapitalRaidSeason';
 interface IClientEvents {
     [ClientEvents.Error]: [error: unknown];

package/dist/client/Client.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Client = void 0;
 const node_events_1 = require("node:events");
-const Constants_1 = require("../util/Constants");
 const HTTPError_1 = require("../rest/HTTPError");
 const RESTManager_1 = require("../rest/RESTManager");
+const Constants_1 = require("../util/Constants");
 const Util_1 = require("../util/Util");
 const struct_1 = require("../struct");
 const CapitalRaidSeason_1 = require("../struct/CapitalRaidSeason");
@@ -75,8 +75,8 @@ class Client extends node_events_1.EventEmitter {
     }
     /** 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 { data, res } = await this.rest.getCurrentWar(clanTag, options);
+        return new struct_1.ClanWar(this, data, { clanTag, maxAge: res.maxAge });
     }
     /**
      * Get info about currently running war in the clan.
@@ -166,8 +166,8 @@ class Client extends node_events_1.EventEmitter {
     /** 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 { data, res } = await this.rest.getClanWarLeagueRound(args.warTag, options);
+        return new struct_1.ClanWar(this, data, { warTag: args.warTag, clanTag: args.clanTag, maxAge: res.maxAge });
     }
     /** Get info about a player by tag. */
     async getPlayer(playerTag, options) {

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/index.d.ts

@@ -1,11 +1,11 @@
 export * from './client/Client';
 export * from './client/PollingClient';
+export * from './rest/HTTPError';
 export * from './rest/RESTManager';
 export * from './rest/RequestHandler';
-export * from './rest/HTTPError';
 export * from './rest/Throttler';
-export * from './util/Util';
 export * from './struct';
 export * from './types';
 export * from './util/Constants';
 export * from './util/Store';
+export * from './util/Util';

package/dist/index.js

@@ -16,12 +16,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./client/Client"), exports);
 __exportStar(require("./client/PollingClient"), exports);
+__exportStar(require("./rest/HTTPError"), exports);
 __exportStar(require("./rest/RESTManager"), exports);
 __exportStar(require("./rest/RequestHandler"), exports);
-__exportStar(require("./rest/HTTPError"), exports);
 __exportStar(require("./rest/Throttler"), exports);
-__exportStar(require("./util/Util"), exports);
 __exportStar(require("./struct"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./util/Constants"), exports);
 __exportStar(require("./util/Store"), exports);
+__exportStar(require("./util/Util"), exports);

package/dist/index.mjs

@@ -65,3 +65,4 @@ export const Util = mod.Util;
 export const WarClan = mod.WarClan;
 export const WarLeagues = mod.WarLeagues;
 export const WarLogClan = mod.WarLogClan;
+export const timeoutSignal = mod.timeoutSignal;

package/dist/rest/RESTManager.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import { EventEmitter } from 'node:events';
-import { Util } from '../util/Util';
-import { APIClan, APIClanList, APIClanMemberList, APICapitalRaidSeasons, APIClanRankingList, APIClanBuilderBaseRankingList, APIClanWar, APIClanWarLeagueGroup, APIClanWarLog, APIGoldPassSeason, APILabelList, APILeague, APILeagueList, APILeagueSeasonList, APILocation, APILocationList, APIPlayer, APIPlayerRankingList, APIPlayerSeasonRankingList, APIPlayerBuilderBaseRankingList, APIVerifyToken, APIWarLeague, APIWarLeagueList, SearchOptions, ClanSearchOptions, RESTOptions, OverrideOptions, LoginOptions, APICapitalLeagueList, APICapitalLeague, APIClanCapitalRankingList, APIBuilderBaseLeagueList, APIBuilderBaseLeague } from '../types';
+import { APIBuilderBaseLeague, APIBuilderBaseLeagueList, APICapitalLeague, APICapitalLeagueList, APICapitalRaidSeasons, APIClan, APIClanBuilderBaseRankingList, APIClanCapitalRankingList, APIClanList, APIClanMemberList, APIClanRankingList, APIClanWar, APIClanWarLeagueGroup, APIClanWarLog, APIGoldPassSeason, APILabelList, APILeague, APILeagueList, APILeagueSeasonList, APILocation, APILocationList, APIPlayer, APIPlayerBuilderBaseRankingList, APIPlayerRankingList, APIPlayerSeasonRankingList, APIVerifyToken, APIWarLeague, APIWarLeagueList, ClanSearchOptions, LoginOptions, OverrideOptions, RESTOptions, SearchOptions } from '../types';
 import { RestEvents } from '../util/Constants';
+import { Util } from '../util/Util';
 import { RequestHandler } from './RequestHandler';
 export interface IRestEvents {
     [RestEvents.Error]: [error: unknown];

package/dist/rest/RESTManager.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RESTManager = void 0;
 const node_events_1 = require("node:events");
-const Util_1 = require("../util/Util");
 const Constants_1 = require("../util/Constants");
+const Util_1 = require("../util/Util");
 const RequestHandler_1 = require("./RequestHandler");
 /** Represents a REST Manager of the client. */
 class RESTManager extends node_events_1.EventEmitter {

package/dist/rest/RequestHandler.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { EventEmitter } from 'node:events';
-import { Response, RequestOptions, LoginOptions, RequestHandlerOptions } from '../types';
+import { LoginOptions, RequestHandlerOptions, RequestOptions, Response } 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);
@@ -27,6 +27,7 @@ export interface RequestHandler {
      */
     rateLimited: string;
 }
+export type ResponseBody = any;
 /** Represents the class that manages handlers for endpoints. */
 export declare class RequestHandler extends EventEmitter {
     #private;
@@ -42,6 +43,7 @@ export declare class RequestHandler extends EventEmitter {
     private readonly restRequestTimeout;
     private readonly throttler?;
     private readonly cached;
+    private readonly dispatcher;
     constructor(options?: RequestHandlerOptions);
     private get _keys();
     private get _key();

package/dist/rest/RequestHandler.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 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");
@@ -33,20 +10,16 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 var _RequestHandler_keyIndex;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RequestHandler = void 0;
-const node_https_1 = __importDefault(require("node:https"));
 const node_events_1 = require("node:events");
-const node_fetch_1 = __importStar(require("node-fetch"));
+const undici_1 = require("undici");
 const Constants_1 = require("../util/Constants");
 const Store_1 = require("../util/Store");
+const Util_1 = require("../util/Util");
 const HTTPError_1 = require("./HTTPError");
 const IP_REGEX = /\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}/g;
-const agent = new node_https_1.default.Agent({ keepAlive: true });
 /** Represents the class that manages handlers for endpoints. */
 class RequestHandler extends node_events_1.EventEmitter {
     constructor(options) {
@@ -62,6 +35,10 @@ class RequestHandler extends node_events_1.EventEmitter {
             this.cached = options.cache;
         else
             this.cached = options?.cache === true ? new Store_1.CacheStore() : null;
+        this.dispatcher = new undici_1.Pool(new URL(this.baseURL).origin, {
+            connections: options?.connections ?? null,
+            pipelining: options?.pipelining ?? 1
+        });
     }
     get _keys() {
         return Array.isArray(this.keys) ? this.keys : [this.keys];
@@ -81,7 +58,10 @@ class RequestHandler extends node_events_1.EventEmitter {
     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 {
+                data: cached.data,
+                res: { maxAge: cached.ttl - Date.now(), status: cached.status, path, ok: cached.status === 200 }
+            };
         }
         if (!this.throttler || options.ignoreRateLimit)
             return this.exec(path, options);
@@ -90,44 +70,50 @@ class RequestHandler extends node_events_1.EventEmitter {
     }
     async exec(path, options = {}, retries = 0) {
         try {
-            const res = await (0, node_fetch_1.default)(`${this.baseURL}${path}`, {
-                agent,
+            const res = await this.dispatcher.request({
+                path: `/v1${path}`,
                 body: options.body,
-                method: options.method,
-                timeout: options.restRequestTimeout ?? this.restRequestTimeout,
+                method: 'GET',
+                signal: (0, Util_1.timeoutSignal)(options.restRequestTimeout ?? this.restRequestTimeout),
                 headers: { 'Authorization': `Bearer ${this._key}`, 'Content-Type': 'application/json' }
             });
-            if (res.status === 504 && retries < (options.retryLimit ?? this.retryLimit)) {
+            if (res.statusCode === 504 && retries < (options.retryLimit ?? this.retryLimit)) {
                 return await this.exec(path, options, ++retries);
             }
-            const data = await res.json();
+            const data = (await res.body.json());
             if (this.creds &&
-                res.status === 403 &&
-                data.reason === 'accessDenied.invalidIp' &&
+                res.statusCode === 403 &&
+                data?.reason === 'accessDenied.invalidIp' &&
                 retries < (options.retryLimit ?? this.retryLimit)) {
                 const keys = await this.reValidateKeys().then(() => () => this.login());
                 if (keys.length)
                     return await this.exec(path, options, ++retries);
             }
-            const maxAge = Number(res.headers.get('cache-control')?.split('=')?.[1] ?? 0) * 1000;
-            if (res.status === 403 && !data?.message && this.rejectIfNotValid) {
-                throw new HTTPError_1.HTTPError(HTTPError_1.PrivateWarLogError, res.status, path, maxAge);
+            const maxAge = Number(res.headers['cache-control']?.split('=')?.[1] ?? 0) * 1000;
+            if (res.statusCode === 403 && !data?.message && this.rejectIfNotValid) {
+                throw new HTTPError_1.HTTPError(HTTPError_1.PrivateWarLogError, res.statusCode, path, maxAge);
             }
-            if (!res.ok && this.rejectIfNotValid) {
-                throw new HTTPError_1.HTTPError(data, res.status, path, maxAge, options.method);
+            if (res.statusCode !== 200 && this.rejectIfNotValid) {
+                throw new HTTPError_1.HTTPError(data, res.statusCode, path, maxAge, options.method);
             }
-            if (this.cached && maxAge > 0 && options.cache !== false && res.ok) {
-                await this.cached.set(path, { data, ttl: Date.now() + maxAge, status: res.status }, maxAge);
+            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);
             }
-            return { data, maxAge, status: res.status, path, ok: res.status === 200 };
+            return {
+                data: data,
+                res: { maxAge, status: res.statusCode, path, ok: res.statusCode === 200 }
+            };
         }
         catch (error) {
-            if (error instanceof node_fetch_1.FetchError && error.type === 'request-timeout' && retries < (options.retryLimit ?? this.retryLimit)) {
+            if (error.code === 'UND_ERR_ABORTED' && retries < (options.retryLimit ?? this.retryLimit)) {
                 return this.exec(path, options, ++retries);
             }
             if (this.rejectIfNotValid)
                 throw error;
-            return { data: { message: error.message }, maxAge: 0, status: 500, path, ok: false };
+            return {
+                data: { message: error.message },
+                res: { maxAge: 0, status: 500, path, ok: false }
+            };
         }
     }
     async init(options) {
@@ -143,9 +129,9 @@ class RequestHandler extends node_events_1.EventEmitter {
     }
     async reValidateKeys() {
         for (const key of this.keys) {
-            const res = await (0, node_fetch_1.default)(`${this.baseURL}/locations?limit=1`, {
+            const res = await (0, undici_1.fetch)(`${this.baseURL}/locations?limit=1`, {
                 method: 'GET',
-                timeout: this.restRequestTimeout,
+                signal: (0, Util_1.timeoutSignal)(this.restRequestTimeout),
                 headers: { 'Authorization': `Bearer ${key}`, 'Content-Type': 'application/json' }
             }).catch(() => null);
             if (res?.status === 403) {
@@ -156,13 +142,13 @@ class RequestHandler extends node_events_1.EventEmitter {
         }
     }
     async login() {
-        const res = await (0, node_fetch_1.default)(`${Constants_1.DevSiteAPIBaseURL}/login`, {
+        const res = await (0, undici_1.fetch)(`${Constants_1.DevSiteAPIBaseURL}/login`, {
             method: 'POST',
-            timeout: this.restRequestTimeout,
+            signal: (0, Util_1.timeoutSignal)(this.restRequestTimeout),
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify({ email: this.email, password: this.password })
         });
-        const data = await res.json();
+        const data = (await res.json());
         if (!res.ok)
             throw new Error(`Invalid email or password. ${JSON.stringify(data)}`);
         const ip = await this.getIp(data.temporaryAPIToken);
@@ -171,12 +157,12 @@ class RequestHandler extends node_events_1.EventEmitter {
         return this.getKeys(res.headers.get('set-cookie'), ip);
     }
     async getKeys(cookie, ip) {
-        const res = await (0, node_fetch_1.default)(`${Constants_1.DevSiteAPIBaseURL}/apikey/list`, {
+        const res = await (0, undici_1.fetch)(`${Constants_1.DevSiteAPIBaseURL}/apikey/list`, {
             method: 'POST',
-            timeout: this.restRequestTimeout,
+            signal: (0, Util_1.timeoutSignal)(this.restRequestTimeout),
             headers: { 'Content-Type': 'application/json', cookie }
         });
-        const data = await res.json();
+        const data = (await res.json());
         if (!res.ok)
             throw new Error(`Failed to retrieve the API Keys. ${JSON.stringify(data)}`);
         // Get all available keys from the developer site.
@@ -213,18 +199,18 @@ class RequestHandler extends node_events_1.EventEmitter {
         return this.keys;
     }
     async revokeKey(keyId, cookie) {
-        const res = await (0, node_fetch_1.default)(`${Constants_1.DevSiteAPIBaseURL}/apikey/revoke`, {
+        const res = await (0, undici_1.fetch)(`${Constants_1.DevSiteAPIBaseURL}/apikey/revoke`, {
             method: 'POST',
-            timeout: this.restRequestTimeout,
+            signal: (0, Util_1.timeoutSignal)(this.restRequestTimeout),
             body: JSON.stringify({ id: keyId }),
             headers: { 'Content-Type': 'application/json', cookie }
         });
         return res.ok;
     }
     async createKey(cookie, ip) {
-        const res = await (0, node_fetch_1.default)(`${Constants_1.DevSiteAPIBaseURL}/apikey/create`, {
+        const res = await (0, undici_1.fetch)(`${Constants_1.DevSiteAPIBaseURL}/apikey/create`, {
             method: 'POST',
-            timeout: this.restRequestTimeout,
+            signal: (0, Util_1.timeoutSignal)(this.restRequestTimeout),
             headers: { 'Content-Type': 'application/json', cookie },
             body: JSON.stringify({
                 cidrRanges: [ip],
@@ -232,7 +218,7 @@ class RequestHandler extends node_events_1.EventEmitter {
                 description: this.keyDescription ?? new Date().toUTCString()
             })
         });
-        const data = await res.json();
+        const data = (await res.json());
         if (!res.ok)
             throw new Error(`Failed to create API Key. ${JSON.stringify(data)}`);
         return data.key;
@@ -244,7 +230,9 @@ class RequestHandler extends node_events_1.EventEmitter {
             return props.cidrs[0].match(IP_REGEX)[0];
         }
         catch {
-            const body = await (0, node_fetch_1.default)('https://api.ipify.org', { timeout: this.restRequestTimeout }).then((res) => res.text());
+            const body = await (0, undici_1.fetch)('https://api.ipify.org', {
+                signal: (0, Util_1.timeoutSignal)(this.restRequestTimeout)
+            }).then((res) => res.text());
             return body.match(IP_REGEX)?.[0] ?? null;
         }
     }

package/dist/struct/Clan.d.ts

@@ -1,10 +1,10 @@
-import { APICapitalLeague, APIChatLanguage, APIClan, APILabel, APIWarLeague, OverrideOptions } from '../types';
 import { Client } from '../client/Client';
-import { ClanMember } from './ClanMember';
-import type { Player } from './Player';
-import { Location } from './Location';
+import { APICapitalLeague, APIChatLanguage, APIClan, APILabel, APIWarLeague, OverrideOptions } from '../types';
 import { Badge } from './Badge';
 import { ClanCapital } from './ClanCapital';
+import { ClanMember } from './ClanMember';
+import { Location } from './Location';
+import type { Player } from './Player';
 /** Represents a Clan. */
 export declare class Clan {
     client: Client;

package/dist/struct/Clan.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Clan = void 0;
-const ClanMember_1 = require("./ClanMember");
-const Location_1 = require("./Location");
 const Badge_1 = require("./Badge");
 const ClanCapital_1 = require("./ClanCapital");
+const ClanMember_1 = require("./ClanMember");
+const Location_1 = require("./Location");
 /** Represents a Clan. */
 class Clan {
     constructor(client, data) {

package/dist/struct/ClanMember.d.ts

@@ -1,5 +1,5 @@
-import { APIClanMember, APIPlayerHouse, OverrideOptions } from '../types';
 import { Client } from '../client/Client';
+import { APIClanMember, APIPlayerHouse, OverrideOptions } from '../types';
 import { League } from './League';
 export declare class ClanMember {
     client: Client;

package/dist/struct/ClanWar.d.ts

@@ -1,5 +1,5 @@
-import { APIClanWar, APIClanWarAttack, APIClanWarMember, APIWarClan } from '../types';
 import { Client } from '../client/Client';
+import { APIClanWar, APIClanWarAttack, APIClanWarMember, APIWarClan } from '../types';
 import { Badge } from './Badge';
 /** Represents a Clash of Clans War Attack. */
 export declare class ClanWarAttack {

package/dist/struct/ClanWarLeagueGroup.d.ts

@@ -1,8 +1,8 @@
-import { APIClanWarLeagueClan, APIClanWarLeagueClanMember, APIClanWarLeagueGroup, APIClanWarLeagueRound, OverrideOptions } from '../types';
 import { Client } from '../client/Client';
+import { APIClanWarLeagueClan, APIClanWarLeagueClanMember, APIClanWarLeagueGroup, APIClanWarLeagueRound, OverrideOptions } from '../types';
+import { Badge } from './Badge';
 import { ClanWar } from './ClanWar';
 import { Player } from './Player';
-import { Badge } from './Badge';
 /** Represents a Clan War League member.  */
 export declare class ClanWarLeagueClanMember {
     /** The member's name. */
@@ -46,7 +46,7 @@ export declare class ClanWarLeagueRound {
 export declare class ClanWarLeagueGroup {
     private readonly client;
     /** The CWL group's current war state. */
-    state: 'preparation' | 'inWar' | 'ended';
+    state: 'preparation' | 'inWar' | 'ended' | 'notInWar';
     /** Season Id of this CWL group. */
     season: string;
     /** Returns all participating clans. */
@@ -54,6 +54,8 @@ export declare class ClanWarLeagueGroup {
     /** An array containing all war tags for each round. */
     rounds: ClanWarLeagueRound[];
     constructor(client: Client, data: APIClanWarLeagueGroup);
+    /** Whether the clan is not in CWL group. */
+    get isNotInWar(): boolean;
     /** Total number of rounds for this CWL. */
     get totalRounds(): number;
     /**

package/dist/struct/ClanWarLeagueGroup.js

@@ -49,11 +49,16 @@ exports.ClanWarLeagueRound = ClanWarLeagueRound;
 class ClanWarLeagueGroup {
     constructor(client, data) {
         this.client = client;
-        // @ts-expect-error
         this.state = data.state;
-        this.season = data.season;
-        this.clans = data.clans.map((clan) => new ClanWarLeagueClan(client, clan));
-        this.rounds = data.rounds.map((round, i) => new ClanWarLeagueRound(round, i));
+        if (this.state !== 'notInWar') {
+            this.season = data.season;
+            this.clans = data.clans.map((clan) => new ClanWarLeagueClan(client, clan));
+            this.rounds = data.rounds.map((round, i) => new ClanWarLeagueRound(round, i));
+        }
+    }
+    /** Whether the clan is not in CWL group. */
+    get isNotInWar() {
+        return this.state === 'notInWar';
     }
     /** Total number of rounds for this CWL. */
     get totalRounds() {

package/dist/struct/ClanWarLog.d.ts

@@ -1,5 +1,5 @@
-import { APIClanWarLogEntry, APIWarLogClan } from '../types';
 import { Client } from '../client/Client';
+import { APIClanWarLogEntry, APIWarLogClan } from '../types';
 import { Badge } from './Badge';
 /**
  * Represents War Log Clan.

package/dist/struct/Player.d.ts

@@ -1,11 +1,11 @@
-import { APIPlayer, APIPlayerHouse, OverrideOptions } from '../types';
 import { Client } from '../client/Client';
-import { LegendStatistics } from './LegendStatistics';
+import { APIPlayer, APIPlayerHouse, OverrideOptions } from '../types';
 import { Achievement } from './Achievement';
-import { Hero, Spell, Troop } from './Unit';
-import { PlayerClan } from './PlayerClan';
-import { League } from './League';
 import { Label } from './Label';
+import { League } from './League';
+import { LegendStatistics } from './LegendStatistics';
+import { PlayerClan } from './PlayerClan';
+import { Hero, Spell, Troop } from './Unit';
 /** Represents a Clash of Clans Player. */
 export declare class Player {
     client: Client;

package/dist/struct/Player.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Player = void 0;
 const Constants_1 = require("../util/Constants");
-const LegendStatistics_1 = require("./LegendStatistics");
 const Achievement_1 = require("./Achievement");
-const Unit_1 = require("./Unit");
-const PlayerClan_1 = require("./PlayerClan");
-const League_1 = require("./League");
 const Label_1 = require("./Label");
+const League_1 = require("./League");
+const LegendStatistics_1 = require("./LegendStatistics");
+const PlayerClan_1 = require("./PlayerClan");
+const Unit_1 = require("./Unit");
 /** Represents a Clash of Clans Player. */
 class Player {
     constructor(client, data) {

package/dist/struct/PlayerClan.d.ts

@@ -1,5 +1,5 @@
-import { OverrideOptions, APIPlayerClan } from '../types';
 import { Client } from '../client/Client';
+import { APIPlayerClan, OverrideOptions } from '../types';
 import { Badge } from './Badge';
 /** Represents a Player's clan. */
 export declare class PlayerClan {

package/dist/struct/Ranking.d.ts

@@ -1,9 +1,9 @@
-import { APIClanRanking, APIClanBuilderBaseRanking, APIPlayerRanking, APIPlayerBuilderBaseRanking } from '../types';
 import { Client } from '../client/Client';
-import { PlayerClan } from './PlayerClan';
-import { Location } from './Location';
-import { League } from './League';
+import { APIClanBuilderBaseRanking, APIClanRanking, APIPlayerBuilderBaseRanking, APIPlayerRanking } from '../types';
 import { Badge } from './Badge';
+import { League } from './League';
+import { Location } from './Location';
+import { PlayerClan } from './PlayerClan';
 /** Represents the Player of seasonal legend league leader-board ranking. */
 export declare class SeasonRankedPlayer {
     /** The player's name. */

package/dist/struct/Ranking.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RankedClan = exports.RankedPlayer = exports.SeasonRankedPlayer = void 0;
 const Constants_1 = require("../util/Constants");
-const PlayerClan_1 = require("./PlayerClan");
-const Location_1 = require("./Location");
-const League_1 = require("./League");
 const Badge_1 = require("./Badge");
+const League_1 = require("./League");
+const Location_1 = require("./Location");
+const PlayerClan_1 = require("./PlayerClan");
 /** Represents the Player of seasonal legend league leader-board ranking. */
 class SeasonRankedPlayer {
     constructor(client, data) {

package/dist/struct/Unit.d.ts

@@ -1,4 +1,4 @@
-import { APIPlayerItem, APIPlayer } from '../types';
+import { APIPlayer, APIPlayerItem } from '../types';
 /** Represents a Player's Unit. */
 export declare class Unit {
     /** The name of this unit. */

package/dist/struct/index.d.ts

@@ -1,10 +1,12 @@
 export * from './Achievement';
 export * from './Badge';
+export * from './CapitalRaidSeason';
 export * from './Clan';
+export * from './ClanCapital';
 export * from './ClanMember';
 export * from './ClanWar';
-export * from './ClanWarLog';
 export * from './ClanWarLeagueGroup';
+export * from './ClanWarLog';
 export * from './Icon';
 export * from './LegendStatistics';
 export * from './Location';
@@ -13,5 +15,3 @@ export * from './PlayerClan';
 export * from './Ranking';
 export * from './Season';
 export * from './Unit';
-export * from './ClanCapital';
-export * from './CapitalRaidSeason';

package/dist/struct/index.js

@@ -16,11 +16,13 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Achievement"), exports);
 __exportStar(require("./Badge"), exports);
+__exportStar(require("./CapitalRaidSeason"), exports);
 __exportStar(require("./Clan"), exports);
+__exportStar(require("./ClanCapital"), exports);
 __exportStar(require("./ClanMember"), exports);
 __exportStar(require("./ClanWar"), exports);
-__exportStar(require("./ClanWarLog"), exports);
 __exportStar(require("./ClanWarLeagueGroup"), exports);
+__exportStar(require("./ClanWarLog"), exports);
 __exportStar(require("./Icon"), exports);
 __exportStar(require("./LegendStatistics"), exports);
 __exportStar(require("./Location"), exports);
@@ -29,5 +31,3 @@ __exportStar(require("./PlayerClan"), exports);
 __exportStar(require("./Ranking"), exports);
 __exportStar(require("./Season"), exports);
 __exportStar(require("./Unit"), exports);
-__exportStar(require("./ClanCapital"), exports);
-__exportStar(require("./CapitalRaidSeason"), exports);

package/dist/types/lib.d.ts

@@ -1,4 +1,4 @@
-import { QueueThrottler, BatchThrottler } from '../rest/Throttler';
+import { BatchThrottler, QueueThrottler } from '../rest/Throttler';
 export interface Store<T = any> {
     set: (key: string, value: T, ttl?: number) => boolean | Promise<boolean>;
     get: (key: string) => T | null | Promise<T | null>;
@@ -50,6 +50,10 @@ export interface PollingClientOptions extends ClientOptions {
 export interface RequestHandlerOptions extends ClientOptions {
     /** Set this `false` to use `res.ok` property. */
     rejectIfNotValid?: boolean;
+    /** The max number of clients to create. null if no limit. Default null. */
+    connections?: number;
+    /** The amount of concurrent requests to be sent over the single TCP/TLS connection according to RFC7230. Default: 1 */
+    pipelining?: number;
 }
 /** Search options for request. */
 export interface SearchOptions extends OverrideOptions {
@@ -88,16 +92,18 @@ export interface RequestOptions extends OverrideOptions {
     method?: string;
 }
 export interface Response<T> {
-    /** Whether the response is ok. */
-    ok: boolean;
     /** 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;
+    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/dist/util/Util.d.ts

@@ -1,4 +1,5 @@
 import { ClanSearchOptions, SearchOptions } from '../types';
+export declare function timeoutSignal(timeout: number): AbortSignal;
 /** Contains various general-purpose utility methods. */
 export declare class Util extends null {
     /**

package/dist/util/Util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Util = void 0;
+exports.Util = exports.timeoutSignal = void 0;
 const Constants_1 = require("../util/Constants");
 const TAG_CHARACTERS = '0289PYLQGRJCUV';
 const params = [
@@ -16,6 +16,20 @@ const params = [
     'after',
     'before'
 ];
+function timeoutSignal(timeout) {
+    if (!Number.isInteger(timeout)) {
+        throw new TypeError('Expected an integer for the timeout');
+    }
+    const controller = new AbortController();
+    if (timeout > 0) {
+        const timeoutId = setTimeout(() => {
+            controller.abort();
+        }, timeout);
+        timeoutId.unref();
+    }
+    return controller.signal;
+}
+exports.timeoutSignal = timeoutSignal;
 /** Contains various general-purpose utility methods. */
 class Util extends null {
     /**

package/package.json

@@ -1,8 +1,8 @@
 {
 	"name": "clashofclans.js",
-	"version": "3.1.2",
+	"version": "3.1.3-dev.048e4b9",
 	"description": "JavaScript library for interacting with the Clash of Clans API",
-	"author": "SUVAJIT <suvajit.me@gmail.com>",
+	"author": "https://clashofclans.js.org",
 	"license": "MIT",
 	"main": "dist/index.js",
 	"exports": {
@@ -42,25 +42,22 @@
 		}
 	},
 	"dependencies": {
-		"node-fetch": "^2.6.7"
+		"undici": "^5.23.0"
 	},
 	"devDependencies": {
-		"@types/node-fetch": "^2.5.12",
-		"gen-esm-wrapper": "^1.1.3",
-		"@types/node": "^18.6.4",
-		"@typescript-eslint/eslint-plugin": "^5.4.0",
-		"@typescript-eslint/parser": "^5.4.0",
+		"@types/node": "^18.17.5",
+		"@typescript-eslint/eslint-plugin": "^6.3.0",
+		"@typescript-eslint/parser": "^6.3.0",
 		"dotenv": "^16.0.2",
-		"eslint": "^8.3.0",
-		"eslint-config-marine": "^9.0.6",
-		"eslint-config-prettier": "^8.3.0",
-		"eslint-plugin-import": "^2.26.0",
-		"eslint-plugin-prettier": "^4.0.0",
-		"prettier": "^2.4.1",
-		"rimraf": "^3.0.2",
-		"typescript": "^4.7.4"
+		"eslint": "^8.47.0",
+		"eslint-config-prettier": "^9.0.0",
+		"eslint-plugin-prettier": "^5.0.0",
+		"gen-esm-wrapper": "^1.1.3",
+		"prettier": "^3.0.1",
+		"rimraf": "^5.0.1",
+		"typescript": "^5.1.6"
 	},
 	"engines": {
-		"node": ">=14.x"
+		"node": ">=16.x"
 	}
 }