@geek-fun/serverlessinsight 0.6.10 → 0.6.12

package/README.md

@@ -333,10 +333,13 @@ When binding a custom domain that requires ownership verification:
 
 For OSS static website hosting, ServerlessInsight supports:
 
-| Domain Type       | CNAME Target                     | Use Case                                       |
-| ----------------- | -------------------------------- | ---------------------------------------------- |
-| Root domain (`@`) | `bucket.region.taihangcda.cn`    | Bypasses DNS CNAME restriction on root domains |
-| Subdomain (`www`) | `bucket.oss-region.aliyuncs.com` | Standard OSS endpoint                          |
+| Domain Type       | CNAME Target                  | Use Case                                       |
+| ----------------- | ----------------------------- | ---------------------------------------------- |
+| Root domain (`@`) | `bucket.region.taihangcda.cn` | Bypasses DNS CNAME restriction on root domains |
+| Subdomain (`www`) | `bucket.region.taihangcda.cn` | Standard CNAME for all subdomains              |
+| Any subdomain     | `bucket.region.taihangcda.cn` | Unified CNAME endpoint for all domain types    |
+
+> 💡 **Note**: All domain types now use the recommended `taihangcda.cn` CNAME endpoint, which is derived automatically from your bucket's actual extranet endpoint via the `GetBucketInfo` API.
 
 For detailed configuration, see [OSS Custom Domain Binding Guide](./docs/oss-custom-domain-binding.md).
 

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@geek-fun/serverlessinsight",
-    "version": "0.6.10",
+    "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,8 +40,19 @@ const createOssOperations = (ossClient, region, dnsOps) => {
     const useBucket = (bucketName) => {
         ossClient.useBucket(bucketName);
     };
-    const getOssEndpoint = (bucketName) => {
-        return `${bucketName}.oss-${region}.aliyuncs.com`;
+    const getBucketCnameEndpoint = async (bucketName) => {
+        const infoResult = await ossClient.getBucketInfo(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 }));
+        }
+        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)
@@ -222,26 +233,27 @@ const createOssOperations = (ossClient, region, dnsOps) => {
         }
     };
     const bindCustomDomain = async (bucketName, domain, certificate) => {
-        const mainDomain = (0, domainUtils_1.extractMainDomain)(domain);
-        const hostRecord = (0, domainUtils_1.extractHostRecord)(domain, mainDomain);
-        const ossEndpoint = getOssEndpoint(bucketName);
-        let cnameResult = await putBucketCname(bucketName, domain, certificate);
+        const normalizedDomain = (0, domainUtils_1.normalizeDomain)(domain);
+        const mainDomain = (0, domainUtils_1.extractMainDomain)(normalizedDomain);
+        const hostRecord = (0, domainUtils_1.extractHostRecord)(normalizedDomain, mainDomain);
+        const ossEndpoint = await getBucketCnameEndpoint(bucketName);
+        let cnameResult = await putBucketCname(bucketName, normalizedDomain, certificate);
         let txtRecordId;
         if (cnameResult.needVerification) {
-            const verificationResult = await handleDomainOwnershipVerification(bucketName, domain, certificate);
+            const verificationResult = await handleDomainOwnershipVerification(bucketName, normalizedDomain, certificate);
             cnameResult = verificationResult;
             txtRecordId = verificationResult.txtRecordId;
         }
         const bucketCnameBound = cnameResult.success;
         if (certificate && bucketCnameBound) {
-            logger_1.logger.info(lang_1.lang.__('OSS_BUCKET_CERT_BOUND', { domain }));
+            logger_1.logger.info(lang_1.lang.__('OSS_BUCKET_CERT_BOUND', { domain: normalizedDomain }));
         }
-        await addCorsRuleForDomain(bucketName, domain);
+        await addCorsRuleForDomain(bucketName, normalizedDomain);
         if (!dnsOps) {
-            logger_1.logger.warn(lang_1.lang.__('OSS_DNS_MANUAL_CONFIG_REQUIRED', { domain, cname: ossEndpoint }));
-            return { domain, cname: ossEndpoint, bucketCnameBound, txtRecordId };
+            logger_1.logger.warn(lang_1.lang.__('OSS_DNS_MANUAL_CONFIG_REQUIRED', { domain: normalizedDomain, cname: ossEndpoint }));
+            return { domain: normalizedDomain, cname: ossEndpoint, bucketCnameBound, txtRecordId };
         }
-        const result = await createOrFindDnsCnameRecord(domain, mainDomain, hostRecord, ossEndpoint, bucketCnameBound);
+        const result = await createOrFindDnsCnameRecord(normalizedDomain, mainDomain, hostRecord, ossEndpoint, bucketCnameBound);
         return { ...result, txtRecordId };
     };
     const logOssVerificationInstructions = (domain, fullTxtRecord, token) => {
@@ -255,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,
@@ -377,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)}`,
@@ -699,7 +711,6 @@ const createOssOperations = (ossClient, region, dnsOps) => {
         },
         bindCustomDomain,
         unbindCustomDomain,
-        getOssEndpoint,
         createCnameToken,
     };
 };

package/dist/src/common/domainUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deriveWwwDomain = exports.extractHostRecord = exports.extractMainDomain = void 0;
+exports.deriveWwwDomain = exports.extractHostRecord = exports.extractMainDomain = exports.normalizeDomain = void 0;
 const MULTI_LEVEL_TLDS = new Set([
     // United Kingdom
     'co.uk',
@@ -93,6 +93,13 @@ const MULTI_LEVEL_TLDS = new Set([
     'gov.sg',
     'edu.sg',
 ]);
+const normalizeDomain = (domain) => {
+    if (domain.startsWith('@.')) {
+        return domain.slice(2);
+    }
+    return domain;
+};
+exports.normalizeDomain = normalizeDomain;
 const extractMainDomain = (domainName) => {
     const parts = domainName.split('.');
     if (parts.length <= 2) {

package/dist/src/lang/en.js

@@ -329,6 +329,8 @@ exports.en = {
     OSS_BUCKET_PUBLIC_ACCESS_BLOCK_DISABLED: 'Disabled Block Public Access for bucket: {{bucketName}}',
     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_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

@@ -326,7 +326,9 @@ exports.zhCN = {
     OSS_CORS_RULE_REMOVED: '已移除自定义域名的 CORS 规则: {{domain}}',
     OSS_CORS_RULE_REMOVE_FAILED: '移除 {{domain}} 的 CORS 规则失败: {{error}}',
     OSS_BUCKET_PUBLIC_ACCESS_BLOCK_DISABLED: '已为存储桶禁用公共访问阻止: {{bucketName}}',
-    OSS_BUCKET_PUBLIC_ACCESS_BLOCK_DISABLE_FAILED: '禁用存储桶 {{bucketName}} 的公共访问阻止失败: {{error}}。您可能需要在阿里云 OSS 控制台手动禁用公共访问阻止。',
+    OSS_BUCKET_PUBLIC_ACCESS_BLOCK_DISABLE_FAILED: '禁用存储桶 {{bucketName}} 的公共访问阻止失败：{{error}}。您可能需要在阿里云 OSS 控制台手动禁用公共访问阻止。',
+    OSS_BUCKET_EXTRANET_ENDPOINT_NOT_FOUND: '存储桶 {{bucketName}} 未找到外网访问端点。该存储桶可能未启用公共访问。',
+    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.10",
+  "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",