diff --git a/.env b/.env deleted file mode 100644 index fbc666d..0000000 --- a/.env +++ /dev/null @@ -1,20 +0,0 @@ -TOKEN=ODcwNzA3OTcyMjE1NTUwMDE0.GNCXuj.kPaJfU-QHKZk7uBvzblOmJHSv9QllNRIIp5dGg -CLIENT_ID=870707972215550014 -OWNER_ID=574544938440851466 - -SUPPORT_SERVER_ID=840770323988873227 -CHANNEL_REQUEST_ACCESS_ID=1402029493258031114 -CHANNEL_ACCESS_STAFF_REQUESTS_ID=1429968603905786000 - -ROLE_WAITER_ID=1429968069450530987 -ROLE_VERIFIED_ID=1429968133304615012 -ROLE_ADMIN_ID=1164572260607205486 - -MINECRAFT_SERVER_IP=valloic.dev:25565 -MINECRAFT_WHITELIST_PATH=/opt/minecraft/server/whitelist.json - -USE_SCREEN=true -SERVER_JAR=fabric-server-launch.jar -JAVA_ARGS=-Xmx2G -Xms1G -USE_SCREEN=true -MINECRAFT_SERVER_PATH=/opt/minecraft/server \ No newline at end of file diff --git a/.env.exemple b/.env.exemple new file mode 100644 index 0000000..4afeb51 --- /dev/null +++ b/.env.exemple @@ -0,0 +1,19 @@ +TOKEN=TOKEN_HERE +CLIENT_ID=CLIENT_ID_HERE +OWNER_ID=OWNER_ID_HERE + +SUPPORT_SERVER_ID=SUPPORT_SERVER_ID_HERE +CHANNEL_REQUEST_ACCESS_ID=CHANNEL_REQUEST_ACCESS_ID_HERE +CHANNEL_ACCESS_STAFF_REQUESTS_ID=CHANNEL_ACCESS_STAFF_REQUESTS_ID_HERE + +ROLE_WAITER_ID=ROLE_WAITER_ID_HERE +ROLE_VERIFIED_ID=ROLE_VERIFIED_ID_HERE +ROLE_ADMIN_ID=ROLE_ADMIN_ID_HERE + +MINECRAFT_SERVER_IP=MINECRAFT_SERVER_IP_HERE +MINECRAFT_WHITELIST_PATH=MINECRAFT_WHITELIST_PATH_HERE + +USE_SCREEN=true # Set to true to run the Minecraft server in a screen session +SERVER_JAR=fabric-server-launch.jar # Name of the Minecraft server jar file +JAVA_ARGS=-Xmx2G -Xms1G # Java arguments for the Minecraft server +MINECRAFT_SERVER_PATH=/opt/minecraft/server # Path to the Minecraft server directory \ No newline at end of file diff --git a/emojis.json b/emojis.json deleted file mode 100644 index e5ae6e4..0000000 --- a/emojis.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "added_whitelist_emoji": "<:securityenable:1429980226351534090>", - "removed_whitelist_emoji": "<:securitydisable:1429980224984055960>", - "refused_whitelist_emoji": "<:securitydisable:1429980224984055960>", - "pending_whitelist_emoji": "<:pending:1429980711481245768>", - "error_emoji": "<:error:1429980784076521614>", - "info_emoji": "<:info:1429981238130774016>", - "success_emoji": "" -} \ No newline at end of file diff --git a/emojis.json.exemple b/emojis.json.exemple new file mode 100644 index 0000000..63b51ef --- /dev/null +++ b/emojis.json.exemple @@ -0,0 +1,9 @@ +{ + "added_whitelist_emoji": "<:securityenable:>", + "removed_whitelist_emoji": "<:securitydisable:>", + "refused_whitelist_emoji": "<:securitydisable:>", + "pending_whitelist_emoji": "<:pending:>", + "error_emoji": "<:error:>", + "info_emoji": "<:info:>", + "success_emoji": "<:success:>" +} \ No newline at end of file diff --git a/src/utils/serverControlManager.js b/src/utils/serverControlManager.js index f3b19d7..2f8a660 100644 --- a/src/utils/serverControlManager.js +++ b/src/utils/serverControlManager.js @@ -98,17 +98,18 @@ class ServerControlManager { if (this.useScreen) { // Vérifier si la session screen existe (nom exact ou suffixé) const screenResult = await this.executeCommand( - `screen -ls | grep -w "${this.screenName}"`, + 'screen -ls | grep \.minecraft', 'Vérification session screen' ); const screenRunning = screenResult.success && screenResult.output.trim() !== ''; // Double vérification : chercher le processus Java avec le bon jar const javaResult = await this.executeCommand( - `pgrep -f "${this.serverJar}" | wc -l`, + `pgrep -af "${this.serverJar}" | grep -v grep`, 'Vérification processus Java Fabric' ); - const javaRunning = javaResult.success && parseInt(javaResult.output.trim()) > 0; + // On considère le serveur comme actif uniquement si la session screen existe ET le processus Java est actif + const javaRunning = javaResult.success && javaResult.output.trim() !== ''; return { running: screenRunning && javaRunning,