Merge pull request #47 from dscsnu/channel-proto

update to json streams

Author: Icelain

backend/internal/channel/channel.go

@@ -39,7 +39,7 @@ func (c *ChannelPool) GetChannel(teamId string) *Channel {
 }
 
 type Channel struct {
-	Recv             <-chan protocol.Packet
+	Recv             chan protocol.Packet
 	BroadcastClients struct {
 		bc  map[chan<- protocol.Packet]struct{}
 		mut sync.Mutex
@@ -48,7 +48,7 @@ type Channel struct {
 
 func NewChannel() *Channel {
 
-	return &Channel{Recv: make(<-chan protocol.Packet), BroadcastClients: struct {
+	return &Channel{Recv: make(chan protocol.Packet), BroadcastClients: struct {
 		bc  map[chan<- protocol.Packet]struct{}
 		mut sync.Mutex
 	}{
@@ -66,6 +66,12 @@ func (c *Channel) AddMember(memberChannel chan<- protocol.Packet) {
 
 }
 
+func (c *Channel) Broadcast(packet protocol.Packet) {
+
+	c.Recv <- packet
+
+}
+
 func (c *Channel) Start() {
 
 	for packet := range c.Recv {
@@ -76,40 +82,27 @@ func (c *Channel) Start() {
 
 		}
 
+		c.BroadcastClients.mut.Lock()
+		for client := range c.BroadcastClients.bc {
+
+			client <- packet
+		}
+		c.BroadcastClients.mut.Unlock()
+
 	}
 
 }
 
+// change backend state with packets
 func (c *Channel) handlePacket(packet protocol.Packet) bool {
 
 	switch packet.Type {
 
-	case protocol.PacketTypeChannelState:
-
-		//channelStateMessage, err := protocol.DecodeChannelStateMessage(packet.Message)
-
-	case protocol.PacketTypeBackground:
-		backgroundMessage, err := protocol.DecodeBackgroundMessage(packet.Message)
-		if err != nil {
+	case "BackgroundMessage":
 
-			return true
-
-		}
-
-		if backgroundMessage.MsgContext == protocol.JoinBackgroundMessageContext {
-
-			c.BroadcastClients.mut.Lock()
-			for broadcastClient := range c.BroadcastClients.bc {
-
-				broadcastClient <- packet
-
-			}
-			c.BroadcastClients.mut.Unlock()
-
-		}
+	case "ChannelStateMessage":
 
-	case protocol.PacketTypeGame:
-		//gameMessage, err := protocol.DecodeGameMessage(packet.Message)
+	case "GameMessage":
 
 	}
 

backend/internal/controllers/controllers.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"context"
+	"encoding/json"
 	"labyrinth/internal/controllers/middleware"
 	"labyrinth/internal/protocol"
 	"labyrinth/internal/router"
@@ -81,7 +82,7 @@ func TeamChannelEventHandler(rtr *router.Router) http.HandlerFunc {
 
 		for eventMessage := range listenerChannel {
 
-			if _, err = w.Write(eventMessage.Message); err != nil {
+			if err = json.NewEncoder(w).Encode(eventMessage); err != nil {
 
 				rtr.Logger.Debug("http stream write failed")
 

backend/internal/controllers/team.go

@@ -3,7 +3,9 @@ package controllers
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"labyrinth/internal/channel"
+	"labyrinth/internal/protocol"
 	"labyrinth/internal/router"
 	"labyrinth/internal/types"
 	"log/slog"
@@ -144,6 +146,9 @@ func TeamUpdateHandler(rtr *router.Router) http.HandlerFunc {
 			rtr.Logger.Error("internal error while getting team", "error", err.Error())
 		}
 
+		teamChannel := rtr.State.ChanPool.GetChannel(team.ID)
+		teamChannel.Broadcast(protocol.Packet{Type: "BackgroundMessage", BackgroundMessage: protocol.BackgroundMessage{Relay: fmt.Sprintf("teamId:%s -> %s joined the team", team.ID, profile.Email), MsgContext: "channel_creation"}})
+
 		if err := json.NewEncoder(w).Encode(team); err != nil {
 			http.Error(w, "error encoding response", http.StatusInternalServerError)
 		}

backend/internal/protocol/protocol.go

@@ -1,62 +1,21 @@
 package protocol
 
-import (
-	"encoding/binary"
-)
-
-type PacketType int
-
-const (
-	PacketTypeBackground PacketType = iota
-	PacketTypeGame
-	PacketTypeChannelState
-)
-
 type Packet struct {
-	Type    PacketType
-	Message []byte
+	Type                string `json:"type"`
+	BackgroundMessage   `json:"backgroundMessage"`
+	ChannelStateMessage `json:"channelStateMessage"`
+	GameMessage         `json:"gameMessage"`
 }
 
-type BackgroundMessageContext int
-
-const (
-	JoinBackgroundMessageContext BackgroundMessageContext = iota
-	LeaveBackgroundMessageContext
-)
-
 type BackgroundMessage struct {
-	Message    [128]byte
-	MsgContext BackgroundMessageContext
+	Relay      string `json:"message"`
+	MsgContext string `json:"msgcontext"`
 }
-
-func DecodeBackgroundMessage(msg []byte) (BackgroundMessage, error) {
-
-	backgroundMessage := BackgroundMessage{}
-	_, err := binary.Decode(msg, binary.LittleEndian, &backgroundMessage)
-
-	return backgroundMessage, err
-}
-
 type ChannelStateMessage struct {
-	Open bool
+	Relay      string `json:"message"`
+	MsgContext string `json:"msgcontext"`
 }
-
-func DecodeChannelStateMessage(msg []byte) (ChannelStateMessage, error) {
-
-	channelStateMessage := ChannelStateMessage{}
-	_, err := binary.Decode(msg, binary.LittleEndian, &channelStateMessage)
-
-	return channelStateMessage, err
-}
-
 type GameMessage struct {
-
-	// game message fields
-
-}
-
-func DecodeGameMessage(msg []byte) (GameMessage, error) {
-	gameMessage := GameMessage{}
-	_, err := binary.Decode(msg, binary.LittleEndian, &gameMessage)
-	return gameMessage, err
+	Relay      string `json:"message"`
+	MsgContext string `json:"msgcontext"`
 }