@juzi/wechaty-puppet-service 1.0.14 → 1.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juzi/wechaty-puppet-service",
-  "version": "1.0.14",
+  "version": "1.0.18",
   "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.9"
+    "@juzi/wechaty-puppet": "^1.0.15"
   },
   "dependencies": {
-    "@juzi/wechaty-grpc": "1.0.9",
+    "@juzi/wechaty-grpc": "^1.0.12",
     "clone-class": "^1.1.1",
     "ducks": "^1.0.2",
     "file-box": "^1.5.5",

package/src/client/puppet-service.ts

@@ -68,6 +68,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
@@ -1432,13 +1433,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
@@ -1915,144 +1923,67 @@ class PuppetService extends PUPPET.Puppet {
     )(request)
   }
 
-  /**
-   *
-   * Tag
-   *
-   */
-  // add a tag for a Contact. Create it first if it not exist.
-  override async tagContactAdd (
-    id: string,
-    contactId: string,
-  ): Promise<void> {
-    log.verbose('PuppetService', 'tagContactAdd(%s, %s)', id, contactId)
-
-    const request = new grpcPuppet.TagContactAddRequest()
-    request.setId(id)
-    request.setContactId(contactId)
-
-    await util.promisify(
-      this.grpcManager.client.tagContactAdd
-        .bind(this.grpcManager.client),
-    )(request)
-  }
-
-  // remove a tag from the Contact
-  override async tagContactRemove (
-    id: string,
-    contactId: string,
-  ) : Promise<void> {
-    log.verbose('PuppetService', 'tagContactRemove(%s, %s)', id, contactId)
-
-    const request = new grpcPuppet.TagContactRemoveRequest()
-    request.setId(id)
-    request.setContactId(contactId)
-
-    await util.promisify(
-      this.grpcManager.client.tagContactRemove
-        .bind(this.grpcManager.client),
-    )(request)
-  }
-
-  // delete a tag from Wechat
-  override async tagContactDelete (
-    id: string,
-  ) : Promise<void> {
-    log.verbose('PuppetService', 'tagContactDelete(%s)', id)
-
-    const request = new grpcPuppet.TagContactDeleteRequest()
-    request.setId(id)
-
-    await util.promisify(
-      this.grpcManager.client.tagContactDelete
-        .bind(this.grpcManager.client),
-    )(request)
-  }
-
-  // get tags from a specific Contact
-  override async tagContactList (
-    contactId?: string,
-  ) : Promise<string[]> {
-    log.verbose('PuppetService', 'tagContactList(%s)', contactId)
-
-    const request = new grpcPuppet.TagContactListRequest()
-
-    if (typeof contactId !== 'undefined') {
-      request.setContactId(contactId)
-      {
-
-        /**
-         * Huan(202110): Deprecated: will be removed after Dec 31, 2022
-         */
-        const contactIdWrapper = new StringValue()
-        contactIdWrapper.setValue(contactId)
-        request.setContactIdStringValueDeprecated(contactIdWrapper)
-      }
-    }
-
-    const response = await util.promisify(
-      this.grpcManager.client.tagContactList
-        .bind(this.grpcManager.client),
-    )(request)
-
-    return response.getIdsList()
-  }
-
   /**
    *
    * Tag
    *
    */
 
-  override async corpTagContactTagAdd (
-    corpTagGroupId: string,
-    corpTagId: string,
-    contactId: string,
+  override async tagContactTagAdd (
+    tags: TagIdentifier[],
+    contactIds: string[],
   ): Promise<void> {
-    log.verbose('PuppetService', 'corpTagContactTagAdd(%s, %s, %s)', corpTagGroupId, corpTagId, contactId)
+    log.verbose('PuppetService', 'tagContactTagAdd(%s, %s)', JSON.stringify(tags), contactIds)
 
-    const request = new grpcPuppet.CorpTagContactTagAddRequest()
+    const request = new grpcPuppet.TagContactTagAddRequest()
 
-    request.setCorpTagGroupId(corpTagGroupId)
-    request.setCorpTagId(corpTagId)
-    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.corpTagContactTagAdd
+      this.grpcManager.client.tagContactTagAdd
         .bind(this.grpcManager.client),
     )(request)
   }
 
-  override async corpTagContactTagRemove (
-    corpTagGroupId: string,
-    corpTagId: string,
-    contactId: string,
+  override async tagContactTagRemove (
+    tags: TagIdentifier[],
+    contactIds: string[],
   ): Promise<void> {
-    log.verbose('PuppetService', 'corpTagContactRemoveAdd(%s, %s, %s)', corpTagGroupId, corpTagId, contactId)
+    log.verbose('PuppetService', 'tagContactTagRemove(%s, %s)', JSON.stringify(tags), contactIds)
 
-    const request = new grpcPuppet.CorpTagContactTagRemoveRequest()
+    const request = new grpcPuppet.TagContactTagRemoveRequest()
 
-    request.setCorpTagGroupId(corpTagGroupId)
-    request.setCorpTagId(corpTagId)
-    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.corpTagContactTagRemove
+      this.grpcManager.client.tagContactTagRemove
         .bind(this.grpcManager.client),
     )(request)
   }
 
-  override async corpTagGroupAdd (
-    corpTagGroupName: string,
-  ): Promise<PUPPET.payloads.CorpTagGroup | void> {
-    log.verbose('PuppetService', 'corpTagGroupAdd(%s)', corpTagGroupName)
+  override async tagGroupAdd (
+    tagGroupName: string,
+  ): Promise<PUPPET.payloads.TagGroup | void> {
+    log.verbose('PuppetService', 'tagGroupAdd(%s)', tagGroupName)
 
-    const request = new grpcPuppet.CorpTagGroupAddRequest()
+    const request = new grpcPuppet.TagGroupAddRequest()
 
-    request.setCorpTagGroupName(corpTagGroupName)
+    request.setTagGroupName(tagGroupName)
 
     const result = await util.promisify(
-      this.grpcManager.client.corpTagGroupAdd
+      this.grpcManager.client.tagGroupAdd
         .bind(this.grpcManager.client),
     )(request)
 
@@ -2061,7 +1992,7 @@ class PuppetService extends PUPPET.Puppet {
     const name = grpcPayload?.getName()
 
     if (id && name) {
-      const payload: PUPPET.payloads.CorpTagGroup = {
+      const payload: PUPPET.payloads.TagGroup = {
         id,
         name,
       }
@@ -2070,35 +2001,37 @@ class PuppetService extends PUPPET.Puppet {
 
   }
 
-  override async corpTagGroupDelete (
-    corpTagGroupId: string,
+  override async tagGroupDelete (
+    tagGroupId: string,
   ): Promise<void> {
-    log.verbose('PuppetService', 'corpTagGroupDelete(%s)', corpTagGroupId)
+    log.verbose('PuppetService', 'tagGroupDelete(%s)', tagGroupId)
 
-    const request = new grpcPuppet.CorpTagGroupDeleteRequest()
+    const request = new grpcPuppet.TagGroupDeleteRequest()
 
-    request.setCorpTagGroupId(corpTagGroupId)
+    request.setTagGroupId(tagGroupId)
 
     await util.promisify(
-      this.grpcManager.client.corpTagGroupDelete
+      this.grpcManager.client.tagGroupDelete
         .bind(this.grpcManager.client),
     )(request)
 
   }
 
-  override async corpTagTagAdd (
-    corpTagGroupId: string,
-    corpTagName: string,
-  ): Promise<PUPPET.payloads.CorpTag | void> {
-    log.verbose('PuppetService', 'corpTagTagAdd(%s, %s)', corpTagGroupId, corpTagName)
+  override async tagTagAdd (
+    tagName: string,
+    tagGroupId?: string,
+  ): Promise<PUPPET.payloads.Tag | void> {
+    log.verbose('PuppetService', 'tagTagAdd(%s, %s)', tagName, tagGroupId)
 
-    const request = new grpcPuppet.CorpTagTagAddRequest()
+    const request = new grpcPuppet.TagTagAddRequest()
 
-    request.setCorpTagGroupId(corpTagGroupId)
-    request.setCorpTagName(corpTagName)
+    if (typeof tagGroupId !== 'undefined') {
+      request.setTagGroupId(tagGroupId)
+    }
+    request.setTagName(tagName)
 
     const result = await util.promisify(
-      this.grpcManager.client.corpTagTagAdd
+      this.grpcManager.client.tagTagAdd
         .bind(this.grpcManager.client),
     )(request)
 
@@ -2106,104 +2039,157 @@ class PuppetService extends PUPPET.Puppet {
     const id = grpcPayload?.getId()
     const name = grpcPayload?.getName()
     const groupId = grpcPayload?.getGroupId()
+    const type = grpcPayload?.getType()
 
-    if (id && name && groupId) {
-      const payload: PUPPET.payloads.CorpTag = {
+    if (id && name && (typeof type !== 'undefined')) {
+      const payload: PUPPET.payloads.Tag = {
         id,
         name,
         groupId,
+        type,
       }
       return payload
     }
 
   }
 
-  override async corpTagTagDelete (
-    corpTagGroupId: string,
-    corpTagId: string,
+  override async tagTagDelete (
+    tag: TagIdentifier,
   ): Promise<void> {
-    log.verbose('PuppetService', 'corpTagTagDelete(%s, %s)', corpTagGroupId, corpTagId)
+    log.verbose('PuppetService', 'tagTagDelete(%s)', JSON.stringify(tag))
+
+    const request = new grpcPuppet.TagTagDeleteRequest()
+    const tagProb = new grpcPuppet.TagIdentifier()
 
-    const request = new grpcPuppet.CorpTagTagDeleteRequest()
+    tag.groupId && tagProb.setGroupId(tag.groupId)
+    tagProb.setId(tag.id)
+    request.setTag(tagProb)
 
-    request.setCorpTagGroupId(corpTagGroupId)
-    request.setCorpTagId(corpTagId)
+    request.setTag(tagProb)
 
     await util.promisify(
-      this.grpcManager.client.corpTagTagDelete
+      this.grpcManager.client.tagTagDelete
         .bind(this.grpcManager.client),
     )(request)
 
   }
 
-  override async corpTagGroupList (): Promise<PUPPET.payloads.CorpTagGroup[]> {
-    log.verbose('PuppetService', 'corpTagGroupList()')
+  override async tagGroupList (): Promise<PUPPET.payloads.TagGroup[]> {
+    log.verbose('PuppetService', 'tagGroupList()')
 
-    const request = new grpcPuppet.CorpTagGroupListRequest()
+    const request = new grpcPuppet.TagGroupListRequest()
 
     const result = await util.promisify(
-      this.grpcManager.client.corpTagGroupList
+      this.grpcManager.client.tagGroupList
         .bind(this.grpcManager.client),
     )(request)
 
     const grpcPayloads = result.getPayloadsList()
-    const payloads: PUPPET.payloads.CorpTagGroup[] = grpcPayloads.map(payload => {
+    const payloads: PUPPET.payloads.TagGroup[] = grpcPayloads.map(payload => {
       return {
         id: payload.getId(),
         name: payload.getName(),
-      } as PUPPET.payloads.CorpTagGroup
+      } as PUPPET.payloads.TagGroup
     })
     return payloads
   }
 
-  override async corpTagTagList (
-    corpTagGroupId: string,
-  ): Promise<PUPPET.payloads.CorpTag[]> {
-    log.verbose('PuppetService', 'corpTagTagList(%s)', corpTagGroupId)
+  override async tagGroupTagList (
+    tagGroupId?: string,
+  ): Promise<PUPPET.payloads.Tag[]> {
+    log.verbose('PuppetService', 'tagGroupTagList(%s)', tagGroupId)
 
-    const request = new grpcPuppet.CorpTagTagListRequest()
-    request.setCorpTagGroupId(corpTagGroupId)
+    const request = new grpcPuppet.TagGroupTagListRequest()
+    if (typeof tagGroupId !== 'undefined') {
+      request.setTagGroupId(tagGroupId)
+    }
 
     const result = await util.promisify(
-      this.grpcManager.client.corpTagTagList
+      this.grpcManager.client.tagGroupTagList
         .bind(this.grpcManager.client),
     )(request)
 
     const grpcPayloads = result.getPayloadsList()
-    const payloads: PUPPET.payloads.CorpTag[] = grpcPayloads.map(payload => {
+    const payloads: PUPPET.payloads.Tag[] = grpcPayloads.map(payload => {
       return {
         id: payload.getId(),
         name: payload.getName(),
         groupId: payload.getGroupId(),
-      } as PUPPET.payloads.CorpTag
+        type: payload.getType(),
+      } as PUPPET.payloads.Tag
     })
     return payloads
   }
 
-  override async corpTagContactTagList (
+  override async tagTagList (
+  ): Promise<PUPPET.payloads.Tag[]> {
+    log.verbose('PuppetService', 'tagTagList()')
+
+    const request = new grpcPuppet.TagTagListRequest()
+
+    const result = await util.promisify(
+      this.grpcManager.client.tagTagList
+        .bind(this.grpcManager.client),
+    )(request)
+
+    const grpcPayloads = result.getPayloadsList()
+    const payloads: PUPPET.payloads.Tag[] = grpcPayloads.map(payload => {
+      return {
+        id: payload.getId(),
+        name: payload.getName(),
+        groupId: payload.getGroupId(),
+        type: payload.getType(),
+      } as PUPPET.payloads.Tag
+    })
+    return payloads
+  }
+
+  override async tagContactTagList (
     contactId: string,
-  ): Promise<PUPPET.payloads.CorpTag[]> {
-    log.verbose('PuppetService', 'corpTagContactTagList(%s)', contactId)
+  ): Promise<PUPPET.payloads.Tag[]> {
+    log.verbose('PuppetService', 'tagContactTagList(%s)', contactId)
 
-    const request = new grpcPuppet.CorpTagContactTagListRequest()
+    const request = new grpcPuppet.TagContactTagListRequest()
     request.setContactId(contactId)
 
     const result = await util.promisify(
-      this.grpcManager.client.corpTagContactTagList
+      this.grpcManager.client.tagContactTagList
         .bind(this.grpcManager.client),
     )(request)
 
     const grpcPayloads = result.getPayloadsList()
-    const payloads: PUPPET.payloads.CorpTag[] = grpcPayloads.map(payload => {
+    const payloads: PUPPET.payloads.Tag[] = grpcPayloads.map(payload => {
       return {
         id: payload.getId(),
         name: payload.getName(),
         groupId: payload.getGroupId(),
-      } as PUPPET.payloads.CorpTag
+        type: payload.getType(),
+      } as PUPPET.payloads.Tag
     })
     return payloads
   }
 
+  override async tagTagContactList (
+    tag: TagIdentifier,
+  ): Promise<string[]> {
+    log.verbose('PuppetService', 'tagTagContactList(%s)', JSON.stringify(tag))
+
+    const request = new grpcPuppet.TagTagContactListRequest()
+    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
+  }
+
   /**
    * @deprecated Will be removed in v2.0
    */

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.14",
+  "version": "1.0.18",
   "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.9"
+    "@juzi/wechaty-puppet": "^1.0.15"
   },
   "dependencies": {
-    "@juzi/wechaty-grpc": "1.0.9",
+    "@juzi/wechaty-grpc": "^1.0.12",
     "clone-class": "^1.1.1",
     "ducks": "^1.0.2",
     "file-box": "^1.5.5",