Connect to alternative WS URL if main WS URL fails

Author: Tim203

core/src/main/java/org/geysermc/geyser/Constants.java

@@ -30,6 +30,7 @@
 
 public final class Constants {
     public static final URI GLOBAL_API_WS_URI;
+    public static final URI GLOBAL_API_WS_URI_ALT;
 
     public static final String NEWS_OVERVIEW_URL = "https://api.geysermc.org/v2/news/";
     public static final String NEWS_PROJECT_NAME = "geyser";
@@ -54,5 +55,12 @@ public final class Constants {
             e.printStackTrace();
         }
         GLOBAL_API_WS_URI = wsUri;
+
+        URI wsUriAlt = null;
+        try {
+            wsUriAlt = new URI("wss://ws.geysermc.org/ws");
+        } catch (URISyntaxException ignored) {
+        }
+        GLOBAL_API_WS_URI_ALT = wsUriAlt;
     }
 }

core/src/main/java/org/geysermc/geyser/skin/FloodgateSkinUploader.java

@@ -49,6 +49,7 @@
 import org.geysermc.geyser.util.JsonUtils;
 import org.geysermc.geyser.util.PluginMessageUtils;
 import org.java_websocket.client.WebSocketClient;
+import org.java_websocket.framing.CloseFrame;
 import org.java_websocket.handshake.ServerHandshake;
 
 public final class FloodgateSkinUploader {
@@ -79,6 +80,8 @@ public final class FloodgateSkinUploader {
     @Getter private boolean allowSubscribers = false;
     private int subscribersCount;
 
+    private int protocolErrorCount = 0;
+
     public FloodgateSkinUploader(GeyserImpl geyser) {
         this.logger = geyser.getLogger();
         this.client = new WebSocketClient(Constants.GLOBAL_API_WS_URI) {
@@ -180,6 +183,22 @@ public void onMessage(String message) {
             public void onClose(int code, String reason, boolean remote) {
                 allowSubscribers = false;
 
+                // If we seem to get protocol errors quite a bit, try our alternative url.
+                // But if that one fails too for a few times, just revert back to our main url.
+                if (code == CloseFrame.PROTOCOL_ERROR) {
+                    boolean shouldSwitch = false;
+                    if (protocolErrorCount < 5) {
+                        shouldSwitch = ++protocolErrorCount == 5;
+                    }
+                    if (protocolErrorCount >= 5 && Constants.GLOBAL_API_WS_URI_ALT != null) {
+                        if (shouldSwitch) {
+                            uri = Constants.GLOBAL_API_WS_URI_ALT;
+                        } else if (++protocolErrorCount == 10) {
+                            uri = Constants.GLOBAL_API_WS_URI;
+                        }
+                    }
+                }
+
                 if (reason != null && !reason.isEmpty()) {
                     try {
                         JsonObject node = JsonUtils.parseJson(reason);