@cloudbase/manager-node 5.8.7 → 5.8.8-beta.0

package/lib/env/index.js

@@ -17,6 +17,7 @@ const signature_nodejs_1 = require("@cloudbase/signature-nodejs");
 const error_1 = require("../error");
 const utils_1 = require("../utils");
 const constant_1 = require("../constant");
+const storage_config_1 = require("../utils/storage-config");
 const billing_1 = require("../billing");
 const uuid_1 = require("uuid");
 class EnvService {
@@ -828,25 +829,6 @@ class EnvService {
     async deleteHttpServiceRoute(params) {
         return this.cloudService.request('DeleteHTTPServiceRoute', Object.assign({}, params));
     }
-    /**
-     * 清除HTTP访问服务域名缓存
-     * 支持 CDN 和 EO 两种缓存类型。CDN 仅支持 PURGE_URL 刷新方式；PURGE_PREFIX / PURGE_HOST 仅 EO 支持
-     * 清除缓存后会生成任务ID，可通过 DescribeHTTPServiceCachePurgeTask 查询任务进度和详细信息
-     * @param {PurgeHttpServiceCacheParams} params 清除缓存参数
-     * @returns {Promise<PurgeHttpServiceCacheRes>}
-     */
-    async purgeHttpServiceCache(params) {
-        return this.cloudService.request('PurgeHTTPServiceCache', Object.assign({}, params));
-    }
-    /**
-     * 查询HTTP访问服务域名缓存清除任务详情
-     * 通过 purgeHttpServiceCache 清除域名缓存后，可传入任务ID查询清除任务状态、时间、缓存类型等信息；也可不传任务ID查询历史任务记录
-     * @param {DescribeHttpServiceCachePurgeTaskParams} params 查询参数
-     * @returns {Promise<DescribeHttpServiceCachePurgeTaskRes>}
-     */
-    async describeHttpServiceCachePurgeTask(params) {
-        return this.cloudService.request('DescribeHTTPServiceCachePurgeTask', Object.assign({}, params));
-    }
     /**
      * 绑定自定义域名到HTTP访问服务
      * 底层调用 CreateHTTPServiceRoute API，专用于域名绑定场景
@@ -919,7 +901,14 @@ class EnvService {
         return res.CORSRules;
     }
     // 添加 COS CORS 域名，和 Web 端行为保持一致
+    // 共享桶（ExternalStorage）环境直接跳过：桶的 CORS 规则作用于桶内所有环境，不能随单个环境的安全域名覆盖；
+    // 调用方未 await 此方法，这里不抛错，避免产生未处理的 Promise rejection
     async modifyCosCorsDomain(domain, deleted = false) {
+        var _a, _b, _c;
+        const storage = (_b = (_a = this.environment.lazyEnvironmentConfig) === null || _a === void 0 ? void 0 : _a.Storages) === null || _b === void 0 ? void 0 : _b[0];
+        if (!(storage === null || storage === void 0 ? void 0 : storage.Bucket) && ((_c = storage === null || storage === void 0 ? void 0 : storage.ExternalStorage) === null || _c === void 0 ? void 0 : _c.Enabled) === true) {
+            return;
+        }
         const cos = this.getCos();
         const putBucketCors = util_1.default.promisify(cos.putBucketCors).bind(cos);
         const { bucket, region } = this.getStorageConfig();
@@ -966,15 +955,7 @@ class EnvService {
         return new cos_nodejs_sdk_v5_1.default(cosConfig);
     }
     getStorageConfig() {
-        var _a;
-        const envConfig = this.environment.lazyEnvironmentConfig;
-        const storageConfig = (_a = envConfig === null || envConfig === void 0 ? void 0 : envConfig.Storages) === null || _a === void 0 ? void 0 : _a[0];
-        const { Region, Bucket } = storageConfig;
-        return {
-            env: envConfig.EnvId,
-            region: Region,
-            bucket: Bucket
-        };
+        return (0, storage_config_1.resolveStorageConfig)(this.environment.lazyEnvironmentConfig);
     }
     parseBillTags(billTags) {
         if (typeof billTags !== 'string') {

package/lib/hosting/index.js

@@ -16,6 +16,7 @@ const make_dir_1 = __importDefault(require("make-dir"));
 const error_1 = require("../error");
 const utils_1 = require("../utils");
 const parallel_1 = require("../utils/parallel");
+const storage_config_1 = require("../utils/storage-config");
 const envDomainCache = new Map();
 const HostingStatusMap = {
     init: '初始化中',
@@ -66,13 +67,13 @@ class HostingService {
         };
     }
     async findFiles(options) {
-        const hosting = await this.checkStatus();
-        const { Bucket, Regoin } = hosting;
+        const { bucket, region, basePath } = await this.getHostingBucket();
         const { maxKeys, marker, prefix } = options;
         const storageService = await this.environment.getStorageService();
         const res = await storageService.getBucket({
-            bucket: Bucket,
-            region: Regoin,
+            bucket,
+            region,
+            basePath,
             maxKeys,
             marker,
             prefix
@@ -83,13 +84,13 @@ class HostingService {
      * 展示文件列表
      */
     async listFiles() {
-        const hosting = await this.checkStatus();
-        const { Bucket, Regoin } = hosting;
+        const { bucket, region, basePath } = await this.getHostingBucket();
         const storageService = await this.environment.getStorageService();
         const list = await storageService.walkCloudDirCustom({
             prefix: '',
-            bucket: Bucket,
-            region: Regoin
+            bucket,
+            region,
+            basePath
         });
         return list;
     }
@@ -132,8 +133,7 @@ class HostingService {
      */
     async uploadFiles(options) {
         const { localPath, cloudPath, entryFiles, files = [], onProgress, onFileFinish, parallel = 20, ignore = ['.DS_Store'], retryCount, retryInterval, verify = false, safe = false, prune = false } = options;
-        const hosting = await this.checkStatus();
-        const { Bucket, Regoin } = hosting;
+        const { bucket, region, basePath } = await this.getHostingBucket();
         const storageService = await this.environment.getStorageService();
         let uploadFiles = Array.isArray(files) ? files : [];
         // localPath 存在，上传文件夹/文件
@@ -147,8 +147,9 @@ class HostingService {
                         localPath: resolvePath,
                         cloudPath,
                         entries: entryFiles,
-                        bucket: Bucket,
-                        region: Regoin,
+                        bucket,
+                        region,
+                        basePath,
                         onProgress,
                         onFileFinish,
                         fileId: false,
@@ -165,12 +166,14 @@ class HostingService {
                     localPath: resolvePath,
                     cloudPath,
                     entryFiles,
-                    bucket: Bucket,
-                    region: Regoin,
+                    bucket,
+                    region,
+                    basePath,
                     onProgress,
                     onFileFinish,
                     fileId: false,
                     ignore,
+                    parallel,
                     retryCount,
                     retryInterval,
                 });
@@ -190,8 +193,9 @@ class HostingService {
             parallel,
             onProgress,
             onFileFinish,
-            bucket: Bucket,
-            region: Regoin,
+            bucket,
+            region,
+            basePath,
             files: uploadFiles,
             fileId: false,
             retryCount,
@@ -204,19 +208,20 @@ class HostingService {
      */
     async deleteFiles(options) {
         const { cloudPath, isDir } = options;
-        const hosting = await this.checkStatus();
-        const { Bucket, Regoin } = hosting;
+        const { bucket, region, basePath } = await this.getHostingBucket();
         const storageService = await this.environment.getStorageService();
         if (isDir) {
             return storageService.deleteDirectoryCustom({
                 cloudPath,
-                bucket: Bucket,
-                region: Regoin
+                bucket,
+                region,
+                basePath
             });
         }
         else {
             try {
-                await storageService.deleteFileCustom([cloudPath], Bucket, Regoin);
+                // deleteFileCustom 按 COS 原始 Key 删除，共享桶下需先换算为物理 Key
+                await storageService.deleteFileCustom([(0, storage_config_1.toPhysicalKey)(basePath, cloudPath)], bucket, region);
                 return {
                     Deleted: [{ Key: cloudPath }],
                     Error: []
@@ -281,14 +286,15 @@ class HostingService {
     async downloadDirectory(options) {
         const { cloudPath, localPath } = options;
         const resolveLocalPath = path_1.default.resolve(localPath);
-        const hosting = await this.checkStatus();
-        const { Bucket, Regoin } = hosting;
+        const { bucket, region, basePath } = await this.getHostingBucket();
         const cloudDirectoryKey = this.getCloudKey(cloudPath);
         const storageService = await this.environment.getStorageService();
+        // 返回逻辑路径，downloadFile 通过托管域名访问，网关会自动拼接 BasePath
         const files = await storageService.walkCloudDirCustom({
             prefix: cloudDirectoryKey,
-            bucket: Bucket,
-            region: Regoin
+            bucket,
+            region,
+            basePath
         });
         const tasks = files.map(file => async () => {
             const fileRelativePath = file.Key.replace(cloudDirectoryKey, '');
@@ -389,10 +395,9 @@ class HostingService {
      * @memberof HostingService
      */
     async getWebsiteConfig() {
-        const hosting = await this.checkStatus();
-        const { Bucket, Regoin } = hosting;
+        const { bucket, region } = await this.getHostingBucket();
         const storageService = await this.environment.getStorageService();
-        const res = await storageService.getWebsiteConfig({ bucket: Bucket, region: Regoin });
+        const res = await storageService.getWebsiteConfig({ bucket, region });
         return res;
     }
     /**
@@ -401,12 +406,15 @@ class HostingService {
      */
     async setWebsiteDocument(options) {
         const { indexDocument, errorDocument, originalHttpStatus, charity404, autoAddressing, routingRules } = options;
-        const hosting = await this.checkStatus();
-        const { Bucket, Regoin } = hosting;
+        const { bucket, region, basePath } = await this.getHostingBucket();
+        // 共享桶的静态网站配置作用于桶内所有环境，按兼容边界（桶级操作不可作用于共享桶本身）明确拒绝
+        if (basePath) {
+            throw new error_1.CloudBaseError('当前环境的静态托管使用共享桶（ExternalStorage），静态网站配置作用于整个共享桶，由平台统一管理，不支持修改', { code: 'INVALID_OPERATION' });
+        }
         const storageService = await this.environment.getStorageService();
         const res = await storageService.putBucketWebsite({
-            bucket: Bucket,
-            region: Regoin,
+            bucket,
+            region,
             indexDocument,
             errorDocument,
             originalHttpStatus,
@@ -434,6 +442,19 @@ class HostingService {
         }
         return website;
     }
+    /**
+     * 检查 hosting 服务状态并解析有效桶，兼容共享桶（ExternalStorage）环境
+     * 静态托管的共享桶与 BasePath 独立于云存储，不能复用 StorageService.getStorageConfig
+     */
+    async getHostingBucket() {
+        const website = await this.checkStatus();
+        return (0, storage_config_1.resolveBucketConfig)({
+            envId: this.environment.getEnvId(),
+            bucket: website.Bucket,
+            region: website.Regoin,
+            externalStorage: website.ExternalStorage
+        });
+    }
     /**
      * 获取配置
      */