feat: Super Endpoints

Author: robinbraemer

core/src/main/java/com/minekube/connect/ConnectPlatform.java

@@ -121,6 +121,9 @@ public boolean enable(Module... postInitializeModules) {
         guice.getInstance(Metrics.class);
 
         logger.info("Endpoint name: " + config.getEndpoint());
+        if (config.getSuperEndpoints() != null && !config.getSuperEndpoints().isEmpty()) {
+            logger.info("Super endpoints: " + String.join(", ", config.getSuperEndpoints()));
+        }
         logger.info("Your public address: " + config.getEndpoint() + DOMAIN_SUFFIX);
 
         return true;

core/src/main/java/com/minekube/connect/config/ConnectConfig.java

@@ -26,6 +26,7 @@
 package com.minekube.connect.config;
 
 import com.minekube.connect.util.Utils;
+import java.util.List;
 import lombok.Getter;
 
 /**
@@ -49,10 +50,16 @@ public class ConnectConfig {
 
     /**
      * Whether cracked players should be allowed to join.
-     * If not set, Connect will automatically detect if the server is in offline mode.
+     * If not set, Connect will automatically detect if the server allows cracked players.
      */
     private Boolean allowOfflineModePlayers;
 
+    /**
+     * Super endpoints are authorized to control this endpoint via Connect API.
+     * e.g. disconnect players from this endpoint, send messages to players, etc.
+     */
+    private List<String> superEndpoints;
+
     private static final String ENDPOINT_ENV = System.getenv("CONNECT_ENDPOINT");
 
     public String getEndpoint() {

core/src/main/java/com/minekube/connect/watch/WatchClient.java

@@ -29,6 +29,7 @@
 import com.google.inject.name.Named;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.minekube.connect.config.ConnectConfig;
+import java.io.IOException;
 import minekube.connect.v1alpha1.WatchServiceOuterClass.SessionRejection;
 import minekube.connect.v1alpha1.WatchServiceOuterClass.SessionRejection.Builder;
 import minekube.connect.v1alpha1.WatchServiceOuterClass.WatchRequest;
@@ -45,6 +46,7 @@
 public class WatchClient {
     private static final String ENDPOINT_HEADER = "Connect-Endpoint";
     private static final String ENDPOINT_OFFLINE_MODE_HEADER = ENDPOINT_HEADER + "-Offline-Mode";
+    private static final String ENDPOINT_PARENTS_HEADER = ENDPOINT_HEADER + "-Parents";
     private static final String WATCH_URL = System.getenv().getOrDefault(
             "CONNECT_WATCH_URL", "wss://watch-connect.minekube.net");
 
@@ -66,13 +68,19 @@ public WebSocket watch(Watcher watcher) {
             request = request.header(ENDPOINT_OFFLINE_MODE_HEADER,
                     config.getAllowOfflineModePlayers().toString());
         }
+        if (config.getSuperEndpoints() != null) {
+            for (String superEndpoint : config.getSuperEndpoints()) {
+                request = request.addHeader(ENDPOINT_PARENTS_HEADER, superEndpoint);
+            }
+        }
 
         Request req = request.build();
         return httpClient.newWebSocket(req, new WebSocketListener() {
             @Override
             public void onClosed(@NotNull WebSocket webSocket, int code, @NotNull String reason) {
                 if (code != 1000) {
-                    watcher.onError(new RuntimeException("Watch closed with code " + code + ": " + reason));
+                    watcher.onError(
+                            new RuntimeException("Watch closed with code " + code + ": " + reason));
                     return;
                 }
                 watcher.onCompleted();
@@ -86,7 +94,21 @@ public void onClosing(@NotNull WebSocket webSocket, int code, @NotNull String re
             @Override
             public void onFailure(@NotNull WebSocket webSocket, @NotNull Throwable t,
                                   @Nullable Response response) {
-                watcher.onError(t);
+
+                // Try to get a more detailed error message from the server
+                String message = null;
+                if (response != null && response.body() != null) {
+                    try {
+                        message = response.body().string();
+                    } catch (IOException ignored) {
+                    }
+                }
+
+                if (message == null || message.isEmpty()) {
+                    watcher.onError(t);
+                } else {
+                    watcher.onError(new RuntimeException(message, t));
+                }
             }
 
             @Override

core/src/main/resources/config.yml

@@ -7,6 +7,14 @@ endpoint: ${endpoint}
 # If left blank, the correct mode will be securely detected automatically.
 allow-offline-mode-players: false
 
+# Super endpoints are authorized to control this endpoint via Connect API.
+# e.g. disconnect players from this endpoint, send messages to players, etc.
+#
+# You can add as many super endpoint names as you want.
+#super-endpoints:
+#  - pvp-endpoint
+#  - someones-hub
+
 # The default locale for Connect. By default, Connect uses the system locale
 #default-locale: en_US
 

core/src/main/resources/proxy-config.yml

@@ -9,6 +9,14 @@ allow-offline-mode-players: false
 # The default locale for Connect. By default, Connect uses the system locale
 #default-locale: en_US
 
+# Super endpoints are authorized to control this endpoint via Connect API.
+# e.g. disconnect players from this endpoint, send messages to players, etc.
+#
+# You can add as many super endpoint names as you want.
+#super-endpoints:
+#  - pvp-endpoint
+#  - someones-hub
+
 # bStats is a stat tracker that is entirely anonymous and tracks only basic information
 # about Connect, such as how many people are online, how many servers are using Connect,
 # what OS is being used, etc. You can learn more about bStats here: https://bstats.org/.