fix: more imports 2

packages/core/src/blitz/generateStats.ts

@@ -0,0 +1,57 @@
+import { BlitzStats, calculateWN8 } from '@blitzkit/core';
+
+export type Stat = keyof ReturnType<typeof generateStats>;
+
+export const STAT_NAMES: Record<Stat, string> = {
+  battles: 'Battles',
+  winrate: 'Winrate',
+  wn8: 'WN8',
+  averageDamage: 'Damage',
+  damage: 'Accumulated damage',
+  wins: 'Wins',
+};
+
+export const STAT_KEYS = Object.keys(STAT_NAMES) as Stat[];
+
+export function generateStats(s: BlitzStats, e?: BlitzStats) {
+  return {
+    battles: s.battles,
+    wins: s.wins,
+    winrate: s.wins / s.battles,
+    wn8: e ? calculateWN8(e, s) : null,
+    damage: s.damage_dealt,
+    averageDamage: s.damage_dealt / s.battles,
+  };
+}
+
+export function prettifyStats(s: ReturnType<typeof generateStats>) {
+  return {
+    battles: `${s.battles}`,
+    wins: `${s.wins}`,
+    winrate: `${(s.winrate * 100).toFixed(0)}%`,
+    wn8: s.wn8 ? s.wn8.toFixed(0) : '--',
+    damage: `${s.damage}`,
+    averageDamage: s.averageDamage.toFixed(0),
+  } satisfies Record<Stat, string>;
+}
+
+export function sumBlitzStarsStats(s: ReturnType<typeof generateStats>[]) {
+  function sum(slice: (stat: ReturnType<typeof generateStats>) => number) {
+    return s.reduce((a, b) => a + slice(b), 0);
+  }
+
+  const battles = sum((s) => s.battles);
+  const wins = sum((s) => s.wins);
+  const damage = sum((s) => s.damage);
+
+  return {
+    battles,
+    wins,
+    winrate: wins / battles,
+    damage,
+    averageDamage: damage / battles,
+    wn8:
+      sum((s) => (s.wn8 ? s.wn8 * s.battles : 0)) /
+      sum((s) => (s.wn8 ? s.battles : 0)),
+  } satisfies ReturnType<typeof generateStats>;
+}

packages/core/src/blitz/getAccountAchievements.ts

@@ -0,0 +1,35 @@
+import { Region } from '@blitzkit/core';
+import { fetchBlitz } from '@blitzkit/core/src/blitz/fetchBlitz';
+import { normalizeIds } from '../../../website/src/core/blitz/normalizeIds';
+
+interface IndividualAccountAchievements {
+  achievements: {
+    [achievement: string]: number;
+  };
+  max_series: {
+    [achievement: string]: number;
+  };
+}
+
+export interface AccountAchievements {
+  [id: number]: IndividualAccountAchievements;
+}
+
+export async function getAccountAchievements<
+  Ids extends number | number[],
+  ReturnType = Ids extends number
+    ? IndividualAccountAchievements
+    : IndividualAccountAchievements[],
+>(region: Region, ids: Ids) {
+  const object = await fetchBlitz<AccountAchievements>(
+    region,
+    'account/achievements',
+    { account_id: normalizeIds(ids) },
+  );
+
+  if (typeof ids === 'number') {
+    return object[ids as number] as ReturnType;
+  } else {
+    return ids.map((id) => object[id]) as ReturnType;
+  }
+}

packages/core/src/blitz/getAccountInfo.ts

@@ -0,0 +1,98 @@
+import { BlitzStats, Region } from '@blitzkit/core';
+import {
+  FetchBlitzParams,
+  fetchBlitz,
+} from '@blitzkit/core/src/blitz/fetchBlitz';
+import { normalizeIds } from '../../../website/src/core/blitz/normalizeIds';
+
+export interface SupplementaryStats {
+  WN8?: number;
+  tier?: number;
+}
+
+export interface ClanStats {
+  spotted: number;
+  max_frags_tank_id: number;
+  hits: number;
+  frags: number;
+  max_xp: number;
+  max_xp_tank_id: number;
+  wins: number;
+  losses: number;
+  capture_points: number;
+  battles: number;
+  damage_dealt: number;
+  damage_received: number;
+  max_frags: number;
+  shots: number;
+  frags8p: number;
+  xp: number;
+  win_and_survived: number;
+  survived_battles: number;
+  dropped_capture_points: number;
+}
+
+export interface RatingStats {
+  spotted: number;
+  calibration_battles_left: number;
+  hits: number;
+  frags: number;
+  recalibration_start_time: number;
+  mm_rating: number;
+  wins: number;
+  losses: number;
+  is_recalibration: boolean;
+  capture_points: number;
+  battles: number;
+  damage_dealt: number;
+  damage_received: number;
+  shots: number;
+  frags8p: number;
+  xp: number;
+  win_and_survived: number;
+  survived_battles: number;
+  dropped_capture_points: number;
+}
+
+export interface IndividualAccountInfo {
+  account_id: number;
+  created_at: number;
+  updated_at: number;
+  private: null;
+  last_battle_time: number;
+  nickname: string;
+  statistics: {
+    all: BlitzStats;
+    clan: ClanStats;
+    rating?: RatingStats;
+    frags: null | number;
+  };
+}
+
+export interface AccountInfo {
+  [accountId: number]: IndividualAccountInfo;
+}
+
+export async function getAccountInfo<
+  Ids extends number | number[],
+  ReturnType = Ids extends number
+    ? IndividualAccountInfo
+    : IndividualAccountInfo[],
+>(
+  region: Region,
+  ids: Ids,
+  extra: string[] = [],
+  params: FetchBlitzParams = {},
+) {
+  const object = await fetchBlitz<AccountInfo>(region, 'account/info', {
+    account_id: normalizeIds(ids),
+    extra: extra.length === 0 ? undefined : extra.join(','),
+    ...params,
+  });
+
+  if (typeof ids === 'number') {
+    return object[ids as number] as ReturnType;
+  } else {
+    return ids.map((id) => object[id]) as ReturnType;
+  }
+}

packages/core/src/blitz/getClanAccountInfo.ts

@@ -0,0 +1,46 @@
+import { Region } from '@blitzkit/core';
+import { fetchBlitz } from '@blitzkit/core/src/blitz/fetchBlitz';
+import { normalizeIds } from '../../../website/src/core/blitz/normalizeIds';
+
+type IndividualClanAccountInfo = {
+  account_id: number;
+  joined_at: number;
+  clan_id: number;
+  role: string;
+  account_name: string;
+
+  clan?: {
+    members_count: number;
+    name: string;
+    created_at: number;
+    tag: string;
+    clan_id: number;
+    emblem_set_id: number;
+  };
+} | null;
+
+interface ClanAccountInfo {
+  [accountId: number]: IndividualClanAccountInfo;
+}
+
+export async function getClanAccountInfo<
+  Ids extends number | number[],
+  ReturnType = Ids extends number
+    ? IndividualClanAccountInfo
+    : IndividualClanAccountInfo[],
+>(region: Region, ids: Ids, extra: string[] = []) {
+  const object = await fetchBlitz<ClanAccountInfo>(
+    region,
+    'clans/accountinfo',
+    {
+      account_id: normalizeIds(ids),
+      extra: extra.length === 0 ? undefined : extra.join(','),
+    },
+  );
+
+  if (typeof ids === 'number') {
+    return object[ids as number] as ReturnType;
+  } else {
+    return ids.map((id) => object[id]) as ReturnType;
+  }
+}

packages/core/src/blitz/getClanInfo.ts

@@ -0,0 +1,51 @@
+import { Region } from '@blitzkit/core';
+import { fetchBlitz } from '@blitzkit/core/src/blitz/fetchBlitz';
+import { normalizeIds } from '../../../website/src/core/blitz/normalizeIds';
+
+interface IndividualClanInfo {
+  recruiting_options: {
+    vehicles_level: number;
+    wins_ratio: number;
+    average_battles_per_day: number;
+    battles: number;
+    average_damage: number;
+  };
+  members_count: number;
+  name: string;
+  creator_name: string;
+  clan_id: number;
+  created_at: number;
+  updated_at: number;
+  leader_name: string;
+  members_ids: number[];
+  recruiting_policy: string;
+  tag: string;
+  is_clan_disbanded: boolean;
+  old_name: string;
+  emblem_set_id: number;
+  creator_id: number;
+  motto: string;
+  renamed_at: number;
+  old_tag: null;
+  leader_id: number;
+  description: string;
+}
+
+interface ClanInfo {
+  [clanId: number]: IndividualClanInfo;
+}
+
+export async function getClanInfo<
+  Ids extends number | number[],
+  ReturnType = Ids extends number ? IndividualClanInfo : IndividualClanInfo[],
+>(region: Region, ids: Ids) {
+  const object = await fetchBlitz<ClanInfo>(region, 'clans/info', {
+    clan_id: normalizeIds(ids),
+  });
+
+  if (typeof ids === 'number') {
+    return object[ids as number] as ReturnType;
+  } else {
+    return ids.map((id) => object[id]) as ReturnType;
+  }
+}

packages/core/src/blitz/getRatingLeague.ts

@@ -0,0 +1,27 @@
+import { LeagueTop, RatingPlayer, Region } from '@blitzkit/core';
+import { regionToRegionSubdomain } from '../../../website/src/core/blitz/regionToRegionSubdomain';
+import { context } from '../../../website/src/core/blitzkit/context';
+import { patientFetch } from '../../../website/src/core/blitzkit/patientFetch';
+
+export async function getRatingLeague(
+  region: Region,
+  league: number,
+  usePatientFetcher = false,
+) {
+  const fetcher = (url: string) =>
+    usePatientFetcher
+      ? patientFetch(url, undefined, { cache: 'no-store' })
+      : fetch(url, { cache: 'no-store' });
+  const response = await fetcher(
+    context === 'website'
+      ? `/api/${region}/rating/current/league/${league}`
+      : `https://${regionToRegionSubdomain(
+          region,
+        )}.wotblitz.com/en/api/rating-leaderboards/league/${league}/top/`,
+  );
+  const json = await response.json();
+
+  return context === 'website'
+    ? (json as RatingPlayer[])
+    : (json as LeagueTop).result;
+}

packages/core/src/blitz/getRatingNeighbors.ts

@@ -0,0 +1,26 @@
+import { RatingNeighbors, Region } from '@blitzkit/core';
+import { regionToRegionSubdomain } from '../../../website/src/core/blitz/regionToRegionSubdomain';
+import { patientFetch } from '../../../website/src/core/blitzkit/patientFetch';
+import { withCORSProxy } from '../../../website/src/core/blitzkit/withCORSProxy';
+
+export async function getRatingNeighbors(
+  region: Region,
+  id: number,
+  count: number,
+  usePatientFetcher = false,
+) {
+  const fetcher = (url: string) =>
+    usePatientFetcher
+      ? patientFetch(url, undefined, { cache: 'no-store' })
+      : fetch(url, { cache: 'no-store' });
+  const response = await fetcher(
+    withCORSProxy(
+      `https://${regionToRegionSubdomain(
+        region,
+      )}.wotblitz.com/en/api/rating-leaderboards/user/${id}/?neighbors=${count}`,
+    ),
+  );
+  const json = (await response.json()) as RatingNeighbors;
+
+  return json;
+}

packages/core/src/blitz/getTankStats.ts

@@ -0,0 +1,18 @@
+import { Region, TanksStats } from '@blitzkit/core';
+import {
+  fetchBlitz,
+  FetchBlitzParams,
+} from '@blitzkit/core/src/blitz/fetchBlitz';
+
+export async function getTankStats(
+  region: Region,
+  id: number,
+  params?: FetchBlitzParams,
+) {
+  const tankStats = await fetchBlitz<TanksStats>(region, 'tanks/stats', {
+    account_id: id,
+    ...params,
+  });
+
+  return tankStats[id];
+}

packages/core/src/blitz/index.ts

@@ -2,8 +2,16 @@ export * from './clans';
 export * from './constants';
 export * from './equipmentPrice';
 export * from './fetchBlitz';
+export * from './generateStats';
+export * from './getAccountAchievements';
+export * from './getAccountInfo';
+export * from './getClanAccountInfo';
+export * from './getClanInfo';
 export * from './getLeagueFromScore';
 export * from './getRatingInfo';
+export * from './getRatingLeague';
+export * from './getRatingNeighbors';
+export * from './getTankStats';
 export * from './idToRegion';
 export * from './nations';
 export * from './permanentSkills';

packages/core/src/statistics/deltaBkrlBlitzStats.ts

@@ -1,4 +1,4 @@
-import { RatingStats } from '../../../website/src/core/blitz/getAccountInfo';
+import { RatingStats } from '../blitz/getAccountInfo';
 import { BkrlSuperset1Entry } from '../streams/bkrl';
 
 export function deltaBkrlBlitzStats(

packages/core/src/statistics/filterStats.ts

@@ -1,9 +1,9 @@
-import { SupplementaryStats } from '../../../website/src/core/blitz/getAccountInfo';
+import { SupplementaryStats } from '../blitz/getAccountInfo';
 import { tankDefinitions, TreeType } from '../blitzkit/tankDefinitions';
 import { blitzStarsTankAverages } from '../blitzstars/tankAverages';
 import { calculateWN8 } from './calculateWN8';
 import { BlitzStats } from './compositeStats';
-import { sumStats } from './sumStats';
+import { sumAllStats } from './sumAllStats';
 
 export interface StatFilters {
   nation?: string;
@@ -38,7 +38,7 @@ export async function filterStats(
       (filters.tank === undefined || entry.id === filters.tank)
     );
   });
-  const stats = sumStats(filteredOrder.map((id) => diff[id]));
+  const stats = sumAllStats(filteredOrder.map((id) => diff[id]));
   const battlesOfTanksWithAverages = filteredOrder.reduce<number>(
     (accumulator, id) =>
       awaitedTankAverages[id] ? accumulator + diff[id].battles : accumulator,

packages/core/src/statistics/index.ts

@@ -7,4 +7,4 @@ export * from './getBkniPercentile';
 export * from './getTierWeights';
 export * from './getWN8Percentile';
 export * from './percentiles';
-export * from './sumStats';
+export * from './sumAllStats';

packages/core/src/statistics/sumAllStats.ts

@@ -1,7 +1,7 @@
 import { emptyAllStats } from '..';
 import { BlitzStats } from './compositeStats/constants';
 
-export function sumStats(allStatsCollection: BlitzStats[]) {
+export function sumAllStats(allStatsCollection: BlitzStats[]) {
   return allStatsCollection.reduce((accumulated, current) => {
     function sum(value: (allStats: BlitzStats) => number) {
       return value(accumulated) + value(current);