add stop for client

This commit is contained in:
Akiba
2022-03-31 15:07:06 +08:00
parent 9ec244cae8
commit b8e1f491aa

View File

@@ -18,6 +18,7 @@ type Client struct {
host string host string
eventHandlers *eventHandlers eventHandlers *eventHandlers
customEventHandlers *customEventHandlers customEventHandlers *customEventHandlers
done chan struct{}
} }
func NewClient(roomID string) *Client { func NewClient(roomID string) *Client {
@@ -25,6 +26,7 @@ func NewClient(roomID string) *Client {
roomID: roomID, roomID: roomID,
eventHandlers: &eventHandlers{}, eventHandlers: &eventHandlers{},
customEventHandlers: &customEventHandlers{}, customEventHandlers: &customEventHandlers{},
done: make(chan struct{}),
} }
} }
@@ -59,17 +61,22 @@ func (c *Client) Start() error {
} }
go func() { go func() {
for { for {
msgType, data, err := c.conn.ReadMessage() select {
if err != nil { case <-c.done:
_ = c.Connect() return
continue default:
} msgType, data, err := c.conn.ReadMessage()
if msgType != websocket.BinaryMessage { if err != nil {
log.Error("packet not binary", data) _ = c.Connect()
continue continue
} }
for _, pkt := range packet.DecodePacket(data).Parse() { if msgType != websocket.BinaryMessage {
go c.Handle(pkt) log.Error("packet not binary", data)
continue
}
for _, pkt := range packet.DecodePacket(data).Parse() {
go c.Handle(pkt)
}
} }
} }
}() }()
@@ -77,6 +84,10 @@ func (c *Client) Start() error {
return nil return nil
} }
func (c *Client) Stop() {
close(c.done)
}
func (c *Client) ConnectAndStart() error { func (c *Client) ConnectAndStart() error {
if err := c.Connect(); err != nil { if err := c.Connect(); err != nil {
return err return err
@@ -98,11 +109,15 @@ func (c *Client) UseDefaultHost() {
func (c *Client) startHeartBeat() { func (c *Client) startHeartBeat() {
pkt := packet.NewHeartBeatPacket() pkt := packet.NewHeartBeatPacket()
for { for {
if err := c.conn.WriteMessage(websocket.BinaryMessage, pkt); err != nil { select {
log.Error(err) case <-c.done:
return
case <-time.After(30 * time.Second):
if err := c.conn.WriteMessage(websocket.BinaryMessage, pkt); err != nil {
log.Error(err)
}
log.Debug("send: HeartBeat")
} }
log.Debug("send: HeartBeat")
time.Sleep(30 * time.Second)
} }
} }