Merge pull request #411 from Mindgamesnl/feature/auto-reconnect

Feature/auto reconnect

client/public/en.lang

@@ -143,4 +143,6 @@ settings.interpolation.title=Location smoothing
 settings.interpolation.body=Automatically smooth movements to minimize speaker/voicechat stuttering while walking. This adds extra movement delay, but sounds better.
 settings.interpolation.button=Enable smoothing
 
+network.serverUnhealthy={serverName}'s connection to OpenAudioMc is unhealthy, client functionality may be limited until the connection is restored.
+
 tooltip.close=Close

client/public/metadata.json

@@ -1 +1 @@
-{"buildMajor":1,"buildMinor":125,"buildRevision":214,"buildTag":"dev","buildDate":"Mon Feb 19 2024","build":"1.125.214 dev"}
+{"buildMajor":1,"buildMinor":125,"buildRevision":221,"buildTag":"dev","buildDate":"Wed Feb 21 2024","build":"1.125.221 dev"}

client/src/client/services/socket/SocketModule.jsx

@@ -53,6 +53,14 @@ export const SocketManager = new class ISocketManager {
       TimeService.sync(timeStamp, hoursOffset);
     });
 
+    this.socket.on('server-reconnecting', () => {
+      setGlobalState({ isServerHealthy: false });
+    });
+
+    this.socket.on('server-reconnected', () => {
+      setGlobalState({ isServerHealthy: true });
+    });
+
     this.socket.on('disconnect', () => {
       MediaManager.destroySounds(null, true);
 

client/src/components/connectionwarning/ServerConnectionWarning.jsx

@@ -0,0 +1,28 @@
+import { connect } from 'react-redux';
+import React from 'react';
+import { msg } from '../../client/OpenAudioAppContainer';
+
+function ServerConnectionWarning(props) {
+  if (props.isServerHealthy) {
+    return null;
+  }
+
+  const message = msg('network.serverUnhealthy').replace('{serverName}', props.settings.serverDisplayName || 'the server');
+
+  return (
+    <div className="pb-4">
+      <div className="bg-red-500 border border-red-400 text-white font-extrabold px-4 py-3 rounded relative flex justify-center" role="alert">
+        <span className="block">{message}</span>
+      </div>
+    </div>
+  );
+}
+
+export default connect(mapStateToProps)(ServerConnectionWarning);
+
+function mapStateToProps(state) {
+  return {
+    isServerHealthy: state.isServerHealthy,
+    settings: state.settings,
+  };
+}

client/src/components/tabwindow/TabWindow.jsx

@@ -5,6 +5,7 @@ import { connect } from 'react-redux';
 import { showTextModal } from '../modal/InputModal';
 import { setGlobalState } from '../../state/store';
 import { msg } from '../../client/OpenAudioAppContainer';
+import ServerConnectionWarning from '../connectionwarning/ServerConnectionWarning';
 
 export const setTab = (tab) => {
   setGlobalState({
@@ -57,6 +58,7 @@ class TabWindow extends Component {
       <div className="flex flex-col-reverse bg-gray-800 bg-opacity-25 text-white h-screen w-screen">
         <main className="flex justify-center overflow-x-hidden overflow-y-auto w-full h-full backdrop-blur">
           <div className="content-wrapper">
+            <ServerConnectionWarning />
             {pages[this.props.currentTab].content}
           </div>
         </main>

client/src/metadata.json

@@ -1 +1 @@
-{"buildMajor":1,"buildMinor":125,"buildRevision":214,"buildTag":"dev","buildDate":"Mon Feb 19 2024","build":"1.125.214 dev"}
+{"buildMajor":1,"buildMinor":125,"buildRevision":221,"buildTag":"dev","buildDate":"Wed Feb 21 2024","build":"1.125.221 dev"}

client/src/state/store.jsx

@@ -28,6 +28,7 @@ const initialState = {
 
   isPremium: false,
   isClaimed: false,
+  isServerHealthy: true,
   clientSupportsVoiceChat: false, // not valid https
   browserSupportsVoiceChat: false, // no webrtc at all
   browserSupportIsLimited: false, // operagx, broken settings?

modules/vistas-server/dependency-reduced-pom.xml

@@ -174,12 +174,6 @@
       <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>

plugin/src/main/bash/data.bin

@@ -1 +1 @@
-BUILD_NUM="1309"
+BUILD_NUM="1386"

plugin/src/main/java/com/craftmend/openaudiomc/OpenAudioMc.java

@@ -176,11 +176,11 @@ public void disable() {
         serviceManager.getService(ModuleLoaderService.class).fire(ModuleEvent.SHUTDOWN);
 
         try {
-            serviceManager.getService(OpenaudioAccountService.class).shutdown();
-            serviceManager.getService(RedisService.class).shutdown();
             if (serviceManager.getService(StateService.class).getCurrentState().isConnected()) {
                 serviceManager.getService(NetworkingService.class).stop();
             }
+            serviceManager.getService(OpenaudioAccountService.class).shutdown();
+            serviceManager.getService(RedisService.class).shutdown();
         } catch (NoClassDefFoundError exception) {
             OpenAudioLogger.warn("Core dependencies were already unloaded by the classloader, skipping shutdown");
         }

plugin/src/main/java/com/craftmend/openaudiomc/generic/commands/CommandService.java

@@ -159,7 +159,7 @@ public List<String> getTabCompletions(CommandContext context, String[] args, Use
         try {
             Set<String> completions = new HashSet<>();
             for (String subCommand : getSubCommands(context)) {
-                if (args.length <= 1 && subCommand.startsWith(args[0])) {
+                if (args.length <= 1 && subCommand.toLowerCase(Locale.ROOT).startsWith(args[0].toLowerCase(Locale.ROOT))) {
                     // Not typing yet, add the entire damn thing
                     completions.add(subCommand);
                 }
@@ -180,6 +180,7 @@ public List<String> getTabCompletions(CommandContext context, String[] args, Use
                     int localArgIndex = args.length - 2;
 
                     boolean isMatch = true;
+
                     for (int i = 0; i < localArgIndex; i++) {
                         if (args.length - 1 < i + 1 || argumentSyntaxParts.length < i + 1) {
                             isMatch = false;

plugin/src/main/java/com/craftmend/openaudiomc/generic/networking/DefaultNetworkingService.java

@@ -6,6 +6,7 @@
 import com.craftmend.openaudiomc.generic.authentication.AuthenticationService;
 import com.craftmend.openaudiomc.generic.client.helpers.SerializableClient;
 import com.craftmend.openaudiomc.generic.client.objects.ClientConnection;
+import com.craftmend.openaudiomc.generic.networking.queue.PacketQueue;
 import com.craftmend.openaudiomc.generic.oac.OpenaudioAccountService;
 import com.craftmend.openaudiomc.generic.environment.MagicValue;
 import com.craftmend.openaudiomc.generic.logging.OpenAudioLogger;
@@ -22,6 +23,7 @@
 import com.craftmend.openaudiomc.generic.platform.interfaces.TaskService;
 import com.craftmend.openaudiomc.generic.proxy.interfaces.UserHooks;
 import com.craftmend.openaudiomc.generic.state.StateService;
+import com.craftmend.openaudiomc.generic.state.states.ReconnectingState;
 import com.craftmend.openaudiomc.generic.user.User;
 import com.craftmend.openaudiomc.spigot.OpenAudioMcSpigot;
 import com.craftmend.openaudiomc.spigot.modules.proxy.enums.OAClientMode;
@@ -37,6 +39,7 @@ public class DefaultNetworkingService extends NetworkingService {
     private final Set<INetworkingEvents> eventHandlers = new HashSet<>();
     private final Map<UUID, ClientConnection> clientMap = new ConcurrentHashMap<>();
     private final Map<PacketChannel, PayloadHandler<?>> packetHandlerMap = new HashMap<>();
+    private final PacketQueue packetQueue = new PacketQueue();
     private SocketConnection socketConnection;
     private int packetThroughput = 0;
 
@@ -99,7 +102,7 @@ private void init() {
                         20, 20);
 
         try {
-            socketConnection = new SocketConnection(OpenAudioMc.getService(AuthenticationService.class).getServerKeySet());
+            socketConnection = new SocketConnection(getService(AuthenticationService.class).getServerKeySet(), this);
         } catch (Exception e) {
             OpenAudioLogger.error(e, "The plugin was unable to start because of a connection problem when requesting the initial private key. Please contact support in https://discord.openaudiomc.net/");
         }
@@ -129,6 +132,20 @@ public void connectIfDown() {
     @Override
     public void send(Authenticatable client, AbstractPacket packet) {
         for (INetworkingEvents event : getEvents()) event.onPacketSend(client, packet);
+
+        // are we in a compromised state?
+        if (getService(StateService.class).getCurrentState() instanceof ReconnectingState) {
+            // is this packet important?
+            if (packet.isQueueableIfReconnecting()) {
+                // we need to queue it
+                packetQueue.addPacket(client.getOwner().getUniqueId(), packet);
+                return;
+            } else {
+                // drop this packet
+                return;
+            }
+        }
+
         socketConnection.send(client, packet);
     }
 
@@ -259,4 +276,11 @@ public void addEventHandler(INetworkingEvents events) {
         eventHandlers.add(events);
     }
 
+    public void discardQueue() {
+        this.packetQueue.clearAll();
+    }
+
+    public void flushQueue() {
+        this.packetQueue.flush(this);
+    }
 }

plugin/src/main/java/com/craftmend/openaudiomc/generic/networking/abstracts/AbstractPacket.java

@@ -1,6 +1,5 @@
 package com.craftmend.openaudiomc.generic.networking.abstracts;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -9,7 +8,6 @@
 
 @Getter
 @NoArgsConstructor
-@AllArgsConstructor
 public class AbstractPacket {
 
     /**
@@ -21,4 +19,12 @@ public class AbstractPacket {
     private PacketChannel packetChannel;
     @Setter private UUID client;
 
+    public AbstractPacket(AbstractPacketPayload data, PacketChannel packetChannel, UUID client) {
+        this.data = data;
+        this.packetChannel = packetChannel;
+        this.client = client;
+    }
+
+    protected transient boolean queueableIfReconnecting = false;
+
 }