feat: cleanup

2026-10-21 02:37:05 +02:00 · 2025-05-26 19:04:58 -05:00
1 parent bc8cfc9897
commit 5adf90bab2
@@ -0,0 +1,113 @@
+{
+  "name": "blitzkit",
+  "private": true,
+  "version": "1.27.11",
+  "description": "🎉 Tools for everything World of Tanks Blitz",
+  "type": "module",
+  "types": "./types.d.ts",
+  "workspaces": ["packages/*", "submodules/*"],
+  "scripts": {
+    "build:assets": "cd packages/scripts && bun run build:assets",
+    "build:averages": "bun --filter=@blitzkit/scripts run build:averages",
+    "build:bot": "cd packages/scripts && bun run build:bot",
+    "build:website": "bun build:prisma --no-hints && cd packages/website && bun run build",
+    "build:prisma": "prisma generate",
+    "build:sitemap": "bun scripts/sitemap.ts",
+    "build:docs": "vitepress build docs",
+    "build:ratingleaderboard": "cd packages/scripts && bun run build:ratingleaderboard",
+    "dev:bot": "bun run build:bot --dev && bun start:bot",
+    "start:bot": "bun dist/bot/main.js",
+    "dev:docs": "vitepress dev docs",
+    "dev:website": "cd packages/website-ue && bun run dev",
+    "dev:api": "bun --filter=@blitzkit/api run dev",
+    "setup:depotdownloader": "bun --filter=@blitzkit/scripts run setup:depotdownloader",
+    "setup:patches": "bun --filter=@blitzkit/scripts run setup:patches",
+    "start:website": "bun --filter=@blitzkit/website run start",
+    "host:docs": "vitepress preview docs",
+    "lint": "tsc",
+    "lint:website": "cd packages/website && bun run lint",
+    "format": "prettier --write \"**/*.@(json|js|jsx|css|md|ts|tsx|html|xml|yml|gltf)\"",
+    "update": "yarn upgrade --latest",
+    "tunnel": "cloudflared tunnel --url http://localhost:3000",
+    "discoverids": "scripts/discoverIds.ts",
+    "build:protos": "bun packages/scripts/src/protos.ts",
+    "preview:website": "cd packages/website && bun run preview",
+    "build:reviews": "cd packages/scripts && bun build:reviews",
+    "build:ids": "cd packages/scripts && bun build:ids",
+    "prunestrings": "cd packages/scripts && bun prunestrings"
+  },
+  "license": "MIT",
+  "dependencies": {
+    "satori": "^0.10.14",
+    "@resvg/resvg-js": "^2.6.2",
+    "discord.js": "^14.16.3",
+    "fuzzysort": "^2.0.4",
+    "bepaint": "^0.1.0-beta.3",
+    "markdown-escape": "^2.0.0",
+    "@types/markdown-escape": "^1.1.3",
+    "@types/adm-zip": "^0.5.5",
+    "@types/lz4js": "^0.2.1",
+    "@octokit/plugin-throttling": "^8.2.0",
+    "@octokit/rest": "^20.1.1",
+    "@prisma/client": "^6.6.0",
+    "adm-zip": "^0.5.16",
+    "crc": "^4.3.2",
+    "dotenv": "^16.4.5",
+    "lz4js": "^0.2.0",
+    "ts-proto": "^2.2.2",
+    "yaml": "^2.5.0",
+    "ts-deepmerge": "^7.0.2",
+    "@types/decompress": "^4.2.7",
+    "@types/progress": "^2.0.7",
+    "@gltf-transform/core": "^4.0.10",
+    "@gltf-transform/extensions": "^4.0.10",
+    "@gltf-transform/functions": "^4.0.10",
+    "csv-parse": "^5.5.6",
+    "decompress": "^4.2.1",
+    "esbuild": "^0.19.12",
+    "fast-xml-parser": "^4.4.1",
+    "progress": "^2.0.3",
+    "puppeteer": "^23.10.4",
+    "@astrojs/check": "^0.9.4",
+    "@astrojs/sitemap": "^3.2.1",
+    "@playform/compress": "^0.1.9",
+    "@playform/inline": "^0.1.2",
+    "@types/js-cookie": "^3.0.6",
+    "@types/three": "^0.160.0",
+    "astro-compressor": "^1.0.0",
+    "@astrojs/partytown": "^2.1.4",
+    "@astrolib/seo": "^1.0.0-beta.8",
+    "@fontsource/inter": "^5.2.5",
+    "@nanostores/persistent": "^0.10.2",
+    "@nanostores/react": "^0.7.3",
+    "@nivo/bar": "^0.87.0",
+    "@nivo/line": "^0.88.0",
+    "@radix-ui/colors": "^3.0.0",
+    "@radix-ui/react-icons": "^1.3.0",
+    "@radix-ui/themes": "^3.1.4",
+    "@react-three/drei": "^9.115.0",
+    "@react-three/fiber": "^8.17.10",
+    "compare-versions": "^6.1.1",
+    "echarts": "^5.5.1",
+    "immer": "^10.1.1",
+    "js-cookie": "^3.0.5",
+    "markdown-to-jsx": "^7.5.0",
+    "nanostores": "^0.11.3",
+    "react-device-detect": "^2.2.3",
+    "react-promise-suspense": "^0.3.4",
+    "three": "^0.169.0",
+    "urlon": "^3.1.0",
+    "zustand": "^4.5.5",
+    "@types/bun": "latest",
+    "@types/lodash-es": "^4.17.12",
+    "@types/node": "^22.14.1",
+    "prettier": "^3.5.3",
+    "prisma": "^6.6.0",
+    "typescript": "^5.8.3",
+    "googleapis": "^144.0.0",
+    "lodash-es": "^4.17.21",
+    "protobufjs": "^7.5.2",
+    "quicklime": "^1.2.0",
+    "sharp": "^0.33.5"
+  }
+}
@@ -0,0 +1,124 @@
+{
+  "name": "blitzkit",
+  "private": true,
+  "version": "1.27.11",
+  "description": "🎉 Tools for everything World of Tanks Blitz",
+  "type": "module",
+  "types": "./types.d.ts",
+  "workspaces": [
+    "packages/*",
+    "submodules/*"
+  ],
+  "scripts": {
+    "build:assets": "cd packages/scripts && bun run build:assets",
+    "build:averages": "bun --filter=@blitzkit/scripts run build:averages",
+    "build:bot": "cd packages/scripts && bun run build:bot",
+    "build:website": "bun build:prisma --no-hints && cd packages/website && bun run build",
+    "build:prisma": "prisma generate",
+    "build:sitemap": "bun scripts/sitemap.ts",
+    "build:docs": "vitepress build docs",
+    "build:ratingleaderboard": "cd packages/scripts && bun run build:ratingleaderboard",
+    "dev:bot": "bun run build:bot --dev && bun start:bot",
+    "start:bot": "bun dist/bot/main.js",
+    "dev:docs": "vitepress dev docs",
+    "dev:website": "cd packages/website-ue && bun run dev",
+    "dev:api": "bun --filter=@blitzkit/api run dev",
+    "setup:depotdownloader": "bun --filter=@blitzkit/scripts run setup:depotdownloader",
+    "setup:patches": "bun --filter=@blitzkit/scripts run setup:patches",
+    "start:website": "bun --filter=@blitzkit/website run start",
+    "host:docs": "vitepress preview docs",
+    "lint": "tsc",
+    "lint:website": "cd packages/website && bun run lint",
+    "format": "prettier --write \"**/*.@(json|js|jsx|css|md|ts|tsx|html|xml|yml|gltf)\"",
+    "update": "yarn upgrade --latest",
+    "tunnel": "cloudflared tunnel --url http://localhost:3000",
+    "discoverids": "scripts/discoverIds.ts",
+    "build:protos": "bun packages/scripts/src/protos.ts",
+    "preview:website": "cd packages/website && bun run preview",
+    "build:reviews": "cd packages/scripts && bun build:reviews",
+    "build:ids": "cd packages/scripts && bun build:ids",
+    "prunestrings": "cd packages/scripts && bun prunestrings"
+  },
+  "license": "MIT",
+  "dependencies": {
+    "satori": "^0.10.14",
+    "@resvg/resvg-js": "^2.6.2",
+    "discord.js": "^14.16.3",
+    "fuzzysort": "^2.0.4",
+    "bepaint": "^0.1.0-beta.3",
+    "markdown-escape": "^2.0.0",
+    "@types/markdown-escape": "^1.1.3",
+    "@types/adm-zip": "^0.5.5",
+    "@types/lz4js": "^0.2.1",
+    "@octokit/plugin-throttling": "^8.2.0",
+    "@octokit/rest": "^20.1.1",
+    "@prisma/client": "^6.6.0",
+    "adm-zip": "^0.5.16",
+    "crc": "^4.3.2",
+    "dotenv": "^16.4.5",
+    "lz4js": "^0.2.0",
+    "ts-proto": "^2.2.2",
+    "yaml": "^2.5.0",
+    "ts-deepmerge": "^7.0.2",
+    "@types/decompress": "^4.2.7",
+    "@types/progress": "^2.0.7",
+    "@gltf-transform/core": "^4.0.10",
+    "@gltf-transform/extensions": "^4.0.10",
+    "@gltf-transform/functions": "^4.0.10",
+    "csv-parse": "^5.5.6",
+    "decompress": "^4.2.1",
+    "esbuild": "^0.19.12",
+    "fast-xml-parser": "^4.4.1",
+    "progress": "^2.0.3",
+    "puppeteer": "^23.10.4",
+    "@astrojs/check": "^0.9.4",
+    "@astrojs/sitemap": "^3.2.1",
+    "@playform/compress": "^0.1.9",
+    "@playform/inline": "^0.1.2",
+    "@types/js-cookie": "^3.0.6",
+    "@types/three": "^0.160.0",
+    "astro-compressor": "^1.0.0",
+    "@astrojs/partytown": "^2.1.4",
+    "@astrolib/seo": "^1.0.0-beta.8",
+    "@fontsource/inter": "^5.2.5",
+    "@nanostores/persistent": "^0.10.2",
+    "@nanostores/react": "^0.7.3",
+    "@nivo/bar": "^0.87.0",
+    "@nivo/line": "^0.88.0",
+    "@radix-ui/colors": "^3.0.0",
+    "@radix-ui/react-icons": "^1.3.0",
+    "@radix-ui/themes": "^3.1.4",
+    "@react-three/drei": "^9.115.0",
+    "@react-three/fiber": "^8.17.10",
+    "compare-versions": "^6.1.1",
+    "echarts": "^5.5.1",
+    "immer": "^10.1.1",
+    "js-cookie": "^3.0.5",
+    "markdown-to-jsx": "^7.5.0",
+    "nanostores": "^0.11.3",
+    "react-device-detect": "^2.2.3",
+    "react-promise-suspense": "^0.3.4",
+    "three": "^0.169.0",
+    "urlon": "^3.1.0",
+    "zustand": "^4.5.5",
+    "@types/bun": "latest",
+    "@types/lodash-es": "^4.17.12",
+    "@types/node": "^22.14.1",
+    "prettier": "^3.5.3",
+    "prisma": "^6.6.0",
+    "typescript": "^5.8.3",
+    "googleapis": "^144.0.0",
+    "lodash-es": "^4.17.21",
+    "protobufjs": "^7.5.2",
+    "quicklime": "^1.2.0",
+    "sharp": "^0.33.5",
+    "@blitzkit/core": "workspace:*",
+    "@blitzkit/i18n": "workspace:*",
+    "@astrojs/react": "^4.3.0",
+    "@types/react": "^19.1.5",
+    "@types/react-dom": "^19.1.5",
+    "astro": "^5.8.0",
+    "react": "^19.1.0",
+    "react-dom": "^19.1.0"
+  }
+}
@@ -6,7 +6,8 @@
  "type": "module",
  "types": "./types.d.ts",
  "workspaces": [
-    "packages/*"
+    "packages/*",
+    "submodules/*"
  ],
  "scripts": {
    "build:assets": "cd packages/scripts && bun run build:assets",
@@ -38,25 +39,5 @@
    "build:ids": "cd packages/scripts && bun build:ids",
    "prunestrings": "cd packages/scripts && bun prunestrings"
  },
-  "license": "MIT",
-  "dependencies": {
-    "@astrojs/react": "^4.3.0",
-    "@types/react": "^19.1.5",
-    "@types/react-dom": "^19.1.5",
-    "googleapis": "^144.0.0",
-    "lodash-es": "^4.17.21",
-    "protobufjs": "^7.5.2",
-    "quicklime": "^1.2.0",
-    "react": "^19.1.0",
-    "react-dom": "^19.1.0",
-    "sharp": "^0.33.5"
-  },
-  "devDependencies": {
-    "@types/bun": "latest",
-    "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.14.1",
-    "prettier": "^3.5.3",
-    "prisma": "^6.6.0",
-    "typescript": "^5.8.3"
-  }
+  "license": "MIT"
 }
@@ -3,24 +3,8 @@
  "private": true,
  "type": "module",
  "types": "src/types.d.ts",
-  "dependencies": {
-    "@blitzkit/core": "workspace:*",
-    "@blitzkit/i18n": "workspace:*",
-    "satori": "^0.10.14",
-    "@resvg/resvg-js": "^2.6.2",
-    "discord.js": "^14.16.3",
-    "react": "^18.3.1",
-    "@radix-ui/colors": "^3.0.0",
-    "fuzzysort": "^2.0.4",
-    "bepaint": "^0.1.0-beta.3",
-    "dotenv": "^16.4.5",
-    "markdown-escape": "^2.0.0"
-  },
  "scripts": {
    "dev": "bun --watch src/main.ts",
    "start": "bun src/main.ts"
-  },
-  "devDependencies": {
-    "@types/markdown-escape": "^1.1.3"
  }
 }
@@ -1,4 +1,11 @@
 {
  "extends": "../../tsconfig.json",
-  "include": ["src/**/*", "../core/src/blitzkit/supportedLocales.ts", "../i18n/src/unwrapper.ts"]
+  "include": [
+    "src/**/*",
+    "../core/src/blitzkit/supportedLocales.ts",
+    "../i18n/src/unwrapper.ts"
+  ],
+  "compilerOptions": {
+    "baseUrl": "../../"
+  }
 }
@@ -2,22 +2,5 @@
  "name": "@blitzkit/core",
  "private": true,
  "type": "module",
-  "main": "src/index.ts",
-  "dependencies": {
-    "@octokit/plugin-throttling": "^8.2.0",
-    "@octokit/rest": "^20.1.1",
-    "@prisma/client": "^6.6.0",
-    "adm-zip": "^0.5.16",
-    "crc": "^4.3.2",
-    "dotenv": "^16.4.5",
-    "lz4js": "^0.2.0",
-    "pickleparser": "^0.2.1",
-    "protobufjs": "^7.4.0",
-    "ts-proto": "^2.2.2",
-    "yaml": "^2.5.0"
-  },
-  "devDependencies": {
-    "@types/adm-zip": "^0.5.5",
-    "@types/lz4js": "^0.2.1"
-  }
+  "main": "src/index.ts"
 }
@@ -0,0 +1,28 @@
+import { CatalogItem } from '@protos/blitz_items';
+import { Any } from '@protos/google/protobuf/any';
+import { MessageFns } from '../protos';
+
+export class CatalogItemAccessor {
+  private components: Record<string, Any> = {};
+
+  constructor(item: CatalogItem) {
+    for (const component of item.components) {
+      if (
+        component.value === undefined ||
+        component.value.component === undefined
+      ) {
+        continue;
+      }
+
+      this.components[component.key] = component.value.component;
+    }
+  }
+
+  get<Type>(Message: MessageFns<Type>, component: string) {
+    if (component in this.components) {
+      return Message.decode(this.components[component].value);
+    }
+
+    throw new Error(`Unknown component: ${component}`);
+  }
+}
@@ -1,4 +1,5 @@
 export * from './canSplash';
+export * from './catalogItemAccessor';
 export * from './clans';
 export * from './classes';
 export * from './constants';
@@ -18,6 +19,7 @@ export * from './getTankStats';
 export * from './idToRegion';
 export * from './isOnGoingRatingSeason';
 export * from './isValidBlitzId';
+export * from './metadataAccessor';
 export * from './nations';
 export * from './normalizeExtra';
 export * from './normalizeIds';
@@ -0,0 +1,38 @@
+import { CatalogItem } from '@protos/blitz_items';
+import { Metadata } from '@protos/blitz_metadata';
+import { CatalogItemAccessor } from './catalogItemAccessor';
+
+export class UnpackedMetadataAccessor {
+  private items: Record<string, CatalogItemAccessor> = {};
+
+  constructor(metadata: Metadata) {
+    for (const item of metadata.catalog_items) {
+      if (item.catalog_id in this.items) {
+        throw new Error(`Duplicate catalog ID: ${item.catalog_id}`);
+      }
+
+      this.items[item.catalog_id] = new CatalogItemAccessor(item);
+    }
+  }
+
+  get(item: string) {
+    if (item in this.items) return this.items[item];
+
+    throw new Error(`Unknown catalog ID: ${item}`);
+  }
+}
+
+export class DiscreteMetadataAccessor {
+  constructor(private base: string) {}
+
+  async get(item: string) {
+    const response = await fetch(`${this.base}/${item}.pb`);
+
+    if (!response.ok) throw new Error(`Unknown catalog ID: ${item}`);
+
+    const buffer = await response.arrayBuffer();
+    const catalogItem = CatalogItem.decode(new Uint8Array(buffer));
+
+    return new CatalogItemAccessor(catalogItem);
+  }
+}
@@ -1,4 +1,7 @@
 {
  "extends": "../../tsconfig.json",
-  "include": ["src/**/*", "../i18n/src/strings.ts"]
+  "include": ["src/**/*", "../i18n/src/strings.ts"],
+  "compilerOptions": {
+    "baseUrl": "../../"
+  }
 }
@@ -2,9 +2,5 @@
  "name": "@blitzkit/i18n",
  "private": true,
  "type": "module",
-  "main": "src/index.ts",
-  "dependencies": {
-    "ts-deepmerge": "^7.0.2"
-  },
-  "devDependencies": {}
+  "main": "src/index.ts"
 }
@@ -12,22 +12,5 @@
    "build:bot": "bun src/buildBot.ts",
    "build:ratingleaderboard": "bun src/buildRatingLeaderboard.ts",
    "prunestrings": "bun src/pruneStrings.ts"
-  },
-  "dependencies": {
-    "@blitzkit/core": "workspace:*",
-    "@blitzkit/i18n": "workspace:*",
-    "@gltf-transform/core": "^4.0.10",
-    "@gltf-transform/extensions": "^4.0.10",
-    "@gltf-transform/functions": "^4.0.10",
-    "csv-parse": "^5.5.6",
-    "decompress": "^4.2.1",
-    "esbuild": "^0.19.12",
-    "fast-xml-parser": "^4.4.1",
-    "progress": "^2.0.3",
-    "puppeteer": "^23.10.4"
-  },
-  "devDependencies": {
-    "@types/decompress": "^4.2.7",
-    "@types/progress": "^2.0.7"
  }
 }
@@ -1,4 +1,7 @@
 {
  "extends": "../../tsconfig.json",
-  "include": ["src/**/*"]
+  "include": ["src/**/*"],
+  "compilerOptions": {
+    "baseUrl": "../../"
+  }
 }
@@ -1,5 +1,5 @@
 {
-  "name": "website-ue",
+  "name": "@blitzkit/website-ue",
  "type": "module",
  "scripts": {
    "dev": "astro dev",
@@ -9,7 +9,7 @@
  },
  "dependencies": {
    "@blitzkit/core": "workspace:*",
-    "@blitzkit/i18n": "workspace:*",
+    "@blitzkit/closed": "workspace:*",
    "@astrojs/react": "^4.3.0",
    "@types/react": "^19.1.5",
    "@types/react-dom": "^19.1.5",
@@ -0,0 +1,9 @@
+import { use } from 'react';
+
+export function TestComponent() {
+  const content = use(
+    fetch('https://example.com/').then((response) => response.text()),
+  );
+
+  return <pre children={content} />;
+}
@@ -0,0 +1,3 @@
+import { DiscreteMetadataAccessor } from 'packages/core/src';
+
+export const discreteMetadata = new DiscreteMetadataAccessor('/api/catalog');
@@ -0,0 +1,9 @@
+import { requestAutoProxyClient, unpackMetadata } from '@blitzkit/closed';
+import type { GetPackedMetadataAsyncResponse } from '@blitzkit/closed/src/unreal/protos/auto_legacy_proxy_client';
+import { UnpackedMetadataAccessor } from 'packages/core/src';
+
+export const unpackedMetadata = new UnpackedMetadataAccessor(
+  await requestAutoProxyClient<GetPackedMetadataAsyncResponse>(
+    'GetPackedMetadataAsyncRequest',
+  ).then(unpackMetadata),
+);
@@ -0,0 +1,14 @@
+---
+import { CatalogItemsComponent } from '@protos/blitz_static_catalog_items_group_component';
+import { TestComponent } from '../../../components/TestComponent';
+import { unpackedMetadata } from '../../../core/blitz/unpackedMetadata';
+export { getStaticPaths } from '../index.astro';
+
+const { locale } = Astro.props;
+
+const allTanks = unpackedMetadata
+  .get('CatalogItemsGroupEntity.all_tanks')
+  .get(CatalogItemsComponent, 'catalogItemsGroupComponent');
+---
+
+<TestComponent />
@@ -4,6 +4,7 @@
  "exclude": ["dist"],
  "compilerOptions": {
    "jsx": "react-jsx",
-    "jsxImportSource": "react"
+    "jsxImportSource": "react",
+    "baseUrl": "../../"
  }
 }
@@ -10,46 +10,8 @@
    "astro": "astro"
  },
  "dependencies": {
-    "@astrojs/partytown": "^2.1.4",
-    "@astrolib/seo": "^1.0.0-beta.8",
-    "@blitzkit/core": "workspace:*",
-    "@blitzkit/i18n": "workspace:*",
-    "@fontsource/inter": "^5.2.5",
-    "@nanostores/persistent": "^0.10.2",
-    "@nanostores/react": "^0.7.3",
-    "@nivo/bar": "^0.87.0",
-    "@nivo/line": "^0.88.0",
-    "@radix-ui/colors": "^3.0.0",
-    "@radix-ui/react-icons": "^1.3.0",
-    "@radix-ui/themes": "^3.1.4",
-    "@react-three/drei": "^9.115.0",
-    "@react-three/fiber": "^8.17.10",
-    "compare-versions": "^6.1.1",
-    "echarts": "^5.5.1",
-    "immer": "^10.1.1",
-    "js-cookie": "^3.0.5",
-    "markdown-to-jsx": "^7.5.0",
-    "nanostores": "^0.11.3",
-    "quicklime": "^1.2.0",
-    "react": "^18.3.1",
-    "react-device-detect": "^2.2.3",
-    "react-dom": "^18.3.1",
-    "react-promise-suspense": "^0.3.4",
-    "three": "^0.169.0",
-    "urlon": "^3.1.0",
-    "zustand": "^4.5.5"
  },
  "devDependencies": {
-    "@astrojs/check": "^0.9.4",
-    "@astrojs/react": "^3.6.2",
-    "@astrojs/sitemap": "^3.2.1",
-    "@playform/compress": "^0.1.9",
-    "@playform/inline": "^0.1.2",
-    "@types/js-cookie": "^3.0.6",
-    "@types/react": "^18.3.12",
-    "@types/react-dom": "^18.3.1",
-    "@types/three": "^0.160.0",
-    "astro": "^4.16.7",
-    "astro-compressor": "^1.0.0"
+
  }
 }
@@ -3,6 +3,7 @@
  "compilerOptions": {
    "jsx": "react-jsx",
    "jsxImportSource": "react",
-    "types": ["vite/client"]
+    "types": ["vite/client"],
+    "baseUrl": "../../"
  }
 }
@@ -18,7 +18,12 @@
      {
        "name": "next"
      }
-    ]
+    ],
+    "baseUrl": "./",
+    "paths": {
+      "@protos/*": ["submodules/blitzkit-closed/src/unreal/protos/*"],
+      "@strings/*": ["packages/i18n/strings/*"]
+    }
  },
  "exclude": ["node_modules/**/*", "dist", ".next"]
 }