feishu-mcp 0.0.16 → 0.0.17

package/dist/utils/cache.js

@@ -1,5 +1,7 @@
 import { Config } from './config.js';
 import { Logger } from './logger.js';
+import * as fs from 'fs';
+import * as path from 'path';
 /**
  * 缓存管理器类
  * 提供内存缓存功能，支持TTL和最大容量限制
@@ -22,8 +24,15 @@ export class CacheManager {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "userTokenCacheFile", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: path.resolve(process.cwd(), 'user_token_cache.json')
+        });
         this.cache = new Map();
         this.config = Config.getInstance();
+        this.loadUserTokenCache();
         // 定期清理过期缓存
         setInterval(() => {
             this.cleanExpiredCache();
@@ -62,6 +71,9 @@ export class CacheManager {
             expiresAt: now + (actualTtl * 1000)
         });
         Logger.debug(`缓存设置: ${key} (TTL: ${actualTtl}秒)`);
+        if (key.startsWith('user_access_token:')) {
+            this.saveUserTokenCache();
+        }
         return true;
     }
     /**
@@ -99,6 +111,9 @@ export class CacheManager {
         const result = this.cache.delete(key);
         if (result) {
             Logger.debug(`缓存删除: ${key}`);
+            if (key.startsWith('user_access_token:')) {
+                this.saveUserTokenCache();
+            }
         }
         return result;
     }
@@ -185,6 +200,47 @@ export class CacheManager {
             ttl: this.config.cache.ttl
         };
     }
+    /**
+     * 缓存Wiki到文档ID的转换结果
+     * @param wikiToken Wiki Token
+     * @param documentId 文档ID
+     * @returns 是否成功设置缓存
+     */
+    cacheWikiToDocId(wikiToken, documentId) {
+        return this.set(`wiki:${wikiToken}`, documentId);
+    }
+    /**
+     * 获取缓存的Wiki转换结果
+     * @param wikiToken Wiki Token
+     * @returns 文档ID，如果未找到或已过期则返回null
+     */
+    getWikiToDocId(wikiToken) {
+        return this.get(`wiki:${wikiToken}`);
+    }
+    /**
+     * 缓存tenant访问令牌
+     * @param token 访问令牌
+     * @param expiresInSeconds 过期时间（秒）
+     * @param key 缓存键，默认为'access_token'
+     * @returns 是否成功设置缓存
+     */
+    cacheTenantToken(key, token, expiresInSeconds) {
+        return this.set(`tenant_access_token:${key}`, token, expiresInSeconds);
+    }
+    /**
+     * 获取tenant缓存的访问令牌
+     * @param key 缓存键，默认为'access_token'
+     * @returns 访问令牌，如果未找到或已过期则返回null
+     */
+    getTenantToken(key) {
+        return this.get(`tenant_access_token:${key}`);
+    }
+    cacheUserToken(key, tokenObj, expiresIn) {
+        return this.set(`user_access_token:${key}`, tokenObj, expiresIn);
+    }
+    getUserToken(key) {
+        return this.get(`user_access_token:${key}`);
+    }
     /**
      * 缓存访问令牌
      * @param token 访问令牌
@@ -192,30 +248,55 @@ export class CacheManager {
      * @returns 是否成功设置缓存
      */
     cacheToken(token, expiresInSeconds) {
-        return this.set('access_token', token, expiresInSeconds);
+        return this.set(`access_token`, token, expiresInSeconds);
     }
     /**
      * 获取缓存的访问令牌
      * @returns 访问令牌，如果未找到或已过期则返回null
      */
     getToken() {
-        return this.get('access_token');
+        return this.get(`access_token`);
     }
     /**
-     * 缓存Wiki到文档ID的转换结果
-     * @param wikiToken Wiki Token
-     * @param documentId 文档ID
-     * @returns 是否成功设置缓存
+     * 生成client_id+client_secret签名
+     * @param client_id
+     * @param client_secret
+     * @returns 唯一key
      */
-    cacheWikiToDocId(wikiToken, documentId) {
-        return this.set(`wiki:${wikiToken}`, documentId);
+    static async getClientKey(client_id, client_secret) {
+        const crypto = await import('crypto');
+        return crypto.createHash('sha256').update(client_id + ':' + client_secret).digest('hex');
     }
-    /**
-     * 获取缓存的Wiki转换结果
-     * @param wikiToken Wiki Token
-     * @returns 文档ID，如果未找到或已过期则返回null
-     */
-    getWikiToDocId(wikiToken) {
-        return this.get(`wiki:${wikiToken}`);
+    loadUserTokenCache() {
+        if (fs.existsSync(this.userTokenCacheFile)) {
+            try {
+                const raw = fs.readFileSync(this.userTokenCacheFile, 'utf-8');
+                const obj = JSON.parse(raw);
+                for (const k in obj) {
+                    if (k.startsWith('user_access_token:')) {
+                        this.cache.set(k, obj[k]);
+                    }
+                }
+                Logger.info(`已加载本地 user_token_cache.json，共${Object.keys(obj).length}条`);
+            }
+            catch (e) {
+                Logger.warn('加载 user_token_cache.json 失败', e);
+            }
+        }
+    }
+    saveUserTokenCache() {
+        const obj = {};
+        for (const [k, v] of this.cache.entries()) {
+            if (k.startsWith('user_access_token:')) {
+                obj[k] = v;
+            }
+        }
+        try {
+            fs.writeFileSync(this.userTokenCacheFile, JSON.stringify(obj, null, 2), 'utf-8');
+            Logger.debug('user_token_cache.json 已写入');
+        }
+        catch (e) {
+            Logger.warn('写入 user_token_cache.json 失败', e);
+        }
     }
 }

package/dist/utils/config.js

@@ -110,6 +110,14 @@ export class Config {
             'cache-ttl': {
                 type: 'number',
                 description: '缓存生存时间（秒）'
+            },
+            'feishu-auth-type': {
+                type: 'string',
+                description: '飞书认证类型 (tenant 或 user)'
+            },
+            'feishu-token-endpoint': {
+                type: 'string',
+                description: '获取token的接口地址，默认 http://localhost:3333/getToken'
             }
         })
             .help()
@@ -144,11 +152,14 @@ export class Config {
      * @returns 飞书配置
      */
     initFeishuConfig(argv) {
+        // 先初始化serverConfig以获取端口
+        const serverConfig = this.server || this.initServerConfig(argv);
         const feishuConfig = {
             appId: '',
             appSecret: '',
             baseUrl: 'https://open.feishu.cn/open-apis',
-            tokenLifetime: 7200000 // 2小时，单位：毫秒
+            authType: 'tenant', // 默认
+            tokenEndpoint: `http://127.0.0.1:${serverConfig.port}/getToken`, // 默认动态端口
         };
         // 处理App ID
         if (argv['feishu-app-id']) {
@@ -180,13 +191,29 @@ export class Config {
         else {
             this.configSources['feishu.baseUrl'] = ConfigSource.DEFAULT;
         }
-        // 处理token生命周期
-        if (process.env.FEISHU_TOKEN_LIFETIME) {
-            feishuConfig.tokenLifetime = parseInt(process.env.FEISHU_TOKEN_LIFETIME, 10) * 1000;
-            this.configSources['feishu.tokenLifetime'] = ConfigSource.ENV;
+        // 处理authType
+        if (argv['feishu-auth-type']) {
+            feishuConfig.authType = argv['feishu-auth-type'] === 'user' ? 'user' : 'tenant';
+            this.configSources['feishu.authType'] = ConfigSource.CLI;
+        }
+        else if (process.env.FEISHU_AUTH_TYPE) {
+            feishuConfig.authType = process.env.FEISHU_AUTH_TYPE === 'user' ? 'user' : 'tenant';
+            this.configSources['feishu.authType'] = ConfigSource.ENV;
         }
         else {
-            this.configSources['feishu.tokenLifetime'] = ConfigSource.DEFAULT;
+            this.configSources['feishu.authType'] = ConfigSource.DEFAULT;
+        }
+        // 处理tokenEndpoint
+        if (argv['feishu-token-endpoint']) {
+            feishuConfig.tokenEndpoint = argv['feishu-token-endpoint'];
+            this.configSources['feishu.tokenEndpoint'] = ConfigSource.CLI;
+        }
+        else if (process.env.FEISHU_TOKEN_ENDPOINT) {
+            feishuConfig.tokenEndpoint = process.env.FEISHU_TOKEN_ENDPOINT;
+            this.configSources['feishu.tokenEndpoint'] = ConfigSource.ENV;
+        }
+        else {
+            this.configSources['feishu.tokenEndpoint'] = ConfigSource.DEFAULT;
         }
         return feishuConfig;
     }
@@ -319,7 +346,8 @@ export class Config {
             Logger.info(`- App Secret: ${this.maskApiKey(this.feishu.appSecret)} (来源: ${this.configSources['feishu.appSecret']})`);
         }
         Logger.info(`- API URL: ${this.feishu.baseUrl} (来源: ${this.configSources['feishu.baseUrl']})`);
-        Logger.info(`- Token生命周期: ${this.feishu.tokenLifetime / 1000}秒 (来源: ${this.configSources['feishu.tokenLifetime']})`);
+        Logger.info(`- 认证类型: ${this.feishu.authType} (来源: ${this.configSources['feishu.authType']})`);
+        Logger.info(`- Token获取地址: ${this.feishu.tokenEndpoint} (来源: ${this.configSources['feishu.tokenEndpoint']})`);
         Logger.info('日志配置:');
         Logger.info(`- 日志级别: ${LogLevel[this.log.level]} (来源: ${this.configSources['log.level']})`);
         Logger.info(`- 显示时间戳: ${this.log.showTimestamp} (来源: ${this.configSources['log.showTimestamp']})`);
@@ -358,6 +386,10 @@ export class Config {
             Logger.error('缺少飞书应用Secret，请通过环境变量FEISHU_APP_SECRET或命令行参数--feishu-app-secret提供');
             return false;
         }
+        if (!this.feishu.tokenEndpoint) {
+            Logger.error('缺少飞书Token获取地址，请通过环境变量FEISHU_TOKEN_ENDPOINT或命令行参数--feishu-token-endpoint提供');
+            return false;
+        }
         return true;
     }
 }

package/dist/utils/document.js

@@ -110,3 +110,157 @@ export function detectMimeType(buffer) {
         return 'application/octet-stream';
     }
 }
+function formatExpire(seconds) {
+    if (!seconds || isNaN(seconds))
+        return '';
+    if (seconds < 0)
+        return `<span style='color:#e53935'>已过期</span> (${seconds}s)`;
+    const h = Math.floor(seconds / 3600);
+    const m = Math.floor((seconds % 3600) / 60);
+    const s = seconds % 60;
+    let str = '';
+    if (h)
+        str += h + '小时';
+    if (m)
+        str += m + '分';
+    if (s || (!h && !m))
+        str += s + '秒';
+    return `${str} (${seconds}s)`;
+}
+export function renderFeishuAuthResultHtml(data) {
+    const isError = data && data.error;
+    const now = Math.floor(Date.now() / 1000);
+    let expiresIn = data && data.expires_in;
+    let refreshExpiresIn = data && (data.refresh_token_expires_in || data.refresh_expires_in);
+    if (expiresIn && expiresIn > 1000000000)
+        expiresIn = expiresIn - now;
+    if (refreshExpiresIn && refreshExpiresIn > 1000000000)
+        refreshExpiresIn = refreshExpiresIn - now;
+    const tokenBlock = data && !isError ? `
+    <div class="card">
+      <h3>Token 信息</h3>
+      <ul class="kv-list">
+        <li><b>token_type:</b> <span>${data.token_type || ''}</span></li>
+        <li><b>access_token:</b> <span class="foldable" onclick="toggleFold(this)">点击展开/收起</span><pre class="fold scrollable">${data.access_token || ''}</pre></li>
+        <li><b>expires_in:</b> <span>${formatExpire(expiresIn)}</span></li>
+        <li><b>refresh_token:</b> <span class="foldable" onclick="toggleFold(this)">点击展开/收起</span><pre class="fold scrollable">${data.refresh_token || ''}</pre></li>
+        <li><b>refresh_token_expires_in:</b> <span>${formatExpire(refreshExpiresIn)}</span></li>
+        <li><b>scope:</b> <pre class="scope">${(data.scope || '').replace(/ /g, '\n')}</pre></li>
+      </ul>
+      <div class="success-action">
+        <span class="success-msg">授权成功，继续完成任务</span>
+        <button class="copy-btn" onclick="copySuccessMsg(this)">点击复制到粘贴板</button>
+      </div>
+    </div>
+  ` : '';
+    let userBlock = '';
+    const userInfo = data && data.userInfo && data.userInfo.data;
+    if (userInfo) {
+        userBlock = `
+      <div class="card user-card">
+        <div class="avatar-wrap">
+          <img src="${userInfo.avatar_big || userInfo.avatar_thumb || userInfo.avatar_url || ''}" class="avatar" />
+        </div>
+        <div class="user-info">
+          <div class="user-name">${userInfo.name || ''}</div>
+          <div class="user-en">${userInfo.en_name || ''}</div>
+        </div>
+      </div>
+    `;
+    }
+    const errorBlock = isError ? `
+    <div class="card error-card">
+      <h3>授权失败</h3>
+      <div class="error-msg">${escapeHtml(data.error || '')}</div>
+      <div class="error-code">错误码: ${data.code || ''}</div>
+    </div>
+  ` : '';
+    return `
+    <html>
+      <head>
+        <title>飞书授权结果</title>
+        <meta charset="utf-8"/>
+        <meta name="viewport" content="width=device-width,initial-scale=1"/>
+        <style>
+          body { background: #f7f8fa; font-family: 'Segoe UI', Arial, sans-serif; margin:0; padding:0; }
+          .container { max-width: 600px; margin: 40px auto; padding: 16px; }
+          .card { background: #fff; border-radius: 12px; box-shadow: 0 2px 12px #0001; margin-bottom: 24px; padding: 24px 20px; }
+          .user-card { display: flex; align-items: center; gap: 24px; }
+          .avatar-wrap { flex-shrink: 0; }
+          .avatar { width: 96px; height: 96px; border-radius: 50%; box-shadow: 0 2px 8px #0002; display: block; margin: 0 auto; }
+          .user-info { flex: 1; }
+          .user-name { font-size: 1.5em; font-weight: bold; margin-bottom: 4px; }
+          .user-en { color: #888; margin-bottom: 10px; }
+          .kv-list { list-style: none; padding: 0; margin: 0; }
+          .kv-list li { margin-bottom: 6px; word-break: break-all; }
+          .kv-list b { color: #1976d2; }
+          .scope { background: #f0f4f8; border-radius: 4px; padding: 6px; font-size: 0.95em; white-space: pre-line; }
+          .foldable { color: #1976d2; cursor: pointer; text-decoration: underline; margin-left: 8px; }
+          .fold { display: none; background: #f6f6f6; border-radius: 4px; padding: 6px; margin: 4px 0; font-size: 0.92em; max-width: 100%; overflow-x: auto; word-break: break-all; }
+          .scrollable { max-width: 100%; overflow-x: auto; font-family: 'Fira Mono', 'Consolas', 'Menlo', monospace; font-size: 0.93em; }
+          .success-action { margin-top: 18px; display: flex; align-items: center; gap: 16px; }
+          .success-msg { color: #388e3c; font-weight: bold; }
+          .copy-btn { background: #1976d2; color: #fff; border: none; border-radius: 4px; padding: 6px 16px; font-size: 1em; cursor: pointer; transition: background 0.2s; }
+          .copy-btn:hover { background: #125ea2; }
+          .error-card { border-left: 6px solid #e53935; background: #fff0f0; color: #b71c1c; }
+          .error-msg { font-size: 1.1em; margin-bottom: 8px; }
+          .error-code { color: #b71c1c; font-size: 0.95em; }
+          .raw-block { margin-top: 24px; }
+          .raw-toggle { color: #1976d2; cursor: pointer; text-decoration: underline; margin-bottom: 8px; display: inline-block; }
+          .raw-pre { display: none; background: #23272e; color: #fff; border-radius: 6px; padding: 12px; font-size: 0.95em; overflow-x: auto; max-width: 100%; }
+          @media (max-width: 700px) {
+            .container { max-width: 98vw; padding: 4vw; }
+            .card { padding: 4vw 3vw; }
+            .avatar { width: 64px; height: 64px; }
+          }
+        </style>
+        <script>
+          function toggleFold(el) {
+            var pre = el.nextElementSibling;
+            if (pre.style.display === 'block') {
+              pre.style.display = 'none';
+            } else {
+              pre.style.display = 'block';
+            }
+          }
+          function toggleRaw() {
+            var pre = document.getElementById('raw-pre');
+            if (pre.style.display === 'block') {
+              pre.style.display = 'none';
+            } else {
+              pre.style.display = 'block';
+            }
+          }
+          function copySuccessMsg(btn) {
+            var text = '授权成功，继续完成任务';
+            navigator.clipboard.writeText(text).then(function() {
+              btn.innerText = '已复制';
+              btn.disabled = true;
+              setTimeout(function() {
+                btn.innerText = '点击复制到粘贴板';
+                btn.disabled = false;
+              }, 2000);
+            });
+          }
+        </script>
+      </head>
+      <body>
+        <div class="container">
+          <h2 style="margin-bottom:24px;">飞书授权结果</h2>
+          ${errorBlock}
+          ${tokenBlock}
+          ${userBlock}
+          <div class="card raw-block">
+            <span class="raw-toggle" onclick="toggleRaw()">点击展开/收起原始数据</span>
+            <pre id="raw-pre" class="raw-pre">${escapeHtml(JSON.stringify(data, null, 2))}</pre>
+          </div>
+        </div>
+      </body>
+    </html>
+  `;
+}
+function escapeHtml(str) {
+    return str.replace(/[&<>"]|'/g, function (c) {
+        return ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' })[c] || c;
+    });
+}

package/package.json

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

package/dist/config.js

@@ -1,26 +0,0 @@
-import { Config, ConfigSource } from './utils/config.js';
-/**
- * 为了向后兼容，保留getServerConfig函数
- * 但内部使用Config类
- * @param isStdioMode 是否在stdio模式下
- * @returns 服务器配置
- */
-export function getServerConfig(isStdioMode) {
-    const config = Config.getInstance();
-    if (!isStdioMode) {
-        config.printConfig(isStdioMode);
-    }
-    // 为了向后兼容，返回旧格式的配置对象
-    return {
-        port: config.server.port,
-        feishuAppId: config.feishu.appId,
-        feishuAppSecret: config.feishu.appSecret,
-        configSources: {
-            port: config.configSources['server.port'].toLowerCase(),
-            feishuAppId: config.configSources['feishu.appId']?.toLowerCase(),
-            feishuAppSecret: config.configSources['feishu.appSecret']?.toLowerCase()
-        }
-    };
-}
-// 导出Config类
-export { Config, ConfigSource };