Support new game topic formats

Author: Wirewraith

app/Jobs/GetPlayerCounts.php

@@ -41,7 +41,7 @@ public function handle()
             $response = GameBridge::server($server)
                 ->force(true)
                 ->priority('high')
-                ->players();
+                ->ping();
             $playerCount = $response->failed() ? null : $response->asNumber();
             $playersOnline = new PlayersOnline;
             $playersOnline->timestamps = false;

app/Services/GameBridge/Server.php

@@ -74,6 +74,18 @@ public function priority(string $priority): self
         return $this;
     }
 
+    /**
+     * Ping the server, returns player count
+     */
+    public function ping(): GameBridgeResponse
+    {
+        if (! $this->priority) {
+            $this->priority = 'low';
+        }
+
+        return $this->send('ping');
+    }
+
     /**
      * Get server status
      */
@@ -87,15 +99,15 @@ public function status(): GameBridgeResponse
     }
 
     /**
-     * Get player count
+     * Get player list
      */
-    public function players(): GameBridgeResponse
+    public function who(): GameBridgeResponse
     {
         if (! $this->priority) {
             $this->priority = 'low';
         }
 
-        return $this->send('players');
+        return $this->send('who');
     }
 
     /**

app/Services/GameBridge/ServerCollection.php

@@ -77,6 +77,18 @@ public function priority(string $priority): self
         return $this;
     }
 
+    /**
+     * Ping all servers, returns player count
+     */
+    public function ping(): Collection
+    {
+        if (! $this->priority) {
+            $this->priority = 'low';
+        }
+
+        return $this->send('ping');
+    }
+
     /**
      * Get status from all servers
      */
@@ -90,15 +102,15 @@ public function status(): Collection
     }
 
     /**
-     * Get player count from all servers
+     * Get player list from all servers
      */
-    public function players(): Collection
+    public function who(): Collection
     {
         if (! $this->priority) {
             $this->priority = 'low';
         }
 
-        return $this->send('players');
+        return $this->send('who');
     }
 
     /**

resources/js/Pages/Home/Partials/ServerStatus.vue

@@ -23,7 +23,7 @@
           <div v-if="error">&nbsp;</div>
           <q-skeleton type="text" v-else-if="loading" width="100%" />
           <template v-else>
-            <span>{{ $formats.capitalize(status.mode) }} Mode</span>
+            <span>{{ $formats.capitalize(status.mode || 'Secret') }} Mode</span>
             <q-separator vertical color="grey" class="q-mx-sm q-my-xs" />
             <span>{{ status.players }} players</span>
             <q-separator vertical color="grey" class="q-mx-sm q-my-xs" />
@@ -167,16 +167,18 @@ export default {
 
   computed: {
     isPreRound() {
-      return this.status?.elapsed === 'pre'
+      // GAME_STATE_PREGAME = 5
+      return parseInt(this.status.gamestate) <= 5
     },
 
     isPostRound() {
-      return this.status?.elapsed === 'post'
+      // GAME_STATE_FINISHED = 8
+      return parseInt(this.status.gamestate) === 8
     },
 
     roundTime() {
-      if (!this.status.elapsed || this.isPreRound) return 0
-      return dayjs.duration(parseInt(this.status.elapsed), 'seconds').format('H[h] m[m]')
+      if (!this.status.round_duration || this.isPreRound) return 0
+      return dayjs.duration(parseInt(this.status.round_duration), 'seconds').format('H[h] m[m]')
     },
 
     mapId() {
@@ -214,6 +216,11 @@ export default {
         preserveState: false,
         onCancelToken: (cancelToken) => (this.cancelToken = cancelToken),
         onSuccess: (page) => {
+          if (page.props.status.error) {
+            this.error = true
+            this.status = {}
+            return
+          }
           this.status = page.props.status
         },
         onError: () => {
@@ -240,8 +247,8 @@ export default {
     cleanup() {
       if (this.cleaned) return
       this.cleaned = true
-      this.cancelToken && this.cancelToken.cancel()
-      this.refreshTimer && clearTimeout(this.refreshTimer)
+      if (this.cancelToken) this.cancelToken.cancel()
+      if (this.refreshTimer) clearTimeout(this.refreshTimer)
     },
   },
 }

resources/views/open-graph/home.blade.php

@@ -77,18 +77,22 @@
         </div>
         @else
         <div class="status__details">
-          <span>{{ Str::ucfirst($server['status']['mode']) }}</span>
+          <span>
+            {{ Str::ucfirst(isset($server['status']['mode']) ? $server['status']['mode'] : 'Secret') }}
+          </span>
           <span class="text-primary">
             {{ $server['status']['players'] }}
             player{{ (int) $server['status']['players'] === 1 ? '' : 's' }}
           </span>
           <span>
-            @if ($server['status']['elapsed'] === 'pre')
+            {{-- GAME_STATE_PREGAME = 5 --}}
+            @if ((int) $server['status']['gamestate'] <= 5)
             Lobby
-            @elseif ($server['status']['elapsed'] === 'post')
+            {{-- GAME_STATE_FINISHED = 8 --}}
+            @elseif ((int) $server['status']['gamestate'] === 8)
             Ended
             @else
-            {{ date("G\h i\m", (int) $server['status']['elapsed']) }}
+            {{ date("G\h i\m", (int) $server['status']['round_duration']) }}
             @endif
           </span>
           @isset ($server['status']['map_name'])