@zhin.js/adapter-lark 1.1.11 → 1.1.13

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @zhin.js/adapter-lark
 
+## 1.1.13
+
+### Patch Changes
+
+- Updated dependencies [db06de8]
+  - @zhin.js/core@1.1.48
+
+## 1.1.12
+
+### Patch Changes
+
+- e40899f: Adapters now project group owners and admins onto the canonical `sender.roles` names `owner` / `admin` (Telegram creator/administrator, KOOK guild owner and admin-permission roles, Lark chat owner/managers, QQ official guild owner/admin identities). KOOK numeric role ids moved from `roles` to `permissions` (`role:<id>`). `@zhin.js/command` exports `canManageConversation` ("private chat or owner/admin/master"), now shared by the Bilibili and earthquake subscription commands; Roulette lets owners and admins toggle the mute penalty and cancel a game.
+- 9e1d1a6: 飞书 / KOOK 查询群主与管理员时，缓存失效那一刻同一个群（服务器）的并发消息共用一次查询，不再各自调用一次接口。
+- Updated dependencies [1a11207]
+- Updated dependencies [9943df6]
+- Updated dependencies [5be09ae]
+- Updated dependencies [a3ab153]
+- Updated dependencies [e8f7309]
+- Updated dependencies [5afc18f]
+- Updated dependencies [d3563d9]
+- Updated dependencies [c618eb7]
+- Updated dependencies [fbfefb7]
+  - @zhin.js/tool@1.1.8
+  - @zhin.js/core@1.1.47
+  - @zhin.js/adapter@1.1.21
+  - @zhin.js/feature-kit@1.1.7
+  - @zhin.js/im-contract@1.1.5
+  - @zhin.js/agent-feature@1.1.8
+  - @zhin.js/skill@1.1.8
+  - @zhin.js/host-http@1.1.8
+
 ## 1.1.11
 
 ### Patch Changes

package/lib/endpoint.js

@@ -9,6 +9,7 @@ import { Endpoint, createEndpointLifecycle, createRecallEndpointControl, } from
 import { formatCompact, getAdapterLogger } from '@zhin.js/logger';
 import { buildImageUploadForm, readOutboundImageMedia, resolveMediaBinary, } from './media-upload.js';
 import { formatInboundContent, formatOutboundBody, generateMessageId, larkInboundConversation, resolveChatType, resolveSender, } from './protocol.js';
+import { normalizeLarkSenderForPermit } from './platform-permit.js';
 import { registerLarkWebhookRoutes } from './webhook.js';
 import { createLarkLongConnection } from './long-connection.js';
 /** 出站 HTTP 调用统一 30s 超时。 */
@@ -31,6 +32,7 @@ export class LarkClient {
     setChatManagers = (id, users) => this.api.setChatManagers(id, users);
     removeChatManagers = (id, users) => this.api.removeChatManagers(id, users);
 }
+const LARK_CHAT_MANAGER_CACHE_TTL_MS = 60_000;
 export class LarkEndpoint extends Endpoint {
     client = new LarkClient({
         getUserInfo: (id, type) => this.getUserInfo(id, type),
@@ -82,6 +84,9 @@ export class LarkEndpoint extends Endpoint {
     #lifecycle;
     #cardSources = new Map();
     #seen = new Map();
+    #chatManagers = new Map();
+    /** One chat.get per chat at a time: concurrent messages on a cache miss share the lookup. */
+    #chatManagerLookups = new Map();
     #startupGeneration = 0;
     #pendingInbound = [];
     constructor(options) {
@@ -301,24 +306,66 @@ export class LarkEndpoint extends Endpoint {
                 this.#seen.delete(this.#seen.keys().next().value);
         }
         const conversation = larkInboundConversation(String(this.#options.id), msg);
-        void this.emit('message.receive', {
+        void this.#emitInbound(msg, conversation).catch((err) => {
+            this.#logger.warn(formatCompact({
+                op: 'lark_gateway_receive_failed',
+                conversation: conversation.id,
+                error: err instanceof Error ? err.message : String(err),
+            }));
+        });
+    }
+    async #emitInbound(msg, conversation) {
+        const chatType = resolveChatType(msg.chat_id, msg.chat_type);
+        const senderId = resolveSender(msg);
+        const permit = chatType === 'group' && msg.chat_id
+            ? normalizeLarkSenderForPermit(await this.#resolveChatRole(msg.chat_id, senderId))
+            : undefined;
+        // 规范角色 owner / admin 进 roles；细粒度能力放 senderPermissions
+        const role = permit?.role === 'owner' || permit?.role === 'admin' ? permit.role : undefined;
+        await this.emit('message.receive', {
             conversation,
             message: { conversation, id: generateMessageId(msg) },
             content: formatInboundContent(msg),
-            sender: { id: resolveSender(msg) },
+            sender: { id: senderId, ...(role ? { roles: [role] } : {}) },
             endpointId: this.#options.config.id,
             metadata: Object.freeze({
                 messageType: msg.message_type,
-                chatType: resolveChatType(msg.chat_id, msg.chat_type),
+                chatType,
+                ...(role ? { senderRole: role } : {}),
+                ...(role && permit?.permissions?.length ? { senderPermissions: [...permit.permissions] } : {}),
             }),
-        }).catch((err) => {
-            this.#logger.warn(formatCompact({
-                op: 'lark_gateway_receive_failed',
-                conversation: conversation.id,
-                error: err instanceof Error ? err.message : String(err),
-            }));
         });
     }
+    /** 群主 / 群管理员来自 chat.get（owner_id + 管理员列表），按群缓存；失败时保守地视为普通成员。 */
+    async #resolveChatRole(chatId, senderId) {
+        const now = Date.now();
+        for (const [id, entry] of this.#chatManagers)
+            if (now - entry.at > LARK_CHAT_MANAGER_CACHE_TTL_MS)
+                this.#chatManagers.delete(id);
+        let entry = this.#chatManagers.get(chatId);
+        if (!entry) {
+            let lookup = this.#chatManagerLookups.get(chatId);
+            if (!lookup) {
+                lookup = (async () => {
+                    const info = await this.getChatInfo(chatId);
+                    const admins = Array.isArray(info?.user_manager_id_list) ? info.user_manager_id_list.map(String) : [];
+                    const fetched = {
+                        at: Date.now(),
+                        ...(typeof info?.owner_id === 'string' && info.owner_id ? { owner: info.owner_id } : {}),
+                        admins: new Set(admins),
+                    };
+                    this.#chatManagers.set(chatId, fetched);
+                    return fetched;
+                })().finally(() => this.#chatManagerLookups.delete(chatId));
+                this.#chatManagerLookups.set(chatId, lookup);
+            }
+            entry = await lookup;
+        }
+        return {
+            isOwner: entry.owner !== undefined && entry.owner === senderId,
+            isAdmin: entry.admins.has(senderId),
+        };
+    }
     /** Only correlate callbacks to a card actually sent by this endpoint. */
     admitCardAction(event) {
         if (!this.#open)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-lark",
-  "version": "1.1.11",
+  "version": "1.1.13",
   "description": "Zhin.js Lark/Feishu adapter (HTTP webhook and WebSocket long connection)",
   "type": "module",
   "main": "./lib/index.js",
@@ -35,24 +35,24 @@
   "dependencies": {
     "undici": "6.28.0",
     "@larksuiteoapi/node-sdk": "^1.67.0",
-    "@zhin.js/adapter": "1.1.20",
-    "@zhin.js/agent-feature": "1.1.7",
-    "@zhin.js/core": "1.1.46",
-    "@zhin.js/feature-kit": "1.1.6",
-    "@zhin.js/host-http": "1.1.7",
-    "@zhin.js/im-contract": "1.1.4",
-    "@zhin.js/skill": "1.1.7",
-    "@zhin.js/tool": "1.1.7",
-    "@zhin.js/logger": "1.1.2"
+    "@zhin.js/adapter": "1.1.21",
+    "@zhin.js/agent-feature": "1.1.8",
+    "@zhin.js/core": "1.1.48",
+    "@zhin.js/feature-kit": "1.1.7",
+    "@zhin.js/host-http": "1.1.8",
+    "@zhin.js/im-contract": "1.1.5",
+    "@zhin.js/logger": "1.1.2",
+    "@zhin.js/skill": "1.1.8",
+    "@zhin.js/tool": "1.1.8"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@zhin.js/adapter": "^1.1.20",
-    "@zhin.js/command": "^1.1.8",
-    "@zhin.js/core": "^1.1.46",
-    "zhin.js": "^1.1.11",
-    "@zhin.js/host-http": "^1.1.7",
-    "@zhin.js/permission": "^1.1.7"
+    "@zhin.js/adapter": "^1.1.21",
+    "@zhin.js/command": "^1.1.9",
+    "@zhin.js/core": "^1.1.48",
+    "@zhin.js/host-http": "^1.1.8",
+    "@zhin.js/permission": "^1.1.7",
+    "zhin.js": "^1.1.13"
   },
   "peerDependenciesMeta": {
     "@zhin.js/command": {
@@ -70,7 +70,7 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "zhin.js": "1.1.11"
+    "zhin.js": "1.1.13"
   },
   "files": [
     "adapters",

package/src/endpoint.ts

@@ -37,6 +37,7 @@ import {
   type LarkMessage,
   type ResolvedLarkConfig,
 } from './protocol.js';
+import { normalizeLarkSenderForPermit } from './platform-permit.js';
 import { registerLarkWebhookRoutes } from './webhook.js';
 import { createLarkLongConnection, type LarkLongConnectionFactory } from './long-connection.js';
 
@@ -100,6 +101,8 @@ export class LarkClient implements LarkClientApi {
   removeChatManagers = (id: string, users: string[]) => this.api.removeChatManagers(id, users);
 }
 
+const LARK_CHAT_MANAGER_CACHE_TTL_MS = 60_000;
+
 export class LarkEndpoint extends Endpoint<LarkClient> {
   readonly client = new LarkClient({
     getUserInfo: (id, type) => this.getUserInfo(id, type),
@@ -154,6 +157,9 @@ export class LarkEndpoint extends Endpoint<LarkClient> {
   readonly #lifecycle: EndpointLifecycle;
   readonly #cardSources = new Map<string, { conversation: ConversationRef; time: number }>();
   readonly #seen = new Map<string, number>();
+  readonly #chatManagers = new Map<string, { at: number; owner?: string; admins: ReadonlySet<string> }>();
+  /** One chat.get per chat at a time: concurrent messages on a cache miss share the lookup. */
+  readonly #chatManagerLookups = new Map<string, Promise<{ at: number; owner?: string; admins: ReadonlySet<string> }>>();
   #startupGeneration = 0;
   readonly #pendingInbound: LarkMessage[] = [];
 
@@ -353,25 +359,70 @@ export class LarkEndpoint extends Endpoint<LarkClient> {
       if (this.#seen.size > 10_000) this.#seen.delete(this.#seen.keys().next().value!);
     }
     const conversation = larkInboundConversation(String(this.#options.id), msg);
-    void this.emit('message.receive', {
+    void this.#emitInbound(msg, conversation).catch((err) => {
+      this.#logger.warn(formatCompact({
+        op: 'lark_gateway_receive_failed',
+        conversation: conversation.id,
+        error: err instanceof Error ? err.message : String(err),
+      }));
+    });
+  }
+
+  async #emitInbound(msg: LarkMessage, conversation: ConversationRef): Promise<void> {
+    const chatType = resolveChatType(msg.chat_id, msg.chat_type);
+    const senderId = resolveSender(msg);
+    const permit = chatType === 'group' && msg.chat_id
+      ? normalizeLarkSenderForPermit(await this.#resolveChatRole(msg.chat_id, senderId))
+      : undefined;
+    // 规范角色 owner / admin 进 roles；细粒度能力放 senderPermissions
+    const role = permit?.role === 'owner' || permit?.role === 'admin' ? permit.role : undefined;
+    await this.emit('message.receive', {
       conversation,
       message: { conversation, id: generateMessageId(msg) },
       content: formatInboundContent(msg),
-      sender: { id: resolveSender(msg) },
+      sender: { id: senderId, ...(role ? { roles: [role] } : {}) },
       endpointId: this.#options.config.id,
       metadata: Object.freeze({
         messageType: msg.message_type,
-        chatType: resolveChatType(msg.chat_id, msg.chat_type),
+        chatType,
+        ...(role ? { senderRole: role } : {}),
+        ...(role && permit?.permissions?.length ? { senderPermissions: [...permit.permissions] } : {}),
       }),
-    }).catch((err) => {
-      this.#logger.warn(formatCompact({
-        op: 'lark_gateway_receive_failed',
-        conversation: conversation.id,
-        error: err instanceof Error ? err.message : String(err),
-      }));
     });
   }
 
+  /** 群主 / 群管理员来自 chat.get（owner_id + 管理员列表），按群缓存；失败时保守地视为普通成员。 */
+  async #resolveChatRole(chatId: string, senderId: string): Promise<{ isOwner: boolean; isAdmin: boolean }> {
+    const now = Date.now();
+    for (const [id, entry] of this.#chatManagers) if (now - entry.at > LARK_CHAT_MANAGER_CACHE_TTL_MS) this.#chatManagers.delete(id);
+    let entry = this.#chatManagers.get(chatId);
+    if (!entry) {
+      let lookup = this.#chatManagerLookups.get(chatId);
+      if (!lookup) {
+        lookup = (async () => {
+          const info = await this.getChatInfo(chatId) as {
+            owner_id?: unknown;
+            user_manager_id_list?: unknown;
+          } | null;
+          const admins = Array.isArray(info?.user_manager_id_list) ? info.user_manager_id_list.map(String) : [];
+          const fetched = {
+            at: Date.now(),
+            ...(typeof info?.owner_id === 'string' && info.owner_id ? { owner: info.owner_id } : {}),
+            admins: new Set(admins) as ReadonlySet<string>,
+          };
+          this.#chatManagers.set(chatId, fetched);
+          return fetched;
+        })().finally(() => this.#chatManagerLookups.delete(chatId));
+        this.#chatManagerLookups.set(chatId, lookup);
+      }
+      entry = await lookup;
+    }
+    return {
+      isOwner: entry.owner !== undefined && entry.owner === senderId,
+      isAdmin: entry.admins.has(senderId),
+    };
+  }
+
   /** Only correlate callbacks to a card actually sent by this endpoint. */
   admitCardAction(event: LarkCardAction): void {
     if (!this.#open) return;