state advancer reducer

jong-line/src/lib.rs

@@ -1,15 +1,9 @@
 use log::debug;
 use spacetimedb::{ReducerContext, Table, reducer};
 
-use jong_types::TurnState;
-
 use crate::tables::*;
 
-mod reducers {
-    mod deal;
-    mod hand;
-    mod lobby;
-}
+mod reducers;
 mod tables;
 
 #[reducer]
@@ -32,27 +26,40 @@ pub fn clear_all(ctx: &ReducerContext) {
 }
 
 #[reducer(client_connected)]
-pub fn login_or_add_player(ctx: &ReducerContext) {
-    let identity = ctx.sender;
-
-    // TODO remove player on disconnect
-    if let Ok(player) = ctx.db.player().try_insert(Player {
-        identity,
-        id: 0,
-        name: None,
-        lobby_id: 0,
-        ready: false,
-        sort: true,
-        hand: vec![],
-        pond: vec![],
-        drawn_tile: None,
-        turn_state: TurnState::None,
-    }) {
-        debug!("added player: {:?}", player);
+pub fn connect(ctx: &ReducerContext) -> Result<(), String> {
+    let player = if let Some(player) = ctx.db.logged_out_player().identity().find(ctx.sender) {
+        let player = ctx.db.player().insert(player);
+        ctx.db.logged_out_player().identity().delete(ctx.sender);
+        player
     } else {
-        let player = ctx.db.player().identity().find(identity).unwrap();
-        debug!("player {:?} has reconnected", player)
-    }
+        ctx.db.player().try_insert(Player {
+            identity: ctx.sender,
+            id: 0,
+            name: None,
+            lobby_id: 0,
+            ready: false,
+            sort: true,
+        })?
+    };
+
+    debug!("player connected: {:?}", player);
+
+    Ok(())
+}
+
+#[reducer(client_disconnected)]
+pub fn disconnect(ctx: &ReducerContext) -> Result<(), String> {
+    let player = ctx
+        .db
+        .player()
+        .identity()
+        .find(ctx.sender)
+        .ok_or_else(|| format!("can't find player {}", ctx.sender))?;
+
+    ctx.db.logged_out_player().insert(player);
+    ctx.db.player().identity().delete(ctx.sender);
+
+    Ok(())
 }
 
 // #[reducer(init)]
@@ -65,11 +72,6 @@ pub fn login_or_add_player(ctx: &ReducerContext) {
 //     // Called everytime a new client connects
 // }
 
-// #[reducer(client_disconnected)]
-// pub fn identity_disconnected(_ctx: &ReducerContext) {
-//     // Called everytime a client disconnects
-// }
-
 // #[reducer]
 // pub fn add(ctx: &ReducerContext, name: String) {
 // ctx.db.player().insert(Player { name });