@satorijs/adapter-lark 3.8.2 → 3.8.4

package/lib/index.cjs

@@ -390,10 +390,20 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
   card;
   noteElements;
   actionElements = [];
+  editMessageIds;
   async post(data) {
     try {
       let resp;
-      if (this.quote?.id) {
+      if (this.editMessageIds) {
+        const messageId = this.editMessageIds.pop();
+        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);
+        } else {
+          await this.bot.internal.updateImMessage(messageId, data);
+        }
+      } else if (this.quote?.id) {
         resp = await this.bot.internal.replyImMessage(this.quote.id, {
           ...data,
           reply_in_thread: this.quote.replyInThread
@@ -404,6 +414,7 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
           receive_id_type: extractIdType(this.channelId)
         });
       }
+      if (!resp) return;
       const session = this.bot.session();
       session.messageId = resp.message_id;
       session.timestamp = Number(resp.create_time) * 1e3;
@@ -445,6 +456,7 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
       await this.post({
         msg_type: "interactive",
         content: JSON.stringify({
+          header: this.card.header,
           elements: this.card.elements
         })
       });
@@ -3341,7 +3353,7 @@ var LarkBot = class extends import_core5.Bot {
     this.logger.debug("refreshed token %s", token);
     this.token = token;
     if (this._refresher) clearTimeout(this._refresher);
-    this._refresher = setTimeout(() => this.refreshToken(), 3600 * 1e3);
+    this._refresher = setTimeout(() => this.refreshToken(), import_core5.Time.minute * 100);
     this.online();
   }
   get token() {
@@ -3352,10 +3364,9 @@ var LarkBot = class extends import_core5.Bot {
     this.http.config.headers.Authorization = `Bearer ${v}`;
   }
   async editMessage(channelId, messageId, content) {
-    await this.internal.updateImMessage(messageId, {
-      content: import_core5.h.normalize(content).join(""),
-      msg_type: "text"
-    });
+    const encoder = new LarkMessageEncoder(this, channelId);
+    encoder.editMessageIds = [messageId];
+    await encoder.send(content);
   }
   async deleteMessage(channelId, messageId) {
     await this.internal.deleteImMessage(messageId);

package/lib/message.d.ts

@@ -7,6 +7,7 @@ export declare class LarkMessageEncoder<C extends Context = Context> extends Mes
     private card;
     private noteElements;
     private actionElements;
+    editMessageIds: string[] | undefined;
     post(data?: any): Promise<void>;
     private flushText;
     flush(): Promise<void>;

package/package.json

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

package/src/bot.ts

@@ -1,4 +1,4 @@
-import { Bot, Context, h, HTTP, Schema, Universal } from '@satorijs/core'
+import { Bot, Context, h, HTTP, Schema, Time, Universal } from '@satorijs/core'
 
 import { HttpServer } from './http'
 import { LarkMessageEncoder } from './message'
@@ -71,10 +71,12 @@ export class LarkBot<C extends Context = Context> extends Bot<C, LarkBot.Config>
     })
     this.logger.debug('refreshed token %s', token)
     this.token = token
-    // Token would be expired in 2 hours, refresh it every 1 hour
-    // see https://open.larksuite.com/document/ukTMukTMukTM/ukDNz4SO0MjL5QzM/auth-v3/auth/tenant_access_token_internal
+    // tenant_access_token 的最大有效期是 2 小时。
+    // 剩余有效期小于 30 分钟时，调用本接口会返回一个新的 tenant_access_token，这会同时存在两个有效的 tenant_access_token。
+    // 剩余有效期大于等于 30 分钟时，调用本接口会返回原有的 tenant_access_token。
+    // https://open.feishu.cn/document/server-docs/authentication-management/access-token/tenant_access_token_internal
     if (this._refresher) clearTimeout(this._refresher)
-    this._refresher = setTimeout(() => this.refreshToken(), 3600 * 1000)
+    this._refresher = setTimeout(() => this.refreshToken(), Time.minute * 100)
     this.online()
   }
 
@@ -88,10 +90,9 @@ export class LarkBot<C extends Context = Context> extends Bot<C, LarkBot.Config>
   }
 
   async editMessage(channelId: string, messageId: string, content: h.Fragment) {
-    await this.internal.updateImMessage(messageId, {
-      content: h.normalize(content).join(''),
-      msg_type: 'text',
-    })
+    const encoder = new LarkMessageEncoder(this, channelId)
+    encoder.editMessageIds = [messageId]
+    await encoder.send(content)
   }
 
   async deleteMessage(channelId: string, messageId: string) {

package/src/message.ts

@@ -11,10 +11,21 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
   private noteElements: MessageContent.Card.NoteElement.InnerElement[] | undefined
   private actionElements: MessageContent.Card.Element[] = []
 
+  public editMessageIds: string[] | undefined
+
   async post(data?: any) {
     try {
       let resp: Lark.Message
-      if (this.quote?.id) {
+      if (this.editMessageIds) {
+        const messageId = this.editMessageIds.pop()
+        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)
+        } else {
+          await this.bot.internal.updateImMessage(messageId, data)
+        }
+      } else if (this.quote?.id) {
         resp = await this.bot.internal.replyImMessage(this.quote.id, {
           ...data,
           reply_in_thread: this.quote.replyInThread,
@@ -25,6 +36,7 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
           receive_id_type: extractIdType(this.channelId),
         })
       }
+      if (!resp) return
       const session = this.bot.session()
       session.messageId = resp.message_id
       session.timestamp = Number(resp.create_time) * 1000
@@ -70,6 +82,7 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
       await this.post({
         msg_type: 'interactive',
         content: JSON.stringify({
+          header: this.card.header,
           elements: this.card.elements,
         }),
       })