@cloudbase/cli 2.3.0 → 2.3.1

package/lib/run/service/common.js

@@ -1,270 +0,0 @@
-"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");
-const types_1 = require("../../types");
-const toolbox_1 = require("@cloudbase/toolbox");
-const index_1 = require("./index");
-const __1 = require("..");
-const constant_1 = require("../../constant");
-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', {
-        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;
-    });
-}
-exports.describeWxCloudBaseRunReleaseOrder = describeWxCloudBaseRunReleaseOrder;
-const convertNumber = (item) => {
-    if (isNaN(Number(item))) {
-        throw new toolbox_1.CloudBaseError(`${item} 必须为数字`);
-    }
-    return Number(item);
-};
-exports.convertNumber = convertNumber;
-const extractPolicyDetails = (policyDetails) => {
-    return policyDetails.split('&').map(condition => {
-        let [type, threshold] = [condition.split('=')[0], Number(condition.split('=')[1])];
-        if (isNaN(threshold) || !['cpu', 'mem'].includes(type)) {
-            throw new toolbox_1.CloudBaseError('请输入合法的缩扩容配置');
-        }
-        return {
-            PolicyType: type,
-            PolicyThreshold: threshold
-        };
-    });
-};
-exports.extractPolicyDetails = extractPolicyDetails;
-const parseEnvParams = (envParams) => {
-    return envParams.split('&').reduce((acc, cur) => {
-        const [key, value] = cur.split('=');
-        acc[key] = value;
-        return acc;
-    }, {});
-};
-exports.parseEnvParams = parseEnvParams;
-const mergeEnvParams = (curEnvParams, preEnvParams) => {
-    const curEnv = (0, exports.parseEnvParams)(curEnvParams);
-    const preEnv = preEnvParams ? JSON.parse(preEnvParams) : {};
-    const curEnvKeys = Object.keys(curEnv);
-    Object.entries(preEnv).forEach(([key, value]) => {
-        if (!curEnvKeys.includes(key)) {
-            curEnv[key] = value;
-        }
-    });
-    return JSON.stringify(curEnv);
-};
-exports.mergeEnvParams = mergeEnvParams;
-function checkRequiredParams(options) {
-    if (!options.envId) {
-        throw new toolbox_1.CloudBaseError('请使用 -e 或 --envId 指定环境ID');
-    }
-    if (!options.serviceName) {
-        throw new toolbox_1.CloudBaseError('请使用 -s 或 --serviceName 指定服务名');
-    }
-    if (!options.containerPort) {
-        throw new toolbox_1.CloudBaseError('请使用 --containerPort 指定监听端口号');
-    }
-    if (!options.isCreated && !options.path && !options.custom_image) {
-        throw new toolbox_1.CloudBaseError('请使用 --path 指定代码根目录或 --custom_image 指定 TCR 镜像 URL');
-    }
-    if (options.isCreated && !options.path && !options.custom_image && !options.library_image && !options.image) {
-        throw new toolbox_1.CloudBaseError('请使用 --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({
-            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('日志类型 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: Object.assign({}, DeployInfo)
-        };
-        if (DeployInfo.DeployType === types_1.DEPLOY_TYPE.PACKAGE) {
-            const { PackageName, PackageVersion } = yield (0, index_1.packageDeploy)({
-                envId,
-                serviceName,
-                filePath: path,
-            });
-            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 = `https://console.cloud.tencent.com/tcbr/env?/tcbr/env=&envId=${envId}`;
-                    throw new toolbox_1.CloudBaseError(`您还未授权 tcr 实例，请先到控制台授权：${(0, utils_1.genClickableLink)(link)}`);
-                }
-                yield validateTcrImageURL(authorizedTcrInstances, custom_image);
-                DeployInfo.ImageUrl = custom_image;
-            }
-            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(`镜像 ${library_image} 不存在`);
-                    }
-                    DeployInfo.ImageUrl = imageInfo.ImageUrl;
-                }
-                else {
-                    throw new toolbox_1.CloudBaseError('暂不支持 --image 参数，请使用 --custom_image 指定 tcr 镜像 URL 或 --library_image 指定线上镜像 tag');
-                }
-            }
-        }
-        newServiceOptions.DeployInfo = Object.assign({}, 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;
-    });
-}
-exports.getAuthorizedTcrInstance = getAuthorizedTcrInstance;
-function validateTcrImageURL(authorizedTcrInstances, imageUrl) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const errMsg = '镜像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 = 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);
-                }
-            }
-        }
-        catch (e) {
-            throw new toolbox_1.CloudBaseError(errMsg);
-        }
-    });
-}
-exports.validateTcrImageURL = validateTcrImageURL;

package/lib/run/service/config.js

@@ -1,69 +0,0 @@
-"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");
-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('必须使用 -e 或 --envId 指定环境ID');
-        }
-        if (!serviceName) {
-            throw new toolbox_1.CloudBaseError('必须使用 -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, utils_1.genClickableLink)('https://console.cloud.tencent.com/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,
-        });
-    });
-}
-exports.updateCloudRunServerConfig = updateCloudRunServerConfig;

package/lib/run/service/deployPackage.js

@@ -1,82 +0,0 @@
-"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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __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 };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.packageDeploy = void 0;
-const path_1 = __importDefault(require("path"));
-const fs = __importStar(require("fs"));
-const __1 = require("..");
-const toolbox_1 = require("@cloudbase/toolbox");
-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('正在压缩文件…');
-                yield (0, toolbox_1.zipDir)(filePath, dstPath, fileToIgnore);
-                loading.succeed('压缩文件完成');
-            }
-        }
-        catch (error) {
-            if (error.code === 'ENOENT') {
-                throw new toolbox_1.CloudBaseError('找不到指定文件夹，请检查文件路径是否正确');
-            }
-            else {
-                throw new toolbox_1.CloudBaseError(error.message);
-            }
-        }
-        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: '\n正在上传代码包...',
-                failTip: '上传代码包失败，请稍后重试'
-            });
-        }
-        finally {
-            yield fs.promises.unlink(dstPath);
-        }
-    });
-}
-exports.packageDeploy = packageDeploy;

package/lib/run/service/index.js

@@ -1,22 +0,0 @@
-"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("./list"), exports);
-__exportStar(require("./showLogs"), exports);
-__exportStar(require("./deployPackage"), exports);
-__exportStar(require("./common"), exports);
-__exportStar(require("./update"), exports);
-__exportStar(require("./config"), exports);

package/lib/run/service/list.js

@@ -1,31 +0,0 @@
-"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.listService = void 0;
-const utils_1 = require("../../utils");
-const tcbService = utils_1.CloudApiService.getInstance('tcb');
-const listService = (options) => __awaiter(void 0, void 0, void 0, function* () {
-    const { data: { ServerList: serverList } } = yield (0, utils_1.callTcbrApi)('DescribeCloudRunServers', {
-        EnvId: options.envId,
-    });
-    const { CloudBaseRunServerSet: serverSet } = yield tcbService.request('DescribeCloudBaseRunServers', {
-        EnvId: options.envId,
-        Offset: 0,
-        Limit: options.limit || 100
-    });
-    if (!serverList.length)
-        return [];
-    const serverInfo = serverList.map(serverItem => {
-        return Object.assign(Object.assign({}, serverItem), { CreatedTime: serverSet.find((item) => item.ServerName === serverItem.ServerName).CreatedTime });
-    });
-    return serverInfo;
-});
-exports.listService = listService;

package/lib/run/service/showLogs.js

@@ -1,116 +0,0 @@
-"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());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLogs = exports.getBuildStatus = void 0;
-const utils_1 = require("../../utils");
-const chalk_1 = __importDefault(require("chalk"));
-function getBuildStatus(envId, serviceName) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { data: deployRes } = yield (0, utils_1.callTcbrApi)('DescribeCloudRunDeployRecord', {
-            EnvId: envId,
-            ServerName: serviceName,
-        });
-        if (deployRes === null || deployRes === void 0 ? void 0 : deployRes.DeployRecords) {
-            if ((deployRes === null || deployRes === void 0 ? void 0 : deployRes.DeployRecords[0].Status) === "deploying") {
-                return Promise.resolve('pending');
-            }
-            else {
-                return Promise.resolve('completed');
-            }
-        }
-        else {
-            return Promise.resolve('pending');
-        }
-    });
-}
-exports.getBuildStatus = getBuildStatus;
-function getBuildId(envId, serviceName) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { data: deployRes } = yield (0, utils_1.callTcbrApi)('DescribeCloudRunDeployRecord', {
-            EnvId: envId,
-            ServerName: serviceName,
-        });
-        if (deployRes === null || deployRes === void 0 ? void 0 : deployRes.DeployRecords) {
-            if (deployRes.DeployRecords[0].Status !== 'deploying') {
-                return Promise.resolve(deployRes.DeployRecords[0].BuildId);
-            }
-        }
-    });
-}
-function getRunId(envId, serviceName) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return new Promise((resolve) => {
-            const timer = setInterval(() => __awaiter(this, void 0, void 0, function* () {
-                const { data: deployRes } = yield (0, utils_1.callTcbrApi)('DescribeCloudRunDeployRecord', {
-                    EnvId: envId,
-                    ServerName: serviceName,
-                });
-                if (deployRes === null || deployRes === void 0 ? void 0 : deployRes.DeployRecords) {
-                    clearInterval(timer);
-                    resolve(deployRes.DeployRecords[0].RunId);
-                }
-            }), 3000);
-        });
-    });
-}
-function showProcessLogs(envId, runId, serviceName) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return new Promise(resolve => {
-            const timer = setInterval(() => __awaiter(this, void 0, void 0, function* () {
-                if ((yield getBuildStatus(envId, serviceName)) === 'completed') {
-                    clearInterval(timer);
-                    resolve();
-                }
-                else {
-                    const { data: processLogs } = yield (0, utils_1.callTcbrApi)('DescribeCloudRunProcessLog', {
-                        EnvId: envId,
-                        RunId: runId,
-                    });
-                    if (processLogs === null || processLogs === void 0 ? void 0 : processLogs.Logs) {
-                        console.log(processLogs === null || processLogs === void 0 ? void 0 : processLogs.Logs.join('\n'));
-                    }
-                }
-            }), 5000);
-        });
-    });
-}
-function showBuildLogs(envId, serviceName, serverVersion = '', offset = 0) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        const buildId = yield getBuildId(envId, serviceName);
-        const { data } = yield (0, utils_1.callTcbrApi)('DescribeCloudRunBuildLog', {
-            EnvId: envId,
-            BuildId: buildId,
-            ServerName: serviceName,
-            ServerVersion: serverVersion || '',
-            Offset: offset || 0,
-        });
-        if ((_a = data === null || data === void 0 ? void 0 : data.Log) === null || _a === void 0 ? void 0 : _a.Text) {
-            console.log((_b = data === null || data === void 0 ? void 0 : data.Log) === null || _b === void 0 ? void 0 : _b.Text);
-        }
-        return Promise.resolve();
-    });
-}
-function getLogs(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const runId = yield getRunId(options.envId, options.serviceName);
-        console.log(chalk_1.default.blue('============ 日志开始 ==============='));
-        yield showProcessLogs(options.envId, runId, options.serviceName);
-        if ((yield getBuildStatus(options.envId, options.serviceName)) === 'completed') {
-            yield showBuildLogs(options.envId, options.serviceName);
-        }
-        console.log(chalk_1.default.blue('============ 日志结束 ==============='));
-    });
-}
-exports.getLogs = getLogs;