Fix RTC in online mode

ntnui-darts · Jan 30, 2024 · 95b449e · 95b449e
1 parent 4283562
commit 95b449e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 25 deletions.
diff --git a/src/components/MainGame.vue b/src/components/MainGame.vue
@@ -52,6 +52,7 @@
     <component
       v-if="showInput"
       :is="getInputComponent(game.type)"
+      :game="game"
       @hit="emit('hit', $event)"
       @miss="emit('miss')"
       @undo="emit('undo')"

diff --git a/src/components/RtcGameInput.vue b/src/components/RtcGameInput.vue
@@ -1,11 +1,6 @@
 <template>
   <div
-    v-if="
-      gameStore.game
-        ? getTypeAttribute < Boolean > (gameStore.game, 'fast', false)
-        : false
-    "
-    div
+    v-if="game ? getTypeAttribute < Boolean > (game, 'fast', false) : false"
     class="row"
     style="justify-content: space-between"
   >
@@ -20,23 +15,25 @@
     </button>
   </div>
   <div class="row" style="height: 12em">
-    <button @click="registerMiss()">&#10008;</button>
-    <button @click="registerHit()">&#10004;</button>
+    <button @click="registerMiss">&#10008;</button>
+    <button @click="registerHit">&#10004;</button>
   </div>
   <button @click="emit('undo')">&#x232B;</button>
 </template>
 
 <script lang="ts" setup>
-import { useGameStore } from '@/stores/game'
 import {
+  Game,
   Multiplier,
   Segment,
   getTypeAttribute,
   multiplierToString,
 } from '@/types/game'
 import { ref } from 'vue'
 
-const gameStore = useGameStore()
+const props = defineProps<{
+  game: Game
+}>()
 
 const emit = defineEmits<{
   hit: [segment: Segment]
@@ -45,7 +42,7 @@ const emit = defineEmits<{
 }>()
 
 const getDefaultMultiplier = () =>
-  gameStore.game ? getTypeAttribute<Multiplier>(gameStore.game, 'mode', 1) : 1
+  props.game ? getTypeAttribute<Multiplier>(props.game, 'mode', 1) : 1
 
 const selectedMultiplier = ref(getDefaultMultiplier())
 
@@ -55,7 +52,6 @@ const registerMiss = () => {
 }
 
 const registerHit = () => {
-  if (!gameStore.game) throw Error()
   emit('hit', { multiplier: selectedMultiplier.value, sector: -1 })
   selectedMultiplier.value = getDefaultMultiplier()
 }

diff --git a/src/stores/online.ts b/src/stores/online.ts
@@ -45,21 +45,22 @@ export const useOnlineStore = defineStore('online', {
       this.outChannel = supabase
         .channel(`game-${userId}`)
         .on('broadcast', { event: 'input' }, (args) => {
+          console.log(args)
           const gameStore = useGameStore()
-          const gameController = gameStore.getController()
           const player = gameStore.gameState?.player
-          if (args.payload.userId == player) {
-            switch (args.payload.type) {
-              case 'hit':
-                gameController.recordHit(args.payload.segment)
-                break
-              case 'miss':
-                gameController.recordMiss()
-                break
-              case 'undo':
-                gameStore.undoScore()
-                break
-            }
+          if (args.payload.userId != player) return
+
+          const gameController = gameStore.getController()
+          switch (args.payload.type) {
+            case 'hit':
+              gameController.recordHit(args.payload.segment)
+              break
+            case 'miss':
+              gameController.recordMiss()
+              break
+            case 'undo':
+              gameStore.undoScore()
+              break
           }
         })
         .on('broadcast', { event: 'refresh' }, () => {