feishu-mcp 0.3.0 → 0.3.2

package/dist/cli/commands/auth.js

@@ -3,6 +3,8 @@ import { createServer as createNetServer } from 'net';
 import express from 'express';
 import { Config } from '../../utils/config.js';
 import { AuthUtils, TokenCacheManager } from '../../utils/auth/index.js';
+import { getRequiredScopes } from '../../services/constants/feishuScopes.js';
+import { ModuleRegistry } from '../../modules/index.js';
 // callbackService 需延迟导入，避免其模块级 Config.getInstance() 在 CLI 启动时提前触发 yargs
 const AUTH_TIMEOUT_MS = 5 * 60 * 1000; // 5 分钟
 const POLL_INTERVAL_MS = 1000;
@@ -87,13 +89,19 @@ export async function handleAuthRequired(userKey) {
     // 1. 寻找可用端口（从配置端口开始）
     const port = await findAvailablePort(config.server.port);
     const redirectUri = `http://localhost:${port}/callback`;
-    // 2. 计算 clientKey 和 state
+    // 2. 计算 clientKey、scope 和 state
     const clientKey = AuthUtils.generateClientKey(userKey);
+    const authType = config.feishu.authType;
+    const enabledIds = config.features.enabledModules;
+    const effectiveModules = ModuleRegistry.getEnabledModules(enabledIds, authType).map(m => m.id);
+    const scopeList = getRequiredScopes(effectiveModules, authType);
+    const scope = encodeURIComponent(scopeList.join(' '));
     const state = AuthUtils.encodeState(appId, appSecret, clientKey, redirectUri);
-    // 3. 构造飞书 OAuth 授权 URL
-    const authUrl = `https://open.feishu.cn/open-apis/authen/v1/index` +
-        `?app_id=${encodeURIComponent(appId)}` +
+    // 3. 构造飞书 OAuth 授权 URL（与 baseService.generateUserAuthUrl 保持一致）
+    const authUrl = `https://accounts.feishu.cn/open-apis/authen/v1/authorize` +
+        `?client_id=${encodeURIComponent(appId)}` +
         `&redirect_uri=${encodeURIComponent(redirectUri)}` +
+        `&scope=${scope}` +
         `&state=${encodeURIComponent(state)}`;
     // 4. 启动临时 callback 服务器
     let server;

package/dist/cli/dispatcher.js

@@ -8,6 +8,21 @@ import { createDocument, getDocumentInfo, getDocumentBlocks, searchDocuments, ba
 import { createTasks, listTasks, updateTask, deleteTasks } from '../modules/task/toolApi/index.js';
 // Member toolApis
 import { getUsers } from '../modules/member/toolApi/index.js';
+/** 将 getImageResource 返回的 Buffer 转为 base64 字符串输出 */
+async function getImageResourceAsBase64(mediaId, extra, svc) {
+    const result = await getImageResource(mediaId, extra, svc);
+    const buf = result instanceof Buffer ? result : Buffer.from(result.data);
+    return { base64: buf.toString('base64') };
+}
+/** 将 getWhiteboardContent 返回的 Buffer 缩略图转为 base64 字符串输出 */
+async function getWhiteboardContentSafe(whiteboardId, svc) {
+    const result = await getWhiteboardContent(whiteboardId, svc);
+    if (result.type === 'thumbnail') {
+        const buf = result.buffer instanceof Buffer ? result.buffer : Buffer.from(result.buffer.data);
+        return { type: 'thumbnail', base64: buf.toString('base64') };
+    }
+    return result;
+}
 /**
  * 按模块组织的工具注册表，与 src/modules 目录划分保持一致
  */
@@ -22,10 +37,10 @@ const MODULE_REGISTRY = {
             batch_update_feishu_block_text: (p, s) => batchUpdateBlockText(p, s),
             batch_create_feishu_blocks: (p, s) => batchCreateBlocks(p, s),
             delete_feishu_document_blocks: (p, s) => deleteDocumentBlocks(p, s),
-            get_feishu_image_resource: (p, s) => getImageResource(p.mediaId, p.extra ?? '', s),
+            get_feishu_image_resource: (p, s) => getImageResourceAsBase64(p.mediaId, p.extra ?? '', s),
             upload_and_bind_image_to_block: (p, s) => uploadAndBindImageToBlock(p, s),
             create_feishu_table: (p, s) => createTable(p, s),
-            get_feishu_whiteboard_content: (p, s) => getWhiteboardContent(p.whiteboardId, s),
+            get_feishu_whiteboard_content: (p, s) => getWhiteboardContentSafe(p.whiteboardId, s),
             fill_whiteboard_with_plantuml: (p, s) => fillWhiteboardWithPlantuml(p, s),
             get_feishu_root_folder_info: (_p, s) => getRootFolderInfo(s),
             get_feishu_folder_files: (p, s) => getFolderFiles(p, s),

package/package.json

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