@juzi/wechaty-puppet-service 1.0.19 → 1.0.22

package/src/client/puppet-service.ts

@@ -57,7 +57,6 @@ import {
 }                       from '../file-box-helper/mod.js'
 import {
   envVars,
-  FOUR_PER_EM_SPACE,
   log,
   NO_LOG_EVENTS,
   VERSION,
@@ -69,7 +68,6 @@ 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
@@ -352,6 +350,9 @@ class PuppetService extends PUPPET.Puppet {
       case grpcPuppet.EventType.EVENT_TYPE_TAG:
         this.emit('tag', JSON.parse(payload) as PUPPET.payloads.EventTag)
         break
+      case grpcPuppet.EventType.EVENT_TYPE_TAG_GROUP:
+        this.emit('tag-group', JSON.parse(payload) as PUPPET.payloads.EventTagGroup)
+        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
@@ -444,6 +445,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 (id: string) => this._payloadStore.tag?.delete(id),
+      [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) },
     }
 
@@ -696,6 +699,7 @@ class PuppetService extends PUPPET.Puppet {
        */
       weixin        : response.getWeixin(),
       additionalInfo: response.getAdditionalInfo(),
+      tags          : response.getTagIdsList(),
     }
 
     await this._payloadStore.contact?.set(id, payload)
@@ -1934,19 +1938,14 @@ class PuppetService extends PUPPET.Puppet {
    */
 
   override async tagContactTagAdd (
-    tags: TagIdentifier[],
+    tagIds: string[],
     contactIds: string[],
   ): Promise<void> {
-    log.verbose('PuppetService', 'tagContactTagAdd(%s, %s)', JSON.stringify(tags), contactIds)
+    log.verbose('PuppetService', 'tagContactTagAdd(%s, %s)', tagIds, contactIds)
 
     const request = new grpcPuppet.TagContactTagAddRequest()
 
-    request.setTagsList(tags.map(t => {
-      const tag = new grpcPuppet.TagIdentifier()
-      t.groupId && tag.setGroupId(t.groupId)
-      tag.setId(t.id)
-      return tag
-    }))
+    request.setTagIdsList(tagIds)
     request.setContactIdsList(contactIds)
 
     await util.promisify(
@@ -1956,19 +1955,14 @@ class PuppetService extends PUPPET.Puppet {
   }
 
   override async tagContactTagRemove (
-    tags: TagIdentifier[],
+    tagIds: string[],
     contactIds: string[],
   ): Promise<void> {
-    log.verbose('PuppetService', 'tagContactTagRemove(%s, %s)', JSON.stringify(tags), contactIds)
+    log.verbose('PuppetService', 'tagContactTagRemove(%s, %s)', tagIds, contactIds)
 
     const request = new grpcPuppet.TagContactTagRemoveRequest()
 
-    request.setTagsList(tags.map(t => {
-      const tag = new grpcPuppet.TagIdentifier()
-      t.groupId && tag.setGroupId(t.groupId)
-      tag.setId(t.id)
-      return tag
-    }))
+    request.setTagIdsList(tagIds)
     request.setContactIdsList(contactIds)
 
     await util.promisify(
@@ -2015,7 +2009,7 @@ class PuppetService extends PUPPET.Puppet {
   override async tagTagAdd (
     tagName: string,
     tagGroupId?: string,
-  ): Promise<PUPPET.filters.TagIdentifier | void> {
+  ): Promise<string | void> {
     log.verbose('PuppetService', 'tagTagAdd(%s, %s)', tagName, tagGroupId)
 
     const request = new grpcPuppet.TagTagAddRequest()
@@ -2030,31 +2024,18 @@ class PuppetService extends PUPPET.Puppet {
         .bind(this.grpcManager.client),
     )(request)
 
-    const tag = result.getTag()
-    const id = tag?.getId()
-    const groupId = tag?.getGroupId()
+    const id = result.getTagId()
 
-    if (id) {
-      return {
-        id,
-        groupId,
-      }
-    }
+    return id
   }
 
   override async tagTagDelete (
-    tag: TagIdentifier,
+    tagId: string,
   ): Promise<void> {
-    log.verbose('PuppetService', 'tagTagDelete(%s)', JSON.stringify(tag))
+    log.verbose('PuppetService', 'tagTagDelete(%s)', tagId)
 
     const request = new grpcPuppet.TagTagDeleteRequest()
-    const tagProb = new grpcPuppet.TagIdentifier()
-
-    tag.groupId && tagProb.setGroupId(tag.groupId)
-    tagProb.setId(tag.id)
-    request.setTag(tagProb)
-
-    request.setTag(tagProb)
+    request.setTagId(tagId)
 
     await util.promisify(
       this.grpcManager.client.tagTagDelete
@@ -2079,7 +2060,7 @@ class PuppetService extends PUPPET.Puppet {
 
   override async tagGroupTagList (
     tagGroupId?: string,
-  ): Promise<PUPPET.filters.TagIdentifier[]> {
+  ): Promise<string[]> {
     log.verbose('PuppetService', 'tagGroupTagList(%s)', tagGroupId)
 
     const request = new grpcPuppet.TagGroupTagListRequest()
@@ -2092,18 +2073,12 @@ class PuppetService extends PUPPET.Puppet {
         .bind(this.grpcManager.client),
     )(request)
 
-    const tags = result.getTagsList()
-    const tagIdentifiers = tags.map(tag => {
-      return {
-        id: tag.getId(),
-        groupId: tag.getGroupId(),
-      }
-    })
-    return tagIdentifiers
+    const tagIds = result.getTagIdsList()
+    return tagIds
   }
 
   override async tagTagList (
-  ): Promise<PUPPET.filters.TagIdentifier[]> {
+  ): Promise<string[]> {
     log.verbose('PuppetService', 'tagTagList()')
 
     const request = new grpcPuppet.TagTagListRequest()
@@ -2113,19 +2088,13 @@ class PuppetService extends PUPPET.Puppet {
         .bind(this.grpcManager.client),
     )(request)
 
-    const tags = result.getTagsList()
-    const tagIdentifiers = tags.map(tag => {
-      return {
-        id: tag.getId(),
-        groupId: tag.getGroupId(),
-      }
-    })
-    return tagIdentifiers
+    const tagIds = result.getTagIdsList()
+    return tagIds
   }
 
   override async tagContactTagList (
     contactId: string,
-  ): Promise<PUPPET.filters.TagIdentifier[]> {
+  ): Promise<string[]> {
     log.verbose('PuppetService', 'tagContactTagList(%s)', contactId)
 
     const request = new grpcPuppet.TagContactTagListRequest()
@@ -2136,27 +2105,17 @@ class PuppetService extends PUPPET.Puppet {
         .bind(this.grpcManager.client),
     )(request)
 
-    const grpcPayloads = result.getTagsList()
-    const tags: PUPPET.filters.TagIdentifier[] = grpcPayloads.map(tag => {
-      return {
-        id: tag.getId(),
-        groupId: tag.getGroupId(),
-      }
-    })
-    return tags
+    const tagIds = result.getTagIdsList()
+    return tagIds
   }
 
   override async tagTagContactList (
-    tag: TagIdentifier,
+    tagId: string,
   ): Promise<string[]> {
-    log.verbose('PuppetService', 'tagTagContactList(%s)', JSON.stringify(tag))
+    log.verbose('PuppetService', 'tagTagContactList(%s)', tagId)
 
     const request = new grpcPuppet.TagTagContactListRequest()
-    const tagProb = new grpcPuppet.TagIdentifier()
-
-    tag.groupId && tagProb.setGroupId(tag.groupId)
-    tagProb.setId(tag.id)
-    request.setTag(tagProb)
+    request.setTagId(tagId)
 
     const result = await util.promisify(
       this.grpcManager.client.tagTagContactList
@@ -2192,6 +2151,7 @@ class PuppetService extends PUPPET.Puppet {
     const payload: PUPPET.payloads.TagGroup = {
       id: grpcPayload.getId(),
       name: grpcPayload.getName(),
+      type: grpcPayload.getType(),
     }
 
     await this._payloadStore.tagGroup?.set(id, payload)
@@ -2200,23 +2160,17 @@ class PuppetService extends PUPPET.Puppet {
     return payload
   }
 
-  override async tagPayloadPuppet (tag: PUPPET.filters.TagIdentifier): Promise<PUPPET.payloads.Tag> {
-    log.verbose('PuppetService', 'tagPayloadPuppet(%s)', JSON.stringify(tag))
+  override async tagPayloadPuppet (tagId: string): Promise<PUPPET.payloads.Tag> {
+    log.verbose('PuppetService', 'tagPayloadPuppet(%s)', tagId)
 
-    const key = tag.groupId || '' + FOUR_PER_EM_SPACE + tag.id
-    const cachedPayload = await this._payloadStore.tag?.get(key)
+    const cachedPayload = await this._payloadStore.tag?.get(tagId)
     if (cachedPayload) {
-      log.silly('PuppetService', 'tagPayloadPuppet(%s) cache HIT', tag)
+      log.silly('PuppetService', 'tagPayloadPuppet(%s) cache HIT', tagId)
       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)
+    request.setTagId(tagId)
 
     const response = await util.promisify(
       this.grpcManager.client.tagPayload
@@ -2225,7 +2179,7 @@ class PuppetService extends PUPPET.Puppet {
     const grpcPayload = response.getPayload()
 
     if (!grpcPayload) {
-      throw new Error(`tag ${JSON.stringify(tag)} got no payload!`)
+      throw new Error(`tag ${tagId} got no payload!`)
     }
 
     const payload: PUPPET.payloads.Tag = {
@@ -2235,8 +2189,8 @@ class PuppetService extends PUPPET.Puppet {
       type: grpcPayload.getType(),
     }
 
-    await this._payloadStore.tag?.set(key, payload)
-    log.silly('PuppetService', 'tagPayloadPuppet(%s) cache SET', JSON.stringify(tag))
+    await this._payloadStore.tag?.set(tagId, payload)
+    log.silly('PuppetService', 'tagPayloadPuppet(%s) cache SET', tagId)
 
     return payload
   }

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.19",
+  "version": "1.0.22",
   "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.22"
+    "@juzi/wechaty-puppet": "^1.0.30"
   },
   "dependencies": {
-    "@juzi/wechaty-grpc": "^1.0.13",
+    "@juzi/wechaty-grpc": "^1.0.17",
     "@juzi/wechaty-redux": "^1.0.1",
     "clone-class": "^1.1.1",
     "ducks": "^1.0.2",

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

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

package/src/server/puppet-implementation.ts

@@ -256,6 +256,7 @@ function puppetImplementation (
         response.setTitle(payload.title || '')
         response.setDescription(payload.description || '')
         response.setAdditionalInfo(payload.additionalInfo || '')
+        response.setTagIdsList(payload.tags || [])
 
         return callback(null, response)
       } catch (e) {
@@ -1507,16 +1508,10 @@ function puppetImplementation (
       log.verbose('PuppetServiceImpl', 'tagContactTagAdd()')
 
       try {
-        const tagsProb = call.request.getTagsList()
+        const tagIds = call.request.getTagIdsList()
         const contactIds = call.request.getContactIdsList()
-        const tags = tagsProb.map(tagProb => {
-          return {
-            id: tagProb.getId(),
-            groupId: tagProb.getGroupId(),
-          }
-        })
 
-        await puppet.tagContactTagAdd(tags, contactIds)
+        await puppet.tagContactTagAdd(tagIds, contactIds)
 
         return callback(null, new grpcPuppet.TagContactTagAddResponse())
       } catch (e) {
@@ -1528,16 +1523,10 @@ function puppetImplementation (
       log.verbose('PuppetServiceImpl', 'tagContactTagRemove()')
 
       try {
-        const tagsProb = call.request.getTagsList()
+        const tagIds = call.request.getTagIdsList()
         const contactIds = call.request.getContactIdsList()
-        const tags = tagsProb.map(tagProb => {
-          return {
-            id: tagProb.getId(),
-            groupId: tagProb.getGroupId(),
-          }
-        })
 
-        await puppet.tagContactTagRemove(tags, contactIds)
+        await puppet.tagContactTagRemove(tagIds, contactIds)
 
         return callback(null, new grpcPuppet.TagContactTagRemoveResponse())
       } catch (e) {
@@ -1587,15 +1576,10 @@ function puppetImplementation (
         const tagName = call.request.getTagName()
 
         const result = await puppet.tagTagAdd(tagName, tagGroupId)
-        const tagIdentifier = new grpcPuppet.TagIdentifier()
         const response = new grpcPuppet.TagTagAddResponse()
 
         if (result) {
-          tagIdentifier.setId(result.id)
-          if (result.groupId) {
-            tagIdentifier.setGroupId(result.groupId)
-          }
-          response.setTag(tagIdentifier)
+          response.setTagId(result)
         }
 
         return callback(null, response)
@@ -1608,11 +1592,9 @@ function puppetImplementation (
       log.verbose('PuppetServiceImpl', 'tagTagDelete()')
 
       try {
-        const tagProb = call.request.getTag()
-        const id = tagProb?.getId()!
-        const groupId = tagProb?.getGroupId()
+        const tagId = call.request.getTagId()
 
-        await puppet.tagTagDelete({ id, groupId })
+        await puppet.tagTagDelete(tagId)
 
         return callback(null, new grpcPuppet.TagTagDeleteResponse())
       } catch (e) {
@@ -1642,16 +1624,9 @@ function puppetImplementation (
         const tagGroupId = call.request.getTagGroupId()
 
         const result = await puppet.tagGroupTagList(tagGroupId)
-        const tagIdentifiers = result.map(tag => {
-          const tagIdentifier = new grpcPuppet.TagIdentifier()
-          tagIdentifier.setId(tag.id)
-          if (tag.groupId) {
-            tagIdentifier.setGroupId(tag.groupId)
-          }
-          return tagIdentifier
-        })
+
         const response = new grpcPuppet.TagGroupTagListResponse()
-        response.setTagsList(tagIdentifiers)
+        response.setTagIdsList(result)
 
         return callback(null, response)
       } catch (e) {
@@ -1665,16 +1640,9 @@ function puppetImplementation (
 
       try {
         const result = await puppet.tagTagList()
-        const tagIdentifiers = result.map(tag => {
-          const tagIdentifier = new grpcPuppet.TagIdentifier()
-          tagIdentifier.setId(tag.id)
-          if (tag.groupId) {
-            tagIdentifier.setGroupId(tag.groupId)
-          }
-          return tagIdentifier
-        })
+
         const response = new grpcPuppet.TagTagListResponse()
-        response.setTagsList(tagIdentifiers)
+        response.setTagIdsList(result)
 
         return callback(null, response)
       } catch (e) {
@@ -1689,16 +1657,9 @@ function puppetImplementation (
         const contactId = call.request.getContactId()
 
         const result = await puppet.tagContactTagList(contactId)
-        const tagIdentifiers = result.map(tag => {
-          const tagIdentifier = new grpcPuppet.TagIdentifier()
-          tagIdentifier.setId(tag.id)
-          if (tag.groupId) {
-            tagIdentifier.setGroupId(tag.groupId)
-          }
-          return tagIdentifier
-        })
+
         const response = new grpcPuppet.TagContactTagListResponse()
-        response.setTagsList(tagIdentifiers)
+        response.setTagIdsList(result)
 
         return callback(null, response)
       } catch (e) {
@@ -1710,11 +1671,9 @@ function puppetImplementation (
       log.verbose('PuppetServiceImpl', 'tagTagContactList()')
 
       try {
-        const tagProb = call.request.getTag()
-        const id = tagProb?.getId()!
-        const groupId = tagProb?.getGroupId()
+        const tagId = call.request.getTagId()
 
-        const result = await puppet.tagTagContactList({ id, groupId })
+        const result = await puppet.tagTagContactList(tagId)
 
         const response = new grpcPuppet.TagTagContactListResponse()
         response.setContactIdsList(result)
@@ -1736,6 +1695,7 @@ function puppetImplementation (
         const payload = new grpcPuppet.TagGroupPayload()
         payload.setId(result.id)
         payload.setName(result.name)
+        payload.setType(result.type)
         response.setPayload(payload)
 
         return callback(null, response)
@@ -1749,11 +1709,9 @@ function puppetImplementation (
       log.verbose('PuppetServiceImpl', 'tagPayload()')
 
       try {
-        const tag = call.request.getTag()!
-        const id = tag.getId()
-        const groupId = tag.getGroupId() || ''
+        const tagId = call.request.getTagId()
 
-        const result = await puppet.tagPayloadPuppet({ id, groupId })
+        const result = await puppet.tagPayloadPuppet(tagId)
         const response = new grpcPuppet.TagPayloadResponse()
         const payload = new grpcPuppet.TagPayload()
         payload.setId(result.id)