support WSS connections to ap servers.

Author: KonoTyran

build.gradle

@@ -9,20 +9,23 @@ archivesBaseName = "Archipelago.MultiClient.Java"
 group = 'gg.archipelago.APClient'
 version = '1.5'
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(16)
+java.toolchain.languageVersion = JavaLanguageVersion.of(8)
 
 logger.info('Java: {} JVM: {}({}}) Arch: {}',System.getProperty('java.version'),System.getProperty('java.vm.version'),System.getProperty('java.vendor'),System.getProperty('os.arch'))
 
 repositories {
     mavenCentral()
 }
 
+
 dependencies {
     implementation 'org.java-websocket:Java-WebSocket:1.5.2'
     implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'org.apache.httpcomponents.client5:httpclient5:5.2.1'
+    implementation 'org.apache.httpcomponents.core5:httpcore5:5.2'
 }
 
-task relocateShadowJar(type: ConfigureShadowRelocation) {
+tasks.register('relocateShadowJar', ConfigureShadowRelocation) {
     target = tasks.shadowJar
     prefix = "archipelagoClient" // Default value is "shadow"
 }

settings.gradle

@@ -1,5 +1,5 @@
 pluginManagement {
     plugins {
-        id 'com.github.johnrengelman.shadow' version '6.0.0'
+        id 'com.github.johnrengelman.shadow' version '7.1.2'
     }
 }

src/main/java/gg/archipelago/APClient/APClient.java

@@ -9,14 +9,15 @@
 import gg.archipelago.APClient.parts.DataPackage;
 import gg.archipelago.APClient.parts.NetworkItem;
 import gg.archipelago.APClient.parts.Version;
+import org.apache.hc.core5.net.URIBuilder;
 
 import java.io.*;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.regex.Pattern;
 
 public abstract class APClient {
 
@@ -168,24 +169,36 @@ public RoomInfoPacket getRoomInfo() {
         return roomInfo;
     }
 
-    public void connect(String address) {
-        LOGGER.fine("attempting WebSocket connection to " + address);
+    public void connect(String address) throws URISyntaxException {
+        URIBuilder builder = new URIBuilder((!address.contains("//")) ? "//" + address : address);
+        if (builder.getPort() == -1) { //set default port if not included
+            builder.setPort(38281);
+        }
+
         if (apWebSocket != null && apWebSocket.isOpen()) {
             LOGGER.fine("previous WebSocket is open, closing.");
             apWebSocket.close();
         }
-        //regex match port on end of address
-        String pattern = ":[0-9]+";
-        Pattern p = Pattern.compile(pattern);
-        if(!p.matcher(address).find()) {
-            LOGGER.fine("no port set assuming default of 38281");
-            address += ":38281";
+
+        if (builder.getScheme() == null) {
+            builder.setScheme("wss");
+            connect(builder.build(), true);
+            return;
         }
-        URI uri = URI.create("ws://" + address);
-        apWebSocket = new APWebSocket(uri, this);
+
+        connect(builder.build());
+    }
+
+    public void connect(URI address) {
+        connect(address, false);
+    }
+
+    public void connect(URI address, boolean allowDowngrade) {
+        LOGGER.fine("attempting WebSocket connection to " + address.toString());
+        apWebSocket = new APWebSocket(address, this);
         locationManager.setAPWebSocket(apWebSocket);
         itemManager.setAPWebSocket(apWebSocket);
-        apWebSocket.connect();
+        apWebSocket.connect(allowDowngrade);
     }
 
     public void sendChat(String message) {

src/main/java/gg/archipelago/APClient/APWebSocket.java

@@ -12,10 +12,12 @@
 import gg.archipelago.APClient.parts.DataPackage;
 import gg.archipelago.APClient.parts.NetworkItem;
 import gg.archipelago.APClient.parts.NetworkPlayer;
+import org.apache.hc.core5.net.URIBuilder;
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.handshake.ServerHandshake;
 
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.*;
 import java.util.logging.Level;
 
@@ -31,17 +33,17 @@ public class APWebSocket extends WebSocketClient {
 
     private int reconnectAttempt = 0;
 
-    private boolean attemptingReconnect;
-
     private String seedName;
     private static Timer reconnectTimer;
+    private boolean downgrade = false;
 
     public APWebSocket(URI serverUri, APClient apClient) {
         super(serverUri);
         this.apClient = apClient;
-        if (reconnectTimer == null)
-            reconnectTimer = new Timer();
-        reconnectTimer.cancel();
+        if (reconnectTimer != null) {
+            reconnectTimer.cancel();
+        }
+        reconnectTimer = new Timer();
     }
 
     @Override
@@ -228,51 +230,63 @@ private void sendManyPackets(APPacket[] packet) {
     @Override
     public void onClose(int code, String wsReason, boolean remote) {
         LOGGER.fine(String.format("Connection closed by %s Code: %s Reason: %s", (remote ? "remote peer" : "us"), code, wsReason));
-        authenticated = false;
-        attemptingReconnect = false;
-        String reason = wsReason;
-        if (code == -1)
-            reason = "Connection refused by the Archipelago server.";
-        if (code == 1006) {
-            reason = "Lost connection to the Archipelago server.";
-            attemptingReconnect = true;
-        }
-
-        if(attemptingReconnect && reconnectAttempt <= 10) {
-            int reconnectDelay = (int) (5000 * Math.pow(2,reconnectAttempt));
-            reconnectAttempt++;
-            apClient.onClose(reason, reconnectDelay/1000);
+        String reason = (wsReason.isEmpty()) ? "Connection refused by the Archipelago server." : wsReason;
+        if (code == -1) {
+            reconnectTimer.cancel();
 
-            TimerTask reconnectTask = new TimerTask() {
-                @Override
-                public void run() {
-                    apClient.reconnect();
+            // attempt to reconnect using non-secure web socket if we are failing to connect with a secure socket.
+            if (uri.getScheme().equalsIgnoreCase("wss") && downgrade) {
+                try {
+                    apClient.connect(new URIBuilder(uri).setScheme("ws").build());
+                } catch (URISyntaxException ignored) {
+                    apClient.onClose(reason, 0);
                 }
-            };
-
-            reconnectTimer.cancel();
-            reconnectTimer = new Timer();
-            reconnectTimer.schedule(reconnectTask, reconnectDelay);
+                return;
+            }
+            apClient.onClose(reason, 0);
+            return;
         }
-        else {
-            attemptingReconnect = false;
+        if(code == 1000) {
             reconnectTimer.cancel();
-            apClient.onClose(reason, 0);
+            apClient.onClose("Disconnected.", 0);
+        }
+
+        if (code == 1006) {
+            reason = "Lost connection to the Archipelago server.";
+            if( reconnectAttempt <= 10) {
+                int reconnectDelay = (int) (5000 * Math.pow(2, reconnectAttempt));
+                reconnectAttempt++;
+                TimerTask reconnectTask = new TimerTask() {
+                    @Override
+                    public void run() {
+                        apClient.reconnect();
+                    }
+                };
+
+                reconnectTimer.cancel();
+                reconnectTimer = new Timer();
+                reconnectTimer.schedule(reconnectTask, reconnectDelay);
+                apClient.onClose(reason, reconnectDelay / 1000);
+                return;
+            }
         }
+
+        reconnectTimer.cancel();
+        apClient.onClose(reason, 0);
     }
 
     @Override
     public void onError(Exception ex) {
-        //apClient.onError(ex);
+        apClient.onError(ex);
         LOGGER.log(Level.WARNING, "Error in websocket connection");
+        ex.printStackTrace();
     }
 
-    @Override
-    public void connect(){
+    public void connect(boolean allowDowngrade){
         super.connect();
         reconnectTimer.cancel();
-        attemptingReconnect = false;
         reconnectAttempt = 0;
+        this.downgrade = allowDowngrade;
     }
 
     public void sendChat(String message) {

src/main/java/gg/archipelago/APClient/SlotData.java

@@ -1,4 +1,4 @@
 package gg.archipelago.APClient;
 
-public class SlotData {
+public interface SlotData {
 }