@juzi/wechaty-puppet-service 1.0.108 → 1.0.109

package/src/client/puppet-service.ts

@@ -50,7 +50,7 @@ import { packageJson }  from '../package-json.js'
 
 import { GrpcManager }  from './grpc-manager.js'
 import { PayloadStore } from './payload-store.js'
-import { OptionalBooleanUnwrapper, OptionalBooleanWrapper, callRecordPbToPayload, channelPayloadToPb, channelPbToPayload, chatHistoryPbToPayload, contactPbToPayload, postPayloadToPb, roomMemberPbToPayload, urlLinkPbToPayload } from '../utils/pb-payload-helper.js'
+import { OptionalBooleanUnwrapper, OptionalBooleanWrapper, callRecordPbToPayload, channelPayloadToPb, channelPbToPayload, chatHistoryPbToPayload, contactPbToPayload, postPayloadToPb, roomMemberPbToPayload, urlLinkPbToPayload, channelCardPayloadToPb, channelCardPbToPayload } from '../utils/pb-payload-helper.js'
 import type { MessageBroadcastTargets } from '@juzi/wechaty-puppet/dist/esm/src/schemas/message.js'
 import { timeoutPromise } from 'gerror'
 import { BooleanIndicator } from 'state-switch'
@@ -1075,6 +1075,24 @@ class PuppetService extends PUPPET.Puppet {
     return payload
   }
 
+  override async messageChannelCard (
+    messageId: string,
+  ): Promise<PUPPET.payloads.ChannelCard> {
+    log.verbose('PuppetService', 'messageChannelCard(%s)', messageId)
+
+    const request = new grpcPuppet.MessageChannelCardRequest()
+    request.setId(messageId)
+
+    const response = await util.promisify(
+      this.grpcManager.client.messageChannelCard
+        .bind(this.grpcManager.client),
+    )(request)
+
+    const payload = channelCardPbToPayload(response.getChannelCard()!)
+
+    return payload
+  }
+
   override async messageCallRecord (
     messageId: string,
   ): Promise<PUPPET.payloads.CallRecord> {
@@ -1220,6 +1238,33 @@ class PuppetService extends PUPPET.Puppet {
     }
   }
 
+  override async messageSendChannelCard (
+    conversationId: string,
+    channelCardPayload: PUPPET.payloads.ChannelCard,
+  ): Promise<void | string> {
+    log.verbose('PuppetService', 'messageSendChannelCard(%s, "%s")', conversationId, JSON.stringify(channelCardPayload))
+
+    const request = new grpcPuppet.MessageSendChannelCardRequest()
+    request.setConversationId(conversationId)
+
+    const pbChannelCardPayload = channelCardPayloadToPb(grpcPuppet, channelCardPayload)
+
+    request.setChannelCard(pbChannelCardPayload)
+
+    log.info('PuppetService', `messageSendChannelCard(${conversationId}, ${channelCardPayload.nickname}) about to call grpc`)
+    const response = await util.promisify(
+      this.grpcManager.client.messageSendChannelCard
+        .bind(this.grpcManager.client),
+    )(request)
+
+    const messageId = response.getId()
+    log.info('PuppetService', `messageSendChannelCard(${conversationId}, ${channelCardPayload.nickname}) grpc called, messageId: ${messageId}`)
+
+    if (messageId) {
+      return messageId
+    }
+  }
+
   override async messageRecall (
     messageId: string,
   ): Promise<boolean> {

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.108",
+  "version": "1.0.109",
   "description": "Puppet Service for Wechaty",
   "type": "module",
   "exports": {
@@ -55,7 +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": "^1.0.106",
+    "@juzi/wechaty-puppet": "^1.0.107",
     "@juzi/wechaty-puppet-mock": "^1.0.1",
     "@swc/core": "1.3.39",
     "@types/google-protobuf": "^3.15.5",
@@ -77,7 +77,7 @@ export const packageJson: PackageJson = {
     "@juzi/wechaty-puppet": "^1.0.84"
   },
   "dependencies": {
-    "@juzi/wechaty-grpc": "^1.0.94",
+    "@juzi/wechaty-grpc": "^1.0.96",
     "clone-class": "^1.1.1",
     "ducks": "^1.0.2",
     "file-box": "^1.5.5",

package/src/server/puppet-implementation.ts

@@ -43,7 +43,7 @@ import {
 import { log } from '../config.js'
 import { grpcError }          from './grpc-error.js'
 import { EventStreamManager } from './event-stream-manager.js'
-import { OptionalBooleanUnwrapper, OptionalBooleanWrapper, callRecordPayloadToPb, channelPayloadToPb, chatHistoryPayloadToPb, postPbToPayload, urlLinkPayloadToPb } from '../utils/pb-payload-helper.js'
+import { OptionalBooleanUnwrapper, OptionalBooleanWrapper, callRecordPayloadToPb, channelPayloadToPb, chatHistoryPayloadToPb, postPbToPayload, urlLinkPayloadToPb, channelCardPayloadToPb } from '../utils/pb-payload-helper.js'
 import { TextContentType } from '@juzi/wechaty-puppet/types'
 
 function puppetImplementation (
@@ -913,6 +913,27 @@ function puppetImplementation (
       }
     },
 
+    messageChannelCard: async (call, callback) => {
+      log.verbose('PuppetServiceImpl', 'messageChannelCard()')
+
+      try {
+        const id = call.request.getId()
+
+        const payload = await puppet.messageChannelCard(id)
+
+        const response = new grpcPuppet.MessageChannelCardResponse()
+
+        const pbChannelCardPayload = channelCardPayloadToPb(grpcPuppet, payload)
+
+        response.setChannelCard(pbChannelCardPayload)
+
+        return callback(null, response)
+
+      } catch (e) {
+        return grpcError('messageChannelCard', e, callback)
+      }
+    },
+
     messageCallRecord: async (call, callback) => {
       log.verbose('PuppetServiceImpl', 'messageCallRecord()')
 
@@ -1301,6 +1322,35 @@ function puppetImplementation (
       }
     },
 
+    messageSendChannelCard: async (call, callback) => {
+      log.verbose('PuppetServiceImpl', 'messageSendChannelCard()')
+
+      try {
+        const conversationId = call.request.getConversationId()
+        const pbChannelCardPayload = call.request.getChannelCard()?.toObject()
+
+        if (!pbChannelCardPayload) {
+          return grpcError('messageSendChannelCard', new Error().stack, callback)
+        }
+        const payload: PUPPET.payloads.ChannelCard = {
+          ...pbChannelCardPayload,
+        }
+
+        const messageId = await puppet.messageSendChannelCard(conversationId, payload)
+
+        const response = new grpcPuppet.MessageSendChannelCardResponse()
+
+        if (messageId) {
+          response.setId(messageId)
+        }
+
+        return callback(null, response)
+
+      } catch (e) {
+        return grpcError('messageSendChannelCard', e, callback)
+      }
+    },
+
     messageSendPost: async (call, callback) => {
       log.verbose('PuppetServiceImpl', 'messageSendPost()')
 

package/src/utils/pb-payload-helper.ts

@@ -79,8 +79,6 @@ export const channelPayloadToPb = (grpcPuppet: grpcPuppet, channelPayload: PUPPE
   if (channelPayload.url) { pbChannelPayload.setUrl(channelPayload.url) }
   if (channelPayload.objectId) { pbChannelPayload.setObjectId(channelPayload.objectId) }
   if (channelPayload.objectNonceId) { pbChannelPayload.setObjectNonceId(channelPayload.objectNonceId) }
-  if (channelPayload.authIconUrl) { pbChannelPayload.setAuthIconUrl(channelPayload.authIconUrl) }
-  if (channelPayload.authJob) { pbChannelPayload.setAuthJob(channelPayload.authJob) }
   return pbChannelPayload
 }
 
@@ -92,6 +90,25 @@ export const channelPbToPayload = (channelPayloadPb: puppet.ChannelPayload) => {
   return channelPayload
 }
 
+export const channelCardPayloadToPb = (grpcPuppet: grpcPuppet, channelCardPayload: PUPPET.payloads.ChannelCard) => {
+  const pbChannelCardPayload = new grpcPuppet.ChannelCardPayload()
+  if (channelCardPayload.avatar) { pbChannelCardPayload.setAvatar(channelCardPayload.avatar) }
+  if (channelCardPayload.extras) { pbChannelCardPayload.setExtras(channelCardPayload.extras) }
+  if (channelCardPayload.nickname) { pbChannelCardPayload.setNickname(channelCardPayload.nickname) }
+  if (channelCardPayload.url) { pbChannelCardPayload.setUrl(channelCardPayload.url) }
+  if (channelCardPayload.authIconUrl) { pbChannelCardPayload.setAuthIconUrl(channelCardPayload.authIconUrl) }
+  if (channelCardPayload.authJob) { pbChannelCardPayload.setAuthJob(channelCardPayload.authJob) }
+  return pbChannelCardPayload
+}
+
+export const channelCardPbToPayload = (channelCardPayloadPb: puppet.ChannelCardPayload) => {
+  const _channelCardPayloadPb = channelCardPayloadPb.toObject()
+  const channelCardPayload: PUPPET.payloads.ChannelCard = {
+    ..._channelCardPayloadPb,
+  }
+  return channelCardPayload
+}
+
 export const postPayloadToPb = async (grpcPuppet: grpcPuppet, payload: PUPPET.payloads.PostClient, serializeFileBox: (filebox: FileBoxInterface) => Promise<string>) => {
   const pb = new grpcPuppet.PostPayloadClient()
   pb.setType(payload.type || 0)
@@ -295,6 +312,9 @@ export const chatHistoryPbToPayload = (FileBoxUuid: typeof FileBox, chatHistoryP
       case puppet.ChatHistoryContentType.CHAT_HISTORY:
         message = chatHistoryPbToPayload(FileBoxUuid, chatHistoryContent.getChatHistoryList()!)
         break
+      case puppet.ChatHistoryContentType.CHANNEL_CARD:
+        message = channelCardPbToPayload(chatHistoryContent.getChannelCard()!)
+        break
       default:
         throw new Error(`Invalid chat history content type: ${chatHistoryContent.getType()}`)
     }
@@ -366,6 +386,11 @@ export const chatHistoryPayloadToPb = async (grpcPuppet: grpcPuppet, chatHistory
         const pbChatHistoryPayload = await chatHistoryPayloadToPb(grpcPuppet, chatHistoryPayload.message, serializeFileBox)
         pbChatHistoryContent.setChatHistoryList(pbChatHistoryPayload)
         break
+      case PUPPET.types.Message.ChannelCard:
+        pbChatHistoryContent.setType(grpcPuppet.ChatHistoryContentType.CHANNEL_CARD)
+        const pbChannelCardPayload = channelCardPayloadToPb(grpcPuppet, chatHistoryPayload.message)
+        pbChatHistoryContent.setChannelCard(pbChannelCardPayload)
+        break
       default:
         throw new Error(`ChatHistoryContent unsupported type ${chatHistoryPayload.type}`)
     }