feat(dingtalk): delete message, fix oapi

adapters/dingtalk/src/bot.ts

@@ -1,4 +1,4 @@
-import { Bot, Context, Logger, Quester, Schema } from '@satorijs/satori'
+import { Bot, Context, Logger, Quester, Schema, Universal } from '@satorijs/satori'
 import { HttpServer } from './http'
 import { DingtalkMessageEncoder } from './message'
 import { WsClient } from './ws'
@@ -15,10 +15,8 @@ export class DingtalkBot extends Bot<DingtalkBot.Config> {
   public internal: Internal
   constructor(ctx: Context, config: DingtalkBot.Config) {
     super(ctx, config)
-    this.http = ctx.http.extend(config)
-    this.oldHttp = ctx.http.extend({
-      endpoint: 'https://oapi.dingtalk.com/',
-    })
+    this.http = ctx.http.extend(config.api)
+    this.oldHttp = ctx.http.extend(config.oldApi)
     this.internal = new Internal(this)
 
     if (config.protocol === 'http') {
@@ -28,6 +26,13 @@ export class DingtalkBot extends Bot<DingtalkBot.Config> {
     }
   }
 
+  async initialize() {
+    const { appList } = await this.internal.OapiMicroappList()
+    const self = appList.find(v => v.agentId === this.config.agentId)
+    this.username = self.name
+    this.avatar = self.appIcon
+  }
+
   // @ts-ignore
   stop(): Promise<void> {
     clearTimeout(this.refreshTokenTimer)
@@ -47,7 +52,7 @@ export class DingtalkBot extends Bot<DingtalkBot.Config> {
       headers: {
         'x-acs-dingtalk-access-token': data.accessToken,
       },
-    }).extend(this.config)
+    }).extend(this.config.api)
     this.refreshTokenTimer = setTimeout(this.refreshToken.bind(this), (data.expireIn - 10) * 1000)
   }
 
@@ -58,13 +63,33 @@ export class DingtalkBot extends Bot<DingtalkBot.Config> {
     })
     return downloadUrl
   }
+
+  async deleteMessage(channelId: string, messageId: string): Promise<void> {
+    if (channelId.startsWith("cid")) {
+      await this.internal.orgGroupRecall({
+        robotCode: this.selfId,
+        processQueryKeys: [messageId],
+        openConversationId: channelId
+      })
+    } else {
+      await this.internal.batchRecallOTO({
+        robotCode: this.selfId,
+        processQueryKeys: [messageId]
+      })
+    }
+
+  }
+
 }
 
 export namespace DingtalkBot {
-  export interface Config extends Bot.Config, Quester.Config, WsClient.Config {
+  export interface Config extends Bot.Config, WsClient.Config {
     secret: string
     protocol: string
     appkey: string
+    agentId: number
+    api: Quester.Config,
+    oldApi: Quester.Config
   }
 
   export const Config: Schema<Config> = Schema.intersect([
@@ -75,10 +100,12 @@ export namespace DingtalkBot {
     }),
     Schema.object({
       secret: Schema.string().required().description('机器人密钥。'),
+      agentId: Schema.number().required().description('AgentId'),
       appkey: Schema.string().required(),
+      api: Quester.createConfig('https://api.dingtalk.com/v1.0/'),
+      oldApi: Quester.createConfig('https://oapi.dingtalk.com/')
     }),
     WsClient.Config,
-    Quester.createConfig('https://api.dingtalk.com/v1.0/'),
   ])
 }
 

adapters/dingtalk/src/http.ts

@@ -13,6 +13,7 @@ export class HttpServer extends Adapter.Server<DingtalkBot> {
   async start(bot: DingtalkBot) {
     await bot.refreshToken()
     bot.selfId = bot.config.appkey
+    await bot.initialize()
     // https://open.dingtalk.com/document/orgapp/receive-message
     bot.ctx.router.post('/dingtalk', async (ctx) => {
       const timestamp = ctx.get('timestamp')

adapters/dingtalk/src/internal.ts

@@ -30,6 +30,9 @@ export class Internal {
               throw new Error(`too many arguments for ${path}, received ${raw}`)
             }
             const quester = isOldApi ? this.bot.oldHttp : this.bot.http
+            if (isOldApi) {
+              config.params = { ...config.params, access_token: this.bot.token }
+            }
             try {
               return await quester(method, url, config)
             } catch (error) {

adapters/dingtalk/src/message.ts

@@ -36,7 +36,6 @@ export class DingtalkMessageEncoder extends MessageEncoder<DingtalkBot> {
 
   // https://open.dingtalk.com/document/orgapp/the-robot-sends-a-group-message
   async sendMessage<T extends keyof SendMessageData>(msgType: T, msgParam: SendMessageData[T]) {
-    console.log(this.session)
     const { processQueryKey } = this.session.isDirect ? await this.bot.internal.batchSendOTO({
       msgKey: msgType,
       msgParam: JSON.stringify(msgParam),
@@ -51,6 +50,10 @@ export class DingtalkMessageEncoder extends MessageEncoder<DingtalkBot> {
     })
     const session = this.bot.session()
     session.messageId = processQueryKey
+    session.channelId = this.session.channelId
+    session.guildId = this.session.guildId
+    console.log(session, processQueryKey)
+    session.app.emit(session, 'send', session)
     this.results.push(session)
   }
 
@@ -109,7 +112,6 @@ export class DingtalkMessageEncoder extends MessageEncoder<DingtalkBot> {
       this.buffer += `* `
     } else if (type === 'a' && attrs.href) {
       this.buffer += `[`
-      console.log(children)
       await this.render(children)
       this.buffer += `](${encodeURI(attrs.href)})`
     } else if (type === 'ul' || type === 'ol') {
@@ -126,7 +128,6 @@ export class DingtalkMessageEncoder extends MessageEncoder<DingtalkBot> {
       this.render(children)
       this.buffer += '\n'
     } else if (type === 'blockquote') {
-      console.log(children)
       if (!this.buffer.endsWith('\n')) this.buffer += '\n'
       this.buffer += '> '
       await this.render(children)

adapters/dingtalk/src/ws.ts

@@ -6,6 +6,7 @@ export class WsClient extends Adapter.WsClient<DingtalkBot> {
   async prepare() {
     await this.bot.refreshToken()
     this.bot.selfId = this.bot.config.appkey
+    await this.bot.initialize()
     const { endpoint, ticket } = await this.bot.http.post<{
       endpoint: string
       ticket: string
@@ -23,6 +24,7 @@ export class WsClient extends Adapter.WsClient<DingtalkBot> {
   }
 
   accept() {
+    this.bot.online()
     this.bot.socket.addEventListener('message', async ({ data }) => {
       const parsed = JSON.parse(data.toString())
       this.ctx.logger('dingtalk').debug(require('util').inspect(parsed, false, null, true))