Restructure protobufs and use them everywhere

packages/relay/internal/core/core.go

@@ -10,6 +10,7 @@ import (
 	"os"
 	"relay/internal/common"
 	"relay/internal/shared"
+	"time"
 
 	"github.com/libp2p/go-libp2p"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
@@ -37,6 +38,16 @@ var globalRelay *Relay
 
 // -- Structs --
 
+// ClientSession tracks browser client connections
+type ClientSession struct {
+	PeerID          peer.ID
+	SessionID       string
+	RoomName        string
+	ConnectedAt     time.Time
+	LastActivity    time.Time
+	ControllerSlots []int32 // Track which controller slots this client owns
+}
+
 // Relay structure enhanced with metrics and state
 type Relay struct {
 	*PeerInfo
@@ -48,6 +59,7 @@ type Relay struct {
 	// Local
 	LocalRooms           *common.SafeMap[ulid.ULID, *shared.Room]         // room ID -> local Room struct (hosted by this relay)
 	LocalMeshConnections *common.SafeMap[peer.ID, *webrtc.PeerConnection] // peer ID -> PeerConnection (connected to this relay)
+	ClientSessions       *common.SafeMap[peer.ID, *ClientSession]         // peer ID -> ClientSession
 
 	// Protocols
 	ProtocolRegistry
@@ -144,6 +156,7 @@ func NewRelay(ctx context.Context, port int, identityKey crypto.PrivKey) (*Relay
 		PingService:          pingSvc,
 		LocalRooms:           common.NewSafeMap[ulid.ULID, *shared.Room](),
 		LocalMeshConnections: common.NewSafeMap[peer.ID, *webrtc.PeerConnection](),
+		ClientSessions:       common.NewSafeMap[peer.ID, *ClientSession](),
 	}
 
 	// Add network notifier after relay is initialized

packages/relay/internal/core/state.go

@@ -5,9 +5,14 @@ import (
 	"encoding/json"
 	"errors"
 	"log/slog"
+	"relay/internal/common"
 	"relay/internal/shared"
 	"time"
 
+	gen "relay/internal/proto"
+
+	"google.golang.org/protobuf/proto"
+
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/core/peer"
@@ -129,12 +134,51 @@ func (r *Relay) onPeerConnected(peerID peer.ID) {
 
 // onPeerDisconnected marks a peer as disconnected in our status view and removes latency info
 func (r *Relay) onPeerDisconnected(peerID peer.ID) {
+	// Check if this was a client session disconnect
+	if session, ok := r.ClientSessions.Get(peerID); ok {
+		slog.Info("Client session disconnected",
+			"peer", peerID,
+			"session", session.SessionID,
+			"room", session.RoomName,
+			"controller_slots", session.ControllerSlots)
+
+		// Send cleanup message to nestri-server if client had active controllers
+		if len(session.ControllerSlots) > 0 {
+			room := r.GetRoomByName(session.RoomName)
+			if room != nil && room.DataChannel != nil {
+				// Create disconnect notification
+				disconnectMsg, err := common.CreateMessage(&gen.ProtoClientDisconnected{
+					SessionId:       session.SessionID,
+					ControllerSlots: session.ControllerSlots,
+				}, "client-disconnected", nil)
+				if err != nil {
+					slog.Error("Failed to create client disconnect message", "err", err)
+				}
+
+				disMarshal, err := proto.Marshal(disconnectMsg)
+				if err != nil {
+					slog.Error("Failed to marshal client disconnect message", "err", err)
+				} else {
+					if err = room.DataChannel.SendBinary(disMarshal); err != nil {
+						slog.Error("Failed to send client disconnect notification", "err", err)
+					} else {
+						slog.Info("Sent controller cleanup notification to nestri-server",
+							"session", session.SessionID,
+							"slots", session.ControllerSlots)
+					}
+				}
+			}
+		}
+
+		r.ClientSessions.Delete(peerID)
+		return
+	}
+
+	// Relay peer disconnect handling
 	slog.Info("Mesh peer disconnected, deleting from local peer map", "peer", peerID)
-	// Remove peer from local mesh peers
 	if r.Peers.Has(peerID) {
 		r.Peers.Delete(peerID)
 	}
-	// Remove any rooms associated with this peer
 	if r.Rooms.Has(peerID.String()) {
 		r.Rooms.Delete(peerID.String())
 	}