feat: Enhance user state management with polling and WebSocket connection handling

ci: bump version to v0.19.0
feat: Update joinGame endpoint to accept gameId as a path parameter
2026-01-07 21:43:17 +01:00 · 2026-01-07 16:00:15 +00:00 · 2026-01-07 16:56:34 +01:00 · 2026-01-07 13:37:03 +00:00 · 2026-01-07 14:33:44 +01:00 · 2026-01-07 14:33:34 +01:00
13 changed files with 222 additions and 31 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -115,3 +115,33 @@
 * **ui:** FRO-34 Lobby ([#21](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/21)) ([bb6355d](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/bb6355d9ed6745b4852a52040d880ee1dcc6d797))
 * **ui:** FRO-5 Animation Card Played ([#23](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/issues/23)) ([70a44fd](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/70a44fd1ea119d43f875e6cfac56fb25747d8913))
 ## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.14.0...0.0.0) (2026-01-06)
 ### Features
 * Enhance win effects and animations in OfflineView component ([db5c70d](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/db5c70d02a646b83ba6e4043e28fc0dc9f76fb04))
 * Enhance win effects and animations in OfflineView component ([8aa0738](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/8aa07388ac27fbb13270fde58b1594688ec44fe7))
 * Enhance win effects and animations in OfflineView component ([6b3eaf2](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/6b3eaf2c706b2ea479aa7ba508b05adb4bab2db4))
 ## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.15.0...0.0.0) (2026-01-06)
 ### Features
 * Update Dockerfile for multi-platform support and add nginx configuration ([e972f1c](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/e972f1c4321ec2633e2989dbdaa714774632c495))
 * Update Dockerfile for multi-platform support and add nginx configuration ([37b88a1](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/37b88a108c71e20fc2caee950acd23cf2bb81190))
 ## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.16.0...0.0.0) (2026-01-06)
 ## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.16.1...0.0.0) (2026-01-07)
 ## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.16.2...0.0.0) (2026-01-07)
 ### Features
 * Add caching headers for env.js in Nginx configuration ([93e5af7](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/93e5af7402edb9fb9662e37d9b2b8c48d250c36e))
 ## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.17.0...0.0.0) (2026-01-07)
 ### Features
 * Add caching headers for env.js in Nginx configuration ([d8b3904](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/d8b3904cbc8b08ed9522d7b9b4fa8af79bc75def))
 ## [0.0.0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/compare/0.18.0...0.0.0) (2026-01-07)
 ### Features
 * Update joinGame endpoint to accept gameId as a path parameter ([92a7bc0](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Frontend/commit/92a7bc05866b77053ebb1d074ad207be8348f9d6))
--- a/6
+++ b/6
@@ -1,4 +1,4 @@
-FROM node:lts-alpine3.23 AS builder
+FROM --platform=$BUILDPLATFORM node:lts-alpine3.23 AS builder
 WORKDIR /app
@@ -9,13 +9,15 @@ RUN npm install
 COPY . .
 RUN npm run build
-FROM nginx:stable-alpine AS production
+FROM --platform=$TARGETPLATFORM nginx:stable-alpine AS production
 RUN apk add --no-cache gettext
 RUN rm -rf /usr/share/nginx/html/*
 COPY --from=builder /app/dist /usr/share/nginx/html
 COPY nginx.conf /etc/nginx/conf.d/default.conf
 COPY public/env.template.js /usr/share/nginx/html/env.template.js
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
    <meta charset="UTF-8">
    <link rel="icon" href="/favicon.ico">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Vite App</title>
+    <title>Knockout-Whist</title>
  </head>
  <body>
    <div id="app"></div>
--- a/nginx.conf
+++ b/nginx.conf
@@ -0,0 +1,22 @@
 server {
    listen       80;
    server_name  localhost;
    location / {
        root   /usr/share/nginx/html;
        index  index.html index.htm;
        try_files $uri $uri/ /index.html;
    }
    location /env.js {
        root /usr/share/nginx/html;
        default_type application/javascript;
        expires -1;
        add_header 'Cache-Control' 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
    }
    error_page   500 502 503 504  /50x.html;
    location = /50x.html {
        root   /usr/share/nginx/html;
    }
 }
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,8 +1,16 @@
 <script setup lang="ts">
 import { RouterView } from 'vue-router'
-import { onMounted, onUnmounted } from 'vue';
+import { onMounted, onUnmounted, watch } from 'vue';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { useUserInfo } from "@/composables/useUserInfo";
 import { useIngame } from "@/composables/useIngame";
 import { storeToRefs } from "pinia";
 import { useWebSocket } from "@/composables/useWebsocket";
 import { useQuasar } from "quasar";
 const route = useRoute();
 const router = useRouter();
 const info = useUserInfo();
 const handleOnlineStatusChange = () => {
  if (navigator.onLine) {
@@ -11,12 +19,84 @@ const handleOnlineStatusChange = () => {
    }
  }
 };
 let interval: number | null = null;
 onMounted(() => {
  window.addEventListener('online', handleOnlineStatusChange);
  // Continuously check user state every 10 seconds
  interval = window.setInterval(async () => {
    if (navigator.onLine && route.name !== 'login' && route.name !== 'offline') {
      await info.requestState();
      if (!info.username && route.name !== 'login') {
        router.push({ name: 'login' });
      }
    }
  }, 10000);
 });
 onUnmounted(() => {
  window.removeEventListener('online', handleOnlineStatusChange);
  if (interval) {
    clearInterval(interval);
  }
 });
 watch(() => info.gameId, (newGameId) => {
  if (newGameId && route.name !== 'game') {
    router.push({ name: 'game' });
  }
 });
 const ig = useIngame()
 const { isWsConnected } = storeToRefs(ig)
 const wb = useWebSocket()
 const $q = useQuasar();
 watch(isWsConnected, (connected) => {
  if (!connected && info.gameId && route.name === 'game') {
    showReconnectDialog();
  }
 });
 function showReconnectDialog() {
  $q.dialog({
    title: 'Connection Lost',
    message: 'The connection to the game server was lost. Would you like to reconnect?',
    persistent: true,
    ok: {
      label: 'Reconnect',
      color: 'positive'
    },
    cancel: {
      label: 'Quit',
      color: 'negative'
    }
  }).onOk(() => {
    reconnect();
  }).onCancel(() => {
    router.replace("/");
  });
 }
 async function reconnect() {
  try {
    await wb.connect();
    $q.notify({
      message: 'Reconnected successfully!',
      color: 'positive',
      icon: 'check'
    });
  } catch (err) {
    $q.notify({
      message: 'Failed to reconnect. Please try again.',
      color: 'negative',
      icon: 'error'
    });
    showReconnectDialog();
  }
 }
 </script>
 <template>
--- a/src/composables/useIngame.ts
+++ b/src/composables/useIngame.ts
@@ -9,12 +9,17 @@ const api = window?.__RUNTIME_CONFIG__?.API_URL;
 export const useIngame = defineStore('ingame', () => {
  const state: Ref<'Lobby' | 'InGame' | 'SelectTrump' | 'TieBreak' | 'FinishedMatch' | null> = ref(null);
  const data: Ref<GameInfo | LobbyInfo | TieInfo | TrumpInfo | WonInfo | null> = ref(null);
  const isWsConnected: Ref<boolean> = ref(false);
  function setIngame(newState: 'Lobby' | 'InGame' | 'SelectTrump' | 'TieBreak' | 'FinishedMatch', newData: GameInfo | LobbyInfo | TieInfo | TrumpInfo | WonInfo) {
    state.value = newState;
    data.value = newData;
  }
  function setWsConnected(connected: boolean) {
    isWsConnected.value = connected;
  }
  async function requestGame(gameId: string) {
    await axios.get(`${api}/status/${gameId}`, {withCredentials: true}).then((response) => {
      setIngame(response.data.state, response.data.data);
@@ -24,7 +29,8 @@ export const useIngame = defineStore('ingame', () => {
  function clearIngame() {
    state.value = null;
    data.value = null;
    isWsConnected.value = false;
  }
-  return { state, data, requestGame, setIngame, clearIngame };
+  return { state, data, isWsConnected, requestGame, setIngame, clearIngame, setWsConnected };
 });
--- a/src/composables/useUserInfo.ts
+++ b/src/composables/useUserInfo.ts
@@ -21,10 +21,19 @@ export const useUserInfo = defineStore('userInfo', () => {
  async function requestState() {
    await axios.get(`${api}/status`, {withCredentials: true}).then((response) => {
      console.log("STATUS DATA:" + response.data.status + response.data.inGame)
-      username.value = response.data.username;
+      if (response.data.status === 'authenticated') {
-      if (response.data.gameId) {
+        username.value = response.data.username;
-        console.log("GAMEID:" + response.data.gameId)
+        userId.value = response.data.userId;
-        gameId.value = response.data.gameId;
+        if (response.data.gameId) {
          console.log("GAMEID:" + response.data.gameId)
          gameId.value = response.data.gameId;
        } else {
          gameId.value = null;
        }
      } else {
        username.value = null;
        userId.value = null;
        gameId.value = null;
      }
    })
  }
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -73,8 +73,12 @@ router.beforeEach(async (to, from, next) => {
    if (isOnline) {
      try {
-        const response = await axios.get(`${api}/userInfo`, { withCredentials: true });
+        await info.requestState();
-        info.setUserInfo(response.data.username, response.data.userId);
+
        if (!info.username) {
          info.clearUserInfo();
          return next('/login');
        }
        return next({ name: 'mainmenu' });
@@ -92,11 +96,17 @@ router.beforeEach(async (to, from, next) => {
  if (!to.meta.requiresAuth) return next();
  try {
-    await axios.get(`${api}/userInfo`, { withCredentials: true }).then(
+    await info.requestState();
-      res => {
+
-        info.setUserInfo(res.data.username, res.data.userId);
+    if (!info.username) {
-      }
+      info.clearUserInfo();
-    );
+      return next('/login');
    }
    if (info.gameId && to.name !== 'game') {
      return next({ name: 'game' });
    }
    next();
  } catch (err) {
      info.clearUserInfo();
--- a/src/services/ws.ts
+++ b/src/services/ws.ts
@@ -160,14 +160,15 @@ function setupSocketHandlers(socket: WebSocket) {
    stopHeartbeat();
    failAllPending("WebSocket closed");
    if (uState) {
      uState.setWsConnected(false);
    }
    if (ev.wasClean) {
      console.log(`[WS] Closed cleanly: code=${ev.code} reason=${ev.reason}`);
    } else {
      console.warn("[WS] Connection died");
    }
    // You redirect here — if you don’t want auto reconnect, keep as is.
    router.replace("/");
  };
 }
@@ -191,6 +192,9 @@ export function connectWebSocket(url?: string): Promise<void> {
      const prevOnError = ws!.onerror;
      ws!.onopen = (ev) => {
        if (prevOnOpen) prevOnOpen.call(ws!, ev);
        if (uState) {
          uState.setWsConnected(true);
        }
        resolve();
      };
      ws!.onerror = (err) => {
@@ -207,6 +211,9 @@ export function connectWebSocket(url?: string): Promise<void> {
  return new Promise((resolve, reject) => {
    ws!.onopen = () => {
      console.log("[WS] Connected");
      if (uState) {
        uState.setWsConnected(true);
      }
      startHeartbeat();
      resolve();
    };
@@ -224,6 +231,9 @@ export function disconnectWebSocket(code = 1000, reason = "Client disconnect") {
      ws.close(code, reason);
    } catch {}
    ws = null;
    if (uState) {
      uState.setWsConnected(false);
    }
  }
 }
--- a/src/views/CreateGame.vue
+++ b/src/views/CreateGame.vue
@@ -3,6 +3,7 @@ import { ref } from 'vue';
 import { useQuasar } from 'quasar';
 import { useRouter } from 'vue-router';
 import axios from "axios";
 import {useUserInfo} from "@/composables/useUserInfo";
 const api = window?.__RUNTIME_CONFIG__?.API_URL;
 const lobbyName = ref('');
@@ -11,13 +12,14 @@ const playerAmount = ref(2);
 const $q = useQuasar();
 const isLoading = ref(false);
 const router = useRouter();
 const info = useUserInfo();
 const createGameQuasar = async () => {
  if (!lobbyName.value) {
    $q.notify({ message: 'Lobby-Name wird benötigt', color: 'red', position: 'top', icon: 'cancel' });
    return;
  }
  isLoading.value = true;
-  axios.post(`${api}/createGame`, {lobbyname: lobbyName.value, playeramount: playerAmount.value.toString()}, {withCredentials: true}).then((response) => {
+  axios.post(`${api}/createGame`, {lobbyname: lobbyName.value, playeramount: playerAmount.value.toString()}, {withCredentials: true}).then(async (response) => {
    const responseData = response.data
    console.log("Response" + responseData.status)
    $q.notify({
@@ -26,12 +28,12 @@ const createGameQuasar = async () => {
      icon: 'check_circle',
      position: 'top'
    });
    await info.requestState();
    router.replace("/game")
  }).catch((err) => {
    console.log("ERROR:" + err)
  }).finally(() =>
    isLoading.value = false
-  )
+  })
 }
 </script>
--- a/src/views/Game.vue
+++ b/src/views/Game.vue
@@ -7,6 +7,7 @@ import LobbyComponent from "@/components/lobby/LobbyComponent.vue";
 import {storeToRefs} from "pinia";
 import {useQuasar} from "quasar";
 import router from "@/router";
 import {ref, watch} from "vue";
 const wb = useWebSocket()
 const ig = useIngame()
@@ -20,7 +21,6 @@ ui.requestState().then(() => {
    $q.notify({
      message: "You're not in any game!",
      color: "negative"
    })
    router.replace("/")
  } else {
--- a/src/views/JoinGameView.vue
+++ b/src/views/JoinGameView.vue
@@ -1,28 +1,49 @@
 <script setup lang="ts">
-import {ref} from "vue";
+import {ref, onUnmounted} from "vue";
 import { useRouter } from 'vue-router';
 import {useQuasar} from "quasar";
 import axios from "axios";
 import {useUserInfo} from "@/composables/useUserInfo";
 const router = useRouter();
 const info = useUserInfo();
 const lobbyCode = ref('');
 const isLoading = ref(false);
 const $q = useQuasar();
 const api = window?.__RUNTIME_CONFIG__?.API_URL;
 let pollInterval: number | null = null;
 onUnmounted(() => {
  if (pollInterval) {
    clearInterval(pollInterval);
  }
 });
 const startGameQuasar = async() => {
  if (!lobbyCode.value) {
    $q.notify({ message: 'Lobby-Name wird benötigt', color: 'red', position: 'top', icon: 'cancel' });
    return;
  }
  isLoading.value = true;
-  axios.post(`${api}/joinGame`, {gameId: lobbyCode.value.toString()}, {withCredentials: true}).then(response => {
+  axios.post(`${api}/joinGame/${lobbyCode.value.toString()}`, {}, {withCredentials: true}).then(() => {
    const responseData = response.data
    $q.notify({
      message: `Lobby "${lobbyCode.value}" erfolgreich gefunden`,
      color: 'green-6',
      icon: 'check_circle',
      position: 'top'
    });
-    router.replace("/game")
+
    // Start polling until gameId is set
    pollInterval = window.setInterval(async () => {
      await info.requestState();
      if (info.gameId) {
        if (pollInterval) {
          clearInterval(pollInterval);
          pollInterval = null;
        }
      }
    }, 100);
  }).catch(() => {
    $q.notify({
      message: `Lobby "${lobbyCode.value}" nicht gefunden`,
@@ -30,9 +51,8 @@ const startGameQuasar = async() => {
      icon: 'cancel',
      position: 'top'
    })
  }).finally(() =>
    isLoading.value = false
-  )
+  })
 }
 </script>
--- a/versions.env
+++ b/versions.env
@@ -1,3 +1,3 @@
 MAJOR=0
-MINOR=14
+MINOR=19
 PATCH=0
Author	SHA1	Message	Date
Janis	02869fff8b	feat: Enhance user state management with polling and WebSocket connection handling	2026-01-07 21:43:17 +01:00
TeamCity	ef073afd5e	ci: bump version to v0.19.0	2026-01-07 16:00:15 +00:00
Janis	92a7bc0586	feat: Update joinGame endpoint to accept gameId as a path parameter	2026-01-07 16:56:34 +01:00
TeamCity	352b7fd3ff	ci: bump version to v0.18.0	2026-01-07 13:37:03 +00:00
Janis	3a62fbc129	Merge remote-tracking branch 'origin/main'	2026-01-07 14:33:44 +01:00
Janis	d8b3904cbc	feat: Add caching headers for env.js in Nginx configuration	2026-01-07 14:33:34 +01:00
TeamCity	c1960a4e33	ci: bump version to v0.17.0	2026-01-07 13:21:19 +00:00
Janis	93e5af7402	feat: Add caching headers for env.js in Nginx configuration	2026-01-07 14:18:32 +01:00
TeamCity	fa900a3b56	ci: bump version to v0.16.2	2026-01-07 11:51:38 +00:00
TeamCity	862be6eaff	ci: bump version to v0.16.1	2026-01-06 14:43:07 +00:00
TeamCity	8541af95f2	ci: bump version to v0.16.0	2026-01-06 14:26:03 +00:00
Janis	e972f1c432	feat: Update Dockerfile for multi-platform support and add nginx configuration	2026-01-06 15:23:33 +01:00
Janis	37b88a108c	feat: Update Dockerfile for multi-platform support and add nginx configuration	2026-01-06 15:21:19 +01:00
TeamCity	91b54d67fa	ci: bump version to v0.15.0	2026-01-06 11:09:38 +00:00