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

Merge branch 'master' of https://github.com/Mrs4s/MiraiGo

Browse Source
This commit is contained in:
wdvxdr 2020-11-14 16:12:11 +08:00
commit 5e9e9b843b
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
client/client.go
View File

@ -87,7 +87,6 @@ type QQClient struct {
eventHandlers *eventHandlers eventHandlers *eventHandlers
groupListLock sync.Mutex groupListLock sync.Mutex
msgSvcLock sync.Mutex
} }
type loginSigInfo struct { type loginSigInfo struct {
@ -176,15 +175,7 @@ func NewClientMd5(uin int64, passwordMd5 [16]byte) *QQClient {
transCache: utils.NewCache(time.Second * 15), transCache: utils.NewCache(time.Second * 15),
onlinePushCache: utils.NewCache(time.Second * 15), onlinePushCache: utils.NewCache(time.Second * 15),
version: genVersionInfo(SystemDeviceInfo.Protocol), version: genVersionInfo(SystemDeviceInfo.Protocol),
servers: []*net.TCPAddr{ // default servers servers: []*net.TCPAddr{},
{IP: net.IP{42, 81, 169, 46}, Port: 8080},
{IP: net.IP{42, 81, 172, 81}, Port: 80},
{IP: net.IP{114, 221, 148, 59}, Port: 14000},
{IP: net.IP{42, 81, 172, 147}, Port: 443},
{IP: net.IP{125, 94, 60, 146}, Port: 80},
{IP: net.IP{114, 221, 144, 215}, Port: 80},
{IP: net.IP{42, 81, 172, 22}, Port: 80},
},
} }
adds, err := net.LookupIP("msfwifi.3g.qq.com") // host servers adds, err := net.LookupIP("msfwifi.3g.qq.com") // host servers
if err == nil && len(adds) > 0 { if err == nil && len(adds) > 0 {
@ -201,6 +192,16 @@ func NewClientMd5(uin int64, passwordMd5 [16]byte) *QQClient {
if err == nil && len(sso) > 0 { if err == nil && len(sso) > 0 {
cli.servers = append(sso, cli.servers...) cli.servers = append(sso, cli.servers...)
} }
if len(cli.servers) == 0 {
cli.servers = []*net.TCPAddr{ // default servers
{IP: net.IP{42, 81, 172, 81}, Port: 80},
{IP: net.IP{114, 221, 148, 59}, Port: 14000},
{IP: net.IP{42, 81, 172, 147}, Port: 443},
{IP: net.IP{125, 94, 60, 146}, Port: 80},
{IP: net.IP{114, 221, 144, 215}, Port: 80},
{IP: net.IP{42, 81, 172, 22}, Port: 80},
}
}
rand.Read(cli.RandomKey) rand.Read(cli.RandomKey)
return cli return cli
} }
@ -1133,6 +1134,7 @@ func (c *QQClient) netLoop() {
func (c *QQClient) doHeartbeat() { func (c *QQClient) doHeartbeat() {
c.heartbeatEnabled = true c.heartbeatEnabled = true
times := 0
for c.Online { for c.Online {
seq := c.nextSeq() seq := c.nextSeq()
sso := packets.BuildSsoPacket(seq, c.version.AppId, "Heartbeat.Alive", SystemDeviceInfo.IMEI, []byte{}, c.OutGoingPacketSessionId, []byte{}, c.ksid) sso := packets.BuildSsoPacket(seq, c.version.AppId, "Heartbeat.Alive", SystemDeviceInfo.IMEI, []byte{}, c.OutGoingPacketSessionId, []byte{}, c.ksid)
@ -1143,6 +1145,11 @@ func (c *QQClient) doHeartbeat() {
c.Disconnect() c.Disconnect()
break break
} }
times++
if times >= 7 {
_ = c.registerClient()
times = 0
}
time.Sleep(time.Second * 30) time.Sleep(time.Second * 30)
} }
c.heartbeatEnabled = false c.heartbeatEnabled = false

5
client/decoders.go
View File

@ -426,8 +426,6 @@ func decodeMsgSendResponse(c *QQClient, _ uint16, payload []byte) (interface{},
// MessageSvc.PushNotify // MessageSvc.PushNotify
func decodeSvcNotify(c *QQClient, _ uint16, _ []byte) (interface{}, error) { func decodeSvcNotify(c *QQClient, _ uint16, _ []byte) (interface{}, error) {
c.msgSvcLock.Lock()
defer c.msgSvcLock.Unlock()
_, err := c.sendAndWait(c.buildGetMessageRequestPacket(msg.SyncFlag_START, time.Now().Unix())) _, err := c.sendAndWait(c.buildGetMessageRequestPacket(msg.SyncFlag_START, time.Now().Unix()))
return nil, err return nil, err
} }
@ -708,6 +706,9 @@ func decodeOnlinePushReqPacket(c *QQClient, seq uint16, payload []byte) (interfa
_ = proto.Unmarshal(r.ReadAvailable(), &b) _ = proto.Unmarshal(r.ReadAvailable(), &b)
if b.OptMsgRecall != nil { if b.OptMsgRecall != nil {
for _, rm := range b.OptMsgRecall.RecalledMsgList { for _, rm := range b.OptMsgRecall.RecalledMsgList {
if rm.MsgType == 2 {
continue
}
c.dispatchGroupMessageRecalledEvent(&GroupMessageRecalledEvent{ c.dispatchGroupMessageRecalledEvent(&GroupMessageRecalledEvent{
GroupCode: groupId, GroupCode: groupId,
OperatorUin: b.OptMsgRecall.Uin, OperatorUin: b.OptMsgRecall.Uin,