From d1fb9d4cedf31d13b5935bce6d1694fd9205a616 Mon Sep 17 00:00:00 2001
From: Knut Ahlers <knut@ahlers.me>
Date: Wed, 21 Aug 2024 20:04:49 +0200
Subject: [PATCH] Drop inactive instances after timeout

in order to no longer show them in the answers list after they left the
game

closes #5
---
 src/app.vue   | 23 ++++++++++++++++++-----
 src/config.ts |  3 +++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/app.vue b/src/app.vue
index d9236ff..cc8d1e9 100644
--- a/src/app.vue
+++ b/src/app.vue
@@ -133,7 +133,7 @@
 </template>
 
 <script lang="ts">
-import { categories, gameSocketTemplate } from './config'
+import { categories, gameSocketTemplate, instanceTimeout } from './config'
 import { defineComponent } from 'vue'
 
 const baseBackoff = 100 // ms
@@ -141,6 +141,11 @@ const maxBackoff = 10000 // ms
 
 export default defineComponent({
   computed: {
+    activeInstances(): any {
+      return Object.fromEntries(Object.entries(this.knownInstances)
+        .filter((e: any[]) => this.now.getTime() - e[1].lastActive < instanceTimeout))
+    },
+
     answersGiven(): Object {
       const keys: string[] = []
       for (const cat of this.gameState.categories) {
@@ -150,9 +155,9 @@ export default defineComponent({
       }
 
       return Object.fromEntries(keys.map(key => [
-        key, Object.keys(this.knownInstances).map(instId => ({
-          answer: this.knownInstances[instId].answers[key],
-          name: this.knownInstances[instId].name,
+        key, Object.keys(this.activeInstances).map(instId => ({
+          answer: this.activeInstances[instId].answers[key],
+          name: this.activeInstances[instId].name,
         })),
       ]))
     },
@@ -169,6 +174,7 @@ export default defineComponent({
 
     this.knownInstances[this.instance] = {
       answers: {},
+      lastActive: new Date().getTime(),
       name: this.name,
     }
   },
@@ -189,6 +195,7 @@ export default defineComponent({
       knownInstances: {} as any,
       localAnswers: {} as any,
       name: '',
+      now: new Date(),
     }
   },
 
@@ -312,7 +319,10 @@ export default defineComponent({
     },
 
     sendPing(): void {
-      this.sendMessage({ instanceState: this.knownInstances[this.instance], type: 'ping' })
+      this.sendMessage({ instanceState: {
+        ...this.knownInstances[this.instance],
+        lastActive: new Date().getTime(),
+      }, type: 'ping' })
     },
 
     shuffle(list: Array<any>): Array<any> {
@@ -364,6 +374,9 @@ export default defineComponent({
     this.connectToGame()
 
     window.setInterval(() => this.sendPing(), 10000)
+    window.setInterval(() => {
+      this.now = new Date()
+    }, 1000)
   },
 
   name: 'StadtLandFlussApp',
diff --git a/src/config.ts b/src/config.ts
index 1b66160..aabb303 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -34,7 +34,10 @@ const categories: string[] = [
 
 const gameSocketTemplate: string = 'wss://tools.hub.luzifer.io/ws/slf-{gameId}'
 
+const instanceTimeout: number = 30000 // ms
+
 export {
   categories,
   gameSocketTemplate,
+  instanceTimeout,
 }