Fix websocket handling

Lila-Kuhlt · May 24, 2024 · 8c1b926 · 8c1b926
1 parent 9de649d
commit 8c1b926
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/liberica/src/lib/bindings.ts b/liberica/src/lib/bindings.ts
@@ -5,7 +5,7 @@
  */
 export type Stop = { name: string; id: string; lat: number; lon: number }
 
-export type ClientResponse = { GameState: GameState } | { MrXGadget: MrXGadget } | { DetectiveGadget: DetectiveGadget } | { MrXPosition: MrXPosition } | "GameStart" | "DetectiveStart" | "GameEnd"
+export type ClientResponse = { GameState: GameState } | { MrXGadget: MrXGadget } | { DetectiveGadget: DetectiveGadget } | { MrXPosition: MrXPosition } | { GameStart: null } | { DetectiveStart: null } | { GameEnd: null }
 
 export type MrXGadget = { AlternativeFacts: { stop_id: string } } | { Midjourney: { image: number[] } } | "NotFound" | "Teleport" | "Shifter"
 

diff --git a/robusta/src/main.rs b/robusta/src/main.rs
@@ -595,9 +595,9 @@ async fn broadcast(connections: &[ClientConnection], message: ClientResponse) {
                 ClientResponse::MrXPosition(_) => "Mr. X position",
                 ClientResponse::MrXGadget(_) => "Mr. X gadget",
                 ClientResponse::DetectiveGadget(_) => "Detective gadget",
-                ClientResponse::GameStart => "game start",
-                ClientResponse::DetectiveStart => "detective start",
-                ClientResponse::GameEnd => "game end",
+                ClientResponse::GameStart() => "game start",
+                ClientResponse::DetectiveStart() => "detective start",
+                ClientResponse::GameEnd() => "game end",
             };
             error!("failed to send {} to client {}: {}", message_type, connection.id, err);
         }
@@ -625,12 +625,12 @@ impl RunningState {
 }
 
 async fn start_game(connections: &[ClientConnection], running_state: &mut RunningState) {
-    broadcast(connections, ClientResponse::GameStart).await;
+    broadcast(connections, ClientResponse::GameStart()).await;
     running_state.position_cooldown = Some(COOLDOWN);
 }
 
 async fn end_game(connections: &[ClientConnection], running_state: &mut RunningState) {
-    broadcast(connections, ClientResponse::GameEnd).await;
+    broadcast(connections, ClientResponse::GameEnd()).await;
     *running_state = RunningState::new();
 }
 
@@ -653,7 +653,7 @@ async fn run_timer_loop(state: SharedState, running_state: Arc<tokio::sync::Mute
                     let state = state.lock().await;
                     running_state.position_cooldown = Some(COOLDOWN);
                     if warmup {
-                        broadcast(&state.connections, ClientResponse::DetectiveStart).await;
+                        broadcast(&state.connections, ClientResponse::DetectiveStart()).await;
                         warmup = false;
                         running_state.mr_x_gadgets.allow_use();
                         running_state.detective_gadgets.allow_use();

diff --git a/robusta/src/ws_message.rs b/robusta/src/ws_message.rs
@@ -20,9 +20,9 @@ pub enum ClientResponse {
     MrXGadget(MrXGadget),
     DetectiveGadget(DetectiveGadget),
     MrXPosition(MrXPosition),
-    GameStart,
-    DetectiveStart,
-    GameEnd,
+    GameStart(),
+    DetectiveStart(),
+    GameEnd(),
 }
 
 #[derive(specta::Type, Clone, Serialize, Deserialize, Debug)]