优化websocket，线程安全

common/service/ws/client.go

@@ -48,7 +48,7 @@ func NewClient(ctx *gin.Context, options ClientOption) (*Client, error) {
 	}
 	collect.Join(client)
 
-	slog.Info("ws connect", "fd", client.Fd, "goroutine", runtime.NumGoroutine(), "total", collect.Total())
+	slog.Info("ws connect", "fd", client.Fd, "goroutine", runtime.NumGoroutine(), "client total", collect.Total(), "progress total", len(collect.progressPip))
 	return client, nil
 }
 

common/service/ws/collection.go

@@ -15,28 +15,26 @@ var (
 
 func NewCollection() *Collection {
 	obj := &Collection{
-		clients:     make(map[string]*Client),
+		clients:     sync.Map{},
 		progressPip: make(map[string]*ProgressPip),
 	}
 	go obj.Broadcast()
 	return obj
 }
 
 type Collection struct {
-	clients     map[string]*Client
+	clients     sync.Map
 	progressPip map[string]*ProgressPip
 	ctx         context.Context
 }
 
 func (self *Collection) Join(c *Client) {
-	self.clients[c.Fd] = c
+	self.clients.Store(c.Fd, c)
 }
 
 func (self *Collection) Leave(c *Client) {
-	if _, ok := self.clients[c.Fd]; ok {
-		delete(self.clients, c.Fd)
-	}
-	if len(self.clients) == 0 {
+	self.clients.Delete(c.Fd)
+	if self.Total() == 0 {
 		for key, pip := range self.progressPip {
 			pip.cancel()
 			delete(self.progressPip, key)
@@ -47,12 +45,14 @@ func (self *Collection) Leave(c *Client) {
 func (self *Collection) sendMessage(message *RespMessage) {
 	lock.Lock()
 	lock.Unlock()
-	for _, client := range self.clients {
-		err := client.Conn.WriteMessage(websocket.TextMessage, message.ToJson())
+	self.clients.Range(func(key, value any) bool {
+		c := value.(*Client)
+		err := c.Conn.WriteMessage(websocket.TextMessage, message.ToJson())
 		if err != nil {
-			slog.Error("ws broadcast error", "fd", client.Fd, "error", err.Error())
+			slog.Error("ws broadcast error", "fd", c.Fd, "error", err.Error())
 		}
-	}
+		return true
+	})
 }
 
 func (self *Collection) Broadcast() {
@@ -72,5 +72,12 @@ func (self *Collection) Broadcast() {
 }
 
 func (self *Collection) Total() int {
-	return len(self.clients)
+	lock.Lock()
+	lock.Unlock()
+	count := 0
+	self.clients.Range(func(key, value any) bool {
+		count += 1
+		return true
+	})
+	return count
 }