@lmcl/ailo-mcp-feishu 0.0.4 → 0.0.6

package/dist/feishu-handler.js

@@ -491,21 +491,28 @@ export class FeishuHandler {
     }
     /**
      * 下载消息资源到本地缓存，返回 path。失败时返回 null（调用方传 ref）。
+     * 路径按年/月组织：blobs/YYYY/MM/
+     * 文件名：时间戳_原始file_name（必须提供 file_name，否则不保存，走 ref）
      */
-    async downloadToCache(messageId, fileKey, resourceType, aidoType) {
+    async downloadToCache(messageId, fileKey, resourceType, aidoType, fileName) {
+        const trimmed = fileName?.trim();
+        if (!trimmed)
+            return null;
         const workDir = getWorkDir();
         if (!workDir)
             return null;
-        const cacheDir = path.join(workDir, "blobs");
+        const now = new Date();
+        const year = String(now.getFullYear());
+        const month = String(now.getMonth() + 1).padStart(2, "0");
+        const cacheDir = path.join(workDir, "blobs", year, month);
         try {
             await fs.promises.mkdir(cacheDir, { recursive: true });
         }
         catch {
             return null;
         }
-        const safeMsg = messageId.replace(/[^a-zA-Z0-9_-]/g, "_");
-        const safeKey = fileKey.replace(/[^a-zA-Z0-9_-]/g, "_");
-        const filename = `ref_feishu_${safeMsg}_${safeKey}_${aidoType}`;
+        const sanitized = trimmed.replace(/[/\\?*:|"<>]/g, "_").slice(0, 200);
+        const filename = `${Date.now()}_${sanitized}`;
         const outPath = path.join(cacheDir, filename);
         const tryMessageResource = async () => {
             const res = await this.client.im.v1.messageResource.get({
@@ -535,18 +542,21 @@ export class FeishuHandler {
         }
     }
     /**
-     * 获取消息资源并转为 attachment。优先下载到 cache 传 path；失败则传 ref。
+     * 获取消息资源并转为 attachment。有 file_name 时下载到 cache 传 path；无则传 ref（不保存）。
      */
     async fetchMessageResourceAttachment(messageId, fileKey, resourceType, aidoType, fileName) {
-        const pathOrNull = await this.downloadToCache(messageId, fileKey, resourceType, aidoType);
+        if (!fileName?.trim()) {
+            return { type: aidoType, ref: `im:${messageId}:${fileKey}:${aidoType}`, channel: "feishu" };
+        }
+        const pathOrNull = await this.downloadToCache(messageId, fileKey, resourceType, aidoType, fileName);
         if (pathOrNull) {
-            const out = { type: aidoType, path: pathOrNull };
-            if (fileName)
-                out.name = fileName;
-            return out;
+            return {
+                type: aidoType,
+                path: pathOrNull,
+                name: path.basename(pathOrNull),
+            };
         }
-        const ref = `im:${messageId}:${fileKey}:${aidoType}`;
-        return { type: aidoType, ref, channel: "feishu", name: fileName };
+        return { type: aidoType, ref: `im:${messageId}:${fileKey}:${aidoType}`, channel: "feishu" };
     }
     /**
      * 使用飞书 WebSocket 长连接接收事件，无需配置回调地址。
@@ -863,6 +873,67 @@ export class FeishuHandler {
         });
         wsClient.start({ eventDispatcher });
     }
+    /**
+     * 根据文件名/扩展名推断飞书 im.file.create 的 file_type。
+     * 支持: opus | mp4 | pdf | doc | xls | ppt | stream
+     */
+    inferFileType(fileName, mime) {
+        const ext = path.extname(fileName || "").toLowerCase().slice(1);
+        const m = (mime ?? "").toLowerCase();
+        if (["mp4", "mov", "avi", "mkv", "webm", "m4v"].includes(ext) || m.includes("video"))
+            return "mp4";
+        if (["opus", "mp3", "wav", "m4a", "aac", "ogg", "flac"].includes(ext) || m.includes("audio"))
+            return "opus";
+        if (ext === "pdf" || m.includes("pdf"))
+            return "pdf";
+        if (["doc", "docx"].includes(ext) || m.includes("msword") || m.includes("document"))
+            return "doc";
+        if (["xls", "xlsx"].includes(ext) || m.includes("spreadsheet") || m.includes("excel"))
+            return "xls";
+        if (["ppt", "pptx"].includes(ext) || m.includes("presentation") || m.includes("powerpoint"))
+            return "ppt";
+        return "stream";
+    }
+    /**
+     * 上传文件到飞书 IM，获取 file_key。
+     * 支持 file_path 或 base64，用于发送文件/音频/视频消息。
+     * 飞书 API: POST /open-apis/im/v1/files (multipart)
+     */
+    async uploadFileToFeishu(opts) {
+        let fileData;
+        if (opts.filePath) {
+            if (!fs.existsSync(opts.filePath)) {
+                throw new Error(`文件不存在: ${opts.filePath}`);
+            }
+            fileData = fs.readFileSync(opts.filePath);
+        }
+        else if (opts.base64) {
+            fileData = Buffer.from(opts.base64, "base64");
+        }
+        else {
+            throw new Error("文件上传失败：未提供 file_path 或 base64");
+        }
+        const fileType = opts.fileType ?? this.inferFileType(opts.fileName, opts.mime);
+        let res;
+        try {
+            res = (await this.client.im.file.create({
+                data: {
+                    file_type: fileType,
+                    file_name: opts.fileName,
+                    file: fileData,
+                    ...(opts.duration != null && opts.duration > 0 ? { duration: opts.duration } : {}),
+                },
+            }));
+        }
+        catch (e) {
+            const err = e;
+            const detail = err?.response?.data ? JSON.stringify(err.response.data) : err?.message;
+            throw new Error(`飞书文件上传失败 (${err?.response?.status ?? "unknown"}): ${detail}`);
+        }
+        if (res?.file_key)
+            return res.file_key;
+        throw new Error(`飞书文件上传失败（无 file_key）: ${JSON.stringify(res)}`);
+    }
     /**
      * 上传图片到飞书，获取 image_key。
      * 支持三种来源（优先级：file_path > base64 > url）：
@@ -908,12 +979,23 @@ export class FeishuHandler {
     }
     async sendText(chatId, text, attachments) {
         const trimmed = (text ?? "").trim();
-        const imageAttachments = (attachments ?? []).filter((a) => (a.type ?? "").toLowerCase() === "image");
-        // 无内容且无图片时跳过
-        if (!trimmed && imageAttachments.length === 0) {
+        const allAttachments = attachments ?? [];
+        const imageAttachments = allAttachments.filter((a) => (a.type ?? "").toLowerCase() === "image");
+        const fileAttachments = allAttachments.filter((a) => {
+            const t = (a.type ?? "").toLowerCase();
+            if (t === "image")
+                return false;
+            if (["file", "audio", "video"].includes(t))
+                return true;
+            // 未指定 type 但有 path/base64 时，视为通用文件
+            return !!(a.file_path || a.base64);
+        });
+        // 无内容且无任何附件时跳过
+        if (!trimmed && imageAttachments.length === 0 && fileAttachments.length === 0) {
             return;
         }
-        // 上传图片获取 image_key（失败时抛出错误，同步传播回 LLM tool result）
+        const receiveIdType = chatId.startsWith("ou_") ? "open_id" : "chat_id";
+        // 1. 上传图片获取 image_key
         const imageKeys = [];
         for (const att of imageAttachments) {
             if (att.file_path || att.base64) {
@@ -924,22 +1006,18 @@ export class FeishuHandler {
                 });
                 imageKeys.push(key);
             }
-            // url 暂不支持（需先下载再上传，可后续扩展）
         }
-        // 构建 post content 行
+        // 2. 先发送文本+图片（post），再发送文件/音频/视频
         const contentRows = [];
         if (trimmed) {
             const { cleanText, atElements } = extractMentionElements(trimmed, this.mentionNameToId);
             const adapted = adaptMarkdownForFeishu(cleanText);
             const processed = convertMarkdownTablesToCodeBlock(adapted);
-            // 按段落拆分为多个 content row（飞书富文本是多段落结构）
             const paragraphs = processed.split(/\n{2,}/).filter((p) => p.trim());
             if (paragraphs.length === 0) {
-                // 无有效段落，退化为单行
                 contentRows.push([{ tag: "md", text: processed }]);
             }
             else {
-                // @mention 的 at 元素放在第一个段落的 row 中
                 const firstRow = [];
                 for (const at of atElements) {
                     firstRow.push({ tag: "at", user_id: at.userId });
@@ -947,33 +1025,65 @@ export class FeishuHandler {
                 }
                 firstRow.push({ tag: "md", text: paragraphs[0].trim() });
                 contentRows.push(firstRow);
-                // 后续段落各自独立一行
                 for (let i = 1; i < paragraphs.length; i++) {
                     contentRows.push([{ tag: "md", text: paragraphs[i].trim() }]);
                 }
             }
         }
-        // 添加图片节点（每张图一行）
         for (const key of imageKeys) {
             contentRows.push([{ tag: "img", image_key: key }]);
         }
-        // 至少需要一行内容
-        if (contentRows.length === 0) {
-            return;
+        if (contentRows.length > 0) {
+            await this.client.im.v1.message.create({
+                params: { receive_id_type: receiveIdType },
+                data: {
+                    receive_id: chatId,
+                    msg_type: "post",
+                    content: JSON.stringify({
+                        zh_cn: {
+                            content: contentRows,
+                        },
+                    }),
+                },
+            });
+        }
+        // 3. 上传文件/音频/视频并发送对应消息
+        for (const att of fileAttachments) {
+            if (!att.file_path && !att.base64)
+                continue;
+            const fileName = att.name?.trim() ||
+                (att.file_path ? path.basename(att.file_path) : `file_${Date.now()}`);
+            const fileKey = await this.uploadFileToFeishu({
+                filePath: att.file_path,
+                base64: att.base64,
+                fileName,
+                mime: att.mime,
+                duration: att.duration,
+            });
+            const msgType = (att.type ?? "file").toLowerCase();
+            let content;
+            if (msgType === "audio") {
+                content = JSON.stringify({ file_key: fileKey, duration: att.duration ?? 0 });
+            }
+            else if (msgType === "video") {
+                content = JSON.stringify({
+                    file_key: fileKey,
+                    file_name: fileName,
+                    duration: att.duration ?? 0,
+                });
+            }
+            else {
+                content = JSON.stringify({ file_key: fileKey, file_name: fileName });
+            }
+            await this.client.im.v1.message.create({
+                params: { receive_id_type: receiveIdType },
+                data: {
+                    receive_id: chatId,
+                    msg_type: msgType === "video" ? "media" : msgType,
+                    content,
+                },
+            });
         }
-        const receiveIdType = chatId.startsWith("ou_") ? "open_id" : "chat_id";
-        await this.client.im.v1.message.create({
-            params: { receive_id_type: receiveIdType },
-            data: {
-                receive_id: chatId,
-                msg_type: "post",
-                content: JSON.stringify({
-                    zh_cn: {
-                        content: contentRows,
-                    },
-                }),
-            },
-        });
     }
     /** 处理来自 MCP 工具 feishu action=set_nickname 的命令 */
     async onCommand(command, params) {

package/dist/mcp-server.js

@@ -4,10 +4,12 @@
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { z } from "zod";
 const attachmentSchema = z.object({
-    type: z.string().optional(),
+    type: z.string().optional().describe("image|file|audio|video"),
     path: z.string().optional(),
     base64: z.string().optional(),
     mime: z.string().optional(),
+    name: z.string().optional().describe("文件名，用于 file/audio/video"),
+    duration: z.number().optional().describe("音视频时长(毫秒)，用于 audio/video"),
 });
 const feishuSchema = {
     action: z.enum(["send", "read_doc", "set_nickname"]).describe("send=发消息; read_doc=读文档; set_nickname=设置备注"),
@@ -21,7 +23,7 @@ const feishuSchema = {
 export function createFeishuMcpServer(handler) {
     const server = new McpServer({ name: "feishu", version: "0.1.0" });
     server.registerTool("feishu", {
-        description: "飞书操作。action=send 发消息(需 chat_id,text；attachments 可选，图片用 type=image+path 或 base64)；read_doc 读文档(需 url)；set_nickname 设置备注(需 sender_id,nickname)。chat_id: ou_xxx 私聊/oc_xxx 群聊。",
+        description: "飞书操作。action=send 发消息(需 chat_id,text；attachments 可选)：type=image 图片；type=file 文件；type=audio 音频；type=video 视频。附件用 path 或 base64，可选 name/duration。read_doc 读文档(需 url)；set_nickname 设置备注(需 sender_id,nickname)。chat_id: ou_xxx 私聊/oc_xxx 群聊。",
         inputSchema: feishuSchema,
     }, async (args) => {
         const { action } = args;
@@ -31,6 +33,8 @@ export function createFeishuMcpServer(handler) {
                 file_path: a.path,
                 base64: a.base64,
                 mime: a.mime,
+                name: a.name,
+                duration: a.duration,
             }));
             await handler.sendText(args.chat_id, args.text ?? "", atts);
             return { content: [{ type: "text", text: `已发送到 ${args.chat_id}` }], isError: false };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lmcl/ailo-mcp-feishu",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "description": "Ailo 飞书/Lark 通道 MCP",
   "type": "module",
   "main": "dist/index.js",