feishu-mcp 0.0.10 → 0.0.11

package/dist/services/blockFactory.js

@@ -34,6 +34,28 @@ export class BlockFactory {
         }
         return BlockFactory.instance;
     }
+    /**
+     * 获取默认的文本元素样式
+     * @returns 默认文本元素样式
+     */
+    static getDefaultTextElementStyle() {
+        return {
+            bold: false,
+            inline_code: false,
+            italic: false,
+            strikethrough: false,
+            underline: false
+        };
+    }
+    /**
+     * 应用默认文本样式
+     * @param style 已有样式（可选）
+     * @returns 合并后的样式
+     */
+    static applyDefaultTextStyle(style) {
+        const defaultStyle = BlockFactory.getDefaultTextElementStyle();
+        return style ? { ...defaultStyle, ...style } : defaultStyle;
+    }
     /**
      * 创建块内容
      * @param type 块类型
@@ -68,7 +90,7 @@ export class BlockFactory {
                 elements: textContents.map(content => ({
                     text_run: {
                         content: content.text,
-                        text_element_style: content.style || {}
+                        text_element_style: BlockFactory.applyDefaultTextStyle(content.style)
                     }
                 })),
                 style: {
@@ -84,6 +106,8 @@ export class BlockFactory {
      */
     createCodeBlock(options) {
         const { code, language = 0, wrap = false } = options;
+        // 校验 language 合法性，飞书API只允许1~75
+        const safeLanguage = language >= 1 && language <= 75 ? language : 1;
         return {
             block_type: 14, // 14表示代码块
             code: {
@@ -91,18 +115,12 @@ export class BlockFactory {
                     {
                         text_run: {
                             content: code,
-                            text_element_style: {
-                                bold: false,
-                                inline_code: false,
-                                italic: false,
-                                strikethrough: false,
-                                underline: false
-                            }
+                            text_element_style: BlockFactory.getDefaultTextElementStyle()
                         }
                     }
                 ],
                 style: {
-                    language: language,
+                    language: safeLanguage,
                     wrap: wrap
                 }
             }
@@ -131,7 +149,7 @@ export class BlockFactory {
                 {
                     text_run: {
                         content: text,
-                        text_element_style: {}
+                        text_element_style: BlockFactory.getDefaultTextElementStyle()
                     }
                 }
             ],
@@ -162,7 +180,7 @@ export class BlockFactory {
                 {
                     text_run: {
                         content: text,
-                        text_element_style: {}
+                        text_element_style: BlockFactory.getDefaultTextElementStyle()
                     }
                 }
             ],

package/dist/services/feishuApiService.js

@@ -229,7 +229,7 @@ export class FeishuApiService extends BaseApiService {
             const elements = textElements.map(item => ({
                 text_run: {
                     content: item.text,
-                    text_element_style: item.style || {}
+                    text_element_style: BlockFactory.applyDefaultTextStyle(item.style)
                 }
             }));
             const data = {
@@ -308,8 +308,13 @@ export class FeishuApiService extends BaseApiService {
      * @returns 创建结果
      */
     async createTextBlock(documentId, parentBlockId, textContents, align = 1, index = 0) {
+        // 处理文本内容样式
+        const processedTextContents = textContents.map(item => ({
+            text: item.text,
+            style: BlockFactory.applyDefaultTextStyle(item.style)
+        }));
         const blockContent = this.blockFactory.createTextBlock({
-            textContents,
+            textContents: processedTextContents,
             align
         });
         return this.createDocumentBlock(documentId, parentBlockId, blockContent, index);
@@ -466,6 +471,33 @@ export class FeishuApiService extends BaseApiService {
      */
     createBlockContent(blockType, options) {
         try {
+            // 处理特殊的heading标题格式，如heading1, heading2等
+            if (typeof blockType === 'string' && blockType.startsWith('heading')) {
+                // 使用正则表达式匹配"heading"后跟1-9的数字格式
+                const headingMatch = blockType.match(/^heading([1-9])$/);
+                if (headingMatch) {
+                    // 提取数字部分，例如从"heading1"中提取"1"
+                    const level = parseInt(headingMatch[1], 10);
+                    // 额外的安全检查，确保level在1-9范围内
+                    if (level >= 1 && level <= 9) {
+                        // 使用level参数创建标题块
+                        if (!options || Object.keys(options).length === 0) {
+                            // 没有提供选项时创建默认选项
+                            options = { heading: { level, content: '', align: 1 } };
+                        }
+                        else if (!('heading' in options)) {
+                            // 提供了选项但没有heading字段
+                            options = { heading: { level, content: '', align: 1 } };
+                        }
+                        else if (options.heading && !('level' in options.heading)) {
+                            // 提供了heading但没有level字段
+                            options.heading.level = level;
+                        }
+                        blockType = BlockType.HEADING; // 将blockType转为标准的heading类型
+                        Logger.info(`转换特殊标题格式: ${blockType}${level} -> standard heading with level=${level}`);
+                    }
+                }
+            }
             // 使用枚举类型来避免字符串错误
             const blockTypeEnum = blockType;
             // 构建块配置
@@ -473,12 +505,19 @@ export class FeishuApiService extends BaseApiService {
                 type: blockTypeEnum,
                 options: {}
             };
+            // 根据块类型处理不同的选项
             switch (blockTypeEnum) {
                 case BlockType.TEXT:
                     if ('text' in options && options.text) {
                         const textOptions = options.text;
+                        // 处理文本样式，应用默认样式
+                        const textStyles = textOptions.textStyles || [];
+                        const processedTextStyles = textStyles.map((item) => ({
+                            text: item.text,
+                            style: BlockFactory.applyDefaultTextStyle(item.style)
+                        }));
                         blockConfig.options = {
-                            textContents: textOptions.textStyles || [],
+                            textContents: processedTextStyles,
                             align: textOptions.align || 1
                         };
                     }
@@ -515,7 +554,55 @@ export class FeishuApiService extends BaseApiService {
                         };
                     }
                     break;
+                default:
+                    Logger.warn(`未知的块类型: ${blockType}，尝试作为标准类型处理`);
+                    if ('text' in options) {
+                        blockConfig.type = BlockType.TEXT;
+                        const textOptions = options.text;
+                        // 处理文本样式，应用默认样式
+                        const textStyles = textOptions.textStyles || [];
+                        const processedTextStyles = textStyles.map((item) => ({
+                            text: item.text,
+                            style: BlockFactory.applyDefaultTextStyle(item.style)
+                        }));
+                        blockConfig.options = {
+                            textContents: processedTextStyles,
+                            align: textOptions.align || 1
+                        };
+                    }
+                    else if ('code' in options) {
+                        blockConfig.type = BlockType.CODE;
+                        const codeOptions = options.code;
+                        blockConfig.options = {
+                            code: codeOptions.code || '',
+                            language: codeOptions.language === 0 ? 0 : (codeOptions.language || 0),
+                            wrap: codeOptions.wrap || false
+                        };
+                    }
+                    else if ('heading' in options) {
+                        blockConfig.type = BlockType.HEADING;
+                        const headingOptions = options.heading;
+                        blockConfig.options = {
+                            text: headingOptions.content || '',
+                            level: headingOptions.level || 1,
+                            align: (headingOptions.align === 1 || headingOptions.align === 2 || headingOptions.align === 3)
+                                ? headingOptions.align : 1
+                        };
+                    }
+                    else if ('list' in options) {
+                        blockConfig.type = BlockType.LIST;
+                        const listOptions = options.list;
+                        blockConfig.options = {
+                            text: listOptions.content || '',
+                            isOrdered: listOptions.isOrdered || false,
+                            align: (listOptions.align === 1 || listOptions.align === 2 || listOptions.align === 3)
+                                ? listOptions.align : 1
+                        };
+                    }
+                    break;
             }
+            // 记录调试信息
+            Logger.debug(`创建块内容: 类型=${blockConfig.type}, 选项=${JSON.stringify(blockConfig.options)}`);
             // 使用BlockFactory创建块
             return this.blockFactory.createBlock(blockConfig.type, blockConfig.options);
         }

package/dist/types/feishuSchema.js

@@ -87,17 +87,18 @@ export const ListBlockSchema = z.object({
     align: AlignSchemaWithValidation,
 });
 // 块类型枚举 - 用于批量创建块工具
-export const BlockTypeEnum = z.enum(['text', 'code', 'heading', 'list']).describe("Block type (required): 'text', 'code', 'heading', or 'list'. Choose based on the content type you need to create. " +
-    "IMPORTANT: For headings use 'heading' (not 'heading1', 'heading2', etc), and specify level within options.");
+export const BlockTypeEnum = z.string().describe("Block type (required). Supports: 'text', 'code', 'heading', 'list', as well as 'heading1' through 'heading9'. " +
+    "For headings, we recommend using 'heading' with level property, but 'heading1'-'heading9' are also supported.");
 // 块配置定义 - 用于批量创建块工具
 export const BlockConfigSchema = z.object({
     blockType: BlockTypeEnum,
     options: z.union([
-        z.object({ text: TextStyleBlockSchema }).describe("Text block options. Only used when blockType is 'text'."),
-        z.object({ code: CodeBlockSchema }).describe("Code block options. Only used when blockType is 'code'."),
-        z.object({ heading: HeadingBlockSchema }).describe("Heading block options. Only used when blockType is 'heading'."),
-        z.object({ list: ListBlockSchema }).describe("List block options. Only used when blockType is 'list'."),
-    ]).describe('Options for the specific block type. Must provide the corresponding options object based on blockType.'),
+        z.object({ text: TextStyleBlockSchema }).describe("Text block options. Used when blockType is 'text'."),
+        z.object({ code: CodeBlockSchema }).describe("Code block options. Used when blockType is 'code'."),
+        z.object({ heading: HeadingBlockSchema }).describe("Heading block options. Used with both 'heading' and 'headingN' formats."),
+        z.object({ list: ListBlockSchema }).describe("List block options. Used when blockType is 'list'."),
+        z.record(z.any()).describe("Fallback for any other block options")
+    ]).describe('Options for the specific block type. Provide the corresponding options object based on blockType.'),
 });
 // 媒体ID参数定义
 export const MediaIdSchema = z.string().describe('Media ID (required). The unique identifier for a media resource (image, file, etc.) in Feishu. ' +

package/dist/utils/logger.js

@@ -25,13 +25,28 @@ export class Logger {
     static configure(config) {
         this.config = { ...this.config, ...config };
         // 确保日志目录存在
-        if (this.config.logToFile) {
+        if (this.config.logToFile && this.config.enabled) {
             const logDir = path.dirname(this.config.logFilePath);
             if (!fs.existsSync(logDir)) {
                 fs.mkdirSync(logDir, { recursive: true });
             }
         }
     }
+    /**
+     * 设置日志开关
+     * @param enabled 是否启用日志
+     */
+    static setEnabled(enabled) {
+        this.config.enabled = enabled;
+    }
+    /**
+     * 检查日志是否可输出
+     * @param level 日志级别
+     * @returns 是否可输出
+     */
+    static canLog(level) {
+        return this.config.enabled && level >= this.config.minLevel;
+    }
     /**
      * 格式化日志消息
      * @param level 日志级别
@@ -59,7 +74,7 @@ export class Logger {
      * @param logParts 日志内容部分
      */
     static writeToFile(logParts) {
-        if (!this.config.logToFile)
+        if (!this.config.enabled || !this.config.logToFile)
             return;
         try {
             // 将日志内容转换为字符串
@@ -143,7 +158,7 @@ export class Logger {
      * @param args 日志参数
      */
     static debug(...args) {
-        if (this.config.minLevel <= LogLevel.DEBUG) {
+        if (this.canLog(LogLevel.DEBUG)) {
             const formattedMessage = this.formatLogMessage(LogLevel.DEBUG, args);
             console.debug(...formattedMessage);
             this.writeToFile(formattedMessage);
@@ -154,7 +169,7 @@ export class Logger {
      * @param args 日志参数
      */
     static info(...args) {
-        if (this.config.minLevel <= LogLevel.INFO) {
+        if (this.canLog(LogLevel.INFO)) {
             const formattedMessage = this.formatLogMessage(LogLevel.INFO, args);
             console.info(...formattedMessage);
             this.writeToFile(formattedMessage);
@@ -165,7 +180,7 @@ export class Logger {
      * @param args 日志参数
      */
     static log(...args) {
-        if (this.config.minLevel <= LogLevel.LOG) {
+        if (this.canLog(LogLevel.LOG)) {
             const formattedMessage = this.formatLogMessage(LogLevel.LOG, args);
             console.log(...formattedMessage);
             this.writeToFile(formattedMessage);
@@ -176,7 +191,7 @@ export class Logger {
      * @param args 日志参数
      */
     static warn(...args) {
-        if (this.config.minLevel <= LogLevel.WARN) {
+        if (this.canLog(LogLevel.WARN)) {
             const formattedMessage = this.formatLogMessage(LogLevel.WARN, args);
             console.warn(...formattedMessage);
             this.writeToFile(formattedMessage);
@@ -187,7 +202,7 @@ export class Logger {
      * @param args 日志参数
      */
     static error(...args) {
-        if (this.config.minLevel <= LogLevel.ERROR) {
+        if (this.canLog(LogLevel.ERROR)) {
             const formattedMessage = this.formatLogMessage(LogLevel.ERROR, args);
             console.error(...formattedMessage);
             this.writeToFile(formattedMessage);
@@ -202,7 +217,7 @@ export class Logger {
      * @param statusCode 响应状态码
      */
     static logApiCall(method, url, data, response, statusCode) {
-        if (this.config.minLevel <= LogLevel.DEBUG) {
+        if (this.canLog(LogLevel.DEBUG)) {
             this.debug('API调用详情:');
             this.debug(`请求: ${method} ${url}`);
             // 简化请求数据记录
@@ -235,7 +250,7 @@ export class Logger {
                 this.debug('响应数据: None');
             }
         }
-        else {
+        else if (this.canLog(LogLevel.INFO)) {
             this.info(`API调用: ${method} ${url} - 状态码: ${statusCode}`);
         }
     }
@@ -245,13 +260,14 @@ Object.defineProperty(Logger, "config", {
     configurable: true,
     writable: true,
     value: {
+        enabled: true, // 默认开启日志
         minLevel: LogLevel.DEBUG, // 修改为DEBUG级别，确保捕获所有日志
         showTimestamp: true,
         showLevel: true,
         timestampFormat: 'yyyy-MM-dd HH:mm:ss.SSS',
-        logToFile: false,
+        logToFile: true,
         logFilePath: 'log/log.txt',
-        maxObjectDepth: 2, // 限制对象序列化深度
+        maxObjectDepth: 4, // 限制对象序列化深度
         maxObjectStringLength: 5000000 // 限制序列化后字符串长度
     }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feishu-mcp",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "Model Context Protocol server for Feishu integration",
   "type": "module",
   "main": "dist/index.js",