mirror of
https://github.com/blitzkit/blitzkit.git
synced 2026-10-21 18:57:03 +02:00
feat: moved tankopedia and tankaverages into a runtime cache
This commit is contained in:
1 parent
95b105cb65
commit
00b721f34f
29 files changed
+268
-235
No files matched your search
+1
-24
@@ -1,5 +1,5 @@
|
||||
import { build } from 'esbuild';
|
||||
import { copyFile, mkdir, rm, writeFile } from 'fs/promises';
|
||||
import { copyFile, mkdir, rm } from 'fs/promises';
|
||||
import { argv } from 'process';
|
||||
|
||||
const isProd = !argv.includes('--dev');
|
||||
@@ -17,29 +17,6 @@ if (isProd) {
|
||||
await mkdir('dist');
|
||||
console.log('✅ Dist created');
|
||||
|
||||
console.log('🟡 Caching tankopedia...');
|
||||
fetch('https://www.blitzstars.com/bs-tankopedia.json')
|
||||
.then((response) => response.text())
|
||||
.then((tankopedia) => writeFile('./dist/tankopedia.json', tankopedia))
|
||||
.then(() => console.log('✅ Tankopedia cached'));
|
||||
|
||||
console.log('🟡 Caching tank averages...');
|
||||
fetch('https://www.blitzstars.com/api/tankaverages.json')
|
||||
.then((response) => response.json())
|
||||
.then((individualTankAverages) => {
|
||||
const tankAverages = {};
|
||||
|
||||
individualTankAverages.forEach((individualTankAverage) => {
|
||||
tankAverages[individualTankAverage.tank_id] = individualTankAverage;
|
||||
});
|
||||
|
||||
return writeFile(
|
||||
'./dist/tankaverages.json',
|
||||
JSON.stringify(tankAverages),
|
||||
);
|
||||
})
|
||||
.then(() => console.log('✅ Tank averages cached'));
|
||||
|
||||
console.log('🟡 Copying package.json...');
|
||||
copyFile('package.dist.json', 'dist/package.json').then(() =>
|
||||
console.log('✅ package.json copied'),
|
||||
|
||||
@@ -12,14 +12,14 @@ const executionStart = new Date().getTime();
|
||||
|
||||
export const debugCommand: CommandRegistry = {
|
||||
inProduction: true,
|
||||
inDevelopment: false,
|
||||
inDevelopment: true,
|
||||
inPublic: true,
|
||||
|
||||
command: new SlashCommandBuilder()
|
||||
.setName('debug')
|
||||
.setDescription('Debug information about the bot'),
|
||||
|
||||
handler(interaction) {
|
||||
async handler(interaction) {
|
||||
const currentTime = new Date().getTime();
|
||||
const uptime = currentTime - executionStart;
|
||||
|
||||
@@ -37,8 +37,8 @@ export const debugCommand: CommandRegistry = {
|
||||
(uptime / 1000) % 60,
|
||||
)}s ${Math.floor(uptime % 1000)}ms`,
|
||||
],
|
||||
['Tankopedia cached', `${tankopedia !== undefined}`],
|
||||
['Tank averages cached', `${tankAverages !== undefined}`],
|
||||
['Tankopedia cached', `${(await tankopedia) !== undefined}`],
|
||||
['Tank averages cached', `${(await tankAverages) !== undefined}`],
|
||||
]),
|
||||
);
|
||||
},
|
||||
|
||||
+45
-29
@@ -15,6 +15,7 @@ import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand.j
|
||||
import { WARGAMING_APPLICATION_ID } from '../core/node/arguments.js';
|
||||
import { CommandRegistry } from '../events/interactionCreate/index.js';
|
||||
import { AccountInfo } from '../types/accountInfo.js';
|
||||
import { PossiblyPromise } from '../types/possiblyPromise.js';
|
||||
|
||||
export type SkilledClan = 'SKLLD' | 'SMRI';
|
||||
|
||||
@@ -25,7 +26,7 @@ export const SKILLED_CLANS: Record<SkilledClan, string> = {
|
||||
|
||||
export const eligibleCommand: CommandRegistry = {
|
||||
inProduction: true,
|
||||
inDevelopment: false,
|
||||
inDevelopment: true,
|
||||
inPublic: false,
|
||||
|
||||
command: new SlashCommandBuilder()
|
||||
@@ -67,41 +68,56 @@ export const eligibleCommand: CommandRegistry = {
|
||||
const entries = Object.entries(tankStatsOverTime);
|
||||
const stats = sumStats(entries.map(([, stats]) => stats));
|
||||
const averageTier =
|
||||
entries.reduce((accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
const tankTier = tankopedia[tankId].tier;
|
||||
(await entries.reduce<PossiblyPromise<number>>(
|
||||
async (accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
const tankTier = (await tankopedia)[tankId].tier;
|
||||
|
||||
return accumulator + tankTier * stats.battles;
|
||||
}, 0) / stats.battles;
|
||||
return (await accumulator) + tankTier * stats.battles;
|
||||
},
|
||||
0,
|
||||
)) / stats.battles;
|
||||
const WN8 =
|
||||
entries.reduce((accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
(await entries.reduce<PossiblyPromise<number>>(
|
||||
async (accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
|
||||
// edge case where new tanks don't have averages
|
||||
if (tankAverages[tankId]) {
|
||||
const tankWN8 = calculateWN8(tankAverages[tankId].all, stats);
|
||||
// edge case where new tanks don't have averages
|
||||
if ((await tankAverages)[tankId]) {
|
||||
const tankWN8 = calculateWN8(
|
||||
(await tankAverages)[tankId].all,
|
||||
stats,
|
||||
);
|
||||
|
||||
if (isNaN(tankWN8)) return accumulator;
|
||||
return accumulator + tankWN8 * stats.battles;
|
||||
} else return accumulator;
|
||||
}, 0) / stats.battles;
|
||||
if (isNaN(tankWN8)) return accumulator;
|
||||
return (await accumulator) + tankWN8 * stats.battles;
|
||||
} else return accumulator;
|
||||
},
|
||||
0,
|
||||
)) / stats.battles;
|
||||
const tier10Damage =
|
||||
entries.reduce((accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
(await entries.reduce<PossiblyPromise<number>>(
|
||||
async (accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
|
||||
if (tankopedia[tankId]?.tier === 10) {
|
||||
const tankStats = tankStatsOverTime[tankId];
|
||||
return accumulator + tankStats.damage_dealt;
|
||||
} else return accumulator;
|
||||
}, 0) /
|
||||
entries.reduce((accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
if ((await tankopedia)[tankId]?.tier === 10) {
|
||||
const tankStats = tankStatsOverTime[tankId];
|
||||
return (await accumulator) + tankStats.damage_dealt;
|
||||
} else return accumulator;
|
||||
},
|
||||
0,
|
||||
)) /
|
||||
(await entries.reduce<PossiblyPromise<number>>(
|
||||
async (accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
|
||||
if (tankopedia[tankId]?.tier === 10) {
|
||||
const tankStats = tankStatsOverTime[tankId];
|
||||
return accumulator + tankStats.battles;
|
||||
} else return accumulator;
|
||||
}, 0);
|
||||
if ((await tankopedia)[tankId]?.tier === 10) {
|
||||
const tankStats = tankStatsOverTime[tankId];
|
||||
return (await accumulator) + tankStats.battles;
|
||||
} else return accumulator;
|
||||
},
|
||||
0,
|
||||
));
|
||||
|
||||
if (stats.battles < 126) {
|
||||
problems.push(['Battles', `${stats.battles} (${stats.battles - 126})`]);
|
||||
|
||||
@@ -36,7 +36,7 @@ export const evolutionCommand: CommandRegistry = {
|
||||
const player = await resolvePlayerFromCommand(interaction);
|
||||
const period = resolvePeriodFromCommand(interaction);
|
||||
const tankIdRaw = interaction.options.getString('tank')!;
|
||||
const tankId = commandGroup === 'tank' ? resolveTankId(tankIdRaw) : null;
|
||||
const tankId = commandGroup === 'tank' ? await resolveTankId(tankIdRaw) : null;
|
||||
const start = interaction.options.getInteger('start');
|
||||
const end = interaction.options.getInteger('end');
|
||||
const { nickname } = (
|
||||
|
||||
@@ -10,7 +10,7 @@ import {
|
||||
|
||||
export const helpCommand: CommandRegistry = {
|
||||
inProduction: true,
|
||||
inDevelopment: false,
|
||||
inDevelopment: true,
|
||||
inPublic: true,
|
||||
|
||||
command: new SlashCommandBuilder()
|
||||
|
||||
@@ -18,7 +18,7 @@ const DEFAULT_THRESHOLD = 7;
|
||||
|
||||
export const inactiveCommand: CommandRegistry = {
|
||||
inProduction: true,
|
||||
inDevelopment: false,
|
||||
inDevelopment: true,
|
||||
inPublic: true,
|
||||
|
||||
command: new SlashCommandBuilder()
|
||||
|
||||
@@ -43,7 +43,7 @@ const COMP_TANKS = [
|
||||
|
||||
export const ownedTanksCommand: CommandRegistry = {
|
||||
inProduction: true,
|
||||
inDevelopment: false,
|
||||
inDevelopment: true,
|
||||
inPublic: true,
|
||||
|
||||
command: new SlashCommandBuilder()
|
||||
@@ -77,9 +77,11 @@ export const ownedTanksCommand: CommandRegistry = {
|
||||
`https://api.wotblitz.${server}/wotb/account/info/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
|
||||
);
|
||||
const tankStats = await getTankStats(server, id);
|
||||
const tanks = tankStats
|
||||
.map((tankData) => tankopedia[tankData.tank_id])
|
||||
.filter((tank) => tank?.tier === tier);
|
||||
const tanks = (
|
||||
await Promise.all(
|
||||
tankStats.map(async (tankData) => (await tankopedia)[tankData.tank_id]),
|
||||
)
|
||||
).filter((tank) => tank?.tier === tier);
|
||||
const clanData = await getWargamingResponse<PlayerClanData>(
|
||||
`https://api.wotblitz.${server}/wotb/clans/accountinfo/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}&extra=clan`,
|
||||
);
|
||||
|
||||
@@ -3,7 +3,7 @@ import { CommandRegistry } from '../events/interactionCreate/index.js';
|
||||
|
||||
export const pingCommand: CommandRegistry<true> = {
|
||||
inProduction: true,
|
||||
inDevelopment: false,
|
||||
inDevelopment: true,
|
||||
inPublic: true,
|
||||
handlesInteraction: true,
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ type SortBy = 'name' | 'count';
|
||||
|
||||
export const playerAchievementsCommand: CommandRegistry = {
|
||||
inProduction: true,
|
||||
inDevelopment: false,
|
||||
inDevelopment: true,
|
||||
inPublic: true,
|
||||
|
||||
command: new SlashCommandBuilder()
|
||||
|
||||
@@ -12,7 +12,7 @@ import { AccountInfo } from '../types/accountInfo.js';
|
||||
|
||||
export const playerInfoCommand: CommandRegistry = {
|
||||
inProduction: true,
|
||||
inDevelopment: false,
|
||||
inDevelopment: true,
|
||||
inPublic: true,
|
||||
|
||||
command: new SlashCommandBuilder()
|
||||
|
||||
@@ -11,7 +11,7 @@ import { ClanList } from '../types/clanList.js';
|
||||
|
||||
export const searchClansCommand: CommandRegistry = {
|
||||
inProduction: true,
|
||||
inDevelopment: false,
|
||||
inDevelopment: true,
|
||||
inPublic: true,
|
||||
|
||||
command: new SlashCommandBuilder()
|
||||
|
||||
@@ -12,7 +12,7 @@ import { AccountList } from '../types/accountList.js';
|
||||
|
||||
export const searchPlayersCommand: CommandRegistry = {
|
||||
inProduction: true,
|
||||
inDevelopment: false,
|
||||
inDevelopment: true,
|
||||
inPublic: true,
|
||||
|
||||
command: new SlashCommandBuilder()
|
||||
|
||||
@@ -8,7 +8,7 @@ import { CommandRegistry } from '../events/interactionCreate/index.js';
|
||||
|
||||
export const searchTanksCommand: CommandRegistry = {
|
||||
inProduction: true,
|
||||
inDevelopment: false,
|
||||
inDevelopment: true,
|
||||
inPublic: true,
|
||||
|
||||
command: new SlashCommandBuilder()
|
||||
|
||||
@@ -36,7 +36,8 @@ export const statsCommand: CommandRegistry = {
|
||||
const player = await resolvePlayerFromCommand(interaction);
|
||||
const period = resolvePeriodFromCommand(interaction);
|
||||
const tankIdRaw = interaction.options.getString('tank')!;
|
||||
const tankId = commandGroup === 'tank' ? resolveTankId(tankIdRaw) : null;
|
||||
const tankId =
|
||||
commandGroup === 'tank' ? await resolveTankId(tankIdRaw) : null;
|
||||
const start = interaction.options.getInteger('start');
|
||||
const end = interaction.options.getInteger('end');
|
||||
const path = interactionToURL(interaction, {
|
||||
|
||||
@@ -19,7 +19,7 @@ import { AccountInfo } from '../types/accountInfo.js';
|
||||
|
||||
export const statsFullCommand: CommandRegistry = {
|
||||
inProduction: true,
|
||||
inDevelopment: false,
|
||||
inDevelopment: true,
|
||||
inPublic: true,
|
||||
|
||||
command: addStatTypeSubCommandGroups(
|
||||
@@ -35,7 +35,8 @@ export const statsFullCommand: CommandRegistry = {
|
||||
const player = await resolvePlayerFromCommand(interaction);
|
||||
const period = resolvePeriodFromCommand(interaction);
|
||||
const tankIdRaw = interaction.options.getString('tank')!;
|
||||
const tankId = commandGroup === 'tank' ? resolveTankId(tankIdRaw) : null;
|
||||
const tankId =
|
||||
commandGroup === 'tank' ? await resolveTankId(tankIdRaw) : null;
|
||||
const start = interaction.options.getInteger('start');
|
||||
const end = interaction.options.getInteger('end');
|
||||
const path = interactionToURL(interaction, {
|
||||
|
||||
@@ -14,7 +14,7 @@ import { AccountInfo } from '../types/accountInfo.js';
|
||||
|
||||
export const todayCommand: CommandRegistry = {
|
||||
inProduction: true,
|
||||
inDevelopment: false,
|
||||
inDevelopment: true,
|
||||
inPublic: true,
|
||||
|
||||
command: new SlashCommandBuilder()
|
||||
|
||||
@@ -14,7 +14,7 @@ import { PlayerClanData } from '../types/playerClanData.js';
|
||||
|
||||
export const verifyCommand: CommandRegistry = {
|
||||
inProduction: true,
|
||||
inDevelopment: false,
|
||||
inDevelopment: true,
|
||||
inPublic: true,
|
||||
|
||||
command: new SlashCommandBuilder()
|
||||
|
||||
@@ -2,7 +2,7 @@ import { go } from 'fuzzysort';
|
||||
import throwError from '../node/throwError.js';
|
||||
import { TANKS, tankopedia } from './tankopedia.js';
|
||||
|
||||
export default function resolveTankId(tank: string) {
|
||||
export default async function resolveTankId(tank: string) {
|
||||
const number = parseInt(tank);
|
||||
|
||||
if (Number.isNaN(number)) {
|
||||
@@ -17,7 +17,7 @@ export default function resolveTankId(tank: string) {
|
||||
return searchResult[0].obj.tank_id;
|
||||
}
|
||||
} else {
|
||||
if (tankopedia[number]) {
|
||||
if ((await tankopedia)[number]) {
|
||||
return number;
|
||||
} else {
|
||||
throw throwError(
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { tankopedia } from './tankopedia.js';
|
||||
|
||||
export default function resolveTankName(tankId: number) {
|
||||
const tankopediaName = tankopedia[tankId].name;
|
||||
export default async function resolveTankName(tankId: number) {
|
||||
const tankopediaName = (await tankopedia)[tankId].name;
|
||||
return tankopediaName ? tankopediaName : `Unknown Tank ${tankId}`;
|
||||
}
|
||||
@@ -1,6 +1,3 @@
|
||||
import { readFileSync } from 'fs';
|
||||
import { join } from 'path';
|
||||
|
||||
export type TankType = 'AT-SPG' | 'lightTank' | 'mediumTank' | 'heavyTank';
|
||||
|
||||
export interface TankopediaEntry {
|
||||
@@ -19,11 +16,13 @@ export interface Tankopedia {
|
||||
[id: number]: TankopediaEntry;
|
||||
}
|
||||
|
||||
export const tankopedia = (
|
||||
JSON.parse(
|
||||
readFileSync(join(__dirname, 'tankopedia.json')) as unknown as string,
|
||||
) as { data: Tankopedia }
|
||||
).data;
|
||||
console.log('Caching tankopedia...');
|
||||
export const tankopedia = fetch('https://www.blitzstars.com/bs-tankopedia.json')
|
||||
.then((response) => response.json())
|
||||
.then((wrapperTankopedia) => {
|
||||
console.log('Tankopedia cached');
|
||||
return (wrapperTankopedia as { data: Tankopedia }).data;
|
||||
});
|
||||
const entries = Object.entries(tankopedia);
|
||||
export const TANK_IDS = entries.map(([, { tank_id }]) => tank_id as number);
|
||||
export const TANKS = entries.map(([, entry]) => entry as TankopediaEntry);
|
||||
|
||||
@@ -3,7 +3,7 @@ import { emptyAllStats } from './getTankStatsDiffed.js';
|
||||
import { tankAverages } from './tankAverages.js';
|
||||
|
||||
console.log('Calculating player average...');
|
||||
export const playerAverage = Object.entries(tankAverages).reduce(
|
||||
export const playerAverage = Object.entries(await tankAverages).reduce(
|
||||
(accumulator, [, tankAverage]) => {
|
||||
return sumStats([accumulator, tankAverage.all]);
|
||||
},
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
import { readFileSync } from 'fs';
|
||||
import { join } from 'path';
|
||||
import { AllStats } from '../../types/accountInfo.js';
|
||||
|
||||
export interface SpecialStats {
|
||||
@@ -82,6 +80,22 @@ export interface IndividualTankAverage {
|
||||
|
||||
export type TankAverages = Record<number, IndividualTankAverage>;
|
||||
|
||||
export const tankAverages = JSON.parse(
|
||||
readFileSync(join(__dirname, 'tankaverages.json')) as unknown as string,
|
||||
) as TankAverages;
|
||||
console.log('Caching tank averages...');
|
||||
export const tankAverages = fetch(
|
||||
'https://www.blitzstars.com/api/tankaverages.json',
|
||||
)
|
||||
.then((response) => response.json())
|
||||
.then((individualTankAverages) => {
|
||||
const partialTankAverages: TankAverages = {};
|
||||
|
||||
(individualTankAverages as IndividualTankAverage[]).forEach(
|
||||
(individualTankAverage) => {
|
||||
partialTankAverages[individualTankAverage.tank_id] =
|
||||
individualTankAverage;
|
||||
},
|
||||
);
|
||||
|
||||
console.log('Tank averages cached');
|
||||
|
||||
return partialTankAverages;
|
||||
});
|
||||
@@ -15,14 +15,16 @@ export default async function autocompleteTanks(
|
||||
|
||||
await interaction.respond(
|
||||
focusedOption.value
|
||||
? go(focusedOption.value, TANKS, { keys: ['name'], limit: 10 }).map(
|
||||
(item) =>
|
||||
({
|
||||
name: item.obj.name
|
||||
? item.obj.name
|
||||
: resolveTankName(item.obj.tank_id),
|
||||
value: `${item.obj.tank_id}`,
|
||||
} satisfies ApplicationCommandOptionChoiceData<string>),
|
||||
? await Promise.all(
|
||||
go(focusedOption.value, TANKS, { keys: ['name'], limit: 10 }).map(
|
||||
async (item) =>
|
||||
({
|
||||
name: item.obj.name
|
||||
? item.obj.name
|
||||
: await resolveTankName(item.obj.tank_id),
|
||||
value: `${item.obj.tank_id}`,
|
||||
} satisfies ApplicationCommandOptionChoiceData<string>),
|
||||
),
|
||||
)
|
||||
: [],
|
||||
);
|
||||
|
||||
@@ -38,8 +38,8 @@ export default async function evolution<Type extends StatType>(
|
||||
? `https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clan.emblem_set_id}.png`
|
||||
: undefined;
|
||||
} else {
|
||||
nameDiscriminator = `(${resolveTankName(tankId!)})`;
|
||||
image = tankopedia[tankId!].images.normal;
|
||||
nameDiscriminator = `(${await resolveTankName(tankId!)})`;
|
||||
image = (await tankopedia)[tankId!].images.normal;
|
||||
}
|
||||
|
||||
let histories: Histories;
|
||||
|
||||
+48
-40
@@ -22,6 +22,7 @@ import {
|
||||
SupplementaryStats,
|
||||
} from '../types/accountInfo.js';
|
||||
import { PlayerClanData } from '../types/playerClanData.js';
|
||||
import { PossiblyPromise } from '../types/possiblyPromise.js';
|
||||
|
||||
export type StatType = 'player' | 'tank';
|
||||
|
||||
@@ -47,8 +48,8 @@ export default async function stats<Type extends StatType>(
|
||||
? `https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clan.emblem_set_id}.png`
|
||||
: undefined;
|
||||
} else if (type === 'tank') {
|
||||
nameDiscriminator = `(${resolveTankName(tankId!)})`;
|
||||
image = tankopedia[tankId!].images.normal;
|
||||
nameDiscriminator = `(${await resolveTankName(tankId!)})`;
|
||||
image = (await tankopedia)[tankId!].images.normal;
|
||||
}
|
||||
|
||||
const tankStats = await getTankStatsDiffed(server, id, start, end);
|
||||
@@ -59,54 +60,61 @@ export default async function stats<Type extends StatType>(
|
||||
if (type === 'player') {
|
||||
const entries = Object.entries(tankStats);
|
||||
stats = sumStats(entries.map(([, stats]) => stats));
|
||||
const battlesOfTanksWithAverages = entries.reduce(
|
||||
(accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
const tankAverage = tankAverages[tankId];
|
||||
const battlesOfTanksWithAverages = await entries.reduce<
|
||||
PossiblyPromise<number>
|
||||
>(async (accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
const tankAverage = (await tankAverages)[tankId];
|
||||
|
||||
return tankAverage ? accumulator + stats.battles : accumulator;
|
||||
},
|
||||
0,
|
||||
);
|
||||
const battlesOfTanksWithTankopediaEntry = entries.reduce(
|
||||
(accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
const tankopediaEntry = tankopedia[tankId];
|
||||
return tankAverage ? (await accumulator) + stats.battles : accumulator;
|
||||
}, 0);
|
||||
const battlesOfTanksWithTankopediaEntry = await entries.reduce<
|
||||
PossiblyPromise<number>
|
||||
>(async (accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
const tankopediaEntry = (await tankopedia)[tankId];
|
||||
|
||||
return tankopediaEntry ? accumulator + stats.battles : accumulator;
|
||||
},
|
||||
0,
|
||||
);
|
||||
return tankopediaEntry
|
||||
? (await accumulator) + stats.battles
|
||||
: accumulator;
|
||||
}, 0);
|
||||
|
||||
supplementaryStats = {
|
||||
WN8:
|
||||
entries.reduce((accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
const tankAverage = tankAverages[tankId];
|
||||
(await entries.reduce<PossiblyPromise<number>>(
|
||||
async (accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
const tankAverage = (await tankAverages)[tankId];
|
||||
|
||||
return tankAverage
|
||||
? accumulator + calculateWN8(tankAverage.all, stats) * stats.battles
|
||||
: accumulator;
|
||||
}, 0) / battlesOfTanksWithAverages,
|
||||
return tankAverage
|
||||
? (await accumulator) +
|
||||
calculateWN8(tankAverage.all, stats) * stats.battles
|
||||
: accumulator;
|
||||
},
|
||||
0,
|
||||
)) / battlesOfTanksWithAverages,
|
||||
tier:
|
||||
entries.reduce((accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
const tankopediaEntry = tankopedia[tankId];
|
||||
(await entries.reduce<PossiblyPromise<number>>(
|
||||
async (accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
const tankopediaEntry = (await tankopedia)[tankId];
|
||||
|
||||
return tankopediaEntry
|
||||
? accumulator + tankopediaEntry.tier * stats.battles
|
||||
: accumulator;
|
||||
}, 0) / battlesOfTanksWithTankopediaEntry,
|
||||
return tankopediaEntry
|
||||
? (await accumulator) + tankopediaEntry.tier * stats.battles
|
||||
: accumulator;
|
||||
},
|
||||
0,
|
||||
)) / battlesOfTanksWithTankopediaEntry,
|
||||
};
|
||||
tierWeights = entries.reduce<TierWeightsRecord>(
|
||||
(accumulator, [tankIdString, stats]) => {
|
||||
tierWeights = await entries.reduce<PossiblyPromise<TierWeightsRecord>>(
|
||||
async (accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
const tier = tankopedia[tankId].tier as Tier;
|
||||
const tier = (await tankopedia)[tankId].tier as Tier;
|
||||
|
||||
if (accumulator[tier]) {
|
||||
accumulator[tier]! += stats.battles;
|
||||
if ((await accumulator)[tier]) {
|
||||
(await accumulator)[tier]! += stats.battles;
|
||||
} else {
|
||||
accumulator[tier] = stats.battles;
|
||||
(await accumulator)[tier] = stats.battles;
|
||||
}
|
||||
|
||||
return accumulator;
|
||||
@@ -118,9 +126,9 @@ export default async function stats<Type extends StatType>(
|
||||
|
||||
supplementaryStats = {
|
||||
WN8: stats
|
||||
? calculateWN8(tankAverages[tankId!].all, tankStats[tankId!])
|
||||
? calculateWN8((await tankAverages)[tankId!].all, tankStats[tankId!])
|
||||
: undefined,
|
||||
tier: tankopedia[tankId!].tier,
|
||||
tier: (await tankopedia)[tankId!].tier,
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
+48
-40
@@ -21,6 +21,7 @@ import {
|
||||
SupplementaryStats,
|
||||
} from '../types/accountInfo.js';
|
||||
import { PlayerClanData } from '../types/playerClanData.js';
|
||||
import { PossiblyPromise } from '../types/possiblyPromise.js';
|
||||
|
||||
export type StatType = 'player' | 'tank';
|
||||
|
||||
@@ -45,8 +46,8 @@ export default async function statsfull<Type extends StatType>(
|
||||
? `https://wotblitz-gc.gcdn.co/icons/clanEmblems1x/clan-icon-v2-${clan.emblem_set_id}.png`
|
||||
: undefined;
|
||||
} else if (type === 'tank') {
|
||||
nameDiscriminator = `(${resolveTankName(tankId!)})`;
|
||||
image = tankopedia[tankId!].images.normal;
|
||||
nameDiscriminator = `(${await resolveTankName(tankId!)})`;
|
||||
image = (await tankopedia)[tankId!].images.normal;
|
||||
}
|
||||
|
||||
const tankStats = await getTankStatsDiffed(server, id, start, end);
|
||||
@@ -57,54 +58,61 @@ export default async function statsfull<Type extends StatType>(
|
||||
if (type === 'player') {
|
||||
const entries = Object.entries(tankStats);
|
||||
stats = sumStats(entries.map(([, stats]) => stats));
|
||||
const battlesOfTanksWithAverages = entries.reduce(
|
||||
(accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
const tankAverage = tankAverages[tankId];
|
||||
const battlesOfTanksWithAverages = await entries.reduce<
|
||||
PossiblyPromise<number>
|
||||
>(async (accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
const tankAverage = (await tankAverages)[tankId];
|
||||
|
||||
return tankAverage ? accumulator + stats.battles : accumulator;
|
||||
},
|
||||
0,
|
||||
);
|
||||
const battlesOfTanksWithTankopediaEntry = entries.reduce(
|
||||
(accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
const tankopediaEntry = tankopedia[tankId];
|
||||
return tankAverage ? (await accumulator) + stats.battles : accumulator;
|
||||
}, 0);
|
||||
const battlesOfTanksWithTankopediaEntry = await entries.reduce<
|
||||
PossiblyPromise<number>
|
||||
>(async (accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
const tankopediaEntry = (await tankopedia)[tankId];
|
||||
|
||||
return tankopediaEntry ? accumulator + stats.battles : accumulator;
|
||||
},
|
||||
0,
|
||||
);
|
||||
return tankopediaEntry
|
||||
? (await accumulator) + stats.battles
|
||||
: accumulator;
|
||||
}, 0);
|
||||
|
||||
supplementaryStats = {
|
||||
WN8:
|
||||
entries.reduce((accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
const tankAverage = tankAverages[tankId];
|
||||
(await entries.reduce<PossiblyPromise<number>>(
|
||||
async (accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
const tankAverage = (await tankAverages)[tankId];
|
||||
|
||||
return tankAverage
|
||||
? accumulator + calculateWN8(tankAverage.all, stats) * stats.battles
|
||||
: accumulator;
|
||||
}, 0) / battlesOfTanksWithAverages,
|
||||
return tankAverage
|
||||
? (await accumulator) +
|
||||
calculateWN8(tankAverage.all, stats) * stats.battles
|
||||
: accumulator;
|
||||
},
|
||||
0,
|
||||
)) / battlesOfTanksWithAverages,
|
||||
tier:
|
||||
entries.reduce((accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
const tankopediaEntry = tankopedia[tankId];
|
||||
(await entries.reduce<PossiblyPromise<number>>(
|
||||
async (accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
const tankopediaEntry = (await tankopedia)[tankId];
|
||||
|
||||
return tankopediaEntry
|
||||
? accumulator + tankopediaEntry.tier * stats.battles
|
||||
: accumulator;
|
||||
}, 0) / battlesOfTanksWithTankopediaEntry,
|
||||
return tankopediaEntry
|
||||
? (await accumulator) + tankopediaEntry.tier * stats.battles
|
||||
: accumulator;
|
||||
},
|
||||
0,
|
||||
)) / battlesOfTanksWithTankopediaEntry,
|
||||
};
|
||||
tierWeights = entries.reduce<TierWeightsRecord>(
|
||||
(accumulator, [tankIdString, stats]) => {
|
||||
tierWeights = await entries.reduce<PossiblyPromise<TierWeightsRecord>>(
|
||||
async (accumulator, [tankIdString, stats]) => {
|
||||
const tankId = parseInt(tankIdString);
|
||||
const tier = tankopedia[tankId].tier as Tier;
|
||||
const tier = (await tankopedia)[tankId].tier as Tier;
|
||||
|
||||
if (accumulator[tier]) {
|
||||
accumulator[tier]! += stats.battles;
|
||||
if ((await accumulator)[tier]) {
|
||||
(await accumulator)[tier]! += stats.battles;
|
||||
} else {
|
||||
accumulator[tier] = stats.battles;
|
||||
(await accumulator)[tier] = stats.battles;
|
||||
}
|
||||
|
||||
return accumulator;
|
||||
@@ -115,8 +123,8 @@ export default async function statsfull<Type extends StatType>(
|
||||
stats = tankStats[tankId!];
|
||||
|
||||
supplementaryStats = {
|
||||
WN8: calculateWN8(tankAverages[tankId!].all, tankStats[tankId!]),
|
||||
tier: tankopedia[tankId!].tier,
|
||||
WN8: calculateWN8((await tankAverages)[tankId!].all, tankStats[tankId!]),
|
||||
tier: (await tankopedia)[tankId!].tier,
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
+55
-51
@@ -18,6 +18,7 @@ import { ResolvedPlayer } from '../core/discord/resolvePlayerFromCommand.js';
|
||||
import { WARGAMING_APPLICATION_ID } from '../core/node/arguments.js';
|
||||
import { AccountInfo, AllStats } from '../types/accountInfo.js';
|
||||
import { PlayerClanData } from '../types/playerClanData.js';
|
||||
import { PossiblyPromise } from '../types/possiblyPromise.js';
|
||||
|
||||
export default async function today({ server, id }: ResolvedPlayer) {
|
||||
const tankStatsOverTime = await getTankStatsDiffed(
|
||||
@@ -52,33 +53,31 @@ export default async function today({ server, id }: ResolvedPlayer) {
|
||||
}
|
||||
|
||||
const tankStatsOverTimeEntries = Object.entries(tankStatsOverTime);
|
||||
const todayWN8s = tankStatsOverTimeEntries.reduce<Record<number, number>>(
|
||||
(accumulator, [tankIdString, tankStats]) => {
|
||||
const tankId = Number(tankIdString);
|
||||
const todayWN8s = await tankStatsOverTimeEntries.reduce<
|
||||
PossiblyPromise<Record<number, number>>
|
||||
>(async (accumulator, [tankIdString, tankStats]) => {
|
||||
const tankId = Number(tankIdString);
|
||||
|
||||
return tankId === 0 || tankAverages[tankId] === undefined
|
||||
? accumulator
|
||||
: {
|
||||
...accumulator,
|
||||
[tankId]: calculateWN8(tankAverages[tankId].all, tankStats),
|
||||
};
|
||||
},
|
||||
{},
|
||||
);
|
||||
const careerWN8s = careerTankStatsRaw.reduce<Record<number, number>>(
|
||||
(accumulator, { tank_id }) => {
|
||||
return tank_id === 0 || tankAverages[tank_id] === undefined
|
||||
? accumulator
|
||||
: {
|
||||
...accumulator,
|
||||
[tank_id]: calculateWN8(
|
||||
tankAverages[tank_id].all,
|
||||
careerStats[tank_id],
|
||||
),
|
||||
};
|
||||
},
|
||||
{},
|
||||
);
|
||||
return tankId === 0 || (await tankAverages)[tankId] === undefined
|
||||
? accumulator
|
||||
: {
|
||||
...accumulator,
|
||||
[tankId]: calculateWN8((await tankAverages)[tankId].all, tankStats),
|
||||
};
|
||||
}, {});
|
||||
const careerWN8s = await careerTankStatsRaw.reduce<
|
||||
PossiblyPromise<Record<number, number>>
|
||||
>(async (accumulator, { tank_id }) => {
|
||||
return tank_id === 0 || (await tankAverages)[tank_id] === undefined
|
||||
? accumulator
|
||||
: {
|
||||
...accumulator,
|
||||
[tank_id]: calculateWN8(
|
||||
(await tankAverages)[tank_id].all,
|
||||
careerStats[tank_id],
|
||||
),
|
||||
};
|
||||
}, {});
|
||||
const todayWN8sEntries = Object.entries(todayWN8s);
|
||||
const careerWN8sEntries = Object.entries(careerWN8s);
|
||||
|
||||
@@ -109,32 +108,37 @@ export default async function today({ server, id }: ResolvedPlayer) {
|
||||
0,
|
||||
);
|
||||
|
||||
const rows = tankStatsOverTimeEntries.map(([tankIdString, tankStats]) => {
|
||||
const tankId = Number(tankIdString);
|
||||
const career = careerStats[tankId];
|
||||
const rows = await Promise.all(
|
||||
tankStatsOverTimeEntries.map(async ([tankIdString, tankStats]) => {
|
||||
const tankId = Number(tankIdString);
|
||||
const career = careerStats[tankId];
|
||||
|
||||
return (
|
||||
<Breakdown.Row
|
||||
key={tankId}
|
||||
name={tankId === 0 ? 'Total' : resolveTankName(Number(tankIdString))}
|
||||
winrate={tankStats.wins / tankStats.battles}
|
||||
careerWinrate={career.wins / career.battles}
|
||||
WN8={isNaN(todayWN8s[tankId]) ? undefined : todayWN8s[tankId]}
|
||||
careerWN8={isNaN(careerWN8s[tankId]) ? undefined : careerWN8s[tankId]}
|
||||
damage={tankStats.damage_dealt / tankStats.battles}
|
||||
careerDamage={career.damage_dealt / career.battles}
|
||||
survival={tankStats.survived_battles / tankStats.battles}
|
||||
careerSurvival={career.survived_battles / career.battles}
|
||||
battles={tankStats.battles}
|
||||
careerBattles={career.battles}
|
||||
icon={
|
||||
tankId === 0
|
||||
? undefined
|
||||
: tankopedia[tankIdString as unknown as number].images.normal
|
||||
}
|
||||
/>
|
||||
);
|
||||
});
|
||||
return (
|
||||
<Breakdown.Row
|
||||
key={tankId}
|
||||
name={
|
||||
tankId === 0 ? 'Total' : await resolveTankName(Number(tankIdString))
|
||||
}
|
||||
winrate={tankStats.wins / tankStats.battles}
|
||||
careerWinrate={career.wins / career.battles}
|
||||
WN8={isNaN(todayWN8s[tankId]) ? undefined : todayWN8s[tankId]}
|
||||
careerWN8={isNaN(careerWN8s[tankId]) ? undefined : careerWN8s[tankId]}
|
||||
damage={tankStats.damage_dealt / tankStats.battles}
|
||||
careerDamage={career.damage_dealt / career.battles}
|
||||
survival={tankStats.survived_battles / tankStats.battles}
|
||||
careerSurvival={career.survived_battles / career.battles}
|
||||
battles={tankStats.battles}
|
||||
careerBattles={career.battles}
|
||||
icon={
|
||||
tankId === 0
|
||||
? undefined
|
||||
: (await tankopedia)[tankIdString as unknown as number].images
|
||||
.normal
|
||||
}
|
||||
/>
|
||||
);
|
||||
}),
|
||||
);
|
||||
|
||||
return (
|
||||
<Wrapper>
|
||||
|
||||
@@ -6,7 +6,7 @@ import { RouteRegistry } from '../server.js';
|
||||
export const statsRoute: RouteRegistry = {
|
||||
route: '/stats/:type/:period',
|
||||
inProduction: true,
|
||||
inDevelopment: false,
|
||||
inDevelopment: true,
|
||||
|
||||
async handler(req) {
|
||||
const type = req.params.type as StatType;
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
export type PossiblyPromise<Type> = Promise<Type> | Type;
|
||||
Reference in new issue
Block a user