Merge branch 'JhaSourav07:main' into main

Author: YerraguntaAjayKumar

app/customize/components/ThemeSelector.test.tsx

@@ -3,7 +3,6 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { ThemeSelector } from './ThemeSelector';
 import { THEME_KEYS } from '../types';
-import userEvent from '@testing-library/user-event';
 
 describe('ThemeSelector', () => {
   const onThemeChange = vi.fn();

lib/rate-limit.test.ts

@@ -108,6 +108,38 @@ describe('rateLimit', () => {
   });
 });
 
+it('keys expire exactly at the window limit with sliding time advances', async () => {
+  vi.useFakeTimers();
+  const ip = '9.9.9.9';
+  const windowMs = 1000;
+  const limit = 5;
+
+  // First request: creates the tracker with 1s TTL
+  let res = await rateLimit(ip, limit, windowMs);
+  expect(res.success).toBe(true);
+  expect(res.remaining).toBe(limit - 1);
+
+  // Advance half the window and make another request
+  vi.advanceTimersByTime(500);
+  res = await rateLimit(ip, limit, windowMs);
+  expect(res.success).toBe(true);
+
+  // Advance to exactly the original window boundary (total = 1000ms)
+  vi.advanceTimersByTime(500);
+
+  // At the exact boundary the entry should still be considered valid
+  res = await rateLimit(ip, limit, windowMs);
+  expect(res.success).toBe(true);
+
+  // Move just past the window expiry
+  vi.advanceTimersByTime(1);
+
+  // Now the key must have expired and a fresh window starts
+  res = await rateLimit(ip, limit, windowMs);
+  expect(res.success).toBe(true);
+  expect(res.remaining).toBe(limit - 1);
+});
+
 it('allows requests after many expired IP entries', async () => {
   const windowMs = 1000;
 

lib/rate-limit.ts

@@ -107,6 +107,24 @@ export class RateLimiter {
   async reset(ip: string): Promise<void> {
     await this.cache.delete(ip);
   }
+  /**
+   * Returns the number of remaining requests allowed for a given IP
+   * in the current window.
+   *
+   * Does not consume a request — use `check()` for that.
+   *
+   * @param ip - The IP address to check.
+   * @returns Promise resolving to the number of remaining requests,
+   *          or the full limit if the IP has no recorded requests.
+   *
+   * @example
+   * const left = await rateLimiter.remaining("192.168.1.1");
+   * console.log(`You have ${left} requests left.`);
+   */
+  async remaining(ip: string): Promise<number> {
+    const current = (await this.cache.get(ip)) ?? 0;
+    return Math.max(0, this.limit - current);
+  }
 
   allow(ip: string): void {
     this.allowlist.add(ip);

lib/validations.test.ts

@@ -552,16 +552,15 @@ describe('streakParamsSchema — boolean transform fields', () => {
   });
 
   // ── hide_background ────────────────────────────────────────────────────────
-  // Stricter than hide_title/hide_stats — only exact 'true' is accepted,
-  // '1' does NOT enable it.
+  // Same dual-value rule as hide_title/hide_stats: 'true' and '1' are both truthy.
 
   describe('hide_background', () => {
     it('returns true when hide_background="true"', () => {
       expect(parse({ hide_background: 'true' }).hide_background).toBe(true);
     });
 
-    it('returns false when hide_background="1" (only exact "true" accepted)', () => {
-      expect(parse({ hide_background: '1' }).hide_background).toBe(false);
+    it('returns true when hide_background="1" (both "true" and "1" accepted)', () => {
+      expect(parse({ hide_background: '1' }).hide_background).toBe(true);
     });
 
     it('returns false when hide_background="false"', () => {

lib/validations.ts

@@ -171,7 +171,7 @@ export const streakParamsSchema = z.object({
     ),
   refresh: z.string().optional().transform(toRefreshFlag),
   hide_title: z.string().optional().transform(toBooleanFlag),
-  hide_background: z.string().optional().transform(toRefreshFlag),
+  hide_background: z.string().optional().transform(toBooleanFlag),
   hide_stats: z.string().optional().transform(toBooleanFlag),
   lang: z.string().optional().default('en'),
   // Unknown view values fall back to the default dashboard view.

package-lock.json

@@ -89,14 +89,18 @@ describe('trackUser', () => {
 
   it('handles empty username without crashing', () => {
     const sendBeaconMock = vi.fn().mockReturnValue(true);
+    const fetchMock = vi.fn();
 
     Object.defineProperty(navigator, 'sendBeacon', {
       value: sendBeaconMock,
       configurable: true,
     });
 
+    vi.stubGlobal('fetch', fetchMock);
+
     expect(() => trackUser('')).not.toThrow();
     expect(sendBeaconMock).not.toHaveBeenCalled();
+    expect(fetchMock).not.toHaveBeenCalled();
   });
 
   it('falls back to fetch when sendBeacon returns false', () => {