@cloudbase/cli 2.10.0-beta.0 → 2.11.0-beta.0

package/lib/commands/lowcode/utils.js

@@ -22,15 +22,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-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 _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMergedOptions = exports.getCmdConfig = exports.getLowcodeCli = exports.promisifyProcess = void 0;
 const lodash_1 = require("lodash");
@@ -58,19 +50,16 @@ function promisifyProcess(p, pipe = false) {
     });
 }
 exports.promisifyProcess = promisifyProcess;
-function getLowcodeCli() {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const key = '@cloudbase/lowcode-cli';
-        const cache = new Map();
-        let result;
-        if (!cache.get(key)) {
-            const module = yield (_a = key, Promise.resolve().then(() => __importStar(require(_a))));
-            cache.set(key, module);
-        }
-        result = cache.get(key);
-        return result;
-    });
+async function getLowcodeCli() {
+    const key = '@cloudbase/lowcode-cli';
+    const cache = new Map();
+    let result;
+    if (!cache.get(key)) {
+        const module = await (_a = key, Promise.resolve().then(() => __importStar(require(_a))));
+        cache.set(key, module);
+    }
+    result = cache.get(key);
+    return result;
 }
 exports.getLowcodeCli = getLowcodeCli;
 function getCmdConfig(config, options) {

package/lib/commands/pull/pull.js

@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PullCommand = void 0;
 const common_1 = require("../common");
@@ -51,45 +42,41 @@ let PullCommand = class PullCommand extends common_1.Command {
             withoutAuth: true
         };
     }
-    execute(options, params, log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { output, force, source } = options;
-            if (process.argv[3] === 'list') {
-                const templateManager = new template_manager_1.TemplateManager();
-                yield this.showTemplateList(templateManager, log);
-                return;
-            }
-            if (!source || typeof source !== 'string') {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('请指定要拉取的模板来源'));
-            }
-            try {
-                const templateManager = new template_manager_1.TemplateManager();
-                yield templateManager.pullTemplate(source, { output, force }, log);
-                log.info((0, i18n_1.t)('🎉 模板拉取完成！'));
-                if (output) {
-                    log.info((0, i18n_1.t)('📁 项目已创建在: {{output}}', { output }));
-                }
-            }
-            catch (error) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('拉取模板失败: {{message}}', { message: error.message }), { original: error });
+    async execute(options, params, log) {
+        const { output, force, source } = options;
+        if (process.argv[3] === 'list') {
+            const templateManager = new template_manager_1.TemplateManager();
+            await this.showTemplateList(templateManager, log);
+            return;
+        }
+        if (!source || typeof source !== 'string') {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('请指定要拉取的模板来源'));
+        }
+        try {
+            const templateManager = new template_manager_1.TemplateManager();
+            await templateManager.pullTemplate(source, { output, force }, log);
+            log.info((0, i18n_1.t)('🎉 模板拉取完成！'));
+            if (output) {
+                log.info((0, i18n_1.t)('📁 项目已创建在: {{output}}', { output }));
             }
-        });
+        }
+        catch (error) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('拉取模板失败: {{message}}', { message: error.message }), { original: error });
+        }
     }
-    showTemplateList(templateManager, log) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const templates = templateManager.getBuiltinTemplates();
-            log.info((0, i18n_1.t)('📋 可用的内置模板:'));
-            for (const [key, name] of Object.entries(templates)) {
-                log.info(`  ${key.padEnd(12)} - ${name}`);
-            }
-            log.info((0, i18n_1.t)('\n🌐 支持的 Git 仓库格式:'));
-            log.info('  GitHub: https://github.com/user/repo');
-            log.info('  Gitee:  https://gitee.com/user/repo');
-            log.info('  CNB:    https://cnb.cool/user/repo');
-            log.info('  SSH:    git@github.com:user/repo.git');
-            log.info((0, i18n_1.t)('\n📁 支持 Git 子目录:'));
-            log.info('  https://github.com/user/repo/tree/main/src/templates');
-        });
+    async showTemplateList(templateManager, log) {
+        const templates = templateManager.getBuiltinTemplates();
+        log.info((0, i18n_1.t)('📋 可用的内置模板:'));
+        for (const [key, name] of Object.entries(templates)) {
+            log.info(`  ${key.padEnd(12)} - ${name}`);
+        }
+        log.info((0, i18n_1.t)('\n🌐 支持的 Git 仓库格式:'));
+        log.info('  GitHub: https://github.com/user/repo');
+        log.info('  Gitee:  https://gitee.com/user/repo');
+        log.info('  CNB:    https://cnb.cool/user/repo');
+        log.info('  SSH:    git@github.com:user/repo.git');
+        log.info((0, i18n_1.t)('\n📁 支持 Git 子目录:'));
+        log.info('  https://github.com/user/repo/tree/main/src/templates');
     }
 };
 __decorate([

package/lib/commands/run/delete.js

@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeleteRun = void 0;
 const enquirer_1 = require("enquirer");
@@ -47,45 +38,43 @@ let DeleteRun = class DeleteRun extends common_1.Command {
             desc: (0, i18n_1.t)('删除云托管服务')
         };
     }
-    execute(envId, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let envCheckType = yield (0, utils_1.checkTcbrEnv)(options.envId, false);
-            if (envCheckType !== 0) {
-                (0, utils_1.logEnvCheck)(envId, envCheckType);
-                return;
-            }
-            let { serviceName = '' } = options;
-            if (serviceName.length === 0) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('必须输入服务名'));
+    async execute(envId, options) {
+        let envCheckType = await (0, utils_1.checkTcbrEnv)(options.envId, false);
+        if (envCheckType !== 0) {
+            (0, utils_1.logEnvCheck)(envId, envCheckType);
+            return;
+        }
+        let { serviceName = '' } = options;
+        if (serviceName.length === 0) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('必须输入服务名'));
+        }
+        const loading = (0, utils_1.loadingFactory)();
+        loading.start((0, i18n_1.t)('数据加载中...'));
+        const versions = await (0, run_1.listVersion)({ envId, serverName: serviceName, limit: 1, offset: 0 });
+        if (versions.length > 0)
+            throw new error_1.CloudBaseError((0, i18n_1.t)('服务下还有版本存在，请先清空版本列表'));
+        const imageRepo = await (0, run_1.describeImageRepo)({ envId, serverName: serviceName });
+        loading.start((0, i18n_1.t)('正在删除服务'));
+        const res = await (0, run_1.deleteRun)({ envId, serverName: serviceName });
+        if (res === 'succ')
+            loading.succeed((0, i18n_1.t)('服务删除完成'));
+        else
+            throw new error_1.CloudBaseError((0, i18n_1.t)('服务删除失败'));
+        if ((await (0, enquirer_1.prompt)({
+            type: 'select',
+            name: 'flag',
+            message: (0, i18n_1.t)('是否删除绑定的镜像仓库{{imageRepo}}', { imageRepo }),
+            choices: [(0, i18n_1.t)('是'), (0, i18n_1.t)('否')]
+        })).flag === (0, i18n_1.t)('是')) {
+            loading.start((0, i18n_1.t)('正在删除镜像仓库'));
+            const res = await (0, run_1.deleteImageRepo)({ imageRepo });
+            if (res === '') {
+                loading.succeed((0, i18n_1.t)('仓库删除完成'));
             }
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start((0, i18n_1.t)('数据加载中...'));
-            const versions = yield (0, run_1.listVersion)({ envId, serverName: serviceName, limit: 1, offset: 0 });
-            if (versions.length > 0)
-                throw new error_1.CloudBaseError((0, i18n_1.t)('服务下还有版本存在，请先清空版本列表'));
-            const imageRepo = yield (0, run_1.describeImageRepo)({ envId, serverName: serviceName });
-            loading.start((0, i18n_1.t)('正在删除服务'));
-            const res = yield (0, run_1.deleteRun)({ envId, serverName: serviceName });
-            if (res === 'succ')
-                loading.succeed((0, i18n_1.t)('服务删除完成'));
-            else
-                throw new error_1.CloudBaseError((0, i18n_1.t)('服务删除失败'));
-            if ((yield (0, enquirer_1.prompt)({
-                type: 'select',
-                name: 'flag',
-                message: (0, i18n_1.t)('是否删除绑定的镜像仓库{{imageRepo}}', { imageRepo }),
-                choices: [(0, i18n_1.t)('是'), (0, i18n_1.t)('否')]
-            })).flag === (0, i18n_1.t)('是')) {
-                loading.start((0, i18n_1.t)('正在删除镜像仓库'));
-                const res = yield (0, run_1.deleteImageRepo)({ imageRepo });
-                if (res === '') {
-                    loading.succeed((0, i18n_1.t)('仓库删除完成'));
-                }
-                else {
-                    throw new error_1.CloudBaseError((0, i18n_1.t)('仓库删除失败'));
-                }
+            else {
+                throw new error_1.CloudBaseError((0, i18n_1.t)('仓库删除失败'));
             }
-        });
+        }
     }
 };
 __decorate([

package/lib/commands/run/image/delete.js

@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeleteImage = void 0;
 const common_1 = require("../../common");
@@ -31,7 +22,9 @@ const common_2 = require("./common");
 const i18n_1 = require("../../../i18n");
 let DeleteImage = class DeleteImage extends common_1.Command {
     get options() {
-        return Object.assign(Object.assign({}, (0, common_2.imageCommonOptions)('delete')), { options: [
+        return {
+            ...(0, common_2.imageCommonOptions)('delete'),
+            options: [
                 {
                     flags: '-e, --envId <envId>',
                     desc: (0, i18n_1.t)('环境 Id')
@@ -44,37 +37,37 @@ let DeleteImage = class DeleteImage extends common_1.Command {
                     flags: '-t, --imageTag <imageTag>',
                     desc: (0, i18n_1.t)('镜像 tag')
                 }
-            ], desc: (0, i18n_1.t)('删除云开发环境下云托管服务的版本') });
+            ],
+            desc: (0, i18n_1.t)('删除云开发环境下云托管服务的版本')
+        };
     }
-    execute(envId, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let envCheckType = yield (0, utils_1.checkTcbrEnv)(options.envId, false);
-            if (envCheckType !== 0) {
-                (0, utils_1.logEnvCheck)(envId, envCheckType);
-                return;
-            }
-            let { serviceName = '', imageTag = '' } = options;
-            if (serviceName.length === 0 || imageTag.length === 0) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('必须输入 serviceName 和 imageTag'));
-            }
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start((0, i18n_1.t)('数据加载中...'));
-            const imageRepo = yield (0, run_1.describeImageRepo)({ envId, serverName: serviceName });
-            const imageUrl = `ccr.ccs.tencentyun.com/${imageRepo}:${imageTag}`;
-            try {
-                const res = yield (0, run_1.deleteImage)({
-                    envId,
-                    imageUrl: imageUrl
-                });
-                if (res === 'success')
-                    loading.succeed((0, i18n_1.t)('成功删除 {{serviceName}} 服务下的 {{imageUrl}} 镜像', { serviceName, imageUrl }));
-                else
-                    throw new error_1.CloudBaseError((0, i18n_1.t)('删除失败'));
-            }
-            catch (e) {
+    async execute(envId, options) {
+        let envCheckType = await (0, utils_1.checkTcbrEnv)(options.envId, false);
+        if (envCheckType !== 0) {
+            (0, utils_1.logEnvCheck)(envId, envCheckType);
+            return;
+        }
+        let { serviceName = '', imageTag = '' } = options;
+        if (serviceName.length === 0 || imageTag.length === 0) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('必须输入 serviceName 和 imageTag'));
+        }
+        const loading = (0, utils_1.loadingFactory)();
+        loading.start((0, i18n_1.t)('数据加载中...'));
+        const imageRepo = await (0, run_1.describeImageRepo)({ envId, serverName: serviceName });
+        const imageUrl = `ccr.ccs.tencentyun.com/${imageRepo}:${imageTag}`;
+        try {
+            const res = await (0, run_1.deleteImage)({
+                envId,
+                imageUrl: imageUrl
+            });
+            if (res === 'success')
+                loading.succeed((0, i18n_1.t)('成功删除 {{serviceName}} 服务下的 {{imageUrl}} 镜像', { serviceName, imageUrl }));
+            else
                 throw new error_1.CloudBaseError((0, i18n_1.t)('删除失败'));
-            }
-        });
+        }
+        catch (e) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('删除失败'));
+        }
     }
 };
 __decorate([

package/lib/commands/run/image/download.js

@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DownLoadImage = void 0;
 const child_process_1 = require("child_process");
@@ -32,7 +23,9 @@ const common_2 = require("./common");
 const i18n_1 = require("../../../i18n");
 let DownLoadImage = class DownLoadImage extends common_1.Command {
     get options() {
-        return Object.assign(Object.assign({}, (0, common_2.imageCommonOptions)('download')), { options: [
+        return {
+            ...(0, common_2.imageCommonOptions)('download'),
+            options: [
                 {
                     flags: '-e, --envId <envId>',
                     desc: (0, i18n_1.t)('环境 Id')
@@ -45,31 +38,31 @@ let DownLoadImage = class DownLoadImage extends common_1.Command {
                     flags: '-t, --imageTag <imageTag>',
                     desc: (0, i18n_1.t)('镜像 tag')
                 }
-            ], desc: (0, i18n_1.t)('下载云开发环境下云托管服务的镜像') });
+            ],
+            desc: (0, i18n_1.t)('下载云开发环境下云托管服务的镜像')
+        };
     }
-    execute(envId, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let envCheckType = yield (0, utils_1.checkTcbrEnv)(options.envId, false);
-            if (envCheckType !== 0) {
-                (0, utils_1.logEnvCheck)(envId, envCheckType);
-                return;
-            }
-            let { serviceName = '', imageTag = '' } = options;
-            if (serviceName.length === 0 || imageTag.length === 0) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('必须输入 serviceName 和 imageTag'));
-            }
-            const loading = (0, utils_1.loadingFactory)();
-            const imageRepo = yield (0, run_1.describeImageRepo)({ envId, serverName: serviceName });
-            const imageUrl = `ccr.ccs.tencentyun.com/${imageRepo}:${imageTag}`;
-            if (!(yield (0, run_1.getAuthFlag)())) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('无法找到~/.docker/config.json或未登录，需要执行docker login'));
-            }
-            let sh = new Promise((resolve, reject) => {
-                (0, child_process_1.exec)(`docker pull ${imageUrl}`, (err, stdout) => err ? reject(err) : resolve({ code: 0, info: stdout })).stdout.pipe(process.stdout);
-            });
-            yield sh;
-            loading.succeed((0, i18n_1.t)('拉取成功'));
+    async execute(envId, options) {
+        let envCheckType = await (0, utils_1.checkTcbrEnv)(options.envId, false);
+        if (envCheckType !== 0) {
+            (0, utils_1.logEnvCheck)(envId, envCheckType);
+            return;
+        }
+        let { serviceName = '', imageTag = '' } = options;
+        if (serviceName.length === 0 || imageTag.length === 0) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('必须输入 serviceName 和 imageTag'));
+        }
+        const loading = (0, utils_1.loadingFactory)();
+        const imageRepo = await (0, run_1.describeImageRepo)({ envId, serverName: serviceName });
+        const imageUrl = `ccr.ccs.tencentyun.com/${imageRepo}:${imageTag}`;
+        if (!(await (0, run_1.getAuthFlag)())) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('无法找到~/.docker/config.json或未登录，需要执行docker login'));
+        }
+        let sh = new Promise((resolve, reject) => {
+            (0, child_process_1.exec)(`docker pull ${imageUrl}`, (err, stdout) => err ? reject(err) : resolve({ code: 0, info: stdout })).stdout.pipe(process.stdout);
         });
+        await sh;
+        loading.succeed((0, i18n_1.t)('拉取成功'));
     }
 };
 __decorate([

package/lib/commands/run/image/list.js

@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ListImage = void 0;
 const common_1 = require("../../common");
@@ -31,7 +22,9 @@ const common_2 = require("./common");
 const i18n_1 = require("../../../i18n");
 let ListImage = class ListImage extends common_1.Command {
     get options() {
-        return Object.assign(Object.assign({}, (0, common_2.imageCommonOptions)('list')), { options: [
+        return {
+            ...(0, common_2.imageCommonOptions)('list'),
+            options: [
                 {
                     flags: '-e, --envId <envId>',
                     desc: (0, i18n_1.t)('环境 Id')
@@ -48,46 +41,46 @@ let ListImage = class ListImage extends common_1.Command {
                     flags: '-o, --offset <offset>',
                     desc: (0, i18n_1.t)('数据偏移量，默认值为 0')
                 }
-            ], desc: (0, i18n_1.t)('展示选择的云托管服务的版本列表') });
+            ],
+            desc: (0, i18n_1.t)('展示选择的云托管服务的版本列表')
+        };
     }
-    execute(envId, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let envCheckType = yield (0, utils_1.checkTcbrEnv)(options.envId, false);
-            if (envCheckType !== 0) {
-                (0, utils_1.logEnvCheck)(envId, envCheckType);
-                return;
-            }
-            let { limit = 20, offset = 0, serviceName = '' } = options;
-            limit = Number(limit);
-            offset = Number(offset);
-            if (!Number.isInteger(limit) || !Number.isInteger(offset)) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('limit 和 offset 必须为整数'));
-            }
-            if (limit < 0 || offset < 0) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('limit 和 offset 必须为大于 0 的整数'));
-            }
-            if (serviceName.length === 0) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('请输入查询的服务名'));
-            }
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start((0, i18n_1.t)('数据加载中...'));
-            const data = yield (0, run_1.listImage)({
-                envId,
-                limit: Number(limit),
-                offset: Number(offset),
-                serviceName: serviceName
-            });
-            loading.stop();
-            const head = [(0, i18n_1.t)('镜像'), (0, i18n_1.t)('大小'), (0, i18n_1.t)('关联服务版本'), (0, i18n_1.t)('创建时间'), (0, i18n_1.t)('更新时间')];
-            const tableData = data.map((item) => [
-                item.ImageUrl.split(':')[1],
-                item.Size,
-                item.ReferVersions.length > 0 ? item.ReferVersions.reduce((sum, item) => `${sum}|${item.VersionName}`, '') : '-',
-                item.CreateTime,
-                item.UpdateTime,
-            ]);
-            (0, utils_1.printHorizontalTable)(head, tableData);
+    async execute(envId, options) {
+        let envCheckType = await (0, utils_1.checkTcbrEnv)(options.envId, false);
+        if (envCheckType !== 0) {
+            (0, utils_1.logEnvCheck)(envId, envCheckType);
+            return;
+        }
+        let { limit = 20, offset = 0, serviceName = '' } = options;
+        limit = Number(limit);
+        offset = Number(offset);
+        if (!Number.isInteger(limit) || !Number.isInteger(offset)) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('limit 和 offset 必须为整数'));
+        }
+        if (limit < 0 || offset < 0) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('limit 和 offset 必须为大于 0 的整数'));
+        }
+        if (serviceName.length === 0) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('请输入查询的服务名'));
+        }
+        const loading = (0, utils_1.loadingFactory)();
+        loading.start((0, i18n_1.t)('数据加载中...'));
+        const data = await (0, run_1.listImage)({
+            envId,
+            limit: Number(limit),
+            offset: Number(offset),
+            serviceName: serviceName
         });
+        loading.stop();
+        const head = [(0, i18n_1.t)('镜像'), (0, i18n_1.t)('大小'), (0, i18n_1.t)('关联服务版本'), (0, i18n_1.t)('创建时间'), (0, i18n_1.t)('更新时间')];
+        const tableData = data.map((item) => [
+            item.ImageUrl.split(':')[1],
+            item.Size,
+            item.ReferVersions.length > 0 ? item.ReferVersions.reduce((sum, item) => `${sum}|${item.VersionName}`, '') : '-',
+            item.CreateTime,
+            item.UpdateTime,
+        ]);
+        (0, utils_1.printHorizontalTable)(head, tableData);
     }
 };
 __decorate([

package/lib/commands/run/image/upload.js

@@ -34,15 +34,6 @@ var __metadata = (this && this.__metadata) || function (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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UploadImage = void 0;
 const child_process_1 = require("child_process");
@@ -56,7 +47,9 @@ const common_2 = require("./common");
 const i18n_1 = require("../../../i18n");
 let UploadImage = class UploadImage extends common_1.Command {
     get options() {
-        return Object.assign(Object.assign({}, (0, common_2.imageCommonOptions)('upload')), { options: [
+        return {
+            ...(0, common_2.imageCommonOptions)('upload'),
+            options: [
                 {
                     flags: '-e, --envId <envId>',
                     desc: (0, i18n_1.t)('环境 Id')
@@ -73,31 +66,31 @@ let UploadImage = class UploadImage extends common_1.Command {
                     flags: '-t, --imageTag <imageTag>',
                     desc: (0, i18n_1.t)('镜像 tag')
                 }
-            ], desc: (0, i18n_1.t)('上传云开发环境下云托管服务的镜像') });
+            ],
+            desc: (0, i18n_1.t)('上传云开发环境下云托管服务的镜像')
+        };
     }
-    execute(envId, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let envCheckType = yield (0, utils_1.checkTcbrEnv)(options.envId, false);
-            if (envCheckType !== 0) {
-                (0, utils_1.logEnvCheck)(envId, envCheckType);
-                return;
-            }
-            const { serviceName = '', imageId = '', imageTag = '' } = options;
-            if (serviceName.length === 0 || imageId.length === 0 || imageTag.length === 0) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('必须输入 serviceName 和 imageId 和 imageTag'));
-            }
-            const loading = (0, utils_1.loadingFactory)();
-            if (!(yield (0, run_1.getAuthFlag)())) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('无法找到~/.docker/config.json或未登录，需要执行docker login'));
-            }
-            const imageRepo = yield (0, run_1.describeImageRepo)({ envId, serverName: serviceName });
-            yield util.promisify(child_process_1.exec)(`docker tag ${imageId} ccr.ccs.tencentyun.com/${imageRepo}:${imageTag}`);
-            let sh = new Promise((resolve, reject) => {
-                (0, child_process_1.exec)(`docker push ccr.ccs.tencentyun.com/${imageRepo}:${imageTag}`, (stderr, stdout) => stderr ? reject(stderr) : resolve({ code: 0, info: stdout })).stdout.pipe(process.stdout);
-            });
-            yield sh;
-            loading.succeed((0, i18n_1.t)('上传成功'));
+    async execute(envId, options) {
+        let envCheckType = await (0, utils_1.checkTcbrEnv)(options.envId, false);
+        if (envCheckType !== 0) {
+            (0, utils_1.logEnvCheck)(envId, envCheckType);
+            return;
+        }
+        const { serviceName = '', imageId = '', imageTag = '' } = options;
+        if (serviceName.length === 0 || imageId.length === 0 || imageTag.length === 0) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('必须输入 serviceName 和 imageId 和 imageTag'));
+        }
+        const loading = (0, utils_1.loadingFactory)();
+        if (!(await (0, run_1.getAuthFlag)())) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('无法找到~/.docker/config.json或未登录，需要执行docker login'));
+        }
+        const imageRepo = await (0, run_1.describeImageRepo)({ envId, serverName: serviceName });
+        await util.promisify(child_process_1.exec)(`docker tag ${imageId} ccr.ccs.tencentyun.com/${imageRepo}:${imageTag}`);
+        let sh = new Promise((resolve, reject) => {
+            (0, child_process_1.exec)(`docker push ccr.ccs.tencentyun.com/${imageRepo}:${imageTag}`, (stderr, stdout) => stderr ? reject(stderr) : resolve({ code: 0, info: stdout })).stdout.pipe(process.stdout);
         });
+        await sh;
+        loading.succeed((0, i18n_1.t)('上传成功'));
     }
 };
 __decorate([