From 2bf3c1af8bc49811ebaf17fcb775b269a9ab9445 Mon Sep 17 00:00:00 2001
From: Derek Stevens <nilix@nilfm.cc>
Date: Sun, 12 Feb 2023 21:25:14 -0700
Subject: [PATCH] roll dice and publish to socket

---
 gametable/server.go |  2 +-
 models/models.go    | 10 +++++-----
 static/dice.js      | 36 ++++++++++++++++++++++++++++++++++++
 static/index.html   |  5 +++--
 static/socket.js    | 18 +++++++++++++++++-
 5 files changed, 62 insertions(+), 9 deletions(-)
 create mode 100644 static/dice.js

diff --git a/gametable/server.go b/gametable/server.go
index ed4a728..0cc7596 100644
--- a/gametable/server.go
+++ b/gametable/server.go
@@ -166,7 +166,7 @@ func (self *GameTableServer) publish(msg []byte) {
 	self.publishLimiter.Wait(context.Background())
 
 	for s, k := range self.subscribers {
-		if k == tableMsg.Key {
+		if k == *tableMsg.Key {
 			select {
 			case s.msgs <- msg:
 			default:
diff --git a/models/models.go b/models/models.go
index 942cd06..1145354 100644
--- a/models/models.go
+++ b/models/models.go
@@ -36,9 +36,9 @@ type Table struct {
 }
 
 type TableMessage struct {
-	Key    TableKey `json:"key"`
-	Roll   DiceRoll `json:"roll"`
-	Token  Token    `json:"token"`
-	MapImg string   `json:"mapImg"`
-	AuxMsg string   `json:"auxMsg"`
+	Key    *TableKey `json:"key"`
+	Roll   *DiceRoll `json:"roll"`
+	Token  *Token    `json:"token"`
+	MapImg *string   `json:"mapImg"`
+	AuxMsg *string   `json:"auxMsg"`
 }
diff --git a/static/dice.js b/static/dice.js
new file mode 100644
index 0000000..2e30f84
--- /dev/null
+++ b/static/dice.js
@@ -0,0 +1,36 @@
+function rollDice() {
+  const name = document.getElementById("name_entry");
+  const numDice = document.getElementById("num_dice");
+  const faces = document.getElementById("dice_faces");
+  const note = document.getElementById("dice_note");
+  
+  if (conn == null || table == null) {
+    setErr("Looks like you haven't joined a table yet.");
+    return;
+  }
+  
+  if (!name || name.value.length < 1) {
+    setErr("Who are you? What's your name? Super brother?");
+    return;
+  }
+  
+  if (numDice && faces && note) {
+    console.log("here?")
+    const n = Number(numDice.value);
+    const d = Number(faces.value);
+    r = new Uint8Array(n);
+    crypto.getRandomValues(r);
+    const rolls = [];
+    for (const i of r) {
+      rolls.push(r%d + 1)
+    }
+    console.log(rolls);
+    publish({diceRoll: {
+      faces: d,
+      roll: rolls,
+      player: name.value,
+      note: note.value,
+      timestamp: new Date(),
+    }});
+  }
+}
\ No newline at end of file
diff --git a/static/index.html b/static/index.html
index 6c50547..4206766 100644
--- a/static/index.html
+++ b/static/index.html
@@ -25,7 +25,7 @@
     <button type="submit" id="admin_login" onclick="doLogin()">login</button>
   </form>
   <div id="dice_log"></div>
-  <select name="num_dice">
+  <select id="num_dice">
     <option>1</option>
     <option>2</option>
     <option>3</option>
@@ -56,7 +56,7 @@
     <option>12</option>
     <option>20</option>
   </select>
-  <input id="dice_note"><button id="dice_submit">Roll</button>
+  <input id="dice_note"><button id="dice_submit" onclick="rollDice()">Roll</button>
   <div id="map"></div>
   <div id="adminWrapper" style="display:none;">
     <div id="adminCtrl">
@@ -73,5 +73,6 @@
 </body>
     <script src="./util.js" type="text/javascript"></script>
     <script src="./socket.js" type="text/javascript"></script>
+    <script src="./dice.js" type="text/javascript"></script>
     <script src="./admin.js" type="text/javascript"></script>
 </html>
\ No newline at end of file
diff --git a/static/socket.js b/static/socket.js
index e95a1e5..484e6d3 100644
--- a/static/socket.js
+++ b/static/socket.js
@@ -27,7 +27,23 @@ function dial() {
       console.info("socket connected");
     });
     conn.addEventListener("message", e => {
-      console.dir(e);
+      console.log(e.data);
+      if (table == null) {
+        table = JSON.parse(e.data);
+      } else {
+        // UPDATE THE TABLE!
+      }
     });
   }
+}
+
+async function publish(msg) {
+  msg.key = tableKey;
+  const res = await fetch('/publish', {
+    method: 'POST',
+    body: JSON.stringify(msg)
+  });
+  if (!res.ok) {
+    setErr("Failed to publish message");
+  }
 }
\ No newline at end of file