feat: moved tankopedia and tankaverages into a runtime cache

This commit is contained in:
TresAbhi committed 2023-07-05 02:09:36 +00:00
1 parent 95b105cb65
commit 00b721f34f
29 files changed
+268 -235

No files matched your search

+4 -4
View File
@@ -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
View File
@@ -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})`]);
+1 -1
View File
@@ -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 } = (
+1 -1
View File
@@ -10,7 +10,7 @@ import {
export const helpCommand: CommandRegistry = {
inProduction: true,
inDevelopment: false,
inDevelopment: true,
inPublic: true,
command: new SlashCommandBuilder()
+1 -1
View File
@@ -18,7 +18,7 @@ const DEFAULT_THRESHOLD = 7;
export const inactiveCommand: CommandRegistry = {
inProduction: true,
inDevelopment: false,
inDevelopment: true,
inPublic: true,
command: new SlashCommandBuilder()
+6 -4
View File
@@ -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`,
);
+1 -1
View File
@@ -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,
+1 -1
View File
@@ -18,7 +18,7 @@ type SortBy = 'name' | 'count';
export const playerAchievementsCommand: CommandRegistry = {
inProduction: true,
inDevelopment: false,
inDevelopment: true,
inPublic: true,
command: new SlashCommandBuilder()
+1 -1
View File
@@ -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()
+1 -1
View File
@@ -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()
+1 -1
View File
@@ -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()
+1 -1
View File
@@ -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()
+2 -1
View File
@@ -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, {
+3 -2
View File
@@ -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, {
+1 -1
View File
@@ -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()
+1 -1
View File
@@ -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()