clashofclans.js 3.3.5-dev.227b0d5 → 3.3.5-dev.560656b

package/dist/rest/RequestHandler.d.ts

@@ -43,6 +43,7 @@ export declare class RequestHandler extends EventEmitter {
     private readonly restRequestTimeout;
     private readonly throttler?;
     private readonly cached;
+    private readonly onError?;
     private readonly dispatcher;
     constructor(options?: RequestHandlerOptions);
     private get _keys();
@@ -52,6 +53,7 @@ export declare class RequestHandler extends EventEmitter {
     request<T>(path: string, options?: RequestOptions): Promise<Result<T>>;
     rawRequest<T>(path: string, options?: RequestOptions): Promise<T>;
     private exec;
+    private dispatch;
     init(options: LoginOptions): Promise<string[]>;
     private reValidateKeys;
     private login;

package/dist/rest/RequestHandler.js

@@ -25,6 +25,7 @@ class RequestHandler extends node_events_1.EventEmitter {
     constructor(options) {
         super();
         _RequestHandler_keyIndex.set(this, 0); // eslint-disable-line
+        this.onError = options?.onError;
         this.keys = options?.keys ?? [];
         this.retryLimit = options?.retryLimit ?? 0;
         this.throttler = options?.throttler ?? null;
@@ -76,9 +77,15 @@ class RequestHandler extends node_events_1.EventEmitter {
         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);
+        const result = await this.exec(path, options);
+        return result.body;
     }
     async exec(path, options = {}, retries = 0) {
+        const result = await this.dispatch(path, options, retries);
+        this.onError?.({ path, status: result.res.status, body: result.body });
+        return result;
+    }
+    async dispatch(path, options = {}, retries = 0) {
         try {
             const res = await this.dispatcher.request({
                 path: `/v1${path}`,

package/dist/types/lib.d.ts

@@ -55,6 +55,11 @@ export interface RequestHandlerOptions extends ClientOptions {
     connections?: number;
     /** The amount of concurrent requests to be sent over the single TCP/TLS connection according to RFC7230. Default: 1 */
     pipelining?: number;
+    onError?: (args: {
+        path: string;
+        status: number;
+        body: unknown;
+    }) => unknown;
 }
 /** Search options for request. */
 export interface SearchOptions extends OverrideOptions {

package/dist/util/Util.d.ts

@@ -33,12 +33,12 @@ export declare class Util extends null {
     static formatDate(date: string): Date;
     /** Returns a string containing a query string suitable for use in a URL. */
     static queryString(options?: SearchOptions | ClanSearchOptions): string;
-    private static getSeasonStart;
-    private static getSeasonEnd;
-    /** Get current trophy season Id. */
+    static getSeasonStart(inputDate: Date): Date;
+    static getSeasonEnd(inputDate: Date, forward?: boolean): Date;
+    /** Get the current season ID. */
     static getSeasonId(): string;
     /**
-     * Get the timestamp for the last Monday of the previous month.
+     * Get the season start and end timestamp.
      * @param {Date} timestamp - The reference date. Defaults to the current date if not provided.
      * @param {boolean} forward - Whether to forward to the next month if the returned date is in the past relative to the given timestamp. Defaults to true.
      */

package/dist/util/Util.js

@@ -63,7 +63,7 @@ class Util extends null {
      * ```
      */
     static encodeTag(tag) {
-        const formatted = this.formatTag(tag).substring(1);
+        const formatted = this.formatTag(tag).slice(1);
         if (!this.isValidTag(formatted)) {
             throw new TypeError(`Failed to encode tag ${formatted}. RegExp matching failed.`);
         }
@@ -120,12 +120,12 @@ class Util extends null {
         }
         return lastMonday;
     }
-    /** Get current trophy season Id. */
+    /** Get the current season ID. */
     static getSeasonId() {
-        return this.getSeasonEnd(new Date()).toISOString().substring(0, 7);
+        return this.getSeasonEnd(new Date()).toISOString().slice(0, 7);
     }
     /**
-     * Get the timestamp for the last Monday of the previous month.
+     * Get the season start and end timestamp.
      * @param {Date} timestamp - The reference date. Defaults to the current date if not provided.
      * @param {boolean} forward - Whether to forward to the next month if the returned date is in the past relative to the given timestamp. Defaults to true.
      */

package/dist/util.spec.js

@@ -5,7 +5,7 @@ describe('util', () => {
     it('should always be UTC', () => {
         expect(new Date().getTimezoneOffset()).toBe(0);
     });
-    it('should forward to next month if date is in past', async () => {
+    it('should forward to next month if the given date is in the past', async () => {
         const timestamp = new Date('2024-03-25T05:01');
         const { endTime, startTime } = Util_1.Util.getSeason(timestamp);
         const expectedEndTime = new Date('2024-04-29T05:00').toISOString();
@@ -13,6 +13,14 @@ describe('util', () => {
         expect(endTime.toISOString()).toBe(expectedEndTime);
         expect(startTime.toISOString()).toBe(expectedStartTime);
     });
+    it('should not forward to next month even if the given date is in the past', async () => {
+        const timestamp = new Date('2024-03-25T05:01');
+        const { endTime, startTime } = Util_1.Util.getSeason(timestamp, false);
+        const expectedEndTime = new Date('2024-03-25T05:00').toISOString();
+        const expectedStartTime = new Date('2024-02-26T05:00').toISOString();
+        expect(endTime.toISOString()).toBe(expectedEndTime);
+        expect(startTime.toISOString()).toBe(expectedStartTime);
+    });
     it('should return the correct season against a date', async () => {
         const timestamp = new Date('2024-03-16T05:01');
         const { endTime, startTime } = Util_1.Util.getSeason(timestamp);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "clashofclans.js",
-	"version": "3.3.5-dev.227b0d5",
+	"version": "3.3.5-dev.560656b",
 	"description": "JavaScript library for interacting with the Clash of Clans API",
 	"author": "https://clashofclans.js.org",
 	"license": "MIT",