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

package/lib/run/repo.js

@@ -1,31 +1,22 @@
 "use strict";
-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.deleteImageRepo = exports.describeImageRepo = void 0;
 const utils_1 = require("../utils");
 const tcbService = utils_1.CloudApiService.getInstance('tcb');
-const describeImageRepo = (options) => __awaiter(void 0, void 0, void 0, function* () {
-    const { ImageRepo } = yield tcbService.request('DescribeCloudBaseRunServer', {
+const describeImageRepo = async (options) => {
+    const { ImageRepo } = await tcbService.request('DescribeCloudBaseRunServer', {
         EnvId: options.envId,
         Limit: options.limit ? options.limit : 100,
         Offset: options.offset ? options.offset : 0,
         ServerName: options.serverName
     });
     return ImageRepo;
-});
+};
 exports.describeImageRepo = describeImageRepo;
-const deleteImageRepo = (options) => __awaiter(void 0, void 0, void 0, function* () {
-    const { result } = yield tcbService.request('DeleteCloudBaseRunImageRepo', {
+const deleteImageRepo = async (options) => {
+    const { result } = await tcbService.request('DeleteCloudBaseRunImageRepo', {
         ImageRepo: options.imageRepo
     });
     return result;
-});
+};
 exports.deleteImageRepo = deleteImageRepo;

package/lib/run/service/common.js

@@ -1,13 +1,4 @@
 "use strict";
-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.validateTcrImageURL = exports.getAuthorizedTcrInstance = exports.tcbrServiceOptions = exports.mergeEnvParams = exports.parseEnvParams = exports.extractPolicyDetails = exports.convertNumber = exports.describeWxCloudBaseRunReleaseOrder = exports.describeCloudRunServerDetail = void 0;
 const utils_1 = require("../../utils");
@@ -19,21 +10,19 @@ const constant_1 = require("../../constant");
 const i18n_1 = require("../../i18n");
 const tcbService = utils_1.CloudApiService.getInstance('tcb');
 const tcrCloudApiService = new utils_1.CloudApiService('tcr', {}, '2019-09-24');
-const describeCloudRunServerDetail = (options) => __awaiter(void 0, void 0, void 0, function* () {
-    return yield (0, utils_1.callTcbrApi)('DescribeCloudRunServerDetail', {
+const describeCloudRunServerDetail = async (options) => {
+    return await (0, utils_1.callTcbrApi)('DescribeCloudRunServerDetail', {
         EnvId: options.envId,
         ServerName: options.serviceName,
     });
-});
+};
 exports.describeCloudRunServerDetail = describeCloudRunServerDetail;
-function describeWxCloudBaseRunReleaseOrder(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const res = yield tcbService.request('DescribeWxCloudBaseRunReleaseOrder', {
-            EnvId: options.envId,
-            ServerName: options.serviceName
-        });
-        return res;
+async function describeWxCloudBaseRunReleaseOrder(options) {
+    const res = await tcbService.request('DescribeWxCloudBaseRunReleaseOrder', {
+        EnvId: options.envId,
+        ServerName: options.serviceName
     });
+    return res;
 }
 exports.describeWxCloudBaseRunReleaseOrder = describeWxCloudBaseRunReleaseOrder;
 const convertNumber = (item) => {
@@ -93,179 +82,177 @@ function checkRequiredParams(options) {
         throw new toolbox_1.CloudBaseError((0, i18n_1.t)('请使用 --path 指定代码根目录或 --custom_image 指定 TCR 镜像 URL 或 --library_image 指定线上镜像 tag '));
     }
 }
-function tcbrServiceOptions(options, isCreated, defaultOverride, previousServerConfig) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let { noConfirm: _noConfirm = false, override: _override = (defaultOverride || false), envId, serviceName, path, cpu, mem, minNum, maxNum, policyDetails, customLogs, envParams, containerPort, remark, targetDir, dockerfile, image, custom_image, library_image, log_type, json: _json = false } = options;
-        checkRequiredParams({
+async function tcbrServiceOptions(options, isCreated, defaultOverride, previousServerConfig) {
+    let { noConfirm: _noConfirm = false, override: _override = (defaultOverride || false), envId, serviceName, path, cpu, mem, minNum, maxNum, policyDetails, customLogs, envParams, containerPort, remark, targetDir, dockerfile, image, custom_image, library_image, log_type, json: _json = false } = options;
+    checkRequiredParams({
+        envId,
+        serviceName,
+        containerPort,
+        isCreated,
+        path,
+        custom_image,
+        library_image,
+        image
+    });
+    containerPort = Number(containerPort);
+    const deployByImage = Boolean(custom_image || library_image || image);
+    const DeployInfo = {
+        DeployType: deployByImage ? types_1.DEPLOY_TYPE.IMAGE : types_1.DEPLOY_TYPE.PACKAGE,
+        DeployRemark: remark || '',
+        ReleaseType: 'FULL'
+    };
+    let { cpuConverted, memConverted, maxNumConverted, minNumConverted } = (0, utils_1.parseOptionalParams)({
+        cpu,
+        mem,
+        maxNum,
+        minNum
+    });
+    if (log_type && log_type !== "none") {
+        throw new toolbox_1.CloudBaseError((0, i18n_1.t)('日志类型 log_type 只能为 none，如需自定义日志，请前往控制台配置'));
+    }
+    const defaultLogType = "none";
+    const newServiceOptions = {
+        ServerName: serviceName,
+        EnvId: envId,
+        ServerConfig: {
+            EnvId: envId,
+            MaxNum: (0, utils_1.parseInputParam)(maxNumConverted, _override, exports.convertNumber, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.MaxNum, 50),
+            MinNum: (0, utils_1.parseInputParam)(minNumConverted, _override, exports.convertNumber, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.MinNum, 0),
+            BuildDir: (0, utils_1.parseInputParam)(targetDir, _override, null, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.BuildDir, '.'),
+            Cpu: (0, utils_1.parseInputParam)(cpuConverted, _override, null, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.Cpu, 0.5),
+            Mem: (0, utils_1.parseInputParam)(memConverted, _override, null, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.Mem, 1),
+            OpenAccessTypes: ['PUBLIC'],
+            ServerName: serviceName,
+            InitialDelaySeconds: 2,
+            CustomLogs: (0, utils_1.parseInputParam)(customLogs, _override, null, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.CustomLogs, 'stdout'),
+            CreateTime: (previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.CreateTime) || (new Date()).toLocaleString().replace(/\//g, '-'),
+            PolicyDetails: (0, utils_1.parseInputParam)(policyDetails, _override, exports.extractPolicyDetails, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.PolicyDetails, constant_1.DEFAULT_CPU_MEM_SET),
+            EnvParams: (0, utils_1.parseInputParam)(envParams, _override, exports.mergeEnvParams, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.EnvParams, '', previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.EnvParams),
+            Port: containerPort,
+            HasDockerfile: true,
+            Dockerfile: dockerfile || 'Dockerfile',
+            LogType: (0, utils_1.parseInputParam)(log_type, _override, null, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.LogType, defaultLogType),
+            LogSetId: previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.LogSetId,
+            LogTopicId: previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.LogTopicId,
+            LogParseType: previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.LogParseType,
+        },
+        DeployInfo: {
+            ...DeployInfo
+        }
+    };
+    if (DeployInfo.DeployType === types_1.DEPLOY_TYPE.PACKAGE) {
+        const { PackageName, PackageVersion } = await (0, index_1.packageDeploy)({
             envId,
             serviceName,
-            containerPort,
-            isCreated,
-            path,
-            custom_image,
-            library_image,
-            image
+            filePath: path,
         });
-        containerPort = Number(containerPort);
-        const deployByImage = Boolean(custom_image || library_image || image);
-        const DeployInfo = {
-            DeployType: deployByImage ? types_1.DEPLOY_TYPE.IMAGE : types_1.DEPLOY_TYPE.PACKAGE,
-            DeployRemark: remark || '',
-            ReleaseType: 'FULL'
-        };
-        let { cpuConverted, memConverted, maxNumConverted, minNumConverted } = (0, utils_1.parseOptionalParams)({
-            cpu,
-            mem,
-            maxNum,
-            minNum
-        });
-        if (log_type && log_type !== "none") {
-            throw new toolbox_1.CloudBaseError((0, i18n_1.t)('日志类型 log_type 只能为 none，如需自定义日志，请前往控制台配置'));
+        DeployInfo.PackageName = PackageName;
+        DeployInfo.PackageVersion = PackageVersion;
+    }
+    else if (DeployInfo.DeployType === types_1.DEPLOY_TYPE.IMAGE) {
+        if (custom_image) {
+            const authorizedTcrInstances = await getAuthorizedTcrInstance(envId);
+            if (!authorizedTcrInstances) {
+                const link = `${utils_1.EUrl.Console}/tcbr/env?/tcbr/env=&envId=${envId}`;
+                throw new toolbox_1.CloudBaseError((0, i18n_1.t)('您还未授权 tcr 实例，请先到控制台授权：{{link}}', { link: (0, utils_1.genClickableLink)(link) }));
+            }
+            await validateTcrImageURL(authorizedTcrInstances, custom_image);
+            DeployInfo.ImageUrl = custom_image;
         }
-        const defaultLogType = "none";
-        const newServiceOptions = {
-            ServerName: serviceName,
-            EnvId: envId,
-            ServerConfig: {
-                EnvId: envId,
-                MaxNum: (0, utils_1.parseInputParam)(maxNumConverted, _override, exports.convertNumber, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.MaxNum, 50),
-                MinNum: (0, utils_1.parseInputParam)(minNumConverted, _override, exports.convertNumber, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.MinNum, 0),
-                BuildDir: (0, utils_1.parseInputParam)(targetDir, _override, null, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.BuildDir, '.'),
-                Cpu: (0, utils_1.parseInputParam)(cpuConverted, _override, null, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.Cpu, 0.5),
-                Mem: (0, utils_1.parseInputParam)(memConverted, _override, null, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.Mem, 1),
-                OpenAccessTypes: ['PUBLIC'],
-                ServerName: serviceName,
-                InitialDelaySeconds: 2,
-                CustomLogs: (0, utils_1.parseInputParam)(customLogs, _override, null, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.CustomLogs, 'stdout'),
-                CreateTime: (previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.CreateTime) || (new Date()).toLocaleString().replace(/\//g, '-'),
-                PolicyDetails: (0, utils_1.parseInputParam)(policyDetails, _override, exports.extractPolicyDetails, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.PolicyDetails, constant_1.DEFAULT_CPU_MEM_SET),
-                EnvParams: (0, utils_1.parseInputParam)(envParams, _override, exports.mergeEnvParams, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.EnvParams, '', previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.EnvParams),
-                Port: containerPort,
-                HasDockerfile: true,
-                Dockerfile: dockerfile || 'Dockerfile',
-                LogType: (0, utils_1.parseInputParam)(log_type, _override, null, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.LogType, defaultLogType),
-                LogSetId: previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.LogSetId,
-                LogTopicId: previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.LogTopicId,
-                LogParseType: previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.LogParseType,
-            },
-            DeployInfo: Object.assign({}, DeployInfo)
-        };
-        if (DeployInfo.DeployType === types_1.DEPLOY_TYPE.PACKAGE) {
-            const { PackageName, PackageVersion } = yield (0, index_1.packageDeploy)({
+        else {
+            const imageList = await (0, __1.listImage)({
                 envId,
-                serviceName,
-                filePath: path,
+                serviceName
             });
-            DeployInfo.PackageName = PackageName;
-            DeployInfo.PackageVersion = PackageVersion;
-        }
-        else if (DeployInfo.DeployType === types_1.DEPLOY_TYPE.IMAGE) {
-            if (custom_image) {
-                const authorizedTcrInstances = yield getAuthorizedTcrInstance(envId);
-                if (!authorizedTcrInstances) {
-                    const link = `${utils_1.EUrl.Console}/tcbr/env?/tcbr/env=&envId=${envId}`;
-                    throw new toolbox_1.CloudBaseError((0, i18n_1.t)('您还未授权 tcr 实例，请先到控制台授权：{{link}}', { link: (0, utils_1.genClickableLink)(link) }));
+            if (library_image) {
+                const imageInfo = imageList.find(({ Tag }) => Tag === library_image);
+                if (!imageInfo) {
+                    throw new toolbox_1.CloudBaseError((0, i18n_1.t)('镜像 {{image}} 不存在', { image: library_image }));
                 }
-                yield validateTcrImageURL(authorizedTcrInstances, custom_image);
-                DeployInfo.ImageUrl = custom_image;
+                DeployInfo.ImageUrl = imageInfo.ImageUrl;
             }
             else {
-                const imageList = yield (0, __1.listImage)({
-                    envId,
-                    serviceName
-                });
-                if (library_image) {
-                    const imageInfo = imageList.find(({ Tag }) => Tag === library_image);
-                    if (!imageInfo) {
-                        throw new toolbox_1.CloudBaseError((0, i18n_1.t)('镜像 {{image}} 不存在', { image: library_image }));
-                    }
-                    DeployInfo.ImageUrl = imageInfo.ImageUrl;
-                }
-                else {
-                    throw new toolbox_1.CloudBaseError((0, i18n_1.t)('暂不支持 --image 参数，请使用 --custom_image 指定 tcr 镜像 URL 或 --library_image 指定线上镜像 tag'));
-                }
+                throw new toolbox_1.CloudBaseError((0, i18n_1.t)('暂不支持 --image 参数，请使用 --custom_image 指定 tcr 镜像 URL 或 --library_image 指定线上镜像 tag'));
             }
         }
-        newServiceOptions.DeployInfo = Object.assign({}, DeployInfo);
-        return newServiceOptions;
-    });
+    }
+    newServiceOptions.DeployInfo = {
+        ...DeployInfo
+    };
+    return newServiceOptions;
 }
 exports.tcbrServiceOptions = tcbrServiceOptions;
-function getAuthorizedTcrInstance(envId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let { data: { TcrInstances: authorizedTcrInstances } } = yield (0, utils_1.callTcbrApi)('DescribeTcrInstances', {
-            EnvId: envId
-        });
-        return authorizedTcrInstances;
+async function getAuthorizedTcrInstance(envId) {
+    let { data: { TcrInstances: authorizedTcrInstances } } = await (0, utils_1.callTcbrApi)('DescribeTcrInstances', {
+        EnvId: envId
     });
+    return authorizedTcrInstances;
 }
 exports.getAuthorizedTcrInstance = getAuthorizedTcrInstance;
-function validateTcrImageURL(authorizedTcrInstances, imageUrl) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const errMsg = (0, i18n_1.t)('镜像URL解析失败，请检查输入的镜像URL是否正确');
-        try {
-            const host = imageUrl.split('/')[0];
-            const namespace = imageUrl.split('/')[1];
-            const name = `${namespace}/${imageUrl.split('/')[2].split(':')[0]}`;
-            const tag = imageUrl.split('/')[2].split(':')[1];
-            const filteredInstances = authorizedTcrInstances === null || authorizedTcrInstances === void 0 ? void 0 : authorizedTcrInstances.filter(({ Domain }) => host === Domain);
-            if (!(filteredInstances === null || filteredInstances === void 0 ? void 0 : filteredInstances.length)) {
+async function validateTcrImageURL(authorizedTcrInstances, imageUrl) {
+    const errMsg = (0, i18n_1.t)('镜像URL解析失败，请检查输入的镜像URL是否正确');
+    try {
+        const host = imageUrl.split('/')[0];
+        const namespace = imageUrl.split('/')[1];
+        const name = `${namespace}/${imageUrl.split('/')[2].split(':')[0]}`;
+        const tag = imageUrl.split('/')[2].split(':')[1];
+        const filteredInstances = authorizedTcrInstances === null || authorizedTcrInstances === void 0 ? void 0 : authorizedTcrInstances.filter(({ Domain }) => host === Domain);
+        if (!(filteredInstances === null || filteredInstances === void 0 ? void 0 : filteredInstances.length)) {
+            throw new toolbox_1.CloudBaseError(errMsg);
+        }
+        const reposUnderSpecifiedRegistry = [];
+        for (const registry of filteredInstances) {
+            const repos = [];
+            let { Id: registryId, Domain: domain } = registry;
+            const limit = 100;
+            let curIndex = 1;
+            let totalCount = 0;
+            do {
+                const rsp = await tcrCloudApiService.request('DescribeRepositories', {
+                    RegistryId: registryId,
+                    Offset: curIndex,
+                    Limit: limit
+                });
+                repos.push(...rsp.RepositoryList);
+                curIndex += 1;
+                totalCount = rsp.TotalCount;
+            } while (repos.length < totalCount);
+            reposUnderSpecifiedRegistry.push({ registryId, domain, repos });
+        }
+        const filteredRepos = [];
+        for (const repo of reposUnderSpecifiedRegistry) {
+            const { registryId, repos } = repo;
+            filteredRepos.push(...repos.filter(({ Name }) => Name === name));
+            if (!(filteredRepos === null || filteredRepos === void 0 ? void 0 : filteredRepos.length)) {
                 throw new toolbox_1.CloudBaseError(errMsg);
             }
-            const reposUnderSpecifiedRegistry = [];
-            for (const registry of filteredInstances) {
-                const repos = [];
-                let { Id: registryId, Domain: domain } = registry;
-                const limit = 100;
-                let curIndex = 1;
-                let totalCount = 0;
-                do {
-                    const rsp = yield tcrCloudApiService.request('DescribeRepositories', {
-                        RegistryId: registryId,
-                        Offset: curIndex,
-                        Limit: limit
-                    });
-                    repos.push(...rsp.RepositoryList);
-                    curIndex += 1;
-                    totalCount = rsp.TotalCount;
-                } while (repos.length < totalCount);
-                reposUnderSpecifiedRegistry.push({ registryId, domain, repos });
-            }
-            const filteredRepos = [];
-            for (const repo of reposUnderSpecifiedRegistry) {
-                const { registryId, repos } = repo;
-                filteredRepos.push(...repos.filter(({ Name }) => Name === name));
-                if (!(filteredRepos === null || filteredRepos === void 0 ? void 0 : filteredRepos.length)) {
-                    throw new toolbox_1.CloudBaseError(errMsg);
-                }
-                filteredRepos.forEach(item => { item.registryId = registryId; });
-            }
-            for (const repoItem of filteredRepos) {
-                const { Name, Namespace, registryId } = repoItem;
-                const images = [];
-                const limit = 100;
-                let curIndex = 1;
-                let totalCount = 0;
-                do {
-                    const rsp = yield tcrCloudApiService.request('DescribeImages', {
-                        RegistryId: registryId,
-                        NamespaceName: Namespace,
-                        RepositoryName: Name.split(`${Namespace}/`)[1],
-                        Offset: curIndex,
-                        Limit: limit
-                    });
-                    images.push(...rsp.ImageInfoList);
-                    curIndex += 1;
-                    totalCount = rsp.TotalCount;
-                } while (images.length < totalCount);
-                if (!images.some(({ ImageVersion }) => ImageVersion === tag)) {
-                    throw new toolbox_1.CloudBaseError(errMsg);
-                }
-            }
+            filteredRepos.forEach(item => { item.registryId = registryId; });
         }
-        catch (e) {
-            throw new toolbox_1.CloudBaseError(errMsg);
+        for (const repoItem of filteredRepos) {
+            const { Name, Namespace, registryId } = repoItem;
+            const images = [];
+            const limit = 100;
+            let curIndex = 1;
+            let totalCount = 0;
+            do {
+                const rsp = await tcrCloudApiService.request('DescribeImages', {
+                    RegistryId: registryId,
+                    NamespaceName: Namespace,
+                    RepositoryName: Name.split(`${Namespace}/`)[1],
+                    Offset: curIndex,
+                    Limit: limit
+                });
+                images.push(...rsp.ImageInfoList);
+                curIndex += 1;
+                totalCount = rsp.TotalCount;
+            } while (images.length < totalCount);
+            if (!images.some(({ ImageVersion }) => ImageVersion === tag)) {
+                throw new toolbox_1.CloudBaseError(errMsg);
+            }
         }
-    });
+    }
+    catch (e) {
+        throw new toolbox_1.CloudBaseError(errMsg);
+    }
 }
 exports.validateTcrImageURL = validateTcrImageURL;

package/lib/run/service/config.js

@@ -1,70 +1,57 @@
 "use strict";
-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.updateCloudRunServerConfig = exports.tcbrServiceConfigOptions = void 0;
 const toolbox_1 = require("@cloudbase/toolbox");
 const common_1 = require("./common");
 const utils_1 = require("../../utils");
 const i18n_1 = require("../../i18n");
-function tcbrServiceConfigOptions(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let { serviceName, envId, cpu, mem, minNum, maxNum, policyDetails, customLogs, envParams, } = options;
-        if (!envId) {
-            throw new toolbox_1.CloudBaseError((0, i18n_1.t)('必须使用 -e 或 --envId 指定环境ID'));
-        }
-        if (!serviceName) {
-            throw new toolbox_1.CloudBaseError((0, i18n_1.t)('必须使用 -s 或 --serviceName 指定服务名'));
-        }
-        let { cpuConverted, memConverted, maxNumConverted, minNumConverted } = (0, utils_1.parseOptionalParams)({
-            cpu,
-            mem,
-            maxNum,
-            minNum
-        });
-        const serviceInfo = yield (0, common_1.describeCloudRunServerDetail)({
-            envId,
-            serviceName
-        });
-        if (serviceInfo instanceof Error && serviceInfo['code'] === 'InvalidParameter') {
-            throw new toolbox_1.CloudBaseError((0, i18n_1.t)('服务不存在，请检查服务名是否正确或到控制台 {{link}} 创建服务', { link: (0, utils_1.genClickableLink)(`${utils_1.EUrl.Console}/tcbr`) }));
-        }
-        const { ServerConfig: previousServerConfig } = serviceInfo.data;
-        const newServiceOptions = {
-            EnvId: envId,
-            ServerName: serviceName,
-            OpenAccessTypes: previousServerConfig.OpenAccessTypes,
-            Cpu: cpuConverted || previousServerConfig.Cpu,
-            Mem: memConverted || previousServerConfig.Mem,
-            MinNum: minNumConverted || previousServerConfig.MinNum,
-            MaxNum: maxNumConverted || previousServerConfig.MaxNum,
-            PolicyDetails: policyDetails ? (0, common_1.extractPolicyDetails)(policyDetails) : previousServerConfig.PolicyDetails,
-            CustomLogs: customLogs || previousServerConfig.CustomLogs,
-            EnvParams: envParams ? (0, common_1.mergeEnvParams)(envParams, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.EnvParams) : previousServerConfig.EnvParams,
-            InitialDelaySeconds: 2,
-            CreateTime: previousServerConfig.CreateTime,
-            Port: previousServerConfig.Port,
-            HasDockerfile: true,
-            Dockerfile: previousServerConfig.Dockerfile,
-            BuildDir: previousServerConfig.BuildDir,
-        };
-        return newServiceOptions;
+async function tcbrServiceConfigOptions(options) {
+    let { serviceName, envId, cpu, mem, minNum, maxNum, policyDetails, customLogs, envParams, } = options;
+    if (!envId) {
+        throw new toolbox_1.CloudBaseError((0, i18n_1.t)('必须使用 -e 或 --envId 指定环境ID'));
+    }
+    if (!serviceName) {
+        throw new toolbox_1.CloudBaseError((0, i18n_1.t)('必须使用 -s 或 --serviceName 指定服务名'));
+    }
+    let { cpuConverted, memConverted, maxNumConverted, minNumConverted } = (0, utils_1.parseOptionalParams)({
+        cpu,
+        mem,
+        maxNum,
+        minNum
+    });
+    const serviceInfo = await (0, common_1.describeCloudRunServerDetail)({
+        envId,
+        serviceName
     });
+    if (serviceInfo instanceof Error && serviceInfo['code'] === 'InvalidParameter') {
+        throw new toolbox_1.CloudBaseError((0, i18n_1.t)('服务不存在，请检查服务名是否正确或到控制台 {{link}} 创建服务', { link: (0, utils_1.genClickableLink)(`${utils_1.EUrl.Console}/tcbr`) }));
+    }
+    const { ServerConfig: previousServerConfig } = serviceInfo.data;
+    const newServiceOptions = {
+        EnvId: envId,
+        ServerName: serviceName,
+        OpenAccessTypes: previousServerConfig.OpenAccessTypes,
+        Cpu: cpuConverted || previousServerConfig.Cpu,
+        Mem: memConverted || previousServerConfig.Mem,
+        MinNum: minNumConverted || previousServerConfig.MinNum,
+        MaxNum: maxNumConverted || previousServerConfig.MaxNum,
+        PolicyDetails: policyDetails ? (0, common_1.extractPolicyDetails)(policyDetails) : previousServerConfig.PolicyDetails,
+        CustomLogs: customLogs || previousServerConfig.CustomLogs,
+        EnvParams: envParams ? (0, common_1.mergeEnvParams)(envParams, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.EnvParams) : previousServerConfig.EnvParams,
+        InitialDelaySeconds: 2,
+        CreateTime: previousServerConfig.CreateTime,
+        Port: previousServerConfig.Port,
+        HasDockerfile: true,
+        Dockerfile: previousServerConfig.Dockerfile,
+        BuildDir: previousServerConfig.BuildDir,
+    };
+    return newServiceOptions;
 }
 exports.tcbrServiceConfigOptions = tcbrServiceConfigOptions;
-function updateCloudRunServerConfig(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return yield (0, utils_1.callTcbrApi)('UpdateCloudRunServerConfig', {
-            EnvId: options.envId,
-            ServerBaseConfig: options.ServerBaseConfig,
-        });
+async function updateCloudRunServerConfig(options) {
+    return await (0, utils_1.callTcbrApi)('UpdateCloudRunServerConfig', {
+        EnvId: options.envId,
+        ServerBaseConfig: options.ServerBaseConfig,
     });
 }
 exports.updateCloudRunServerConfig = updateCloudRunServerConfig;

package/lib/run/service/deployPackage.js

@@ -22,15 +22,6 @@ 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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -41,43 +32,41 @@ const fs = __importStar(require("fs"));
 const __1 = require("..");
 const toolbox_1 = require("@cloudbase/toolbox");
 const i18n_1 = require("../../i18n");
-function packageDeploy(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let { envId, serviceName, filePath, fileToIgnore } = options;
-        let { PackageName, PackageVersion, UploadUrl, UploadHeaders } = yield (0, __1.createBuild)({
-            envId,
-            serviceName
-        });
-        const loading = (0, toolbox_1.loadingFactory)();
-        const zipFile = `.tcbr_${serviceName}_${Date.now()}.zip`;
-        const dstPath = path_1.default.join(process.cwd(), zipFile);
-        try {
-            if (fs.statSync(filePath).isDirectory()) {
-                loading.start((0, i18n_1.t)('正在压缩文件…'));
-                yield (0, toolbox_1.zipDir)(filePath, dstPath, fileToIgnore);
-                loading.succeed((0, i18n_1.t)('压缩文件完成'));
-            }
-        }
-        catch (error) {
-            if (error.code === 'ENOENT') {
-                throw new toolbox_1.CloudBaseError((0, i18n_1.t)('找不到指定文件夹，请检查文件路径是否正确'));
-            }
-            else {
-                throw new toolbox_1.CloudBaseError(error.message);
-            }
+async function packageDeploy(options) {
+    let { envId, serviceName, filePath, fileToIgnore } = options;
+    let { PackageName, PackageVersion, UploadUrl, UploadHeaders } = await (0, __1.createBuild)({
+        envId,
+        serviceName
+    });
+    const loading = (0, toolbox_1.loadingFactory)();
+    const zipFile = `.tcbr_${serviceName}_${Date.now()}.zip`;
+    const dstPath = path_1.default.join(process.cwd(), zipFile);
+    try {
+        if (fs.statSync(filePath).isDirectory()) {
+            loading.start((0, i18n_1.t)('正在压缩文件…'));
+            await (0, toolbox_1.zipDir)(filePath, dstPath, fileToIgnore);
+            loading.succeed((0, i18n_1.t)('压缩文件完成'));
         }
-        try {
-            return yield (0, toolbox_1.execWithLoading)(() => __awaiter(this, void 0, void 0, function* () {
-                yield (0, __1.uploadZip)(zipFile, UploadUrl, UploadHeaders[0]);
-                return { PackageName, PackageVersion };
-            }), {
-                startTip: (0, i18n_1.t)('\n正在上传代码包...'),
-                failTip: (0, i18n_1.t)('上传代码包失败，请稍后重试')
-            });
+    }
+    catch (error) {
+        if (error.code === 'ENOENT') {
+            throw new toolbox_1.CloudBaseError((0, i18n_1.t)('找不到指定文件夹，请检查文件路径是否正确'));
         }
-        finally {
-            yield fs.promises.unlink(dstPath);
+        else {
+            throw new toolbox_1.CloudBaseError(error.message);
         }
-    });
+    }
+    try {
+        return await (0, toolbox_1.execWithLoading)(async () => {
+            await (0, __1.uploadZip)(zipFile, UploadUrl, UploadHeaders[0]);
+            return { PackageName, PackageVersion };
+        }, {
+            startTip: (0, i18n_1.t)('\n正在上传代码包...'),
+            failTip: (0, i18n_1.t)('上传代码包失败，请稍后重试')
+        });
+    }
+    finally {
+        await fs.promises.unlink(dstPath);
+    }
 }
 exports.packageDeploy = packageDeploy;