feat: logs

.github/workflows/cd-assets.yml

@@ -4,7 +4,7 @@ on:
   push:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 2 * * *'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/ci-build-bot.yml

@@ -33,6 +33,9 @@ jobs:
       - name: Install dependencies
         run: yarn
 
+      - name: Add fixed sharp
+        run: yarn add [email protected] --ignore-engines
+
       - name: Build
         run: yarn build:bot
 

docs/changelogs/1.17.1.md

@@ -0,0 +1,8 @@
+# Blitzkrieg 1.17.1
+
+Some stability fixes.
+
+## Technical Changes
+
+- `sharp` is now included in the build instead of having being installed before runtime.
+- Png converter cache is now more memory efficient.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitzkrieg",
-  "version": "1.17.0",
+  "version": "1.17.1",
   "description": "🎉 Tools for everything World of Tanks Blitz",
   "main": "src/server.ts",
   "type": "module",
@@ -12,7 +12,7 @@
     "build:assets": "vite-node --max_old_space_size=16384 --script scripts/buildAssets/index",
     "build:test": "vite-node --script scripts/buildTest",
     "build:ratingsplot": "vite-node --script scripts/buildRatingsPlot",
-    "dev:bot": "yarn build:bot && yarn start:bot",
+    "dev:bot": "yarn build:bot --dev && yarn start:bot",
     "dev:docs": "vitepress dev docs",
     "dev:website": "next dev",
     "start:bot": "node --enable-source-maps dist/bot/index.cjs",

scripts/build.ts

@@ -1,5 +1,8 @@
 import { build } from 'esbuild';
 import { cp, readdir } from 'fs/promises';
+import { argv } from 'process';
+
+const isDev = argv.includes('--dev');
 
 readdir('src/workers').then((workers) => {
   const files = [
@@ -25,6 +28,7 @@ readdir('src/workers').then((workers) => {
       '.js': '.cjs',
     },
 
+    external: ['sharp'],
     bundle: true,
     sourcemap: true,
     minifyIdentifiers: false, // causes goofy errors
@@ -42,3 +46,8 @@ readdir('node_modules/prisma').then((files) =>
     .filter((file) => file.endsWith('.node'))
     .map((file) => cp(`node_modules/prisma/${file}`, `dist/bot/${file}`)),
 );
+
+// copy sharp as is
+if (!isDev) {
+  cp('node_modules/sharp', 'dist/bot/node_modules/sharp', { recursive: true });
+}

src/commands/research.tsx

@@ -285,8 +285,9 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                       color: theme.colors.textHighContrast,
                     }}
                   >
+                    Experience:{' '}
                     {costs
-                      .reduce((a, b) => a + b.purchase + b.equipment, 0)
+                      .reduce((a, b) => a + (b.research ?? 0) + b.upgrades, 0)
                       .toLocaleString(interaction.locale)}
                   </span>
                 </div>
@@ -309,8 +310,34 @@ export const researchCommand = new Promise<CommandRegistry>((resolve) => {
                       color: theme.colors.textHighContrast,
                     }}
                   >
+                    Purchase:{' '}
                     {costs
-                      .reduce((a, b) => a + (b.research ?? 0) + b.upgrades, 0)
+                      .reduce((a, b) => a + b.purchase, 0)
+                      .toLocaleString(interaction.locale)}
+                  </span>
+                </div>
+
+                <div
+                  style={{
+                    display: 'flex',
+                    gap: 4,
+                    alignItems: 'center',
+                  }}
+                >
+                  <img
+                    src={await iconPng(asset('icons/currencies/silver.webp'))}
+                    width={16}
+                    height={16}
+                  />
+                  <span
+                    style={{
+                      fontSize: 16,
+                      color: theme.colors.textHighContrast,
+                    }}
+                  >
+                    Equipment:{' '}
+                    {costs
+                      .reduce((a, b) => a + b.equipment, 0)
                       .toLocaleString(interaction.locale)}
                   </span>
                 </div>

src/core/blitz/extractModel/index.ts

@@ -57,7 +57,7 @@ export async function extractModel(data: string, path: string) {
         material.setBaseColorTexture(
           document
             .createTexture(node.materialName)
-            .setMimeType('image/png')
+            .setMimeType('image/jpeg')
             .setImage(
               await readTexture(
                 `${data}/3d/${dirname(path)}/${textures.albedo}`,
@@ -70,7 +70,7 @@ export async function extractModel(data: string, path: string) {
           material.setMetallicRoughnessTexture(
             document
               .createTexture(node.materialName)
-              .setMimeType('image/png')
+              .setMimeType('image/jpeg')
               .setImage(
                 await readTexture(
                   `${data}/3d/${dirname(path)}/${textures.baseRMMap}`,
@@ -86,7 +86,7 @@ export async function extractModel(data: string, path: string) {
           material.setNormalTexture(
             document
               .createTexture(node.materialName)
-              .setMimeType('image/png')
+              .setMimeType('image/jpeg')
               .setImage(
                 await readTexture(
                   `${data}/3d/${dirname(path)}/${
@@ -102,7 +102,7 @@ export async function extractModel(data: string, path: string) {
           material.setOcclusionTexture(
             document
               .createTexture(node.materialName)
-              .setMimeType('image/png')
+              .setMimeType('image/jpeg')
               .setImage(
                 await readTexture(
                   `${data}/3d/${dirname(path)}/${textures.miscMap}`,

src/core/blitzkrieg/iconPng.ts

@@ -1,14 +1,14 @@
 import sharp from 'sharp';
 
-const cache: Record<string, string> = {};
+const cache: Record<string, Buffer> = {};
 
 export async function iconPng(url: string) {
-  if (cache[url]) return cache[url];
+  if (!cache[url]) {
+    const imageResponse = await fetch(url);
+    const imageBufferWEBP = await imageResponse.arrayBuffer();
+    const imageBufferPNG = await sharp(imageBufferWEBP).png().toBuffer();
+    cache[url] = imageBufferPNG;
+  }
 
-  const imageResponse = await fetch(url);
-  const imageBufferWEBP = await imageResponse.arrayBuffer();
-  const imageBufferPNG = await sharp(imageBufferWEBP).png().toBuffer();
-  cache[url] = `data:image/png;base64,${imageBufferPNG.toString('base64')}`;
-
-  return cache[url];
+  return `data:image/png;base64,${cache[url].toString('base64')}`;
 }

src/core/blitzkrieg/readTexture/index.ts

@@ -36,7 +36,7 @@ export async function readTexture(path: string, mutation?: TextureMutation) {
         raw.data[index + 3] = 255;
       }
 
-      return await sharp(raw.data, { raw }).png().toBuffer();
+      return await sharp(raw.data, { raw }).jpeg().toBuffer();
     }
 
     case TextureMutation.RoughnessMetallicness: {
@@ -45,16 +45,16 @@ export async function readTexture(path: string, mutation?: TextureMutation) {
       });
       const metallicness = sharp(raw.data, { raw })
         .extractChannel('green')
-        .png()
+        .jpeg()
         .toBuffer();
       const roughness = sharp(raw.data, { raw })
         .extractChannel('alpha')
-        .png()
+        .jpeg()
         .toBuffer();
 
       return await newImage
         .joinChannel(await Promise.all([roughness, metallicness]))
-        .png()
+        .jpeg()
         .toBuffer();
     }
 
@@ -65,15 +65,15 @@ export async function readTexture(path: string, mutation?: TextureMutation) {
        */
       return await sharp(raw.data, { raw })
         .extractChannel('alpha')
-        .png()
+        .jpeg()
         .toBuffer();
     }
 
     case TextureMutation.Albedo: {
-      return await sharp(raw.data, { raw }).removeAlpha().png().toBuffer();
+      return await sharp(raw.data, { raw }).removeAlpha().jpeg().toBuffer();
     }
 
     default:
-      return await sharp(raw.data, { raw }).png().toBuffer();
+      return await sharp(raw.data, { raw }).jpeg().toBuffer();
   }
 }

src/lang/en-US.json

@@ -500,7 +500,7 @@
           "view_channels": "View channels: needed to find the message the refresh button was used on",
           "read_message_history": "Read message history: needed to find the message to refresh",
           "attach_files": "Attach files: needed to add images to image-based commands",
-          "external_emojis": "External emojis: needed add national flags and tank class emojis"
+          "external_emojis": "External emojis: needed to add national flags and tank class emojis"
         }
       },
 

src/lang/es-ES.json

@@ -137,10 +137,10 @@
           "description": "Región"
         },
         "tier": {
-          "$": "tier",
-          "description": "Tier",
+          "$": "nivel",
+          "description": "Nivel",
           "choices": {
-            "tier": "Tier %s - %s"
+            "tier": "Nivel %s - %s"
           }
         }
       },
@@ -152,7 +152,7 @@
       },
       "filters": {
         "none": "Sin filtros",
-        "tier": "Tier %s"
+        "tier": "Nivel %s"
       },
       "no_data": {
         "battles_in_period": "No hay batallas jugadas en este período",
@@ -170,10 +170,42 @@
         "tank_id_not_found": "# Tanque no encontrado\nNo se pudo encontrar al tanque del ID \"%s\". Prueba escribiendo el nombre del tanque en vez de un número.",
         "no_tank_stats": "# No hay estadísticas de tanque disponibles\nEste jugador no tiene estadísticas disponibles. Este podría no ser el jugador que estás buscando.",
         "get_help": "Servidor de ayuda de Discord",
-        "uncaught_error": "# ¡Blitzkrieg sufrió un error!\nLo sentimos mucho. Siéntete libre de [unirte al servidor oficial de Discord](https://discord.gg/nDt7AjGJQH) para obtener ayuda."
+        "uncaught_error": "# ¡Blitzkrieg sufrió un error!\nLo sentimos mucho. Siéntete libre de [unirte al servidor oficial de Discord](https://discord.gg/nDt7AjGJQH) para obtener ayuda.",
+        "preview": "# Este comando es una vista previa\n\nSolo puedes acceder a este comando en [el servidor oficial de Discord](https://discord.gg/nDt7AjGJQH). Generalmente este comando estará disponible pronto."
       }
     },
     "commands": {
+      "research": {
+        "$": "investigar",
+        "description": "Enumera los gastos por investigar una línea",
+        "options": {
+          "target_tank": {
+            "$": "tanque-objetivo",
+            "description": "El último tanque a investigar en la línea"
+          },
+          "starting_tank": {
+            "$": "tanque-inicial",
+            "description": "El tanque inicial en la línea (se deduce automáticamente si no se proporciona)"
+          }
+        },
+        "body": {
+          "subtitle": "Investigar",
+          "total": "Total",
+          "research": "Investigar: %s",
+          "upgrades": "Mejoras: %s",
+          "purchase": "Purchase: %s",
+          "equipment": "Equipamiento: %s",
+          "estimation": "# ¡Esto es una estimación!\n\nEsta lista podría incluir tanques ya investigados debido a la información errónea que proporciona Wargaming. Si puedes, prueba proporcionando un `tanque-inicial` de la línea al usar el comando."
+        },
+        "errors": {
+          "non_tech_tree": "# %s no está en el árbol tecnológico\n\nNo puedes investigar un tanque prémium o coleccionista.",
+          "tier_1": "# %s es un nivel I\n\nLos tanque de nivel I están siempre desbloqueados gratuitamente para todos los jugadores.",
+          "already_researched": "# %s ya está investigado\n\nPrueba proporcionando un `tanque-inicial` al usar el comando para ver los totales para una línea que ya has investigado.",
+          "start_end_equal": "# %s fue proporcionado dos veces\n\nAsegúrate de que `tanque-inicial` y `tanque-objetivo` son diferentes.",
+          "tanks_not_on_line": "# %s y %s no están en la misma línea\n\nAsegúrate de que `tanque-inicial` y `tanque-objetivo` están en la misma línea del árbol tecnológico.",
+          "unordered": "# %s higher tiered to %s\n\nMake sure to provide %s as the `starting-tank` instead as it is the lower tiered tank."
+        }
+      },
       "about": {
         "$": "sobre",
         "description": "Toda la información que necesitas sobre el bot",
@@ -278,13 +310,13 @@
             "lethality": {
               "$": "Letalidad",
               "average_damage": "Daño promedio",
-              "damage_per_tier": "Daño por tier",
+              "damage_per_tier": "Daño por nivel",
               "damage_ratio": "Relación de daño",
               "average_kills": "Promedio de bajas"
             },
             "miscellaneous": {
               "$": "Misceláneo",
-              "average_tier": "Tier promedio",
+              "average_tier": "Nivel promedio",
               "average_spots": "Promedio de detecciones",
               "average_xp": "Promedio de XP",
               "kills_to_death_ratio": "Relación bajas-muertes"
@@ -386,7 +418,7 @@
           "winrate": "Tasa de victorias",
           "damage": "Daño",
           "damage_ratio": "Relación de daño",
-          "tier": "Tier",
+          "tier": "Nivel",
           "survival": "Supervivencia",
           "accuracy": "Precisión",
           "kill_ratio": "Relación de bajas"
@@ -394,9 +426,9 @@
       },
       "owned_tanks": {
         "$": "tanques-propios",
-        "description": "Muestra todos los tanques propios en un tier",
+        "description": "Muestra todos los tanques propios en un nivel",
         "body": {
-          "subtitle": "Tanques de tier %s"
+          "title": "# Tanques de %s de nivel %s\n\n"
         }
       },
       "permissions": {
@@ -404,9 +436,10 @@
         "description": "Comprueba si el bot tiene los permisos requeridos para funcionar",
         "body": {
           "title": "# Permisos\n\n%s",
-          "view_channels": "Ver canales: necesario para que funcione el botón de actualizar",
-          "read_message_history": "Leer el historial de mensajes: necesario para que el botón de actualizar pueda encontrar el mensaje a actualizar",
-          "attach_files": "Adjuntar archivos: necesario para que funcionen los comandos basados en imágenes"
+          "view_channels": "Ver canales: necesario para encontrar el mensaje en el cual el botón \"actualizar\" fue usado",
+          "read_message_history": "Leer historial de mensajes: necesario para encontrar el mensaje a actualizar",
+          "attach_files": "Adjuntar archivos: necesario para añadir imágenes a los comandos basados en estas",
+          "external_emojis": "Emoticonos externos: necesario para añadir emoticonos de banderas nacionales y clases de tanque"
         }
       },
       "ping": {

src/lang/hr.json

@@ -170,10 +170,42 @@
         "tank_id_not_found": "# Tank not found\nCould not find tank by the ID \"%s\". Try typing the name of the tank instead of a number.",
         "no_tank_stats": "# No tank stats available\nThis player doesn't have any stats available. This may not be the player you are looking for.",
         "get_help": "Help Discord server",
-        "uncaught_error": "# Blitzkrieg ran into an error!\nWe're so sorry about this. Feel free to [join the official Discord server](https://discord.gg/nDt7AjGJQH) to get help."
+        "uncaught_error": "# Blitzkrieg ran into an error!\nWe're so sorry about this. Feel free to [join the official Discord server](https://discord.gg/nDt7AjGJQH) to get help.",
+        "preview": "# This command is in preview\n\nYou can only access this command in [the official Discord server](https://discord.gg/nDt7AjGJQH). The command will be generally available soon."
       }
     },
     "commands": {
+      "research": {
+        "$": "research",
+        "description": "Lists the expenses in researching a line",
+        "options": {
+          "target_tank": {
+            "$": "target-tank",
+            "description": "The final tank to research in the line"
+          },
+          "starting_tank": {
+            "$": "starting-tank",
+            "description": "The starting tank in the line (inferred automatically if not provided)"
+          }
+        },
+        "body": {
+          "subtitle": "Research",
+          "total": "Total",
+          "research": "Research: %s",
+          "upgrades": "Upgrades: %s",
+          "purchase": "Purchase: %s",
+          "equipment": "Equipment: %s",
+          "estimation": "# This is an estimation!\n\nThis list may include already researched tanks because of the inaccurate information Wargaming provides. Try providing a `starting-tank` from the line when using the command if you can."
+        },
+        "errors": {
+          "non_tech_tree": "# %s is not on the tech tree\n\nYou cannot research a premium/collector tank.",
+          "tier_1": "# %s is a tier I\n\nTier I tanks are always unlocked for free for all players.",
+          "already_researched": "# %s is already researched\n\nTry providing a `starting-tank` when using the command to view the totals for a line you have already researched.",
+          "start_end_equal": "# %s was provided twice\n\nMake sure `starting-tank` and `target-tank` are different.",
+          "tanks_not_on_line": "# %s and %s are not on the same line\n\nMake sure `starting-tank` and `target-tank` are on the same tech-tree line.",
+          "unordered": "# %s higher tiered to %s\n\nMake sure to provide %s as the `starting-tank` instead as it is the lower tiered tank."
+        }
+      },
       "about": {
         "$": "about",
         "description": "All the info you need about the bot",
@@ -396,7 +428,7 @@
         "$": "owned-tanks",
         "description": "Shows all own tanks in a tier",
         "body": {
-          "subtitle": "Tier %s tanks"
+          "title": "# %s's owned tier %s tanks\n\n"
         }
       },
       "permissions": {
@@ -404,9 +436,10 @@
         "description": "Checks wether the bot has the required permissions to function",
         "body": {
           "title": "# Permissions\n\n%s",
-          "view_channels": "View channels: needed for the refresh button to work",
-          "read_message_history": "Read message history: needed for the refresh button to find the message to refresh",
-          "attach_files": "Attach files: needed for image-based commands to work"
+          "view_channels": "View channels: needed to find the message the refresh button was used on",
+          "read_message_history": "Read message history: needed to find the message to refresh",
+          "attach_files": "Attach files: needed to add images to image-based commands",
+          "external_emojis": "External emojis: needed to add national flags and tank class emojis"
         }
       },
       "ping": {