Keep Alive & Master fallback

backend/src/main/java/fr/zelytra/session/SessionManager.java

@@ -102,24 +102,33 @@ public Fleet joinSession(String sessionId, Player player) {
      * @param player The player to remove from their session.
      */
     public void leaveSession(Player player) {
-        for (Fleet fleet : sessions.values()) {
 
-            SotServer sotServer = getSotServerFromPlayer(player);
-            if (sotServer != null) {
-                playerLeaveSotServer(player, sotServer);
-            }
+        Fleet fleet = getFleetByPlayerName(player.getUsername());
 
-            fleet.getPlayers().remove(player);
-            fleet.getServers().forEach((key, value) -> value.getConnectedPlayers().remove(player));
-            SessionSocket.broadcastDataToSession(fleet.getSessionId(), MessageType.UPDATE, fleet);
-            Log.info("[" + fleet.getSessionId() + "] " + player.getUsername() + " Leave the session !");
+        SotServer sotServer = getSotServerFromPlayer(player);
+        if (sotServer != null) {
+            playerLeaveSotServer(player, sotServer);
+        }
 
-            // Clean empty session
-            if (fleet.getPlayers().isEmpty()) {
-                sessions.remove(fleet.getSessionId());
-                Log.info("[" + fleet.getSessionId() + "] Has been disbanded");
-            }
+        fleet.getPlayers().remove(player);
+        fleet.getServers().forEach((key, value) -> value.getConnectedPlayers().remove(player));
+
+        // Check if player was master, then give another user the master role
+        if (player.isMaster() && !fleet.getPlayers().isEmpty()) {
+            Player newMaster = fleet.getPlayers().get(0);
+            newMaster.setMaster(true);
+            Log.info("[" + fleet.getSessionId() + "] Master as left, giving the role to " + newMaster.getUsername());
         }
+
+        SessionSocket.broadcastDataToSession(fleet.getSessionId(), MessageType.UPDATE, fleet);
+        Log.info("[" + fleet.getSessionId() + "] " + player.getUsername() + " Leave the session !");
+
+        // Clean empty session
+        if (fleet.getPlayers().isEmpty()) {
+            sessions.remove(fleet.getSessionId());
+            Log.info("[" + fleet.getSessionId() + "] Has been disbanded");
+        }
+
     }
 
     /**

backend/src/main/java/fr/zelytra/session/SessionSocket.java

@@ -77,6 +77,7 @@ public void onMessage(String message, Session session, @PathParam("sessionId") S
             }
             case START_COUNTDOWN -> handleStartCountdown(session);
             case CLEAR_STATUS -> handleClearStatus(session);
+            case KEEP_ALIVE -> {}
             case JOIN_SERVER -> {
                 SotServer sotServer = objectMapper.convertValue(socketMessage.data(), SotServer.class);
                 handleJoinServerMessage(session, sotServer);
@@ -146,8 +147,7 @@ private void handleConnectMessage(Player player, Session session, String session
             }
             return;
         }
-
-        session.setMaxIdleTimeout(3600000); // 1h of timeout
+        session.setMaxIdleTimeout(30000); // 1h of timeout
 
         SessionManager manager = SessionManager.getInstance();
         player.setSocket(session);
@@ -168,8 +168,6 @@ private void handleConnectMessage(Player player, Session session, String session
                 broadcastDataToSession(sessionId, MessageType.UPDATE, fleet);
             }
         }
-
-
     }
 
     // Extracted method to handle LEAVE messages

backend/src/main/java/fr/zelytra/session/socket/MessageType.java

@@ -9,5 +9,6 @@ public enum MessageType {
     LEAVE_SERVER,
     CLEAR_STATUS,
     OUTDATED_CLIENT,
-    SESSION_NOT_FOUND
+    SESSION_NOT_FOUND,
+    KEEP_ALIVE,
 }

webapp/src/components/Fleet.vue

@@ -52,7 +52,6 @@ const gameStatusRefresh: number = setInterval(() => {
   })
 }, 400);
 
-
 onUnmounted(() => {
   if (UserStore.player.fleet) {
     UserStore.player.fleet.leaveSession();

webapp/src/components/fleet/FleetLobby.vue

@@ -14,7 +14,7 @@
               <img src="@/assets/icons/clipboard.svg" alt="copy-button"
                    @click="copyIdToClipboard(session.sessionId.toUpperCase())"/>
               <transition>
-                <p v-if="displayIdCopy">{{ t('session.idCopy')}}</p>
+                <p v-if="displayIdCopy">{{ t('session.idCopy') }}</p>
               </transition>
             </div>
           </div>
@@ -29,7 +29,7 @@
     </BannerTemplate>
     <div class="lobby-content">
       <div class="player-table">
-        <ServerContainer v-if="computedsession.servers.size > 0" v-for="[hash,server] of session.servers.entries()"
+        <ServerContainer v-if="computedSession.servers.size > 0" v-for="[hash,server] of session.servers.entries()"
                          :server="hash+' | '+server.location">
           <PlayerFleet
               v-for="player in server.connectedPlayers.sort((a, b) => {
@@ -90,7 +90,7 @@
 </template>
 
 <script setup lang="ts">
-import {computed, PropType, ref} from "vue";
+import {computed, onUnmounted, PropType, ref} from "vue";
 import {Fleet} from "@/objects/Fleet.ts";
 import PlayerFleet from "@/vue/fleet/PlayerFleet.vue";
 import {useI18n} from "vue-i18n";
@@ -108,13 +108,23 @@ const props = defineProps({
   },
 });
 
+const keepAlive: number = setInterval(() => {
+  if (props.session) {
+    props.session.sendKeepAlive()
+  }
+}, 30000)
+
+onUnmounted(() => {
+  clearInterval(keepAlive)
+})
+
 function updateStatus() {
   UserStore.player.isReady = !UserStore.player.isReady;
   props.session.updateToSession();
 }
 
 defineEmits(["update:selected-value"]);
-const computedsession = computed({
+const computedSession = computed({
   get: (): Fleet => props.session,
   set: (): void => {
   },
@@ -131,14 +141,14 @@ function startSession() {
 function getFilteredPlayerList() {
   const removedPlayer: string[] = [];
   for (const player of props.session!.players) {
-    computedsession.value.servers.forEach((value, _key) => {
+    computedSession.value.servers.forEach((value, _key) => {
       if (value.connectedPlayers.filter(x => x.username == player.username).length > 0) {
         removedPlayer.push(player.username)
         return;
       }
     })
   }
-  return computedsession.value.players.filter(x => !removedPlayer.includes(x.username)).sort((a, b) => {
+  return computedSession.value.players.filter(x => !removedPlayer.includes(x.username)).sort((a, b) => {
     return a.isMaster === b.isMaster ? 0 : a.isMaster ? -1 : 1;
   })
 }
@@ -181,7 +191,7 @@ function copyIdToClipboard(id: string) {
         cursor: pointer;
       }
 
-      p{
+      p {
         font-family: BrushTip, sans-serif;
         font-size: 20px;
         font-weight: 400;

webapp/src/objects/Fleet.ts

@@ -192,6 +192,15 @@ export class Fleet {
     return this.players.filter((player) => player.isReady);
   }
 
+  sendKeepAlive(){
+    if (!this.socket) return;
+    const message: WebSocketMessage = {
+      data: null,
+      messageType: WebSocketMessageType.KEEP_ALIVE,
+    };
+    this.socket.send(JSON.stringify(message));
+  }
+
   public static getFormatedStatus(player: Player) {
     return player.status.toString().toLowerCase().replace("_", "-");
   }

webapp/src/objects/WebSocet.ts

@@ -12,5 +12,6 @@ export enum WebSocketMessageType {
   JOIN_SERVER = "JOIN_SERVER",
   LEAVE_SERVER = "LEAVE_SERVER",
   OUTDATED_CLIENT = "OUTDATED_CLIENT",
-  SESSION_NOT_FOUND = "SESSION_NOT_FOUND"
+  SESSION_NOT_FOUND = "SESSION_NOT_FOUND",
+  KEEP_ALIVE = "KEEP_ALIVE"
 }

webapp/src/objects/stores/UserStore.ts

@@ -22,7 +22,6 @@ export const UserStore = reactive({
 
     if (!this.player.clientVersion) {
       this.player.clientVersion = import.meta.env.VITE_VERSION;
-      console.log(this.player.clientVersion)
     }
 
     //@ts-ignore I18N typescript implementation