From 151ed123f40b397d31b14d4f04dfa89a00431193 Mon Sep 17 00:00:00 2001 From: orgin Date: Thu, 22 Sep 2022 10:50:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96WSClient=E7=9A=84MessageType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- network/ws_client.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/network/ws_client.go b/network/ws_client.go index 7e469d2..07a28e4 100644 --- a/network/ws_client.go +++ b/network/ws_client.go @@ -14,6 +14,7 @@ type WSClient struct { ConnectInterval time.Duration PendingWriteNum int MaxMsgLen uint32 + MessageType int HandshakeTimeout time.Duration AutoReconnect bool NewAgent func(*WSConn) Agent @@ -21,7 +22,7 @@ type WSClient struct { cons WebsocketConnSet wg sync.WaitGroup closeFlag bool - messageType int + } func (client *WSClient) Start() { @@ -63,7 +64,11 @@ func (client *WSClient) init() { if client.cons != nil { log.SFatal("client is running") } - client.messageType = websocket.TextMessage + + if client.MessageType == 0 { + client.MessageType = websocket.TextMessage + } + client.cons = make(WebsocketConnSet) client.closeFlag = false client.dialer = websocket.Dialer{ @@ -84,9 +89,6 @@ func (client *WSClient) dial() *websocket.Conn { } } -func (client *WSClient) SetMessageType(messageType int){ - client.messageType = messageType -} func (client *WSClient) connect() { defer client.wg.Done() @@ -106,7 +108,7 @@ reconnect: client.cons[conn] = struct{}{} client.Unlock() - wsConn := newWSConn(conn, client.PendingWriteNum, client.MaxMsgLen,client.messageType) + wsConn := newWSConn(conn, client.PendingWriteNum, client.MaxMsgLen,client.MessageType) agent := client.NewAgent(wsConn) agent.Run()