update initiate heartbeat logic.

pull/2404/head
Monet Lee 1 year ago
parent 58cd8ee0a7
commit 557e8099c6

@ -74,6 +74,7 @@ type Client struct {
closedErr error
token string
hbCtx context.Context
hbCancel context.CancelFunc
}
// ResetClient updates the client's state with new connection and context information.
@ -90,7 +91,7 @@ func (c *Client) ResetClient(ctx *UserConnContext, conn LongConn, longConnServer
c.closed.Store(false)
c.closedErr = nil
c.token = ctx.GetToken()
c.hbCtx, _ = context.WithCancel(c.ctx)
c.hbCtx, c.hbCancel = context.WithCancel(c.ctx)
}
func (c *Client) pingHandler(_ string) error {
@ -101,6 +102,13 @@ func (c *Client) pingHandler(_ string) error {
return c.writePongMsg()
}
func (c *Client) pongHandler(_ string) error {
if err := c.conn.SetReadDeadline(pongWait); err != nil {
return err
}
return nil
}
// readMessage continuously reads messages from the connection.
func (c *Client) readMessage() {
defer func() {
@ -113,8 +121,9 @@ func (c *Client) readMessage() {
c.conn.SetReadLimit(maxMessageSize)
_ = c.conn.SetReadDeadline(pongWait)
c.conn.SetPongHandler(c.pongHandler)
c.conn.SetPingHandler(c.pingHandler)
go c.activeHeartbeat(c.hbCtx)
c.activeHeartbeat(c.hbCtx)
for {
log.ZDebug(c.ctx, "readMessage")
@ -240,7 +249,7 @@ func (c *Client) close() {
c.closed.Store(true)
c.conn.Close()
<-c.hbCtx.Done() // Close server-initiated heartbeat.
c.hbCancel() // Close server-initiated heartbeat.
c.longConnServer.UnRegister(c)
}
@ -330,6 +339,7 @@ func (c *Client) writeBinaryMsg(resp Resp) error {
// Actively initiate Heartbeat when platform in Web.
func (c *Client) activeHeartbeat(ctx context.Context) {
if c.PlatformID == constant.WebPlatformID {
go func() {
log.ZDebug(ctx, "server initiative send heartbeat start.")
ticker := time.NewTicker(pingPeriod)
defer ticker.Stop()
@ -345,6 +355,7 @@ func (c *Client) activeHeartbeat(ctx context.Context) {
return
}
}
}()
}
}

Loading…
Cancel
Save