@juzi/wechaty-puppet-service 1.0.17 → 1.0.20

package/src/client/puppet-service.ts

@@ -57,6 +57,7 @@ import {
 }                       from '../file-box-helper/mod.js'
 import {
   envVars,
+  FOUR_PER_EM_SPACE,
   log,
   NO_LOG_EVENTS,
   VERSION,
@@ -68,6 +69,7 @@ import { packageJson }  from '../package-json.js'
 
 import { GrpcManager }  from './grpc-manager.js'
 import { PayloadStore } from './payload-store.js'
+import type { TagIdentifier } from '@juzi/wechaty-puppet/filters'
 
 export type PuppetServiceOptions = PUPPET.PuppetOptions & {
   authority?  : string
@@ -347,6 +349,9 @@ class PuppetService extends PUPPET.Puppet {
       case grpcPuppet.EventType.EVENT_TYPE_SCAN:
         this.emit('scan', JSON.parse(payload) as PUPPET.payloads.EventScan)
         break
+      case grpcPuppet.EventType.EVENT_TYPE_TAG:
+        this.emit('tag', JSON.parse(payload) as PUPPET.payloads.EventTag)
+        break
       case grpcPuppet.EventType.EVENT_TYPE_RESET:
         log.warn('PuppetService', 'onGrpcStreamEvent() got an EventType.EVENT_TYPE_RESET ?')
         // the `reset` event should be dealed not send out
@@ -439,6 +444,8 @@ class PuppetService extends PUPPET.Puppet {
       [PUPPET.types.Dirty.Post]:         async (_: string) => {},
       [PUPPET.types.Dirty.Room]:         async (id: string) => this._payloadStore.room?.delete(id),
       [PUPPET.types.Dirty.RoomMember]:   async (id: string) => this._payloadStore.roomMember?.delete(id),
+      [PUPPET.types.Dirty.Tag]:          async (key: string) => this._payloadStore.tag?.delete(key),
+      [PUPPET.types.Dirty.TagGroup]:     async (id: string) => this._payloadStore.tagGroup?.delete(id),
       [PUPPET.types.Dirty.Unspecified]:  async (id: string) => { throw new Error('Unspecified type with id: ' + id) },
     }
 
@@ -1432,13 +1439,20 @@ class PuppetService extends PUPPET.Puppet {
 
   override async roomDel (
     roomId    : string,
-    contactId : string,
+    contactIds : string | string[],
   ): Promise<void> {
-    log.verbose('PuppetService', 'roomDel(%s, %s)', roomId, contactId)
+    log.verbose('PuppetService', 'roomDel(%s, %s)', roomId, contactIds)
 
     const request = new grpcPuppet.RoomDelRequest()
     request.setId(roomId)
-    request.setContactId(contactId)
+    if (Array.isArray(contactIds)) {
+      request.setContactIdsList(contactIds)
+      if (contactIds.length === 1) {
+        request.setContactId(contactIds[0] as string)
+      }
+    } else {
+      request.setContactId(contactIds)
+    }
 
     await util.promisify(
       this.grpcManager.client.roomDel
@@ -1922,19 +1936,20 @@ class PuppetService extends PUPPET.Puppet {
    */
 
   override async tagContactTagAdd (
-    tagGroupId: string | undefined,
-    tagId: string,
-    contactId: string,
+    tags: TagIdentifier[],
+    contactIds: string[],
   ): Promise<void> {
-    log.verbose('PuppetService', 'tagContactTagAdd(%s, %s, %s)', tagGroupId, tagId, contactId)
+    log.verbose('PuppetService', 'tagContactTagAdd(%s, %s)', JSON.stringify(tags), contactIds)
 
     const request = new grpcPuppet.TagContactTagAddRequest()
 
-    if (typeof tagGroupId !== 'undefined') {
-      request.setTagGroupId(tagGroupId)
-    }
-    request.setTagId(tagId)
-    request.setContactId(contactId)
+    request.setTagsList(tags.map(t => {
+      const tag = new grpcPuppet.TagIdentifier()
+      t.groupId && tag.setGroupId(t.groupId)
+      tag.setId(t.id)
+      return tag
+    }))
+    request.setContactIdsList(contactIds)
 
     await util.promisify(
       this.grpcManager.client.tagContactTagAdd
@@ -1943,19 +1958,20 @@ class PuppetService extends PUPPET.Puppet {
   }
 
   override async tagContactTagRemove (
-    tagGroupId: string | undefined,
-    tagId: string,
-    contactId: string,
+    tags: TagIdentifier[],
+    contactIds: string[],
   ): Promise<void> {
-    log.verbose('PuppetService', 'tagContactTagRemove(%s, %s, %s)', tagGroupId, tagId, contactId)
+    log.verbose('PuppetService', 'tagContactTagRemove(%s, %s)', JSON.stringify(tags), contactIds)
 
     const request = new grpcPuppet.TagContactTagRemoveRequest()
 
-    if (typeof tagGroupId !== 'undefined') {
-      request.setTagGroupId(tagGroupId)
-    }
-    request.setTagId(tagId)
-    request.setContactId(contactId)
+    request.setTagsList(tags.map(t => {
+      const tag = new grpcPuppet.TagIdentifier()
+      t.groupId && tag.setGroupId(t.groupId)
+      tag.setId(t.id)
+      return tag
+    }))
+    request.setContactIdsList(contactIds)
 
     await util.promisify(
       this.grpcManager.client.tagContactTagRemove
@@ -1965,7 +1981,7 @@ class PuppetService extends PUPPET.Puppet {
 
   override async tagGroupAdd (
     tagGroupName: string,
-  ): Promise<PUPPET.payloads.TagGroup | void> {
+  ): Promise<string | void> {
     log.verbose('PuppetService', 'tagGroupAdd(%s)', tagGroupName)
 
     const request = new grpcPuppet.TagGroupAddRequest()
@@ -1977,18 +1993,9 @@ class PuppetService extends PUPPET.Puppet {
         .bind(this.grpcManager.client),
     )(request)
 
-    const grpcPayload = result.getPayload()
-    const id = grpcPayload?.getId()
-    const name = grpcPayload?.getName()
-
-    if (id && name) {
-      const payload: PUPPET.payloads.TagGroup = {
-        id,
-        name,
-      }
-      return payload
-    }
+    const id = result.getTagGroupId()
 
+    return id
   }
 
   override async tagGroupDelete (
@@ -2008,10 +2015,10 @@ class PuppetService extends PUPPET.Puppet {
   }
 
   override async tagTagAdd (
-    tagGroupId: string | undefined,
     tagName: string,
-  ): Promise<PUPPET.payloads.Tag | void> {
-    log.verbose('PuppetService', 'tagTagAdd(%s, %s)', tagGroupId, tagName)
+    tagGroupId?: string,
+  ): Promise<PUPPET.filters.TagIdentifier | void> {
+    log.verbose('PuppetService', 'tagTagAdd(%s, %s)', tagName, tagGroupId)
 
     const request = new grpcPuppet.TagTagAddRequest()
 
@@ -2025,36 +2032,31 @@ class PuppetService extends PUPPET.Puppet {
         .bind(this.grpcManager.client),
     )(request)
 
-    const grpcPayload = result.getPayload()
-    const id = grpcPayload?.getId()
-    const name = grpcPayload?.getName()
-    const groupId = grpcPayload?.getGroupId()
-    const type = grpcPayload?.getType()
+    const tag = result.getTag()
+    const id = tag?.getId()
+    const groupId = tag?.getGroupId()
 
-    if (id && name && (typeof type !== 'undefined')) {
-      const payload: PUPPET.payloads.Tag = {
+    if (id) {
+      return {
         id,
-        name,
         groupId,
-        type,
       }
-      return payload
     }
-
   }
 
   override async tagTagDelete (
-    tagGroupId: string | undefined,
-    tagId: string,
+    tag: TagIdentifier,
   ): Promise<void> {
-    log.verbose('PuppetService', 'tagTagDelete(%s, %s)', tagGroupId, tagId)
+    log.verbose('PuppetService', 'tagTagDelete(%s)', JSON.stringify(tag))
 
     const request = new grpcPuppet.TagTagDeleteRequest()
+    const tagProb = new grpcPuppet.TagIdentifier()
 
-    if (typeof tagGroupId !== 'undefined') {
-      request.setTagGroupId(tagGroupId)
-    }
-    request.setTagId(tagId)
+    tag.groupId && tagProb.setGroupId(tag.groupId)
+    tagProb.setId(tag.id)
+    request.setTag(tagProb)
+
+    request.setTag(tagProb)
 
     await util.promisify(
       this.grpcManager.client.tagTagDelete
@@ -2063,7 +2065,7 @@ class PuppetService extends PUPPET.Puppet {
 
   }
 
-  override async tagGroupList (): Promise<PUPPET.payloads.TagGroup[]> {
+  override async tagGroupList (): Promise<string[]> {
     log.verbose('PuppetService', 'tagGroupList()')
 
     const request = new grpcPuppet.TagGroupListRequest()
@@ -2073,19 +2075,13 @@ class PuppetService extends PUPPET.Puppet {
         .bind(this.grpcManager.client),
     )(request)
 
-    const grpcPayloads = result.getPayloadsList()
-    const payloads: PUPPET.payloads.TagGroup[] = grpcPayloads.map(payload => {
-      return {
-        id: payload.getId(),
-        name: payload.getName(),
-      } as PUPPET.payloads.TagGroup
-    })
-    return payloads
+    const groupIds = result.getTagGroupIdsList()
+    return groupIds
   }
 
   override async tagGroupTagList (
-    tagGroupId: string | undefined,
-  ): Promise<PUPPET.payloads.Tag[]> {
+    tagGroupId?: string,
+  ): Promise<PUPPET.filters.TagIdentifier[]> {
     log.verbose('PuppetService', 'tagGroupTagList(%s)', tagGroupId)
 
     const request = new grpcPuppet.TagGroupTagListRequest()
@@ -2098,20 +2094,18 @@ class PuppetService extends PUPPET.Puppet {
         .bind(this.grpcManager.client),
     )(request)
 
-    const grpcPayloads = result.getPayloadsList()
-    const payloads: PUPPET.payloads.Tag[] = grpcPayloads.map(payload => {
+    const tags = result.getTagsList()
+    const tagIdentifiers = tags.map(tag => {
       return {
-        id: payload.getId(),
-        name: payload.getName(),
-        groupId: payload.getGroupId(),
-        type: payload.getType(),
-      } as PUPPET.payloads.Tag
+        id: tag.getId(),
+        groupId: tag.getGroupId(),
+      }
     })
-    return payloads
+    return tagIdentifiers
   }
 
   override async tagTagList (
-  ): Promise<PUPPET.payloads.Tag[]> {
+  ): Promise<PUPPET.filters.TagIdentifier[]> {
     log.verbose('PuppetService', 'tagTagList()')
 
     const request = new grpcPuppet.TagTagListRequest()
@@ -2121,21 +2115,19 @@ class PuppetService extends PUPPET.Puppet {
         .bind(this.grpcManager.client),
     )(request)
 
-    const grpcPayloads = result.getPayloadsList()
-    const payloads: PUPPET.payloads.Tag[] = grpcPayloads.map(payload => {
+    const tags = result.getTagsList()
+    const tagIdentifiers = tags.map(tag => {
       return {
-        id: payload.getId(),
-        name: payload.getName(),
-        groupId: payload.getGroupId(),
-        type: payload.getType(),
-      } as PUPPET.payloads.Tag
+        id: tag.getId(),
+        groupId: tag.getGroupId(),
+      }
     })
-    return payloads
+    return tagIdentifiers
   }
 
   override async tagContactTagList (
     contactId: string,
-  ): Promise<PUPPET.payloads.Tag[]> {
+  ): Promise<PUPPET.filters.TagIdentifier[]> {
     log.verbose('PuppetService', 'tagContactTagList(%s)', contactId)
 
     const request = new grpcPuppet.TagContactTagListRequest()
@@ -2146,37 +2138,110 @@ class PuppetService extends PUPPET.Puppet {
         .bind(this.grpcManager.client),
     )(request)
 
-    const grpcPayloads = result.getPayloadsList()
-    const payloads: PUPPET.payloads.Tag[] = grpcPayloads.map(payload => {
+    const grpcPayloads = result.getTagsList()
+    const tags: PUPPET.filters.TagIdentifier[] = grpcPayloads.map(tag => {
       return {
-        id: payload.getId(),
-        name: payload.getName(),
-        groupId: payload.getGroupId(),
-        type: payload.getType(),
-      } as PUPPET.payloads.Tag
+        id: tag.getId(),
+        groupId: tag.getGroupId(),
+      }
     })
-    return payloads
+    return tags
   }
 
   override async tagTagContactList (
-    tagGroupId: string | undefined,
-    tagId: string,
+    tag: TagIdentifier,
   ): Promise<string[]> {
-    log.verbose('PuppetService', 'tagTagContactList(%s, %s)', tagGroupId, tagId)
+    log.verbose('PuppetService', 'tagTagContactList(%s)', JSON.stringify(tag))
 
     const request = new grpcPuppet.TagTagContactListRequest()
-    if (typeof tagGroupId !== 'undefined') {
-      request.setTagGroupId(tagGroupId)
-    }
-    request.setTagId(tagId)
+    const tagProb = new grpcPuppet.TagIdentifier()
+
+    tag.groupId && tagProb.setGroupId(tag.groupId)
+    tagProb.setId(tag.id)
+    request.setTag(tagProb)
 
     const result = await util.promisify(
       this.grpcManager.client.tagTagContactList
         .bind(this.grpcManager.client),
     )(request)
 
-    const payloads = result.getPayloadsList()
-    return payloads
+    const contactIds = result.getContactIdsList()
+    return contactIds
+  }
+
+  override async tagGroupPayloadPuppet (id: string): Promise<PUPPET.payloads.TagGroup> {
+    log.verbose('PuppetService', 'tagGroupPayload(%s)', id)
+
+    const cachedPayload = await this._payloadStore.tagGroup?.get(id)
+    if (cachedPayload) {
+      log.silly('PuppetService', 'tagGroupPayload(%s) cache HIT', id)
+      return cachedPayload
+    }
+
+    const request = new grpcPuppet.TagGroupPayloadRequest()
+    request.setGroupId(id)
+
+    const response = await util.promisify(
+      this.grpcManager.client.tagGroupPayload
+        .bind(this.grpcManager.client),
+    )(request)
+    const grpcPayload = response.getPayload()
+
+    if (!grpcPayload) {
+      throw new Error(`tagGroup ${id} got no payload!`)
+    }
+
+    const payload: PUPPET.payloads.TagGroup = {
+      id: grpcPayload.getId(),
+      name: grpcPayload.getName(),
+      type: grpcPayload.getType(),
+    }
+
+    await this._payloadStore.tagGroup?.set(id, payload)
+    log.silly('PuppetService', 'tagGroupPayloadPuppet(%s) cache SET', id)
+
+    return payload
+  }
+
+  override async tagPayloadPuppet (tag: PUPPET.filters.TagIdentifier): Promise<PUPPET.payloads.Tag> {
+    log.verbose('PuppetService', 'tagPayloadPuppet(%s)', JSON.stringify(tag))
+
+    const key = tag.groupId || '' + FOUR_PER_EM_SPACE + tag.id
+    const cachedPayload = await this._payloadStore.tag?.get(key)
+    if (cachedPayload) {
+      log.silly('PuppetService', 'tagPayloadPuppet(%s) cache HIT', tag)
+      return cachedPayload
+    }
+
+    const tagIdentifier = new grpcPuppet.TagIdentifier()
+    tagIdentifier.setId(tag.id)
+    if (tag.groupId) {
+      tagIdentifier.setGroupId(tag.groupId)
+    }
+    const request = new grpcPuppet.TagPayloadRequest()
+    request.setTag(tagIdentifier)
+
+    const response = await util.promisify(
+      this.grpcManager.client.tagPayload
+        .bind(this.grpcManager.client),
+    )(request)
+    const grpcPayload = response.getPayload()
+
+    if (!grpcPayload) {
+      throw new Error(`tag ${JSON.stringify(tag)} got no payload!`)
+    }
+
+    const payload: PUPPET.payloads.Tag = {
+      id: grpcPayload.getId(),
+      name: grpcPayload.getName(),
+      groupId: grpcPayload.getGroupId(),
+      type: grpcPayload.getType(),
+    }
+
+    await this._payloadStore.tag?.set(key, payload)
+    log.silly('PuppetService', 'tagPayloadPuppet(%s) cache SET', JSON.stringify(tag))
+
+    return payload
   }
 
   /**

package/src/config.ts

@@ -12,6 +12,7 @@ import {
 } from '@juzi/wechaty-grpc'
 
 const VERSION = packageJson.version || '0.0.0'
+export const FOUR_PER_EM_SPACE = String.fromCharCode(0x2005)
 
 const envVars = {
   ...rootEnvVars,

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.17",
+  "version": "1.0.20",
   "description": "Puppet Service for Wechaty",
   "type": "module",
   "exports": {
@@ -55,6 +55,7 @@ export const packageJson: PackageJson = {
     "@chatie/eslint-config": "^1.0.4",
     "@chatie/semver": "^0.4.7",
     "@chatie/tsconfig": "^4.6.3",
+    "@juzi/wechaty-puppet-mock": "^1.0.1",
     "@types/google-protobuf": "^3.15.5",
     "@types/lru-cache": "^7.5.0",
     "@types/semver": "^7.3.9",
@@ -65,14 +66,14 @@ export const packageJson: PackageJson = {
     "temp": "^0.9.4",
     "typed-emitter": "^1.5.0-from-event",
     "utility-types": "^3.10.0",
-    "@juzi/wechaty-puppet-mock": "^1.0.1",
     "why-is-node-running": "^2.2.1"
   },
   "peerDependencies": {
-    "@juzi/wechaty-puppet": "^1.0.12"
+    "@juzi/wechaty-puppet": "^1.0.24"
   },
   "dependencies": {
-    "@juzi/wechaty-grpc": "^1.0.11",
+    "@juzi/wechaty-grpc": "^1.0.14",
+    "@juzi/wechaty-redux": "^1.0.1",
     "clone-class": "^1.1.1",
     "ducks": "^1.0.2",
     "file-box": "^1.5.5",
@@ -83,7 +84,6 @@ export const packageJson: PackageJson = {
     "semver": "^7.3.5",
     "stronger-typed-streams": "^0.2.0",
     "uuid": "^8.3.2",
-    "@juzi/wechaty-redux": "^1.0.1",
     "wechaty-token": "^1.0.6"
   },
   "publishConfig": {

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

@@ -273,6 +273,13 @@ class EventStreamManager {
           this.offCallbackList.push(off)
           break
         }
+        case 'tag': {
+          const listener = (payload: PUPPET.payloads.EventTag) => this.grpcEmit(grpcPuppet.EventType.EVENT_TYPE_TAG, payload)
+          this.puppet.on('tag', listener)
+          const off = () => this.puppet.off('tag', listener)
+          this.offCallbackList.push(off)
+          break
+        }
         case 'reset':
           // the `reset` event should be dealed internally, should not send out
           break