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

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

@@ -103,12 +103,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 +250,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 +283,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 +615,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 +665,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 +692,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 +772,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 +865,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 +1040,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 +1202,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 +1219,7 @@ class FunctionService {
                 // 清理临时文件
                 await packer.clean();
                 if (err) {
-                    reject(err);
+                    reject(new error_1.CloudBaseError(`COS 上传失败: ${err.message || err}`));
                 }
                 else {
                     resolve(data);
@@ -1323,32 +1330,26 @@ 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('文件不能为空');
+            }
             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 上传
+        const legacyResult = await this.uploadFunctionZipToCosLegacy(options, installDependency);
         return {
-            ZipFile: base64
+            CosBucketRegion: constant_1.SCF_TEMP_COS.REGION,
+            TempCosObjectName: `/${legacyResult.Key}`
         };
     }
     // 获取 COS 临时信息
@@ -1387,10 +1388,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.3",
+    "version": "4.7.4-beta.1",
     "description": "The node manage service api for cloudbase.",
     "main": "lib/index.js",
     "scripts": {

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;
+};