feat: detached cdn branch

.vscode/settings.json

@@ -88,6 +88,7 @@
     "loddist",
     "lods",
     "lossrate",
+    "Maddoxkkm",
     "malum",
     "mantlets",
     "metallicness",

scripts/applyPatches.ts

@@ -5,7 +5,7 @@ import { parse as parseYaml, stringify as stringifyYaml } from 'yaml';
 import { readStringDVPL } from '../src/core/blitz/readStringDVPL';
 import { readYAMLDVPL } from '../src/core/blitz/readYAMLDVPL';
 import { writeDVPL } from '../src/core/blitz/writeDVPL';
-import { secrets } from '../src/core/blitzkit/secrets';
+import { assertSecrete } from '../src/core/blitzkit/secrete';
 import { dvp } from '../submodules/blitzkit-closed/src/dvp';
 import { DATA } from './buildAssets/constants';
 
@@ -21,18 +21,18 @@ console.log(`Installing patches for ${currentVersion}...`);
 let patchIndex = 1;
 while (true) {
   const response = await fetch(
-    `${secrets.WOTB_DLC_CDN}/dlc/s${currentVersion}_${patchIndex}.yaml`,
+    `${assertSecrete(process.env.WOTB_DLC_CDN)}/dlc/s${currentVersion}_${patchIndex}.yaml`,
   );
 
   if (response.status === 200) {
     console.log(`Applying patch ${patchIndex}...`);
 
     const data = parseYaml(await response.text());
-    const dvpm = await fetch(`${secrets.WOTB_DLC_CDN}/dlc/${data.dx11}`).then(
-      (response) => response.arrayBuffer(),
-    );
+    const dvpm = await fetch(
+      `${assertSecrete(process.env.WOTB_DLC_CDN)}/dlc/${data.dx11}`,
+    ).then((response) => response.arrayBuffer());
     const dvpd = await fetch(
-      `${secrets.WOTB_DLC_CDN}/dlc/${data.dx11.replace('.dvpm', '.dvpd')}`,
+      `${assertSecrete(process.env.WOTB_DLC_CDN)}/dlc/${data.dx11.replace('.dvpm', '.dvpd')}`,
     ).then((response) => response.arrayBuffer());
     const files = await dvp(dvpm, dvpd);
     const bar = new ProgressBar(
@@ -45,7 +45,10 @@ while (true) {
         const { dir } = parsePath(path);
 
         await mkdir(`${DATA}/${dir}`, { recursive: true });
-        await writeFile(`${DATA}/${path}.dvpl`, writeDVPL(Buffer.from(data)));
+        await writeFile(
+          `${DATA}/${path}.dvpl`,
+          new Uint8Array(writeDVPL(Buffer.from(data))),
+        );
 
         bar.tick();
       }),
@@ -55,7 +58,7 @@ while (true) {
       console.log('Found dynamic content localizations; patching...');
 
       const localizationsResponse = await fetch(
-        `${secrets.WOTB_DLC_CDN}/dlc/${data.dynamicContentLocalizationsDir}/en.yaml`,
+        `${assertSecrete(process.env.WOTB_DLC_CDN)}/dlc/${data.dynamicContentLocalizationsDir}/en.yaml`,
       );
       const newStrings = parseYaml(await localizationsResponse.text());
       const oldStrings = await readYAMLDVPL<Record<string, string>>(
@@ -66,7 +69,7 @@ while (true) {
 
       await writeFile(
         `${DATA}/Strings/en.yaml.dvpl`,
-        writeDVPL(Buffer.from(patchedContent)),
+        new Uint8Array(writeDVPL(Buffer.from(patchedContent))),
       );
     }
 

scripts/averages.ts

@@ -1,5 +1,4 @@
 import { chunk, times } from 'lodash';
-import { argv } from 'process';
 import { Region, REGIONS } from '../src/constants/regions';
 import { getAccountInfo } from '../src/core/blitz/getAccountInfo';
 import getTankStats from '../src/core/blitz/getTankStats';
@@ -36,8 +35,7 @@ const THREADS = 10;
 const PLAYER_IDS_PER_CALL = 100;
 
 const startTime = Date.now();
-const production = argv.includes('--production');
-const preDiscoveredIds = await fetchPreDiscoveredIds(!production);
+const preDiscoveredIds = await fetchPreDiscoveredIds();
 const playerIds: Record<Region, number[][]> = {
   asia: chunk(
     preDiscoveredIds.filter((id) => idToRegion(id) === 'asia'),
@@ -223,23 +221,19 @@ async function postWork() {
     latest,
   };
 
-  commitAssets(
-    'averages',
-    [
-      {
-        path: `averages/${latest}.pb`,
-        content: await encodeToBase64(
-          'blitzkit/blitzkit.AverageDefinitions',
-          averageDefinitions,
-        ),
-        encoding: 'base64',
-      },
-      {
-        path: 'averages/manifest.json',
-        content: JSON.stringify(manifest),
-        encoding: 'utf-8',
-      },
-    ],
-    production,
-  );
+  commitAssets('averages', [
+    {
+      path: `averages/${latest}.pb`,
+      content: await encodeToBase64(
+        'blitzkit/blitzkit.AverageDefinitions',
+        averageDefinitions,
+      ),
+      encoding: 'base64',
+    },
+    {
+      path: 'averages/manifest.json',
+      content: JSON.stringify(manifest),
+      encoding: 'utf-8',
+    },
+  ]);
 }

scripts/buildAssets/boosterIcons.ts

@@ -6,7 +6,7 @@ import { commitAssets } from '../../src/core/blitzkit/commitAssets';
 import { FileChange } from '../../src/core/blitzkit/commitMultipleFiles';
 import { DATA } from './constants';
 
-export async function boosterIcons(production: boolean) {
+export async function boosterIcons() {
   const boosterFiles = (await readdir(`${DATA}/Gfx/Shared/boosters`)).filter(
     (file) => !file.endsWith('@2x.txt.dvpl') && !file.startsWith('texture0'),
   );
@@ -47,5 +47,5 @@ export async function boosterIcons(production: boolean) {
     }),
   );
 
-  await commitAssets('booster icons', changes, production);
+  await commitAssets('booster icons', changes);
 }

scripts/buildAssets/camouflageIcons.ts

@@ -3,7 +3,7 @@ import { commitAssets } from '../../src/core/blitzkit/commitAssets';
 import { FileChange } from '../../src/core/blitzkit/commitMultipleFiles';
 import { DATA } from './constants';
 
-export async function camouflageIcons(production: boolean) {
+export async function camouflageIcons() {
   console.log('Building camouflage icons...');
   const content = await readDVPLFile(
     `${DATA}/Gfx/UI/Hangar/IconCamouflage.packed.webp.dvpl`,
@@ -16,5 +16,5 @@ export async function camouflageIcons(production: boolean) {
     },
   ];
 
-  await commitAssets('camo icons', changes, production);
+  await commitAssets('camo icons', changes);
 }

scripts/buildAssets/consumableProvisionIcons.ts

@@ -19,7 +19,7 @@ interface Mappings {
 
 const listItemsPattern = /<items path="(.+)\.xml"\/>/g;
 
-export async function consumableProvisionIcons(production: boolean) {
+export async function consumableProvisionIcons() {
   console.log('Building consumable and provision icons...');
 
   const changes: FileChange[] = [];
@@ -188,5 +188,5 @@ export async function consumableProvisionIcons(production: boolean) {
     );
   }
 
-  await commitAssets('consumable and provision icons', changes, production);
+  await commitAssets('consumable and provision icons', changes);
 }

scripts/buildAssets/currencies.ts

@@ -2,6 +2,7 @@ import sharp from 'sharp';
 import { readDVPLFile } from '../../src/core/blitz/readDVPLFile';
 import { commitAssets } from '../../src/core/blitzkit/commitAssets';
 import { FileChange } from '../../src/core/blitzkit/commitMultipleFiles';
+import { assertSecrete } from '../../src/core/blitzkit/secrete';
 import { DATA } from './constants';
 
 const ICONS = [
@@ -21,7 +22,7 @@ type BlitzGlossary = Record<
   }
 >;
 
-export async function currencies(production: boolean) {
+export async function currencies() {
   console.log('Building currency icons...');
 
   const changes: FileChange[] = [];
@@ -44,7 +45,7 @@ export async function currencies(production: boolean) {
     }),
   );
 
-  const glossary = await fetch(process.env.WOTB_GLOSSARY!).then(
+  const glossary = await fetch(assertSecrete(process.env.WOTB_GLOSSARY)).then(
     (response) => response.json() as Promise<BlitzGlossary>,
   );
 
@@ -74,5 +75,5 @@ export async function currencies(production: boolean) {
       }),
   );
 
-  await commitAssets('currency icons', changes, production);
+  await commitAssets('currency icons', changes);
 }

scripts/buildAssets/definitions.ts

@@ -433,7 +433,7 @@ const missingStrings: Record<string, string> = {
 };
 export const botPattern = /^.+((tutorial_bot(\d+)?)|(TU(R?)))$/;
 
-export async function definitions(production: boolean) {
+export async function definitions() {
   console.log('Building definitions...');
 
   const wargamingTankopedia = (await fetch(
@@ -1460,55 +1460,51 @@ export async function definitions(production: boolean) {
     };
   });
 
-  await commitAssets(
-    'definitions',
-    [
-      {
-        content: superCompress(gameDefinitions),
-        encoding: 'base64',
-        path: 'definitions/game.cdon.lz4',
-      },
-      {
-        content: superCompress(tankDefinitions),
-        encoding: 'base64',
-        path: 'definitions/tanks.cdon.lz4',
-      },
-      {
-        content: superCompress(modelDefinitions),
-        encoding: 'base64',
-        path: 'definitions/models.cdon.lz4',
-      },
-      {
-        content: superCompress(equipmentDefinitions),
-        encoding: 'base64',
-        path: 'definitions/equipment.cdon.lz4',
-      },
-      {
-        content: superCompress(consumableDefinitions),
-        encoding: 'base64',
-        path: 'definitions/consumables.cdon.lz4',
-      },
-      {
-        content: superCompress(provisionDefinitions),
-        encoding: 'base64',
-        path: 'definitions/provisions.cdon.lz4',
-      },
-      {
-        content: superCompress(skillDefinitions),
-        encoding: 'base64',
-        path: 'definitions/skills.cdon.lz4',
-      },
-      {
-        content: superCompress(mapDefinitions),
-        encoding: 'base64',
-        path: 'definitions/maps.cdon.lz4',
-      },
-      {
-        content: superCompress(camouflageDefinitions),
-        encoding: 'base64',
-        path: 'definitions/camouflages.cdon.lz4',
-      },
-    ],
-    production,
-  );
+  await commitAssets('definitions', [
+    {
+      content: superCompress(gameDefinitions),
+      encoding: 'base64',
+      path: 'definitions/game.cdon.lz4',
+    },
+    {
+      content: superCompress(tankDefinitions),
+      encoding: 'base64',
+      path: 'definitions/tanks.cdon.lz4',
+    },
+    {
+      content: superCompress(modelDefinitions),
+      encoding: 'base64',
+      path: 'definitions/models.cdon.lz4',
+    },
+    {
+      content: superCompress(equipmentDefinitions),
+      encoding: 'base64',
+      path: 'definitions/equipment.cdon.lz4',
+    },
+    {
+      content: superCompress(consumableDefinitions),
+      encoding: 'base64',
+      path: 'definitions/consumables.cdon.lz4',
+    },
+    {
+      content: superCompress(provisionDefinitions),
+      encoding: 'base64',
+      path: 'definitions/provisions.cdon.lz4',
+    },
+    {
+      content: superCompress(skillDefinitions),
+      encoding: 'base64',
+      path: 'definitions/skills.cdon.lz4',
+    },
+    {
+      content: superCompress(mapDefinitions),
+      encoding: 'base64',
+      path: 'definitions/maps.cdon.lz4',
+    },
+    {
+      content: superCompress(camouflageDefinitions),
+      encoding: 'base64',
+      path: 'definitions/camouflages.cdon.lz4',
+    },
+  ]);
 }

scripts/buildAssets/equipmentIcons.ts

@@ -17,7 +17,7 @@ interface Mappings {
   }[];
 }
 
-export async function equipmentIcons(production: boolean) {
+export async function equipmentIcons() {
   console.log('Building equipment icons...');
 
   const changes: FileChange[] = [];
@@ -91,5 +91,5 @@ export async function equipmentIcons(production: boolean) {
     ),
   );
 
-  await commitAssets('equipment icons', changes, production);
+  await commitAssets('equipment icons', changes);
 }

scripts/buildAssets/flags.ts

@@ -6,7 +6,7 @@ import { commitAssets } from '../../src/core/blitzkit/commitAssets';
 import { FileChange } from '../../src/core/blitzkit/commitMultipleFiles';
 import { DATA } from './constants';
 
-export async function flags(production: boolean) {
+export async function flags() {
   console.log('Building flags...');
 
   const changes = [
@@ -82,5 +82,5 @@ export async function flags(production: boolean) {
     )),
   ];
 
-  await commitAssets('flags', changes, production);
+  await commitAssets('flags', changes);
 }

scripts/buildAssets/gameModeBanners.ts

@@ -6,7 +6,7 @@ import { FileChange } from '../../src/core/blitzkit/commitMultipleFiles';
 import { DATA } from './constants';
 import { SquadBattleTypeStyles } from './definitions';
 
-export async function gameModeBanners(production: boolean) {
+export async function gameModeBanners() {
   console.log('Building game mode banners...');
 
   const changes: FileChange[] = [];
@@ -50,5 +50,5 @@ export async function gameModeBanners(production: boolean) {
     });
   }
 
-  await commitAssets('game mode banners', changes, production);
+  await commitAssets('game mode banners', changes);
 }

scripts/buildAssets/index.ts

@@ -8,7 +8,6 @@ const targets = argv
   .find((argument) => argument.startsWith('--target'))
   ?.split('=')[1]
   .split(',');
-const production = argv.includes('--production');
 
 import { boosterIcons } from './boosterIcons';
 import { camouflageIcons } from './camouflageIcons';
@@ -45,5 +44,5 @@ const methods = [
 ];
 
 for (const method of methods) {
-  if (allTargets || targets?.includes(method.name)) await method(production);
+  if (allTargets || targets?.includes(method.name)) await method();
 }

scripts/buildAssets/moduleIcons.ts

@@ -5,7 +5,7 @@ import { commitAssets } from '../../src/core/blitzkit/commitAssets';
 import { FileChange } from '../../src/core/blitzkit/commitMultipleFiles';
 import { DATA } from './constants';
 
-export async function moduleIcons(production: boolean) {
+export async function moduleIcons() {
   console.log('Building module icons...');
 
   const changes = await Promise.all(
@@ -33,5 +33,5 @@ export async function moduleIcons(production: boolean) {
       }),
   );
 
-  await commitAssets('module icons', changes, production);
+  await commitAssets('module icons', changes);
 }

scripts/buildAssets/shellIcons.ts

@@ -6,7 +6,7 @@ import { commitAssets } from '../../src/core/blitzkit/commitAssets';
 import { FileChange } from '../../src/core/blitzkit/commitMultipleFiles';
 import { DATA } from './constants';
 
-export async function shellIcons(production: boolean) {
+export async function shellIcons() {
   console.log('Building shell icons...');
 
   const image = sharp(
@@ -47,5 +47,5 @@ export async function shellIcons(production: boolean) {
       }),
   );
 
-  await commitAssets('shell icons', changes, production);
+  await commitAssets('shell icons', changes);
 }

scripts/buildAssets/skillIcons.ts

@@ -25,7 +25,7 @@ export interface Avatar {
   };
 }
 
-export async function skillIcons(production: boolean) {
+export async function skillIcons() {
   console.log('Building skill icons...');
 
   const avatar = await readXMLDVPL<{ root: Avatar }>(
@@ -47,5 +47,5 @@ export async function skillIcons(production: boolean) {
     }),
   );
 
-  commitAssets('skill icons', changes, production);
+  commitAssets('skill icons', changes);
 }

scripts/buildAssets/tankArmors.ts

@@ -8,7 +8,7 @@ import { FileChange } from '../../src/core/blitzkit/commitMultipleFiles';
 import { DATA } from './constants';
 import { VehicleDefinitionList } from './definitions';
 
-export async function tankArmors(production: boolean) {
+export async function tankArmors() {
   console.log('Building tank armors...');
 
   const changes: FileChange[] = [];
@@ -42,5 +42,5 @@ export async function tankArmors(production: boolean) {
     }),
   );
 
-  await commitAssets('tank armor', changes, production);
+  await commitAssets('tank armor', changes);
 }

scripts/buildAssets/tankIcons.ts

@@ -42,7 +42,7 @@ export interface TankParameters {
   };
 }
 
-export async function tankIcons(production: boolean) {
+export async function tankIcons() {
   console.log('Building tank icons...');
 
   const changes: FileChange[] = [];
@@ -97,5 +97,5 @@ export async function tankIcons(production: boolean) {
     }),
   );
 
-  await commitAssets('tank icons', changes, production);
+  await commitAssets('tank icons', changes);
 }

scripts/buildAssets/tankModels.ts

@@ -10,7 +10,7 @@ import { DATA } from './constants';
 import { VehicleDefinitionList } from './definitions';
 import { TankParameters } from './tankIcons';
 
-export async function tankModels(production: boolean) {
+export async function tankModels() {
   console.log('Building tank models...');
 
   const nodeIO = new NodeIO();
@@ -50,6 +50,6 @@ export async function tankModels(production: boolean) {
       }),
     );
 
-    await commitAssets(`tank models ${nation}`, changes, production);
+    await commitAssets(`tank models ${nation}`, changes);
   }
 }

scripts/buildRatingLeaderboard.ts

@@ -191,9 +191,5 @@ regionSubdomains.split(',').forEach(async (regionSubdomain) => {
     },
   ];
 
-  commitAssets(
-    `rating leaderboard ${regionSubdomain} ${target}`,
-    changes,
-    production,
-  );
+  commitAssets(`rating leaderboard ${regionSubdomain} ${target}`, changes);
 });

scripts/discoverIds.ts

@@ -1,13 +1,12 @@
 import { chunk, times, uniq } from 'lodash';
 import { compress, decompress } from 'lz4js';
-import { argv } from 'process';
 import { REGIONS, Region } from '../src/constants/regions';
 import { retryAbleBlitzFetchEvent } from '../src/core/blitz/fetchBlitz';
 import { getAccountInfo } from '../src/core/blitz/getAccountInfo';
 import { MIN_IDS, idToRegion } from '../src/core/blitz/idToRegion';
 import { asset } from '../src/core/blitzkit/asset';
 import { commitAssets } from '../src/core/blitzkit/commitAssets';
-import { DiscoverIdsDefinitions } from '../src/core/blitzkit/discoveredIdDefinitions';
+import { DiscoveredIdsDefinitions } from '../src/core/blitzkit/discoveredIdDefinitions';
 import { DidsReadStream, DidsWriteStream } from '../src/core/streams/dids';
 
 const CHUNK_SIZE = 2 ** 21;
@@ -16,17 +15,12 @@ const PROGRESS_UPDATE_FREQUENCY = 1000 * 60;
 const MAX_REQUESTS = 10;
 const ACCOUNTS_PER_CALL = 100;
 const TERMINATION_THRESHOLD = 1000;
-
-const production = argv.includes('--production');
-
-console.log(`Running in ${production ? 'production' : 'development'} mode`);
-
 const startTime = Date.now();
 const indexableRegions = [...REGIONS];
 let ids: number[] = [];
-const preDiscoveredManifest = (await fetch(
-  asset('ids/manifest.json', !production),
-).then((response) => response.json())) as DiscoverIdsDefinitions;
+const preDiscoveredManifest = (await fetch(asset('ids/manifest.json')).then(
+  (response) => response.json(),
+)) as DiscoveredIdsDefinitions;
 
 console.log(
   `Fetching ${preDiscoveredManifest.chunks} pre-discovered chunks...`,
@@ -34,13 +28,13 @@ console.log(
 
 let chunkIndex = 0;
 while (chunkIndex < preDiscoveredManifest.chunks) {
-  const preDiscovered = await fetch(
-    asset(`ids/${chunkIndex}.dids.lz4`, !production),
-  ).then(async (response) => {
-    const buffer = await response.arrayBuffer();
-    const decompressed = decompress(new Uint8Array(buffer)).buffer;
-    return new DidsReadStream(decompressed as ArrayBuffer).dids();
-  });
+  const preDiscovered = await fetch(asset(`ids/${chunkIndex}.dids.lz4`)).then(
+    async (response) => {
+      const buffer = await response.arrayBuffer();
+      const decompressed = decompress(new Uint8Array(buffer)).buffer;
+      return new DidsReadStream(decompressed as ArrayBuffer).dids();
+    },
+  );
 
   // no spread syntax: https://github.com/oven-sh/bun/issues/11734
   ids = ids.concat(preDiscovered);
@@ -149,20 +143,16 @@ function post() {
     };
   });
 
-  commitAssets(
-    'discovered ids',
-    [
-      ...files,
-      {
-        content: JSON.stringify({
-          chunks: idsChunked.length,
-          count: ids.length,
-          time: Date.now(),
-        } satisfies DiscoverIdsDefinitions),
-        encoding: 'utf-8',
-        path: 'ids/manifest.json',
-      },
-    ],
-    production,
-  );
+  commitAssets('discovered ids', [
+    ...files,
+    {
+      content: JSON.stringify({
+        chunks: idsChunked.length,
+        count: ids.length,
+        time: Date.now(),
+      } satisfies DiscoveredIdsDefinitions),
+      encoding: 'utf-8',
+      path: 'ids/manifest.json',
+    },
+  ]);
 }

scripts/reviews.ts

@@ -22,7 +22,7 @@ const MAX_QUERIES = 128;
 
 console.log('Finding reviews...');
 
-const currentReviews = await fetch(asset('definitions/reviews.pb', false))
+const currentReviews = await fetch(asset('definitions/reviews.pb'))
   .then((response) => response.arrayBuffer())
   .then((buffer) =>
     decode<Reviews>('reviews/blitzkit.Reviews', new Uint8Array(buffer)),
@@ -128,8 +128,6 @@ const content = await encode('reviews/blitzkit.Reviews', reviews).then(
   (array) => Buffer.from(array).toString('base64'),
 );
 
-await commitAssets(
-  'reviews',
-  [{ content, encoding: 'base64', path: 'definitions/reviews.pb' }],
-  true,
-);
+await commitAssets('reviews', [
+  { content, encoding: 'base64', path: 'definitions/reviews.pb' },
+]);

scripts/test.ts

@@ -1,96 +0,0 @@
-import { chunk, times } from 'lodash';
-import { compress } from 'lz4js';
-import { argv } from 'process';
-import { Region, REGIONS } from '../src/constants/regions';
-import getTankStats from '../src/core/blitz/getTankStats';
-import { idToRegion } from '../src/core/blitz/idToRegion';
-import { commitAssets } from '../src/core/blitzkit/commitAssets';
-import { FileChange } from '../src/core/blitzkit/commitMultipleFiles';
-import {
-  RtscWritePlayer,
-  RtscWriteStream,
-  RtsmWriteStream,
-} from '../src/core/streams/rts';
-import usersRaw from '../test.users.json';
-
-const PLAYERS_PER_CHUNK = 256;
-const CHUNKS_PER_BATCH = 128;
-
-const production = argv.includes('--production');
-const region = argv
-  .find((argument) => argument.startsWith('--region'))
-  ?.split('=')[1] as Region | undefined;
-
-if (!region || !REGIONS.includes(region)) {
-  throw new Error('No valid region specified');
-}
-
-const today = new Date();
-const todayPath = `${today.getUTCFullYear()}/${today.getUTCMonth() + 1}/${today.getUTCDate()}`;
-const users = usersRaw.filter(({ blitz }) => idToRegion(blitz) === region);
-const base = Math.ceil(users.length / PLAYERS_PER_CHUNK);
-const chunks = times(base, (offset) => ({
-  offset,
-  users: users.filter((user) => user.blitz % base === offset),
-}));
-const batches = chunk(chunks, CHUNKS_PER_BATCH);
-const manifestWriteStream = new RtsmWriteStream();
-
-console.log(`Found ${users.length} players in ${region}`);
-
-await commitAssets(
-  `regular tank stats manifests ${todayPath}`,
-  [
-    {
-      encoding: 'base64',
-      path: `regions/${region}/regular/tanks/${todayPath}/manifest.rtsm`,
-      content: Buffer.from(
-        compress(manifestWriteStream.rtsm(base).uint8Array),
-      ).toString('base64'),
-    },
-  ],
-  production,
-);
-
-let batchesDone = 0;
-for (const batch of batches) {
-  console.log(`Batch ${++batchesDone} of ${batches.length}`);
-
-  const changes: FileChange[] = [];
-
-  let chunksDone = 0;
-  for (const chunk of batch) {
-    console.log(`Chunk ${++chunksDone} of ${chunks.length}`);
-
-    let playersDone = 0;
-    const players = await Promise.all(
-      chunk.users.map(async (user) => {
-        const tanks = await getTankStats(region, user.blitz);
-
-        console.log(`Player ${++playersDone} of ${chunk.users.length}`);
-
-        if (tanks === null) return null;
-
-        return {
-          id: user.blitz,
-          tanks,
-        } satisfies RtscWritePlayer;
-      }),
-    ).then((players) => players.filter((player) => player !== null));
-    const writeStream = new RtscWriteStream();
-
-    writeStream.rtsc(players);
-    changes.push({
-      encoding: 'base64',
-      content: Buffer.from(compress(writeStream.uint8Array)).toString('base64'),
-      path: `regions/${region}/regular/tanks/${todayPath}/${chunk.offset}.rtsc.lz4`,
-    });
-  }
-
-  // do not await; commit in background
-  commitAssets(
-    `regular tank stats ${todayPath} batch ${batches.indexOf(batch) + 1}`,
-    changes,
-    production,
-  );
-}

scripts/test2.ts

@@ -1,36 +0,0 @@
-import AdmZip from 'adm-zip';
-import { readFile } from 'fs/promises';
-import { BattleResultsReadStream } from '../src/core/streams/battleResults';
-
-interface WoTBReplayMeta {
-  version: string;
-  title: string;
-  dbid: string;
-  playerName: string;
-  battleStartTime: string;
-  playerVehicleName: string;
-  mapName: string;
-  arenaUniqueId: string;
-  battleDuration: number;
-  vehicleCompDescriptor: number;
-  camouflageId: number;
-  mapId: number;
-  arenaBonusType: number;
-}
-
-const file = await readFile('temp/test.wotbreplay');
-const zip = new AdmZip(file);
-const entries = zip.getEntries();
-
-const metaRaw = entries.find((entry) => entry.name === 'meta.json');
-const battleResultsRaw = entries.find(
-  (entry) => entry.name === 'battle_results.dat',
-);
-
-if (!metaRaw) throw new Error('No meta.json found');
-if (!battleResultsRaw) throw new Error('No battle_results.dat found');
-
-const meta = JSON.parse(metaRaw.getData().toString()) as WoTBReplayMeta;
-const battleResults = new BattleResultsReadStream(
-  battleResultsRaw.getData().buffer,
-).battleResults();

src/app/api/patreon/auth/[code]/route.ts

@@ -1,11 +1,18 @@
 import { NextResponse } from 'next/server';
+import { assertSecrete } from '../../../../../core/blitzkit/secrete';
 
 export async function GET(
   request: Request,
   { params }: { params: { code: string } },
 ) {
   const response = await fetch(
-    `https://www.patreon.com/api/oauth2/token?code=${params.code}&grant_type=authorization_code&client_id=${process.env.NEXT_PUBLIC_PATREON_CLIENT_ID}&client_secret=${process.env.PATREON_CLIENT_SECRET}&redirect_uri=${process.env.NEXT_PUBLIC_PATREON_REDIRECT_URI}`,
+    `https://www.patreon.com/api/oauth2/token?code=${
+      params.code
+    }&grant_type=authorization_code&client_id=${assertSecrete(
+      process.env.NEXT_PUBLIC_PATREON_CLIENT_ID,
+    )}&client_secret=${assertSecrete(
+      process.env.PATREON_CLIENT_SECRET,
+    )}&redirect_uri=${assertSecrete(process.env.NEXT_PUBLIC_PATREON_REDIRECT_URI)}`,
     {
       method: 'POST',
       headers: { 'Content-Type': 'application/x-www-form-urlencoded' },

src/app/api/patreon/membership/[token]/route.ts

@@ -1,4 +1,5 @@
 import { NextResponse } from 'next/server';
+import { assertSecrete } from '../../../../../core/blitzkit/secrete';
 
 interface PatreonMembershipResponse {
   data: {
@@ -68,7 +69,7 @@ export async function GET(
       (item) =>
         item.type === 'member' &&
         item.relationships.campaign.data.id ===
-          process.env.PATREON_CAMPAIGN_ID &&
+          assertSecrete(process.env.PATREON_CAMPAIGN_ID) &&
         item.attributes.patron_status === 'active_patron',
     ),
   );

src/app/api/patreon/refresh/[token]/route.ts

@@ -1,11 +1,16 @@
 import { NextResponse } from 'next/server';
+import { assertSecrete } from '../../../../../core/blitzkit/secrete';
 
 export async function GET(
   request: Request,
   { params }: { params: { token: string } },
 ) {
   const response = await fetch(
-    `https://www.patreon.com/api/oauth2/token?grant_type=refresh_token&refresh_token=${params.token}&client_id=${process.env.NEXT_PUBLIC_PATREON_CLIENT_ID}&client_secret=${process.env.PATREON_CLIENT_SECRET}`,
+    `https://www.patreon.com/api/oauth2/token?grant_type=refresh_token&refresh_token=${
+      params.token
+    }&client_id=${assertSecrete(
+      process.env.NEXT_PUBLIC_PATREON_CLIENT_ID,
+    )}&client_secret=${assertSecrete(process.env.PATREON_CLIENT_SECRET)}`,
     { method: 'POST' },
   );
   const json = await response.json();

src/app/docs/[directory]/[document]/page.tsx

@@ -3,7 +3,7 @@ import Markdown from 'markdown-to-jsx';
 import { use } from 'react';
 import { Link } from '../../../../components/Link';
 import PageWrapper from '../../../../components/PageWrapper';
-import isDev from '../../../../core/blitzkit/isDev';
+import { assertSecrete } from '../../../../core/blitzkit/secrete';
 
 export default function Page({
   params,
@@ -12,7 +12,9 @@ export default function Page({
 }) {
   const markdown = use(
     fetch(
-      `https://raw.githubusercontent.com/tresabhi/blitzkit/${isDev() ? 'dev' : 'main'}/docs/${params.directory}/${params.document}.md`,
+      `https://raw.githubusercontent.com/tresabhi/blitzkit/${assertSecrete(
+        process.env.NEXT_PUBLIC_ASSET_BRANCH,
+      )}/docs/${params.directory}/${params.document}.md`,
     ).then((response) => response.text()),
   );
 

src/components/Footer/index.tsx

@@ -1,31 +1,32 @@
 'use client';
 
-import { Flex, Heading, Text, Theme } from '@radix-ui/themes';
+import { Code, Flex, Heading, Text, Theme } from '@radix-ui/themes';
+import { use } from 'react';
 import packageJson from '../../../package.json';
+import { gameDefinitions } from '../../core/blitzkit/gameDefinitions';
 import { Link } from '../Link';
 
 export function Footer() {
+  const awaitedGameDefinitions = use(gameDefinitions);
+
   return (
     <Theme radius="none">
       <Flex
-        justify="center"
-        gap="3"
+        gap="6"
         p="6"
-        style={{
-          backgroundColor: 'var(--color-panel)',
-        }}
+        direction="column"
+        align="center"
+        style={{ backgroundColor: 'var(--color-panel)' }}
       >
         <Flex
           align="center"
           justify="between"
-          maxWidth="640px"
+          maxWidth="40rem"
+          width="100%"
           flexGrow="1"
           gap="5"
           position="relative"
-          direction={{
-            initial: 'column',
-            sm: 'row',
-          }}
+          direction={{ initial: 'column', sm: 'row' }}
         >
           <Flex
             direction="column"
@@ -34,12 +35,7 @@ export function Footer() {
               sm: 'start',
             }}
           >
-            <Heading>
-              BlitzKit{' '}
-              <Text color="gray" size="1" weight="regular">
-                {packageJson.version}
-              </Text>
-            </Heading>
+            <Heading>BlitzKit </Heading>
 
             <Text color="gray">Everything World of Tanks Blitz</Text>
           </Flex>
@@ -131,6 +127,53 @@ export function Footer() {
             </Flex>
           </Flex>
         </Flex>
+
+        <Flex gap="5" display={{ initial: 'flex', sm: 'none' }}>
+          <Flex direction="column" justify="between" align="end">
+            <Text size="2" color="gray">
+              BlitzKit
+            </Text>
+            <Text size="2" color="gray">
+              WoT Blitz
+            </Text>
+            <Text size="2" color="gray">
+              CDN
+            </Text>
+          </Flex>
+
+          <Flex direction="column" justify="between" align="start">
+            <Code size="2" color="gray">
+              {packageJson.version}
+            </Code>
+            <Code size="2" color="gray">
+              {awaitedGameDefinitions.version}
+            </Code>
+            <Code size="2" color="gray">
+              {process.env.NEXT_PUBLIC_ASSET_BRANCH}
+            </Code>
+          </Flex>
+        </Flex>
+
+        <Flex gap="2" align="center" display={{ initial: 'none', sm: 'flex' }}>
+          <Text size="2" color="gray">
+            BlitzKit
+          </Text>
+          <Code size="2" color="gray">
+            {packageJson.version}
+          </Code>
+          <Text size="2" color="gray">
+            WoT Blitz
+          </Text>
+          <Code size="2" color="gray">
+            {awaitedGameDefinitions.version}
+          </Code>
+          <Text size="2" color="gray">
+            CDN
+          </Text>
+          <Code size="2" color="gray">
+            {process.env.NEXT_PUBLIC_ASSET_BRANCH}
+          </Code>
+        </Flex>
       </Flex>
     </Theme>
   );

src/core/blitz/writeDVPL.ts

@@ -26,7 +26,10 @@ export function writeDVPL(buffer: Buffer) {
       0,
     );
 
-    return Buffer.concat([buffer, footerBuffer], buffer.length + 20);
+    return Buffer.concat(
+      [new Uint8Array(buffer), new Uint8Array(footerBuffer)],
+      buffer.length + 20,
+    );
   } else {
     output = output.subarray(0, compressedBlockSize);
     const footerBuffer = toDVPLFooter(
@@ -36,7 +39,10 @@ export function writeDVPL(buffer: Buffer) {
       2,
     );
 
-    return Buffer.concat([output, footerBuffer], compressedBlockSize + 20);
+    return Buffer.concat(
+      [new Uint8Array(output), new Uint8Array(footerBuffer)],
+      compressedBlockSize + 20,
+    );
   }
 }
 

src/core/blitzkit/asset.ts

@@ -1,6 +1,8 @@
 import { ASSETS_REPO } from '../../constants/assets';
-import isDev from './isDev';
+import { assertSecrete } from './secrete';
 
-export function asset(path: string, dev = isDev()) {
-  return `https://raw.githubusercontent.com/tresabhi/${ASSETS_REPO}/${dev ? 'dev' : 'main'}/${path}`;
+export function asset(path: string) {
+  return `https://raw.githubusercontent.com/tresabhi/${ASSETS_REPO}/${assertSecrete(
+    process.env.NEXT_PUBLIC_ASSET_BRANCH,
+  )}/${path}`;
 }

src/core/blitzkit/commitAssets.ts

@@ -1,11 +1,8 @@
 import { ASSETS_REPO } from '../../constants/assets';
 import commitMultipleFiles, { FileChange } from './commitMultipleFiles';
+import { assertSecrete } from './secrete';
 
-export async function commitAssets(
-  message: string,
-  changes: FileChange[],
-  production: boolean,
-) {
+export async function commitAssets(message: string, changes: FileChange[]) {
   console.log(`Committing ${message}...`);
 
   if (changes.length === 0) return;
@@ -13,7 +10,7 @@ export async function commitAssets(
   await commitMultipleFiles(
     'tresabhi',
     ASSETS_REPO,
-    production ? 'main' : 'dev',
+    assertSecrete(process.env.NEXT_PUBLIC_ASSET_BRANCH),
     `${message} - ${new Date().toDateString()}`,
     changes,
   );

src/core/blitzkit/discoveredIdDefinitions.ts

@@ -1,5 +1,4 @@
 import { asset } from './asset';
-import isDev from './isDev';
 
 export interface DiscoveredIdsDefinitions {
   time: number;
@@ -7,6 +6,6 @@ export interface DiscoveredIdsDefinitions {
   count: number;
 }
 
-export const discoveredIdsDefinitions = fetch(
-  asset('ids/manifest.json', isDev()),
-).then((response) => response.json() as Promise<DiscoveredIdsDefinitions>);
+export const discoveredIdsDefinitions = fetch(asset('ids/manifest.json')).then(
+  (response) => response.json() as Promise<DiscoveredIdsDefinitions>,
+);

src/core/blitzkit/fetchPreDiscoveredIds.ts

@@ -5,10 +5,10 @@ import { DidsReadStream } from '../streams/dids';
 import { asset } from './asset';
 import { DiscoveredIdsDefinitions } from './discoveredIdDefinitions';
 
-export async function fetchPreDiscoveredIds(dev: boolean) {
+export async function fetchPreDiscoveredIds() {
   const idChunks: number[][] = [];
-  const manifest = (await fetch(asset('ids/manifest.json', dev)).then(
-    (response) => response.json(),
+  const manifest = (await fetch(asset('ids/manifest.json')).then((response) =>
+    response.json(),
   )) as DiscoveredIdsDefinitions;
   const bar = new ProgressBar(
     `Fetching ${manifest.count.toLocaleString()} ids in ${manifest.chunks} chunks :bar`,
@@ -19,7 +19,7 @@ export async function fetchPreDiscoveredIds(dev: boolean) {
   await Promise.all(
     times(manifest.chunks, async (chunkIndex) => {
       const preDiscovered = await fetch(
-        asset(`ids/${chunkIndex}.dids.lz4`, dev),
+        asset(`ids/${chunkIndex}.dids.lz4`),
       ).then(async (response) => {
         const buffer = await response.arrayBuffer();
         const decompressed = decompress(new Uint8Array(buffer)).buffer;

src/core/blitzkit/isDev.ts

@@ -1,23 +0,0 @@
-import { config } from 'dotenv';
-
-config();
-
-const devHostStartNames = [
-  'dev',
-  'beta',
-  'blitzkrieg-',
-  'localhost',
-  'betakrieg',
-  'devkrieg',
-  'blitzrinth-',
-  'blitzkit-',
-];
-
-export default function isDev() {
-  return (
-    process.env.NODE_ENV === 'development' ||
-    process.env.VERCEL_ENV === 'preview' ||
-    (typeof window !== 'undefined' &&
-      devHostStartNames.some((name) => window.location.host.startsWith(name)))
-  );
-}

src/core/blitzkit/octokit.ts

@@ -1,7 +1,9 @@
 import { throttling } from '@octokit/plugin-throttling';
 import { Octokit } from '@octokit/rest';
-import { secrets } from './secrets';
+import { assertSecrete } from './secrete';
 
 Octokit.plugin(throttling);
 
-export const octokit = new Octokit({ auth: secrets.GH_TOKEN });
+export const octokit = new Octokit({
+  auth: assertSecrete(process.env.GH_TOKEN),
+});

src/core/blitzkit/patreonLoginUrl.ts

@@ -1,8 +1,10 @@
+import { assertSecrete } from './secrete';
+
 export function patreonLoginUrl() {
   const params = new URLSearchParams({
     response_type: 'code',
-    client_id: process.env.NEXT_PUBLIC_PATREON_CLIENT_ID as string,
-    redirect_uri: process.env.NEXT_PUBLIC_PATREON_REDIRECT_URI as string,
+    client_id: assertSecrete(process.env.NEXT_PUBLIC_PATREON_CLIENT_ID),
+    redirect_uri: assertSecrete(process.env.NEXT_PUBLIC_PATREON_REDIRECT_URI),
     scope: 'identity',
   });
 

src/core/blitzkit/secrete.ts

@@ -0,0 +1,4 @@
+export function assertSecrete(secrete?: string) {
+  if (secrete === undefined) throw new Error('Missing secret');
+  return secrete;
+}

src/core/blitzkit/secrets.ts

@@ -1,27 +0,0 @@
-import { config } from 'dotenv';
-
-config();
-
-const SECRET_KEYS = [
-  'DISCORD_TOKEN',
-  'DISCORD_CLIENT_ID',
-  'GH_TOKEN',
-  'DATABASE_URL',
-  'WOTB_DLC_CDN',
-] as const;
-
-export type SECRET = typeof SECRET_KEYS extends readonly (infer T)[]
-  ? T
-  : never;
-
-export const secrets = SECRET_KEYS.reduce<Partial<Record<SECRET, string>>>(
-  (accumulator, key) => ({
-    ...accumulator,
-
-    get [key](): string {
-      if (!(key in process.env)) throw new Error(`Secret ${key} not provided`);
-      return process.env[key]!;
-    },
-  }),
-  {},
-) as Record<SECRET, string>;

src/core/discord/manager.ts

@@ -1,6 +1,6 @@
 import { ShardingManager } from 'discord.js';
-import { secrets } from '../blitzkit/secrets';
+import { assertSecrete } from '../blitzkit/secrete';
 
 export const manager = new ShardingManager('dist/bot/workers/bot.js', {
-  token: secrets.DISCORD_TOKEN,
+  token: assertSecrete(process.env.DISCORD_TOKEN),
 });

src/core/github/assetCommit.ts

@@ -1,12 +1,10 @@
 import { ASSETS_REPO } from '../../constants/assets';
 import { GithubChangeBlob, createBlob } from '../blitzkit/createBlob';
 import { octokit } from '../blitzkit/octokit';
+import { assertSecrete } from '../blitzkit/secrete';
 
 export class AssetCommit {
-  constructor(
-    public message: string,
-    public production: boolean,
-  ) {}
+  constructor(public message: string) {}
   private blobs: GithubChangeBlob[] = [];
 
   async add(path: string, content: string, encoding: 'utf-8' | 'base64') {
@@ -28,7 +26,7 @@ export class AssetCommit {
       await octokit.git.getRef({
         owner: 'tresabhi',
         repo: ASSETS_REPO,
-        ref: `heads/${this.production ? 'main' : 'dev'}`,
+        ref: `heads/${assertSecrete(process.env.NEXT_PUBLIC_ASSET_BRANCH)}`,
       })
     ).data.object.sha;
     const treeSha = (
@@ -56,7 +54,7 @@ export class AssetCommit {
     await octokit.git.updateRef({
       owner: 'tresabhi',
       repo: ASSETS_REPO,
-      ref: `heads/${this.production ? 'main' : 'dev'}`,
+      ref: `heads/${assertSecrete(process.env.NEXT_PUBLIC_ASSET_BRANCH)}`,
       sha: newCommitData.sha,
     });
   }

src/events/interactionCreate/index.ts

@@ -33,7 +33,7 @@ import { searchPlayersCommand } from '../../commands/searchPlayers';
 import { statsCommand } from '../../commands/stats';
 import { todayCommand } from '../../commands/today';
 import { RenderConfiguration } from '../../core/blitzkit/renderConfiguration';
-import { secrets } from '../../core/blitzkit/secrets';
+import { assertSecrete } from '../../core/blitzkit/secrete';
 import handleAutocomplete from './handlers/autocomplete';
 import handleButton from './handlers/button';
 import handleChatInputCommand from './handlers/chatInputCommand';
@@ -115,14 +115,19 @@ export const commands = Promise.allSettled(COMMANDS_RAW).then((rawCommands) => {
   );
 });
 
-const rest = new REST().setToken(secrets.DISCORD_TOKEN);
+const rest = new REST().setToken(assertSecrete(process.env.DISCORD_TOKEN));
 
 commands.then((awaitedCommands) => {
   const body = Object.values(awaitedCommands).map((registry) =>
     registry.command.toJSON(),
   );
 
-  rest.put(Routes.applicationCommands(secrets.DISCORD_CLIENT_ID), { body });
+  rest.put(
+    Routes.applicationCommands(assertSecrete(process.env.DISCORD_CLIENT_ID)),
+    {
+      body,
+    },
+  );
 });
 
 export default async function interactionCreate(

src/workers/bot.ts

@@ -1,8 +1,9 @@
 import { registerProcesses } from '../core/blitzkit/processes';
-import { secrets } from '../core/blitzkit/secrets';
+import { assertSecrete } from '../core/blitzkit/secrete';
 import { client } from '../core/discord/client';
 
 console.log(`🟡 Launching bot ${client.shard?.ids[0]}`);
 
 registerProcesses();
-client.login(secrets.DISCORD_TOKEN);
+
+client.login(assertSecrete(process.env.DISCORD_TOKEN));

tsconfig.json

@@ -21,5 +21,5 @@
     ]
   },
   "include": ["src/**/*", "scripts/**/*", "dist/website/types/**/*.ts"],
-  "exclude": ["node_modules/**/*", "dist", "scripts"]
+  "exclude": ["node_modules/**/*", "dist"]
 }