shkong/MiraiGo
1
0
Fork 0
mirror of https://github.com/Mrs4s/MiraiGo.git synced 2025-05-04 19:17:38 +08:00
Code Issues Projects Releases Wiki Activity

fix(client): send on closed channel

Browse Source
This commit is contained in:
wdvxdr 2021-07-20 21:39:43 +08:00
parent bf6cfc84c5
commit ddf3476b30
No known key found for this signature in database
GPG Key ID: 55FF1414A69CEBA6
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
client/network.go
View File

@ -5,9 +5,10 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/pkg/errors"
"github.com/Mrs4s/MiraiGo/protocol/packets" "github.com/Mrs4s/MiraiGo/protocol/packets"
"github.com/Mrs4s/MiraiGo/utils" "github.com/Mrs4s/MiraiGo/utils"
"github.com/pkg/errors"
) )
// connect 连接到 QQClient.servers 中的服务器 // connect 连接到 QQClient.servers 中的服务器
@ -60,16 +61,12 @@ func (c *QQClient) sendAndWait(seq uint16, pkt []byte, params ...requestParams)
Response interface{} Response interface{}
Error error Error error
} }
ch := make(chan T, 1)
var p requestParams
ch := make(chan T) if len(params) != 0 {
defer close(ch) p = params[0]
}
p := func() requestParams {
if len(params) == 0 {
return nil
}
return params[0]
}()
c.handlers.Store(seq, &handlerInfo{fun: func(i interface{}, err error) { c.handlers.Store(seq, &handlerInfo{fun: func(i interface{}, err error) {
ch <- T{ ch <- T{
@ -96,8 +93,6 @@ func (c *QQClient) sendAndWait(seq uint16, pkt []byte, params ...requestParams)
continue continue
} }
c.handlers.Delete(seq) c.handlers.Delete(seq)
// c.Error("packet timed out, seq: %v", seq)
// println("Packet Timed out")
return nil, errors.New("Packet timed out") return nil, errors.New("Packet timed out")
} }
} }
@ -174,9 +169,8 @@ func (c *QQClient) netLoop() {
} }
continue continue
} }
payload := pkt.Payload
if pkt.Flag2 == 2 { if pkt.Flag2 == 2 {
payload, err = pkt.DecryptPayload(c.RandomKey, c.sigInfo.wtSessionTicketKey) pkt.Payload, err = pkt.DecryptPayload(c.RandomKey, c.sigInfo.wtSessionTicketKey)
if err != nil { if err != nil {
c.Error("decrypt payload error: %v", err) c.Error("decrypt payload error: %v", err)
continue continue
@ -185,7 +179,7 @@ func (c *QQClient) netLoop() {
errCount = 0 errCount = 0
c.Debug("rev pkt: %v seq: %v", pkt.CommandName, pkt.SequenceId) c.Debug("rev pkt: %v seq: %v", pkt.CommandName, pkt.SequenceId)
atomic.AddUint64(&c.stat.PacketReceived, 1) atomic.AddUint64(&c.stat.PacketReceived, 1)
go func() { go func(pkt *packets.IncomingPacket) {
defer func() { defer func() {
if pan := recover(); pan != nil { if pan := recover(); pan != nil {
c.Error("panic on decoder %v : %v\n%s", pkt.CommandName, pan, debug.Stack()) c.Error("panic on decoder %v : %v\n%s", pkt.CommandName, pan, debug.Stack())
@ -204,7 +198,7 @@ func (c *QQClient) netLoop() {
} }
return info.params return info.params
}(), }(),
}, payload) }, pkt.Payload)
if err != nil { if err != nil {
c.Debug("decode pkt %v error: %+v", pkt.CommandName, err) c.Debug("decode pkt %v error: %+v", pkt.CommandName, err)
} }
@ -219,6 +213,6 @@ func (c *QQClient) netLoop() {
} else { } else {
c.Debug("Unhandled Command: %s\nSeq: %d\nThis message can be ignored.", pkt.CommandName, pkt.SequenceId) c.Debug("Unhandled Command: %s\nSeq: %d\nThis message can be ignored.", pkt.CommandName, pkt.SequenceId)
} }
}() }(pkt)
} }
} }