@cloudbase/cloudbase-mcp 2.4.0-alpha.0 → 2.5.0

package/dist/cli.cjs

@@ -100573,6 +100573,9 @@ async function createCloudBaseMcpServer(options) {
     if (logger) {
         server.logger = logger;
     }
+    server.setLogger = (logger) => {
+        server.logger = logger;
+    };
     // Enable telemetry if requested
     if (enableTelemetry) {
         (0, tool_wrapper_js_1.wrapServerWithTelemetry)(server);
@@ -135174,7 +135177,7 @@ class TelemetryReporter {
         const nodeVersion = process.version; // Node.js版本
         const arch = os_1.default.arch(); // 系统架构
         // 从构建时注入的版本号获取MCP版本信息
-        const mcpVersion = process.env.npm_package_version || "2.4.0-alpha.0" || 0;
+        const mcpVersion = process.env.npm_package_version || "2.5.0" || 0;
         return {
             userAgent: `${osType} ${osRelease} ${arch} ${nodeVersion} CloudBase-MCP/${mcpVersion}`,
             deviceId: this.deviceId,
@@ -185656,6 +185659,7 @@ exports.getClaudePrompt = getClaudePrompt;
 exports.registerRagTools = registerRagTools;
 const adm_zip_1 = __importDefault(__webpack_require__(30283));
 const fs = __importStar(__webpack_require__(79748));
+const lockfile_1 = __importDefault(__webpack_require__(80127));
 const os = __importStar(__webpack_require__(21820));
 const path = __importStar(__webpack_require__(39902));
 const zod_1 = __webpack_require__(21614);
@@ -185672,7 +185676,39 @@ const KnowledgeBaseIdMap = {
 // ============ 缓存配置 ============
 const CACHE_BASE_DIR = path.join(os.homedir(), ".cloudbase-mcp");
 const CACHE_META_FILE = path.join(CACHE_BASE_DIR, "cache-meta.json");
+const LOCK_FILE = path.join(CACHE_BASE_DIR, ".download.lock");
 const DEFAULT_CACHE_TTL_MS = 24 * 60 * 60 * 1000; // 默认 24 小时
+// Promise wrapper for lockfile methods
+function acquireLock(lockPath, options) {
+    return new Promise((resolve, reject) => {
+        if (options) {
+            lockfile_1.default.lock(lockPath, options, (err) => {
+                if (err)
+                    reject(err);
+                else
+                    resolve();
+            });
+        }
+        else {
+            lockfile_1.default.lock(lockPath, (err) => {
+                if (err)
+                    reject(err);
+                else
+                    resolve();
+            });
+        }
+    });
+}
+function releaseLock(lockPath) {
+    return new Promise((resolve, reject) => {
+        lockfile_1.default.unlock(lockPath, (err) => {
+            if (err)
+                reject(err);
+            else
+                resolve();
+        });
+    });
+}
 // 支持环境变量 CLOUDBASE_MCP_CACHE_TTL_MS 控制缓存过期时间（毫秒）
 const parsedCacheTTL = process.env.CLOUDBASE_MCP_CACHE_TTL_MS
     ? parseInt(process.env.CLOUDBASE_MCP_CACHE_TTL_MS, 10)
@@ -185842,14 +185878,19 @@ async function _doDownloadResources() {
 async function downloadResources() {
     const webTemplateDir = path.join(CACHE_BASE_DIR, "web-template");
     const openAPIDir = path.join(CACHE_BASE_DIR, "openapi");
-    // 检查缓存是否有效
+    // 如果已有下载任务在进行中，共享该 Promise
+    if (resourceDownloadPromise) {
+        (0, logger_js_1.debug)("[downloadResources] 共享已有下载任务");
+        return resourceDownloadPromise;
+    }
+    // 先快速检查缓存（不需要锁，因为只是读取）
     if (await canUseCache()) {
         try {
             // 检查两个目录都存在
             await Promise.all([fs.access(webTemplateDir), fs.access(openAPIDir)]);
             const files = await fs.readdir(openAPIDir);
             if (files.length > 0) {
-                (0, logger_js_1.debug)("[downloadResources] 使用缓存");
+                (0, logger_js_1.debug)("[downloadResources] 使用缓存（快速路径）");
                 return {
                     webTemplateDir,
                     openAPIDocs: OPENAPI_SOURCES.map((source) => ({
@@ -185864,21 +185905,61 @@ async function downloadResources() {
             // 缓存无效，需要重新下载
         }
     }
-    // 如果已有下载任务在进行中，共享该 Promise
-    if (resourceDownloadPromise) {
-        (0, logger_js_1.debug)("[downloadResources] 共享已有下载任务");
-        return resourceDownloadPromise;
-    }
-    // 创建新的下载任务
+    // 创建新的下载任务，使用文件锁保护
     (0, logger_js_1.debug)("[downloadResources] 开始新下载任务");
     await fs.mkdir(CACHE_BASE_DIR, { recursive: true });
-    resourceDownloadPromise = _doDownloadResources()
-        .then(async (result) => {
-        await updateCache();
-        (0, logger_js_1.debug)("[downloadResources] 缓存已更新");
-        return result;
-    })
-        .finally(() => {
+    resourceDownloadPromise = (async () => {
+        // 尝试获取文件锁，最多等待 6 秒（30 次 × 200ms），每 200ms 轮询一次
+        let lockAcquired = false;
+        try {
+            await acquireLock(LOCK_FILE, {
+                wait: 30 * 200, // 总等待时间：6000ms (6 秒)
+                pollPeriod: 200, // 轮询间隔：200ms
+                stale: 5 * 60 * 1000, // 5 分钟，如果锁文件超过这个时间认为是过期的
+            });
+            lockAcquired = true;
+            (0, logger_js_1.debug)("[downloadResources] 文件锁已获取");
+            // 在持有锁的情况下再次检查缓存（可能其他进程已经下载完成）
+            if (await canUseCache()) {
+                try {
+                    // 检查两个目录都存在
+                    await Promise.all([fs.access(webTemplateDir), fs.access(openAPIDir)]);
+                    const files = await fs.readdir(openAPIDir);
+                    if (files.length > 0) {
+                        (0, logger_js_1.debug)("[downloadResources] 使用缓存（在锁保护下检查）");
+                        return {
+                            webTemplateDir,
+                            openAPIDocs: OPENAPI_SOURCES.map((source) => ({
+                                name: source.name,
+                                description: source.description,
+                                absolutePath: path.join(openAPIDir, `${source.name}.openapi.yaml`),
+                            })).filter((item) => files.includes(`${item.name}.openapi.yaml`)),
+                        };
+                    }
+                }
+                catch {
+                    // 缓存无效，需要重新下载
+                }
+            }
+            // 执行下载
+            const result = await _doDownloadResources();
+            await updateCache();
+            (0, logger_js_1.debug)("[downloadResources] 缓存已更新");
+            return result;
+        }
+        finally {
+            // 释放文件锁
+            if (lockAcquired) {
+                try {
+                    await releaseLock(LOCK_FILE);
+                    (0, logger_js_1.debug)("[downloadResources] 文件锁已释放");
+                }
+                catch (error) {
+                    (0, logger_js_1.warn)("[downloadResources] 释放文件锁失败", { error });
+                }
+            }
+        }
+    })().finally(() => {
         resourceDownloadPromise = null;
     });
     return resourceDownloadPromise;
@@ -201022,7 +201103,7 @@ ${envIdSection}
 ## 环境信息
 - 操作系统: ${os_1.default.type()} ${os_1.default.release()}
 - Node.js版本: ${process.version}
-- MCP 版本：${process.env.npm_package_version || "2.4.0-alpha.0" || 0}
+- MCP 版本：${process.env.npm_package_version || "2.5.0" || 0}
 - 系统架构: ${os_1.default.arch()}
 - 时间: ${new Date().toISOString()}
 - 请求ID: ${requestId}
@@ -215691,7 +215772,7 @@ function registerSetupTools(server) {
         title: "下载项目模板",
         description: `自动下载并部署CloudBase项目模板。⚠️ **MANDATORY FOR NEW PROJECTS** ⚠️
 
-**CRITICAL**: This tool MUST be called FIRST when starting a new project.\n\n支持的模板:\n- react: React + CloudBase 全栈应用模板\n- vue: Vue + CloudBase 全栈应用模板\n- miniprogram: 微信小程序 + 云开发模板  \n- uniapp: UniApp + CloudBase 跨端应用模板\n- rules: 只包含AI编辑器配置文件（包含Cursor、WindSurf、CodeBuddy等所有主流编辑器配置），适合在已有项目中补充AI编辑器配置\n\n支持的IDE类型:\n- all: 下载所有IDE配置（默认）\n- cursor: Cursor AI编辑器\n- windsurf: WindSurf AI编辑器\n- codebuddy: CodeBuddy AI编辑器\n- claude-code: Claude Code AI编辑器\n- cline: Cline AI编辑器\n- gemini-cli: Gemini CLI\n- opencode: OpenCode AI编辑器\n- qwen-code: 通义灵码\n- baidu-comate: 百度Comate\n- openai-codex-cli: OpenAI Codex CLI\n- augment-code: Augment Code\n- github-copilot: GitHub Copilot\n- roocode: RooCode AI编辑器\n- tongyi-lingma: 通义灵码\n- trae: Trae AI编辑器\n- qoder: Qoder AI编辑器\n- antigravity: Google Antigravity AI编辑器\n- vscode: Visual Studio Code\n\n特别说明：\n- rules 模板会自动包含当前 mcp 版本号信息（版本号：${ true ? "2.4.0-alpha.0" : 0}），便于后续维护和版本追踪\n- 下载 rules 模板时，如果项目中已存在 README.md 文件，系统会自动保护该文件不被覆盖（除非设置 overwrite=true）`,
+**CRITICAL**: This tool MUST be called FIRST when starting a new project.\n\n支持的模板:\n- react: React + CloudBase 全栈应用模板\n- vue: Vue + CloudBase 全栈应用模板\n- miniprogram: 微信小程序 + 云开发模板  \n- uniapp: UniApp + CloudBase 跨端应用模板\n- rules: 只包含AI编辑器配置文件（包含Cursor、WindSurf、CodeBuddy等所有主流编辑器配置），适合在已有项目中补充AI编辑器配置\n\n支持的IDE类型:\n- all: 下载所有IDE配置（默认）\n- cursor: Cursor AI编辑器\n- windsurf: WindSurf AI编辑器\n- codebuddy: CodeBuddy AI编辑器\n- claude-code: Claude Code AI编辑器\n- cline: Cline AI编辑器\n- gemini-cli: Gemini CLI\n- opencode: OpenCode AI编辑器\n- qwen-code: 通义灵码\n- baidu-comate: 百度Comate\n- openai-codex-cli: OpenAI Codex CLI\n- augment-code: Augment Code\n- github-copilot: GitHub Copilot\n- roocode: RooCode AI编辑器\n- tongyi-lingma: 通义灵码\n- trae: Trae AI编辑器\n- qoder: Qoder AI编辑器\n- antigravity: Google Antigravity AI编辑器\n- vscode: Visual Studio Code\n\n特别说明：\n- rules 模板会自动包含当前 mcp 版本号信息（版本号：${ true ? "2.5.0" : 0}），便于后续维护和版本追踪\n- 下载 rules 模板时，如果项目中已存在 README.md 文件，系统会自动保护该文件不被覆盖（除非设置 overwrite=true）`,
         inputSchema: {
             template: zod_1.z
                 .enum(["react", "vue", "miniprogram", "uniapp", "rules"])
@@ -224736,6 +224817,333 @@ function resolveIds(schema) {
 }
 
 
+/***/ }),
+
+/***/ 80127:
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+var fs = __webpack_require__(29021)
+
+var wx = 'wx'
+if (process.version.match(/^v0\.[0-6]/)) {
+  var c = __webpack_require__(81115)
+  wx = c.O_TRUNC | c.O_CREAT | c.O_WRONLY | c.O_EXCL
+}
+
+var os = __webpack_require__(21820)
+exports.filetime = 'ctime'
+if (os.platform() == "win32") {
+  exports.filetime = 'mtime'
+}
+
+var debug
+var util = __webpack_require__(28354)
+if (util.debuglog)
+  debug = util.debuglog('LOCKFILE')
+else if (/\blockfile\b/i.test(process.env.NODE_DEBUG))
+  debug = function() {
+    var msg = util.format.apply(util, arguments)
+    console.error('LOCKFILE %d %s', process.pid, msg)
+  }
+else
+  debug = function() {}
+
+var locks = {}
+
+function hasOwnProperty (obj, prop) {
+  return Object.prototype.hasOwnProperty.call(obj, prop)
+}
+
+var onExit = __webpack_require__(29468)
+onExit(function () {
+  debug('exit listener')
+  // cleanup
+  Object.keys(locks).forEach(exports.unlockSync)
+})
+
+// XXX https://github.com/joyent/node/issues/3555
+// Remove when node 0.8 is deprecated.
+if (/^v0\.[0-8]\./.test(process.version)) {
+  debug('uncaughtException, version = %s', process.version)
+  process.on('uncaughtException', function H (er) {
+    debug('uncaughtException')
+    var l = process.listeners('uncaughtException').filter(function (h) {
+      return h !== H
+    })
+    if (!l.length) {
+      // cleanup
+      try { Object.keys(locks).forEach(exports.unlockSync) } catch (e) {}
+      process.removeListener('uncaughtException', H)
+      throw er
+    }
+  })
+}
+
+exports.unlock = function (path, cb) {
+  debug('unlock', path)
+  // best-effort.  unlocking an already-unlocked lock is a noop
+  delete locks[path]
+  fs.unlink(path, function (unlinkEr) { cb && cb() })
+}
+
+exports.unlockSync = function (path) {
+  debug('unlockSync', path)
+  // best-effort.  unlocking an already-unlocked lock is a noop
+  try { fs.unlinkSync(path) } catch (er) {}
+  delete locks[path]
+}
+
+
+// if the file can be opened in readonly mode, then it's there.
+// if the error is something other than ENOENT, then it's not.
+exports.check = function (path, opts, cb) {
+  if (typeof opts === 'function') cb = opts, opts = {}
+  debug('check', path, opts)
+  fs.open(path, 'r', function (er, fd) {
+    if (er) {
+      if (er.code !== 'ENOENT') return cb(er)
+      return cb(null, false)
+    }
+
+    if (!opts.stale) {
+      return fs.close(fd, function (er) {
+        return cb(er, true)
+      })
+    }
+
+    fs.fstat(fd, function (er, st) {
+      if (er) return fs.close(fd, function (er2) {
+        return cb(er)
+      })
+
+      fs.close(fd, function (er) {
+        var age = Date.now() - st[exports.filetime].getTime()
+        return cb(er, age <= opts.stale)
+      })
+    })
+  })
+}
+
+exports.checkSync = function (path, opts) {
+  opts = opts || {}
+  debug('checkSync', path, opts)
+  if (opts.wait) {
+    throw new Error('opts.wait not supported sync for obvious reasons')
+  }
+
+  try {
+    var fd = fs.openSync(path, 'r')
+  } catch (er) {
+    if (er.code !== 'ENOENT') throw er
+    return false
+  }
+
+  if (!opts.stale) {
+    try { fs.closeSync(fd) } catch (er) {}
+    return true
+  }
+
+  // file exists.  however, might be stale
+  if (opts.stale) {
+    try {
+      var st = fs.fstatSync(fd)
+    } finally {
+      fs.closeSync(fd)
+    }
+    var age = Date.now() - st[exports.filetime].getTime()
+    return (age <= opts.stale)
+  }
+}
+
+
+
+var req = 1
+exports.lock = function (path, opts, cb) {
+  if (typeof opts === 'function') cb = opts, opts = {}
+  opts.req = opts.req || req++
+  debug('lock', path, opts)
+  opts.start = opts.start || Date.now()
+
+  if (typeof opts.retries === 'number' && opts.retries > 0) {
+    debug('has retries', opts.retries)
+    var retries = opts.retries
+    opts.retries = 0
+    cb = (function (orig) { return function cb (er, fd) {
+      debug('retry-mutated callback')
+      retries -= 1
+      if (!er || retries < 0) return orig(er, fd)
+
+      debug('lock retry', path, opts)
+
+      if (opts.retryWait) setTimeout(retry, opts.retryWait)
+      else retry()
+
+      function retry () {
+        opts.start = Date.now()
+        debug('retrying', opts.start)
+        exports.lock(path, opts, cb)
+      }
+    }})(cb)
+  }
+
+  // try to engage the lock.
+  // if this succeeds, then we're in business.
+  fs.open(path, wx, function (er, fd) {
+    if (!er) {
+      debug('locked', path, fd)
+      locks[path] = fd
+      return fs.close(fd, function () {
+        return cb()
+      })
+    }
+
+    debug('failed to acquire lock', er)
+
+    // something other than "currently locked"
+    // maybe eperm or something.
+    if (er.code !== 'EEXIST') {
+      debug('not EEXIST error', er)
+      return cb(er)
+    }
+
+    // someone's got this one.  see if it's valid.
+    if (!opts.stale) return notStale(er, path, opts, cb)
+
+    return maybeStale(er, path, opts, false, cb)
+  })
+  debug('lock return')
+}
+
+
+// Staleness checking algorithm
+// 1. acquire $lock, fail
+// 2. stat $lock, find that it is stale
+// 3. acquire $lock.STALE
+// 4. stat $lock, assert that it is still stale
+// 5. unlink $lock
+// 6. link $lock.STALE $lock
+// 7. unlink $lock.STALE
+// On any failure, clean up whatever we've done, and raise the error.
+function maybeStale (originalEr, path, opts, hasStaleLock, cb) {
+  fs.stat(path, function (statEr, st) {
+    if (statEr) {
+      if (statEr.code === 'ENOENT') {
+        // expired already!
+        opts.stale = false
+        debug('lock stale enoent retry', path, opts)
+        exports.lock(path, opts, cb)
+        return
+      }
+      return cb(statEr)
+    }
+
+    var age = Date.now() - st[exports.filetime].getTime()
+    if (age <= opts.stale) return notStale(originalEr, path, opts, cb)
+
+    debug('lock stale', path, opts)
+    if (hasStaleLock) {
+      exports.unlock(path, function (er) {
+        if (er) return cb(er)
+        debug('lock stale retry', path, opts)
+        fs.link(path + '.STALE', path, function (er) {
+          fs.unlink(path + '.STALE', function () {
+            // best effort.  if the unlink fails, oh well.
+            cb(er)
+          })
+        })
+      })
+    } else {
+      debug('acquire .STALE file lock', opts)
+      exports.lock(path + '.STALE', opts, function (er) {
+        if (er) return cb(er)
+        maybeStale(originalEr, path, opts, true, cb)
+      })
+    }
+  })
+}
+
+function notStale (er, path, opts, cb) {
+  debug('notStale', path, opts)
+
+  // if we can't wait, then just call it a failure
+  if (typeof opts.wait !== 'number' || opts.wait <= 0) {
+    debug('notStale, wait is not a number')
+    return cb(er)
+  }
+
+  // poll for some ms for the lock to clear
+  var now = Date.now()
+  var start = opts.start || now
+  var end = start + opts.wait
+
+  if (end <= now)
+    return cb(er)
+
+  debug('now=%d, wait until %d (delta=%d)', start, end, end-start)
+  var wait = Math.min(end - start, opts.pollPeriod || 100)
+  var timer = setTimeout(poll, wait)
+
+  function poll () {
+    debug('notStale, polling', path, opts)
+    exports.lock(path, opts, cb)
+  }
+}
+
+exports.lockSync = function (path, opts) {
+  opts = opts || {}
+  opts.req = opts.req || req++
+  debug('lockSync', path, opts)
+  if (opts.wait || opts.retryWait) {
+    throw new Error('opts.wait not supported sync for obvious reasons')
+  }
+
+  try {
+    var fd = fs.openSync(path, wx)
+    locks[path] = fd
+    try { fs.closeSync(fd) } catch (er) {}
+    debug('locked sync!', path, fd)
+    return
+  } catch (er) {
+    if (er.code !== 'EEXIST') return retryThrow(path, opts, er)
+
+    if (opts.stale) {
+      var st = fs.statSync(path)
+      var ct = st[exports.filetime].getTime()
+      if (!(ct % 1000) && (opts.stale % 1000)) {
+        // probably don't have subsecond resolution.
+        // round up the staleness indicator.
+        // Yes, this will be wrong 1/1000 times on platforms
+        // with subsecond stat precision, but that's acceptable
+        // in exchange for not mistakenly removing locks on
+        // most other systems.
+        opts.stale = 1000 * Math.ceil(opts.stale / 1000)
+      }
+      var age = Date.now() - ct
+      if (age > opts.stale) {
+        debug('lockSync stale', path, opts, age)
+        exports.unlockSync(path)
+        return exports.lockSync(path, opts)
+      }
+    }
+
+    // failed to lock!
+    debug('failed to lock', path, opts, er)
+    return retryThrow(path, opts, er)
+  }
+}
+
+function retryThrow (path, opts, er) {
+  if (typeof opts.retries === 'number' && opts.retries > 0) {
+    var newRT = opts.retries - 1
+    debug('retryThrow', path, opts, newRT)
+    opts.retries = newRT
+    return exports.lockSync(path, opts)
+  }
+  throw er
+}
+
+
+
 /***/ }),
 
 /***/ 80280: