@juzi/wechaty-puppet-service 1.0.9 → 1.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juzi/wechaty-puppet-service",
-  "version": "1.0.9",
+  "version": "1.0.12",
   "description": "Puppet Service for Wechaty",
   "type": "module",
   "exports": {
@@ -65,10 +65,10 @@
     "why-is-node-running": "^2.2.1"
   },
   "peerDependencies": {
-    "@juzi/wechaty-puppet": "1.0.6"
+    "@juzi/wechaty-puppet": "1.0.7"
   },
   "dependencies": {
-    "@juzi/wechaty-grpc": "1.0.6",
+    "@juzi/wechaty-grpc": "1.0.7",
     "clone-class": "^1.1.1",
     "ducks": "^1.0.2",
     "file-box": "^1.5.5",

package/src/client/puppet-service.ts

@@ -689,7 +689,8 @@ class PuppetService extends PUPPET.Puppet {
        * `weixin` is deprecated, will be removed after Dec 31, 2022
        * use `handle` instead.
        */
-      weixin      : response.getWeixin(),
+      weixin        : response.getWeixin(),
+      additionalInfo: response.getAdditionalInfo(),
     }
 
     await this._payloadStore.contact?.set(id, payload)
@@ -1380,13 +1381,14 @@ class PuppetService extends PUPPET.Puppet {
     )(request)
 
     const payload: PUPPET.payloads.Room = {
-      adminIdList  : response.getAdminIdsList(),
-      avatar       : response.getAvatar(),
-      handle       : response.getHandle(),
-      id           : response.getId(),
-      memberIdList : response.getMemberIdsList(),
-      ownerId      : response.getOwnerId(),
-      topic        : response.getTopic(),
+      adminIdList   : response.getAdminIdsList(),
+      avatar        : response.getAvatar(),
+      handle        : response.getHandle(),
+      id            : response.getId(),
+      memberIdList  : response.getMemberIdsList(),
+      ownerId       : response.getOwnerId(),
+      topic         : response.getTopic(),
+      additionalInfo: response.getAdditionalInfo(),
     }
 
     await this._payloadStore.room?.set(id, payload)
@@ -1598,11 +1600,12 @@ class PuppetService extends PUPPET.Puppet {
     )(request)
 
     const payload: PUPPET.payloads.RoomMember = {
-      avatar    : response.getAvatar(),
-      id        : response.getId(),
-      inviterId : response.getInviterId(),
-      name      : response.getName(),
-      roomAlias : response.getRoomAlias(),
+      avatar        : response.getAvatar(),
+      id            : response.getId(),
+      inviterId     : response.getInviterId(),
+      name          : response.getName(),
+      roomAlias     : response.getRoomAlias(),
+      additionalInfo: response.getAdditionalInfo(),
     }
 
     await this._payloadStore.roomMember?.set(roomId, {

package/src/config.ts

@@ -30,6 +30,7 @@ const GRPC_OPTIONS = {
 export const NO_LOG_EVENTS: grpcPuppet.EventTypeMap[keyof grpcPuppet.EventTypeMap][] = [
   grpcPuppet.EventType.EVENT_TYPE_HEARTBEAT,
   grpcPuppet.EventType.EVENT_TYPE_DONG,
+  grpcPuppet.EventType.EVENT_TYPE_DIRTY,
 ]
 
 export {

package/src/package-json.ts

@@ -4,7 +4,7 @@
 import type { PackageJson } from 'type-fest'
 export const packageJson: PackageJson = {
   "name": "@juzi/wechaty-puppet-service",
-  "version": "1.0.9",
+  "version": "1.0.12",
   "description": "Puppet Service for Wechaty",
   "type": "module",
   "exports": {
@@ -69,10 +69,10 @@ export const packageJson: PackageJson = {
     "why-is-node-running": "^2.2.1"
   },
   "peerDependencies": {
-    "@juzi/wechaty-puppet": "1.0.6"
+    "@juzi/wechaty-puppet": "1.0.7"
   },
   "dependencies": {
-    "@juzi/wechaty-grpc": "1.0.6",
+    "@juzi/wechaty-grpc": "1.0.7",
     "clone-class": "^1.1.1",
     "ducks": "^1.0.2",
     "file-box": "^1.5.5",

package/src/server/event-stream-manager.ts

@@ -34,6 +34,7 @@ class EventStreamManager {
   protected eventStream: undefined | grpc.ServerWritableStream<grpcPuppet.EventRequest, grpcPuppet.EventResponse>
 
   private puppetListening = false
+  private offCallbackList: (() => void)[] = []
 
   constructor (
     public puppet: PUPPET.impls.PuppetInterface,
@@ -53,10 +54,14 @@ class EventStreamManager {
     if (this.eventStream) {
       throw new Error('can not set twice')
     }
+
+    // clear all listeners before load new ones
+    this.removePuppetListeners()
+
     this.eventStream = stream
 
-    const removeAllListeners = this.connectPuppetEventToStreamingCall()
-    this.onStreamingCallEnd(removeAllListeners)
+    this.connectPuppetEventToStreamingCall()
+    this.onStreamingCallEnd()
 
     /**
      * Huan(202108):
@@ -112,6 +117,7 @@ class EventStreamManager {
       throw new Error('no this.eventStream')
     }
 
+    this.removePuppetListeners()
     this.eventStream.end()
     this.eventStream = undefined
   }
@@ -150,19 +156,9 @@ class EventStreamManager {
     }
   }
 
-  public connectPuppetEventToStreamingCall (): () => void {
+  public connectPuppetEventToStreamingCall () {
     log.verbose('EventStreamManager', 'connectPuppetEventToStreamingCall() for %s', this.puppet)
 
-    const offCallbackList = [] as (() => void)[]
-    const offAll = () => {
-      log.verbose('EventStreamManager',
-        'connectPuppetEventToStreamingCall() offAll() %s callbacks',
-        offCallbackList.length,
-      )
-      offCallbackList.forEach(off => off())
-      this.puppetListening = false
-    }
-
     const eventNameList: PUPPET.types.PuppetEventName[] = Object.keys(PUPPET.types.PUPPET_EVENT_DICT) as PUPPET.types.PuppetEventName[]
     for (const eventName of eventNameList) {
       log.verbose('EventStreamManager',
@@ -176,105 +172,105 @@ class EventStreamManager {
           const listener = (payload: PUPPET.payloads.EventDong) => this.grpcEmit(grpcPuppet.EventType.EVENT_TYPE_DONG, payload)
           this.puppet.on('dong', listener)
           const off = () => this.puppet.off('dong', listener)
-          offCallbackList.push(off)
+          this.offCallbackList.push(off)
           break
         }
         case 'dirty': {
           const listener = (payload: PUPPET.payloads.EventDirty) => this.grpcEmit(grpcPuppet.EventType.EVENT_TYPE_DIRTY, payload)
           this.puppet.on('dirty', listener)
           const off = () => this.puppet.off('dirty', listener)
-          offCallbackList.push(off)
+          this.offCallbackList.push(off)
           break
         }
         case 'error': {
           const listener = (payload: PUPPET.payloads.EventError) => this.grpcEmit(grpcPuppet.EventType.EVENT_TYPE_ERROR, payload)
           this.puppet.on('error', listener)
           const off = () => this.puppet.off('error', listener)
-          offCallbackList.push(off)
+          this.offCallbackList.push(off)
           break
         }
         case 'heartbeat': {
           const listener = (payload: PUPPET.payloads.EventHeartbeat) => this.grpcEmit(grpcPuppet.EventType.EVENT_TYPE_HEARTBEAT, payload)
           this.puppet.on('heartbeat', listener)
           const off = () => this.puppet.off('heartbeat', listener)
-          offCallbackList.push(off)
+          this.offCallbackList.push(off)
           break
         }
         case 'friendship': {
           const listener = (payload: PUPPET.payloads.EventFriendship) => this.grpcEmit(grpcPuppet.EventType.EVENT_TYPE_FRIENDSHIP, payload)
           this.puppet.on('friendship', listener)
           const off = () => this.puppet.off('friendship', listener)
-          offCallbackList.push(off)
+          this.offCallbackList.push(off)
           break
         }
         case 'login': {
           const listener = (payload: PUPPET.payloads.EventLogin) => this.grpcEmit(grpcPuppet.EventType.EVENT_TYPE_LOGIN, payload)
           this.puppet.on('login', listener)
           const off = () => this.puppet.off('login', listener)
-          offCallbackList.push(off)
+          this.offCallbackList.push(off)
           break
         }
         case 'logout': {
           const listener = (payload: PUPPET.payloads.EventLogout) => this.grpcEmit(grpcPuppet.EventType.EVENT_TYPE_LOGOUT, payload)
           this.puppet.on('logout', listener)
           const off = () => this.puppet.off('logout', listener)
-          offCallbackList.push(off)
+          this.offCallbackList.push(off)
           break
         }
         case 'message': {
           const listener = (payload: PUPPET.payloads.EventMessage) => this.grpcEmit(grpcPuppet.EventType.EVENT_TYPE_MESSAGE, payload)
           this.puppet.on('message', listener)
           const off = () => this.puppet.off('message', listener)
-          offCallbackList.push(off)
+          this.offCallbackList.push(off)
           break
         }
         case 'post': {
           const listener = (payload: PUPPET.payloads.EventPost) => this.grpcEmit(grpcPuppet.EventType.EVENT_TYPE_POST, payload)
           this.puppet.on('post', listener)
           const off = () => this.puppet.off('post', listener)
-          offCallbackList.push(off)
+          this.offCallbackList.push(off)
           break
         }
         case 'ready': {
           const listener = (payload: PUPPET.payloads.EventReady) => this.grpcEmit(grpcPuppet.EventType.EVENT_TYPE_READY, payload)
           this.puppet.on('ready', listener)
           const off = () => this.puppet.off('ready', listener)
-          offCallbackList.push(off)
+          this.offCallbackList.push(off)
           break
         }
         case 'room-invite': {
           const listener = (payload: PUPPET.payloads.EventRoomInvite) => this.grpcEmit(grpcPuppet.EventType.EVENT_TYPE_ROOM_INVITE, payload)
           this.puppet.on('room-invite', listener)
           const off = () => this.puppet.off('room-invite', listener)
-          offCallbackList.push(off)
+          this.offCallbackList.push(off)
           break
         }
         case 'room-join': {
           const listener = (payload: PUPPET.payloads.EventRoomJoin) => this.grpcEmit(grpcPuppet.EventType.EVENT_TYPE_ROOM_JOIN, payload)
           this.puppet.on('room-join', listener)
           const off = () => this.puppet.off('room-join', listener)
-          offCallbackList.push(off)
+          this.offCallbackList.push(off)
           break
         }
         case 'room-leave': {
           const listener = (payload: PUPPET.payloads.EventRoomLeave) => this.grpcEmit(grpcPuppet.EventType.EVENT_TYPE_ROOM_LEAVE, payload)
           this.puppet.on('room-leave', listener)
           const off = () => this.puppet.off('room-leave', listener)
-          offCallbackList.push(off)
+          this.offCallbackList.push(off)
           break
         }
         case 'room-topic': {
           const listener = (payload: PUPPET.payloads.EventRoomTopic) => this.grpcEmit(grpcPuppet.EventType.EVENT_TYPE_ROOM_TOPIC, payload)
           this.puppet.on('room-topic', listener)
           const off = () => this.puppet.off('room-topic', listener)
-          offCallbackList.push(off)
+          this.offCallbackList.push(off)
           break
         }
         case 'scan': {
           const listener = (payload: PUPPET.payloads.EventScan) => this.grpcEmit(grpcPuppet.EventType.EVENT_TYPE_SCAN, payload)
           this.puppet.on('scan', listener)
           const off = () => this.puppet.off('scan', listener)
-          offCallbackList.push(off)
+          this.offCallbackList.push(off)
           break
         }
         case 'reset':
@@ -288,17 +284,14 @@ class EventStreamManager {
     }
 
     this.puppetListening = true
-    return offAll
   }
 
   /**
    * Detect if the streaming call was gone (GRPC disconnects)
    *  https://github.com/grpc/grpc/issues/8117#issuecomment-362198092
    */
-  private onStreamingCallEnd (
-    removePuppetListeners: () => void,
-  ): void {
-    log.verbose('EventStreamManager', 'onStreamingCallEnd(callback)')
+  private onStreamingCallEnd () {
+    log.verbose('EventStreamManager', 'onStreamingCallEnd()')
 
     if (!this.eventStream) {
       throw new Error('no this.eventStream found')
@@ -324,7 +317,7 @@ class EventStreamManager {
       )
 
       if (this.puppetListening) {
-        removePuppetListeners()
+        this.removePuppetListeners()
       }
       if (this.eventStream) {
         this.eventStream = undefined
@@ -336,7 +329,7 @@ class EventStreamManager {
     this.eventStream.on('error', err => {
       log.verbose('EventStreamManager', 'this.onStreamingCallEnd() this.eventStream.on(error) fired: %s', err)
       if (this.puppetListening) {
-        removePuppetListeners()
+        this.removePuppetListeners()
       }
       if (this.eventStream) {
         this.eventStream = undefined
@@ -348,7 +341,7 @@ class EventStreamManager {
     this.eventStream.on('finish', () => {
       log.verbose('EventStreamManager', 'this.onStreamingCallEnd() this.eventStream.on(finish) fired')
       if (this.puppetListening) {
-        removePuppetListeners()
+        this.removePuppetListeners()
       }
       if (this.eventStream) {
         this.eventStream = undefined
@@ -360,7 +353,7 @@ class EventStreamManager {
     this.eventStream.on('end', () => {
       log.verbose('EventStreamManager', 'this.onStreamingCallEnd() this.eventStream.on(end) fired')
       if (this.puppetListening) {
-        removePuppetListeners()
+        this.removePuppetListeners()
       }
       if (this.eventStream) {
         this.eventStream = undefined
@@ -372,7 +365,7 @@ class EventStreamManager {
     this.eventStream.on('close', () => {
       log.verbose('EventStreamManager', 'this.onStreamingCallEnd() this.eventStream.on(close) fired')
       if (this.puppetListening) {
-        removePuppetListeners()
+        this.removePuppetListeners()
       }
       if (this.eventStream) {
         this.eventStream = undefined
@@ -382,6 +375,13 @@ class EventStreamManager {
     })
   }
 
+  removePuppetListeners () {
+    while (this.offCallbackList.length > 0) {
+      const func = this.offCallbackList.pop()
+      func && func()
+    }
+  }
+
 }
 
 export { EventStreamManager }

package/src/server/puppet-implementation.ts

@@ -255,6 +255,7 @@ function puppetImplementation (
         response.setCorporation(payload.corporation || '')
         response.setTitle(payload.title || '')
         response.setDescription(payload.description || '')
+        response.setAdditionalInfo(payload.additionalInfo || '')
 
         return callback(null, response)
       } catch (e) {
@@ -769,6 +770,7 @@ function puppetImplementation (
          */
         response.setListenerId(payload.listenerId || payload.toId || '')
         response.setType(payload.type as grpcPuppet.MessageTypeMap[keyof grpcPuppet.MessageTypeMap])
+        response.setQuoteId(payload.quoteId || '')
 
         return callback(null, response)
 
@@ -1349,6 +1351,7 @@ function puppetImplementation (
         response.setInviterId(payload.inviterId || '')
         response.setName(payload.name)
         response.setRoomAlias(payload.roomAlias || '')
+        response.setAdditionalInfo(payload.additionalInfo || '')
 
         return callback(null, response)
 
@@ -1373,6 +1376,7 @@ function puppetImplementation (
         response.setMemberIdsList(payload.memberIdList)
         response.setOwnerId(payload.ownerId || '')
         response.setTopic(payload.topic)
+        response.setAdditionalInfo(payload.additionalInfo || '')
 
         return callback(null, response)