@cloudbase/cloudbase-mcp 1.7.3 → 1.7.5

package/README.md

@@ -132,7 +132,7 @@ https://github.com/user-attachments/assets/2b402fa6-c5c4-495a-b85b-f5d4a25daa4a
   "mcpServers": {
     "cloudbase-mcp": {
       "command": "npx",
-      "args": ["@cloudbase/cloudbase-mcp@latest"]
+      "args": ["-y", "@cloudbase/cloudbase-mcp@latest"]
     }
   }
 }
@@ -162,7 +162,7 @@ https://github.com/user-attachments/assets/2b402fa6-c5c4-495a-b85b-f5d4a25daa4a
   "mcpServers": {
     "cloudbase-mcp": {
       "command": "npx",
-      "args": ["@cloudbase/cloudbase-mcp@latest"]
+      "args": ["-y", "@cloudbase/cloudbase-mcp@latest"]
     }
   }
 }
@@ -190,7 +190,7 @@ https://github.com/user-attachments/assets/2b402fa6-c5c4-495a-b85b-f5d4a25daa4a
   "mcpServers": {
     "cloudbase-mcp": {
       "command": "npx",
-      "args": ["@cloudbase/cloudbase-mcp@latest"]
+      "args": ["-y", "@cloudbase/cloudbase-mcp@latest"]
     }
   }
 }
@@ -284,7 +284,7 @@ https://github.com/user-attachments/assets/2b402fa6-c5c4-495a-b85b-f5d4a25daa4a
   "mcpServers": {
     "cloudbase-mcp": {
       "command": "npx",
-      "args": ["@cloudbase/cloudbase-mcp@latest"]
+      "args": ["-y", "@cloudbase/cloudbase-mcp@latest"]
     }
   }
 }
@@ -312,7 +312,7 @@ https://github.com/user-attachments/assets/2b402fa6-c5c4-495a-b85b-f5d4a25daa4a
   "mcpServers": {
     "cloudbase-mcp": {
       "command": "npx",
-      "args": ["@cloudbase/cloudbase-mcp@latest"]
+      "args": ["-y", "@cloudbase/cloudbase-mcp@latest"]
     }
   }
 }

package/dist/cloudbase-manager.js

@@ -1,84 +1,122 @@
 import { getLoginState } from './auth.js';
-import { ensureEnvId, autoSetupEnvironmentId } from './tools/interactive.js';
+import { loadEnvIdFromUserConfig, saveEnvIdToUserConfig, autoSetupEnvironmentId } from './tools/interactive.js';
 import CloudBase from "@cloudbase/manager-node";
 import { debug, error } from './utils/logger.js';
-let initializationPromise = null;
-let noEnvIdInitializationPromise = null;
-const INITIALIZATION_TIMEOUT = 30000; // 30 seconds
-export function getCloudBaseManager(options = {}) {
-    const { requireEnvId = true } = options;
-    if (requireEnvId) {
-        if (initializationPromise) {
-            return initializationPromise;
+const ENV_ID_TIMEOUT = 30000; // 30 seconds
+// 统一的环境ID管理类
+class EnvironmentManager {
+    cachedEnvId = null;
+    envIdPromise = null;
+    // 重置缓存
+    reset() {
+        this.cachedEnvId = null;
+        this.envIdPromise = null;
+        delete process.env.CLOUDBASE_ENV_ID;
+    }
+    // 获取环境ID的核心逻辑
+    async getEnvId() {
+        // 1. 优先使用内存缓存
+        if (this.cachedEnvId) {
+            debug('使用内存缓存的环境ID:', this.cachedEnvId);
+            return this.cachedEnvId;
         }
-        const executor = async () => {
-            try {
-                // 检查并确保环境ID已配置
-                let userEnvId = await ensureEnvId();
-                if (!userEnvId) {
-                    debug("未找到环境ID，尝试自动设置...");
-                    userEnvId = await autoSetupEnvironmentId();
-                    if (!userEnvId) {
-                        throw new Error("CloudBase Environment ID not found after auto setup. Please set CLOUDBASE_ENV_ID or run setupEnvironmentId tool.");
-                    }
-                }
-                const loginState = await getLoginState();
-                const { envId, secretId, secretKey, token } = loginState;
-                const manager = new CloudBase({
-                    secretId,
-                    secretKey,
-                    envId: userEnvId,
-                    token,
-                    proxy: process.env.http_proxy
-                });
-                return manager;
-            }
-            catch (err) {
-                error('Failed to initialize CloudBase Manager:', err);
-                throw err;
-            }
-        };
+        // 2. 如果正在获取中，等待结果
+        if (this.envIdPromise) {
+            return this.envIdPromise;
+        }
+        // 3. 开始获取环境ID
+        this.envIdPromise = this._fetchEnvId();
+        // 增加超时保护
         const timeoutPromise = new Promise((_, reject) => {
             const id = setTimeout(() => {
                 clearTimeout(id);
-                reject(new Error(`CloudBase Manager initialization timed out after ${INITIALIZATION_TIMEOUT / 1000} seconds.`));
-            }, INITIALIZATION_TIMEOUT);
-        });
-        initializationPromise = Promise.race([executor(), timeoutPromise]);
-        initializationPromise.catch(() => {
-            initializationPromise = null;
+                reject(new Error(`EnvId 获取超时（${ENV_ID_TIMEOUT / 1000}秒）`));
+            }, ENV_ID_TIMEOUT);
         });
-        return initializationPromise;
-    }
-    if (noEnvIdInitializationPromise) {
-        return noEnvIdInitializationPromise;
-    }
-    const noEnvIdExecutor = async () => {
         try {
-            const loginState = await getLoginState();
-            const { secretId, secretKey, token } = loginState;
-            const manager = new CloudBase({
-                secretId,
-                secretKey,
-                token,
-                proxy: process.env.http_proxy
-            });
-            return manager;
+            const result = await Promise.race([this.envIdPromise, timeoutPromise]);
+            return result;
         }
         catch (err) {
-            error('Failed to initialize CloudBase Manager (no envId):', err instanceof Error ? err.message : String(err));
+            this.envIdPromise = null;
             throw err;
         }
-    };
-    const timeoutPromise = new Promise((_, reject) => {
-        const id = setTimeout(() => {
-            clearTimeout(id);
-            reject(new Error(`CloudBase Manager (no envId) initialization timed out after ${INITIALIZATION_TIMEOUT / 1000} seconds.`));
-        }, INITIALIZATION_TIMEOUT);
-    });
-    noEnvIdInitializationPromise = Promise.race([noEnvIdExecutor(), timeoutPromise]);
-    noEnvIdInitializationPromise.catch(() => {
-        noEnvIdInitializationPromise = null;
-    });
-    return noEnvIdInitializationPromise;
+    }
+    async _fetchEnvId() {
+        try {
+            // 1. 检查进程环境变量
+            if (process.env.CLOUDBASE_ENV_ID) {
+                debug('使用进程环境变量的环境ID:', process.env.CLOUDBASE_ENV_ID);
+                this.cachedEnvId = process.env.CLOUDBASE_ENV_ID;
+                return this.cachedEnvId;
+            }
+            // 2. 从配置文件读取
+            const fileEnvId = await loadEnvIdFromUserConfig();
+            if (fileEnvId) {
+                debug('从配置文件读取到环境ID:', fileEnvId);
+                this._setCachedEnvId(fileEnvId);
+                return fileEnvId;
+            }
+            // 3. 自动设置环境ID
+            debug('未找到环境ID，尝试自动设置...');
+            const autoEnvId = await autoSetupEnvironmentId();
+            if (!autoEnvId) {
+                throw new Error("CloudBase Environment ID not found after auto setup. Please set CLOUDBASE_ENV_ID or run setupEnvironmentId tool.");
+            }
+            debug('自动设置环境ID成功:', autoEnvId);
+            this._setCachedEnvId(autoEnvId);
+            return autoEnvId;
+        }
+        finally {
+            this.envIdPromise = null;
+        }
+    }
+    // 统一设置缓存的方法
+    _setCachedEnvId(envId) {
+        this.cachedEnvId = envId;
+        process.env.CLOUDBASE_ENV_ID = envId;
+        debug('已更新环境ID缓存:', envId);
+    }
+    // 手动设置环境ID（用于外部调用）
+    async setEnvId(envId) {
+        this._setCachedEnvId(envId);
+        // 同步保存到配置文件
+        await saveEnvIdToUserConfig(envId);
+        debug('手动设置环境ID并保存到文件:', envId);
+    }
+}
+// 全局实例
+const envManager = new EnvironmentManager();
+// 导出函数保持兼容性
+export function resetCloudBaseManagerCache() {
+    envManager.reset();
+}
+/**
+ * 每次都实时获取最新的 token/secretId/secretKey
+ */
+export async function getCloudBaseManager(options = {}) {
+    const { requireEnvId = true } = options;
+    try {
+        const loginState = await getLoginState();
+        const { envId: loginEnvId, secretId, secretKey, token } = loginState;
+        let finalEnvId;
+        if (requireEnvId) {
+            finalEnvId = await envManager.getEnvId();
+        }
+        // envId 优先顺序：获取到的envId > loginState中的envId > undefined
+        const manager = new CloudBase({
+            secretId,
+            secretKey,
+            envId: finalEnvId || loginEnvId,
+            token,
+            proxy: process.env.http_proxy
+        });
+        return manager;
+    }
+    catch (err) {
+        error('Failed to initialize CloudBase Manager:', err instanceof Error ? err.message : String(err));
+        throw err;
+    }
 }
+// 导出环境管理器实例供其他地方使用
+export { envManager };

package/dist/interactive-server.js

@@ -17,13 +17,25 @@ export class InteractiveServer {
     sessionData = new Map();
     // 固定端口配置
     DEFAULT_PORT = 3721;
-    FALLBACK_PORTS = [3722, 3723, 3724, 3725];
+    FALLBACK_PORTS = [3722, 3723, 3724, 3725, 3726, 3727, 3728, 3729, 3730, 3731, 3732, 3733, 3734, 3735];
     constructor() {
         this.app = express();
         this.server = http.createServer(this.app);
         this.wss = new WebSocketServer({ server: this.server });
         this.setupExpress();
         this.setupWebSocket();
+        // 确保进程退出时清理资源
+        process.on('exit', () => this.cleanup());
+        process.on('SIGINT', () => this.cleanup());
+        process.on('SIGTERM', () => this.cleanup());
+    }
+    cleanup() {
+        if (this.isRunning) {
+            debug('Cleaning up interactive server resources...');
+            this.server.close();
+            this.wss.close();
+            this.isRunning = false;
+        }
     }
     setupExpress() {
         this.app.use(express.json());
@@ -148,32 +160,41 @@ export class InteractiveServer {
             let currentIndex = 0;
             const tryNextPort = () => {
                 if (currentIndex >= tryPorts.length) {
-                    const err = new Error('All ports are in use, failed to start server');
+                    const err = new Error(`All ${tryPorts.length} ports are in use (${tryPorts.join(', ')}), failed to start server`);
                     error('Server start failed', err);
                     reject(err);
                     return;
                 }
                 const portToTry = tryPorts[currentIndex];
                 currentIndex++;
-                debug(`Trying to start server on port ${portToTry}`);
-                // 清除之前的错误监听器
+                debug(`Trying to start server on port ${portToTry} (attempt ${currentIndex}/${tryPorts.length})`);
+                // 清除之前的所有监听器
                 this.server.removeAllListeners('error');
-                this.server.on('error', (err) => {
+                this.server.removeAllListeners('listening');
+                // 设置错误处理
+                const errorHandler = (err) => {
                     if (err.code === 'EADDRINUSE') {
                         warn(`Port ${portToTry} is in use, trying next port...`);
+                        // 清理当前尝试
+                        this.server.removeAllListeners('error');
+                        this.server.removeAllListeners('listening');
                         tryNextPort();
                     }
                     else {
                         error('Server error', err);
                         reject(err);
                     }
-                });
-                this.server.listen(portToTry, '127.0.0.1', () => {
+                };
+                // 设置成功监听处理
+                const listeningHandler = () => {
                     const address = this.server.address();
                     if (address && typeof address === 'object') {
                         this.port = address.port;
                         this.isRunning = true;
                         info(`Interactive server started successfully on http://localhost:${this.port}`);
+                        // 移除临时监听器
+                        this.server.removeListener('error', errorHandler);
+                        this.server.removeListener('listening', listeningHandler);
                         resolve(this.port);
                     }
                     else {
@@ -181,19 +202,61 @@ export class InteractiveServer {
                         error('Server start error', err);
                         reject(err);
                     }
-                });
+                };
+                this.server.once('error', errorHandler);
+                this.server.once('listening', listeningHandler);
+                try {
+                    this.server.listen(portToTry, '127.0.0.1');
+                }
+                catch (err) {
+                    error(`Failed to bind to port ${portToTry}:`, err);
+                    tryNextPort();
+                }
             };
             tryNextPort();
         });
     }
     async stop() {
-        if (!this.isRunning)
+        if (!this.isRunning) {
+            debug('Interactive server is not running, nothing to stop');
             return;
-        return new Promise((resolve) => {
-            this.server.close(() => {
+        }
+        info('Stopping interactive server...');
+        return new Promise((resolve, reject) => {
+            // 设置超时，防止无限等待
+            const timeout = setTimeout(() => {
+                warn('Server close timeout, forcing cleanup');
                 this.isRunning = false;
+                this.port = 0;
                 resolve();
-            });
+            }, 5000);
+            try {
+                // 首先关闭WebSocket服务器
+                this.wss.close(() => {
+                    debug('WebSocket server closed');
+                });
+                // 然后关闭HTTP服务器
+                this.server.close((err) => {
+                    clearTimeout(timeout);
+                    if (err) {
+                        error('Error closing server:', err);
+                        reject(err);
+                    }
+                    else {
+                        info('Interactive server stopped successfully');
+                        this.isRunning = false;
+                        this.port = 0;
+                        resolve();
+                    }
+                });
+            }
+            catch (err) {
+                clearTimeout(timeout);
+                error('Error stopping server:', err);
+                this.isRunning = false;
+                this.port = 0;
+                reject(err);
+            }
         });
     }
     async collectEnvId(availableEnvs) {
@@ -2438,6 +2501,14 @@ export class InteractiveServer {
 </body>
 </html>`;
     }
+    // 公共方法获取运行状态
+    get running() {
+        return this.isRunning;
+    }
+    // 公共方法获取端口
+    get currentPort() {
+        return this.port;
+    }
 }
 // 单例实例
 let interactiveServerInstance = null;
@@ -2447,3 +2518,27 @@ export function getInteractiveServer() {
     }
     return interactiveServerInstance;
 }
+export async function resetInteractiveServer() {
+    if (interactiveServerInstance) {
+        try {
+            await interactiveServerInstance.stop();
+        }
+        catch (err) {
+            error('Error stopping existing server instance:', err);
+        }
+        interactiveServerInstance = null;
+    }
+}
+export async function getInteractiveServerSafe() {
+    // 如果当前实例存在但不在运行状态，先清理
+    if (interactiveServerInstance && !interactiveServerInstance.running) {
+        try {
+            await interactiveServerInstance.stop();
+        }
+        catch (err) {
+            debug('Error stopping non-running server:', err);
+        }
+        interactiveServerInstance = null;
+    }
+    return getInteractiveServer();
+}

package/dist/tools/env.js

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { getCloudBaseManager } from '../cloudbase-manager.js';
+import { getCloudBaseManager, resetCloudBaseManagerCache } from '../cloudbase-manager.js';
 import { logout } from '../auth.js';
 import { clearUserEnvId, _promptAndSetEnvironmentId } from './interactive.js';
 import { debug } from '../utils/logger.js';
@@ -48,6 +48,7 @@ export function registerEnvTools(server) {
             await logout();
             // 清理环境ID配置
             await clearUserEnvId();
+            await resetCloudBaseManagerCache();
             return {
                 content: [{
                         type: "text",

package/dist/tools/interactive.js

@@ -97,10 +97,10 @@ export async function _promptAndSetEnvironmentId(autoSelectSingle) {
         }
         selectedEnvId = result.data;
     }
-    // 4. 保存并设置环境ID
+    // 4. 保存环境ID配置
     if (selectedEnvId) {
         await saveEnvIdToUserConfig(selectedEnvId);
-        process.env.CLOUDBASE_ENV_ID = selectedEnvId;
+        debug('环境ID已保存到配置文件:', selectedEnvId);
     }
     return { selectedEnvId, cancelled: false };
 }
@@ -109,7 +109,7 @@ function getUserConfigPath() {
     return path.join(os.homedir(), '.cloudbase-env-id');
 }
 // 保存环境ID到用户配置文件
-async function saveEnvIdToUserConfig(envId) {
+export async function saveEnvIdToUserConfig(envId) {
     const configPath = getUserConfigPath();
     try {
         const config = {
@@ -118,7 +118,7 @@ async function saveEnvIdToUserConfig(envId) {
             version: '1.0'
         };
         await fs.writeFile(configPath, JSON.stringify(config, null, 2), 'utf8');
-        // 环境ID已保存 - 静默操作避免干扰MCP返回值
+        debug('环境ID配置已保存到文件:', configPath);
     }
     catch (error) {
         console.error('保存环境ID配置失败:', error);
@@ -126,7 +126,7 @@ async function saveEnvIdToUserConfig(envId) {
     }
 }
 // 从用户配置文件读取环境ID
-async function loadEnvIdFromUserConfig() {
+export async function loadEnvIdFromUserConfig() {
     const configPath = getUserConfigPath();
     try {
         const configContent = await fs.readFile(configPath, 'utf8');
@@ -135,6 +135,9 @@ async function loadEnvIdFromUserConfig() {
         if (!envId) {
             warn(`Config file ${configPath} found, but 'envId' property is missing or empty.`);
         }
+        else {
+            debug('从配置文件加载环境ID:', envId);
+        }
         return envId;
     }
     catch (err) {
@@ -148,36 +151,16 @@ async function loadEnvIdFromUserConfig() {
         return null;
     }
 }
-// 检查并设置环境ID
-export async function ensureEnvId() {
-    // 优先使用进程环境变量
-    if (process.env.CLOUDBASE_ENV_ID) {
-        return process.env.CLOUDBASE_ENV_ID;
-    }
-    // 从用户配置文件读取
-    const envId = await loadEnvIdFromUserConfig();
-    if (envId) {
-        // 设置到进程环境变量中
-        process.env.CLOUDBASE_ENV_ID = envId;
-        return envId;
-    }
-    return null;
-}
 // 清理用户环境ID配置
 export async function clearUserEnvId() {
     const configPath = getUserConfigPath();
     try {
         await fs.unlink(configPath);
-        // 清理进程环境变量
-        delete process.env.CLOUDBASE_ENV_ID;
-        delete process.env.TENCENTCLOUD_SECRETID;
-        delete process.env.TENCENTCLOUD_SECRETKEY;
-        delete process.env.TENCENTCLOUD_SESSIONTOKEN;
-        // 环境ID配置已清理 - 静默操作
+        debug('环境ID配置文件已删除:', configPath);
     }
     catch (error) {
         // 文件不存在或删除失败，忽略错误
-        // 环境ID配置文件不存在或已清理 - 静默操作
+        debug('环境ID配置文件不存在或已清理:', configPath);
     }
 }
 // 自动设置环境ID（无需MCP工具调用）

package/dist/tools/setup.js

@@ -12,6 +12,10 @@ const TEMPLATES = {
         description: "React + CloudBase 全栈应用模板",
         url: "https://static.cloudbase.net/cloudbase-examples/web-cloudbase-react-template.zip"
     },
+    "vue": {
+        description: "Vue + CloudBase 全栈应用模板",
+        url: "https://static.cloudbase.net/cloudbase-examples/web-cloudbase-vue-template.zip"
+    },
     "miniprogram": {
         description: "微信小程序 + 云开发模板",
         url: "https://static.cloudbase.net/cloudbase-examples/miniprogram-cloudbase-miniprogram-template.zip"
@@ -123,11 +127,12 @@ export function registerSetupTools(server) {
 
 支持的模板:
 - react: React + CloudBase 全栈应用模板
+- vue: Vue + CloudBase 全栈应用模板
 - miniprogram: 微信小程序 + 云开发模板  
 - rules: 只包含AI编辑器配置文件（包含Cursor、WindSurf、CodeBuddy等所有主流编辑器配置），适合在已有项目中补充AI编辑器配置
 
 工具会自动下载模板到临时目录，解压后如果检测到WORKSPACE_FOLDER_PATHS环境变量，则复制到项目目录。`, {
-        template: z.enum(["react", "miniprogram", "rules"]).describe("要下载的模板类型"),
+        template: z.enum(["react", "vue", "miniprogram", "rules"]).describe("要下载的模板类型"),
         overwrite: z.boolean().optional().describe("是否覆盖已存在的文件，默认为false（不覆盖）")
     }, async ({ template, overwrite = false }) => {
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/cloudbase-mcp",
-  "version": "1.7.3",
+  "version": "1.7.5",
   "description": "腾讯云开发 MCP Server，支持静态托管/环境查询/",
   "main": "index.js",
   "type": "module",