clashofclans.js 3.5.2-dev.50a7e99 → 3.5.4-dev.074d698

package/dist/util/Util.d.ts

@@ -54,6 +54,16 @@ export declare class Util extends null {
         endTime: Date;
         seasonId: string;
     };
+    static getTournamentWindow(timestamp?: Date): {
+        id: string;
+        startTime: Date;
+        endTime: Date;
+    };
+    static getTournamentWindowById(id: string): {
+        id: string;
+        startTime: Date;
+        endTime: Date;
+    };
     static allSettled<T>(values: Promise<T>[]): Promise<T[]>;
     static delay(ms: number): Promise<unknown>;
 }

package/dist/util/Util.js

@@ -169,9 +169,9 @@ class Util extends null {
                 seasonId
             };
         }
-        const [yearStr, monthStr] = seasonId.split('-');
-        const targetYear = parseInt(yearStr, 10);
-        const targetMonth = parseInt(monthStr, 10); // 1..12
+        const date = new Date(seasonId);
+        const targetYear = date.getUTCFullYear();
+        const targetMonth = date.getUTCMonth() + 1; // 1..12
         const referenceDate = new Date('2025-10-06T05:00:00.000Z');
         // Only handle the post-6 Oct seasons with 28-day intervals
         const refYear = referenceDate.getUTCFullYear();
@@ -195,6 +195,32 @@ class Util extends null {
         const endTime = new Date(startTime.getTime() + seasonDuration);
         return { startTime, endTime, seasonId };
     }
+    static getTournamentWindow(timestamp) {
+        const now = timestamp ?? new Date();
+        const day = now.getUTCDay(); // 0=Sun, 1=Mon, ..., 6=Sat
+        const hour = now.getUTCHours();
+        // Days since last Monday
+        let daysSinceMonday = (day + 6) % 7; // e.g., if Mon -> 0, Tue -> 1, etc.
+        // If today is Monday but before 5 AM, move back one full week
+        if (day === 1 && hour < 5) {
+            daysSinceMonday = 7;
+        }
+        // Last Monday 5:00 AM UTC
+        const lastMonday = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate() - daysSinceMonday, 5, 0, 0, 0));
+        // Next Monday 5:00 AM UTC (7 days after last Monday)
+        const nextMonday = new Date(Date.UTC(lastMonday.getUTCFullYear(), lastMonday.getUTCMonth(), lastMonday.getUTCDate() + 7, 5, 0, 0, 0));
+        const year = lastMonday.getUTCFullYear();
+        const month = String(lastMonday.getUTCMonth() + 1).padStart(2, '0');
+        const dayOfMonth = String(lastMonday.getUTCDate()).padStart(2, '0');
+        return {
+            id: `${year}-${month}-${dayOfMonth}`,
+            startTime: lastMonday,
+            endTime: nextMonday
+        };
+    }
+    static getTournamentWindowById(id) {
+        return this.getTournamentWindow(new Date(`${id}T05:00:00.000Z`));
+    }
     static async allSettled(values) {
         return (await Promise.allSettled(values))
             .filter((res) => res.status === 'fulfilled')

package/dist/util.spec.js

@@ -86,7 +86,6 @@ describe('util', () => {
     });
     it('should pass Aug 2025 (seasonId)', async () => {
         const { endTime, startTime, seasonId } = Util_1.Util.getSeasonById('2025-08');
-        console.log({ endTime, startTime, seasonId });
         const expectedStartTime = new Date('2025-07-28T05:00').toISOString();
         const expectedEndTime = new Date('2025-08-25T05:00').toISOString();
         expect(startTime.toISOString()).toBe(expectedStartTime);
@@ -95,7 +94,6 @@ describe('util', () => {
     });
     it('should pass March 2024 (seasonId)', async () => {
         const { endTime, startTime, seasonId } = Util_1.Util.getSeasonById('2024-03');
-        console.log({ endTime, startTime, seasonId });
         const expectedEndTime = new Date('2024-03-25T05:00').toISOString();
         const expectedStartTime = new Date('2024-02-26T05:00').toISOString();
         expect(endTime.toISOString()).toBe(expectedEndTime);
@@ -104,7 +102,6 @@ describe('util', () => {
     });
     it('should pass Sep 2025 (seasonId)', async () => {
         const { endTime, startTime, seasonId } = Util_1.Util.getSeasonById('2025-09');
-        console.log({ endTime, startTime, seasonId });
         const expectedStartTime = new Date('2025-08-25T05:00').toISOString();
         const expectedEndTime = new Date('2025-10-06T05:00').toISOString();
         expect(startTime.toISOString()).toBe(expectedStartTime);
@@ -113,7 +110,6 @@ describe('util', () => {
     });
     it('should pass October 2025 (seasonId)', async () => {
         const { endTime, startTime, seasonId } = Util_1.Util.getSeasonById('2025-10');
-        console.log({ endTime, startTime, seasonId });
         const expectedStartTime = new Date('2025-10-06T05:00').toISOString();
         const expectedEndTime = new Date('2025-11-03T05:00').toISOString();
         expect(startTime.toISOString()).toBe(expectedStartTime);
@@ -122,7 +118,6 @@ describe('util', () => {
     });
     it('should pass Dec 2025 (seasonId)', async () => {
         const { endTime, startTime, seasonId } = Util_1.Util.getSeasonById('2025-12');
-        console.log({ endTime, startTime, seasonId });
         const expectedStartTime = new Date('2025-12-01T05:00').toISOString();
         const expectedEndTime = new Date('2025-12-29T05:00').toISOString();
         expect(startTime.toISOString()).toBe(expectedStartTime);
@@ -131,7 +126,6 @@ describe('util', () => {
     });
     it('should pass Jan 2026 (seasonId)', async () => {
         const { endTime, startTime, seasonId } = Util_1.Util.getSeasonById('2026-01');
-        console.log({ endTime, startTime, seasonId });
         const expectedStartTime = new Date('2025-12-29T05:00').toISOString();
         const expectedEndTime = new Date('2026-01-26T05:00').toISOString();
         expect(startTime.toISOString()).toBe(expectedStartTime);
@@ -140,11 +134,74 @@ describe('util', () => {
     });
     it('should pass Feb 2026 (seasonId)', async () => {
         const { endTime, startTime, seasonId } = Util_1.Util.getSeasonById('2026-02');
-        console.log({ endTime, startTime, seasonId });
         const expectedStartTime = new Date('2026-01-26T05:00').toISOString();
         const expectedEndTime = new Date('2026-02-23T05:00').toISOString();
         expect(startTime.toISOString()).toBe(expectedStartTime);
         expect(endTime.toISOString()).toBe(expectedEndTime);
         expect(seasonId).toBe('2026-02');
     });
+    // tournament window
+    it('should get the correct tournament window for a Wednesday', async () => {
+        const timestamp = new Date('2024-03-20T10:00'); // Wednesday
+        const { endTime, startTime } = Util_1.Util.getTournamentWindow(timestamp);
+        const expectedStartTime = new Date('2024-03-18T05:00').toISOString(); // Last Monday 5 AM UTC
+        const expectedEndTime = new Date('2024-03-25T05:00').toISOString(); // Next Monday 5 AM UTC
+        expect(startTime.toISOString()).toBe(expectedStartTime);
+        expect(endTime.toISOString()).toBe(expectedEndTime);
+    });
+    it('should get the correct tournament window for a Monday after 5 AM', async () => {
+        const timestamp = new Date('2024-03-18T10:00'); // Monday after 5 AM
+        const { endTime, startTime } = Util_1.Util.getTournamentWindow(timestamp);
+        const expectedStartTime = new Date('2024-03-18T05:00').toISOString(); // Last Monday 5 AM UTC
+        const expectedEndTime = new Date('2024-03-25T05:00').toISOString(); // Next Monday 5 AM UTC
+        expect(startTime.toISOString()).toBe(expectedStartTime);
+        expect(endTime.toISOString()).toBe(expectedEndTime);
+    });
+    it('should get the correct tournament window for a Monday before 5 AM', async () => {
+        const timestamp = new Date('2024-03-18T04:00'); // Monday before 5 AM
+        const { endTime, startTime } = Util_1.Util.getTournamentWindow(timestamp);
+        const expectedStartTime = new Date('2024-03-11T05:00').toISOString(); // Last Monday 5 AM UTC (a week earlier)
+        const expectedEndTime = new Date('2024-03-18T05:00').toISOString(); // Next Monday 5 AM UTC
+        expect(startTime.toISOString()).toBe(expectedStartTime);
+        expect(endTime.toISOString()).toBe(expectedEndTime);
+    });
+    it('should get the correct tournament window for a Sunday', async () => {
+        const timestamp = new Date('2024-03-17T10:00'); // Sunday
+        const { endTime, startTime } = Util_1.Util.getTournamentWindow(timestamp);
+        const expectedStartTime = new Date('2024-03-11T05:00').toISOString(); // Last Monday 5 AM UTC
+        const expectedEndTime = new Date('2024-03-18T05:00').toISOString(); // Next Monday 5 AM UTC
+        expect(startTime.toISOString()).toBe(expectedStartTime);
+        expect(endTime.toISOString()).toBe(expectedEndTime);
+    });
+    it('should pass 5am Monday', async () => {
+        const timestamp = new Date('2025-10-06T05:00');
+        const { endTime, startTime } = Util_1.Util.getTournamentWindow(timestamp);
+        const expectedStartTime = new Date('2025-10-06T05:00').toISOString(); // Last Monday 5 AM UTC
+        const expectedEndTime = new Date('2025-10-13T05:00').toISOString(); // Next Monday 5 AM UTC
+        expect(startTime.toISOString()).toBe(expectedStartTime);
+        expect(endTime.toISOString()).toBe(expectedEndTime);
+    });
+    it('should pass 4:59am Monday', async () => {
+        const timestamp = new Date('2025-10-06T04:59');
+        const { endTime, startTime } = Util_1.Util.getTournamentWindow(timestamp);
+        const expectedStartTime = new Date('2025-09-29T05:00').toISOString();
+        const expectedEndTime = new Date('2025-10-06T05:00').toISOString();
+        expect(startTime.toISOString()).toBe(expectedStartTime);
+        expect(endTime.toISOString()).toBe(expectedEndTime);
+    });
+    it('should pass End of year', async () => {
+        const timestamp = new Date('2025-12-30T05:00');
+        const { endTime, startTime } = Util_1.Util.getTournamentWindow(timestamp);
+        const expectedStartTime = new Date('2025-12-29T05:00').toISOString();
+        const expectedEndTime = new Date('2026-01-05T05:00').toISOString();
+        expect(startTime.toISOString()).toBe(expectedStartTime);
+        expect(endTime.toISOString()).toBe(expectedEndTime);
+    });
+    it('should pass End of year (ID)', async () => {
+        const { endTime, startTime } = Util_1.Util.getTournamentWindowById('2025-12-30');
+        const expectedStartTime = new Date('2025-12-29T05:00').toISOString();
+        const expectedEndTime = new Date('2026-01-05T05:00').toISOString();
+        expect(startTime.toISOString()).toBe(expectedStartTime);
+        expect(endTime.toISOString()).toBe(expectedEndTime);
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "clashofclans.js",
-	"version": "3.5.2-dev.50a7e99",
+	"version": "3.5.4-dev.074d698",
 	"description": "JavaScript library for interacting with the Clash of Clans API",
 	"author": "https://clashofclans.js.org",
 	"license": "MIT",