fix: reset polling on shutdown, guard serverId overwrite, check auth on reload, fix Log varargs, use Envelope.MAPPER in UserCache

Author: objz

backends/src/main/java/dev/objz/commandbridge/backends/api/BackendCommandBridgeImpl.java

@@ -68,8 +68,10 @@ public void shutdown() {
         if (providerRegistered.compareAndSet(true, false)) {
             CommandBridgeProvider.unregister();
         }
+        polling.set(false);
         if (statePoller != null) {
             statePoller.shutdownNow();
+            statePoller = null;
         }
     }
 
@@ -110,12 +112,14 @@ public Optional<PlayerLocator> playerLocator() {
 
     @Override
     public Subscription onServerConnected(ServerEventListener listener) {
-        throw new UnsupportedOperationException("Server events are only available on the proxy");
+        Objects.requireNonNull(listener);
+        return () -> { };
     }
 
     @Override
     public Subscription onServerDisconnected(ServerEventListener listener) {
-        throw new UnsupportedOperationException("Server events are only available on the proxy");
+        Objects.requireNonNull(listener);
+        return () -> { };
     }
 
     @Override
@@ -149,7 +153,7 @@ public PluginMessage handlePluginMessageRequest(Envelope env) {
     public void handlePluginMessageResponse(Envelope env) {
         String to = env.to();
         if (to != null && !to.equals(localServerId()) && !"*".equals(to)) {
-            Log.debug("Dropping plugin response for mismatched target {}", to);
+            Log.warn("Dropping plugin response for mismatched target {} (local={})", to, localServerId());
         }
     }
 

backends/src/main/java/dev/objz/commandbridge/backends/net/in/RegistrationHandler.java

@@ -67,7 +67,9 @@ public void accept(Endpoint endpoint, Envelope env) {
             }
         }
         registeredCommands = List.copyOf(rc.commands());
-        client.setServerId(env.from());
+        if (client.serverId() == null || client.serverId().isBlank()) {
+            client.setServerId(env.from());
+        }
         Feedback f = fc.build();
         Summary.feedbackSummary("Registration", f, env.from());
         Summary.feedbackDetails(f, env.from(), true);

core/src/main/java/dev/objz/commandbridge/logging/Log.java

@@ -476,7 +476,10 @@ private void errorI(Throwable t, String message, Object... args) {
             if (args == null || args.length == 0) {
                 base.error("{}", m, t);
             } else {
-                base.error(m, args, t);
+                Object[] merged = new Object[args.length + 1];
+                System.arraycopy(args, 0, merged, 0, args.length);
+                merged[args.length] = t;
+                base.error(m, merged);
             }
         } else {
             Throwable root = rootCause(t);
@@ -560,7 +563,11 @@ private void onConsole(java.util.function.Consumer<Logger> sink) {
         var isMain = isMainThread;
         var dispatch = mainThreadDispatch;
         if (isMain != null && dispatch != null && !isMain.getAsBoolean()) {
-            dispatch.accept(() -> sink.accept(base));
+            try {
+                dispatch.accept(() -> sink.accept(base));
+            } catch (Exception e) {
+                sink.accept(base);
+            }
         } else {
             sink.accept(base);
         }

velocity/src/main/java/dev/objz/commandbridge/velocity/RegistrationManager.java

@@ -120,7 +120,8 @@ public void onClientAuthenticated(ClientSession session) {
 
     public void reload() {
         for (ClientSession session : sessions) {
-            if (session.id() != null) {
+            if (session.id() != null
+                    && session.status() == dev.objz.commandbridge.security.AuthStatus.AUTH_OK) {
                 onClientAuthenticated(session);
             }
         }

velocity/src/main/java/dev/objz/commandbridge/velocity/util/UserCache.java

@@ -1,11 +1,11 @@
 package dev.objz.commandbridge.velocity.util;
 
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ProxyServer;
 import dev.objz.commandbridge.logging.Log;
 import dev.objz.commandbridge.net.OutNode;
+import dev.objz.commandbridge.net.proto.Envelope;
 import dev.objz.commandbridge.net.proto.MessageType;
 import dev.objz.commandbridge.scripting.model.enums.Location;
 import dev.objz.commandbridge.security.AuthStatus;
@@ -35,7 +35,6 @@ public final class UserCache {
     private final ProxyServer proxy;
     private final SessionHub sessions;
     private final OutNode outNode;
-    private final ObjectMapper mapper = new ObjectMapper();
     private final ConcurrentHashMap<String, CacheEntry> cache = new ConcurrentHashMap<>();
     private final Path cachePath;
 
@@ -151,7 +150,7 @@ public synchronized void save() {
         try {
             Files.createDirectories(cachePath.getParent());
             List<CacheEntry> entries = new ArrayList<>(cache.values());
-            mapper.writeValue(cachePath.toFile(), entries);
+            Envelope.MAPPER.writeValue(cachePath.toFile(), entries);
         } catch (IOException e) {
             Log.error("Failed to save user cache: {}", e.getMessage());
         }
@@ -160,7 +159,7 @@ public synchronized void save() {
     private synchronized void load() {
         if (Files.notExists(cachePath)) return;
         try {
-            List<CacheEntry> entries = mapper.readValue(cachePath.toFile(),
+            List<CacheEntry> entries = Envelope.MAPPER.readValue(cachePath.toFile(),
                     new TypeReference<List<CacheEntry>>() {
                     });
             for (CacheEntry entry : entries) {