fix: types

packages/website/src/core/blitz/canSplash.ts

@@ -1,3 +1,5 @@
+import { ShellDefinition, ShellType } from '@blitzkit/core';
+
 export function canSplash(type: ShellDefinition['type']): type is ShellType.HE {
   return type === ShellType.HE;
 }

packages/website/src/core/blitz/extractArmor.ts

@@ -1,13 +1,16 @@
+import {
+  Hierarchy,
+  Sc2ReadStream,
+  ScgReadStream,
+  VertexAttribute,
+} from '@blitzkit/core';
 import { Accessor, Document, Node, Scene } from '@gltf-transform/core';
 import { times } from 'lodash';
-import { Hierarchy, Sc2ReadStream } from '../streams/sc2';
-import { ScgReadStream } from '../streams/scg';
-import { VertexAttribute } from '../streams/scpg';
+import { readDVPLFile } from '../../../../scripts/src/core/blitz/readDVPLFile';
 import {
   vertexAttributeGLTFName,
   vertexAttributeGltfVectorSizes,
 } from './extractModel/constants';
-import { readDVPLFile } from './readDVPLFile';
 
 export async function extractArmor(data: string, fileName: string) {
   const sc2Path = `${data}/3d/Tanks/CollisionMeshes/${fileName}.sc2.dvpl`;

packages/website/src/core/blitz/extractModel/constants.ts

@@ -1,5 +1,4 @@
-import { vertexAttributeVectorSizes } from '../../streams/scg';
-import { VertexAttribute } from '../../streams/scpg';
+import { VertexAttribute, vertexAttributeVectorSizes } from '@blitzkit/core';
 
 export const vertexAttributeGLTFName: Partial<Record<VertexAttribute, string>> =
   {

packages/website/src/core/blitz/extractModel/index.ts

@@ -1,13 +1,17 @@
+import {
+  Hierarchy,
+  Sc2ReadStream,
+  ScgReadStream,
+  Textures,
+  VertexAttribute,
+} from '@blitzkit/core';
 import { Document, Material, Node, Scene } from '@gltf-transform/core';
 import { times } from 'lodash';
 import { dirname } from 'path';
 import { Matrix4, Quaternion, Vector3, Vector4Tuple } from 'three';
+import { readDVPLFile } from '../../../../../scripts/src/core/blitz/readDVPLFile';
 import { readTexture } from '../../blitzkit/readTexture';
 import { TextureMutation } from '../../blitzkit/readTexture/constants';
-import { Hierarchy, Sc2ReadStream, Textures } from '../../streams/sc2';
-import { ScgReadStream } from '../../streams/scg';
-import { VertexAttribute } from '../../streams/scpg';
-import { readDVPLFile } from '../readDVPLFile';
 import {
   vertexAttributeGLTFName,
   vertexAttributeGltfVectorSizes,

packages/website/src/core/blitz/fetchBlitz.ts

@@ -1,6 +1,5 @@
-import { assertSecret } from '@blitzkit/core';
+import { assertSecret, Region } from '@blitzkit/core';
 import { EventManager } from '@blitzkit/core/src/blitzkit/eventManager';
-import { Region } from '../../constants/regions';
 import { patientFetch } from '../blitzkit/patientFetch';
 
 const RETRY_ERRORS = ['REQUEST_LIMIT_EXCEEDED', 'SOURCE_NOT_AVAILABLE'];
@@ -73,7 +72,9 @@ export default function fetchBlitz<Data extends object>(
   return new Promise<Data>((resolve) => {
     queue.push({
       url: `https://api.wotblitz.${region}/wotb/${path}/?${Object.entries({
-        application_id: assertSecret(process.env.WARGAMING_APPLICATION_ID),
+        application_id: assertSecret(
+          process.env.NEXT_PUBLIC_WARGAMING_APPLICATION_ID,
+        ),
         ...params,
       })
         .filter(([_, value]) => value !== undefined)

packages/website/src/core/blitz/generateStats.ts

@@ -1,5 +1,5 @@
-import calculateWN8 from '../statistics/calculateWN8';
-import { BlitzStats } from '../statistics/compositeStats/constants';
+import { BlitzStats } from '@blitzkit/core';
+import calculateWN8 from '@blitzkit/core/src/statistics/calculateWN8';
 
 export type Stat = keyof ReturnType<typeof generateStats>;
 

packages/website/src/core/blitz/getAccountAchievements.ts

@@ -1,4 +1,4 @@
-import { Region } from '../../constants/regions';
+import { Region } from '@blitzkit/core';
 import fetchBlitz from './fetchBlitz';
 import { normalizeIds } from './normalizeIds';
 

packages/website/src/core/blitz/getAccountInfo.ts

@@ -1,5 +1,4 @@
-import { Region } from '../../constants/regions';
-import { BlitzStats } from '../statistics/compositeStats/constants';
+import { BlitzStats, Region } from '@blitzkit/core';
 import fetchBlitz, { FetchBlitzParams } from './fetchBlitz';
 import { normalizeIds } from './normalizeIds';
 

packages/website/src/core/blitz/getClanAccountInfo.ts

@@ -1,4 +1,4 @@
-import { Region } from '../../constants/regions';
+import { Region } from '@blitzkit/core';
 import fetchBlitz from './fetchBlitz';
 import { normalizeIds } from './normalizeIds';
 

packages/website/src/core/blitz/getClanInfo.ts

@@ -1,4 +1,4 @@
-import { Region } from '../../constants/regions';
+import { Region } from '@blitzkit/core';
 import fetchBlitz from './fetchBlitz';
 import { normalizeIds } from './normalizeIds';
 

packages/website/src/core/blitz/getLeagueFromScore.ts

@@ -1,4 +1,4 @@
-import { LEAGUES } from '../../constants/leagues';
+import { LEAGUES } from '@blitzkit/core';
 
 export function getLeagueFromScore(score: number) {
   return LEAGUES.find(({ minScore }) => score >= minScore)!;

packages/website/src/core/blitz/getRatingInfo.ts

@@ -1,5 +1,5 @@
-import { RatingInfo } from '../../commands/ratingLeaderboard';
-import { Region } from '../../constants/regions';
+import { Region } from '@blitzkit/core';
+import { RatingInfo } from '../../../../bot/src/commands/ratingLeaderboard';
 import { context } from '../blitzkit/context';
 import { patientFetch } from '../blitzkit/patientFetch';
 import regionToRegionSubdomain from './regionToRegionSubdomain';

packages/website/src/core/blitz/getRatingLeague.ts

@@ -1,5 +1,8 @@
-import { LeagueTop, RatingPlayer } from '../../commands/ratingLeaderboard';
-import { Region } from '../../constants/regions';
+import { Region } from '@blitzkit/core';
+import {
+  LeagueTop,
+  RatingPlayer,
+} from '../../../../bot/src/commands/ratingLeaderboard';
 import { context } from '../blitzkit/context';
 import { patientFetch } from '../blitzkit/patientFetch';
 import regionToRegionSubdomain from './regionToRegionSubdomain';

packages/website/src/core/blitz/getRatingNeighbors.ts

@@ -1,5 +1,5 @@
-import { RatingNeighbors } from '../../commands/ratingLeaderboard';
-import { Region } from '../../constants/regions';
+import { Region } from '@blitzkit/core';
+import { RatingNeighbors } from '../../../../bot/src/commands/ratingLeaderboard';
 import { patientFetch } from '../blitzkit/patientFetch';
 import { withCORSProxy } from '../blitzkit/withCORSProxy';
 import regionToRegionSubdomain from './regionToRegionSubdomain';

packages/website/src/core/blitz/getTankStats.ts

@@ -1,5 +1,4 @@
-import { Region } from '../../constants/regions';
-import { TanksStats } from '../../types/tanksStats';
+import { Region, TanksStats } from '@blitzkit/core';
 import fetchBlitz, { FetchBlitzParams } from './fetchBlitz';
 
 export default async function getTankStats(

packages/website/src/core/blitz/isValidBlitzId.ts

@@ -1,6 +1,4 @@
-import { Region } from '../../constants/regions';
-import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID';
-import { idToRegion } from './idToRegion';
+import { Region, assertSecret, idToRegion } from '@blitzkit/core';
 
 export async function isValidBlitzId(id: number, token?: string) {
   let region: Region;
@@ -12,9 +10,9 @@ export async function isValidBlitzId(id: number, token?: string) {
   }
 
   const json = await fetch(
-    `https://api.wotblitz.${region}/wotb/account/info/?account_id=${
-      id
-    }&application_id=${WARGAMING_APPLICATION_ID}${
+    `https://api.wotblitz.${region}/wotb/account/info/?account_id=${id}&application_id=${assertSecret(
+      process.env.NEXT_PUBLIC_WARGAMING_APPLICATION_ID,
+    )}${
       token === undefined ? '' : `&access_token=${token}`
     }&fields=account_id%2C-account_id`,
   ).then(

packages/website/src/core/blitz/readBase64DVPL.ts

@@ -1,6 +0,0 @@
-import { readDVPLFile } from './readDVPLFile';
-
-export async function readBase64DVPL(file: string) {
-  const buffer = await readDVPLFile(file);
-  return buffer.toString('base64');
-}

packages/website/src/core/blitz/readDVPL.ts

@@ -1,60 +0,0 @@
-import { crc32 } from 'crc';
-import { decompressBlock } from 'lz4js';
-
-/**
- * Thanks Maddoxkkm! Modified heavily to be modern.
- * https://github.com/Maddoxkkm/dvpl_converter/
- */
-export function readDVPL(buffer: Buffer) {
-  const footerBuffer = buffer.subarray(buffer.length - 20, buffer.length);
-
-  if (
-    footerBuffer.toString('utf8', 16, 20) !== 'DVPL' ||
-    footerBuffer.length !== 20
-  ) {
-    throw new SyntaxError('Invalid DVPL footer');
-  }
-
-  const footerData = {
-    oSize: footerBuffer.readUInt32LE(0),
-    cSize: footerBuffer.readUInt32LE(4),
-    crc32: footerBuffer.readUInt32LE(8),
-    type: footerBuffer.readUInt32LE(12),
-  };
-  const targetBlock = buffer.subarray(0, buffer.length - 20);
-
-  if (targetBlock.length !== footerData.cSize) {
-    throw new RangeError('DVPL size mismatch');
-  }
-  if (crc32(targetBlock) !== footerData.crc32) {
-    throw new TypeError('DVPL CRC32 mismatch');
-  }
-
-  if (footerData.type === 0) {
-    if (!(footerData.oSize === footerData.cSize && footerData.type === 0)) {
-      throw new RangeError('DVPL type and size mismatch');
-    }
-
-    return targetBlock;
-  } else if (footerData.type === 1 || footerData.type === 2) {
-    const source = new Uint8Array(targetBlock);
-    const destination = new Uint8Array(footerData.oSize);
-    const decompressedSize = decompressBlock(
-      source,
-      destination,
-      0,
-      source.length,
-      0,
-    );
-
-    if (decompressedSize !== footerData.oSize) {
-      throw new RangeError(
-        `Decompressed DVPL size mismatch (${decompressedSize} vs ${footerData.oSize})`,
-      );
-    }
-
-    return Buffer.from(destination);
-  } else {
-    throw new SyntaxError('Unknown DVPL format');
-  }
-}

packages/website/src/core/blitz/readDVPLFile.ts

@@ -1,6 +0,0 @@
-import { readFile } from 'fs/promises';
-import { readDVPL } from './readDVPL';
-
-export async function readDVPLFile(file: string) {
-  return readDVPL(await readFile(file));
-}

packages/website/src/core/blitz/readStringDVPL.ts

@@ -1,6 +0,0 @@
-import { readDVPLFile } from './readDVPLFile';
-
-export async function readStringDVPL(file: string) {
-  const buffer = await readDVPLFile(file);
-  return buffer.toString();
-}

packages/website/src/core/blitz/readXMLDVPL.ts

@@ -1,9 +0,0 @@
-import { XMLParser } from 'fast-xml-parser';
-import { readStringDVPL } from './readStringDVPL';
-
-export async function readXMLDVPL<Type>(file: string) {
-  const parser = new XMLParser();
-  const xml = await readStringDVPL(file);
-
-  return parser.parse(xml) as Type;
-}

packages/website/src/core/blitz/readYAML.ts

@@ -1,7 +0,0 @@
-import { readFile } from 'fs/promises';
-import { parse } from 'yaml';
-
-export async function readYAML<Type>(file: string) {
-  const yaml = (await readFile(file)).toString();
-  return parse(yaml) as Type;
-}

packages/website/src/core/blitz/readYAMLDVPL.ts

@@ -1,8 +0,0 @@
-import { parse } from 'yaml';
-import { readStringDVPL } from './readStringDVPL';
-
-export async function readYAMLDVPL<Type>(file: string) {
-  const yaml = await readStringDVPL(file);
-
-  return parse(yaml) as Type;
-}

packages/website/src/core/blitz/regionSubdomainToRegion.ts

@@ -1,7 +1,7 @@
-import { Region, RegionSubdomain } from '../../constants/regions';
+import { Region, RegionSubdomain } from "@blitzkit/core";
 
 export default function regionSubdomainToRegion(
   regionDomain: RegionSubdomain,
 ): Region {
-  return regionDomain === 'na' ? 'com' : regionDomain;
+  return regionDomain === 'na'   ? 'com'  : regionDomain;
 }

packages/website/src/core/blitz/regionToRegionSubdomain.ts

@@ -1,4 +1,4 @@
-import { Region, RegionSubdomain } from '../../constants/regions';
+import { Region, RegionSubdomain } from "@blitzkit/core";
 
 export default function regionToRegionSubdomain(
   regionDomain: Region,

packages/website/src/core/blitz/resolveTankId.ts

@@ -1,11 +1,10 @@
+import { tankDefinitions, tankNames } from '@blitzkit/core';
 import { Locale } from 'discord.js';
 import { go } from 'fuzzysort';
 import markdownEscape from 'markdown-escape';
+import { tankNamesTechTreeOnly } from '../../../../bot/src/core/discord/autocompleteTanks';
+import { translator } from '../../../../bot/src/core/localization/translator';
 import { UserError } from '../../hooks/userError';
-import { tankDefinitions } from '../blitzkit/tankDefinitions';
-import { tankNames } from '../blitzkit/tankDefinitions/tankNames';
-import { tankNamesTechTreeOnly } from '../discord/autocompleteTanks';
-import { translator } from '../localization/translator';
 
 export default async function resolveTankId(
   tank: string | number,

packages/website/src/core/blitz/searchClansAcrossRegions.ts

@@ -1,5 +1,5 @@
-import { Region } from '../../constants/regions';
-import { ClanList } from '../../types/clanList';
+import { Region } from '@blitzkit/core';
+import { ClanList } from '../../../../bot/src/types/clanList';
 import fetchBlitz from './fetchBlitz';
 
 export default async function searchClansAcrossRegions(

packages/website/src/core/blitz/searchCurrentRatingPlayers.ts

@@ -1,4 +1,4 @@
-import { Region } from '../../constants/regions';
+import { Region } from '@blitzkit/core';
 import { context } from '../blitzkit/context';
 import regionToRegionSubdomain from './regionToRegionSubdomain';
 

packages/website/src/core/blitz/searchPlayersAcrossRegions/index.ts

@@ -1,4 +1,4 @@
-import { Region } from '../../../constants/regions';
+import { Region } from '@blitzkit/core';
 import fetchBlitz from '../fetchBlitz';
 import { usernamePattern } from './constants';
 

packages/website/src/core/blitz/toUniqueId.ts

@@ -1,4 +1,4 @@
-import { NATION_IDS } from '../../constants/nations';
+import { NATION_IDS } from "@blitzkit/core";
 
 export function toUniqueId(nation: string, id: number) {
   return (id << 8) + (NATION_IDS[nation] << 4) + 1;