@nextclaw/channel-runtime 0.2.12 → 0.3.0

package/dist/index.d.ts

@@ -99,8 +99,7 @@ declare class EmailChannel extends BaseChannel<Config["channels"]["email"]> {
 
 declare class FeishuChannel extends BaseChannel<Config["channels"]["feishu"]> {
     name: string;
-    private client;
-    private wsClient;
+    private clients;
     private processedMessageIds;
     private processedSet;
     constructor(config: Config["channels"]["feishu"], bus: MessageBus);
@@ -110,6 +109,11 @@ declare class FeishuChannel extends BaseChannel<Config["channels"]["feishu"]> {
     private handleIncoming;
     private isDuplicate;
     private addReaction;
+    private resolveOutboundAccount;
+    private isAllowedByPolicy;
+    private resolveMentionState;
+    private convertResource;
+    private buildInboundPayload;
 }
 
 declare class MochatChannel extends BaseChannel<Config["channels"]["mochat"]> {

package/dist/index.js

@@ -1264,138 +1264,237 @@ var EmailChannel = class extends BaseChannel {
   }
 };
 
-// src/channels/feishu.ts
-import * as Lark from "@larksuiteoapi/node-sdk";
-var MSG_TYPE_MAP = {
-  image: "[image]",
-  audio: "[audio]",
-  file: "[file]",
-  sticker: "[sticker]"
-};
+// src/channels/feishu-message-support.ts
 var TABLE_RE = /((?:^[ \t]*\|.+\|[ \t]*\n)(?:^[ \t]*\|[-:\s|]+\|[ \t]*\n)(?:^[ \t]*\|.+\|[ \t]*\n?)+)/gm;
+function extractSenderInfo(sender) {
+  const senderIdObj = sender.sender_id ?? {};
+  const senderOpenId = senderIdObj.open_id || sender.open_id || "";
+  const senderUserId = senderIdObj.user_id || sender.user_id || "";
+  const senderUnionId = senderIdObj.union_id || sender.union_id || "";
+  return {
+    senderId: senderOpenId || senderUserId || senderUnionId || "",
+    senderType: sender.sender_type ?? sender.senderType,
+    senderOpenId: senderOpenId || void 0,
+    senderUserId: senderUserId || void 0,
+    senderUnionId: senderUnionId || void 0
+  };
+}
+function extractMessageInfo(message) {
+  const chatId = message.chat_id ?? "";
+  const chatType = message.chat_type ?? "";
+  return {
+    chatId,
+    chatType,
+    isGroup: chatType === "group",
+    msgType: message.msg_type ?? message.message_type ?? "",
+    messageId: message.message_id ?? "",
+    rawContent: typeof message.content === "string" ? message.content : ""
+  };
+}
+function extractMentions(root, message) {
+  if (Array.isArray(root.mentions)) {
+    return root.mentions;
+  }
+  if (Array.isArray(message.mentions)) {
+    return message.mentions;
+  }
+  return [];
+}
+function buildInboundMetadata(params) {
+  return {
+    account_id: params.accountId,
+    accountId: params.accountId,
+    message_id: params.messageInfo.messageId,
+    chat_id: params.messageInfo.chatId,
+    chat_type: params.messageInfo.chatType,
+    msg_type: params.messageInfo.msgType,
+    is_group: params.messageInfo.isGroup,
+    peer_kind: params.messageInfo.isGroup ? "group" : "direct",
+    peer_id: params.messageInfo.isGroup ? params.messageInfo.chatId : params.senderInfo.senderId,
+    sender_open_id: params.senderInfo.senderOpenId,
+    sender_user_id: params.senderInfo.senderUserId,
+    sender_union_id: params.senderInfo.senderUnionId,
+    was_mentioned: params.mentionState.wasMentioned,
+    require_mention: params.mentionState.requireMention
+  };
+}
+function inferFeishuResourceMimeType(resourceType) {
+  if (resourceType === "image" || resourceType === "sticker") {
+    return "image/*";
+  }
+  if (resourceType === "audio") {
+    return "audio/*";
+  }
+  return void 0;
+}
+function buildFeishuCardElements(content) {
+  const elements = [];
+  let lastEnd = 0;
+  for (const match of content.matchAll(TABLE_RE)) {
+    const start = match.index ?? 0;
+    const tableText = match[1] ?? "";
+    const before = content.slice(lastEnd, start).trim();
+    if (before) {
+      elements.push({ tag: "markdown", content: before });
+    }
+    elements.push(parseMarkdownTable(tableText) ?? { tag: "markdown", content: tableText });
+    lastEnd = start + tableText.length;
+  }
+  const remaining = content.slice(lastEnd).trim();
+  if (remaining) {
+    elements.push({ tag: "markdown", content: remaining });
+  }
+  if (!elements.length) {
+    elements.push({ tag: "markdown", content });
+  }
+  return elements;
+}
+function parseMarkdownTable(tableText) {
+  const lines = tableText.trim().split("\n").map((line) => line.trim()).filter(Boolean);
+  if (lines.length < 3) {
+    return null;
+  }
+  const split = (line) => line.replace(/^\|+|\|+$/g, "").split("|").map((item) => item.trim());
+  const headers = split(lines[0]);
+  const rows = lines.slice(2).map(split);
+  return {
+    tag: "table",
+    page_size: rows.length + 1,
+    columns: headers.map((header, index) => ({
+      tag: "column",
+      name: `c${index}`,
+      display_name: header,
+      width: "auto"
+    })),
+    rows: rows.map((row) => {
+      const values = {};
+      headers.forEach((_, index) => {
+        values[`c${index}`] = row[index] ?? "";
+      });
+      return values;
+    })
+  };
+}
+
+// src/channels/feishu.ts
+import {
+  buildFeishuConvertContext,
+  convertFeishuMessageContent,
+  getDefaultFeishuAccountId,
+  getEnabledFeishuAccounts,
+  LarkClient
+} from "@nextclaw/feishu-core";
 function isRecord(value) {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 var FeishuChannel = class extends BaseChannel {
   name = "feishu";
-  client = null;
-  wsClient = null;
+  clients = /* @__PURE__ */ new Map();
   processedMessageIds = [];
   processedSet = /* @__PURE__ */ new Set();
   constructor(config, bus) {
     super(config, bus);
   }
   async start() {
-    if (!this.config.appId || !this.config.appSecret) {
+    const accounts = getEnabledFeishuAccounts(this.config);
+    if (accounts.length === 0) {
       throw new Error("Feishu appId/appSecret not configured");
     }
     this.running = true;
-    this.client = new Lark.Client({ appId: this.config.appId, appSecret: this.config.appSecret });
-    const dispatcher = new Lark.EventDispatcher({
-      encryptKey: this.config.encryptKey || void 0,
-      verificationToken: this.config.verificationToken || void 0
-    }).register({
-      "im.message.receive_v1": async (data) => {
-        await this.handleIncoming(data);
+    for (const account of accounts) {
+      const client = LarkClient.fromAccount(account);
+      const activeAccount = {
+        accountId: account.accountId,
+        client
+      };
+      const probe = await client.probe();
+      if (probe.ok) {
+        activeAccount.botOpenId = probe.botOpenId;
+        activeAccount.botName = probe.botName;
       }
-    });
-    this.wsClient = new Lark.WSClient({
-      appId: this.config.appId,
-      appSecret: this.config.appSecret,
-      loggerLevel: Lark.LoggerLevel.info
-    });
-    this.wsClient.start({ eventDispatcher: dispatcher });
+      client.startWebsocket(async (data) => {
+        await this.handleIncoming(account.accountId, data);
+      });
+      this.clients.set(account.accountId, activeAccount);
+    }
   }
   async stop() {
     this.running = false;
-    if (this.wsClient) {
-      this.wsClient.close();
-      this.wsClient = null;
+    for (const account of this.clients.values()) {
+      account.client.closeWebsocket();
     }
+    this.clients.clear();
   }
   async send(msg) {
-    if (!this.client) {
+    const account = this.resolveOutboundAccount(msg.metadata);
+    if (!account) {
       return;
     }
     const receiveIdType = msg.chatId.startsWith("oc_") ? "chat_id" : "open_id";
-    const elements = buildCardElements(msg.content ?? "");
+    const elements = buildFeishuCardElements(msg.content ?? "");
     const card = {
       config: { wide_screen_mode: true },
       elements
     };
     const content = JSON.stringify(card);
-    await this.client.im.message.create({
-      params: { receive_id_type: receiveIdType },
-      data: {
-        receive_id: msg.chatId,
-        msg_type: "interactive",
-        content
-      }
+    await account.client.sendInteractiveCard({
+      receiveId: msg.chatId,
+      receiveIdType,
+      content
     });
   }
-  async handleIncoming(data) {
+  async handleIncoming(accountId, data) {
+    const account = this.clients.get(accountId);
+    if (!account) {
+      return;
+    }
     const root = isRecord(data.event) ? data.event : data;
     const message = root.message ?? data.message ?? {};
     const sender = root.sender ?? message.sender ?? data.sender ?? {};
-    const senderIdObj = sender.sender_id ?? {};
-    const senderOpenId = senderIdObj.open_id || sender.open_id || "";
-    const senderUserId = senderIdObj.user_id || sender.user_id || "";
-    const senderUnionId = senderIdObj.union_id || sender.union_id || "";
-    const senderId = senderOpenId || senderUserId || senderUnionId || "";
-    const senderType = sender.sender_type ?? sender.senderType;
-    if (senderType === "bot") {
-      return;
-    }
-    const chatId = message.chat_id ?? "";
-    const chatType = message.chat_type ?? "";
-    const isGroup = chatType === "group";
-    const msgType = message.msg_type ?? message.message_type ?? "";
-    const messageId = message.message_id ?? "";
-    if (!senderId || !chatId) {
+    const senderInfo = extractSenderInfo(sender);
+    if (senderInfo.senderType === "bot") {
       return;
     }
-    if (!this.isAllowed(String(senderId))) {
+    const messageInfo = extractMessageInfo(message);
+    if (!senderInfo.senderId || !messageInfo.chatId) {
       return;
     }
-    if (messageId && this.isDuplicate(messageId)) {
+    if (!this.isAllowedByPolicy({ senderId: senderInfo.senderId, chatId: messageInfo.chatId, isGroup: messageInfo.isGroup })) {
       return;
     }
-    if (messageId) {
-      await this.addReaction(messageId, "THUMBSUP");
+    if (messageInfo.messageId && this.isDuplicate(`${accountId}:${messageInfo.messageId}`)) {
+      return;
     }
-    let content = "";
-    if (message.content) {
-      try {
-        const parsed = JSON.parse(String(message.content));
-        content = String(parsed.text ?? parsed.content ?? "");
-      } catch {
-        content = String(message.content);
-      }
+    if (messageInfo.messageId) {
+      await this.addReaction(account, messageInfo.messageId, "THUMBSUP");
     }
-    if (!content && MSG_TYPE_MAP[msgType]) {
-      content = MSG_TYPE_MAP[msgType];
+    const mentions = extractMentions(root, message);
+    const mentionState = this.resolveMentionState({
+      account,
+      mentions,
+      chatId: messageInfo.chatId,
+      isGroup: messageInfo.isGroup,
+      rawContent: messageInfo.rawContent
+    });
+    if (mentionState.requireMention && !mentionState.wasMentioned) {
+      return;
     }
-    if (!content) {
+    const payload = this.buildInboundPayload(account, messageInfo, mentions);
+    if (!payload) {
       return;
     }
     await this.handleMessage({
-      senderId: String(senderId),
+      senderId: senderInfo.senderId,
       // Always route by Feishu chat_id so DM/group sessions are stable.
-      chatId,
-      content,
-      attachments: [],
-      metadata: {
-        message_id: messageId,
-        chat_id: chatId,
-        chat_type: chatType,
-        msg_type: msgType,
-        is_group: isGroup,
-        peer_kind: isGroup ? "group" : "direct",
-        peer_id: chatId,
-        sender_open_id: senderOpenId || void 0,
-        sender_user_id: senderUserId || void 0,
-        sender_union_id: senderUnionId || void 0
-      }
+      chatId: messageInfo.chatId,
+      content: payload.content,
+      attachments: payload.attachments,
+      metadata: buildInboundMetadata({
+        accountId,
+        messageInfo,
+        senderInfo,
+        mentionState
+      })
     });
   }
   isDuplicate(messageId) {
@@ -1412,69 +1511,99 @@ var FeishuChannel = class extends BaseChannel {
     }
     return false;
   }
-  async addReaction(messageId, emojiType) {
-    if (!this.client) {
-      return;
-    }
+  async addReaction(account, messageId, emojiType) {
     try {
-      await this.client.im.messageReaction.create({
-        path: { message_id: messageId },
-        data: { reaction_type: { emoji_type: emojiType } }
-      });
+      await account.client.addReaction(messageId, emojiType);
     } catch {
     }
   }
-};
-function buildCardElements(content) {
-  const elements = [];
-  let lastEnd = 0;
-  for (const match of content.matchAll(TABLE_RE)) {
-    const start = match.index ?? 0;
-    const tableText = match[1] ?? "";
-    const before = content.slice(lastEnd, start).trim();
-    if (before) {
-      elements.push({ tag: "markdown", content: before });
+  resolveOutboundAccount(metadata) {
+    const accountId = typeof metadata?.accountId === "string" ? metadata.accountId : typeof metadata?.account_id === "string" ? metadata.account_id : getDefaultFeishuAccountId(this.config);
+    return this.clients.get(accountId) ?? this.clients.get(getDefaultFeishuAccountId(this.config)) ?? null;
+  }
+  isAllowedByPolicy(params) {
+    if (!params.isGroup) {
+      if (this.config.dmPolicy === "disabled") {
+        return false;
+      }
+      if (this.config.dmPolicy === "allowlist" || this.config.dmPolicy === "pairing") {
+        return this.isAllowed(params.senderId);
+      }
+      const allowFrom = this.config.allowFrom ?? [];
+      return allowFrom.length === 0 || allowFrom.includes("*") || this.isAllowed(params.senderId);
     }
-    elements.push(parseMdTable(tableText) ?? { tag: "markdown", content: tableText });
-    lastEnd = start + tableText.length;
+    if (this.config.groupPolicy === "disabled") {
+      return false;
+    }
+    if (this.config.groupPolicy === "allowlist") {
+      const allowFrom = this.config.groupAllowFrom ?? [];
+      return allowFrom.includes("*") || allowFrom.includes(params.chatId);
+    }
+    return true;
   }
-  const remaining = content.slice(lastEnd).trim();
-  if (remaining) {
-    elements.push({ tag: "markdown", content: remaining });
+  resolveMentionState(params) {
+    if (!params.isGroup) {
+      return { wasMentioned: false, requireMention: false };
+    }
+    const groupRule = this.config.groups?.[params.chatId] ?? this.config.groups?.["*"];
+    const requireMention = groupRule?.requireMention ?? this.config.requireMention ?? false;
+    if (!requireMention) {
+      return { wasMentioned: false, requireMention: false };
+    }
+    const patterns = [...this.config.mentionPatterns ?? [], ...groupRule?.mentionPatterns ?? []].map((pattern) => pattern.trim()).filter(Boolean);
+    const rawText = params.rawContent.toLowerCase();
+    const mentionedByPattern = patterns.some((pattern) => {
+      try {
+        return new RegExp(pattern, "i").test(rawText);
+      } catch {
+        return rawText.includes(pattern.toLowerCase());
+      }
+    });
+    const mentionedByIds = params.mentions.some((entry) => {
+      if (!entry || typeof entry !== "object") {
+        return false;
+      }
+      const mention = entry;
+      const openId = (typeof mention.open_id === "string" ? mention.open_id : "") || (mention.id && typeof mention.id === "object" && "open_id" in mention.id ? mention.id.open_id ?? "" : typeof mention.id === "string" ? mention.id : "");
+      const name = typeof mention.name === "string" ? mention.name : "";
+      return openId === params.account.botOpenId || (params.account.botName ? name === params.account.botName : false);
+    });
+    return {
+      wasMentioned: mentionedByPattern || mentionedByIds,
+      requireMention
+    };
   }
-  if (!elements.length) {
-    elements.push({ tag: "markdown", content });
+  convertResource(resource) {
+    return {
+      id: resource.fileKey,
+      name: resource.fileName,
+      source: "feishu",
+      status: "remote-only",
+      mimeType: inferFeishuResourceMimeType(resource.type),
+      url: resource.fileKey
+    };
   }
-  return elements;
-}
-function parseMdTable(tableText) {
-  const lines = tableText.trim().split("\n").map((line) => line.trim()).filter(Boolean);
-  if (lines.length < 3) {
-    return null;
+  buildInboundPayload(account, messageInfo, mentions) {
+    const converted = convertFeishuMessageContent(
+      messageInfo.rawContent,
+      messageInfo.msgType,
+      buildFeishuConvertContext({
+        mentions,
+        stripBotMentions: true,
+        botOpenId: account.botOpenId,
+        botName: account.botName
+      })
+    );
+    const content = converted.content.trim();
+    if (!content) {
+      return null;
+    }
+    return {
+      content,
+      attachments: converted.resources.map((resource) => this.convertResource(resource))
+    };
   }
-  const split = (line) => line.replace(/^\|+|\|+$/g, "").split("|").map((item) => item.trim());
-  const headers = split(lines[0]);
-  const rows = lines.slice(2).map(split);
-  const columns = headers.map((header, index) => ({
-    tag: "column",
-    name: `c${index}`,
-    display_name: header,
-    width: "auto"
-  }));
-  const tableRows = rows.map((row) => {
-    const values = {};
-    headers.forEach((_, index) => {
-      values[`c${index}`] = row[index] ?? "";
-    });
-    return values;
-  });
-  return {
-    tag: "table",
-    page_size: rows.length + 1,
-    columns,
-    rows: tableRows
-  };
-}
+};
 
 // src/channels/mochat.ts
 import { io } from "socket.io-client";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/channel-runtime",
-  "version": "0.2.12",
+  "version": "0.3.0",
   "private": false,
   "description": "Runtime implementations for NextClaw builtin channel plugins.",
   "type": "module",
@@ -15,7 +15,6 @@
     "dist"
   ],
   "dependencies": {
-    "@larksuiteoapi/node-sdk": "^1.58.0",
     "@slack/socket-mode": "^1.3.3",
     "@slack/web-api": "^7.6.0",
     "dingtalk-stream": "^2.1.4",
@@ -29,7 +28,8 @@
     "undici": "^6.21.0",
     "ws": "^8.18.0",
     "socket.io-msgpack-parser": "^3.0.2",
-    "@nextclaw/core": "0.9.12"
+    "@nextclaw/core": "0.10.0",
+    "@nextclaw/feishu-core": "0.2.0"
   },
   "devDependencies": {
     "@types/mailparser": "^3.4.6",