@satorijs/adapter-lark 3.7.1 → 3.7.3

package/lib/types/internal.d.ts

@@ -1,4 +1,4 @@
-import { Dict } from '@satorijs/core';
+import { Dict, HTTP } from '@satorijs/core';
 import { LarkBot } from '../bot';
 export interface Internal {
 }
@@ -8,11 +8,14 @@ export interface BaseResponse {
     /** error message. would be 'success' if success. */
     msg: string;
 }
-type Method = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
+export interface InternalConfig {
+    multipart?: boolean;
+    noExtractData?: boolean;
+}
 export declare class Internal {
     private bot;
     constructor(bot: LarkBot);
-    private assertResponse;
-    static define(routes: Dict<Partial<Record<Method, string | string[]>>>, extractData?: boolean): void;
+    private _assertResponse;
+    private _buildData;
+    static define(routes: Dict<Partial<Record<HTTP.Method, string | string[]>>>, options?: InternalConfig): void;
 }
-export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@satorijs/adapter-lark",
   "description": "Lark (飞书) Adapter for Satorijs",
-  "version": "3.7.1",
+  "version": "3.7.3",
   "type": "module",
   "main": "lib/index.cjs",
   "types": "lib/index.d.ts",
@@ -35,10 +35,10 @@
   ],
   "devDependencies": {
     "@cordisjs/plugin-server": "^0.2.4",
-    "@satorijs/core": "^4.2.11",
+    "@satorijs/core": "^4.2.12",
     "cordis": "^3.18.1"
   },
   "peerDependencies": {
-    "@satorijs/core": "^4.2.11"
+    "@satorijs/core": "^4.2.12"
   }
 }

package/src/message.ts

@@ -1,6 +1,6 @@
 import { Context, Dict, h, MessageEncoder } from '@satorijs/core'
 import { LarkBot } from './bot'
-import { Lark, MessageContent } from './types'
+import { CreateImFileForm, Lark, MessageContent } from './types'
 import { extractIdType } from './utils'
 
 export class LarkMessageEncoder<C extends Context = Context> extends MessageEncoder<C, LarkBot<C>> {
@@ -93,40 +93,43 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
 
   async createImage(url: string) {
     const { filename, type, data } = await this.bot.assetsQuester.file(url)
-    const payload = new FormData()
-    payload.append('image', new Blob([data], { type }), filename)
-    payload.append('image_type', 'message')
-    const { image_key } = await this.bot.internal.createImImage(payload)
+    const { image_key } = await this.bot.internal.createImImage({
+      image_type: 'message',
+      image: new File([data], filename, { type }),
+    })
     return image_key
   }
 
   async sendFile(_type: 'video' | 'audio' | 'file', attrs: any) {
     const url = attrs.src || attrs.url
-    const payload = new FormData()
     const { filename, type, data } = await this.bot.assetsQuester.file(url)
-    payload.append('file', new Blob([data], { type }), filename)
-    payload.append('file_name', filename)
-
-    if (attrs.duration) {
-      payload.append('duration', attrs.duration)
-    }
 
+    let file_type: CreateImFileForm['file_type']
     if (_type === 'audio') {
       // FIXME: only support opus
-      payload.append('file_type', 'opus')
+      file_type = 'opus'
     } else if (_type === 'video') {
       // FIXME: only support mp4
-      payload.append('file_type', 'mp4')
+      file_type = 'mp4'
     } else {
       const ext = filename.split('.').pop()
       if (['doc', 'xls', 'ppt', 'pdf'].includes(ext)) {
-        payload.append('file_type', ext)
+        file_type = ext
       } else {
-        payload.append('file_type', 'stream')
+        file_type = 'stream'
       }
     }
 
-    const { file_key } = await this.bot.internal.createImFile(payload)
+    const form: CreateImFileForm = {
+      file_type,
+      file: new File([data], filename, { type }),
+      file_name: filename,
+    }
+    if (attrs.duration) {
+      form.duration = attrs.duration
+    }
+
+    const { file_key } = await this.bot.internal.createImFile(form)
     await this.post({
       msg_type: _type === 'video' ? 'media' : _type,
       content: JSON.stringify({ file_key }),