웹소켓 메시지 전송 채널 단일화

core/connection.go

@@ -7,7 +7,6 @@ import (
 	"github.com/gorilla/websocket"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"repositories.action2quare.com/ayo/gocommon"
-	"repositories.action2quare.com/ayo/gocommon/logger"
 	"repositories.action2quare.com/ayo/gocommon/wshandler"
 )
 
@@ -20,6 +19,7 @@ type connWithFriends struct {
 type connections struct {
 	connLock sync.Mutex
 	conns    map[primitive.ObjectID]*connWithFriends
+	wsh      *wshandler.WebsocketHandler
 	redison  *gocommon.RedisonHandler
 }
 
@@ -90,12 +90,7 @@ func (cs *connections) writeMessage(acc primitive.ObjectID, src any) {
 	}
 
 	if bt, err := json.Marshal(src); err == nil {
-		pmsg, err := websocket.NewPreparedMessage(websocket.TextMessage, bt)
-		if err != nil {
-			logger.Println("connections.writeMessage failed :", err)
-		} else {
-			conn.c.WritePreparedMessage(pmsg)
-		}
+		cs.wsh.WriteDirectMessage(conn.c, websocket.TextMessage, bt)
 	}
 }
 
@@ -109,9 +104,10 @@ func (cs *connections) ClientDisconnected(msg string, callby *wshandler.Sender)
 	cs.delete(callby.Accid)
 }
 
-func makeConnections(redison *gocommon.RedisonHandler) *connections {
+func makeConnections(redison *gocommon.RedisonHandler, wsh *wshandler.WebsocketHandler) *connections {
 	return &connections{
 		conns:   make(map[primitive.ObjectID]*connWithFriends),
+		wsh:     wsh,
 		redison: redison,
 	}
 }

core/friend.go

@@ -144,12 +144,7 @@ func makeFriends(ctx context.Context, so *Social, conns *connections) (*friends,
 					}
 
 					if exists && srcmap != nil && len(srcmap.lastState) > 0 {
-						pmsg, err := websocket.NewPreparedMessage(websocket.TextMessage, srcmap.lastState)
-						if err != nil {
-							logger.Println("makeFriends.NewPreparedMessage failed :", err)
-						} else {
-							reg.l.c.WritePreparedMessage(pmsg)
-						}
+						so.wsh.WriteDirectMessage(reg.l.c, websocket.TextMessage, srcmap.lastState)
 					}
 
 					if len(srcmap.listeners) == 0 && len(srcmap.lastState) == 0 {
@@ -172,15 +167,13 @@ func makeFriends(ctx context.Context, so *Social, conns *connections) (*friends,
 								delete(listeners, target)
 							}
 
-							pmsg, _ := websocket.NewPreparedMessage(websocket.TextMessage, srcmap.offline)
 							for _, l := range srcmap.listeners {
-								l.c.WritePreparedMessage(pmsg)
+								so.wsh.WriteDirectMessage(l.c, websocket.TextMessage, srcmap.offline)
 							}
 						} else {
 							srcmap.lastState = []byte(state)
-							pmsg, _ := websocket.NewPreparedMessage(websocket.TextMessage, srcmap.lastState)
 							for _, l := range srcmap.listeners {
-								l.c.WritePreparedMessage(pmsg)
+								so.wsh.WriteDirectMessage(l.c, websocket.TextMessage, srcmap.lastState)
 							}
 						}
 					} else if len(state) > 0 {

core/social.go

@@ -80,7 +80,7 @@ func (so *Social) prepare(ctx context.Context) error {
 
 	so.redison = gocommon.NewRedisonHandler(redisClient.Context(), redisClient)
 
-	connections := makeConnections(so.redison)
+	connections := makeConnections(so.redison, so.wsh)
 	so.wsh.AddHandler(wshandler.MakeWebsocketApiHandler(connections, "social"))
 	so.httpApiBorker.AddHandler(gocommon.MakeHttpApiHandler(connections, "social"))