update (3)

packages/core/src/blitzkit/camouflageDefinitions.ts

@@ -1,7 +0,0 @@
-import { fetchPB } from '../protobuf';
-import { CamouflageDefinitions } from '../protos';
-import { asset } from './asset';
-
-export function fetchCamouflageDefinitions() {
-  return fetchPB(asset('definitions/camouflages.pb'), CamouflageDefinitions);
-}

packages/core/src/blitzkit/index.ts

@@ -23,6 +23,7 @@ export * from "./romanize";
 export * from "./sluggify";
 export * from "./staticAsset";
 export * from "./sum";
+export * from "./tankDefinitions";
 export * from "./tankIcon";
 export * from "./tankNames";
 export * from "./unionBoundingBox";

packages/core/src/blitzkit/tankDefinitions/index.ts

@@ -0,0 +1 @@
+export * from "./constants";

packages/core/src/blitzkit/tankNames.ts

@@ -1,13 +1,12 @@
+import { BlitzKitAPI } from "@blitzkit/core";
 import locales from "@blitzkit/i18n/locales.json";
 import { deburr } from "lodash-es";
 import { I18nString } from "../protos";
-import { fetchCamouflageDefinitions } from "./camouflageDefinitions";
-import { fetchTankDefinitions } from "./tankDefinitions";
 
-export async function fetchTankNames() {
+export async function fetchTankNames(api: BlitzKitAPI) {
   const [tankDefinitions, camouflageDefinitions] = await Promise.all([
-    fetchTankDefinitions(),
-    fetchCamouflageDefinitions(),
+    api.tankDefinitions(),
+    api.camouflageDefinitions(),
   ]);
   const tankDefinitionsArray = Object.values(tankDefinitions.tanks);
 

packages/website/src/components/TankCard/index.tsx

@@ -1,12 +1,8 @@
-import {
-  asset,
-  fetchTankDefinitions,
-  TankType,
-  type TankDefinition,
-} from "@blitzkit/core";
+import { asset, TankType, type TankDefinition } from "@blitzkit/core";
 import { Flex, Text, type TextProps } from "@radix-ui/themes";
 import { uniq } from "lodash-es";
 import { forwardRef, type ReactNode } from "react";
+import { api } from "../../core/blitzkit/api";
 import { useLocale } from "../../hooks/useLocale";
 import { TankopediaPersistent } from "../../stores/tankopediaPersistent";
 import { classIcons } from "../ClassIcon";
@@ -21,7 +17,7 @@ type TankCardProps = TextProps & {
   noLink?: boolean;
 };
 
-const tankDefinitions = await fetchTankDefinitions();
+const tankDefinitions = await api.tankDefinitions();
 
 export const TankCard = forwardRef<HTMLSpanElement, TankCardProps>(
   (

packages/website/src/components/TankSearch/components/Card.tsx

@@ -5,7 +5,7 @@ import {
   type TankDefinition,
 } from "@blitzkit/core";
 import { useMemo } from "react";
-import { awaitableModelDefinitions } from "../../../core/awaitables/modelDefinitions";
+import { api } from "../../../core/blitzkit/api";
 import { resolveReload } from "../../../core/blitzkit/resolveReload";
 import { TankSort } from "../../../stores/tankopediaSort";
 import { TankCard } from "../../TankCard";
@@ -15,7 +15,7 @@ interface TankSearchCardProps {
   onSelect?: (tank: TankDefinition) => void;
 }
 
-const modelDefinitions = await awaitableModelDefinitions;
+const modelDefinitions = await api.modelDefinitions();
 
 export function TankSearchCard({ tank, onSelect }: TankSearchCardProps) {
   const by = TankSort.use((state) => state.by);

packages/website/src/components/TankSearch/components/FilterControl.tsx

@@ -1,5 +1,4 @@
 import {
-  asset,
   GunDefinition,
   ShellType,
   TANK_CLASSES,
@@ -27,10 +26,7 @@ import {
 } from "@radix-ui/themes";
 import { times } from "lodash-es";
 import { Fragment, type ComponentProps, type ReactNode } from "react";
-import { awaitableConsumableDefinitions } from "../../../core/awaitables/consumableDefinitions";
-import { awaitableGameDefinitions } from "../../../core/awaitables/gameDefinitions";
-import { awaitableProvisionDefinitions } from "../../../core/awaitables/provisionDefinitions";
-import { awaitableTankDefinitions } from "../../../core/awaitables/tankDefinitions";
+import { api } from "../../../core/blitzkit/api";
 import { useLocale } from "../../../hooks/useLocale";
 import { App } from "../../../stores/app";
 import { TankFilters, type CaseType } from "../../../stores/tankFilters";
@@ -43,10 +39,10 @@ import { ResearchedIcon } from "../../ResearchedIcon";
 import { ScienceIcon } from "../../ScienceIcon";
 import { ScienceOffIcon } from "../../ScienceOffIcon";
 
-const gameDefinitions = await awaitableGameDefinitions;
-const consumableDefinitions = await awaitableConsumableDefinitions;
-const provisionDefinitions = await awaitableProvisionDefinitions;
-const tankDefinitions = await awaitableTankDefinitions;
+const gameDefinitions = await api.gameDefinitions();
+const consumableDefinitions = await api.consumableDefinitions();
+const provisionDefinitions = await api.provisionDefinitions();
+const tankDefinitions = await api.tankDefinitions();
 
 const gameModeRoleSets: Record<number, Set<number>> = {};
 
@@ -313,7 +309,7 @@ function NationsFilter() {
                   width: "1.25em",
                   height: "1.25em",
                 }}
-                src={asset(`flags/circle/${nation}.webp`)}
+                src={`/api/flags/circle/${nation}.webp`}
               />
             ))}
           </Flex>
@@ -350,9 +346,7 @@ function NationsFilter() {
                 right="0"
                 mr="-2"
                 style={{
-                  backgroundImage: `url(${asset(
-                    `flags/scratched/${nation}.webp`,
-                  )})`,
+                  backgroundImage: `url(${`/api/flags/scratched/${nation}.webp`})`,
                   backgroundSize: "100%",
                   backgroundRepeat: "no-repeat",
                   backgroundPosition: "5rem center",
@@ -685,11 +679,9 @@ function IndividualShellFilter({
           {shells[index] !== null && (
             <img
               style={{ width: "1em", height: "1em" }}
-              src={asset(
-                `icons/shells/${shellTypeIcons[shells[index]]}${
-                  premium ? "_premium" : ""
-                }.webp`,
-              )}
+              src={`/api/icons/shells/${shellTypeIcons[shells[index]]}${
+                premium ? "_premium" : ""
+              }.webp`}
             />
           )}
         </IconButton>
@@ -720,11 +712,9 @@ function IndividualShellFilter({
                 color={selected ? undefined : "gray"}
               >
                 <img
-                  src={asset(
-                    `icons/shells/${shellTypeIcons[shellType]}${
-                      premium ? "_premium" : ""
-                    }.webp`,
-                  )}
+                  src={`/api/icons/shells/${shellTypeIcons[shellType]}${
+                    premium ? "_premium" : ""
+                  }.webp`}
                   style={{ width: "1.25em", height: "1.25em" }}
                 />
 
@@ -893,7 +883,7 @@ function ConsumablesFilter() {
                   height: "1.25em",
                   objectFit: "contain",
                 }}
-                src={asset(`icons/consumables/${consumable}.webp`)}
+                src={`/api/icons/consumables/${consumable}.webp`}
               />
             ))}
 
@@ -938,7 +928,7 @@ function ConsumablesFilter() {
                   height: "1.25em",
                   objectFit: "contain",
                 }}
-                src={asset(`icons/consumables/${consumable}.webp`)}
+                src={`/api/icons/consumables/${consumable}.webp`}
               />
 
               {unwrap(consumableDefinition.name!)}
@@ -987,7 +977,7 @@ function ProvisionsFilter() {
                   height: "1.25em",
                   objectFit: "contain",
                 }}
-                src={asset(`icons/provisions/${provision}.webp`)}
+                src={`/api/icons/provisions/${provision}.webp`}
               />
             ))}
 
@@ -1032,7 +1022,7 @@ function ProvisionsFilter() {
                   height: "1.25em",
                   objectFit: "contain",
                 }}
-                src={asset(`icons/provisions/${provision}.webp`)}
+                src={`/api/icons/provisions/${provision}.webp`}
               />
 
               {unwrap(provisionDefinition.name!)}
@@ -1075,8 +1065,8 @@ function GameModeAbilitiesFilter() {
       : rawPowers;
 
   const icons = [
-    ...abilities.map((ability) => `icons/consumables/${ability}.webp`),
-    ...powers.map((power) => `icons/provisions/${power}.webp`),
+    ...abilities.map((ability) => `api/icons/consumables/${ability}.webp`),
+    ...powers.map((power) => `api/icons/provisions/${power}.webp`),
   ];
 
   return (
@@ -1094,7 +1084,7 @@ function GameModeAbilitiesFilter() {
                   height: "1.25em",
                   objectFit: "contain",
                 }}
-                src={asset(icon)}
+                src={icon}
               />
             ))}
 
@@ -1161,7 +1151,7 @@ function GameModeAbilitiesFilter() {
                           height: "1.25em",
                           objectFit: "contain",
                         }}
-                        src={asset(`icons/consumables/${consumable}.webp`)}
+                        src={`/api/icons/consumables/${consumable}.webp`}
                       />
 
                       {unwrap(abilityDefinition.name!)}
@@ -1210,7 +1200,7 @@ function GameModeAbilitiesFilter() {
                           height: "1.25em",
                           objectFit: "contain",
                         }}
-                        src={asset(`icons/provisions/${provision}.webp`)}
+                        src={`/api/icons/provisions/${provision}.webp`}
                       />
 
                       {unwrap(powerDefinition.name!)}

packages/website/src/core/awaitables/consumableDefinitions.ts

@@ -1,3 +0,0 @@
-import { fetchConsumableDefinitions } from '@blitzkit/core';
-
-export const awaitableConsumableDefinitions = fetchConsumableDefinitions();

packages/website/src/core/awaitables/modelDefinitions.ts

@@ -1,3 +0,0 @@
-import { fetchModelDefinitions } from '@blitzkit/core';
-
-export const awaitableModelDefinitions = fetchModelDefinitions();

packages/website/src/core/awaitables/provisionDefinitions.ts

@@ -1,3 +0,0 @@
-import { fetchProvisionDefinitions } from '@blitzkit/core';
-
-export const awaitableProvisionDefinitions = fetchProvisionDefinitions();

packages/website/src/core/awaitables/tankDefinitions.ts

@@ -1,3 +0,0 @@
-import { fetchTankDefinitions } from '@blitzkit/core';
-
-export const awaitableTankDefinitions = fetchTankDefinitions();

packages/website/src/core/awaitables/tankNames.ts

@@ -1,3 +1,4 @@
 import { fetchTankNames } from "@blitzkit/core";
+import { api } from "../blitzkit/api";
 
-export const awaitableTankNames = fetchTankNames();
+export const awaitableTankNames = fetchTankNames(api);

packages/website/src/core/blitzkit/filterTank.ts

@@ -1,21 +1,19 @@
 import type { TankDefinition } from "@blitzkit/core";
 import { checkConsumableProvisionInclusivity } from "@blitzkit/core/src/blitzkit/checkConsumableProvisionInclusivity";
 import { times } from "lodash-es";
-import { awaitableConsumableDefinitions } from "../../core/awaitables/consumableDefinitions";
 import type { TankFilters } from "../../stores/tankFilters";
-import { awaitableGameDefinitions } from "../awaitables/gameDefinitions";
-import { awaitableProvisionDefinitions } from "../awaitables/provisionDefinitions";
+import { api } from "./api";
 
 const SHELLS = times(3, (index) => index);
 
-const consumableDefinitions = await awaitableConsumableDefinitions;
-const provisionDefinitions = await awaitableProvisionDefinitions;
-const gameDefinitions = await awaitableGameDefinitions;
+const consumableDefinitions = await api.consumableDefinitions();
+const provisionDefinitions = await api.provisionDefinitions();
+const gameDefinitions = await api.gameDefinitions();
 
 export async function filterTank(
   filters: TankFilters,
   tank: TankDefinition,
-  owned: number[] = []
+  owned: number[] = [],
 ) {
   return (
     ((filters.showOwned && owned.includes(tank.id)) ||
@@ -29,15 +27,15 @@ export async function filterTank(
     (filters.gunType.length === 0 ||
       (filters.gunType.includes("regular") &&
         tank.turrets.some((turret) =>
-          turret.guns.some((gun) => gun.gun_type!.$case === "regular")
+          turret.guns.some((gun) => gun.gun_type!.$case === "regular"),
         )) ||
       (filters.gunType.includes("auto_loader") &&
         tank.turrets.some((turret) =>
-          turret.guns.some((gun) => gun.gun_type!.$case === "auto_loader")
+          turret.guns.some((gun) => gun.gun_type!.$case === "auto_loader"),
         )) ||
       (filters.gunType.includes("auto_reloader") &&
         tank.turrets.some((turret) =>
-          turret.guns.some((gun) => gun.gun_type!.$case === "auto_reloader")
+          turret.guns.some((gun) => gun.gun_type!.$case === "auto_reloader"),
         ))) &&
     tank.turrets.some((turret) =>
       turret.guns.some((gun) =>
@@ -45,9 +43,9 @@ export async function filterTank(
           (index) =>
             filters.shells[index] === null ||
             gun.shells[index] === undefined ||
-            gun.shells[index].type === filters.shells[index]
-        )
-      )
+            gun.shells[index].type === filters.shells[index],
+        ),
+      ),
     ) &&
     (filters.consumables.length === 0 ||
       filters.consumables.every((consumable) =>
@@ -56,10 +54,10 @@ export async function filterTank(
             checkConsumableProvisionInclusivity(
               consumableDefinitions.consumables[consumable],
               tank,
-              gun
-            )
-          )
-        )
+              gun,
+            ),
+          ),
+        ),
       )) &&
     (filters.provisions.length === 0 ||
       filters.provisions.every((provision) =>
@@ -68,22 +66,22 @@ export async function filterTank(
             checkConsumableProvisionInclusivity(
               provisionDefinitions.provisions[provision],
               tank,
-              gun
-            )
-          )
-        )
+              gun,
+            ),
+          ),
+        ),
       )) &&
     (filters.abilities.length === 0 ||
       Object.values(tank.roles).some((id) =>
         gameDefinitions.roles[id as unknown as number].consumables.some(
-          (consumable) => filters.abilities.includes(consumable)
-        )
+          (consumable) => filters.abilities.includes(consumable),
+        ),
       )) &&
     (filters.powers.length === 0 ||
       Object.values(tank.roles).some((id) =>
         gameDefinitions.roles[id as unknown as number].provisions.some(
-          (consumable) => filters.powers.includes(consumable)
-        )
+          (consumable) => filters.powers.includes(consumable),
+        ),
       ))
   );
 }

packages/website/src/pages/[...chunk_pages]/[...locale]/performance/index.astro

@@ -1,7 +1,7 @@
 ---
-import ToolOpenGraph from "../../../components/ToolOpenGraph.astro";
-import { tools } from "../../../constants/tools";
-import BaseLayout from "../../../layouts/BaseLayout.astro";
+import ToolOpenGraph from "../../../../components/ToolOpenGraph.astro";
+import { tools } from "../../../../constants/tools";
+import BaseLayout from "../../../../layouts/BaseLayout.astro";
 import type { getStaticPaths } from "../index.astro";
 import { Page } from "./_index";