Fix deadloop for dirty (#127)

* fix: deadloop for dirty

* base DirtyPayload

* make ci green

Author: dchaofei

wechaty-puppet-service/puppet_service.go

@@ -1128,7 +1128,7 @@ func (p *PuppetService) TagContactList(contactID string) ([]string, error) {
 // DirtyPayload ...
 func (p *PuppetService) DirtyPayload(payloadType schemas.PayloadType, id string) error {
 	log.Printf("PuppetService DirtyPayload(%v, %v)\n", payloadType, id)
-	err := p.Puppet.DirtyPayload(payloadType, id)
+	err := p.Puppet.OnDirty(payloadType, id)
 	if err != nil {
 		return err
 	}

wechaty-puppet/puppet.go

@@ -132,7 +132,8 @@ func NewPuppet(option Option) (*Puppet, error) {
 	if err != nil {
 		return nil, err
 	}
-	return &Puppet{
+
+	p := &Puppet{
 		Option:                     option,
 		EventEmitter:               events.New(),
 		cacheMessagePayload:        cacheMessage,
@@ -141,7 +142,16 @@ func NewPuppet(option Option) (*Puppet, error) {
 		cacheRoomPayload:           cacheRoomPayload,
 		cacheRoomMemberPayload:     cacheRoomMemberPayload,
 		cacheContactPayload:        cacheContactPayload,
-	}, nil
+	}
+
+	p.On(schemas.PuppetEventNameDirty, func(i ...interface{}) {
+		payload, ok := i[0].(*schemas.EventDirtyPayload)
+		if !ok {
+			return
+		}
+		_ = p.OnDirty(payload.PayloadType, payload.PayloadId)
+	})
+	return p, nil
 }
 
 // MessageList message list
@@ -725,8 +735,8 @@ func (p *Puppet) dirtyPayloadFriendship(friendshipID string) {
 	p.cacheFriendshipPayload.Remove(friendshipID)
 }
 
-// DirtyPayload ...
-func (p *Puppet) DirtyPayload(payloadType schemas.PayloadType, id string) error {
+// OnDirty clean cache
+func (p *Puppet) OnDirty(payloadType schemas.PayloadType, id string) error {
 	switch payloadType {
 	case schemas.PayloadTypeMessage:
 		p.dirtyPayloadMessage(id)
@@ -760,3 +770,8 @@ func (p *Puppet) MessageMiniProgram(messageID string) (*schemas.MiniProgramPaylo
 	}
 	return miniapp, nil
 }
+
+// DirtyPayload base clean cache
+func (p *Puppet) DirtyPayload(payloadType schemas.PayloadType, id string) error {
+	return p.OnDirty(payloadType, id)
+}

wechaty/user/contact.go

@@ -52,13 +52,6 @@ func (c *Contact) Ready(forceSync bool) (err error) {
 		return nil
 	}
 
-	if forceSync {
-		err := c.GetPuppet().DirtyPayload(schemas.PayloadTypeContact, c.Id)
-		if err != nil {
-			return err
-		}
-	}
-
 	c.payload, err = c.GetPuppet().ContactPayload(c.Id)
 	if err != nil {
 		return err
@@ -72,6 +65,10 @@ func (c *Contact) IsReady() bool {
 
 // Sync force reload data for Contact, sync data from lowlevel API again.
 func (c *Contact) Sync() error {
+	err := c.GetPuppet().DirtyPayload(schemas.PayloadTypeContact, c.Id)
+	if err != nil {
+		return err
+	}
 	return c.Ready(true)
 }
 

wechaty/user/room.go

@@ -32,15 +32,6 @@ func (r *Room) Ready(forceSync bool) (err error) {
 		return nil
 	}
 
-	if forceSync {
-		if err := r.GetPuppet().DirtyPayload(schemas.PayloadTypeRoom, r.id); err != nil {
-			return err
-		}
-		if err := r.GetPuppet().DirtyPayload(schemas.PayloadTypeRoomMember, r.id); err != nil {
-			return err
-		}
-	}
-
 	r.payLoad, err = r.GetPuppet().RoomPayload(r.id)
 	if err != nil {
 		return err
@@ -140,6 +131,12 @@ func (r *Room) Alias(contact _interface.IContact) (string, error) {
 
 // Sync Force reload data for Room, Sync data from puppet API again.
 func (r *Room) Sync() error {
+	if err := r.GetPuppet().DirtyPayload(schemas.PayloadTypeRoom, r.id); err != nil {
+		return err
+	}
+	if err := r.GetPuppet().DirtyPayload(schemas.PayloadTypeRoomMember, r.id); err != nil {
+		return err
+	}
 	return r.Ready(true)
 }
 

wechaty/wechaty.go

@@ -458,14 +458,14 @@ func (w *Wechaty) initPuppetEventBridge() {
 				switch payload.PayloadType {
 				case schemas.PayloadTypeRoomMember,
 					schemas.PayloadTypeContact:
-					if err := w.contact.Load(payload.PayloadId).Sync(); err != nil {
-						log.Printf("emit dirty contact.Sync() err: %s\n", err.Error())
+					if err := w.contact.Load(payload.PayloadId).Ready(true); err != nil {
+						log.Printf("emit dirty contact.Ready() err: %s\n", err.Error())
 						w.emit(schemas.PuppetEventNameError, NewContext(), err)
 						return
 					}
 				case schemas.PayloadTypeRoom:
-					if err := w.room.Load(payload.PayloadId).Sync(); err != nil {
-						log.Printf("emit dirty room.Sync() err: %s\n", err.Error())
+					if err := w.room.Load(payload.PayloadId).Ready(true); err != nil {
+						log.Printf("emit dirty room.Ready() err: %s\n", err.Error())
 						w.emit(schemas.PuppetEventNameError, NewContext(), err)
 						return
 					}