@cloudbase/manager-node 5.0.0 → 5.1.0

package/lib/function/index.js

@@ -1477,14 +1477,16 @@ class FunctionService {
         });
     }
     /**
-     * 通过scf COS 上传方式（通过 GetTempCosInfo + COS SDK 上传）
+     * 通过 SCF COS 上传方式（通过 GetTempCosInfo + COS SDK 上传）
      * 返回 TempCosObjectName 用于创建/更新函数
      */
-    async uploadFunctionZipToCosLegacy(options, installDependency) {
+    async uploadFunctionZipToCos(options, installDependency) {
         const { func, functionPath, functionRootPath } = options;
-        const { env } = this.getFunctionConfig();
-        const { CloudAppId } = await this.userService.getTcbAccountInfo();
-        const objectPath = `${CloudAppId}/${env}/${func.name}.zip`;
+        const { env, appId } = this.getFunctionConfig();
+        if (!appId) {
+            throw new error_1.CloudBaseError('无法获取 AppId，请确认环境已开通存储服务');
+        }
+        const objectPath = `${appId}/${env}/${func.name}.zip`;
         // 1. 生成存放函数包的临时 Cos 目录
         const { Date: cosDate, Sign } = await this.scfService.request('GetTempCosInfo', {
             ObjectPath: `${objectPath}`
@@ -1545,10 +1547,11 @@ class FunctionService {
         });
     }
     /**
-     * 新的 COS 上传方式（通过 DescribeBuildServiceCosInfo + PUT 上传）
+     * 旧的 COS 上传方式（通过 DescribeBuildServiceCosInfo + PUT 上传）
      * 返回 CosTimestamp 用于创建/更新函数
+     * @deprecated 请使用 uploadFunctionZipToCos 代替
      */
-    async uploadFunctionZipToCos(options, installDependency) {
+    async uploadFunctionZipToCosLegacy(options, installDependency) {
         const { func, functionPath, functionRootPath } = options;
         const { env } = this.getFunctionConfig();
         // 1. 生成存放函数包的临时 Cos 目录
@@ -1649,13 +1652,13 @@ class FunctionService {
                 ZipFile: base64
             };
         }
-        // 默认走 COS 上传
+        // 默认走 COS 上传（GetTempCosInfo + COS SDK）
         console.log(`[${func.name}] 部署方式: COS 上传`);
         const region = this.environment.cloudBaseContext.region || constant_1.SCF_TEMP_COS.DEFAULT_REGION;
-        const legacyResult = await this.uploadFunctionZipToCosLegacy(options, installDependency);
+        const result = await this.uploadFunctionZipToCos(options, installDependency);
         return {
             CosBucketRegion: region,
-            TempCosObjectName: `/${legacyResult.Key}`
+            TempCosObjectName: `/${result.Key}`
         };
     }
     async createAccessPath(name, path) {
@@ -1717,11 +1720,14 @@ class FunctionService {
      * @memberof FunctionService
      */
     getFunctionConfig() {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const envConfig = this.environment.lazyEnvironmentConfig;
         // 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;
+        // AppId 可能为空字符串，从 Bucket 名称中提取
+        // COS Bucket 格式: {BucketName}-{APPID}，APPID 为纯数字
+        const storage = (_c = envConfig.Storages) === null || _c === void 0 ? void 0 : _c[0];
+        const appId = (storage === null || storage === void 0 ? void 0 : storage.AppId) || ((_e = (_d = storage === null || storage === void 0 ? void 0 : storage.Bucket) === null || _d === void 0 ? void 0 : _d.match(/-(\d+)$/)) === null || _e === void 0 ? void 0 : _e[1]) || '';
         const { proxy } = this.environment.cloudBaseContext;
         return {
             proxy,
@@ -1882,10 +1888,10 @@ __decorate([
 ], FunctionService.prototype, "getFunctionAlias", null);
 __decorate([
     (0, utils_1.preLazy)()
-], FunctionService.prototype, "uploadFunctionZipToCosLegacy", null);
+], FunctionService.prototype, "uploadFunctionZipToCos", null);
 __decorate([
     (0, utils_1.preLazy)()
-], FunctionService.prototype, "uploadFunctionZipToCos", null);
+], FunctionService.prototype, "uploadFunctionZipToCosLegacy", null);
 __decorate([
     (0, utils_1.preLazy)()
 ], FunctionService.prototype, "getCodeParams", null);

package/package.json

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