@satorijs/adapter-lark 3.10.6 → 3.11.1

package/src/internal.ts

@@ -34,17 +34,26 @@ export interface InternalRoute {
 }
 
 export class Internal<C extends Context = Context> {
-  constructor(private bot: LarkBot<C>) {}
+  constructor(bot: LarkBot<C>, tree = Internal._tree) {
+    return new Proxy(this, {
+      get: (target, prop) => {
+        if (typeof prop === 'symbol') return Reflect.get(target, prop)
+        const value = tree[prop]
+        if (typeof value === 'function') return value.bind(bot)
+        if (value) return new Internal(bot, value)
+      },
+    })
+  }
 
-  private _assertResponse(response: HTTP.Response<BaseResponse>) {
+  private static _assertResponse(bot: LarkBot, response: HTTP.Response<BaseResponse>) {
     if (!response.data.code) return
-    this.bot.logger.debug('response: %o', response.data)
+    bot.logger.debug('response: %o', response.data)
     const error = new HTTP.Error(`request failed`)
     error.response = response
     throw error
   }
 
-  private _buildData(arg: object, options: InternalRoute) {
+  private static _buildData(arg: object, options: InternalRoute) {
     if (options.multipart) {
       const form = new FormData()
       for (const [key, value] of Object.entries(arg)) {
@@ -60,6 +69,8 @@ export class Internal<C extends Context = Context> {
     }
   }
 
+  private static _tree: Dict = Object.create(null)
+
   static define(routes: Dict<Partial<Record<HTTP.Method, string | InternalRoute>>>) {
     for (const path in routes) {
       for (const key in routes[path]) {
@@ -69,7 +80,7 @@ export class Internal<C extends Context = Context> {
             route = { name: route }
           }
 
-          const impl = async function (this: Internal, ...args: any[]) {
+          const impl = async function (bot: LarkBot, ...args: any[]) {
             const raw = args.join(', ')
             const url = path.replace(/\{([^}]+)\}/g, () => {
               if (!args.length) throw new Error(`too few arguments for ${path}, received ${raw}`)
@@ -80,10 +91,10 @@ export class Internal<C extends Context = Context> {
               if (method === 'GET' || method === 'DELETE') {
                 config.params = args[0]
               } else {
-                config.data = this._buildData(args[0], route)
+                config.data = Internal._buildData(args[0], route)
               }
             } else if (args.length === 2 && method !== 'GET' && method !== 'DELETE') {
-              config.data = this._buildData(args[0], route)
+              config.data = Internal._buildData(args[0], route)
               config.params = args[1]
             } else if (args.length > 1) {
               throw new Error(`too many arguments for ${path}, received ${raw}`)
@@ -91,8 +102,8 @@ export class Internal<C extends Context = Context> {
             if (route.type === 'binary') {
               config.responseType = 'arraybuffer'
             }
-            const response = await this.bot.http(method, url, config)
-            this._assertResponse(response)
+            const response = await bot.http(method, url, config)
+            Internal._assertResponse(bot, response)
             if (route.type === 'raw-json' || route.type === 'binary') {
               return response.data
             } else {
@@ -100,12 +111,18 @@ export class Internal<C extends Context = Context> {
             }
           }
 
-          Internal.prototype[route.name] = function (this: Internal, ...args: any[]) {
+          let root = Internal._tree
+          const parts = route.name.split('.')
+          const lastPart = parts.pop()!
+          for (const part of parts) {
+            root = root[part] ??= Object.create(null)
+          }
+          root[lastPart] = function (this: LarkBot, ...args: any[]) {
             let promise: Promise<any> | undefined
             const result = {} as Paginated
             for (const key of ['then', 'catch', 'finally']) {
               result[key] = (...args2: any[]) => {
-                return (promise ??= impl.apply(this, args))[key](...args2)
+                return (promise ??= impl(this, ...args))[key](...args2)
               }
             }
 
@@ -126,7 +143,7 @@ export class Internal<C extends Context = Context> {
                 return this
               }
               result[Symbol.for('satori.pagination')] = async () => {
-                const data = await impl.apply(this, iterArgs)
+                const data = await impl(this, ...iterArgs)
                 iterArgs[argIndex].page_token = data[tokenKey]
                 return {
                   data: data[itemsKey],

package/src/message.ts

@@ -1,6 +1,6 @@
 import { Context, Dict, h, MessageEncoder } from '@satorijs/core'
 import { LarkBot } from './bot'
-import { CreateImFileForm, Message } from './types'
+import { Im, Message } from './types'
 import { EventPayload, extractIdType } from './utils'
 import { MessageContent } from './content'
 
@@ -11,8 +11,7 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
   private textContent = ''
   private richContent: MessageContent.RichText.Paragraph[] = []
   private card: MessageContent.Card | undefined
-  private noteElements: MessageContent.Card.NoteElement.InnerElement[] | undefined
-  private actionElements: MessageContent.Card.Element[] = []
+  private elements: MessageContent.Card.Element[] = []
   private isForm = false
 
   public editMessageIds: string[] | undefined
@@ -29,7 +28,7 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
           }
         } else if (this.referrer.type === 'card.action.trigger') {
           // cannot determine whether the card is in thread or not
-          const { items: [message] } = await this.bot.internal.getImMessage(this.referrer.event.context.open_message_id)
+          const { items: [message] } = await this.bot.internal.im.message.get(this.referrer.event.context.open_message_id)
           if (message?.thread_id) {
             quote = {
               id: this.referrer.event.context.open_message_id,
@@ -43,18 +42,18 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
         if (!messageId) throw new Error('No message to edit')
         if (data.msg_type === 'interactive') {
           delete data.msg_type
-          await this.bot.internal.patchImMessage(messageId, data)
+          await this.bot.internal.im.message.patch(messageId, data)
         } else {
-          await this.bot.internal.updateImMessage(messageId, data)
+          await this.bot.internal.im.message.update(messageId, data)
         }
       } else if (quote?.id) {
-        resp = await this.bot.internal.replyImMessage(quote.id, {
+        resp = await this.bot.internal.im.message.reply(quote.id, {
           ...data,
           reply_in_thread: quote.replyInThread,
         })
       } else {
         data.receive_id = this.channelId
-        resp = await this.bot.internal.createImMessage(data, {
+        resp = await this.bot.internal.im.message.create(data, {
           receive_id_type: extractIdType(this.channelId),
         })
       }
@@ -79,20 +78,11 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
     }
   }
 
-  private flushText(button = false) {
-    if ((this.textContent || !button) && this.actionElements.length) {
-      this.card!.elements.push({ tag: 'action', actions: this.actionElements, layout: 'flow' })
-      this.actionElements = []
-    }
-    if (this.textContent) {
-      this.richContent.push([{ tag: 'md', text: this.textContent }])
-      if (this.noteElements) {
-        this.noteElements.push({ tag: 'plain_text', content: this.textContent })
-      } else if (this.card) {
-        this.card.elements.push({ tag: 'markdown', content: this.textContent })
-      }
-      this.textContent = ''
-    }
+  private flushText() {
+    if (!this.textContent) return
+    this.richContent.push([{ tag: 'md', text: this.textContent }])
+    this.elements.push({ tag: 'markdown', content: this.textContent })
+    this.textContent = ''
   }
 
   async flush() {
@@ -100,13 +90,11 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
     if (!this.card && !this.richContent.length) return
 
     if (this.card) {
-      this.bot.logger.debug('card', JSON.stringify(this.card.elements))
+      // strip undefined properties
+      this.bot.logger.debug('card %o', JSON.parse(JSON.stringify(this.card)))
       await this.post({
         msg_type: 'interactive',
-        content: JSON.stringify({
-          header: this.card.header,
-          elements: this.card.elements,
-        }),
+        content: JSON.stringify(this.card),
       })
     } else {
       await this.post({
@@ -128,7 +116,7 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
 
   async createImage(url: string) {
     const { filename, type, data } = await this.bot.assetsQuester.file(url)
-    const { image_key } = await this.bot.internal.createImImage({
+    const { image_key } = await this.bot.internal.im.image.create({
       image_type: 'message',
       image: new File([data], filename, { type }),
     })
@@ -149,7 +137,7 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
 
     const { filename, type, data } = await this.bot.assetsQuester.file(url)
 
-    let file_type: CreateImFileForm['file_type']
+    let file_type: Im.File.CreateForm['file_type']
     if (_type === 'audio') {
       // FIXME: only support opus
       file_type = 'opus'
@@ -165,7 +153,7 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
       }
     }
 
-    const form: CreateImFileForm = {
+    const form: Im.File.CreateForm = {
       file_type,
       file: new File([data], filename, { type }),
       file_name: filename,
@@ -174,21 +162,21 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
       form.duration = attrs.duration
     }
 
-    const { file_key } = await this.bot.internal.createImFile(form)
+    const { file_key } = await this.bot.internal.im.file.create(form)
     await this.post({
       msg_type: _type === 'video' ? 'media' : _type,
       content: JSON.stringify({ file_key }),
     })
   }
 
-  private createBehavior(attrs: Dict) {
+  private createBehaviors(attrs: Dict) {
     const behaviors: MessageContent.Card.ActionBehavior[] = []
     if (attrs.type === 'link') {
       behaviors.push({
         type: 'open_url',
         default_url: attrs.href,
       })
-    } else if (attrs.type === 'input') {
+    } else if (attrs.type === 'input' || attrs.type === 'submit') {
       behaviors.push({
         type: 'callback',
         value: {
@@ -248,26 +236,24 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
     } else if (type === 'hr') {
       this.flushText()
       this.richContent.push([{ tag: 'hr' }])
-      this.card?.elements.push({ tag: 'hr' })
+      this.elements.push({ tag: 'hr' })
     } else if (type === 'form') {
       this.flushText()
-      const length = this.card?.elements.length
+      const parent = this.elements
+      parent.push({
+        tag: 'form',
+        name: attrs.name || 'Form',
+        elements: this.elements = [],
+      })
       this.isForm = true
       await this.render(children)
       this.isForm = false
-      if (this.card?.elements.length > length) {
-        const elements = this.card?.elements.splice(length)
-        this.card.elements.push({
-          tag: 'form',
-          name: attrs.name || 'Form',
-          elements,
-        })
-      }
+      this.elements = parent
     } else if (type === 'input') {
       if (attrs.type === 'checkbox') {
         this.flushText()
         await this.render(children)
-        this.card?.elements.push({
+        this.elements.push({
           tag: 'checker',
           name: (attrs.argument ? '@@' : attrs.option ? `@${attrs.option}=` : '') + attrs.name,
           checked: attrs.value,
@@ -278,20 +264,17 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
         })
         this.textContent = ''
       } else if (attrs.type === 'submit') {
-        this.flushText(true)
+        this.flushText()
         await this.render(children)
-        this.card?.elements.push({
+        this.elements.push({
           tag: 'button',
           name: attrs.name,
           text: {
             tag: 'plain_text',
             content: this.textContent,
           },
-          action_type: 'form_submit',
-          value: {
-            _satori_type: 'command',
-            content: attrs.text,
-          },
+          form_action_type: 'submit',
+          behaviors: this.createBehaviors(attrs),
         })
         this.textContent = ''
       } else {
@@ -311,18 +294,9 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
           default_value: attrs.value,
           disabled: attrs.disabled,
           required: attrs.required,
+          behaviors: this.createBehaviors(attrs),
         }
-        if (this.isForm) {
-          this.card?.elements.push(input)
-        } else {
-          this.card?.elements.push({
-            tag: 'action',
-            actions: [{
-              ...input,
-              behaviors: this.createBehavior(attrs),
-            }],
-          })
-        }
+        this.elements.push(input)
       }
     } else if (type === 'select') {
       this.flushText()
@@ -338,6 +312,7 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
           content: attrs.placeholder,
         },
         options: [],
+        behaviors: this.createBehaviors(attrs),
       }
       for (const child of children) {
         if (child.type !== 'option') continue
@@ -351,29 +326,17 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
         })
         this.textContent = ''
       }
-      if (this.isForm) {
-        this.card?.elements.push(select)
-      } else {
-        this.card?.elements.push({
-          tag: 'action',
-          actions: [{
-            ...select,
-            behaviors: this.createBehavior(attrs),
-          }],
-        })
-      }
+      this.elements.push(select)
     } else if (type === 'button') {
-      this.card ??= { elements: [] }
-      this.flushText(true)
+      this.flushText()
       await this.render(children)
-      this.actionElements.push({
+      this.elements.push({
         tag: 'button',
         text: {
           tag: 'plain_text',
           content: this.textContent,
         },
         disabled: attrs.disabled,
-        behaviors: this.createBehavior(attrs),
         type: attrs['lark:type'],
         size: attrs['lark:size'],
         width: attrs['lark:width'],
@@ -389,12 +352,24 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
           tag: 'plain_text',
           content: attrs['lark:disabled-tips'],
         },
+        behaviors: this.createBehaviors(attrs),
       })
       this.textContent = ''
-    } else if (type === 'button-group') {
+    } else if (type === 'div') {
       this.flushText()
       await this.render(children)
-      this.flushText()
+      this.elements.push({
+        tag: 'markdown',
+        text_align: attrs.align,
+        text_size: attrs.size,
+        content: this.textContent,
+        margin: attrs.margin,
+        icon: attrs.icon && {
+          tag: 'standard_icon',
+          token: attrs.icon,
+        },
+      })
+      this.textContent = ''
     } else if (type.startsWith('lark:') || type.startsWith('feishu:')) {
       const tag = type.slice(type.split(':', 1)[0].length + 1)
       if (tag === 'share-chat') {
@@ -424,7 +399,7 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
       } else if (tag === 'card') {
         await this.flush()
         this.card = {
-          elements: [],
+          schema: '2.0',
           header: attrs.title && {
             template: attrs.color,
             ud_icon: attrs.icon && {
@@ -440,39 +415,15 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
               content: attrs.subtitle,
             },
           },
+          body: {
+            elements: this.elements = [],
+          },
         }
         await this.render(children, true)
-      } else if (tag === 'div') {
-        this.flushText()
-        await this.render(children)
-        this.card?.elements.push({
-          tag: 'markdown',
-          text_align: attrs.align,
-          text_size: attrs.size,
-          content: this.textContent,
-        })
-        this.textContent = ''
-      } else if (tag === 'note') {
-        this.flushText()
-        this.noteElements = []
-        await this.render(children)
-        this.flushText()
-        this.card?.elements.push({
-          tag: 'note',
-          elements: this.noteElements,
-        })
-        this.noteElements = undefined
-      } else if (tag === 'icon') {
-        this.flushText()
-        this.noteElements?.push({
-          tag: 'standard_icon',
-          token: attrs.token,
-        })
       } else if (tag === 'column-set') {
         this.flushText()
-        const parent = this.card
         const columns: MessageContent.Card.ColumnElement[] = []
-        parent?.elements.push({
+        this.elements.push({
           tag: 'column_set',
           margin: attrs.margin,
           flex_mode: attrs.flexMode,
@@ -481,12 +432,13 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
           background_style: attrs.backgroundStyle,
           columns,
         })
+        const parent = this.elements
         for (const child of children) {
           if (child.type !== 'lark:column' && child.type !== 'feishu:column') {
             // throw unexpected?
             continue
           }
-          this.card = { elements: [] }
+          this.elements = []
           await this.render(child.children)
           this.flushText()
           columns.push({
@@ -497,11 +449,30 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
             vertical_align: child.attrs.verticalAlign ?? 'center',
             vertical_spacing: child.attrs.verticalSpacing ?? '0px',
             background_style: child.attrs.backgroundStyle,
-            elements: this.card.elements,
+            elements: this.elements,
           })
         }
-        this.card = parent
+        this.elements = parent
       }
+    } else if (type === 'button-group') {
+      this.flushText()
+      const parent = this.elements
+      this.elements = []
+      await this.render(children)
+      this.flushText()
+      parent.push({
+        tag: 'column_set',
+        margin: attrs.margin,
+        flex_mode: attrs.flexMode,
+        horizontal_align: attrs.horizontalAlign,
+        horizontal_spacing: attrs.horizontalSpacing,
+        background_style: attrs.backgroundStyle,
+        columns: this.elements.map((element) => ({
+          tag: 'column',
+          elements: [element],
+        })),
+      })
+      this.elements = parent
     } else {
       await this.render(children)
     }