@cloudbase/manager-node 4.7.4-beta.0 → 4.7.4-beta.2

package/lib/cloudrun/index.js

@@ -16,7 +16,6 @@ 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");
 /**
  * 云托管服务管理类
  * 提供云托管服务的初始化、下载、列表查询和删除等功能
@@ -106,87 +105,6 @@ class CloudRunService {
             ServerType: params === null || params === void 0 ? void 0 : params.serverType
         }));
     }
-    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,
-                }]
-        });
-    }
-    /**
-     * 完成灰度
-     */
-    async promote(serverName) {
-        const envConfig = this.environment.lazyEnvironmentConfig;
-        // 获取当前版本和灰度版本
-        const { ReleaseOrderInfo } = await this.tcbrService.request('DescribeReleaseOrder', {
-            EnvId: envConfig.EnvId, // 环境 Id
-            ServerName: serverName // 服务名
-        });
-        const { CurrentVersion, ReleaseVersion } = ReleaseOrderInfo;
-        const res = 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,
-        });
-    }
-    /**
-     * 取消灰度
-     */
-    async rollback(serverName) {
-        const envConfig = this.environment.lazyEnvironmentConfig;
-        const { Task } = await this.tcbrService.request('DescribeServerManageTask', {
-            EnvId: envConfig.EnvId,
-            ServerName: serverName, // 服务名
-            TaskId: 0 // 任务Id
-        });
-        const res = await this.tcbrService.request('OperateServerManage', {
-            EnvId: envConfig.EnvId, // 环境 Id
-            ServerName: serverName,
-            TaskId: Task.Id,
-            OperateType: 'go_back',
-        });
-        return res;
-    }
     /**
      *查询云托管服务详情
      * @param {Object} params 查询参数
@@ -238,7 +156,7 @@ class CloudRunService {
      * @returns {Promise<IResponseInfo>} 返回部署操作的响应信息
      */
     async deploy(params) {
-        const { serverName, targetPath = process.cwd(), serverConfig, deployInfo: { ReleaseType = "FULL" } } = params;
+        const { serverName, targetPath = process.cwd(), serverConfig } = params;
         /**
          * 参数校验和默认值设置
          */
@@ -286,7 +204,7 @@ class CloudRunService {
                     RepoLanguage: 'Node.js'
                 };
             }
-            deployInfo.ReleaseType = ReleaseType;
+            deployInfo.ReleaseType = 'FULL';
             return this._upsertFunction(false, {
                 name: serverName,
                 deployInfo,
@@ -373,15 +291,6 @@ __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.ReleaseTypeEnum = exports.CloudrunServerType = void 0;
+exports.CloudrunServerType = void 0;
 var CloudrunServerType;
 (function (CloudrunServerType) {
     /**
@@ -12,14 +12,3 @@ 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/constant.js

@@ -4,7 +4,7 @@
 //     static credentail = 'credential'
 // }
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.COS_SDK_KEEPALIVE = exports.COS_SDK_PROTOCOL = exports.INTERNAL_ENDPOINT_REGION = exports.USE_INTERNAL_ENDPOINT = exports.SCF_STATUS = exports.ROLE_NAME = exports.PUBLIC_RSA_KEY = exports.ERROR = exports.SERVICE_TYPE = exports.ENDPOINT = exports.RUN_ENV = exports.SDK_VERSION = exports.ENV_NAME = void 0;
+exports.SCF_TEMP_COS = exports.COS_SDK_KEEPALIVE = exports.COS_SDK_PROTOCOL = exports.INTERNAL_ENDPOINT_REGION = exports.USE_INTERNAL_ENDPOINT = exports.SCF_STATUS = exports.ROLE_NAME = exports.PUBLIC_RSA_KEY = exports.ERROR = exports.SERVICE_TYPE = exports.ENDPOINT = exports.RUN_ENV = exports.SDK_VERSION = exports.ENV_NAME = void 0;
 exports.ENV_NAME = {
     ENV_SECRETID: 'TENCENTCLOUD_SECRETID',
     ENV_SECRETKEY: 'TENCENTCLOUD_SECRETKEY',
@@ -59,3 +59,8 @@ exports.USE_INTERNAL_ENDPOINT = "USE_INTERNAL_ENDPOINT" in process.env;
 exports.INTERNAL_ENDPOINT_REGION = process.env.INTERNAL_ENDPOINT_REGION;
 exports.COS_SDK_PROTOCOL = process.env.COS_SDK_PROTOCOL;
 exports.COS_SDK_KEEPALIVE = process.env.COS_SDK_KEEPALIVE;
+// SCF 临时 COS 配置（用于函数代码上传）
+exports.SCF_TEMP_COS = {
+    APPID: '1253665819',
+    REGION: 'ap-shanghai'
+};

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) {
@@ -103,12 +123,13 @@ class FunctionService {
      * @memberof FunctionService
      */
     async updateFunctionIncrementalCode(funcParam) {
-        const { env } = this.getFunctionConfig();
+        const { env, namespace } = this.getFunctionConfig();
         const { functionRootPath, func, deleteFiles, addFiles } = funcParam;
         const { name, runtime } = func;
         const params = {
             FunctionName: name,
-            EnvId: env
+            EnvId: env,
+            Namespace: namespace
         };
         let packer;
         let base64;
@@ -249,9 +270,9 @@ class FunctionService {
      */
     async listFunctions(limit = 20, offset = 0) {
         // 获取Function 环境配置
-        const { namespace } = this.getFunctionConfig();
-        const res = await this.scfService.request('ListFunctions', {
-            Namespace: namespace,
+        const { env } = this.getFunctionConfig();
+        const res = await this.tcbService.request('ListFunctions', {
+            EnvId: env,
             Limit: limit,
             Offset: offset
         });
@@ -282,8 +303,8 @@ class FunctionService {
         const { envId } = options;
         while (true) {
             try {
-                const res = await this.scfService.request('ListFunctions', {
-                    Namespace: envId,
+                const res = await this.tcbService.request('ListFunctions', {
+                    EnvId: envId,
                     Limit: pageSize,
                     Offset: currentOffset
                 });
@@ -614,7 +635,8 @@ class FunctionService {
         }
         catch (e) {
             throw new error_1.CloudBaseError(`[${func.name}] 更新函数配置失败：${e.message}`, {
-                code: e.code
+                code: e.code,
+                requestId: e.requestId
             });
         }
     }
@@ -663,8 +685,9 @@ class FunctionService {
             return res;
         }
         catch (e) {
-            throw new error_1.CloudBaseError(`[${funcName}] 函数代码更新失败： ${e.message}`, {
-                code: e.code
+            throw new error_1.CloudBaseError(`[${funcName}] 函数代码更新失败：${e.message}`, {
+                code: e.code,
+                requestId: e.requestId
             });
         }
     }
@@ -689,7 +712,9 @@ class FunctionService {
             return Object.assign({ RequestId }, Result);
         }
         catch (e) {
-            throw new error_1.CloudBaseError(`[${name}] 调用失败：\n${e.message}`);
+            throw new error_1.CloudBaseError(`[${name}] 调用失败：${e.message}`, {
+                requestId: e.requestId
+            });
         }
     }
     /**
@@ -767,7 +792,8 @@ class FunctionService {
         catch (e) {
             throw new error_1.CloudBaseError(`[${name}] 创建触发器失败：${e.message}`, {
                 action: e.action,
-                code: e.code
+                code: e.code,
+                requestId: e.requestId
             });
         }
     }
@@ -859,7 +885,9 @@ class FunctionService {
             return { Url, RequestId, CodeSha256 };
         }
         catch (e) {
-            throw new error_1.CloudBaseError(`[${functionName}] 获取函数代码下载链接失败：\n${e.message}`);
+            throw new error_1.CloudBaseError(`[${functionName}] 获取函数代码下载链接失败：${e.message}`, {
+                requestId: e.requestId
+            });
         }
     }
     // 函数绑定文件层
@@ -1032,9 +1060,9 @@ class FunctionService {
                         return;
                     // 创建失败
                     if (Status === constant_1.SCF_STATUS.CREATE_FAILED) {
-                        StatusDesc && console.log(`函数状态描述: ${StatusDesc}`);
-                        const errorDetails = StatusReasons.map(item => `[${item.ErrorCode}] ${item.ErrorMessage}`).join('\n');
-                        throw new error_1.CloudBaseError(`云函数创建失败\n失败信息: ${errorDetails}\nRequestId: ${RequestId}`);
+                        const errorDetails = (StatusReasons === null || StatusReasons === void 0 ? void 0 : StatusReasons.map(item => `[${item.ErrorCode}] ${item.ErrorMessage}`).join('\n')) || '';
+                        const errorMsg = `云函数创建失败${StatusDesc ? `\n状态描述: ${StatusDesc}` : ''}${errorDetails ? `\n失败信息: ${errorDetails}` : ''}`;
+                        throw new error_1.CloudBaseError(errorMsg, { requestId: RequestId });
                     }
                     // 函数状态正常
                     clearInterval(ticker);
@@ -1194,11 +1222,10 @@ class FunctionService {
         const zipFilePath = await packer.compressFiles();
         // 3. 初始化 cos 并上传
         const tempCosObjectName = `/${cosDate}/${objectPath}`;
-        const TEMP_COS_APPID = '1253665819';
         const uploadParams = {
-            Bucket: `shtempcos-${TEMP_COS_APPID}`,
+            Bucket: `shtempcos-${constant_1.SCF_TEMP_COS.APPID}`,
             Key: tempCosObjectName,
-            Region: 'ap-shanghai',
+            Region: constant_1.SCF_TEMP_COS.REGION,
             FilePath: zipFilePath,
         };
         const cos = new cos_nodejs_sdk_v5_1.default({
@@ -1212,7 +1239,7 @@ class FunctionService {
                 // 清理临时文件
                 await packer.clean();
                 if (err) {
-                    reject(err);
+                    reject(new error_1.CloudBaseError(`COS 上传失败: ${err.message || err}`));
                 }
                 else {
                     resolve(data);
@@ -1323,32 +1350,28 @@ class FunctionService {
             root: functionRootPath
         });
         await packer.build();
-        // 判断是否超过 ZipFile 上传大小限制（1.5MB）
-        const reachMax = await packer.isReachMaxSize();
-        // 如果指定了 zip 上传方式但超过大小限制，直接报错
-        if (deployMode === 'zip' && reachMax) {
-            throw new error_1.CloudBaseError('ZipFile 上传不能大于 1.5MB，请使用 COS 上传方式（deployMode: "cos"）');
-        }
-        // 走 COS 上传：指定 cos 模式，或未指定模式但超过大小限制
-        const useCos = deployMode === 'cos' || reachMax;
-        if (useCos) {
-            // 先调用scf的 COS 上传方式
-            const legacyResult = await this.uploadFunctionZipToCosLegacy(options, installDependency);
-            // 再调用tcb COS 上传方式
-            const cosResult = await this.uploadFunctionZipToCos(options, installDependency);
+        // 指定 zip 上传方式：走 ZipFile base64 上传
+        if (deployMode === 'zip') {
+            // 判断是否超过 ZipFile 上传大小限制（1.5MB）
+            const reachMax = await packer.isReachMaxSize();
+            if (reachMax) {
+                throw new error_1.CloudBaseError('ZipFile 上传不能大于 1.5MB，请使用 COS 上传方式（deployMode: "cos"）');
+            }
+            const base64 = await packer.getBase64Code();
+            if (!(base64 === null || base64 === void 0 ? void 0 : base64.length)) {
+                throw new error_1.CloudBaseError('文件不能为空');
+            }
+            console.log(`[${func.name}] 部署方式: ZIP base64 上传`);
             return {
-                CosTimestamp: cosResult.UnixTimestamp,
-                CosBucketRegion: 'ap-shanghai',
-                TempCosObjectName: `/${legacyResult.Key}`
+                ZipFile: base64
             };
         }
-        // ZIP base64 上传
-        const base64 = await packer.getBase64Code();
-        if (!(base64 === null || base64 === void 0 ? void 0 : base64.length)) {
-            throw new error_1.CloudBaseError('文件不能为空');
-        }
+        // 默认走 COS 上传
+        console.log(`[${func.name}] 部署方式: COS 上传`);
+        const legacyResult = await this.uploadFunctionZipToCosLegacy(options, installDependency);
         return {
-            ZipFile: base64
+            CosBucketRegion: constant_1.SCF_TEMP_COS.REGION,
+            TempCosObjectName: `/${legacyResult.Key}`
         };
     }
     // 获取 COS 临时信息
@@ -1387,10 +1410,11 @@ class FunctionService {
      * @memberof FunctionService
      */
     getFunctionConfig() {
-        var _a;
+        var _a, _b, _c, _d;
         const envConfig = this.environment.lazyEnvironmentConfig;
-        const namespace = envConfig.Functions[0].Namespace;
-        const appId = (_a = envConfig.Storages[0]) === null || _a === void 0 ? void 0 : _a.AppId;
+        // Functions 可能为空
+        const namespace = ((_b = (_a = envConfig.Functions) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.Namespace) || '';
+        const appId = (_d = (_c = envConfig.Storages) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.AppId;
         const { proxy } = this.environment.cloudBaseContext;
         return {
             proxy,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/manager-node",
-    "version": "4.7.4-beta.0",
+    "version": "4.7.4-beta.2",
     "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, ReleaseTypeEnum } from './type';
+import { CloudrunServerType, ICloudrunDetailResponse, ICloudrunListResponse, ICloudrunServerBaseConfig, ICloudrunServerBaseInfo, IDiffConfigItem, ITemplate } from './type';
 /**
  * 云托管服务管理类
  * 提供云托管服务的初始化、下载、列表查询和删除等功能
@@ -56,19 +56,6 @@ export declare class CloudRunService {
         serverName?: string;
         serverType?: CloudrunServerType;
     }): Promise<ICloudrunListResponse>;
-    setTraffic(serverName: string, stablePercent: number, canaryPercent: number): Promise<{
-        RequestId?: string;
-    }>;
-    /**
-     * 完成灰度
-     */
-    promote(serverName: string): Promise<void>;
-    /**
-     * 取消灰度
-     */
-    rollback(serverName: string): Promise<{
-        RequestId?: string;
-    }>;
     /**
      *查询云托管服务详情
      * @param {Object} params 查询参数
@@ -112,9 +99,6 @@ 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,16 +8,6 @@ export declare enum CloudrunServerType {
      */
     Container = "container"
 }
-export declare enum ReleaseTypeEnum {
-    /**
-     * 灰度发布
-     */
-    GRAY = "GRAY",
-    /**
-     * 全量发布
-     */
-    FULL = "FULL"
-}
 /**
  * 服务基础信息接口
  */
@@ -337,71 +327,3 @@ 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/constant.d.ts

@@ -48,3 +48,7 @@ export declare const enum COS_ENDPOINT {
 }
 export declare const COS_SDK_PROTOCOL: string;
 export declare const COS_SDK_KEEPALIVE: string;
+export declare const SCF_TEMP_COS: {
+    APPID: string;
+    REGION: string;
+};

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;