shkong/go-cqhttp
1
0
Fork 0
mirror of https://github.com/Mrs4s/go-cqhttp.git synced 2025-05-05 03:23:49 +08:00
Code Issues Projects Releases Wiki Activity

fix(server): ws reverse reconnect.

Browse Source
This commit is contained in:
wdvxdr 2021-08-11 22:39:58 +08:00
parent 75e82eaf35
commit c355549c8d
No known key found for this signature in database
GPG Key ID: 703F8C071DE7A1B6
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/websocket.go
View File

@ -160,7 +160,12 @@ func (c *websocketClient) connectEvent() {
} }
log.Infof("已连接到反向WebSocket Event服务器 %v", c.conf.Event) log.Infof("已连接到反向WebSocket Event服务器 %v", c.conf.Event)
c.eventConn = &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)} if c.eventConn == nil {
wrappedConn := &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)}
c.eventConn = wrappedConn
} else {
c.eventConn.Conn = conn
}
} }
func (c *websocketClient) connectUniversal() { func (c *websocketClient) connectUniversal() {
@ -189,12 +194,16 @@ func (c *websocketClient) connectUniversal() {
log.Warnf("反向WebSocket 握手时出现错误: %v", err) log.Warnf("反向WebSocket 握手时出现错误: %v", err)
} }
wrappedConn := &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)} if c.universalConn == nil {
if c.conf.RateLimit.Enabled { wrappedConn := &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)}
wrappedConn.apiCaller.use(rateLimit(c.conf.RateLimit.Frequency, c.conf.RateLimit.Bucket)) if c.conf.RateLimit.Enabled {
wrappedConn.apiCaller.use(rateLimit(c.conf.RateLimit.Frequency, c.conf.RateLimit.Bucket))
}
c.universalConn = wrappedConn
} else {
c.universalConn.Conn = conn
} }
go c.listenAPI(wrappedConn, true) go c.listenAPI(c.universalConn, true)
c.universalConn = wrappedConn
} }
func (c *websocketClient) listenAPI(conn *webSocketConn, u bool) { func (c *websocketClient) listenAPI(conn *webSocketConn, u bool) {