fix: harden websocket heartbeat under load
This commit is contained in:
@@ -40,6 +40,8 @@ type ctrlError struct {
|
||||
Text string
|
||||
}
|
||||
|
||||
const dataCallbackQueueSize = 512
|
||||
|
||||
func (e *ctrlError) Error() string {
|
||||
return fmt.Sprintf("ctrl code=%d text=%s", e.Code, e.Text)
|
||||
}
|
||||
@@ -56,6 +58,7 @@ type WSClient struct {
|
||||
seq uint64
|
||||
waits map[string]chan ctrlPacket
|
||||
done chan struct{}
|
||||
data chan dataPacket
|
||||
closed atomic.Bool
|
||||
}
|
||||
|
||||
@@ -84,6 +87,7 @@ func connectWSClient(ctx context.Context, cfg *Config, account AccountRecord, ap
|
||||
account: account, conn: conn, commandTimeout: timeout, onData: onData, onDisconnect: onDisconnect,
|
||||
waits: make(map[string]chan ctrlPacket), done: make(chan struct{}),
|
||||
}
|
||||
client.startDataProcessor()
|
||||
go client.readLoop()
|
||||
if _, err = client.command(ctx, "hi", map[string]any{"hi": map[string]any{
|
||||
"id": client.nextID("hi"), "ver": "0.25", "ua": "im-pressure/1.0",
|
||||
@@ -346,6 +350,9 @@ func (c *WSClient) removeWait(id string) {
|
||||
func (c *WSClient) readLoop() {
|
||||
defer func() {
|
||||
_ = c.conn.Close()
|
||||
if c.data != nil {
|
||||
close(c.data)
|
||||
}
|
||||
close(c.done)
|
||||
}()
|
||||
for {
|
||||
@@ -372,12 +379,28 @@ func (c *WSClient) readLoop() {
|
||||
if raw := envelope["data"]; len(raw) > 0 && c.onData != nil {
|
||||
var data dataPacket
|
||||
if json.Unmarshal(raw, &data) == nil {
|
||||
c.onData(c.account, data)
|
||||
if c.data == nil {
|
||||
c.onData(c.account, data)
|
||||
} else {
|
||||
c.data <- data
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (c *WSClient) startDataProcessor() {
|
||||
if c.onData == nil || c.data != nil {
|
||||
return
|
||||
}
|
||||
c.data = make(chan dataPacket, dataCallbackQueueSize)
|
||||
go func() {
|
||||
for data := range c.data {
|
||||
c.onData(c.account, data)
|
||||
}
|
||||
}()
|
||||
}
|
||||
|
||||
func (c *WSClient) startKeepalive(interval time.Duration) {
|
||||
go func() {
|
||||
ticker := time.NewTicker(interval)
|
||||
|
||||
Reference in New Issue
Block a user