refactor: use API RunAs and ConnectionState, remove internal duplicates

objz · objz · commit b1536849ea80 · 2026-03-21T23:55:17.000+01:00
diff --git a/backends/folia/src/main/java/dev/objz/commandbridge/folia/FoliaExecutor.java b/backends/folia/src/main/java/dev/objz/commandbridge/folia/FoliaExecutor.java
@@ -3,7 +3,7 @@
 import dev.objz.commandbridge.backends.platform.PlatformExecutor;
 import dev.objz.commandbridge.logging.Log;
 import dev.objz.commandbridge.net.payloads.cmd.ExecuteCommand;
-import dev.objz.commandbridge.scripting.model.enums.RunAs;
+import dev.objz.commandbridge.api.channel.command.RunAs;
 import io.papermc.paper.threadedregions.scheduler.GlobalRegionScheduler;
 import io.papermc.paper.threadedregions.scheduler.EntityScheduler;
 import org.bukkit.Bukkit;
diff --git a/backends/src/main/java/dev/objz/commandbridge/backends/net/client/RedisClient.java b/backends/src/main/java/dev/objz/commandbridge/backends/net/client/RedisClient.java
@@ -1,7 +1,7 @@
 package dev.objz.commandbridge.backends.net.client;
 
 import dev.objz.commandbridge.backends.net.connection.ClientStatus;
-import dev.objz.commandbridge.backends.net.connection.ConnectionState;
+import dev.objz.commandbridge.api.platform.ConnectionState;
 import dev.objz.commandbridge.backends.net.connection.ReconnectHandler;
 import dev.objz.commandbridge.backends.net.routing.AuthHandler;
 import dev.objz.commandbridge.backends.net.routing.RedisMessageRouter;
@@ -143,7 +143,7 @@ public synchronized void close() {
 
     @Override
     public ClientStatus status() {
-        return stateRef.get().toClientStatus();
+        return ClientStatus.fromConnectionState(stateRef.get());
     }
 
     @Override
diff --git a/backends/src/main/java/dev/objz/commandbridge/backends/net/client/WsClient.java b/backends/src/main/java/dev/objz/commandbridge/backends/net/client/WsClient.java
@@ -1,7 +1,7 @@
 package dev.objz.commandbridge.backends.net.client;
 
 import dev.objz.commandbridge.backends.net.connection.ConnectionHandler;
-import dev.objz.commandbridge.backends.net.connection.ConnectionState;
+import dev.objz.commandbridge.api.platform.ConnectionState;
 import dev.objz.commandbridge.backends.net.connection.ClientStatus;
 import dev.objz.commandbridge.backends.net.connection.ReconnectHandler;
 import dev.objz.commandbridge.backends.net.connection.ResourcePool;
@@ -162,7 +162,7 @@ public synchronized void close() throws Exception {
 
     @Override
     public ClientStatus status() {
-        return stateRef.get().toClientStatus();
+        return ClientStatus.fromConnectionState(stateRef.get());
     }
 
     @Override
diff --git a/backends/src/main/java/dev/objz/commandbridge/backends/net/connection/ClientStatus.java b/backends/src/main/java/dev/objz/commandbridge/backends/net/connection/ClientStatus.java
@@ -1,8 +1,28 @@
 package dev.objz.commandbridge.backends.net.connection;
 
+import dev.objz.commandbridge.api.platform.ConnectionState;
+
 public enum ClientStatus {
     DISCONNECTED,
     CONNECTED,
     AUTH_OK,
-    AUTH_FAILED
+    AUTH_FAILED;
+
+    public ConnectionState toConnectionState() {
+        return switch (this) {
+            case DISCONNECTED -> ConnectionState.DISCONNECTED;
+            case CONNECTED -> ConnectionState.CONNECTED;
+            case AUTH_OK -> ConnectionState.AUTHENTICATED;
+            case AUTH_FAILED -> ConnectionState.AUTH_FAILED;
+        };
+    }
+
+    public static ClientStatus fromConnectionState(ConnectionState state) {
+        return switch (state) {
+            case DISCONNECTED, CONNECTING, RECONNECTING -> DISCONNECTED;
+            case CONNECTED -> CONNECTED;
+            case AUTHENTICATED -> AUTH_OK;
+            case AUTH_FAILED -> AUTH_FAILED;
+        };
+    }
 }
diff --git a/backends/src/main/java/dev/objz/commandbridge/backends/net/connection/ConnectionHandler.java b/backends/src/main/java/dev/objz/commandbridge/backends/net/connection/ConnectionHandler.java
@@ -1,5 +1,6 @@
 package dev.objz.commandbridge.backends.net.connection;
 
+import dev.objz.commandbridge.api.platform.ConnectionState;
 import dev.objz.commandbridge.config.model.BackendsConfig;
 import dev.objz.commandbridge.config.model.TlsMode;
 import dev.objz.commandbridge.logging.Log;
diff --git a/backends/src/main/java/dev/objz/commandbridge/backends/net/connection/ConnectionState.java b/backends/src/main/java/dev/objz/commandbridge/backends/net/connection/ConnectionState.java
diff --git a/backends/src/main/java/dev/objz/commandbridge/backends/net/in/ExecuteCommandHandler.java b/backends/src/main/java/dev/objz/commandbridge/backends/net/in/ExecuteCommandHandler.java
@@ -8,7 +8,7 @@
 import dev.objz.commandbridge.net.payloads.cmd.ExecuteCommandResult;
 import dev.objz.commandbridge.net.proto.Envelope;
 import dev.objz.commandbridge.net.proto.MessageType;
-import dev.objz.commandbridge.scripting.model.enums.RunAs;
+import dev.objz.commandbridge.api.channel.command.RunAs;
 
 import java.util.HashSet;
 import java.util.Objects;
diff --git a/backends/src/main/java/dev/objz/commandbridge/backends/net/routing/AuthHandler.java b/backends/src/main/java/dev/objz/commandbridge/backends/net/routing/AuthHandler.java
@@ -1,7 +1,7 @@
 package dev.objz.commandbridge.backends.net.routing;
 
 import dev.objz.commandbridge.backends.net.connection.ClientStatus;
-import dev.objz.commandbridge.backends.net.connection.ConnectionState;
+import dev.objz.commandbridge.api.platform.ConnectionState;
 import dev.objz.commandbridge.config.model.BackendsConfig;
 import dev.objz.commandbridge.logging.Log;
 import dev.objz.commandbridge.net.OutNode;
@@ -31,7 +31,7 @@ public void onAuthenticated(Runnable callback) {
     public boolean authenticate() {
 
         Consumer<ClientStatus> statusUpdater = status -> {
-            ConnectionState newState = ConnectionState.fromClientStatus(status);
+            ConnectionState newState = status.toConnectionState();
             stateRef.set(newState);
 
             if (newState == ConnectionState.AUTHENTICATED) {
diff --git a/backends/src/main/java/dev/objz/commandbridge/backends/net/routing/MessageRouter.java b/backends/src/main/java/dev/objz/commandbridge/backends/net/routing/MessageRouter.java
@@ -1,6 +1,6 @@
 package dev.objz.commandbridge.backends.net.routing;
 
-import dev.objz.commandbridge.backends.net.connection.ConnectionState;
+import dev.objz.commandbridge.api.platform.ConnectionState;
 import dev.objz.commandbridge.backends.net.in.PingHandler;
 import dev.objz.commandbridge.backends.net.out.AuthRequest;
 import dev.objz.commandbridge.backends.net.out.InvokedCommandEvent;
diff --git a/backends/src/main/java/dev/objz/commandbridge/backends/net/routing/RedisMessageRouter.java b/backends/src/main/java/dev/objz/commandbridge/backends/net/routing/RedisMessageRouter.java
@@ -1,6 +1,6 @@
 package dev.objz.commandbridge.backends.net.routing;
 
-import dev.objz.commandbridge.backends.net.connection.ConnectionState;
+import dev.objz.commandbridge.api.platform.ConnectionState;
 import dev.objz.commandbridge.backends.net.in.PingHandler;
 import dev.objz.commandbridge.backends.net.out.AuthRequest;
 import dev.objz.commandbridge.backends.net.out.InvokedCommandEvent;
diff --git a/backends/src/main/java/dev/objz/commandbridge/backends/platform/PlatformExecutor.java b/backends/src/main/java/dev/objz/commandbridge/backends/platform/PlatformExecutor.java
@@ -2,7 +2,7 @@
 
 import dev.objz.commandbridge.logging.Log;
 import dev.objz.commandbridge.net.payloads.cmd.ExecuteCommand;
-import dev.objz.commandbridge.scripting.model.enums.RunAs;
+import dev.objz.commandbridge.api.channel.command.RunAs;
 import dev.objz.commandbridge.backends.platform.cmd.CommandExecutor;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
diff --git a/backends/velocity/src/main/java/dev/objz/commandbridge/velocity/VelocityExecutor.java b/backends/velocity/src/main/java/dev/objz/commandbridge/velocity/VelocityExecutor.java
@@ -7,7 +7,7 @@
 import dev.objz.commandbridge.backends.platform.cmd.CommandExecutor;
 import dev.objz.commandbridge.logging.Log;
 import dev.objz.commandbridge.net.payloads.cmd.ExecuteCommand;
-import dev.objz.commandbridge.scripting.model.enums.RunAs;
+import dev.objz.commandbridge.api.channel.command.RunAs;
 import net.kyori.adventure.text.Component;
 
 import java.util.Objects;
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -15,6 +15,7 @@ repositories {
 }
 
 dependencies {
+    api(project(":api"))
     api("com.fasterxml.jackson.core:jackson-databind:2.18.2")
     api("com.fasterxml.jackson.core:jackson-annotations:2.18")
     api("com.fasterxml.jackson.core:jackson-core:2.18.2")
diff --git a/core/src/main/java/dev/objz/commandbridge/net/payloads/cmd/ExecuteCommand.java b/core/src/main/java/dev/objz/commandbridge/net/payloads/cmd/ExecuteCommand.java
@@ -2,7 +2,7 @@
 
 import java.util.Set;
 import java.util.UUID;
-import dev.objz.commandbridge.scripting.model.enums.RunAs;
+import dev.objz.commandbridge.api.channel.command.RunAs;
 
 public record ExecuteCommand(
         String command,
diff --git a/core/src/main/java/dev/objz/commandbridge/scripting/model/Defaults.java b/core/src/main/java/dev/objz/commandbridge/scripting/model/Defaults.java
@@ -7,7 +7,7 @@
 import dev.objz.commandbridge.scripting.anno.Min;
 import dev.objz.commandbridge.scripting.anno.Model;
 import dev.objz.commandbridge.scripting.anno.YmlKey;
-import dev.objz.commandbridge.scripting.model.enums.RunAs;
+import dev.objz.commandbridge.api.channel.command.RunAs;
 import dev.objz.commandbridge.scripting.model.records.Server;
 import dev.objz.commandbridge.scripting.model.records.mapping.IdMapping;
 
diff --git a/core/src/main/java/dev/objz/commandbridge/scripting/model/enums/RunAs.java b/core/src/main/java/dev/objz/commandbridge/scripting/model/enums/RunAs.java
diff --git a/core/src/main/java/dev/objz/commandbridge/scripting/model/records/mapping/CmdMapping.java b/core/src/main/java/dev/objz/commandbridge/scripting/model/records/mapping/CmdMapping.java
@@ -9,7 +9,7 @@
 import dev.objz.commandbridge.scripting.anno.Required;
 import dev.objz.commandbridge.scripting.anno.Resolvable;
 import dev.objz.commandbridge.scripting.anno.YmlKey;
-import dev.objz.commandbridge.scripting.model.enums.RunAs;
+import dev.objz.commandbridge.api.channel.command.RunAs;
 import dev.objz.commandbridge.scripting.model.records.Server;
 
 @Model("commands")
diff --git a/velocity/src/main/java/dev/objz/commandbridge/velocity/dispatch/CommandDispatcher.java b/velocity/src/main/java/dev/objz/commandbridge/velocity/dispatch/CommandDispatcher.java
@@ -8,7 +8,7 @@
 import dev.objz.commandbridge.net.proto.MessageType;
 import dev.objz.commandbridge.scripting.model.Script;
 import dev.objz.commandbridge.scripting.model.enums.Location;
-import dev.objz.commandbridge.scripting.model.enums.RunAs;
+import dev.objz.commandbridge.api.channel.command.RunAs;
 import dev.objz.commandbridge.scripting.model.records.mapping.CmdMapping;
 import dev.objz.commandbridge.scripting.model.records.mapping.IdMapping;
 import dev.objz.commandbridge.velocity.dispatch.exec.LocalDispatcher;
diff --git a/velocity/src/main/java/dev/objz/commandbridge/velocity/dispatch/exec/LocalDispatcher.java b/velocity/src/main/java/dev/objz/commandbridge/velocity/dispatch/exec/LocalDispatcher.java
@@ -4,7 +4,7 @@
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ProxyServer;
 import dev.objz.commandbridge.logging.Log;
-import dev.objz.commandbridge.scripting.model.enums.RunAs;
+import dev.objz.commandbridge.api.channel.command.RunAs;
 
 import java.util.Objects;
 import java.util.UUID;
diff --git a/velocity/src/main/java/dev/objz/commandbridge/velocity/net/out/ctx/ExecuteCommandContext.java b/velocity/src/main/java/dev/objz/commandbridge/velocity/net/out/ctx/ExecuteCommandContext.java
@@ -1,6 +1,6 @@
 package dev.objz.commandbridge.velocity.net.out.ctx;
 
-import dev.objz.commandbridge.scripting.model.enums.RunAs;
+import dev.objz.commandbridge.api.channel.command.RunAs;
 import dev.objz.commandbridge.velocity.net.session.ClientSession;
 
 import java.util.Objects;
