chattercatcher 0.1.11 → 0.1.13

package/dist/cli.js

@@ -8,7 +8,7 @@ import fs13 from "fs/promises";
 // package.json
 var package_default = {
   name: "chattercatcher",
-  version: "0.1.11",
+  version: "0.1.13",
   description: "\u672C\u5730\u4F18\u5148\u7684\u98DE\u4E66/Lark \u5BB6\u5EAD\u7FA4\u77E5\u8BC6\u5E93\u673A\u5668\u4EBA",
   type: "module",
   main: "dist/index.js",
@@ -88,6 +88,7 @@ var appConfigSchema = z.object({
   feishu: z.object({
     domain: z.enum(["feishu", "lark"]).default("feishu"),
     appId: z.string().default(""),
+    botOpenId: z.string().default(""),
     groupPolicy: z.enum(["open", "allowlist", "disabled"]).default("open"),
     requireMention: z.boolean().default(true)
   }),
@@ -1944,6 +1945,80 @@ async function restoreLocalData(input2) {
   };
 }
 
+// src/feishu/bot-info.ts
+function getOpenApiBaseUrl(domain) {
+  return domain === "lark" ? "https://open.larksuite.com/open-apis" : "https://open.feishu.cn/open-apis";
+}
+async function readFeishuJson(response) {
+  if (!response.ok) {
+    throw new Error(`\u98DE\u4E66\u63A5\u53E3\u8BF7\u6C42\u5931\u8D25\uFF1AHTTP ${response.status}`);
+  }
+  return response.json();
+}
+function assertFeishuSuccess(payload, fallbackMessage) {
+  if (!payload || typeof payload !== "object") {
+    throw new Error(fallbackMessage);
+  }
+  const code = payload.code;
+  if (code !== 0) {
+    const message = payload.msg;
+    throw new Error(typeof message === "string" ? message : fallbackMessage);
+  }
+}
+async function resolveFeishuBotOpenId(config, secrets, options = {}) {
+  if (!config.feishu.appId || !secrets.feishu.appSecret) {
+    throw new Error("\u98DE\u4E66 App ID \u6216 App Secret \u672A\u914D\u7F6E\u3002");
+  }
+  const fetchImpl = options.fetch ?? fetch;
+  const baseUrl = getOpenApiBaseUrl(config.feishu.domain);
+  const tokenPayload = await readFeishuJson(
+    await fetchImpl(`${baseUrl}/auth/v3/tenant_access_token/internal`, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({
+        app_id: config.feishu.appId,
+        app_secret: secrets.feishu.appSecret
+      })
+    })
+  );
+  assertFeishuSuccess(tokenPayload, "\u83B7\u53D6\u98DE\u4E66 tenant_access_token \u5931\u8D25\u3002");
+  const tenantAccessToken = tokenPayload.tenant_access_token;
+  if (typeof tenantAccessToken !== "string" || !tenantAccessToken) {
+    throw new Error("\u98DE\u4E66 tenant_access_token \u54CD\u5E94\u7F3A\u5C11 token\u3002");
+  }
+  const botInfoPayload = await readFeishuJson(
+    await fetchImpl(`${baseUrl}/bot/v3/info`, {
+      method: "GET",
+      headers: { Authorization: `Bearer ${tenantAccessToken}` }
+    })
+  );
+  assertFeishuSuccess(botInfoPayload, "\u83B7\u53D6\u98DE\u4E66\u673A\u5668\u4EBA\u4FE1\u606F\u5931\u8D25\u3002");
+  const bot = botInfoPayload.bot;
+  if (!bot || typeof bot !== "object") {
+    throw new Error("\u98DE\u4E66\u673A\u5668\u4EBA\u4FE1\u606F\u54CD\u5E94\u7F3A\u5C11 bot\u3002");
+  }
+  const openId = bot.open_id;
+  if (typeof openId !== "string" || !openId) {
+    throw new Error("\u98DE\u4E66\u673A\u5668\u4EBA\u4FE1\u606F\u54CD\u5E94\u7F3A\u5C11 open_id\u3002");
+  }
+  return openId;
+}
+async function ensureFeishuBotOpenId(config, secrets, options = {}) {
+  if (config.feishu.botOpenId) {
+    return config.feishu.botOpenId;
+  }
+  const openId = await resolveFeishuBotOpenId(config, secrets, options);
+  const previousOpenId = config.feishu.botOpenId;
+  config.feishu.botOpenId = openId;
+  try {
+    await options.onSave?.();
+  } catch (error) {
+    config.feishu.botOpenId = previousOpenId;
+    throw error;
+  }
+  return openId;
+}
+
 // src/feishu/gateway.ts
 import * as lark2 from "@larksuiteoapi/node-sdk";
 
@@ -2106,12 +2181,22 @@ function stripMentions(text, mentions) {
   }
   return result.replace(/@/g, " ").replace(/\s+/g, " ").trim();
 }
-function isFeishuMessageAddressedToBot(payload) {
+function isMentionForBot(mention, config) {
+  if (!config.feishu.botOpenId) {
+    return false;
+  }
+  return mention.id?.open_id === config.feishu.botOpenId;
+}
+function getBotMentions(payload, config) {
+  const message = payload.event?.message;
+  return (message?.mentions ?? []).filter((mention) => isMentionForBot(mention, config));
+}
+function isFeishuMessageAddressedToBot(payload, config) {
   const message = payload.event?.message;
   if (!message || message.message_type !== "text") {
     return false;
   }
-  return (message.mentions ?? []).length > 0;
+  return getBotMentions(payload, config).length > 0;
 }
 function getFeishuQuestionDecision(payload, config) {
   const message = payload.event?.message;
@@ -2121,9 +2206,9 @@ function getFeishuQuestionDecision(payload, config) {
       reason: "\u4E0D\u662F\u53EF\u56DE\u7B54\u7684\u6587\u672C\u6D88\u606F\u3002"
     };
   }
-  const mentions = message.mentions ?? [];
+  const mentions = getBotMentions(payload, config);
   const text = parseTextContent(message.content);
-  const hasMention = isFeishuMessageAddressedToBot(payload);
+  const hasMention = isFeishuMessageAddressedToBot(payload, config);
   if (config.feishu.requireMention && !hasMention) {
     return {
       shouldAnswer: false,
@@ -2300,7 +2385,7 @@ function createFeishuEventDispatcher(options) {
   return new lark2.EventDispatcher({}).register({
     "im.message.receive_v1": async (data2) => {
       const payload = { event: data2 };
-      if (options.questionHandler && isFeishuMessageAddressedToBot(payload)) {
+      if (options.questionHandler && isFeishuMessageAddressedToBot(payload, options.config)) {
         const platformMessageId = data2?.message?.message_id;
         if (platformMessageId && answeredMessageIds.has(platformMessageId)) {
           console.log("\u98DE\u4E66\u63D0\u95EE\u91CD\u590D\u6295\u9012\uFF1A\u5DF2\u8DF3\u8FC7\u56DE\u7B54\u3002");
@@ -3584,6 +3669,7 @@ async function promptForConfiguration(config, secrets) {
     secrets.feishu.appSecret,
     await password({ message: secrets.feishu.appSecret ? "\u98DE\u4E66 App Secret\uFF08\u7559\u7A7A\u4FDD\u7559\uFF09" : "\u98DE\u4E66 App Secret", mask: "*" })
   );
+  await tryEnsureFeishuBotOpenId(config, secrets);
   config.llm.baseUrl = await input({ message: "LLM Base URL\uFF08OpenAI-compatible\uFF09", default: config.llm.baseUrl });
   secrets.llm.apiKey = applySecretInput(
     secrets.llm.apiKey,
@@ -3611,10 +3697,21 @@ async function promptForConfiguration(config, secrets) {
   config.embedding.dimension = dimension ?? null;
   config.web.port = await number({ message: "Web UI \u7AEF\u53E3", default: config.web.port, required: true }) ?? config.web.port;
   config.feishu.requireMention = await confirm({
-    message: "\u7FA4\u804A\u56DE\u7B54\u662F\u5426\u8981\u6C42 @ChatterCatcher\uFF1F",
+    message: "\u7FA4\u804A\u56DE\u7B54\u662F\u5426\u8981\u6C42 @ \u673A\u5668\u4EBA\uFF1F",
     default: config.feishu.requireMention
   });
 }
+async function tryEnsureFeishuBotOpenId(config, secrets) {
+  if (config.feishu.botOpenId || !config.feishu.appId || !secrets.feishu.appSecret) {
+    return;
+  }
+  try {
+    const openId = await ensureFeishuBotOpenId(config, secrets, { onSave: () => saveConfig(config) });
+    console.log(`\u5DF2\u81EA\u52A8\u83B7\u53D6\u98DE\u4E66\u673A\u5668\u4EBA Open ID\uFF1A${openId}`);
+  } catch (error) {
+    console.log(`\u6682\u65F6\u65E0\u6CD5\u81EA\u52A8\u83B7\u53D6\u98DE\u4E66\u673A\u5668\u4EBA Open ID\uFF1A${error instanceof Error ? error.message : String(error)}`);
+  }
+}
 function printSettings(config, secrets) {
   console.log(JSON.stringify(
     {
@@ -3713,6 +3810,7 @@ async function startGatewayForegroundCommand() {
     await startWebServer(config);
     return;
   }
+  await tryEnsureFeishuBotOpenId(config, secrets);
   writeGatewayPidRecord(void 0, {
     ...pidRecordBase,
     mode: "gateway"
@@ -3767,6 +3865,7 @@ async function startGatewayCommand(options = {}) {
   }
   const config = await loadConfig();
   const secrets = await loadSecrets();
+  await tryEnsureFeishuBotOpenId(config, secrets);
   const result = await startDetachedGateway({ config, secrets });
   console.log(result.message);
   if (result.pid) {