Exclude reconnect query if disabled

Mindgamesnl · Feb 23, 2024 · e89cc97 · e89cc97
1 parent d46be36
commit e89cc97
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 26 deletions.
diff --git a/modules/vistas-server/dependency-reduced-pom.xml b/modules/vistas-server/dependency-reduced-pom.xml
@@ -174,6 +174,12 @@
       <artifactId>junit</artifactId>
       <version>4.13.2</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>hamcrest-core</artifactId>
+          <groupId>org.hamcrest</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
   <properties>

diff --git a/plugin/src/main/bash/data.bin b/plugin/src/main/bash/data.bin
@@ -1 +1 @@
-BUILD_NUM="1397"
+BUILD_NUM="1400"
diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/generic/networking/io/SocketConnection.java b/plugin/src/main/java/com/craftmend/openaudiomc/generic/networking/io/SocketConnection.java
@@ -23,6 +23,7 @@
 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 io.socket.client.IO;
 import io.socket.client.Socket;
@@ -102,13 +103,20 @@ public void setupConnection() {
         opts.forceNew = true;
         opts.rememberUpgrade = false;
 
-        // authentication headers
-        opts.query = String.format(
-                "type=server&private=%s&public=%s&reconnect=%s",
-                keySet.getPrivateKey().getValue(),
-                keySet.getPublicKey().getValue(),
-                isReconnect ? "true" : "false"
-        );
+        if (StorageKey.SETTINGS_AUTO_RECONNECT.getBoolean()) {
+            opts.query = String.format(
+                    "type=server&private=%s&public=%s&reconnect=%s",
+                    keySet.getPrivateKey().getValue(),
+                    keySet.getPublicKey().getValue(),
+                    isReconnect ? "true" : "false"
+            );
+        } else {
+            opts.query = String.format(
+                    "type=server&private=%s&public=%s",
+                    keySet.getPrivateKey().getValue(),
+                    keySet.getPublicKey().getValue()
+            );
+        }
 
         // only do login handling if we're not reconnecting, because then we'd be re-using the same config
         if (!isReconnect) {

diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/generic/voicechat/bus/VoiceSocket.java b/plugin/src/main/java/com/craftmend/openaudiomc/generic/voicechat/bus/VoiceSocket.java
@@ -6,6 +6,7 @@
 import com.craftmend.openaudiomc.generic.rest.RestRequest;
 import com.craftmend.openaudiomc.generic.rest.response.NoResponse;
 import com.craftmend.openaudiomc.generic.rest.routes.Endpoint;
+import com.craftmend.openaudiomc.generic.storage.enums.StorageKey;
 import lombok.Getter;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -43,12 +44,16 @@ public VoiceSocket(String server, String password, boolean isReconnectAttempt) {
 
     public boolean start() {
         // check if connections are allowed
-        RestRequest preAuthCheck = new RestRequest(NoResponse.class, Endpoint.VOICE_PREFLIGHT_CHECK);
+        RestRequest<NoResponse> preAuthCheck = new RestRequest<>(NoResponse.class, Endpoint.VOICE_PREFLIGHT_CHECK);
         AuthenticationService authenticationService = OpenAudioMc.getService(AuthenticationService.class);
         preAuthCheck.setQuery("publicKey", authenticationService.getServerKeySet().getPublicKey().getValue());
         preAuthCheck.setQuery("privateKey", authenticationService.getServerKeySet().getPrivateKey().getValue());
         preAuthCheck.setQuery("password", this.password);
-        preAuthCheck.setQuery("reconnect", String.valueOf(this.isReconnectAttempt));
+
+        if (StorageKey.SETTINGS_AUTO_RECONNECT.getBoolean()) {
+            preAuthCheck.setQuery("reconnect", String.valueOf(this.isReconnectAttempt));
+        }
+
         preAuthCheck.setBaseUrl(this.server);
         preAuthCheck.run();
 
@@ -59,13 +64,18 @@ public boolean start() {
         }
 
         // translate url to websocket
-        String ebUri = new RestRequest<>(NoResponse.class, Endpoint.VOICE_BUS)
+        RestRequest<NoResponse> urlBuilder = new RestRequest<>(NoResponse.class, Endpoint.VOICE_BUS)
                 .setQuery("publicKey", authenticationService.getServerKeySet().getPublicKey().getValue())
                 .setQuery("privateKey", authenticationService.getServerKeySet().getPrivateKey().getValue())
-                .setQuery("password", this.password)
-                .setQuery("reconnect", String.valueOf(this.isReconnectAttempt))
-                .setBaseUrl(this.server)
-                .buildURL();
+                .setQuery("password", this.password);
+
+        if (StorageKey.SETTINGS_AUTO_RECONNECT.getBoolean()) {
+            urlBuilder.setQuery("reconnect", String.valueOf(this.isReconnectAttempt));
+        }
+
+        urlBuilder.setBaseUrl(this.server);
+
+        String ebUri = urlBuilder.buildURL();
 
         ebUri = ebUri.replace("http", "ws"); // https:// => wss:// and http:// => ws://
 

diff --git a/plugin/src/main/java/com/craftmend/openaudiomc/spigot/OpenAudioMcSpigot.java b/plugin/src/main/java/com/craftmend/openaudiomc/spigot/OpenAudioMcSpigot.java
@@ -143,14 +143,6 @@ public void onEnable() {
             OpenAudioLogger.error(e, "A fatal error occurred while enabling OpenAudioMc. The plugin will now disable itself.");
             Bukkit.getServer().getPluginManager().disablePlugin(this);
         }
-
-        getServer().getScheduler().scheduleSyncRepeatingTask(this, () -> {
-            StateService stateService = OpenAudioMc.getService(StateService.class);
-            if (stateService.getCurrentState().canConnect()) {
-                OpenAudioLogger.debug("COnnecting from loop...");
-                OpenAudioMc.getService(NetworkingService.class).connectIfDown();
-            }
-        }, 30 * 20, 30 * 20);
     }
 
     /**

diff --git a/plugin/src/main/resources/data.bin b/plugin/src/main/resources/data.bin
@@ -1 +1 @@
-BUILD_NUM="1397"
+BUILD_NUM="1400"
diff --git a/plugin/src/main/resources/openaudiomc-build.properties b/plugin/src/main/resources/openaudiomc-build.properties
@@ -1,3 +1,3 @@
-BUILD_VERSION="1397"
-BUILD_COMMIT="492d368d6b912f0f8b02892644baee64bbc4a3af"
+BUILD_VERSION="1400"
+BUILD_COMMIT="d46be3657f6a32f5a9b33ccba19238354246d040"
 BUILD_AUTHOR="Mats"