From 2f4944db1002e1214db83eefb112a7b04a3eb4ef Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Thu, 25 Apr 2019 15:31:57 +1000
Subject: [PATCH] instance lists

---
 client/src/components/menu.component.jsx |  9 +++----
 client/src/components/menu.container.jsx |  5 ++--
 client/src/socket.jsx                    | 14 +++++-----
 phaser-client/src/scenes/home.js         |  2 +-
 phaser-client/src/socket.js              | 14 +++++-----
 server/src/account.rs                    | 19 +++++++++-----
 server/src/instance.rs                   | 33 +++++++++++++++++++-----
 server/src/rpc.rs                        | 12 ++++-----
 8 files changed, 67 insertions(+), 41 deletions(-)

diff --git a/client/src/components/menu.component.jsx b/client/src/components/menu.component.jsx
index 03dd167f..c83b9d62 100644
--- a/client/src/components/menu.component.jsx
+++ b/client/src/components/menu.component.jsx
@@ -17,6 +17,7 @@ const COLOURS = [
 
 function Menu(args) {
     const {
+        account,
         cryps,
         selectedCryps,
         setSelectedCryps,
@@ -31,14 +32,12 @@ function Menu(args) {
         if (!instances) return <div>...</div>;
 
         const instancePanels = instances.map(instance => {
-            const globalInstance = instance.instance === NULL_UUID;
-            const name = globalInstance
-                ? 'Global Matchmaking'
-                : `${instance.instance.substring(0, 5)} | ${instance.score.wins} : ${instance.score.losses}`;
+            const player = instance.players.find(p => p.account === account.id);
+            const name = `${instance.name} | ${player.score.wins} : ${player.score.losses}`;
 
             return (
                 <button
-                    className={`menu-instance-btn right ${globalInstance ? 'full' : ''}`}
+                    className={'menu-instance-btn right'}
                     key={instance.id}
                     onClick={() => sendInstanceState(instance)}>
                     {name}
diff --git a/client/src/components/menu.container.jsx b/client/src/components/menu.container.jsx
index dfd5b567..4e4f9c1f 100644
--- a/client/src/components/menu.container.jsx
+++ b/client/src/components/menu.container.jsx
@@ -5,7 +5,7 @@ const actions = require('./../actions');
 
 const addState = connect(
     function receiveState(state) {
-        const { ws, cryps, selectedCryps, instances } = state;
+        const { ws, cryps, selectedCryps, instances, account } = state;
 
         function sendInstanceJoin() {
             if (selectedCryps.length) {
@@ -26,10 +26,11 @@ const addState = connect(
         }
 
         function sendInstanceState(instance) {
-            return ws.sendInstanceState(instance.instance);
+            return ws.sendInstanceState(instance.id);
         }
 
         return {
+            account,
             cryps,
             selectedCryps,
             sendInstanceJoin,
diff --git a/client/src/socket.jsx b/client/src/socket.jsx
index 721bc284..f0ba9108 100644
--- a/client/src/socket.jsx
+++ b/client/src/socket.jsx
@@ -50,8 +50,8 @@ function createSocket(events) {
         send({ method: 'account_cryps', params: {} });
     }
 
-    function sendAccountPlayers() {
-        send({ method: 'account_players', params: {} });
+    function sendAccountInstances() {
+        send({ method: 'account_instances', params: {} });
     }
 
     function sendAccountZone() {
@@ -171,10 +171,10 @@ function createSocket(events) {
         localStorage.setItem('account', JSON.stringify(login));
         events.setAccount(login);
         sendAccountCryps();
-        sendAccountPlayers();
+        sendAccountInstances();
     }
 
-    function accountPlayerList(res) {
+    function accountInstanceList(res) {
         const [struct, playerList] = res;
         events.setInstanceList(playerList);
     }
@@ -229,7 +229,7 @@ function createSocket(events) {
         account_login: accountLogin,
         account_create: accountLogin,
         account_cryps: accountCryps,
-        account_players: accountPlayerList,
+        account_instances: accountInstanceList,
         instance_scores: instanceScores,
         zone_create: res => console.log(res),
         zone_state: zoneState,
@@ -285,7 +285,7 @@ function createSocket(events) {
 
             if (account) {
                 events.setAccount(account);
-                sendAccountPlayers();
+                sendAccountInstances();
                 sendAccountCryps();
             }
 
@@ -319,7 +319,7 @@ function createSocket(events) {
         sendAccountCreate,
         sendAccountDemo,
         sendAccountCryps,
-        sendAccountPlayers,
+        sendAccountInstances,
         sendAccountZone,
         sendGameState,
         sendGameJoin,
diff --git a/phaser-client/src/scenes/home.js b/phaser-client/src/scenes/home.js
index ae96e772..175fa4a4 100644
--- a/phaser-client/src/scenes/home.js
+++ b/phaser-client/src/scenes/home.js
@@ -27,7 +27,7 @@ class Home extends Phaser.Scene {
     }
 
     create() {
-        this.registry.get('ws').sendAccountPlayers();
+        this.registry.get('ws').sendAccountInstances();
 
         this.registry.events.on('changedata', this.updateData, this);
         this.registry.events.on('setdata', this.updateData, this);
diff --git a/phaser-client/src/socket.js b/phaser-client/src/socket.js
index 1f5960a3..df705042 100644
--- a/phaser-client/src/socket.js
+++ b/phaser-client/src/socket.js
@@ -45,8 +45,8 @@ function createSocket(events) {
         send({ method: 'account_cryps', params: {} });
     }
 
-    function sendAccountPlayers() {
-        send({ method: 'account_players', params: {} });
+    function sendAccountInstances() {
+        send({ method: 'account_instances', params: {} });
     }
 
     function sendAccountZone() {
@@ -168,9 +168,9 @@ function createSocket(events) {
         sendAccountCryps();
     }
 
-    function accountPlayerList(res) {
-        const [struct, playerList] = res;
-        events.setPlayerList(playerList);
+    function accountInstanceList(res) {
+        const [struct, instanceList] = res;
+        events.setInstanceList(instanceList);
     }
 
     function accountCryps(response) {
@@ -221,7 +221,7 @@ function createSocket(events) {
         account_login: accountLogin,
         account_create: accountLogin,
         account_cryps: accountCryps,
-        account_players: accountPlayerList,
+        account_instances: accountInstanceList,
         instance_scores: instanceScores,
         zone_create: res => console.log(res),
         zone_state: zoneState,
@@ -302,7 +302,7 @@ function createSocket(events) {
         sendAccountCreate,
         sendAccountDemo,
         sendAccountCryps,
-        sendAccountPlayers,
+        sendAccountInstances,
         sendAccountZone,
         sendGameState,
         sendGamePve,
diff --git a/server/src/account.rs b/server/src/account.rs
index b961ef52..e1e53cde 100644
--- a/server/src/account.rs
+++ b/server/src/account.rs
@@ -10,7 +10,7 @@ use postgres::transaction::Transaction;
 use rpc::{AccountCreateParams, AccountLoginParams};
 
 use cryp::{Cryp, cryp_recover};
-use player::{Player, player_delete};
+use instance::{Instance, instance_delete};
 
 use failure::Error;
 use failure::err_msg;
@@ -177,11 +177,16 @@ pub fn account_cryps(tx: &mut Transaction, account: &Account) -> Result<Vec<Cryp
     return Ok(cryps);
 }
 
-pub fn account_players(tx: &mut Transaction, account: &Account) -> Result<Vec<Player>, Error> {
+pub fn account_instances(tx: &mut Transaction, account: &Account) -> Result<Vec<Instance>, Error> {
     let query = "
         SELECT data, id
-        FROM players
-        WHERE account = $1;
+        FROM instances
+        WHERE open = true
+        OR id IN (
+            SELECT instance
+            FROM players
+            WHERE account = $1
+        );
     ";
 
     let result = tx
@@ -193,15 +198,15 @@ pub fn account_players(tx: &mut Transaction, account: &Account) -> Result<Vec<Pl
         let bytes: Vec<u8> = row.get(0);
         let id = row.get(1);
 
-        match from_slice::<Player>(&bytes) {
+        match from_slice::<Instance>(&bytes) {
             Ok(i) => list.push(i),
             Err(_e) => {
-                player_delete(tx, id)?;
+                instance_delete(tx, id)?;
             }
         };
     }
 
-    list.sort_by_key(|c| c.instance);
+    list.sort_unstable_by_key(|c| c.name.clone());
 
     return Ok(list);
 }
\ No newline at end of file
diff --git a/server/src/instance.rs b/server/src/instance.rs
index d1c5cdec..136cbd85 100644
--- a/server/src/instance.rs
+++ b/server/src/instance.rs
@@ -41,7 +41,7 @@ pub struct Instance {
     open: bool,
     max_players: usize,
     password: Option<String>,
-    name: String,
+    pub name: String,
 }
 
 impl Instance {
@@ -141,7 +141,7 @@ impl Instance {
                     self.start();
                 }
             },
-            InstancePhase::Vbox =>
+            InstancePhase::Vbox => {
                 if self.all_ready() {
                     self.games_phase_start();
                 }
@@ -306,7 +306,10 @@ impl Instance {
                     game = game.start();
 
                     assert!(game.finished());
-                    let winner = game.winner().unwrap();
+                    let winner = match game.winner() {
+                        Some(w) => w,
+                        None => panic!("game has no winner {:?}", game),
+                    };
 
                     round.finished = true;
 
@@ -479,6 +482,25 @@ pub fn instance_get(tx: &mut Transaction, instance_id: Uuid) -> Result<Instance,
     return Ok(instance);
 }
 
+pub fn instance_delete(tx: &mut Transaction, id: Uuid) -> Result<(), Error> {
+    let query = "
+        DELETE
+        FROM instances
+        WHERE id = $1;
+    ";
+
+    let result = tx
+        .execute(query, &[&id])?;
+
+    if result != 1 {
+        return Err(format_err!("unable to delete instance {:?}", id));
+    }
+
+    println!("instance deleted {:?}", id);
+
+    return Ok(());
+}
+
 pub fn instance_get_open(tx: &mut Transaction) -> Result<Instance, Error> {
     let query = "
         SELECT *
@@ -511,7 +533,6 @@ pub fn instance_lobby(params: InstanceLobbyParams, tx: &mut Transaction, account
     instance_join(join_params, tx, account)
 }
 
-
 pub fn instance_join(params: InstanceJoinParams, tx: &mut Transaction, account: &Account) -> Result<Instance, Error> {
     let mut instance = instance_get(tx, params.instance_id)?;
 
@@ -557,9 +578,9 @@ pub fn instance_scores(params: InstanceReadyParams, tx: &mut Transaction, _accou
 }
 
 pub fn instance_ready(params: InstanceReadyParams, tx: &mut Transaction, account: &Account) -> Result<Instance, Error> {
-    let player = player_get(tx, account.id, params.instance_id)?;
     let mut instance = instance_get(tx, params.instance_id)?;
-    instance.player_ready(player.id)?;
+    let player_id = instance.account_player(account.id)?.id;
+    instance.player_ready(player_id)?;
 
     instance_update(tx, instance)
 }
diff --git a/server/src/rpc.rs b/server/src/rpc.rs
index 93e19189..e3fc3ffb 100644
--- a/server/src/rpc.rs
+++ b/server/src/rpc.rs
@@ -17,7 +17,7 @@ use failure::err_msg;
 use net::Db;
 use cryp::{Cryp, cryp_spawn};
 use game::{Game, game_state, game_skill};
-use account::{Account, account_create, account_login, account_from_token, account_cryps, account_players};
+use account::{Account, account_create, account_login, account_from_token, account_cryps, account_instances};
 use skill::{Skill};
 // use zone::{Zone, zone_create, zone_join, zone_close};
 use spec::{Spec};
@@ -64,7 +64,7 @@ impl Rpc {
 
                     // auth methods
                     "account_cryps" => Rpc::account_cryps(data, &mut tx, account.unwrap(), client),
-                    "account_players" => Rpc::account_players(data, &mut tx, account.unwrap(), client),
+                    "account_instances" => Rpc::account_instances(data, &mut tx, account.unwrap(), client),
                     // "account_zone" => Rpc::account_zone(data, &mut tx, account.unwrap(), client),
 
                     "cryp_spawn" => Rpc::cryp_spawn(data, &mut tx, account.unwrap(), client),
@@ -210,10 +210,10 @@ impl Rpc {
         })
     }
 
-    fn account_players(_data: Vec<u8>, tx: &mut Transaction, account: Account, _client: &mut WebSocket<TcpStream>) -> Result<RpcResponse, Error> {
+    fn account_instances(_data: Vec<u8>, tx: &mut Transaction, account: Account, _client: &mut WebSocket<TcpStream>) -> Result<RpcResponse, Error> {
         Ok(RpcResponse {
-            method: "account_players".to_string(),
-            params: RpcResult::PlayerList(account_players(tx, &account)?)
+            method: "account_instances".to_string(),
+            params: RpcResult::InstanceList(account_instances(tx, &account)?)
         })
     }
 
@@ -391,7 +391,7 @@ pub enum RpcResult {
     // ZoneState(Zone),
     // ZoneClose(()),
 
-    PlayerList(Vec<Player>),
+    InstanceList(Vec<Instance>),
     InstanceState(Instance),
 }