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

Merge pull request #27 from wfjsw/patches/group-list-race-condition

Browse Source 
Mrs4s/go-cqhttp#135
This commit is contained in:
Mrs4s 2020-08-21 13:55:01 +08:00 committed by GitHub
commit eb783be51d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
client/client.go
View File

@ -75,8 +75,10 @@ type QQClient struct {
highwayApplyUpSeq int32
eventHandlers *eventHandlers
groupListLock *sync.Mutex
groupListLock sync.Mutex
msgSvcLock sync.Mutex
seqLock sync.Mutex
}
type loginSigInfo struct {
@ -143,7 +145,6 @@ func NewClientMd5(uin int64, passwordMd5 [16]byte) *QQClient {
highwayApplyUpSeq: 77918,
ksid: []byte("|454001228437590|A8.2.7.27f6ea96"),
eventHandlers: &eventHandlers{},
groupListLock: new(sync.Mutex),
msgSvcCache: utils.NewCache(time.Second * 15),
transCache: utils.NewCache(time.Second * 15),
}
@ -598,20 +599,10 @@ func (c *QQClient) QueryFriendImage(target int64, hash []byte, size int32) (*mes
}, nil
}
func (c *QQClient) ReloadGroupList(async ...bool) error {
f := false
if len(async) > 0 {
f = async[0]
}
func (c *QQClient) ReloadGroupList() error {
c.groupListLock.Lock()
defer c.groupListLock.Unlock()
list, err := func() ([]*GroupInfo, error) {
if f {
return c.GetGroupListAsync()
} else {
return c.GetGroupList()
}
}()
list, err := c.GetGroupList()
if err != nil {
return err
}
@ -625,32 +616,19 @@ func (c *QQClient) GetGroupList() ([]*GroupInfo, error) {
return nil, err
}
r := rsp.([]*GroupInfo)
wg := sync.WaitGroup{}
wg.Add(len(r))
for _, group := range r {
m, err := c.GetGroupMembers(group)
if err != nil {
continue
}
group.Members = m
}
return r, nil
}
func (c *QQClient) GetGroupListAsync() ([]*GroupInfo, error) {
rsp, err := c.sendAndWait(c.buildGroupListRequestPacket())
if err != nil {
return nil, err
}
r := rsp.([]*GroupInfo)
for _, group := range r {
g := group
go func() {
go func(g *GroupInfo, wg *sync.WaitGroup) {
defer wg.Done()
m, err := c.GetGroupMembers(g)
if err != nil {
return
}
g.Members = m
}()
}(group, &wg)
}
wg.Wait()
return r, nil
}
@ -847,6 +825,9 @@ func (c *QQClient) registerClient() {
}
func (c *QQClient) nextSeq() uint16 {
c.seqLock.Lock()
defer c.seqLock.Unlock()
c.SequenceId++
c.SequenceId &= 0x7FFF
if c.SequenceId == 0 {