feat: added queues to fetchBlitz

src/app/embeds/session/page.tsx

@@ -5,7 +5,7 @@ import { useEffect, useState } from 'react';
 import * as Breakdown from '../../../components/Breakdown';
 import { TreeTypeEnum } from '../../../components/Tanks';
 import { WARGAMING_APPLICATION_ID } from '../../../constants/wargamingApplicationID';
-import fetchBlitz from '../../../core/blitz/fetchWargaming';
+import fetchBlitz from '../../../core/blitz/fetchBlitz';
 import { tankAverages } from '../../../core/blitzstars/tankAverages';
 import {
   TankopediaEntry,

src/commands/searchClans.ts

@@ -2,7 +2,7 @@ import { SlashCommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
 import { REGION_NAMES, Region } from '../constants/regions';
 import { WARGAMING_APPLICATION_ID } from '../constants/wargamingApplicationID';
-import fetchBlitz from '../core/blitz/fetchWargaming';
+import fetchBlitz from '../core/blitz/fetchBlitz';
 import addClanChoices from '../core/discord/addClanChoices';
 import addRegionChoices from '../core/discord/addRegionChoices';
 import embedInfo from '../core/discord/embedInfo';

src/commands/searchPlayers.ts

@@ -2,7 +2,7 @@ import { SlashCommandBuilder } from 'discord.js';
 import markdownEscape from 'markdown-escape';
 import { REGION_NAMES, Region } from '../constants/regions';
 import { WARGAMING_APPLICATION_ID } from '../constants/wargamingApplicationID';
-import fetchBlitz from '../core/blitz/fetchWargaming';
+import fetchBlitz from '../core/blitz/fetchBlitz';
 import {
   AccountList,
   usernamePattern,

src/core/blitz/fetchBlitz.ts

@@ -0,0 +1,53 @@
+export type BlitzResponse<Data extends object> =
+  | {
+      status: 'error';
+      error: { field: string; message: string; code: 402; value: null };
+    }
+  | {
+      status: 'ok';
+      data: Data;
+    };
+
+const MAX_CALLS_PER_SECOND = 10;
+
+const queue: { url: string; resolve: (data: object) => void }[] = [];
+let inProgress = 0;
+
+async function manageQueue() {
+  if (queue.length > 0 && inProgress < MAX_CALLS_PER_SECOND) {
+    inProgress++;
+
+    setTimeout(() => {
+      inProgress--;
+    }, 1000);
+
+    const { url, resolve } = queue.shift()!;
+    const data = (await fetch(url)
+      .then((response) => response.json())
+      .catch((error) => ({ status: 'error', error }))) as BlitzResponse<
+      typeof resolve
+    >;
+
+    manageQueue();
+
+    if (data.status === 'ok') {
+      resolve(data.data);
+    } else {
+      throw new Error(`Wargaming response error status:"${data.status}"`, {
+        cause: `Message: "${data.error.message}"\nURL: "${url}"`,
+      });
+    }
+  }
+}
+
+export default function fetchBlitz<Data extends object>(url: string) {
+  return new Promise<BlitzResponse<Data>>((resolve) => {
+    queue.push({
+      url,
+      resolve(data) {
+        resolve(data as BlitzResponse<Data>);
+      },
+    });
+    manageQueue();
+  });
+}

src/core/blitz/fetchWargaming.ts

@@ -1,23 +0,0 @@
-export type BlitzResponse<Data extends object> =
-  | {
-      status: 'error';
-      error: { field: string; message: string; code: 402; value: null };
-    }
-  | {
-      status: 'ok';
-      data: Data;
-    };
-
-export default async function fetchBlitz<Data extends object>(url: string) {
-  const data = (await fetch(url).then((response) =>
-    response.json(),
-  )) as BlitzResponse<Data>;
-
-  if (data.status === 'ok') {
-    return data.data;
-  } else {
-    throw new Error(`Wargaming response error status:"${data.status}"`, {
-      cause: `Message: "${data.error.message}"\nURL: "${url}"`,
-    });
-  }
-}

src/core/blitz/getAccountAchievements.ts

@@ -1,6 +1,6 @@
 import { Region } from '../../constants/regions';
 import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID';
-import fetchBlitz from './fetchWargaming';
+import fetchBlitz from './fetchBlitz';
 import { normalizeIds } from './normalizeIds';
 
 interface IndividualAccountAchievements {

src/core/blitz/getAccountInfo.ts

@@ -1,6 +1,6 @@
 import { Region } from '../../constants/regions';
 import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID';
-import fetchBlitz from './fetchWargaming';
+import fetchBlitz from './fetchBlitz';
 import { normalizeIds } from './normalizeIds';
 
 export interface AllStats {

src/core/blitz/getClanAccountInfo.ts

@@ -1,6 +1,6 @@
 import { Region } from '../../constants/regions';
 import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID';
-import fetchBlitz from './fetchWargaming';
+import fetchBlitz from './fetchBlitz';
 import { normalizeExtra } from './normalizeExtra';
 import { normalizeIds } from './normalizeIds';
 

src/core/blitz/getClanInfo.ts

@@ -1,6 +1,6 @@
 import { Region } from '../../constants/regions';
 import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID';
-import fetchBlitz from './fetchWargaming';
+import fetchBlitz from './fetchBlitz';
 import { normalizeIds } from './normalizeIds';
 
 export interface IndividualClanInfo {

src/core/blitz/getTankStats.ts

@@ -2,7 +2,7 @@ import { Region } from '../../constants/regions';
 import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID';
 import { TanksStats } from '../../types/tanksStats';
 import { UserError } from '../blitzkrieg/userError';
-import fetchBlitz from './fetchWargaming';
+import fetchBlitz from './fetchBlitz';
 
 export default async function getTankStats(region: Region, id: number) {
   const tankStats = await fetchBlitz<TanksStats>(

src/core/blitz/searchClansAcrossRegions.ts

@@ -1,7 +1,7 @@
 import { Region } from '../../constants/regions';
 import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID';
 import { Clan, ClanList } from '../../types/clanList';
-import fetchBlitz from './fetchWargaming';
+import fetchBlitz from './fetchBlitz';
 
 export type ClanListWithRegion = (Clan & {
   region: 'com' | 'eu' | 'asia';

src/core/blitz/searchPlayersAcrossRegions.ts

@@ -1,6 +1,6 @@
 import { Region } from '../../constants/regions';
 import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID';
-import fetchBlitz from './fetchWargaming';
+import fetchBlitz from './fetchBlitz';
 
 interface Account {
   nickname: string;

src/core/blitzstars/tankopedia.ts

@@ -1,7 +1,7 @@
 import { deburr } from 'lodash';
 import { TreeTypeString } from '../../components/Tanks';
 import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID';
-import fetchBlitz from '../blitz/fetchWargaming';
+import fetchBlitz from '../blitz/fetchBlitz';
 import { context } from '../blitzkrieg/context';
 
 export interface TankopediaEntry {

src/stores/session.ts

@@ -4,7 +4,7 @@ import { devtools, persist } from 'zustand/middleware';
 import { CustomColumnDisplay } from '../app/tools/session/components/CustomColumn';
 import { Region } from '../constants/regions';
 import { WARGAMING_APPLICATION_ID } from '../constants/wargamingApplicationID';
-import fetchBlitz from '../core/blitz/fetchWargaming';
+import fetchBlitz from '../core/blitz/fetchBlitz';
 import { NormalizedTankStats, TanksStats } from '../types/tanksStats';
 
 type Session = (