@juzi/wechaty-puppet-service 1.0.12 → 1.0.16

package/src/client/puppet-service.ts

@@ -921,12 +921,14 @@ class PuppetService extends PUPPET.Puppet {
      */
     request.setMiniProgramDeprecated(JSON.stringify(miniProgramPayload))
 
+    log.info('PuppetService', `messageSendMiniProgram(${conversationId}, ${miniProgramPayload.description}) about to call grpc`)
     const response = await util.promisify(
       this.grpcManager.client.messageSendMiniProgram
         .bind(this.grpcManager.client),
     )(request)
 
     const messageId = response.getId()
+    log.info('PuppetService', `messageSendMiniProgram(${conversationId}, ${miniProgramPayload.description}) grpc called, messageId: ${messageId}`)
 
     if (messageId) {
       return messageId
@@ -961,12 +963,14 @@ class PuppetService extends PUPPET.Puppet {
     pbLocationPayload.setName(locationPayload.name)
     request.setLocation(pbLocationPayload)
 
+    log.info('PuppetService', `messageSendLocation(${conversationId}, ${locationPayload.name}) about to call grpc`)
     const response = await util.promisify(
       this.grpcManager.client.messageSendLocation
         .bind(this.grpcManager.client),
     )(request)
 
     const id = response.getId()
+    log.info('PuppetService', `messageSendMiniProgram(${conversationId}, ${locationPayload.name}) grpc called, messageId: ${id}`)
 
     if (id) {
       return id
@@ -993,12 +997,14 @@ class PuppetService extends PUPPET.Puppet {
     if (channelPayload.url) { pbChannelPayload.setUrl(channelPayload.url) }
     request.setChannel(pbChannelPayload)
 
+    log.info('PuppetService', `messageSendChannel(${conversationId}, ${channelPayload.desc}) about to call grpc`)
     const response = await util.promisify(
       this.grpcManager.client.messageSendChannel
         .bind(this.grpcManager.client),
     )(request)
 
     const messageId = response.getId()
+    log.info('PuppetService', `messageSendChannel(${conversationId}, ${channelPayload.desc}) grpc called, messageId: ${messageId}`)
 
     if (messageId) {
       return messageId
@@ -1087,12 +1093,14 @@ class PuppetService extends PUPPET.Puppet {
     request.setConversationId(conversationId)
     request.setMessageId(messageId)
 
+    log.info('PuppetService', `messageForward(${conversationId}, ${messageId}) about to call grpc`)
     const response = await util.promisify(
       this.grpcManager.client.messageForward
         .bind(this.grpcManager.client),
     )(request)
 
     const forwardedMessageId = response.getId()
+    log.info('PuppetService', `messageForward(${conversationId}, ${messageId}) grpc called, messageId: ${forwardedMessageId}`)
 
     if (forwardedMessageId) {
       return forwardedMessageId
@@ -1185,12 +1193,14 @@ class PuppetService extends PUPPET.Puppet {
       request.setQuoteId(quoteId)
     }
 
+    log.info('PuppetService', `messageSend(${conversationId}, ${text}) about to call grpc`)
     const response = await util.promisify(
       this.grpcManager.client.messageSendText
         .bind(this.grpcManager.client),
     )(request)
 
     const messageId = response.getId()
+    log.info('PuppetService', `messageSend(${conversationId}, ${text}) grpc called, messageId: ${messageId}`)
 
     if (messageId) {
       return messageId
@@ -1221,12 +1231,14 @@ class PuppetService extends PUPPET.Puppet {
       const serializedFileBox = await this.serializeFileBox(fileBox)
       request.setFileBox(serializedFileBox)
 
+      log.info('PuppetService', `messageSendFile(${conversationId}, ${fileBox}) about to call grpc`)
       const response = await util.promisify(
         this.grpcManager.client.messageSendFile
           .bind(this.grpcManager.client),
       )(request)
 
       const messageId = response.getId()
+      log.info('PuppetService', `messageSendFile(${conversationId}, ${fileBox}) grpc called, messageId: ${messageId}`)
 
       if (messageId) {
         return messageId
@@ -1265,12 +1277,14 @@ class PuppetService extends PUPPET.Puppet {
     request.setConversationId(conversationId)
     request.setContactId(contactId)
 
+    log.info('PuppetService', `messageSendContact(${conversationId}, ${contactId}) about to call grpc`)
     const response = await util.promisify(
       this.grpcManager.client.messageSendContact
         .bind(this.grpcManager.client),
     )(request)
 
     const messageId = response.getId()
+    log.info('PuppetService', `messageSendContact(${conversationId}, ${contactId}) grpc called, messageId: ${messageId}`)
 
     if (messageId) {
       return messageId
@@ -1307,12 +1321,14 @@ class PuppetService extends PUPPET.Puppet {
     // Deprecated: will be removed after Dec 31, 2022
     request.setUrlLinkDeprecated(JSON.stringify(urlLinkPayload))
 
+    log.info('PuppetService', `messageSendUrl(${conversationId}, ${urlLinkPayload}) about to call grpc`)
     const response = await util.promisify(
       this.grpcManager.client.messageSendUrl
         .bind(this.grpcManager.client),
     )(request)
 
     const messageId = response.getId()
+    log.info('PuppetService', `messageSendUrl(${conversationId}, ${urlLinkPayload}) grpc called, messageId: ${messageId}`)
 
     if (messageId) {
       return messageId
@@ -1904,82 +1920,263 @@ class PuppetService extends PUPPET.Puppet {
    * Tag
    *
    */
-  // add a tag for a Contact. Create it first if it not exist.
-  override async tagContactAdd (
-    id: string,
+
+  override async tagContactTagAdd (
+    tagGroupId: string | undefined,
+    tagId: string,
     contactId: string,
   ): Promise<void> {
-    log.verbose('PuppetService', 'tagContactAdd(%s, %s)', id, contactId)
+    log.verbose('PuppetService', 'tagContactTagAdd(%s, %s, %s)', tagGroupId, tagId, contactId)
 
-    const request = new grpcPuppet.TagContactAddRequest()
-    request.setId(id)
+    const request = new grpcPuppet.TagContactTagAddRequest()
+
+    if (typeof tagGroupId !== 'undefined') {
+      request.setTagGroupId(tagGroupId)
+    }
+    request.setTagId(tagId)
     request.setContactId(contactId)
 
     await util.promisify(
-      this.grpcManager.client.tagContactAdd
+      this.grpcManager.client.tagContactTagAdd
         .bind(this.grpcManager.client),
     )(request)
   }
 
-  // remove a tag from the Contact
-  override async tagContactRemove (
-    id: string,
+  override async tagContactTagRemove (
+    tagGroupId: string | undefined,
+    tagId: string,
     contactId: string,
-  ) : Promise<void> {
-    log.verbose('PuppetService', 'tagContactRemove(%s, %s)', id, contactId)
+  ): Promise<void> {
+    log.verbose('PuppetService', 'tagContactTagRemove(%s, %s, %s)', tagGroupId, tagId, contactId)
 
-    const request = new grpcPuppet.TagContactRemoveRequest()
-    request.setId(id)
+    const request = new grpcPuppet.TagContactTagRemoveRequest()
+
+    if (typeof tagGroupId !== 'undefined') {
+      request.setTagGroupId(tagGroupId)
+    }
+    request.setTagId(tagId)
     request.setContactId(contactId)
 
     await util.promisify(
-      this.grpcManager.client.tagContactRemove
+      this.grpcManager.client.tagContactTagRemove
         .bind(this.grpcManager.client),
     )(request)
   }
 
-  // delete a tag from Wechat
-  override async tagContactDelete (
-    id: string,
-  ) : Promise<void> {
-    log.verbose('PuppetService', 'tagContactDelete(%s)', id)
+  override async tagGroupAdd (
+    tagGroupName: string,
+  ): Promise<PUPPET.payloads.TagGroup | void> {
+    log.verbose('PuppetService', 'tagGroupAdd(%s)', tagGroupName)
 
-    const request = new grpcPuppet.TagContactDeleteRequest()
-    request.setId(id)
+    const request = new grpcPuppet.TagGroupAddRequest()
+
+    request.setTagGroupName(tagGroupName)
+
+    const result = await util.promisify(
+      this.grpcManager.client.tagGroupAdd
+        .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
+    }
+
+  }
+
+  override async tagGroupDelete (
+    tagGroupId: string,
+  ): Promise<void> {
+    log.verbose('PuppetService', 'tagGroupDelete(%s)', tagGroupId)
+
+    const request = new grpcPuppet.TagGroupDeleteRequest()
+
+    request.setTagGroupId(tagGroupId)
 
     await util.promisify(
-      this.grpcManager.client.tagContactDelete
+      this.grpcManager.client.tagGroupDelete
         .bind(this.grpcManager.client),
     )(request)
+
   }
 
-  // get tags from a specific Contact
-  override async tagContactList (
-    contactId?: string,
-  ) : Promise<string[]> {
-    log.verbose('PuppetService', 'tagContactList(%s)', contactId)
+  override async tagTagAdd (
+    tagGroupId: string | undefined,
+    tagName: string,
+  ): Promise<PUPPET.payloads.Tag | void> {
+    log.verbose('PuppetService', 'tagTagAdd(%s, %s)', tagGroupId, tagName)
 
-    const request = new grpcPuppet.TagContactListRequest()
+    const request = new grpcPuppet.TagTagAddRequest()
 
-    if (typeof contactId !== 'undefined') {
-      request.setContactId(contactId)
-      {
+    if (typeof tagGroupId !== 'undefined') {
+      request.setTagGroupId(tagGroupId)
+    }
+    request.setTagName(tagName)
 
-        /**
-         * Huan(202110): Deprecated: will be removed after Dec 31, 2022
-         */
-        const contactIdWrapper = new StringValue()
-        contactIdWrapper.setValue(contactId)
-        request.setContactIdStringValueDeprecated(contactIdWrapper)
+    const result = await util.promisify(
+      this.grpcManager.client.tagTagAdd
+        .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()
+
+    if (id && name && type) {
+      const payload: PUPPET.payloads.Tag = {
+        id,
+        name,
+        groupId,
+        type,
       }
+      return payload
     }
 
-    const response = await util.promisify(
-      this.grpcManager.client.tagContactList
+  }
+
+  override async tagTagDelete (
+    tagGroupId: string | undefined,
+    tagId: string,
+  ): Promise<void> {
+    log.verbose('PuppetService', 'tagTagDelete(%s, %s)', tagGroupId, tagId)
+
+    const request = new grpcPuppet.TagTagDeleteRequest()
+
+    if (typeof tagGroupId !== 'undefined') {
+      request.setTagGroupId(tagGroupId)
+    }
+    request.setTagId(tagId)
+
+    await util.promisify(
+      this.grpcManager.client.tagTagDelete
         .bind(this.grpcManager.client),
     )(request)
 
-    return response.getIdsList()
+  }
+
+  override async tagGroupList (): Promise<PUPPET.payloads.TagGroup[]> {
+    log.verbose('PuppetService', 'tagGroupList()')
+
+    const request = new grpcPuppet.TagGroupListRequest()
+
+    const result = await util.promisify(
+      this.grpcManager.client.tagGroupList
+        .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
+  }
+
+  override async tagGroupTagList (
+    tagGroupId: string | undefined,
+  ): Promise<PUPPET.payloads.Tag[]> {
+    log.verbose('PuppetService', 'tagGroupTagList(%s)', tagGroupId)
+
+    const request = new grpcPuppet.TagGroupTagListRequest()
+    if (typeof tagGroupId !== 'undefined') {
+      request.setTagGroupId(tagGroupId)
+    }
+
+    const result = await util.promisify(
+      this.grpcManager.client.tagGroupTagList
+        .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 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.Tag[]> {
+    log.verbose('PuppetService', 'tagContactTagList(%s)', contactId)
+
+    const request = new grpcPuppet.TagContactTagListRequest()
+    request.setContactId(contactId)
+
+    const result = await util.promisify(
+      this.grpcManager.client.tagContactTagList
+        .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 tagTagContactList (
+    tagGroupId: string | undefined,
+    tagId: string,
+  ): Promise<string[]> {
+    log.verbose('PuppetService', 'tagTagContactList(%s, %s)', tagGroupId, tagId)
+
+    const request = new grpcPuppet.TagTagContactListRequest()
+    if (typeof tagGroupId !== 'undefined') {
+      request.setTagGroupId(tagGroupId)
+    }
+    request.setTagId(tagId)
+
+    const result = await util.promisify(
+      this.grpcManager.client.tagTagContactList
+        .bind(this.grpcManager.client),
+    )(request)
+
+    const payloads = result.getPayloadsList()
+    return payloads
   }
 
   /**

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.12",
+  "version": "1.0.16",
   "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.7"
+    "@juzi/wechaty-puppet": "^1.0.12"
   },
   "dependencies": {
-    "@juzi/wechaty-grpc": "1.0.7",
+    "@juzi/wechaty-grpc": "^1.0.11",
     "clone-class": "^1.1.1",
     "ducks": "^1.0.2",
     "file-box": "^1.5.5",