@satorijs/adapter-lark 3.8.3 → 3.8.5

package/lib/index.cjs

@@ -394,6 +394,14 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
   async post(data) {
     try {
       let resp;
+      let quote = this.quote;
+      const payload = this.options?.session?.lark;
+      if (!quote && payload?.type === "im.message.receive_v1" && payload.event.message.thread_id) {
+        quote = {
+          id: payload.event.message.message_id,
+          replyInThread: true
+        };
+      }
       if (this.editMessageIds) {
         const messageId = this.editMessageIds.pop();
         if (!messageId) throw new Error("No message to edit");
@@ -403,10 +411,10 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
         } else {
           await this.bot.internal.updateImMessage(messageId, data);
         }
-      } else if (this.quote?.id) {
-        resp = await this.bot.internal.replyImMessage(this.quote.id, {
+      } else if (quote?.id) {
+        resp = await this.bot.internal.replyImMessage(quote.id, {
           ...data,
-          reply_in_thread: this.quote.replyInThread
+          reply_in_thread: quote.replyInThread
         });
       } else {
         data.receive_id = this.channelId;
@@ -3353,7 +3361,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() {

package/lib/index.d.ts

@@ -5,7 +5,7 @@ export { Lark, Lark as Feishu };
 export default LarkBot;
 declare module '@satorijs/core' {
     interface Session {
-        feishu: Lark.Internal;
-        lark: Lark.Internal;
+        feishu: Lark.Internal & Lark.EventPayload;
+        lark: Lark.Internal & Lark.EventPayload;
     }
 }

package/lib/types/message/index.d.ts

@@ -16,6 +16,7 @@ declare module '../event' {
                 message_id: string;
                 root_id: string;
                 parent_id: string;
+                thread_id: string;
                 create_time: string;
                 chat_id: string;
                 chat_type: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@satorijs/adapter-lark",
   "description": "Lark (飞书) Adapter for Satorijs",
-  "version": "3.8.3",
+  "version": "3.8.5",
   "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.4",
     "cordis": "^3.18.1"
   },
   "peerDependencies": {
-    "@satorijs/core": "^4.3.2"
+    "@satorijs/core": "^4.3.4"
   }
 }

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()
   }
 

package/src/index.ts

@@ -9,7 +9,7 @@ export default LarkBot
 
 declare module '@satorijs/core' {
   interface Session {
-    feishu: Lark.Internal
-    lark: Lark.Internal
+    feishu: Lark.Internal & Lark.EventPayload
+    lark: Lark.Internal & Lark.EventPayload
   }
 }

package/src/message.ts

@@ -16,6 +16,14 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
   async post(data?: any) {
     try {
       let resp: Lark.Message
+      let quote = this.quote
+      const payload = this.options?.session?.lark
+      if (!quote && payload?.type === 'im.message.receive_v1' && payload.event.message.thread_id) {
+        quote = {
+          id: payload.event.message.message_id,
+          replyInThread: true,
+        }
+      }
       if (this.editMessageIds) {
         const messageId = this.editMessageIds.pop()
         if (!messageId) throw new Error('No message to edit')
@@ -25,10 +33,10 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
         } else {
           await this.bot.internal.updateImMessage(messageId, data)
         }
-      } else if (this.quote?.id) {
-        resp = await this.bot.internal.replyImMessage(this.quote.id, {
+      } else if (quote?.id) {
+        resp = await this.bot.internal.replyImMessage(quote.id, {
           ...data,
-          reply_in_thread: this.quote.replyInThread,
+          reply_in_thread: quote.replyInThread,
         })
       } else {
         data.receive_id = this.channelId

package/src/types/message/index.ts

@@ -18,6 +18,7 @@ declare module '../event' {
         message_id: string
         root_id: string
         parent_id: string
+        thread_id: string
         create_time: string
         chat_id: string
         chat_type: string