@satorijs/adapter-lark 3.9.4 → 3.9.5

package/lib/index.cjs

@@ -574,10 +574,18 @@ var LarkMessageEncoder = class extends import_core3.MessageEncoder {
     if (type === "text") {
       this.textContent += attrs.content;
     } else if (type === "at") {
-      if (attrs.type === "all") {
-        this.textContent += `<at user_id="all">${attrs.name ?? "所有人"}</at>`;
+      if (this.card) {
+        if (attrs.type === "all") {
+          this.textContent += `<at id=all>${attrs.name ?? "所有人"}</at>`;
+        } else {
+          this.textContent += `<at id=${attrs.id}>${attrs.name ?? ""}</at>`;
+        }
       } else {
-        this.textContent += `<at user_id="${attrs.id}">${attrs.name}</at>`;
+        if (attrs.type === "all") {
+          this.textContent += `<at user_id="all">${attrs.name ?? "所有人"}</at>`;
+        } else {
+          this.textContent += `<at user_id="${attrs.id}">${attrs.name ?? ""}</at>`;
+        }
       }
     } else if (type === "a") {
       await this.render(children);
@@ -916,14 +924,21 @@ var LarkBot = class extends import_core5.Bot {
     this.online();
   }
   async refreshToken() {
-    const { tenant_access_token: token } = await this.internal.tenantAccessTokenInternalAuth({
-      app_id: this.config.appId,
-      app_secret: this.config.appSecret
-    });
-    this.logger.debug("refreshed token %s", token);
-    this.token = token;
+    let timeout = import_core5.Time.minute * 20;
+    try {
+      const { tenant_access_token: token } = await this.internal.tenantAccessTokenInternalAuth({
+        app_id: this.config.appId,
+        app_secret: this.config.appSecret
+      });
+      this.logger.debug("refreshed token %s", token);
+      this.token = token;
+    } catch (error) {
+      this.logger.error("failed to refresh token, retrying in 10s");
+      this.logger.error(error);
+      timeout = import_core5.Time.second * 10;
+    }
     if (this._refresher) clearTimeout(this._refresher);
-    this._refresher = setTimeout(() => this.refreshToken(), import_core5.Time.minute * 20);
+    this._refresher = setTimeout(() => this.refreshToken(), timeout);
     this.online();
   }
   get token() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@satorijs/adapter-lark",
   "description": "Lark (飞书) Adapter for Satorijs",
-  "version": "3.9.4",
+  "version": "3.9.5",
   "type": "module",
   "main": "lib/index.cjs",
   "types": "lib/index.d.ts",

package/src/bot.ts

@@ -74,19 +74,26 @@ export class LarkBot<C extends Context = Context> extends Bot<C, LarkBot.Config>
   }
 
   private async refreshToken() {
-    const { tenant_access_token: token } = await this.internal.tenantAccessTokenInternalAuth({
-      app_id: this.config.appId,
-      app_secret: this.config.appSecret,
-    })
-    this.logger.debug('refreshed token %s', token)
-    this.token = token
-    if (this._refresher) clearTimeout(this._refresher)
     // https://open.feishu.cn/document/server-docs/authentication-management/access-token/tenant_access_token_internal
     // tenant_access_token 的最大有效期是 2 小时。
     // 剩余有效期小于 30 分钟时，调用本接口会返回一个新的 tenant_access_token，此时会同时存在两个有效的 tenant_access_token。
     // 剩余有效期大于等于 30 分钟时，调用本接口会返回原有的 tenant_access_token。
     // 初次获得 token 后的半小时内必须刷新一次，因为初次获得的 token 可能是 1.5 小时前生成的。
-    this._refresher = setTimeout(() => this.refreshToken(), Time.minute * 20)
+    let timeout = Time.minute * 20
+    try {
+      const { tenant_access_token: token } = await this.internal.tenantAccessTokenInternalAuth({
+        app_id: this.config.appId,
+        app_secret: this.config.appSecret,
+      })
+      this.logger.debug('refreshed token %s', token)
+      this.token = token
+    } catch (error) {
+      this.logger.error('failed to refresh token, retrying in 10s')
+      this.logger.error(error)
+      timeout = Time.second * 10
+    }
+    if (this._refresher) clearTimeout(this._refresher)
+    this._refresher = setTimeout(() => this.refreshToken(), timeout)
     this.online()
   }
 

package/src/message.ts

@@ -206,10 +206,18 @@ export class LarkMessageEncoder<C extends Context = Context> extends MessageEnco
     if (type === 'text') {
       this.textContent += attrs.content
     } else if (type === 'at') {
-      if (attrs.type === 'all') {
-        this.textContent += `<at user_id="all">${attrs.name ?? '所有人'}</at>`
+      if (this.card) {
+        if (attrs.type === 'all') {
+          this.textContent += `<at id=all>${attrs.name ?? '所有人'}</at>`
+        } else {
+          this.textContent += `<at id=${attrs.id}>${attrs.name ?? ''}</at>`
+        }
       } else {
-        this.textContent += `<at user_id="${attrs.id}">${attrs.name}</at>`
+        if (attrs.type === 'all') {
+          this.textContent += `<at user_id="all">${attrs.name ?? '所有人'}</at>`
+        } else {
+          this.textContent += `<at user_id="${attrs.id}">${attrs.name ?? ''}</at>`
+        }
       }
     } else if (type === 'a') {
       await this.render(children)