@cloudbase/manager-node 4.7.4-beta.1 → 4.7.4

package/lib/cloudrun/index.js

@@ -16,6 +16,7 @@ const archiver_1 = __importDefault(require("archiver"));
 const fs_extra_1 = require("fs-extra");
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("../utils");
+const type_1 = require("./type");
 /**
  * 云托管服务管理类
  * 提供云托管服务的初始化、下载、列表查询和删除等功能
@@ -105,6 +106,97 @@ class CloudRunService {
             ServerType: params === null || params === void 0 ? void 0 : params.serverType
         }));
     }
+    /**
+     *
+     * @param serverName 云托管服务名
+     * @param stablePercent 稳定版本流量比例
+     * @param canaryPercent 灰度版本流量比例
+     * @returns 灰度发布进度
+     */
+    async setTraffic(serverName, stablePercent, canaryPercent) {
+        // 校验比例之和是否为100%
+        if (stablePercent + canaryPercent !== 100) {
+            throw new Error('稳定版本流量比例和灰度版本流量比例之和必须等于 100');
+        }
+        const envConfig = this.environment.lazyEnvironmentConfig;
+        const { Task } = await this.tcbrService.request('DescribeServerManageTask', {
+            EnvId: envConfig.EnvId,
+            ServerName: serverName, // 服务名
+            TaskId: 0 // 任务Id
+        });
+        // 判断是否存在灰度版本
+        const isGary = (Task === null || Task === void 0 ? void 0 : Task.ReleaseType) === type_1.ReleaseTypeEnum.GRAY && (Task === null || Task === void 0 ? void 0 : Task.Status) === 'running';
+        if (!isGary) {
+            throw new Error('不存在灰度中的版本或灰度版本部署未完成');
+        }
+        // 获取当前版本和灰度版本
+        const { ReleaseOrderInfo } = await this.tcbrService.request('DescribeReleaseOrder', {
+            EnvId: envConfig.EnvId, // 环境 Id
+            ServerName: serverName // 服务名
+        });
+        const { CurrentVersion, ReleaseVersion } = ReleaseOrderInfo;
+        // 设置版本比例
+        return await this.tcbrService.request('ReleaseGray', {
+            EnvId: envConfig.EnvId, // 环境 Id
+            ServerName: serverName, // 服务名
+            GrayType: "gray",
+            TrafficType: "FLOW",
+            GrayFlowRatio: canaryPercent,
+            VersionFlowItems: [{
+                    VersionName: CurrentVersion.VersionName,
+                    FlowRatio: stablePercent,
+                    IsDefaultPriority: true,
+                    Priority: 1,
+                }, {
+                    VersionName: ReleaseVersion.VersionName,
+                    FlowRatio: canaryPercent,
+                    IsDefaultPriority: false,
+                    Priority: 2,
+                }]
+        });
+    }
+    /**
+     *
+     * @param serverName 云托管服务名
+     * @returns 发布结果
+     */
+    async promote(serverName) {
+        const envConfig = this.environment.lazyEnvironmentConfig;
+        // 获取当前版本和灰度版本
+        const { ReleaseOrderInfo } = await this.tcbrService.request('DescribeReleaseOrder', {
+            EnvId: envConfig.EnvId, // 环境 Id
+            ServerName: serverName // 服务名
+        });
+        const { ReleaseVersion } = ReleaseOrderInfo;
+        return await this.tcbrService.request('ReleaseGray', {
+            EnvId: envConfig.EnvId, // 环境 Id
+            ServerName: serverName, // 服务名
+            GrayType: "gray",
+            TrafficType: "FLOW",
+            GrayFlowRatio: 100,
+            VersionFlowItems: [{ VersionName: ReleaseVersion.VersionName, FlowRatio: 100, Priority: 0, IsDefaultPriority: true }],
+            CloseGrayRelease: true,
+        });
+    }
+    /**
+     *
+     * @param serverName 云托管服务名
+     * @returns 回滚结果
+     */
+    async rollback(serverName) {
+        const envConfig = this.environment.lazyEnvironmentConfig;
+        const { Task } = await this.tcbrService.request('DescribeServerManageTask', {
+            EnvId: envConfig.EnvId,
+            ServerName: serverName, // 服务名
+            TaskId: 0 // 任务Id
+        });
+        return await this.tcbrService.request('OperateServerManage', {
+            EnvId: envConfig.EnvId, // 环境 Id
+            ServerName: serverName,
+            TaskId: Task.Id,
+            OperateType: 'go_back',
+        });
+    }
     /**
      *查询云托管服务详情
      * @param {Object} params 查询参数
@@ -156,7 +248,7 @@ class CloudRunService {
      * @returns {Promise<IResponseInfo>} 返回部署操作的响应信息
      */
     async deploy(params) {
-        const { serverName, targetPath = process.cwd(), serverConfig } = params;
+        const { serverName, targetPath = process.cwd(), serverConfig, deployInfo: { ReleaseType = "FULL" } } = params;
         /**
          * 参数校验和默认值设置
          */
@@ -204,7 +296,7 @@ class CloudRunService {
                     RepoLanguage: 'Node.js'
                 };
             }
-            deployInfo.ReleaseType = 'FULL';
+            deployInfo.ReleaseType = ReleaseType;
             return this._upsertFunction(false, {
                 name: serverName,
                 deployInfo,
@@ -291,6 +383,15 @@ __decorate([
 __decorate([
     (0, utils_1.preLazy)()
 ], CloudRunService.prototype, "list", null);
+__decorate([
+    (0, utils_1.preLazy)()
+], CloudRunService.prototype, "setTraffic", null);
+__decorate([
+    (0, utils_1.preLazy)()
+], CloudRunService.prototype, "promote", null);
+__decorate([
+    (0, utils_1.preLazy)()
+], CloudRunService.prototype, "rollback", null);
 __decorate([
     (0, utils_1.preLazy)()
 ], CloudRunService.prototype, "detail", null);

package/lib/cloudrun/type.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CloudrunServerType = void 0;
+exports.ReleaseTypeEnum = exports.CloudrunServerType = void 0;
 var CloudrunServerType;
 (function (CloudrunServerType) {
     /**
@@ -12,3 +12,14 @@ var CloudrunServerType;
      */
     CloudrunServerType["Container"] = "container";
 })(CloudrunServerType || (exports.CloudrunServerType = CloudrunServerType = {}));
+var ReleaseTypeEnum;
+(function (ReleaseTypeEnum) {
+    /**
+     * 灰度发布
+     */
+    ReleaseTypeEnum["GRAY"] = "GRAY";
+    /**
+     * 全量发布
+     */
+    ReleaseTypeEnum["FULL"] = "FULL";
+})(ReleaseTypeEnum || (exports.ReleaseTypeEnum = ReleaseTypeEnum = {}));

package/lib/function/index.js

@@ -25,7 +25,7 @@ function isNodeFunction(runtime) {
 }
 // 解析函数配置，换成请求参数
 function configToParams(options) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
     const { func, codeSecret, baseParams } = options;
     let installDependency;
     // Node 函数默认安装依赖
@@ -81,6 +81,26 @@ function configToParams(options) {
     // HTTP 云函数类型
     if ((func === null || func === void 0 ? void 0 : func.type) === 'HTTP') {
         params.Type = 'HTTP';
+        // WebSocket 协议支持
+        if ((func === null || func === void 0 ? void 0 : func.protocolType) === 'WS') {
+            params.ProtocolType = 'WS';
+            // 协议参数，直接透传或使用默认值
+            // 参考文档：https://cloud.tencent.com/document/api/583/17244#ProtocolParams
+            const idleTimeOut = (_g = (_f = func === null || func === void 0 ? void 0 : func.protocolParams) === null || _f === void 0 ? void 0 : _f.wsParams) === null || _g === void 0 ? void 0 : _g.idleTimeOut;
+            params.ProtocolParams = {
+                WSParams: {
+                    IdleTimeOut: typeof idleTimeOut === 'number' ? idleTimeOut : 15
+                }
+            };
+        }
+        // 多并发配置
+        // 参考文档：https://cloud.tencent.com/document/api/583/17244#InstanceConcurrencyConfig
+        if (func === null || func === void 0 ? void 0 : func.instanceConcurrencyConfig) {
+            params.InstanceConcurrencyConfig = {
+                DynamicEnabled: func.instanceConcurrencyConfig.dynamicEnabled || 'FALSE',
+                MaxConcurrency: func.instanceConcurrencyConfig.maxConcurrency || 10
+            };
+        }
     }
     // 云函数描述
     if (func === null || func === void 0 ? void 0 : func.description) {
@@ -554,7 +574,7 @@ class FunctionService {
      * @returns {Promise<IResponseInfo>}
      */
     async updateFunctionConfig(func) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g;
         const { namespace } = this.getFunctionConfig();
         const envVariables = Object.keys(func.envVariables || {}).map(key => ({
             Key: key,
@@ -600,6 +620,22 @@ class FunctionService {
             }));
             params.Layers = transformLayers;
         }
+        // WebSocket 协议支持（仅 HTTP 函数）
+        if (func === null || func === void 0 ? void 0 : func.protocolParams) {
+            const idleTimeOut = (_g = (_f = func === null || func === void 0 ? void 0 : func.protocolParams) === null || _f === void 0 ? void 0 : _f.wsParams) === null || _g === void 0 ? void 0 : _g.idleTimeOut;
+            params.ProtocolParams = {
+                WSParams: {
+                    IdleTimeOut: typeof idleTimeOut === 'number' ? idleTimeOut : 15
+                }
+            };
+        }
+        // 多并发配置（仅 HTTP 函数）
+        if (func === null || func === void 0 ? void 0 : func.instanceConcurrencyConfig) {
+            params.InstanceConcurrencyConfig = {
+                DynamicEnabled: func.instanceConcurrencyConfig.dynamicEnabled || 'FALSE',
+                MaxConcurrency: func.instanceConcurrencyConfig.maxConcurrency || 10
+            };
+        }
         try {
             // 如果函数配置中包含触发器，则更新触发器
             if (func.triggers && func.triggers.length > 0) {
@@ -1341,11 +1377,13 @@ class FunctionService {
             if (!(base64 === null || base64 === void 0 ? void 0 : base64.length)) {
                 throw new error_1.CloudBaseError('文件不能为空');
             }
+            console.log(`[${func.name}] 部署方式: ZIP base64 上传`);
             return {
                 ZipFile: base64
             };
         }
         // 默认走 COS 上传
+        console.log(`[${func.name}] 部署方式: COS 上传`);
         const legacyResult = await this.uploadFunctionZipToCosLegacy(options, installDependency);
         return {
             CosBucketRegion: constant_1.SCF_TEMP_COS.REGION,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/manager-node",
-    "version": "4.7.4-beta.1",
+    "version": "4.7.4",
     "description": "The node manage service api for cloudbase.",
     "main": "lib/index.js",
     "scripts": {

package/types/cloudrun/index.d.ts

@@ -1,6 +1,6 @@
 import { Environment } from '../environment';
 import { IResponseInfo } from '../interfaces';
-import { CloudrunServerType, ICloudrunDetailResponse, ICloudrunListResponse, ICloudrunServerBaseConfig, ICloudrunServerBaseInfo, IDiffConfigItem, ITemplate } from './type';
+import { CloudrunServerType, ICloudrunDetailResponse, ICloudrunListResponse, ICloudrunServerBaseConfig, ICloudrunServerBaseInfo, IDiffConfigItem, ITemplate, ReleaseTypeEnum } from './type';
 /**
  * 云托管服务管理类
  * 提供云托管服务的初始化、下载、列表查询和删除等功能
@@ -56,6 +56,32 @@ export declare class CloudRunService {
         serverName?: string;
         serverType?: CloudrunServerType;
     }): Promise<ICloudrunListResponse>;
+    /**
+     *
+     * @param serverName 云托管服务名
+     * @param stablePercent 稳定版本流量比例
+     * @param canaryPercent 灰度版本流量比例
+     * @returns 灰度发布进度
+     */
+    setTraffic(serverName: string, stablePercent: number, canaryPercent: number): Promise<{
+        RequestId?: string;
+    }>;
+    /**
+     *
+     * @param serverName 云托管服务名
+     * @returns 发布结果
+     */
+    promote(serverName: string): Promise<{
+        RequestId?: string;
+    }>;
+    /**
+     *
+     * @param serverName 云托管服务名
+     * @returns 回滚结果
+     */
+    rollback(serverName: string): Promise<{
+        RequestId?: string;
+    }>;
     /**
      *查询云托管服务详情
      * @param {Object} params 查询参数
@@ -99,6 +125,9 @@ export declare class CloudRunService {
     deploy(params: {
         serverName: string;
         targetPath: string;
+        deployInfo: {
+            ReleaseType: ReleaseTypeEnum;
+        };
         serverConfig?: Partial<Pick<ICloudrunServerBaseConfig, 'OpenAccessTypes' | 'Cpu' | 'Mem' | 'MinNum' | 'MaxNum' | 'PolicyDetails' | 'CustomLogs' | 'EnvParams' | 'Port' | 'Dockerfile' | 'BuildDir' | 'InternalAccess' | 'InternalDomain' | 'EntryPoint' | 'Cmd' | 'InstallDependency'>>;
     }): Promise<IResponseInfo>;
     /**

package/types/cloudrun/type.d.ts

@@ -8,6 +8,16 @@ export declare enum CloudrunServerType {
      */
     Container = "container"
 }
+export declare enum ReleaseTypeEnum {
+    /**
+     * 灰度发布
+     */
+    GRAY = "GRAY",
+    /**
+     * 全量发布
+     */
+    FULL = "FULL"
+}
 /**
  * 服务基础信息接口
  */
@@ -327,3 +337,71 @@ export interface ITemplate {
     language: string;
     zipFileStore: string;
 }
+export interface ITaskStepInfo {
+    Name?: string;
+    Status?: string;
+    StartTime?: string;
+    EndTime?: string;
+    CostTime?: number;
+    FailReason?: string;
+}
+export interface IServerManageTaskInfo {
+    Id?: number;
+    EnvId?: string;
+    ServerName?: string;
+    CreateTime?: string;
+    ChangeType?: string;
+    ReleaseType?: string;
+    DeployType?: string;
+    PreVersionName?: string;
+    VersionName?: string;
+    PipelineId?: number;
+    PipelineTaskId?: number;
+    ReleaseId?: number;
+    Status?: string;
+    Steps?: ITaskStepInfo[];
+    FailReason?: string;
+    OperatorRemark?: string;
+}
+export interface IObjectKVPriority {
+    Key?: string;
+    Value?: string;
+    Priority?: number;
+}
+export interface IVersionInfo {
+    VersionName?: string;
+    FlowRatio?: number;
+    Status?: string;
+    CreatedTime?: string;
+    UpdatedTime?: string;
+    BuildId?: number;
+    UploadType?: string;
+    Remark?: string;
+    UrlParam?: IObjectKV;
+    Priority?: number;
+    IsDefaultPriority?: boolean;
+    FlowParams?: IObjectKVPriority[];
+    MinReplicas?: number;
+    MaxReplicas?: number;
+    RunId?: string;
+    Percent?: number;
+    CurrentReplicas?: number;
+    Architecture?: string;
+}
+export interface IObjectKV {
+    Key: string;
+    Value: string;
+}
+export interface IReleaseOrderInfo {
+    Id?: number;
+    ServerName?: string;
+    CurrentVersion?: IVersionInfo;
+    ReleaseVersion?: IVersionInfo;
+    GrayStatus?: string;
+    ReleaseStatus?: string;
+    TrafficTypeValues?: IObjectKV[];
+    TrafficType?: string;
+    FlowRatio?: number;
+    CreateTime?: string;
+    IsReleasing?: boolean;
+}

package/types/interfaces/function.interface.d.ts

@@ -25,6 +25,16 @@ export interface ICloudFunction extends ICloudFunctionConfig {
     name: string;
     description?: string;
     type?: 'Event' | 'HTTP';
+    protocolType?: 'WS';
+    protocolParams?: {
+        wsParams?: {
+            idleTimeOut?: number;
+        };
+    };
+    instanceConcurrencyConfig?: {
+        dynamicEnabled?: 'FALSE';
+        maxConcurrency?: number;
+    };
     handler?: string;
     codeSecret?: string;
     isWaitInstall?: boolean;