test new arch

.env.example

@@ -1,7 +1,7 @@
 # Configuration Discord
 DISCORD_TOKEN=votre_token_discord
 GUILD_ID=votre_guild_id
-BRIDGE_CHANNEL_ID=1467491354924814411
+BRIDGE_CHANNEL_ID=1234567891234567891
 
 # Configuration Pterodactyl
 PTERODACTYL_API_URL=https://votre-panel.com

commands/server/ram-status.js

@@ -1,5 +1,5 @@
 const { SlashCommandBuilder } = require('discord.js');
-const { checkRAMUsage, getMonitoringStatus } = require('../../ramMonitor.js');
+const { checkRAMUsage, getMonitoringStatus } = require('../../src/monitoring/ramMonitor.js');
 
 module.exports = {
 	data: new SlashCommandBuilder()

commands/server/server-clean.js

@@ -6,7 +6,7 @@ const path = require('node:path');
 const { execFile } = require('node:child_process');
 const { promisify } = require('node:util');
 
-const { getAllLinks } = require('../../database.js');
+const { getAllLinks } = require('../../src/core/database.js');
 const {
     defaultBaseUrl,
     defaultServerId,
@@ -14,7 +14,7 @@ const {
     downloadFile,
     uploadSingleFile,
     deleteFiles,
-} = require('../../pterodactylFiles.js');
+} = require('../../src/pterodactyl/pterodactylFiles.js');
 
 const execFileAsync = promisify(execFile);
 

commands/server/server-stats.js

@@ -1,7 +1,7 @@
 const axios = require('axios');
 const { SlashCommandBuilder } = require('discord.js');
 const { EmbedBuilder } = require('discord.js');
-const { checkRAMUsage } = require('../../ramMonitor');
+const { checkRAMUsage } = require('../../src/monitoring/ramMonitor');
 
 const getPlayersNumberAndFPS = (token) => {
     return new Promise((resolve, reject) => {

commands/utility/afficher-inactifs.js

@@ -1,5 +1,5 @@
 const { SlashCommandBuilder, EmbedBuilder, MessageFlags } = require('discord.js');
-const { getAllLinks } = require('../../database.js');
+const { getAllLinks } = require('../../src/core/database.js');
 
 module.exports = {
     data: new SlashCommandBuilder()

commands/utility/afficher-lies.js

@@ -1,5 +1,5 @@
 const { SlashCommandBuilder, EmbedBuilder, MessageFlags } = require('discord.js');
-const { getAllLinks } = require('../../database.js');
+const { getAllLinks } = require('../../src/core/database.js');
 
 module.exports = {
     data: new SlashCommandBuilder()

commands/utility/delier-rygainland.js

@@ -1,5 +1,5 @@
 const { SlashCommandBuilder, EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, MessageFlags } = require('discord.js');
-const { getUserLink, deleteUserLink } = require('../../database.js');
+const { getUserLink, deleteUserLink } = require('../../src/core/database.js');
 
 module.exports = {
     data: new SlashCommandBuilder()

commands/utility/delier.js

@@ -1,5 +1,5 @@
 const { SlashCommandBuilder, EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, MessageFlags } = require('discord.js');
-const { getUserLink, deleteUserLink } = require('../../database.js');
+const { getUserLink, deleteUserLink } = require('../../src/core/database.js');
 
 module.exports = {
     data: new SlashCommandBuilder()

commands/utility/diagnostique-ws.js

@@ -1,5 +1,5 @@
 const { SlashCommandBuilder, EmbedBuilder, MessageFlags } = require('discord.js');
-const { getWebSocketStatus, forceWebSocketReconnect } = require('../../consoleMonitor.js');
+const { getWebSocketStatus, forceWebSocketReconnect } = require('../../src/monitoring/consoleMonitor.js');
 
 module.exports = {
     data: new SlashCommandBuilder()

commands/utility/info.js

@@ -1,5 +1,5 @@
 const { SlashCommandBuilder, EmbedBuilder, MessageFlags } = require('discord.js');
-const { getUserLink } = require('../../database.js');
+const { getUserLink } = require('../../src/core/database.js');
 
 module.exports = {
     data: new SlashCommandBuilder()

commands/utility/lier-rygainland.js

@@ -1,5 +1,5 @@
 const { SlashCommandBuilder, EmbedBuilder, MessageFlags } = require('discord.js');
-const { generateLinkCode, getUserLink } = require('../../database.js');
+const { generateLinkCode, getUserLink } = require('../../src/core/database.js');
 
 module.exports = {
     data: new SlashCommandBuilder()

commands/utility/lier.js

@@ -1,5 +1,5 @@
 const { SlashCommandBuilder, EmbedBuilder, MessageFlags } = require('discord.js');
-const { verifyLinkCode, updateUserLinkWithUsername } = require('../../database.js');
+const { verifyLinkCode, updateUserLinkWithUsername } = require('../../src/core/database.js');
 const axios = require('axios');
 
 module.exports = {
@@ -56,7 +56,7 @@ module.exports = {
             }
 
             // Créer un code temporaire pour la liaison manuelle
-            const { generateLinkCode } = require('../../database.js');
+            const { generateLinkCode } = require('../../src/core/database.js');
             const code = await generateLinkCode(discordUser.id);
 
             // Effectuer la liaison immédiatement

commands/utility/panel.js

@@ -1,6 +1,6 @@
 const { SlashCommandBuilder, EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, StringSelectMenuBuilder } = require('discord.js');
-const { getConfig, updateConfig, getAllConfig } = require('../../database');
-const { getMonitoringStatus } = require('../../ramMonitor');
+const { getConfig, updateConfig, getAllConfig } = require('../../src/core/database');
+const { getMonitoringStatus } = require('../../src/monitoring/ramMonitor');
 
 module.exports = {
     data: new SlashCommandBuilder()
@@ -137,7 +137,7 @@ async function buildPanelPayload() {
 async function buildStatsPayload() {
     const config = await getAllConfig();
     const monitoringStatus = getMonitoringStatus();
-    const { checkRAMUsage } = require('../../ramMonitor');
+    const { checkRAMUsage } = require('../../src/monitoring/ramMonitor');
 
     const ramData = await checkRAMUsage();
 

index.js

@@ -2,14 +2,14 @@ require('dotenv').config();
 const fs = require('node:fs');
 const deepl = require('deepl-node');
 const path = require('node:path');
-const deploy = require('./deploy_command.js')
-const update  = require('./displayer.js');
-const clean = require('./cleaner.js');
+const deploy = require('./src/discord/deploy_command.js')
+const update  = require('./src/pterodactyl/displayer.js');
+const clean = require('./src/pterodactyl/cleaner.js');
 const { Client, GatewayIntentBits, Collection, Events, Partials } = require('discord.js');
-const { initDatabase, createTables, cleanExpiredCodes } = require('./database.js');
-const { startConsoleMonitoring, forceWebSocketReconnect } = require('./consoleMonitor.js');
-const { initPalworldBridge } = require('./palworld-bridge.js');
-const { startRAMMonitoring } = require('./ramMonitor.js');
+const { initDatabase, createTables, cleanExpiredCodes } = require('./src/core/database.js');
+const { startConsoleMonitoring, forceWebSocketReconnect } = require('./src/monitoring/consoleMonitor.js');
+const { initPalworldBridge } = require('./src/bridge/palworld-bridge.js');
+const { startRAMMonitoring } = require('./src/monitoring/ramMonitor.js');
 
 const client = new Client({ intents:
 	[

package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "main": "index.js",
   "scripts": {
-    "deploy": "deploy_command.js"
+    "deploy": "node src/discord/deploy_command.js"
   },
   "keywords": [],
   "author": "",

src/bridge/palworld-bridge.js

@@ -1,5 +1,5 @@
 const axios = require('axios');
-const { getUserLink, getAllLinks } = require('./database.js');
+const { getUserLink, getAllLinks } = require('../core/database.js');
 
 let bridgeClient = null;
 let bridgeChannelId = null;

src/discord/deploy_command.js

@@ -4,7 +4,7 @@ const path = require('node:path');
 module.exports = (token) => {
 	const commands = [];
 	// Grab all the command folders from the commands directory you created earlier
-	const foldersPath = path.join(__dirname, 'commands');
+	const foldersPath = path.join(__dirname, '../../commands');
 	const commandFolders = fs.readdirSync(foldersPath);
 
 	for (const folder of commandFolders) {

src/monitoring/consoleMonitor.js

@@ -1,7 +1,7 @@
 const axios = require('axios');
 const WebSocket = require('ws');
-const { verifyLinkCode, updateUserLinkWithUsername, updateLastConnection } = require('./database.js');
-const { handlePalworldChat } = require('./palworld-bridge.js');
+const { verifyLinkCode, updateUserLinkWithUsername, updateLastConnection } = require('../core/database.js');
+const { handlePalworldChat } = require('../bridge/palworld-bridge.js');
 
 let ws = null;
 let reconnectTimeout = null;
@@ -236,7 +236,7 @@ const pollPlayersAndDetectDisconnects = async (serverState = null) => {
 };
 
 const checkAndManageWebSocket = async () => {
-    const { cleanExpiredCodes } = require('./database.js');
+    const { cleanExpiredCodes } = require('../core/database.js');
     try {
         await cleanExpiredCodes();
 

src/monitoring/ramMonitor.js

@@ -1,5 +1,5 @@
 const axios = require('axios');
-const { getConfig } = require('./database');
+const { getConfig } = require('../core/database');
 
 let isMonitoring = false;
 let checkInterval = null;