@geek-fun/serverlessinsight 0.6.11 → 0.6.12

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@geek-fun/serverlessinsight",
-    "version": "0.6.11",
+    "version": "0.6.12",
     "description": "Full life cycle cross providers serverless application management for your fast-growing business.",
     "homepage": "https://serverlessinsight.geekfun.club",
     "main": "dist/src/index.js",

package/dist/src/common/aliyunClient/ossOperations.js

@@ -40,27 +40,19 @@ const createOssOperations = (ossClient, region, dnsOps) => {
     const useBucket = (bucketName) => {
         ossClient.useBucket(bucketName);
     };
-    const getBucketExtranetEndpoint = async (bucketName) => {
+    const getBucketCnameEndpoint = async (bucketName) => {
         const infoResult = await ossClient.getBucketInfo(bucketName);
-        const endpoint = infoResult.bucket.ExtranetEndpoint;
-        if (!endpoint) {
-            throw new Error(lang_1.lang.__('OSS_BUCKET_EXTRANET_ENDPOINT_NOT_FOUND', { bucketName }));
+        const bucket = infoResult.bucket;
+        const actualBucketName = bucket.Name || bucketName;
+        const location = bucket.Location;
+        if (!location) {
+            throw new Error(lang_1.lang.__('OSS_BUCKET_LOCATION_NOT_FOUND', { bucketName }));
         }
-        return endpoint;
-    };
-    const getCnameEndpointFromExtranet = (extranetEndpoint) => {
-        const suffix = '.aliyuncs.com';
-        if (!extranetEndpoint.endsWith(suffix)) {
-            throw new Error(lang_1.lang.__('OSS_BUCKET_ENDPOINT_INVALID_FORMAT', { extranetEndpoint }));
-        }
-        const withoutAliyun = extranetEndpoint.slice(0, -suffix.length);
-        const lastDotIndex = withoutAliyun.lastIndexOf('.');
-        if (lastDotIndex <= 0) {
-            throw new Error(lang_1.lang.__('OSS_BUCKET_ENDPOINT_INVALID_FORMAT', { extranetEndpoint }));
-        }
-        const bucketPart = withoutAliyun.slice(0, lastDotIndex);
-        const regionWithout = withoutAliyun.slice(lastDotIndex + 1).replace(/^oss-/, '');
-        return `${bucketPart}.${regionWithout}.taihangcda.cn`;
+        const derivedRegion = location.replace(/^oss-/, '');
+        const isChinaRegion = derivedRegion.startsWith('cn-');
+        return isChinaRegion
+            ? `${actualBucketName}.${derivedRegion}.taihangcda.cn`
+            : `${actualBucketName}.oss-${derivedRegion}.aliyuncs.com`;
     };
     const buildCertificateXml = (cert) => {
         if (!cert)
@@ -244,8 +236,7 @@ const createOssOperations = (ossClient, region, dnsOps) => {
         const normalizedDomain = (0, domainUtils_1.normalizeDomain)(domain);
         const mainDomain = (0, domainUtils_1.extractMainDomain)(normalizedDomain);
         const hostRecord = (0, domainUtils_1.extractHostRecord)(normalizedDomain, mainDomain);
-        const extranetEndpoint = await getBucketExtranetEndpoint(bucketName);
-        const ossEndpoint = getCnameEndpointFromExtranet(extranetEndpoint);
+        const ossEndpoint = await getBucketCnameEndpoint(bucketName);
         let cnameResult = await putBucketCname(bucketName, normalizedDomain, certificate);
         let txtRecordId;
         if (cnameResult.needVerification) {
@@ -276,7 +267,7 @@ const createOssOperations = (ossClient, region, dnsOps) => {
         const tokenInfo = await createCnameToken(bucketName, domain);
         const txtRecordName = '_dnsauth';
         const hostRecord = (0, domainUtils_1.extractHostRecord)(domain, (0, domainUtils_1.extractMainDomain)(domain));
-        const fullTxtRecord = hostRecord ? `${txtRecordName}.${hostRecord}` : txtRecordName;
+        const fullTxtRecord = hostRecord && hostRecord !== '@' ? `${txtRecordName}.${hostRecord}` : txtRecordName;
         logger_1.logger.info(lang_1.lang.__('OSS_CNAME_VERIFICATION_TOKEN_CREATED', {
             domain,
             txtRecord: fullTxtRecord,
@@ -398,7 +389,7 @@ const createOssOperations = (ossClient, region, dnsOps) => {
         }
         const hostRecord = (0, domainUtils_1.extractHostRecord)(domain, (0, domainUtils_1.extractMainDomain)(domain));
         const txtRecordName = '_dnsauth';
-        const fullTxtRecord = hostRecord ? `${txtRecordName}.${hostRecord}` : txtRecordName;
+        const fullTxtRecord = hostRecord && hostRecord !== '@' ? `${txtRecordName}.${hostRecord}` : txtRecordName;
         logger_1.logger.warn(lang_1.lang.__('OSS_CNAME_VERIFICATION_RETRY_FAILED', {
             domain,
             txtRecord: `${fullTxtRecord}.${(0, domainUtils_1.extractMainDomain)(domain)}`,

package/dist/src/lang/en.js

@@ -330,7 +330,7 @@ exports.en = {
     OSS_BUCKET_PUBLIC_ACCESS_BLOCK_DISABLE_FAILED: 'Failed to disable Block Public Access for bucket {{bucketName}}: {{error}}. ' +
         'You may need to manually disable Block Public Access in the Alibaba Cloud OSS Console.',
     OSS_BUCKET_EXTRANET_ENDPOINT_NOT_FOUND: 'ExtranetEndpoint not found for bucket: {{bucketName}}. The bucket may not have public access enabled.',
-    OSS_BUCKET_ENDPOINT_INVALID_FORMAT: 'Invalid OSS endpoint format: {{extranetEndpoint}}. Expected format: {bucket}.oss-{region}.aliyuncs.com',
+    OSS_BUCKET_LOCATION_NOT_FOUND: 'Location not found for bucket: {{bucketName}}',
     // Tencent COS DNS messages
     COS_DNS_CNAME_CREATED: 'Created DNS CNAME record: {{domain}} -> {{cname}}',
     COS_DNS_CNAME_EXISTS: 'DNS CNAME record already exists: {{domain}} -> {{cname}}',

package/dist/src/lang/zh-CN.js

@@ -328,7 +328,7 @@ exports.zhCN = {
     OSS_BUCKET_PUBLIC_ACCESS_BLOCK_DISABLED: '已为存储桶禁用公共访问阻止: {{bucketName}}',
     OSS_BUCKET_PUBLIC_ACCESS_BLOCK_DISABLE_FAILED: '禁用存储桶 {{bucketName}} 的公共访问阻止失败：{{error}}。您可能需要在阿里云 OSS 控制台手动禁用公共访问阻止。',
     OSS_BUCKET_EXTRANET_ENDPOINT_NOT_FOUND: '存储桶 {{bucketName}} 未找到外网访问端点。该存储桶可能未启用公共访问。',
-    OSS_BUCKET_ENDPOINT_INVALID_FORMAT: 'OSS 端点格式无效：{{extranetEndpoint}}。预期格式：{bucket}.oss-{region}.aliyuncs.com',
+    OSS_BUCKET_LOCATION_NOT_FOUND: '存储桶 {{bucketName}} 未找到地域信息',
     // Tencent COS DNS messages
     COS_DNS_CNAME_CREATED: '已创建 DNS CNAME 记录: {{domain}} -> {{cname}}',
     COS_DNS_CNAME_EXISTS: 'DNS CNAME 记录已存在: {{domain}} -> {{cname}}',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geek-fun/serverlessinsight",
-  "version": "0.6.11",
+  "version": "0.6.12",
   "description": "Full life cycle cross providers serverless application management for your fast-growing business.",
   "homepage": "https://serverlessinsight.geekfun.club",
   "main": "dist/src/index.js",