@cloudbase/cli 2.9.4 → 2.9.6

package/lib/commands/cloudrun/base.js

@@ -79,6 +79,10 @@ const AccessType = {
     MINIAPP: 'MINIAPP',
     VPC: 'VPC'
 };
+const ResourceTitle = {
+    container: '容器型云托管',
+    function: '函数型云托管'
+};
 function getCloudrunService(envId) {
     return __awaiter(this, void 0, void 0, function* () {
         const region = yield (0, toolbox_1.getRegion)();
@@ -598,12 +602,17 @@ let CloudRunDeployCommand = class CloudRunDeployCommand extends common_1.Command
                 }
                 serviceName = yield _inputServiceName(defaultName);
             }
+            const containerConfigFile = 'container.config.json';
+            const containerConfigPath = path_1.default.join(targetDir, containerConfigFile);
+            if (yield fs_extra_1.default.pathExists(containerConfigPath)) {
+                log.warn(`CLI 中 ${containerConfigFile} 文件将不会生效，请通过命令行参数进行配置！`);
+            }
             if (!force) {
                 const answers = yield inquirer_1.default.prompt([
                     {
                         type: 'confirm',
                         name: 'confirm',
-                        message: `即将开始部署，是否确认继续？`,
+                        message: '即将开始部署，是否确认继续？',
                         default: true
                     }
                 ]);
@@ -643,29 +652,25 @@ let CloudRunDeployCommand = class CloudRunDeployCommand extends common_1.Command
             function _runDeploy() {
                 return __awaiter(this, void 0, void 0, function* () {
                     try {
-                        const res = serverType === 'function'
-                            ? yield iac_core_1.IAC.FunctionV2.apply({
-                                cwd: targetDir,
-                                envId: envId,
-                                name: serviceName
-                            }, function (message) {
-                                (0, utils_2.trackCallback)(message, log);
-                            })
-                            : yield iac_core_1.IAC.Cloudrun.apply({
-                                cwd: targetDir,
-                                envId: envId,
-                                name: serviceName,
-                                port: port ? Number(port) : undefined
-                            }, function (message) {
-                                (0, utils_2.trackCallback)(message, log);
-                            });
+                        utils_2.trackCallback === null || utils_2.trackCallback === void 0 ? void 0 : (0, utils_2.trackCallback)({
+                            details: `正在提交${ResourceTitle[serverType]} ${serviceName} 中，请稍候...`,
+                            status: 'progress'
+                        }, log);
+                        yield cloudrunService.deploy({
+                            serverName: serviceName,
+                            targetPath: targetDir,
+                            serverConfig: Object.assign({}, (port ? { Port: Number(port) } : {}))
+                        });
+                        utils_2.trackCallback === null || utils_2.trackCallback === void 0 ? void 0 : (0, utils_2.trackCallback)({
+                            details: `提交${ResourceTitle[serverType]} ${serviceName} 已完成！`,
+                            status: 'done'
+                        }, log);
                         yield (0, utils_2.upsertCloudbaserc)(targetDir, {
                             envId,
                             cloudrun: { name: serviceName }
                         });
-                        const { envId: _envId, name, resourceType: _resourceType } = res === null || res === void 0 ? void 0 : res.data;
                         (0, utils_2.trackCallback)({
-                            details: `请打开链接查看部署状态: https://tcb.cloud.tencent.com/dev?envId=${_envId}#/platform-run/service/detail?serverName=${name}&tabId=deploy&envId=${_envId}`
+                            details: `请打开链接查看部署状态: https://tcb.cloud.tencent.com/dev?envId=${envId}#/platform-run/service/detail?serverName=${serviceName}&tabId=deploy&envId=${envId}`
                         }, log);
                     }
                     catch (e) {
@@ -675,7 +680,7 @@ let CloudRunDeployCommand = class CloudRunDeployCommand extends common_1.Command
                                 {
                                     type: 'confirm',
                                     name: 'confirm',
-                                    message: `平台当前有部署发布任务正在运行中。确认继续部署，正在执行的部署任务将被取消，并立即部署最新的代码`,
+                                    message: '平台当前有部署发布任务正在运行中。确认继续部署，正在执行的部署任务将被取消，并立即部署最新的代码',
                                     default: true
                                 }
                             ])
@@ -743,11 +748,11 @@ let CloudRunRunCommand = class CloudRunRunCommand extends common_1.Command {
             options: [
                 {
                     flags: '--runMode <runMode>',
-                    desc: `运行模式，可选值: normal(普通函数) | agent(函数式 Agent)，默认值: normal`
+                    desc: '运行模式，可选值: normal(普通函数) | agent(函数式 Agent)，默认值: normal'
                 },
                 {
                     flags: '--agentId <agentId>',
-                    desc: `在 agent 模式下需要提供 Agent ID 进行调试`
+                    desc: '在 agent 模式下需要提供 Agent ID 进行调试'
                 },
                 {
                     flags: '-e, --envId <envId>',
@@ -793,7 +798,7 @@ let CloudRunRunCommand = class CloudRunRunCommand extends common_1.Command {
                 },
                 {
                     flags: '--open-debug-panel <openDebugPanel>',
-                    desc: `是否打开调试面板，默认为 'true'`
+                    desc: '是否打开调试面板，默认为 \'true\''
                 }
             ],
             requiredEnvId: false,
@@ -828,7 +833,7 @@ let CloudRunRunCommand = class CloudRunRunCommand extends common_1.Command {
                         {
                             type: 'input',
                             name: 'agentId',
-                            message: `请输入 Agent ID（如没有请填写任意值）:`,
+                            message: '请输入 Agent ID（如没有请填写任意值）:',
                             validate: (val) => {
                                 return val.trim() ? true : 'Agent ID 不能为空';
                             }
@@ -895,7 +900,7 @@ let CloudRunRunCommand = class CloudRunRunCommand extends common_1.Command {
                     logger.info(`[nodemon ${e.type}] ${e.message}`);
                 })
                     .on('crash', () => {
-                    logger.error(`Server crashed.`);
+                    logger.error('Server crashed.');
                     process.exit(1);
                 })
                     .on('exit', (e) => {

package/lib/utils/template-manager.js

@@ -124,6 +124,19 @@ class TemplateManager {
                 subpath: giteeMatch[4]
             };
         }
+        const cnbMatchWithDash = url.match(/https?:\/\/cnb\.cool\/(.+?)\/-\/tree\/([^\/]+)\/(.+)$/);
+        if (cnbMatchWithDash) {
+            const pathParts = cnbMatchWithDash[1].split('/').filter(p => p.length > 0);
+            if (pathParts.length >= 2) {
+                return {
+                    platform: 'cnb',
+                    owner: pathParts[0],
+                    repo: pathParts.slice(1).join('/'),
+                    branch: cnbMatchWithDash[2] || 'main',
+                    subpath: cnbMatchWithDash[3]
+                };
+            }
+        }
         const cnbMatch = url.match(/https?:\/\/cnb\.cool\/(.+?)(?:\/tree\/([^\/]+)\/(.+))?$/);
         if (cnbMatch) {
             const pathParts = cnbMatch[1].split('/').filter(p => p.length > 0);
@@ -160,6 +173,38 @@ class TemplateManager {
         }
         throw new error_1.CloudBaseError(`不支持的 Git 平台: ${gitInfo.platform}`);
     }
+    cloneWithSubpathOptimized(gitUrl, tempDir, gitInfo, log) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.git.clone(gitUrl, tempDir, [
+                    '--depth', '1',
+                    '--single-branch',
+                    '--branch', gitInfo.branch,
+                    '--filter=blob:none'
+                ]);
+                const subpathFull = path_1.default.join(tempDir, gitInfo.subpath);
+                if (!(yield fs_extra_1.default.pathExists(subpathFull))) {
+                    throw new error_1.CloudBaseError(`子目录不存在: ${gitInfo.subpath}`);
+                }
+                const tempContentDir = path_1.default.join(tempDir, '.temp-content-' + Date.now());
+                yield fs_extra_1.default.move(subpathFull, tempContentDir);
+                const tempFiles = yield fs_extra_1.default.readdir(tempDir);
+                for (const file of tempFiles) {
+                    if (file !== path_1.default.basename(tempContentDir)) {
+                        yield fs_extra_1.default.remove(path_1.default.join(tempDir, file));
+                    }
+                }
+                const contentFiles = yield fs_extra_1.default.readdir(tempContentDir);
+                for (const file of contentFiles) {
+                    yield fs_extra_1.default.move(path_1.default.join(tempContentDir, file), path_1.default.join(tempDir, file));
+                }
+                yield fs_extra_1.default.remove(tempContentDir);
+            }
+            catch (error) {
+                throw new error_1.CloudBaseError(`克隆子目录失败: ${error.message}`, { original: error });
+            }
+        });
+    }
     cloneWithSubpath(gitUrl, tempDir, gitInfo, log) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -212,10 +257,10 @@ class TemplateManager {
             log.info(`📦 正在从 ${gitInfo.platform} 下载模板到临时目录...`);
             try {
                 if (gitInfo.subpath) {
-                    yield this.cloneWithSubpath(gitUrl, tempDir, gitInfo, log);
+                    yield this.cloneWithSubpathOptimized(gitUrl, tempDir, gitInfo, log);
                 }
                 else {
-                    yield this.git.clone(gitUrl, tempDir);
+                    yield this.git.clone(gitUrl, tempDir, ['--depth', '1', '--single-branch', '--branch', gitInfo.branch]);
                 }
                 log.info(`✅ Git 模板下载完成到临时目录`);
             }
@@ -271,10 +316,14 @@ class TemplateManager {
                     if (stat.isDirectory()) {
                         yield fs_extra_1.default.ensureDir(destPath);
                         const entries = yield fs_extra_1.default.readdir(srcPath, { withFileTypes: true });
-                        for (const entry of entries) {
+                        const copyPromises = entries.map(entry => {
                             const entrySrcPath = path_1.default.join(srcPath, entry.name);
                             const entryDestPath = path_1.default.join(destPath, entry.name);
-                            yield copyFile(entrySrcPath, entryDestPath);
+                            return copyFile(entrySrcPath, entryDestPath);
+                        });
+                        const chunks = this.chunkArray(copyPromises, 10);
+                        for (const chunk of chunks) {
+                            yield Promise.all(chunk);
                         }
                     }
                     else {
@@ -295,10 +344,14 @@ class TemplateManager {
                 }
             });
             const entries = yield fs_extra_1.default.readdir(sourceDir, { withFileTypes: true });
-            for (const entry of entries) {
+            const copyPromises = entries.map(entry => {
                 const srcPath = path_1.default.join(sourceDir, entry.name);
                 const destPath = path_1.default.join(targetDir, entry.name);
-                yield copyFile(srcPath, destPath);
+                return copyFile(srcPath, destPath);
+            });
+            const chunks = this.chunkArray(copyPromises, 5);
+            for (const chunk of chunks) {
+                yield Promise.all(chunk);
             }
             log.info(`📊 复制统计: ${copiedCount} 个新文件复制, ${overwrittenCount} 个文件覆盖`);
         });
@@ -313,10 +366,14 @@ class TemplateManager {
                     if (stat.isDirectory()) {
                         yield fs_extra_1.default.ensureDir(destPath);
                         const entries = yield fs_extra_1.default.readdir(srcPath, { withFileTypes: true });
-                        for (const entry of entries) {
+                        const copyPromises = entries.map(entry => {
                             const entrySrcPath = path_1.default.join(srcPath, entry.name);
                             const entryDestPath = path_1.default.join(destPath, entry.name);
-                            yield copyFile(entrySrcPath, entryDestPath);
+                            return copyFile(entrySrcPath, entryDestPath);
+                        });
+                        const chunks = this.chunkArray(copyPromises, 10);
+                        for (const chunk of chunks) {
+                            yield Promise.all(chunk);
                         }
                     }
                     else {
@@ -337,14 +394,25 @@ class TemplateManager {
                 }
             });
             const entries = yield fs_extra_1.default.readdir(sourceDir, { withFileTypes: true });
-            for (const entry of entries) {
+            const copyPromises = entries.map(entry => {
                 const srcPath = path_1.default.join(sourceDir, entry.name);
                 const destPath = path_1.default.join(targetDir, entry.name);
-                yield copyFile(srcPath, destPath);
+                return copyFile(srcPath, destPath);
+            });
+            const chunks = this.chunkArray(copyPromises, 5);
+            for (const chunk of chunks) {
+                yield Promise.all(chunk);
             }
             log.info(`📊 复制统计: ${copiedCount} 个文件复制完成, ${skippedCount} 个文件跳过`);
         });
     }
+    chunkArray(array, chunkSize) {
+        const chunks = [];
+        for (let i = 0; i < array.length; i += chunkSize) {
+            chunks.push(array.slice(i, i + chunkSize));
+        }
+        return chunks;
+    }
     getBuiltinTemplates() {
         const templates = {};
         for (const [key, template] of Object.entries(BUILTIN_TEMPLATES)) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.9.4",
+    "version": "2.9.6",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -53,7 +53,7 @@
         "@cloudbase/functions-framework": "1.16.0",
         "@cloudbase/iac-core": "0.0.3-alpha.11",
         "@cloudbase/lowcode-cli": "^0.22.2",
-        "@cloudbase/manager-node": "4.6.1",
+        "@cloudbase/manager-node": "4.6.3",
         "@cloudbase/toolbox": "^0.7.9",
         "@dotenvx/dotenvx": "^1.48.3",
         "@musistudio/claude-code-router": "1.0.36",

package/types/utils/template-manager.d.ts

@@ -12,12 +12,14 @@ export declare class TemplateManager {
     private isGitUrl;
     private parseGitUrl;
     private buildGitUrl;
+    private cloneWithSubpathOptimized;
     private cloneWithSubpath;
     private downloadBuiltinTemplateToTemp;
     private downloadGitTemplateToTemp;
     private copyFromTempToTarget;
     private copyFilesWithOverwrite;
     private copyFilesSkipExisting;
+    private chunkArray;
     getBuiltinTemplates(): Record<string, string>;
 }
 export {};