M gametable/server.go → gametable/server.go

@@ -86,18 +86,11 @@ c.Close(websocket.StatusPolicyViolation, "connection too slow to keep up with messages")
 		},
 	}
 
-	tableName, tblNameErr := cookie.GetToken("tableName", r)
-	tablePasscode, tblPassErr := cookie.GetToken("tablePasscode", r)
-
-	if tblNameErr != nil {
-		return tblNameErr
-	} else if tblPassErr != nil {
-		return tblPassErr
-	}
-
-	tableKey := models.TableKey{
-		Name:     tableName,
-		Passcode: tablePasscode,
+	tableKey := models.TableKey{}
+	err := json.NewDecoder(r.Body).Decode(&tableKey)
+	if err != nil {
+		fmt.Println(err.Error())
+		return
 	}
 
 	if !self.dbAdapter.CheckTable(tableKey) {
@@ -148,23 +141,38 @@ self.subscribersLock.Lock()
 	defer self.subscribersLock.Unlock()
 
 	// decode message and store in DB
+	tableMsg := models.TableMessage{}
+	err := json.NewDecoder(msg).Decode(&tableMsg)
+	if err != nil {
+		fmt.Println(err.Error())
+		return
+	}
+
+	self.writeToDB(tableMsg)
 
 	self.publishLimiter.Wait(context.Background())
 
-	for s := range self.subscribers {
-		select {
-		case s.msgs <- msg:
-		default:
-			go s.closeSlow()
+	for s, k := range self.subscribers {
+		if k == tableMsg.tableKey {
+			select {
+			case s.msgs <- msg:
+			default:
+				go s.closeSlow()
+			}
 		}
 	}
 }
 
-func (self *GameTableServer) getCurrentState(tableKey models.TableKey) []byte {
+func (self *GameTableServer) getCurrentState(tableKey models.TableKey) ([]byte, error) {
 	// get diceroll log, map, and token state
+
 	// build into a []byte message
 
-	return make([]byte, 1)
+	return make([]byte, 1), nil
+}
+
+func (self *GameTableServer) writeToDB(tableMsg models.TableMessage) error {
+	return nil
 }
 
 func (self *GameTableServer) addSubscriber(s *Subscriber, k models.TableKey) {

M models/models.go → models/models.go

@@ -36,6 +36,7 @@ AuxMessage      string     `json:"auxMessage"`
 }
 
 type TableMessage struct {
+	Key    TableKey `json:"key"`
 	Roll   DiceRoll `json:"roll"`
 	Token  Token    `json:"token"`
 	MapImg string   `json:"mapImg"`

M notes.txt → notes.txt

@@ -27,4 +27,20 @@ delete token
   }
   - Get /storage/ {
       static storage tree
-  }+  }
+  
+  
+subscribe:
+  subscribe (tableKey) => {
+    subscriber[s] = tablekey;
+    return getCurrentState(tableKey)
+  }
+  
+publish:
+  publish (updateData) => {
+    writeToDB(updateData)
+    for s, k := range subscribers
+      if k == updateData.tableKey {
+        s.msgs <- updateData
+      }
+  }