update for protobuf with options

go.mod

···
 
 require (
 	github.com/gorilla/websocket v1.5.3
-	github.com/rachel-mp4/lrcproto v0.0.0-20250523232424-249fb4ca623e
+	github.com/rachel-mp4/lrcproto v0.0.0-20250527205756-58da8216f98c
 	google.golang.org/protobuf v1.36.6
 )

go.sum

···
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/rachel-mp4/lrcproto v0.0.0-20250523232424-249fb4ca623e h1:0rCvzEgNyWX48ZC1qh8+QhN27pTmr05oahCXcR2T7Go=
-github.com/rachel-mp4/lrcproto v0.0.0-20250523232424-249fb4ca623e/go.mod h1:hQzO36tQELGbkmRnUtKeM6NMU34t79ZcTlhM+MO7pHw=
+github.com/rachel-mp4/lrcproto v0.0.0-20250527205756-58da8216f98c h1:nOWeKeE7wph0IcwUyUBi0YBynUnAo4JW/J5DM88x4KM=
+github.com/rachel-mp4/lrcproto v0.0.0-20250527205756-58da8216f98c/go.mod h1:hQzO36tQELGbkmRnUtKeM6NMU34t79ZcTlhM+MO7pHw=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=

server.go

···
 	s.pongEvt = pe
 }
 
+// Start starts a server, and returns an error if it has ever been started before
 func (s *Server) Start() error {
 	if s.ctx != nil {
 		return errors.New("cannot start already started server")
···
 	return nil
 }
 
+// Stop stops a server if it has started, and returns an error if it is already stopped
 func (s *Server) Stop() error {
 	if s.ctx == nil {
 		return nil
···
 	}
 }
 
+// Connected returns how many clients are currently connected to the server
 func (s *Server) Connected() int {
 	return len(s.clients)
 }
 
+// StopIfEmpty stops the server if it is empty, returning true.
 func (s *Server) StopIfEmpty() bool {
 	if len(s.clients) == 0 {
 		s.Stop()
···
 func (s *Server) WSHandler() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		upgrader := &websocket.Upgrader{
-			Subprotocols: []string{"lrcprotov1"},
+			Subprotocols: []string{"lrc.v1"},
 			CheckOrigin: func(r *http.Request) bool {
 				return true
 			},
 		}
+		// initialize
 		conn, err := upgrader.Upgrade(w, r, nil)
 		if err != nil {
 			log.Println("Upgrade failed:", err)
···
 		s.clients[client] = true
 		s.clientsMu.Unlock()
 
+		// lifetime
 		var wg sync.WaitGroup
 		wg.Add(2)
 		go func() { defer wg.Done(); s.wsWriter(client) }()
···
 		s.logDebug("new ws connection!")
 		wg.Wait()
 
+		// clean up
 		s.clientsMu.Lock()
 		delete(s.clients, client)
 		close(client.dataChan)
 		s.clientsMu.Unlock()
+
 		s.idmapsMu.Lock()
-		for _, id := range client.myIDs {
+		for _, id := range client.myIDs { // remove myself from the idToClient map
 			delete(s.idToClient, id)
 		}
-		for mutedClient, _ := range client.muteMap {
+		for mutedClient := range client.muteMap { // remove myself from everyone that I muted's backreference map
 			delete(mutedClient.mutedBy, client)
 		}
-		for mutingClient, _ := range client.mutedBy {
+		for mutingClient := range client.mutedBy { // remove myself from everyone who muted me
 			delete(mutingClient.muteMap, client)
 		}
 		s.idmapsMu.Unlock()
+
 		conn.Close()
 		s.logDebug("closed ws connection")
 	}
···
 	client.myIDs = append(client.myIDs, newID)
 	newpost := ""
 	client.post = &newpost
-	msg.Init.Id = newID
-	nick := client.nick
-	if nick != nil {
-		msg.Init.Nick = *nick
-	} else {
-		msg.Init.Nick = "wanderer"
-	}
-	externID := client.externID
-	if externID != nil {
-		msg.Init.ExternalID = *externID
-	} else {
-		msg.Init.ExternalID = ""
-	}
-	color := client.color
-	if color != nil {
-		msg.Init.Color = *color
-	} else {
-		msg.Init.Color = 0xD90368
-	}
-	msg.Init.Echoed = false
-
+	msg.Init.Id = &newID
+	msg.Init.Nick = client.nick
+	msg.Init.ExternalID = client.externID
+	msg.Init.Color = client.color
+	echoed := false
+	msg.Init.Echoed = &echoed
 	if s.initChan != nil {
 		select {
 		case s.initChan <- *msg:
···
 func (s *Server) broadcastInit(msg *lrcpb.Event_Init, client *client) {
 	stdEvent := &lrcpb.Event{Msg: msg}
 	stdData, _ := proto.Marshal(stdEvent)
-	msg.Init.Echoed = true
+	echoed := true
+	msg.Init.Echoed = &echoed
 	echoEvent := &lrcpb.Event{Msg: msg}
 	echoData, _ := proto.Marshal(echoEvent)
 	muteEvent := &lrcpb.Event{Msg: &lrcpb.Event_Mute{Mute: &lrcpb.Mute{Id: msg.Init.GetId()}}}
···
 	s.idmapsMu.Lock()
 	s.clientToID[client] = nil
 	s.idmapsMu.Unlock()
-	msg.Pub.Id = *curID
+	msg.Pub.Id = curID
 	event := &lrcpb.Event{Msg: msg}
 	if s.pubChan != nil {
 		select {
···
 	if curID == nil {
 		return
 	}
-	newpost, err := insertAtUTF16Index(*client.post, msg.Insert.GetByteIndex(), msg.Insert.GetBody())
+	newpost, err := insertAtUTF16Index(*client.post, msg.Insert.GetUtf16Index(), msg.Insert.GetBody())
 	if err != nil {
 		return
 	}
 	client.post = &newpost
-	msg.Insert.Id = *curID
+	msg.Insert.Id = curID
 	event := &lrcpb.Event{Msg: msg}
 	s.broadcast(event, client)
 }
···
 	if curID == nil {
 		return
 	}
-	newPost, err := deleteBtwnUTF16Indices(*client.post, msg.Delete.GetByteStart(), msg.Delete.GetByteEnd())
+	newPost, err := deleteBtwnUTF16Indices(*client.post, msg.Delete.GetUtf16Start(), msg.Delete.GetUtf16End())
 	if err != nil {
 		return
 	}
 	client.post = &newPost
-	msg.Delete.Id = *curID
+	msg.Delete.Id = curID
 	event := &lrcpb.Event{Msg: msg}
 	s.broadcast(event, client)
 }
···
 		client.dataChan <- data
 	}
 }
-
-// func (s *Server) broadcastAll(evt []byte) {
-// 	s.clientsMu.Lock()
-// 	defer s.clientsMu.Unlock()
-// 	for client := range s.clients {
-// 		select {
-// 		case client.evtChan <- evt:
-// 			s.logDebug(fmt.Sprintf("b %x", evt))
-// 		default:
-// 			s.log("kicked client")
-// 			if client.tcpconn != nil {
-// 				(*client.tcpconn).Close()
-// 			}
-// 			if client.wsconn != nil {
-// 				(*client.wsconn).Close()
-// 			}
-// 			delete(s.clients, client)
-// 		}
-// 	}
-// }
-
-// func (s *Server) broadcastInit(evt []byte, c *client, id uint32) {
-// 	bevt, eevt := events.GenServerEvent(evt, id)
-// 	s.clientsMu.Lock()
-// 	defer s.clientsMu.Unlock()
-// 	for client := range s.clients {
-// 		evtToSend := bevt
-// 		if client == c {
-// 			evtToSend = eevt
-// 		}
-// 		select {
-// 		case client.evtChan <- evtToSend:
-// 			s.logDebug(fmt.Sprintf("b %x", bevt))
-// 		default:
-// 			s.log("kicked client")
-// 			if client.tcpconn != nil {
-// 				(*client.tcpconn).Close()
-// 			}
-// 			if client.wsconn != nil {
-// 				(*client.wsconn).Close()
-// 			}
-// 			delete(s.clients, client)
-// 		}
-// 	}
-// }
 
 // logDebug debugs unless in production
 func (server *Server) logDebug(s string) {