1.0.7: added debugMode

leaderos-net · Apr 12, 2024 · d17d92e · d17d92e
1 parent acc1a28
commit d17d92e
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 13 deletions.
diff --git a/bukkit/src/main/java/net/leaderos/plugin/configuration/Config.java b/bukkit/src/main/java/net/leaderos/plugin/configuration/Config.java
@@ -7,6 +7,7 @@
 import eu.okaeri.configs.annotation.Names;
 import lombok.Getter;
 import lombok.Setter;
+import net.leaderos.shared.model.DebugMode;
 
 /**
  * Main config file
@@ -41,8 +42,14 @@ public static class Settings extends OkaeriConfig {
         @Comment("API Key for request")
         private String apiKey = "YOUR_API_KEY";
 
-        @Comment("Debug mode for API requests")
-        private boolean debug = false;
+        @Comment({
+                "Debug mode for API requests.",
+                "Available modes:",
+                "DISABLED: No debug messages",
+                "ENABLED: All debug messages",
+                "ONLY_ERRORS: Only error messages"
+        })
+        private DebugMode debugMode = DebugMode.ONLY_ERRORS;
 
         @Comment("Time format for plugin")
         private String timeFormat= "yyyy-MM-dd HH:mm:ss";

diff --git a/bukkit/src/main/java/net/leaderos/plugin/helpers/DebugBukkit.java b/bukkit/src/main/java/net/leaderos/plugin/helpers/DebugBukkit.java
@@ -2,6 +2,7 @@
 
 import net.leaderos.plugin.Bukkit;
 import net.leaderos.shared.helpers.DebugAPI;
+import net.leaderos.shared.model.DebugMode;
 
 /**
  * Sends debug to console
@@ -17,7 +18,10 @@ public class DebugBukkit implements DebugAPI {
      */
     @Override
     public void send(String message, boolean strict) {
-        if (Bukkit.getInstance().getConfigFile().getSettings().isDebug() || strict) {
+        if (
+                Bukkit.getInstance().getConfigFile().getSettings().getDebugMode() == DebugMode.ENABLED ||
+                        (Bukkit.getInstance().getConfigFile().getSettings().getDebugMode() == DebugMode.ONLY_ERRORS && strict)
+        ) {
             Bukkit.getInstance().getLogger().warning(ChatUtil.color(
                     "&e[DEBUG] &f" + message
             ));

diff --git a/bungee/src/main/java/net/leaderos/bungee/configuration/Config.java b/bungee/src/main/java/net/leaderos/bungee/configuration/Config.java
@@ -7,6 +7,7 @@
 import eu.okaeri.configs.annotation.Names;
 import lombok.Getter;
 import lombok.Setter;
+import net.leaderos.shared.model.DebugMode;
 
 /**
  * Main config file
@@ -38,8 +39,14 @@ public static class Settings extends OkaeriConfig {
         @Comment("Url of your website")
         private String url = "https://yourwebsite.com";
 
-        @Comment("Debug mode for API requests")
-        private boolean debug = false;
+        @Comment({
+                "Debug mode for API requests.",
+                "Available modes:",
+                "DISABLED: No debug messages",
+                "ENABLED: All debug messages",
+                "ONLY_ERRORS: Only error messages"
+        })
+        private DebugMode debugMode = DebugMode.ONLY_ERRORS;
 
         @Comment("API Key for request")
         private String apiKey = "YOUR_API_KEY";

diff --git a/bungee/src/main/java/net/leaderos/bungee/helpers/DebugBungee.java b/bungee/src/main/java/net/leaderos/bungee/helpers/DebugBungee.java
@@ -2,6 +2,7 @@
 
 import net.leaderos.bungee.Bungee;
 import net.leaderos.shared.helpers.DebugAPI;
+import net.leaderos.shared.model.DebugMode;
 
 /**
  * Sends debug to console
@@ -17,7 +18,10 @@ public class DebugBungee implements DebugAPI {
      */
     @Override
     public void send(String message, boolean strict) {
-        if (Bungee.getInstance().getConfigFile().getSettings().isDebug() || strict) {
+        if (
+                Bungee.getInstance().getConfigFile().getSettings().getDebugMode() == DebugMode.ENABLED ||
+                        (Bungee.getInstance().getConfigFile().getSettings().getDebugMode() == DebugMode.ONLY_ERRORS && strict)
+        ) {
             Bungee.getInstance().getLogger().warning(ChatUtil.color(
                     "&e[DEBUG] &f" + message
             ));

diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <shared.version>1.0.6</shared.version>
+        <shared.version>1.0.7</shared.version>
     </properties>
 
     <!-- Dependencies -->

diff --git a/shared/src/main/java/net/leaderos/shared/model/DebugMode.java b/shared/src/main/java/net/leaderos/shared/model/DebugMode.java
@@ -0,0 +1,11 @@
+package net.leaderos.shared.model;
+
+/**
+ * @author benfiratkaya
+ * @since 1.0.7
+ */
+public enum DebugMode {
+    DISABLED,
+    ENABLED,
+    ONLY_ERRORS
+}
diff --git a/shared/src/main/java/net/leaderos/shared/modules/connect/socket/SocketClient.java b/shared/src/main/java/net/leaderos/shared/modules/connect/socket/SocketClient.java
@@ -2,6 +2,7 @@
 
 import io.socket.client.IO;
 import io.socket.client.Socket;
+import io.socket.engineio.client.transports.Polling;
 import io.socket.engineio.client.transports.WebSocket;
 import lombok.Getter;
 import lombok.Setter;
@@ -43,7 +44,7 @@ public SocketClient(String apiKey, String serverToken) throws URISyntaxException
         opts.auth = auth;
 
         // Set transports
-        opts.transports = new String[] {WebSocket.NAME};
+        opts.transports = new String[] {WebSocket.NAME, Polling.NAME};
 
         this.socket = IO.socket(url, opts);
 
@@ -52,6 +53,11 @@ public SocketClient(String apiKey, String serverToken) throws URISyntaxException
             System.out.println("Socket Error: " + Arrays.toString(args));
         });
 
+        // Disconnect listener
+        socket.on(Socket.EVENT_DISCONNECT, args -> {
+            System.out.println("Socket Disconnected: " + Arrays.toString(args));
+        });
+
         // Connect to socket
         socket.on(Socket.EVENT_CONNECT, args -> {
             // Join room

diff --git a/velocity/src/main/java/net/leaderos/velocity/Velocity.java b/velocity/src/main/java/net/leaderos/velocity/Velocity.java
@@ -45,7 +45,7 @@
 @Plugin(
         id = "leaderos",
         name = "LeaderOS",
-        version = "1.0.6",
+        version = "1.0.7",
         url = "https://leaderos.net",
         description = "LeaderOS Plugin for Velocity",
         authors = {"leaderos"}
@@ -209,7 +209,7 @@ public void setupFiles() {
 
     public void checkUpdate() {
         Velocity.getInstance().getServer().getScheduler().buildTask(Velocity.getInstance(), () -> {
-            PluginUpdater updater = new PluginUpdater("1.0.6");
+            PluginUpdater updater = new PluginUpdater("1.0.7");
             try {
                 if (updater.checkForUpdates()) {
                     Component msg = ChatUtil.replacePlaceholders(

diff --git a/velocity/src/main/java/net/leaderos/velocity/configuration/Config.java b/velocity/src/main/java/net/leaderos/velocity/configuration/Config.java
@@ -7,6 +7,7 @@
 import eu.okaeri.configs.annotation.Names;
 import lombok.Getter;
 import lombok.Setter;
+import net.leaderos.shared.model.DebugMode;
 
 /**
  * Main config file
@@ -38,8 +39,14 @@ public static class Settings extends OkaeriConfig {
         @Comment("Url of your website")
         private String url = "https://yourwebsite.com";
 
-        @Comment("Debug mode for API requests")
-        private boolean debug = false;
+        @Comment({
+                "Debug mode for API requests.",
+                "Available modes:",
+                "DISABLED: No debug messages",
+                "ENABLED: All debug messages",
+                "ONLY_ERRORS: Only error messages"
+        })
+        private DebugMode debugMode = DebugMode.ONLY_ERRORS;
 
         @Comment("API Key for request")
         private String apiKey = "YOUR_API_KEY";

diff --git a/velocity/src/main/java/net/leaderos/velocity/helpers/DebugVelocity.java b/velocity/src/main/java/net/leaderos/velocity/helpers/DebugVelocity.java
@@ -1,6 +1,7 @@
 package net.leaderos.velocity.helpers;
 
 import net.leaderos.shared.helpers.DebugAPI;
+import net.leaderos.shared.model.DebugMode;
 import net.leaderos.velocity.Velocity;
 
 /**
@@ -17,7 +18,10 @@ public class DebugVelocity implements DebugAPI {
      */
     @Override
     public void send(String message, boolean strict) {
-        if (Velocity.getInstance().getConfigFile().getSettings().isDebug() || strict) {
+        if (
+                Velocity.getInstance().getConfigFile().getSettings().getDebugMode() == DebugMode.ENABLED ||
+                        (Velocity.getInstance().getConfigFile().getSettings().getDebugMode() == DebugMode.ONLY_ERRORS && strict)
+        ) {
             Velocity.getInstance().getLogger().warn(
                     "[DEBUG] " + message
             );