Merge pull request #65 from ignaciochemes/develop

Update 2025

Author: ignaciochemes

.env-example

@@ -1,6 +1,7 @@
-TOKEN=YOUR-DISCORD-BOT-TOKEN-HERE
+TOKEN=
 STEAM_API=YOUR-STEAM-API-KEY-HERE
 DB_URI=YOUR-MONGO-DB-URI-HERE
 DBL_TOKEN=YOUR_DBL_TOKEN_HERE
-CLIENT_ID=YOUR_BOT_CLIENT_ID
-API_PORT=API_PORT_HERE
+CLIENT_ID=1437401678386036847
+API_PORT=8000
+API_ACTIVE=true

db/migrations/001_init.sql

@@ -0,0 +1,84 @@
+-- Esquema base para la migración a PostgreSQL
+-- Crea tablas, constraints e índices necesarios para el bot
+
+-- Usuarios (Discord)
+CREATE TABLE IF NOT EXISTS users (
+    id BIGSERIAL PRIMARY KEY,
+    discord_user_id TEXT UNIQUE NOT NULL,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT now()
+);
+
+-- Catálogo de juegos/servicios
+CREATE TABLE IF NOT EXISTS games (
+    key TEXT PRIMARY KEY,
+    display_name TEXT NOT NULL
+);
+
+-- Servidores configurados por usuario y juego
+CREATE TABLE IF NOT EXISTS user_servers (
+    id BIGSERIAL PRIMARY KEY,
+    user_id BIGINT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    game_key TEXT NOT NULL REFERENCES games(key),
+    host TEXT NOT NULL,
+    query_port INTEGER NOT NULL DEFAULT 2302,
+    updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+    CONSTRAINT uq_user_game UNIQUE (user_id, game_key)
+);
+
+-- Log de comandos ejecutados
+CREATE TABLE IF NOT EXISTS commands_log (
+    id BIGSERIAL PRIMARY KEY,
+    user_id BIGINT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    command_name TEXT NOT NULL,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT now()
+);
+
+-- Conversiones GUID (SteamID64 -> GUID)
+CREATE TABLE IF NOT EXISTS guid_conversions (
+    id BIGSERIAL PRIMARY KEY,
+    user_id BIGINT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    steam_id64 TEXT NOT NULL,
+    guid CHAR(32) NOT NULL UNIQUE,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+    CONSTRAINT chk_guid_hex CHECK (guid ~ '^[0-9a-f]{32}$'),
+    CONSTRAINT chk_steam_id64_digits CHECK (steam_id64 ~ '^[0-9]{17}$')
+);
+
+-- Conversiones UID (SteamID64 -> CFTools/Bohemia UID)
+CREATE TABLE IF NOT EXISTS uid_conversions (
+    id BIGSERIAL PRIMARY KEY,
+    user_id BIGINT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    steam_id64 TEXT NOT NULL,
+    cftools_uid VARCHAR(64) NOT NULL,
+    bohemia_uid VARCHAR(64) NOT NULL,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+    CONSTRAINT chk_uid_steam_id64_digits CHECK (steam_id64 ~ '^[0-9]{17}$'),
+    CONSTRAINT uq_uid_steam_pair UNIQUE (steam_id64, cftools_uid)
+);
+
+-- Pings a servidores (cache/observabilidad opcional)
+CREATE TABLE IF NOT EXISTS server_pings (
+    id BIGSERIAL PRIMARY KEY,
+    server_id BIGINT NOT NULL REFERENCES user_servers(id) ON DELETE CASCADE,
+    status TEXT NOT NULL,
+    ping_ms INTEGER,
+    raw JSONB,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT now()
+);
+
+-- Estadísticas diarias (agregados opcionales)
+CREATE TABLE IF NOT EXISTS stats_daily (
+    day DATE PRIMARY KEY,
+    commands_total INTEGER NOT NULL DEFAULT 0,
+    guid_conversions_total INTEGER NOT NULL DEFAULT 0,
+    uid_conversions_total INTEGER NOT NULL DEFAULT 0
+);
+
+-- Índices recomendados
+CREATE INDEX IF NOT EXISTS idx_commands_log_user_id ON commands_log (user_id);
+CREATE INDEX IF NOT EXISTS idx_commands_log_cmd_created_at ON commands_log (command_name, created_at DESC);
+
+CREATE INDEX IF NOT EXISTS idx_guid_conversions_user_created ON guid_conversions (user_id, created_at DESC);
+CREATE INDEX IF NOT EXISTS idx_uid_conversions_user_created ON uid_conversions (user_id, created_at DESC);
+
+CREATE INDEX IF NOT EXISTS idx_server_pings_server_created ON server_pings (server_id, created_at DESC);

db/migrations/002_relax_guid_uniqueness.sql

@@ -0,0 +1,8 @@
+-- Permitir GUIDs duplicados en guid_conversions
+-- Se elimina la restricción UNIQUE y se agrega un índice no único
+
+ALTER TABLE IF EXISTS guid_conversions
+    DROP CONSTRAINT IF EXISTS guid_conversions_guid_key;
+
+CREATE INDEX IF NOT EXISTS idx_guid_conversions_guid
+    ON guid_conversions (guid);

index.js

@@ -1,18 +1,25 @@
-const fs = require('node:fs');
-const path = require('node:path');
-const { Client, GatewayIntentBits, REST, Collection, Routes, ActivityType } = require("discord.js");
-const { getEnvironment } = require("./src/Configs/EnvironmentSelector");
-const { DatabaseConnection } = require("./src/Database/DbConnection");
-const { WebServer } = require('./src/WebServer');
-const { default: AutoPoster } = require('topgg-autoposter');
-const config = require('./config.json');
+import fs from 'node:fs';
+import path from 'node:path';
+import { Client, GatewayIntentBits, REST, Collection, Routes, ActivityType } from "discord.js";
+import { fileURLToPath, pathToFileURL } from 'node:url';
+import getEnvironment from "./src/Configs/EnvironmentSelector.js";
+// import { DatabaseConnection } from "./src/Database/DbConnection";
+import WebServerModule from './src/WebServer.js';
+// import { default as AutoPoster } from 'topgg-autoposter';
+// import raw from './config.json' assert { type: 'json' };
+// const config = raw;
+
+// Resuelve __dirname en ESM
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 getEnvironment();
-if (config.database.active === true) {
-    DatabaseConnection.getInstance();
-}
-if (config.api.active === true) {
-    new WebServer().listen();
+// if (config.database.active === true) {
+//     DatabaseConnection.getInstance();
+// }
+// Arranque opcional del servidor HTTP según variable de entorno.
+if (process.env.API_ACTIVE === 'true') {
+    new WebServerModule.WebServer().listen();
 }
 
 const client = new Client({ intents: [GatewayIntentBits.Guilds, GatewayIntentBits.GuildMessages] });
@@ -21,26 +28,34 @@ const commandsPath = path.join(__dirname, './src/Commands');
 const commandFiles = fs.readdirSync(commandsPath).filter(file => file.endsWith('.js'));
 const commands = [];
 
-for (const file of commandFiles) {
-    const filePath = path.join(commandsPath, file);
-    const command = require(filePath);
-    client.commands.set(command.data.name, command);
-    commands.push(command.data.toJSON());
+/**
+ * Carga dinámicamente los comandos desde la carpeta ./src/Commands en ESM.
+ */
+async function loadCommands() {
+    for (const file of commandFiles) {
+        const filePath = path.join(commandsPath, file);
+        const module = await import(pathToFileURL(filePath).href);
+        const command = module.default;
+        client.commands.set(command.data.name, command);
+        commands.push(command.data.toJSON());
+    }
 }
 
-const rest = new REST({ version: '10' }).setToken(process.env.TOKEN);
+// Registro de comandos vía REST (ejecuta tras cargar comandos)
 
-setInterval(async () => {
-    if (process.env.STEAMID_ENV === 'production') {
-        const ap = AutoPoster(process.env.DBL_TOKEN, client);
-        ap.on('posted', () => {
-            console.log('Server count posted!');
-        })
-    }
-}, 3600000);
+// setInterval(async () => {
+//     if (process.env.STEAMID_ENV === 'production') {
+//         const ap = AutoPoster(process.env.DBL_TOKEN, client);
+//         ap.on('posted', () => {
+//             console.log('Server count posted!');
+//         })
+//     }
+// }, 3600000);
 
 (async () => {
     try {
+        await loadCommands();
+        const rest = new REST({ version: '10' }).setToken(process.env.TOKEN);
         console.log('Started refreshing application (/) commands.');
         await rest.put(
             Routes.applicationCommands(process.env.CLIENT_ID),
@@ -59,6 +74,14 @@ client.on('ready', () => {
 });
 
 client.on('interactionCreate', async interaction => {
+    /**
+     * Maneja interacciones de comandos (slash) de Discord.
+     * Si ocurre un error, responde de forma segura usando `reply` o `followUp`
+     * según si la interacción ya fue reconocida (deferred/replied) para evitar
+     * el error "Interaction has already been acknowledged".
+     * Usa `flags: 64` para respuestas efímeras (deprecado `ephemeral`).
+     * @param {import('discord.js').Interaction} interaction - Interacción entrante.
+     */
     if (!interaction.isChatInputCommand()) return;
     const command = client.commands.get(interaction.commandName);
     if (!command) return;
@@ -67,7 +90,17 @@ client.on('interactionCreate', async interaction => {
         await command.execute(interaction);
     } catch (error) {
         console.error(error);
-        await interaction.reply({ content: 'There was an error while executing this command!', ephemeral: true });
+        const errorPayload = { content: 'There was an error while executing this command!', flags: 64 };
+        try {
+            if (interaction.deferred || interaction.replied) {
+                await interaction.followUp(errorPayload);
+            } else {
+                await interaction.reply(errorPayload);
+            }
+        } catch (e) {
+            // Evita que el proceso se caiga si no puede responder
+            console.error('Failed to send error response for interaction:', e);
+        }
     }
 });