@cloudbase/cli 2.6.11 → 2.6.13

package/lib/commands/cloudfunction/base.js

@@ -24,81 +24,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CloudFunctionRunCommand = exports.CloudFunctionDownloadCommand = exports.CloudFunctionDeployCommand = exports.CloudFunctionListCommand = void 0;
+exports.CloudFunctionRunCommand = exports.CloudFunctionDownloadCommand = exports.CloudFunctionDeployCommand = void 0;
 const functions_framework_1 = require("@cloudbase/functions-framework");
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const camelcase_keys_1 = __importDefault(require("camelcase-keys"));
 const iac_core_1 = require("@cloudbase/iac-core");
+const camelcase_keys_1 = __importDefault(require("camelcase-keys"));
 const inquirer_1 = __importDefault(require("inquirer"));
+const nodemon_1 = __importDefault(require("nodemon"));
 const path_1 = __importDefault(require("path"));
 const decorators_1 = require("../../decorators");
-const utils_1 = require("../../utils");
 const common_1 = require("../common");
 const constants_1 = require("../constants");
-const utils_2 = require("../utils");
-const nodemon_1 = __importDefault(require("nodemon"));
-const { CloudAPI } = iac_core_1.CloudAPI;
-const scfService = utils_1.CloudApiService.getInstance('tcb');
-class CloudFunctionListCommand extends common_1.Command {
-    get options() {
-        return {
-            cmd: 'cloudfunction',
-            childCmd: 'list',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                }
-            ],
-            requiredEnvId: false,
-            autoRunLogin: true,
-            desc: '查看函数式托管服务列表'
-        };
-    }
-    execute(envId, log) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const loading = (0, utils_1.loadingFactory)();
-            if (!envId) {
-                envId = yield _selectEnv();
-            }
-            else {
-                log.info(`当前环境 Id：${envId}`);
-            }
-            try {
-                loading.start('获取函数式托管服务列表中…');
-                let serverListRes = yield scfService
-                    .request('DescribeCloudBaseRunServers', {
-                    EnvId: envId,
-                    Limit: 100,
-                    Offset: 0
-                })
-                    .finally(() => loading.stop());
-                const serverList = (_a = serverListRes.CloudBaseRunServerSet) === null || _a === void 0 ? void 0 : _a.filter((item) => item.Tag === 'function');
-                const head = ['服务名称', '状态', '创建时间', '更新时间'];
-                const tableData = serverList.map((serverItem) => [
-                    serverItem.ServerName,
-                    serverItem.Status,
-                    serverItem.CreatedTime,
-                    serverItem.UpdatedTime
-                ]);
-                (0, utils_1.printHorizontalTable)(head, tableData);
-            }
-            catch (e) {
-                log.error('获取函数式托管服务列表失败：' + e.message);
-            }
-        });
-    }
-}
-__decorate([
-    (0, decorators_1.InjectParams)(),
-    __param(0, (0, decorators_1.EnvId)()),
-    __param(1, (0, decorators_1.Log)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, decorators_1.Logger]),
-    __metadata("design:returntype", Promise)
-], CloudFunctionListCommand.prototype, "execute", null);
-exports.CloudFunctionListCommand = CloudFunctionListCommand;
+const utils_1 = require("../utils");
 let CloudFunctionDeployCommand = class CloudFunctionDeployCommand extends common_1.Command {
     get options() {
         return {
@@ -141,7 +77,7 @@ let CloudFunctionDeployCommand = class CloudFunctionDeployCommand extends common
                 log.info(`当前环境 Id：${envId}`);
             }
             if (!serviceName) {
-                const { shortName } = yield (0, utils_2.getPackageJsonName)(path_1.default.join(targetDir, 'package.json'));
+                const { shortName } = yield (0, utils_1.getPackageJsonName)(path_1.default.join(targetDir, 'package.json'));
                 serviceName = yield _inputServiceName(shortName);
             }
             const answers = yield inquirer_1.default.prompt([
@@ -158,7 +94,7 @@ let CloudFunctionDeployCommand = class CloudFunctionDeployCommand extends common
             yield iac_core_1.IAC.init({
                 cwd: targetDir,
                 getCredential: () => {
-                    return getCredential(ctx, options);
+                    return (0, utils_1.getCredential)(ctx, options);
                 },
                 polyRepoMode: true
             });
@@ -167,25 +103,25 @@ let CloudFunctionDeployCommand = class CloudFunctionDeployCommand extends common
                 var _a;
                 return __awaiter(this, void 0, void 0, function* () {
                     try {
-                        const res = yield iac_core_1.IAC.Function.apply({
+                        yield iac_core_1.IAC.Function.apply({
                             cwd: targetDir,
                             envId: envId,
                             name: serviceName
                         }, function (message) {
-                            trackCallback(message, log);
+                            (0, utils_1.trackCallback)(message, log);
                         });
                     }
                     catch (e) {
                         if ((e === null || e === void 0 ? void 0 : e.action) === 'UpdateFunctionConfiguration' &&
                             ((_a = e === null || e === void 0 ? void 0 : e.message) === null || _a === void 0 ? void 0 : _a.includes('当前函数处于Updating状态，无法进行此操作，请稍后重试'))) {
-                            trackCallback({
+                            (0, utils_1.trackCallback)({
                                 type: 'error',
                                 details: '当前函数处于更新状态，无法进行此操作，请稍后重试',
                                 originalError: e
                             }, log);
                         }
                         else {
-                            trackCallback({
+                            (0, utils_1.trackCallback)({
                                 type: 'error',
                                 details: `${e.message}`,
                                 originalError: e
@@ -247,13 +183,13 @@ let CloudFunctionDownloadCommand = class CloudFunctionDownloadCommand extends co
                 log.info(`当前环境 Id：${envId}`);
             }
             if (!serviceName) {
-                const { shortName } = yield (0, utils_2.getPackageJsonName)(path_1.default.join(targetDir, 'package.json'));
+                const { shortName } = yield (0, utils_1.getPackageJsonName)(path_1.default.join(targetDir, 'package.json'));
                 serviceName = yield _inputServiceName(shortName);
                 if (serviceName !== shortName) {
                     targetDir = path_1.default.join(targetDir, serviceName);
                 }
             }
-            const needTips = !(yield isDirectoryEmptyOrNotExists(targetDir));
+            const needTips = !(yield (0, utils_1.isDirectoryEmptyOrNotExists)(targetDir));
             if (needTips) {
                 const answers = yield inquirer_1.default.prompt([
                     {
@@ -270,7 +206,7 @@ let CloudFunctionDownloadCommand = class CloudFunctionDownloadCommand extends co
             yield iac_core_1.IAC.init({
                 cwd: targetDir,
                 getCredential: () => {
-                    return getCredential(ctx, options);
+                    return (0, utils_1.getCredential)(ctx, options);
                 },
                 polyRepoMode: true
             });
@@ -280,11 +216,11 @@ let CloudFunctionDownloadCommand = class CloudFunctionDownloadCommand extends co
                     envId: envId,
                     name: serviceName
                 }, function (message) {
-                    trackCallback(message, log);
+                    (0, utils_1.trackCallback)(message, log);
                 });
             }
             catch (e) {
-                trackCallback({
+                (0, utils_1.trackCallback)({
                     type: 'error',
                     details: `${e.message}`,
                     originalError: e
@@ -339,7 +275,7 @@ let CloudFunctionRunCommand = class CloudFunctionRunCommand extends common_1.Com
             const watchFlag = ['--watch', '-w'];
             const defaultIgnoreFiles = ['logs/*.*'];
             const envConfig = (0, camelcase_keys_1.default)(yield iac_core_1.utils.loadEnv(process.cwd()));
-            const credential = yield getCredential(ctx, options);
+            const credential = yield (0, utils_1.getCredential)(ctx, options);
             process.env.TCB_ENV = envConfig.envId;
             process.env.TENCENTCLOUD_SECRETID = credential.secretId;
             process.env.TENCENTCLOUD_SECRETKEY = credential.secretKey;
@@ -400,7 +336,7 @@ CloudFunctionRunCommand = __decorate([
 exports.CloudFunctionRunCommand = CloudFunctionRunCommand;
 function _selectEnv() {
     return __awaiter(this, void 0, void 0, function* () {
-        return (0, utils_2.selectEnv)({ source: [constants_1.EnvSource.MINIAPP, constants_1.EnvSource.QCLOUD] });
+        return (0, utils_1.selectEnv)({ source: [constants_1.EnvSource.MINIAPP, constants_1.EnvSource.QCLOUD] });
     });
 }
 function _inputServiceName(defaultVal = '') {
@@ -425,40 +361,3 @@ function _inputServiceName(defaultVal = '') {
         return answers['serviceName'];
     });
 }
-function getCredential(ctx, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let credential;
-        if (ctx.hasPrivateSettings) {
-            process.env.IS_PRIVATE = 'true';
-            const privateSettings = (0, utils_1.getPrivateSettings)(ctx.config, options.cmd);
-            credential = privateSettings === null || privateSettings === void 0 ? void 0 : privateSettings.credential;
-        }
-        else {
-            credential = yield utils_1.authSupevisor.getLoginState();
-        }
-        return credential;
-    });
-}
-function isDirectoryEmptyOrNotExists(dirPath) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const exists = yield fs_extra_1.default.pathExists(dirPath);
-            if (!exists) {
-                return true;
-            }
-            const files = yield fs_extra_1.default.readdir(dirPath);
-            return files.length === 0;
-        }
-        catch (error) {
-            return true;
-        }
-    });
-}
-function trackCallback(message, log) {
-    if (message.type === 'error') {
-        log.error(message.details);
-    }
-    else {
-        log.info(message.details);
-    }
-}

package/lib/commands/cloudrun/base.js

@@ -0,0 +1,206 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CloudRunDeployCommand = void 0;
+const camelcase_keys_1 = __importDefault(require("camelcase-keys"));
+const iac_core_1 = require("@cloudbase/iac-core");
+const inquirer_1 = __importDefault(require("inquirer"));
+const path_1 = __importDefault(require("path"));
+const decorators_1 = require("../../decorators");
+const common_1 = require("../common");
+const constants_1 = require("../constants");
+const utils_1 = require("../utils");
+const { CloudAPI } = iac_core_1.CloudAPI;
+let CloudRunDeployCommand = class CloudRunDeployCommand extends common_1.Command {
+    get options() {
+        return {
+            cmd: 'cloudrun',
+            childCmd: 'deploy',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                {
+                    flags: '-s, --serviceName <serviceName>',
+                    desc: '服务名称'
+                },
+                {
+                    flags: '--source <source>',
+                    desc: '目标云托管代码文件所在目录路径。默认为当前路径'
+                }
+            ],
+            requiredEnvId: false,
+            autoRunLogin: true,
+            desc: '部署云托管服务'
+        };
+    }
+    execute(ctx, envId, log, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let { serviceName, source } = options;
+            const targetDir = path_1.default.resolve(source || process.cwd());
+            if (!envId) {
+                const envConfig = (0, camelcase_keys_1.default)(yield iac_core_1.utils.loadEnv(targetDir));
+                if (envConfig.envId) {
+                    envId = envConfig.envId;
+                    log.info(`当前环境 Id：${envId}`);
+                }
+                else {
+                    envId = yield _selectEnv();
+                }
+            }
+            else {
+                log.info(`当前环境 Id：${envId}`);
+            }
+            if (!serviceName) {
+                const { shortName } = yield (0, utils_1.getPackageJsonName)(path_1.default.join(targetDir, 'package.json'));
+                serviceName = yield _inputServiceName(shortName);
+            }
+            const answers = yield inquirer_1.default.prompt([
+                {
+                    type: 'confirm',
+                    name: 'confirm',
+                    message: `即将开始部署，是否确认继续？`,
+                    default: true
+                }
+            ]);
+            if (!answers.confirm) {
+                return;
+            }
+            yield iac_core_1.IAC.init({
+                cwd: targetDir,
+                getCredential: () => {
+                    return (0, utils_1.getCredential)(ctx, options);
+                },
+                polyRepoMode: true
+            });
+            yield _runDeploy();
+            function _runDeploy() {
+                return __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const res = yield iac_core_1.IAC.Cloudrun.apply({
+                            cwd: targetDir,
+                            envId: envId,
+                            name: serviceName
+                        }, function (message) {
+                            (0, utils_1.trackCallback)(message, log);
+                        });
+                        const { envId: _envId, name, resourceType: _resourceType } = res === null || res === void 0 ? void 0 : res.data;
+                        (0, utils_1.trackCallback)({
+                            details: `请打开链接查看部署状态: https://tcb.cloud.tencent.com/dev?envId=${_envId}#/platform-run/service/detail?serverName=${name}&tabId=deploy&envId=${_envId}`
+                        }, log);
+                    }
+                    catch (e) {
+                        if ((e === null || e === void 0 ? void 0 : e.action) === 'UpdateCloudRunServer' && (e === null || e === void 0 ? void 0 : e.code) === 'ResourceInUse') {
+                            inquirer_1.default
+                                .prompt([
+                                {
+                                    type: 'confirm',
+                                    name: 'confirm',
+                                    message: `平台当前有部署发布任务正在运行中。确认继续部署，正在执行的部署任务将被取消，并立即部署最新的代码`,
+                                    default: true
+                                }
+                            ])
+                                .then((answers) => __awaiter(this, void 0, void 0, function* () {
+                                if (answers.confirm) {
+                                    try {
+                                        const { task } = yield CloudAPI.tcbrServiceRequest('DescribeServerManageTask', {
+                                            envId,
+                                            serverName: serviceName,
+                                            taskId: 0
+                                        });
+                                        const id = task === null || task === void 0 ? void 0 : task.id;
+                                        yield CloudAPI.tcbrServiceRequest('OperateServerManage', {
+                                            envId,
+                                            operateType: 'cancel',
+                                            serverName: serviceName,
+                                            taskId: id
+                                        });
+                                        yield _runDeploy();
+                                    }
+                                    catch (e) {
+                                        (0, utils_1.trackCallback)({
+                                            type: 'error',
+                                            details: e.message
+                                        }, log);
+                                    }
+                                }
+                            }));
+                        }
+                        else {
+                            (0, utils_1.trackCallback)({
+                                type: 'error',
+                                details: `${e.message}`,
+                                originalError: e
+                            }, log);
+                        }
+                    }
+                });
+            }
+        });
+    }
+};
+__decorate([
+    (0, decorators_1.InjectParams)(),
+    __param(0, (0, decorators_1.CmdContext)()),
+    __param(1, (0, decorators_1.EnvId)()),
+    __param(2, (0, decorators_1.Log)()),
+    __param(3, (0, decorators_1.ArgsOptions)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Object, decorators_1.Logger, Object]),
+    __metadata("design:returntype", Promise)
+], CloudRunDeployCommand.prototype, "execute", null);
+CloudRunDeployCommand = __decorate([
+    (0, common_1.ICommand)()
+], CloudRunDeployCommand);
+exports.CloudRunDeployCommand = CloudRunDeployCommand;
+function _selectEnv() {
+    return __awaiter(this, void 0, void 0, function* () {
+        return (0, utils_1.selectEnv)({ source: [constants_1.EnvSource.MINIAPP, constants_1.EnvSource.QCLOUD] });
+    });
+}
+function _inputServiceName(defaultVal = '') {
+    return __awaiter(this, void 0, void 0, function* () {
+        const questions = [
+            {
+                type: 'input',
+                name: 'serviceName',
+                message: '请输入服务名称',
+                default: defaultVal,
+                validate: (val) => {
+                    const isValid = !val.startsWith('lcap') &&
+                        !val.startsWith('lowcode') &&
+                        /^[A-Za-z][\w-_]{0,43}[A-Za-z0-9]$/.test(val);
+                    return isValid
+                        ? true
+                        : '支持大小写字母、数字、-和_，但必须以字母开头、以字母和数字结尾，不支持以lcap、lowcode开头，最长45个字符';
+                }
+            }
+        ];
+        const answers = yield inquirer_1.default.prompt(questions);
+        return answers['serviceName'];
+    });
+}

package/lib/commands/cloudrun/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./base"), exports);

package/lib/commands/index.js

@@ -31,3 +31,4 @@ __exportStar(require("./db"), exports);
 __exportStar(require("./fun"), exports);
 __exportStar(require("./runf"), exports);
 __exportStar(require("./cloudfunction"), exports);
+__exportStar(require("./cloudrun"), exports);

package/lib/commands/runf/base.js

@@ -24,81 +24,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RunfRunCommand = exports.RunfDownloadCommand = exports.RunfDeployCommand = exports.RunfListCommand = void 0;
+exports.RunfRunCommand = exports.RunfDownloadCommand = exports.RunfDeployCommand = void 0;
 const functions_framework_1 = require("@cloudbase/functions-framework");
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const camelcase_keys_1 = __importDefault(require("camelcase-keys"));
 const iac_core_1 = require("@cloudbase/iac-core");
+const camelcase_keys_1 = __importDefault(require("camelcase-keys"));
 const inquirer_1 = __importDefault(require("inquirer"));
+const nodemon_1 = __importDefault(require("nodemon"));
 const path_1 = __importDefault(require("path"));
 const decorators_1 = require("../../decorators");
-const utils_1 = require("../../utils");
 const common_1 = require("../common");
 const constants_1 = require("../constants");
-const utils_2 = require("../utils");
-const nodemon_1 = __importDefault(require("nodemon"));
+const utils_1 = require("../utils");
 const { CloudAPI } = iac_core_1.CloudAPI;
-const scfService = utils_1.CloudApiService.getInstance('tcb');
-class RunfListCommand extends common_1.Command {
-    get options() {
-        return {
-            cmd: 'cloudrunfunction',
-            childCmd: 'list',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                }
-            ],
-            requiredEnvId: false,
-            autoRunLogin: true,
-            desc: '查看函数式托管服务列表'
-        };
-    }
-    execute(envId, log) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const loading = (0, utils_1.loadingFactory)();
-            if (!envId) {
-                envId = yield _selectEnv();
-            }
-            else {
-                log.info(`当前环境 Id：${envId}`);
-            }
-            try {
-                loading.start('获取函数式托管服务列表中…');
-                let serverListRes = yield scfService
-                    .request('DescribeCloudBaseRunServers', {
-                    EnvId: envId,
-                    Limit: 100,
-                    Offset: 0
-                })
-                    .finally(() => loading.stop());
-                const serverList = (_a = serverListRes.CloudBaseRunServerSet) === null || _a === void 0 ? void 0 : _a.filter((item) => item.Tag === 'function');
-                const head = ['服务名称', '状态', '创建时间', '更新时间'];
-                const tableData = serverList.map((serverItem) => [
-                    serverItem.ServerName,
-                    serverItem.Status,
-                    serverItem.CreatedTime,
-                    serverItem.UpdatedTime
-                ]);
-                (0, utils_1.printHorizontalTable)(head, tableData);
-            }
-            catch (e) {
-                log.error('获取函数式托管服务列表失败：' + e.message);
-            }
-        });
-    }
-}
-__decorate([
-    (0, decorators_1.InjectParams)(),
-    __param(0, (0, decorators_1.EnvId)()),
-    __param(1, (0, decorators_1.Log)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, decorators_1.Logger]),
-    __metadata("design:returntype", Promise)
-], RunfListCommand.prototype, "execute", null);
-exports.RunfListCommand = RunfListCommand;
 let RunfDeployCommand = class RunfDeployCommand extends common_1.Command {
     get options() {
         return {
@@ -141,7 +78,7 @@ let RunfDeployCommand = class RunfDeployCommand extends common_1.Command {
                 log.info(`当前环境 Id：${envId}`);
             }
             if (!serviceName) {
-                const { shortName } = yield (0, utils_2.getPackageJsonName)(path_1.default.join(targetDir, 'package.json'));
+                const { shortName } = yield (0, utils_1.getPackageJsonName)(path_1.default.join(targetDir, 'package.json'));
                 serviceName = yield _inputServiceName(shortName);
             }
             const answers = yield inquirer_1.default.prompt([
@@ -158,7 +95,7 @@ let RunfDeployCommand = class RunfDeployCommand extends common_1.Command {
             yield iac_core_1.IAC.init({
                 cwd: targetDir,
                 getCredential: () => {
-                    return getCredential(ctx, options);
+                    return (0, utils_1.getCredential)(ctx, options);
                 },
                 polyRepoMode: true
             });
@@ -171,10 +108,10 @@ let RunfDeployCommand = class RunfDeployCommand extends common_1.Command {
                             envId: envId,
                             name: serviceName
                         }, function (message) {
-                            trackCallback(message, log);
+                            (0, utils_1.trackCallback)(message, log);
                         });
                         const { envId: _envId, name, resourceType: _resourceType } = res === null || res === void 0 ? void 0 : res.data;
-                        trackCallback({
+                        (0, utils_1.trackCallback)({
                             details: `请打开链接查看部署状态: https://tcb.cloud.tencent.com/dev?envId=${_envId}#/platform-run/service/detail?serverName=${name}&tabId=deploy&envId=${_envId}`
                         }, log);
                     }
@@ -207,7 +144,7 @@ let RunfDeployCommand = class RunfDeployCommand extends common_1.Command {
                                         yield _runDeploy();
                                     }
                                     catch (e) {
-                                        trackCallback({
+                                        (0, utils_1.trackCallback)({
                                             type: 'error',
                                             details: e.message
                                         }, log);
@@ -216,7 +153,7 @@ let RunfDeployCommand = class RunfDeployCommand extends common_1.Command {
                             }));
                         }
                         else {
-                            trackCallback({
+                            (0, utils_1.trackCallback)({
                                 type: 'error',
                                 details: `${e.message}`,
                                 originalError: e
@@ -278,13 +215,13 @@ let RunfDownloadCommand = class RunfDownloadCommand extends common_1.Command {
                 log.info(`当前环境 Id：${envId}`);
             }
             if (!serviceName) {
-                const { shortName } = yield (0, utils_2.getPackageJsonName)(path_1.default.join(targetDir, 'package.json'));
+                const { shortName } = yield (0, utils_1.getPackageJsonName)(path_1.default.join(targetDir, 'package.json'));
                 serviceName = yield _inputServiceName(shortName);
                 if (serviceName !== shortName) {
                     targetDir = path_1.default.join(targetDir, serviceName);
                 }
             }
-            const needTips = !(yield isDirectoryEmptyOrNotExists(targetDir));
+            const needTips = !(yield (0, utils_1.isDirectoryEmptyOrNotExists)(targetDir));
             if (needTips) {
                 const answers = yield inquirer_1.default.prompt([
                     {
@@ -301,7 +238,7 @@ let RunfDownloadCommand = class RunfDownloadCommand extends common_1.Command {
             yield iac_core_1.IAC.init({
                 cwd: targetDir,
                 getCredential: () => {
-                    return getCredential(ctx, options);
+                    return (0, utils_1.getCredential)(ctx, options);
                 },
                 polyRepoMode: true
             });
@@ -311,11 +248,11 @@ let RunfDownloadCommand = class RunfDownloadCommand extends common_1.Command {
                     envId: envId,
                     name: serviceName
                 }, function (message) {
-                    trackCallback(message, log);
+                    (0, utils_1.trackCallback)(message, log);
                 });
             }
             catch (e) {
-                trackCallback({
+                (0, utils_1.trackCallback)({
                     type: 'error',
                     details: `${e.message}`,
                     originalError: e
@@ -413,7 +350,7 @@ let RunfRunCommand = class RunfRunCommand extends common_1.Command {
             const watchFlag = ['--watch', '-w'];
             const defaultIgnoreFiles = ['logs/*.*'];
             const envConfig = (0, camelcase_keys_1.default)(yield iac_core_1.utils.loadEnv(process.cwd()));
-            const credential = yield getCredential(ctx, options);
+            const credential = yield (0, utils_1.getCredential)(ctx, options);
             process.env.EXTENDED_CONTEXT = JSON.stringify({
                 tmpSecret: {
                     secretId: credential.secretId,
@@ -478,7 +415,7 @@ RunfRunCommand = __decorate([
 exports.RunfRunCommand = RunfRunCommand;
 function _selectEnv() {
     return __awaiter(this, void 0, void 0, function* () {
-        return (0, utils_2.selectEnv)({ source: [constants_1.EnvSource.MINIAPP, constants_1.EnvSource.QCLOUD] });
+        return (0, utils_1.selectEnv)({ source: [constants_1.EnvSource.MINIAPP, constants_1.EnvSource.QCLOUD] });
     });
 }
 function _inputServiceName(defaultVal = '') {
@@ -503,40 +440,3 @@ function _inputServiceName(defaultVal = '') {
         return answers['serviceName'];
     });
 }
-function getCredential(ctx, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let credential;
-        if (ctx.hasPrivateSettings) {
-            process.env.IS_PRIVATE = 'true';
-            const privateSettings = (0, utils_1.getPrivateSettings)(ctx.config, options.cmd);
-            credential = privateSettings === null || privateSettings === void 0 ? void 0 : privateSettings.credential;
-        }
-        else {
-            credential = yield utils_1.authSupevisor.getLoginState();
-        }
-        return credential;
-    });
-}
-function isDirectoryEmptyOrNotExists(dirPath) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const exists = yield fs_extra_1.default.pathExists(dirPath);
-            if (!exists) {
-                return true;
-            }
-            const files = yield fs_extra_1.default.readdir(dirPath);
-            return files.length === 0;
-        }
-        catch (error) {
-            return true;
-        }
-    });
-}
-function trackCallback(message, log) {
-    if (message.type === 'error') {
-        log.error(message.details);
-    }
-    else {
-        log.info(message.details);
-    }
-}

package/lib/commands/utils.js

@@ -12,13 +12,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPackageJsonName = exports.selectEnv = void 0;
+exports.getCredential = exports.trackCallback = exports.isDirectoryEmptyOrNotExists = exports.getPackageJsonName = exports.selectEnv = void 0;
+const fs_1 = require("@cloudbase/iac-core/lib/src/fs");
+const fs_extra_1 = require("fs-extra");
+const inquirer_1 = __importDefault(require("inquirer"));
 const lodash_1 = require("lodash");
 const env_1 = require("../env");
-const constants_1 = require("./constants");
-const inquirer_1 = __importDefault(require("inquirer"));
 const utils_1 = require("../utils");
-const fs_1 = require("@cloudbase/iac-core/lib/src/fs");
+const constants_1 = require("./constants");
 function selectEnv(options = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         const loading = (0, utils_1.loadingFactory)();
@@ -59,3 +60,43 @@ function getPackageJsonName(pkgPath) {
     });
 }
 exports.getPackageJsonName = getPackageJsonName;
+function isDirectoryEmptyOrNotExists(dirPath) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const exists = yield (0, fs_extra_1.pathExists)(dirPath);
+            if (!exists) {
+                return true;
+            }
+            const files = yield (0, fs_extra_1.readdir)(dirPath);
+            return files.length === 0;
+        }
+        catch (error) {
+            return true;
+        }
+    });
+}
+exports.isDirectoryEmptyOrNotExists = isDirectoryEmptyOrNotExists;
+function trackCallback(message, log) {
+    if (message.type === 'error') {
+        log.error(message.details);
+    }
+    else {
+        log.info(message.details);
+    }
+}
+exports.trackCallback = trackCallback;
+function getCredential(ctx, options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let credential;
+        if (ctx.hasPrivateSettings) {
+            process.env.IS_PRIVATE = 'true';
+            const privateSettings = (0, utils_1.getPrivateSettings)(ctx.config, options.cmd);
+            credential = privateSettings === null || privateSettings === void 0 ? void 0 : privateSettings.credential;
+        }
+        else {
+            credential = yield utils_1.authSupevisor.getLoginState();
+        }
+        return credential;
+    });
+}
+exports.getCredential = getCredential;

package/lib/help.js

@@ -21,6 +21,7 @@ const outputHelpInfo = () => {
     service           [cmd]                      HTTP 访问服务管理操作
     run:deprecated    [cmd]                      云托管环境管理操作 (BAAS 或 RUN 类型环境)
     run               [cmd]                      云托管环境管理操作 (TCBR 类型环境)
+    cloudrun          [cmd]                      云托管服务管理操作（新版云开发平台）
     cloudrunfunction  [cmd]                      云函数 2.0 服务管理操作`;
     const options = `
   选项

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.6.11",
+    "version": "2.6.13",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -34,8 +34,8 @@
         "@cloudbase/cloud-api": "^0.5.5",
         "@cloudbase/framework-core": "^1.9.7",
         "@cloudbase/functions-framework": "^1.5.0",
-        "@cloudbase/iac-core": "^0.0.3-alpha.6",
-        "@cloudbase/lowcode-cli": "^0.22.0",
+        "@cloudbase/iac-core": "^0.0.3-alpha.8",
+        "@cloudbase/lowcode-cli": "^0.22.2",
         "@cloudbase/manager-node": "4.2.8",
         "@cloudbase/toolbox": "^0.7.5",
         "@sentry/node": "^5.10.2",

package/types/commands/cloudfunction/base.d.ts

@@ -1,19 +1,5 @@
 import { Logger } from '../../decorators';
 import { Command } from '../common';
-export declare class CloudFunctionListCommand extends Command {
-    get options(): {
-        cmd: string;
-        childCmd: string;
-        options: {
-            flags: string;
-            desc: string;
-        }[];
-        requiredEnvId: boolean;
-        autoRunLogin: boolean;
-        desc: string;
-    };
-    execute(envId: any, log: Logger): Promise<void>;
-}
 export declare class CloudFunctionDeployCommand extends Command {
     get options(): {
         cmd: string;

package/types/commands/cloudrun/base.d.ts

@@ -0,0 +1,16 @@
+import { Logger } from '../../decorators';
+import { Command } from '../common';
+export declare class CloudRunDeployCommand extends Command {
+    get options(): {
+        cmd: string;
+        childCmd: string;
+        options: {
+            flags: string;
+            desc: string;
+        }[];
+        requiredEnvId: boolean;
+        autoRunLogin: boolean;
+        desc: string;
+    };
+    execute(ctx: any, envId: any, log: Logger, options: any): Promise<void>;
+}

package/types/commands/cloudrun/index.d.ts

@@ -0,0 +1 @@
+export * from './base';

package/types/commands/index.d.ts

@@ -15,3 +15,4 @@ export * from './db';
 export * from './fun';
 export * from './runf';
 export * from './cloudfunction';
+export * from './cloudrun';

package/types/commands/runf/base.d.ts

@@ -1,19 +1,5 @@
 import { Logger } from '../../decorators';
 import { Command } from '../common';
-export declare class RunfListCommand extends Command {
-    get options(): {
-        cmd: string;
-        childCmd: string;
-        options: {
-            flags: string;
-            desc: string;
-        }[];
-        requiredEnvId: boolean;
-        autoRunLogin: boolean;
-        desc: string;
-    };
-    execute(envId: any, log: Logger): Promise<void>;
-}
 export declare class RunfDeployCommand extends Command {
     get options(): {
         cmd: string;

package/types/commands/utils.d.ts

@@ -1,3 +1,4 @@
+import { Logger } from '../decorators';
 export declare function selectEnv(options?: {
     source?: string[];
 }): Promise<string>;
@@ -5,3 +6,6 @@ export declare function getPackageJsonName(pkgPath: string): Promise<{
     fullName: any;
     shortName: any;
 }>;
+export declare function isDirectoryEmptyOrNotExists(dirPath: string): Promise<boolean>;
+export declare function trackCallback(message: any, log: Logger): void;
+export declare function getCredential(ctx: any, options: any): Promise<any>;