feat: implement heartbeat logic in msggateway.

pull/2404/head
Monet Lee 1 year ago
parent 1b1bc0b756
commit fa1c9b4329

@ -73,6 +73,7 @@ type Client struct {
closed atomic.Bool closed atomic.Bool
closedErr error closedErr error
token string token string
hbCtx context.Context
} }
// ResetClient updates the client's state with new connection and context information. // ResetClient updates the client's state with new connection and context information.
@ -89,6 +90,7 @@ func (c *Client) ResetClient(ctx *UserConnContext, conn LongConn, longConnServer
c.closed.Store(false) c.closed.Store(false)
c.closedErr = nil c.closedErr = nil
c.token = ctx.GetToken() c.token = ctx.GetToken()
c.hbCtx, _ = context.WithTimeout(c.ctx, pongWait*2)
} }
func (c *Client) pingHandler(_ string) error { func (c *Client) pingHandler(_ string) error {
@ -113,23 +115,8 @@ func (c *Client) readMessage() {
_ = c.conn.SetReadDeadline(pongWait) _ = c.conn.SetReadDeadline(pongWait)
c.conn.SetPingHandler(c.pingHandler) c.conn.SetPingHandler(c.pingHandler)
if c.PlatformID == 5 { if c.PlatformID == constant.WebPlatformID {
go func() { go c.heartbeat(c.hbCtx)
ticker := time.NewTicker(20)
defer ticker.Stop()
for {
select {
case <-ticker.C:
if err := c.writePingMsg(); err != nil {
log.ZError(c.ctx, "send Ping Message error.", err)
return
}
case <-c.ctx.Done():
return
}
}
}()
} }
for { for {
@ -138,7 +125,6 @@ func (c *Client) readMessage() {
if returnErr != nil { if returnErr != nil {
log.ZWarn(c.ctx, "readMessage", returnErr, "messageType", messageType) log.ZWarn(c.ctx, "readMessage", returnErr, "messageType", messageType)
c.closedErr = returnErr c.closedErr = returnErr
<-c.ctx.Done()
return return
} }
@ -146,7 +132,6 @@ func (c *Client) readMessage() {
if c.closed.Load() { if c.closed.Load() {
// The scenario where the connection has just been closed, but the coroutine has not exited // The scenario where the connection has just been closed, but the coroutine has not exited
c.closedErr = ErrConnClosed c.closedErr = ErrConnClosed
<-c.ctx.Done()
return return
} }
@ -156,12 +141,10 @@ func (c *Client) readMessage() {
parseDataErr := c.handleMessage(message) parseDataErr := c.handleMessage(message)
if parseDataErr != nil { if parseDataErr != nil {
c.closedErr = parseDataErr c.closedErr = parseDataErr
<-c.ctx.Done()
return return
} }
case MessageText: case MessageText:
c.closedErr = ErrNotSupportMessageProtocol c.closedErr = ErrNotSupportMessageProtocol
<-c.ctx.Done()
return return
case PingMessage: case PingMessage:
@ -170,7 +153,6 @@ func (c *Client) readMessage() {
case CloseMessage: case CloseMessage:
c.closedErr = ErrClientClosed c.closedErr = ErrClientClosed
<-c.ctx.Done()
return return
default: default:
@ -261,6 +243,7 @@ func (c *Client) close() {
c.closed.Store(true) c.closed.Store(true)
c.conn.Close() c.conn.Close()
<-c.hbCtx.Done() // Close initiated heartbeat in server send.
c.longConnServer.UnRegister(c) c.longConnServer.UnRegister(c)
} }
@ -347,20 +330,22 @@ func (c *Client) writeBinaryMsg(resp Resp) error {
return c.conn.WriteMessage(MessageBinary, encodedBuf) return c.conn.WriteMessage(MessageBinary, encodedBuf)
} }
func (c *Client) writePingMsg() error { func (c *Client) heartbeat(ctx context.Context) {
if c.closed.Load() { log.ZDebug(ctx, "server initiative send heartbeat start.")
return nil ticker := time.NewTicker(pingPeriod)
} defer ticker.Stop()
c.w.Lock()
defer c.w.Unlock()
err := c.conn.SetWriteDeadline(writeWait) for {
if err != nil { select {
return err case <-ticker.C:
if err := c.conn.WriteMessage(PingMessage, nil); err != nil {
log.ZError(c.ctx, "send Ping Message error.", err)
return
}
case <-c.hbCtx.Done():
return
}
} }
return c.conn.WriteMessage(PingMessage, nil)
} }
func (c *Client) writePongMsg() error { func (c *Client) writePongMsg() error {

@ -53,6 +53,9 @@ const (
// Time allowed to read the next pong message from the peer. // Time allowed to read the next pong message from the peer.
pongWait = 30 * time.Second pongWait = 30 * time.Second
// Send pings to peer with this period. Must be less than pongWait.
pingPeriod = (pongWait * 9) / 10
// Maximum message size allowed from peer. // Maximum message size allowed from peer.
maxMessageSize = 51200 maxMessageSize = 51200
) )

@ -16,10 +16,11 @@ package msggateway
import ( import (
"encoding/json" "encoding/json"
"github.com/openimsdk/tools/apiresp"
"net/http" "net/http"
"time" "time"
"github.com/openimsdk/tools/apiresp"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/errs"
) )

Loading…
Cancel
Save