pipeline fixes

Author: Mindgamesnl

.github/workflows/javadoc-pages.yml

@@ -10,6 +10,7 @@ on:
 jobs:
   publish:
     runs-on: ubuntu-latest
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -27,10 +28,10 @@ jobs:
         with:
           java-version: '17'
           distribution: 'temurin'
-          cache: 'maven'
+          cache: 'gradle'
 
-      - name: Generate Javadoc
-        run: mvn clean javadoc:aggregate -pl :openaudiomc-api -U
+      - name: Generate Javadoc (API module)
+        run: ./gradlew :OpenAudioMc:API:javadoc --no-daemon
 
       - name: Checkout javadoc branch
         uses: actions/checkout@v3
@@ -46,7 +47,8 @@ jobs:
           mkdir -p javadoc
 
       - name: Copy new javadoc
-        run: cp -r api/target/reports/apidocs/* javadoc-branch/javadoc/
+        run: |
+          cp -r OpenAudioMc/API/build/docs/javadoc/* javadoc-branch/javadoc/
 
       - name: Commit and push javadoc
         run: |

.tool-versions

@@ -1 +1 @@
-java openjdk-17
+java openjdk-21

OpenAudioMc/Plugin/build.gradle

@@ -161,7 +161,8 @@ import dev.s7a.gradle.minecraft.server.tasks.LaunchMinecraftServerTask
         ["20", "1.20.4"],
 //        ["21", "1.21.4"],
         ["21", "1.21.7"],
-        ["2110", "1.21.10"]
+        ["2110", "1.21.10"],
+        ["2111", "1.21.11"]
 ].each { name, version ->
     task("testPlugin$name", type: LaunchMinecraftServerTask) {
         dependsOn 'shadowJar' // Changed from 'build' to use the shaded jar

OpenAudioMc/Plugin/src/main/bash/data.bin

@@ -1 +1 @@
-BUILD_NUM="1552"
+BUILD_NUM="1564"

OpenAudioMc/Plugin/src/main/java/com/craftmend/openaudiomc/generic/networking/io/SocketConnection.java

@@ -5,31 +5,30 @@
 import com.craftmend.openaudiomc.generic.authentication.AuthenticationService;
 import com.craftmend.openaudiomc.generic.authentication.objects.ServerKeySet;
 import com.craftmend.openaudiomc.generic.events.events.StateChangeEvent;
-import com.craftmend.openaudiomc.generic.networking.DefaultNetworkingService;
-import com.craftmend.openaudiomc.generic.oac.OpenaudioAccountService;
 import com.craftmend.openaudiomc.generic.logging.OpenAudioLogger;
-import com.craftmend.openaudiomc.generic.networking.certificate.CertificateHelper;
+import com.craftmend.openaudiomc.generic.networking.DefaultNetworkingService;
 import com.craftmend.openaudiomc.generic.networking.abstracts.AbstractPacket;
+import com.craftmend.openaudiomc.generic.networking.certificate.CertificateHelper;
 import com.craftmend.openaudiomc.generic.networking.drivers.ClientDriver;
 import com.craftmend.openaudiomc.generic.networking.drivers.NotificationDriver;
 import com.craftmend.openaudiomc.generic.networking.drivers.SystemDriver;
+import com.craftmend.openaudiomc.generic.networking.interfaces.Authenticatable;
+import com.craftmend.openaudiomc.generic.networking.interfaces.SocketDriver;
+import com.craftmend.openaudiomc.generic.oac.OpenaudioAccountService;
 import com.craftmend.openaudiomc.generic.platform.interfaces.TaskService;
 import com.craftmend.openaudiomc.generic.rest.RestRequest;
+import com.craftmend.openaudiomc.generic.rest.ServerEnvironment;
 import com.craftmend.openaudiomc.generic.rest.response.NoResponse;
 import com.craftmend.openaudiomc.generic.rest.routes.Endpoint;
 import com.craftmend.openaudiomc.generic.rest.types.RelayLoginResponse;
 import com.craftmend.openaudiomc.generic.state.StateService;
 import com.craftmend.openaudiomc.generic.state.states.*;
-import com.craftmend.openaudiomc.generic.networking.interfaces.Authenticatable;
-import com.craftmend.openaudiomc.generic.networking.interfaces.SocketDriver;
-
 import com.craftmend.openaudiomc.generic.storage.enums.StorageKey;
 import com.craftmend.openaudiomc.generic.uploads.UploadIndexService;
+import com.craftmend.openaudiomc.generic.utils.NamedExecutors;
 import io.socket.client.IO;
 import io.socket.client.Socket;
-
 import lombok.Getter;
-
 import okhttp3.Call;
 import okhttp3.OkHttpClient;
 import okhttp3.WebSocket;
@@ -41,7 +40,24 @@
 
 public class SocketConnection {
 
-    @Getter private final DefaultNetworkingService parent;
+    private static final OkHttpClient SOCKET_HTTP_CLIENT = buildSocketHttpClient();
+    private static OkHttpClient buildSocketHttpClient() {
+        ProxySelector.setDefault(new NullProxySelector());
+
+        OkHttpClient.Builder builder = new OkHttpClient.Builder()
+                .proxySelector(new NullProxySelector())
+                .dispatcher(NamedExecutors.namedDispatcher("OA-SocketPreauth"));
+
+        if (OpenAudioMc.SERVER_ENVIRONMENT == ServerEnvironment.DEVELOPMENT) {
+            OpenAudioLogger.warn("Running in development mode, disabling SSL verification");
+            CertificateHelper.ignore(builder);
+        }
+
+        return builder.build();
+    }
+
+    @Getter
+    private final DefaultNetworkingService parent;
 
     private Socket socket;
     @Getter
@@ -50,8 +66,8 @@ public class SocketConnection {
     private boolean registeredLogout = false;
     @Getter
     private RelayLoginResponse previousLogin;
-    private ServerKeySet keySet;
-    private SystemDriver systemDriver = new SystemDriver(this);
+    private final ServerKeySet keySet;
+    private final SystemDriver systemDriver = new SystemDriver(this);
 
     private final SocketDriver[] drivers = new SocketDriver[]{
             new NotificationDriver(),
@@ -71,18 +87,17 @@ public void setupConnection() {
 
         if (!isReconnect && !OpenAudioMc.getService(StateService.class).getCurrentState().canConnect()) return;
 
-        // update state
         if (!isReconnect) {
-            // only override the state if we are not reconnecting
             OpenAudioMc.getService(StateService.class).setState(new AssigningRelayState());
         } else {
             OpenAudioLogger.info("Attempting to restore connection to OpenAudioMc, attempt " + attempt);
         }
 
         if (!registeredLogout) {
-            relayLoginRequest = new RestRequest(RelayLoginResponse.class, Endpoint.RELAY_LOGIN);
-            relayLoginRequest.setQuery("oa-version", OpenAudioMc.BUILD.getBuildNumber() + "");
-            relayLogoutRequest = new RestRequest(NoResponse.class, Endpoint.RELAY_LOGOUT);
+            relayLoginRequest = new RestRequest<>(RelayLoginResponse.class, Endpoint.RELAY_LOGIN)
+                    .setQuery("oa-version", String.valueOf(OpenAudioMc.BUILD.getBuildNumber()));
+
+            relayLogoutRequest = new RestRequest<>(NoResponse.class, Endpoint.RELAY_LOGOUT);
 
             EventApi.getInstance().registerHandler(StateChangeEvent.class, event -> {
                 if (event.getOldState() instanceof ConnectedState) {
@@ -93,13 +108,10 @@ public void setupConnection() {
             registeredLogout = true;
         }
 
-        ProxySelector.setDefault(new NullProxySelector());
-        OkHttpClient okHttpClient = CertificateHelper.ignore(new OkHttpClient.Builder().proxySelector(new NullProxySelector())).build();
-
         IO.Options opts = new IO.Options();
-        opts.callFactory = (Call.Factory) okHttpClient;
+        opts.callFactory = (Call.Factory) SOCKET_HTTP_CLIENT;
+        opts.webSocketFactory = (WebSocket.Factory) SOCKET_HTTP_CLIENT;
         opts.reconnection = false;
-        opts.webSocketFactory = (WebSocket.Factory) okHttpClient;
         opts.forceNew = true;
         opts.rememberUpgrade = false;
 
@@ -108,7 +120,7 @@ public void setupConnection() {
                     "type=server&private=%s&public=%s&reconnect=%s",
                     keySet.getPrivateKey().getValue(),
                     keySet.getPublicKey().getValue(),
-                    isReconnect ? "true" : "false"
+                    isReconnect
             );
         } else {
             opts.query = String.format(
@@ -118,19 +130,20 @@ public void setupConnection() {
             );
         }
 
-        // only do login handling if we're not reconnecting, because then we'd be re-using the same config
         if (!isReconnect) {
             OpenAudioMc.resolveDependency(TaskService.class).schduleSyncDelayedTask(() -> {
                 if (OpenAudioMc.getService(StateService.class).getCurrentState() instanceof AssigningRelayState) {
                     OpenAudioLogger.info("Connecting timed out.");
-                    OpenAudioMc.getService(StateService.class).setState(new IdleState("Connecting to OpenAudioMc timed out"));
+                    OpenAudioMc.getService(StateService.class)
+                            .setState(new IdleState("Connecting to OpenAudioMc timed out"));
                 }
             }, 20 * 35);
 
             relayLoginRequest.run();
 
             if (relayLoginRequest.hasError()) {
-                OpenAudioMc.getService(StateService.class).setState(new IdleState("Failed to do the initial handshake. Error: " + relayLoginRequest.getError()));
+                OpenAudioMc.getService(StateService.class)
+                        .setState(new IdleState("Failed to do the initial handshake. Error: " + relayLoginRequest.getError()));
                 OpenAudioLogger.info("Failed to get instance: " + relayLoginRequest.getError().getMessage());
                 try {
                     throw new IOException("Failed to get instance! see console for error information");
@@ -140,43 +153,37 @@ public void setupConnection() {
                 return;
             }
 
-            RelayLoginResponse loginResponse = relayLoginRequest.getResponse();
-            previousLogin = loginResponse;
-            OpenAudioMc.getService(UploadIndexService.class).setContent(loginResponse.getFiles());
+            previousLogin = relayLoginRequest.getResponse();
+            OpenAudioMc.getService(UploadIndexService.class).setContent(previousLogin.getFiles());
         }
 
         if (previousLogin == null) {
-            OpenAudioMc.getService(StateService.class).setState(new IdleState("Failed to get a relay instance"));
-            OpenAudioLogger.warn("Entered a track which should only be entered during recovery, but there was no previous login. reconnect: " + isReconnect + " attempt: " + attempt);
+            OpenAudioMc.getService(StateService.class)
+                    .setState(new IdleState("Failed to get a relay instance"));
+            OpenAudioLogger.warn("Recovery path hit without previous login");
             return;
         }
 
         try {
-            String endpoint = previousLogin.getRelayEndpoint();
-            endpoint = endpoint.replace("https", "http");
+            String endpoint = previousLogin.getRelayEndpoint().replace("https", "http");
             socket = IO.socket(endpoint, opts);
         } catch (URISyntaxException e) {
             OpenAudioLogger.error(e, "Received an invalid endpoint");
+            return;
         }
 
-        // this should again, only be done if we're not reconnecting
         if (!isReconnect) {
-            // register state to be connecting
             OpenAudioMc.getService(StateService.class).setState(new ConnectingState());
-
-            // clear session cache
             OpenAudioMc.getService(AuthenticationService.class).getDriver().initCache();
         }
 
-        // schedule timeout check
         OpenAudioMc.resolveDependency(TaskService.class).schduleSyncDelayedTask(() -> {
-            // was it a normal connection?
             if (OpenAudioMc.getService(StateService.class).getCurrentState() instanceof ConnectingState) {
                 OpenAudioLogger.warn("Connect timed out.");
-                OpenAudioMc.getService(StateService.class).setState(new IdleState("Connecting to the assigned instance timed out (socket)"));
+                OpenAudioMc.getService(StateService.class)
+                        .setState(new IdleState("Connecting to the assigned instance timed out (socket)"));
             }
 
-            // alternatively, check if we're still in the same reconnect cycle
             if (OpenAudioMc.getService(StateService.class).getCurrentState() instanceof ReconnectingState) {
                 ReconnectingState state = (ReconnectingState) OpenAudioMc.getService(StateService.class).getCurrentState();
                 if (state.getStateId().equals(stateId) && state.getAttempts() == attempt) {
@@ -185,9 +192,9 @@ public void setupConnection() {
             }
         }, 20 * 35);
 
-
-        // register drivers
-        for (SocketDriver driver : drivers) driver.boot(socket, this);
+        for (SocketDriver driver : drivers) {
+            driver.boot(socket, this);
+        }
 
         socket.connect();
     }
@@ -196,22 +203,22 @@ public void disconnect() {
         if (relayLogoutRequest != null) {
             relayLogoutRequest.run();
         }
-        if (this.socket != null) {
-            // let them know that we intend to shut down
+        if (socket != null) {
             systemDriver.setAnnouncedShutdown(true);
-            this.socket.emit("announce-shutdown", "goodbye");
-            this.socket.disconnect();
+            socket.emit("announce-shutdown", "goodbye");
+            socket.disconnect();
         }
         OpenAudioMc.getService(StateService.class).setState(new IdleState());
-        OpenAudioMc.getService(OpenaudioAccountService.class).getVoiceApiConnection().stop();
+        OpenAudioMc.getService(OpenaudioAccountService.class)
+                .getVoiceApiConnection()
+                .stop();
     }
 
     public void send(Authenticatable client, AbstractPacket packet) {
-        // only send the packet if the client is online, valid and the plugin is connected
-        if (client.isConnected() && OpenAudioMc.getService(StateService.class).getCurrentState().isConnected()) {
+        if (client.isConnected() &&
+                OpenAudioMc.getService(StateService.class).getCurrentState().isConnected()) {
             packet.setClient(client.getOwner().getUniqueId());
             socket.emit("data", OpenAudioMc.getGson().toJson(packet));
         }
     }
-
 }