X-Git-Url: http://git.purplebirdman.com/go.git/blobdiff_plain/c333cf27ccfa279f10a2e5f86f67c3a26b0e2875..1ab140d932b72040eb3b32af2f7fb367b6401805:/socket/server.js?ds=sidebyside

diff --git a/socket/server.js b/socket/server.js
index 7aeb30d..017bebd 100644
--- a/socket/server.js
+++ b/socket/server.js
@@ -9,67 +9,78 @@ function sleep(ms) {
 }
 
 async function pollStatefulChange(ws, session_id) {
-    let conn;
-    try {
-        conn = await db.pool.getConnection();
-        var lastUpdated = 0;
-        while(true) {
-            var res = await conn.query(`
-select UNIX_TIMESTAMP(MAX(updated_at)) as last_updated
-from go.state
-where session_id = ?;
-            `, [session_id]);
-            console.log(res);
-            let updatedAt = res[0].last_updated;
-            if ( updatedAt > lastUpdated) {
-                console.log("websocket poll: board updated!");
+    var lastUpdated  = 0;
+    var rowCount = 0;
+    while (true) {
+        try {
+            var res = await db.getMaxUpdatedState(session_id);
+            var newRowCount = res[0].num_rows;
+            var updatedAt = res[0].last_updated;
+
+            // update board state of client if more moves
+            // have been added since max last timestamp
+            // If more moves have been added in <1 sec,
+            // use the row count for the max last updated timestamp
+            if (updatedAt > lastUpdated || rowCount < newRowCount) {
                 lastUpdated = updatedAt;
-                res = await db.getBoardState(session_id);
+                rowCount = newRowCount;
                 ws.send(JSON.stringify({
                     "type": "board",
-                    "data": res
+                    "data": await db.getBoardState(session_id)
                 }));
             }
             await sleep(1000);
+        } catch(err) {
+            console.log(`websocket poll error: ${err}`);
         }
-    } catch(err) {
-        console.log(`websocket poll error: ${err}`);
-    } finally {
-        if (conn) conn.end();
-    } 
+    }
 }
 
 app.ws('/ws', async function(ws, req) {
     // poll for stateful change and notify clients to update their boards
     var session_id = 0;
-    pollStatefulChange(ws, 0);
+    db.initBoard();
 
-    ws.on('message', async function(msg) {
-        console.log(`ws message: ${msg}`);
+    // send initial message to draw client board
+    ws.send(JSON.stringify({
+        "type": "board",
+        "data": await db.getBoardState(session_id)
+    }));
 
-        var parsed = JSON.parse(msg);
-        switch (parsed.type) {
-            case "move":
-                await db.addMove(
-                    parsed.data.session,
-                    parsed.data.x,
-                    parsed.data.y,
-                    parsed.data.state,
-                    );
-                // fall through and return new board state
-            case "board":
-                var res = await db.getBoardState(
-                    parsed.data.session
-                    );
-                ws.send(JSON.stringify({
-                    "type": "board",
-                    "data": res
-                }));
-                break;
-            default:
-                console.log("ws message: Unknown message type: " + type);
+    ws.on('message', async function(msg) {
+        let parsed;
+        try {
+            parsed = JSON.parse(msg);
+            switch (parsed.type) {
+                case "new":
+                    ws.send(JSON.stringify({
+                        "type": "new",
+                        "data": await db.deleteSession(parsed.data.session)
+                    }));
+                    break;
+                case "move":
+                    await db.addMove(
+                        parsed.data.session,
+                        parsed.data.x,
+                        parsed.data.y,
+                        parsed.data.state,
+                        );
+                    // fall through and return new board state
+                case "board":
+                    ws.send(JSON.stringify({
+                        "type": "board",
+                        "data": await db.getBoardState(parsed.data.session)
+                    }));
+                    break;
+                default:
+                    console.log("ws message: Unknown message type: " + type);
+            }
+        } catch(err) {
+            console.log(`ws message error: ${err}`);
         }
     });
+
+    pollStatefulChange(ws, session_id);
 });
 
 app.listen(3000);