@geek-fun/serverlessinsight 0.6.8 → 0.6.9

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@geek-fun/serverlessinsight",
-    "version": "0.6.8",
+    "version": "0.6.9",
     "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/domainUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractHostRecord = exports.extractMainDomain = void 0;
+exports.deriveWwwDomain = exports.extractHostRecord = exports.extractMainDomain = void 0;
 const MULTI_LEVEL_TLDS = new Set([
     // United Kingdom
     'co.uk',
@@ -119,3 +119,21 @@ const extractHostRecord = (fullDomain, mainDomain) => {
     return fullDomain;
 };
 exports.extractHostRecord = extractHostRecord;
+/**
+ * Derive the www variant of a domain by prepending "www."
+ *
+ * @example deriveWwwDomain("example.com") // "www.example.com"
+ * @example deriveWwwDomain("www.example.com") // null (already has www prefix)
+ * @example deriveWwwDomain("api.example.com") // "www.api.example.com" (subdomains also get www prepended)
+ *
+ * Note: This function prepends "www." to any domain that doesn't already start with "www.",
+ * including subdomains. For example, "api.example.com" becomes "www.api.example.com".
+ * Users should ensure the domain is appropriate for www binding before calling this function.
+ */
+const deriveWwwDomain = (domain) => {
+    if (domain.startsWith('www.')) {
+        return null;
+    }
+    return `www.${domain}`;
+};
+exports.deriveWwwDomain = deriveWwwDomain;

package/dist/src/lang/en.js

@@ -223,6 +223,8 @@ exports.en = {
     // API Gateway messages
     APIGW_GROUP_FOUND_REUSING: 'Found existing API Group: {{groupName}}, will reuse it',
     APIGW_DOMAIN_BINDING_FAILED: 'Failed to bind custom domain: {{error}}',
+    APIGW_DOMAIN_UNBIND_FAILED: 'Failed to unbind domain {{domain}}: {{error}}',
+    APIGW_WWW_DOMAIN_UNBIND_FAILED: 'Failed to unbind www domain {{domain}}: {{error}}',
     APIGW_GROUP_APIS_CREATED_DOMAIN_FAILED: 'API Gateway group and APIs created successfully, but domain binding failed',
     APIGW_STATE_SAVED_RETRY: 'State has been saved. You can fix domain verification and retry deployment',
     APIGW_DOMAIN_VERIFICATION_REQUIRED: 'Domain {{domainName}} requires ownership verification. Add DNS records as instructed above.',

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

@@ -221,8 +221,10 @@ exports.zhCN = {
     LOCK_TIME_AGO_ONE_HOUR: '1 小时前',
     LOCK_TIME_AGO_HOURS: '{{hours}} 小时前',
     // API Gateway messages
-    APIGW_GROUP_FOUND_REUSING: '找到现有 API 分组: {{groupName}}，将复用它',
-    APIGW_DOMAIN_BINDING_FAILED: '绑定自定义域名失败: {{error}}',
+    APIGW_GROUP_FOUND_REUSING: '找到现有 API 分组：{{groupName}}，将复用它',
+    APIGW_DOMAIN_BINDING_FAILED: '绑定自定义域名失败：{{error}}',
+    APIGW_DOMAIN_UNBIND_FAILED: '解绑域名 {{domain}} 失败：{{error}}',
+    APIGW_WWW_DOMAIN_UNBIND_FAILED: '解绑 www 域名 {{domain}} 失败：{{error}}',
     APIGW_GROUP_APIS_CREATED_DOMAIN_FAILED: 'API 网关分组和 API 创建成功，但域名绑定失败',
     APIGW_STATE_SAVED_RETRY: '状态已保存。您可以修复域名验证问题后重新部署',
     APIGW_DOMAIN_VERIFICATION_REQUIRED: '域名 {{domainName}} 需要所有权验证。请按照上面的说明添加 DNS 记录。',

package/dist/src/parser/bucketParser.js

@@ -4,10 +4,11 @@ exports.parseBucket = void 0;
 const types_1 = require("../types");
 const parseUtils_1 = require("./parseUtils");
 const isStructuredDomain = (domain) => typeof domain === 'object' && domain !== null && 'domain_name' in domain;
-const parseWebsiteDomain = (domain) => {
+const parseWebsiteDomain = (domain, www_bind_apex) => {
     if (domain == null) {
         return {
             domain: undefined,
+            www_bind_apex: (0, parseUtils_1.parseBooleanWithDefault)(www_bind_apex, false),
             domain_certificate_id: undefined,
             domain_certificate_body: undefined,
             domain_certificate_private_key: undefined,
@@ -17,6 +18,7 @@ const parseWebsiteDomain = (domain) => {
     if (!isStructuredDomain(domain)) {
         return {
             domain: String(domain),
+            www_bind_apex: (0, parseUtils_1.parseBooleanWithDefault)(www_bind_apex, false),
             domain_certificate_id: undefined,
             domain_certificate_body: undefined,
             domain_certificate_private_key: undefined,
@@ -25,6 +27,7 @@ const parseWebsiteDomain = (domain) => {
     }
     return {
         domain: String(domain.domain_name),
+        www_bind_apex: (0, parseUtils_1.parseBooleanWithDefault)(www_bind_apex, false),
         domain_certificate_id: domain.certificate_id != null ? String(domain.certificate_id) : undefined,
         domain_certificate_body: domain.certificate_body != null ? String(domain.certificate_body) : undefined,
         domain_certificate_private_key: domain.certificate_private_key != null ? String(domain.certificate_private_key) : undefined,
@@ -69,7 +72,7 @@ const parseBucket = (buckets) => {
         website: bucket.website
             ? {
                 code: String(bucket.website.code),
-                ...parseWebsiteDomain(bucket.website.domain),
+                ...parseWebsiteDomain(bucket.website.domain, bucket.website.www_bind_apex),
                 index: (0, parseUtils_1.parseStringWithDefault)(bucket.website.index, 'index.html'),
                 error_page: (0, parseUtils_1.parseStringWithDefault)(bucket.website.error_page, '404.html'),
                 error_code: (0, parseUtils_1.parseNumberWithDefault)(bucket.website.error_code, 404),

package/dist/src/parser/eventParser.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseEvent = void 0;
+const parseUtils_1 = require("./parseUtils");
 const parseEvent = (events) => {
     if (!events) {
         return undefined;
@@ -10,7 +11,12 @@ const parseEvent = (events) => {
         name: event.name,
         type: event.type,
         triggers: event.triggers?.map((trigger) => ({ ...trigger, method: trigger.method ?? 'GET' })),
-        domain: event.domain,
+        domain: event.domain
+            ? {
+                ...event.domain,
+                www_bind_apex: (0, parseUtils_1.parseBooleanWithDefault)(event.domain.www_bind_apex, false),
+            }
+            : undefined,
     }));
 };
 exports.parseEvent = parseEvent;

package/dist/src/stack/aliyunStack/apigwPlanner.js

@@ -40,15 +40,7 @@ const generateApigwPlan = async (context, state, events, serviceName) => {
                 path: t.path,
                 backend: t.backend,
             })),
-            domain: event.domain
-                ? {
-                    domainName: event.domain.domain_name,
-                    certificateId: event.domain.certificate_id ?? null,
-                    certificateBody: event.domain.certificate_body ?? null,
-                    certificatePrivateKey: event.domain.certificate_private_key ? '(managed)' : null,
-                    protocol: event.domain.protocol ?? null,
-                }
-                : null,
+            domain: (0, apigwTypes_1.extractEventDomainDefinition)(event.domain),
         };
         if (!currentState) {
             // No state exists, check if resource exists remotely

package/dist/src/stack/aliyunStack/apigwResource.js

@@ -8,6 +8,7 @@ const common_1 = require("../../common");
 const certUtils_1 = require("../../common/certUtils");
 const logger_1 = require("../../common/logger");
 const lang_1 = require("../../lang");
+const domainUtils_1 = require("../../common/domainUtils");
 const buildApigwGroupInstanceFromProvider = (info, stage) => {
     return {
         type: 'ALIYUN_APIGW_GROUP',
@@ -130,15 +131,7 @@ const createApigwResource = async (context, event, serviceName, roleArn, state)
                 path: t.path,
                 backend: t.backend,
             })),
-            domain: event.domain
-                ? {
-                    domainName: event.domain.domain_name,
-                    certificateId: event.domain.certificate_id ?? null,
-                    certificateBody: event.domain.certificate_body ?? null,
-                    certificatePrivateKey: event.domain.certificate_private_key ? '(managed)' : null,
-                    protocol: event.domain.protocol ?? null,
-                }
-                : null,
+            domain: (0, apigwTypes_1.extractEventDomainDefinition)(event.domain),
         },
         instances,
         lastUpdated: new Date().toISOString(),
@@ -172,15 +165,7 @@ const createApigwResource = async (context, event, serviceName, roleArn, state)
                     path: t.path,
                     backend: t.backend,
                 })),
-                domain: event.domain
-                    ? {
-                        domainName: event.domain.domain_name,
-                        certificateId: event.domain.certificate_id ?? null,
-                        certificateBody: event.domain.certificate_body ?? null,
-                        certificatePrivateKey: event.domain.certificate_private_key ? '(managed)' : null,
-                        protocol: event.domain.protocol ?? null,
-                    }
-                    : null,
+                domain: (0, apigwTypes_1.extractEventDomainDefinition)(event.domain),
             },
             instances,
             lastUpdated: new Date().toISOString(),
@@ -189,8 +174,22 @@ const createApigwResource = async (context, event, serviceName, roleArn, state)
     }
     if (event.domain) {
         try {
+            const primaryDomain = event.domain.domain_name;
+            const wwwBindApex = event.domain.www_bind_apex === true;
             const domainConfig = await buildDomainBindingConfig(event.domain, groupId, serviceName, event.key, context.stage, client);
             state = await client.apigw.bindCustomDomain(domainConfig, state, logicalId);
+            const wwwDomain = wwwBindApex ? (0, domainUtils_1.deriveWwwDomain)(primaryDomain) : null;
+            if (wwwDomain) {
+                logger_1.logger.info(lang_1.lang.__('APIGW_BINDING_DOMAIN', { domain: wwwDomain }));
+                const wwwDomainConfig = {
+                    ...domainConfig,
+                    domainName: wwwDomain,
+                    certificateName: domainConfig.certificateName
+                        ? `${domainConfig.certificateName}-www`
+                        : undefined,
+                };
+                state = await client.apigw.bindCustomDomain(wwwDomainConfig, state, logicalId);
+            }
         }
         catch (error) {
             logger_1.logger.error(lang_1.lang.__('APIGW_DOMAIN_BINDING_FAILED', { error: String(error) }));
@@ -210,15 +209,7 @@ const createApigwResource = async (context, event, serviceName, roleArn, state)
                 path: t.path,
                 backend: t.backend,
             })),
-            domain: event.domain
-                ? {
-                    domainName: event.domain.domain_name,
-                    certificateId: event.domain.certificate_id ?? null,
-                    certificateBody: event.domain.certificate_body ?? null,
-                    certificatePrivateKey: event.domain.certificate_private_key ? '(managed)' : null,
-                    protocol: event.domain.protocol ?? null,
-                }
-                : null,
+            domain: (0, apigwTypes_1.extractEventDomainDefinition)(event.domain),
         },
         instances,
         lastUpdated: new Date().toISOString(),
@@ -307,8 +298,65 @@ const updateApigwResource = async (context, event, serviceName, roleArn, state)
         }
     }
     if (event.domain) {
+        const primaryDomain = event.domain.domain_name;
+        const wwwBindApex = event.domain.www_bind_apex === true;
+        const existingDomain = existingState.definition?.domain;
+        const previousWwwBindApex = existingDomain?.wwwBindApex === true;
+        const previousDomainName = existingDomain?.domainName;
         const domainConfig = await buildDomainBindingConfig(event.domain, groupId, serviceName, event.key, context.stage, client);
         state = await client.apigw.bindCustomDomain(domainConfig, state, logicalId);
+        const wwwDomain = wwwBindApex ? (0, domainUtils_1.deriveWwwDomain)(primaryDomain) : null;
+        if (wwwDomain) {
+            logger_1.logger.info(lang_1.lang.__('APIGW_BINDING_DOMAIN', { domain: wwwDomain }));
+            const wwwDomainConfig = {
+                ...domainConfig,
+                domainName: wwwDomain,
+                certificateName: domainConfig.certificateName
+                    ? `${domainConfig.certificateName}-www`
+                    : undefined,
+            };
+            state = await client.apigw.bindCustomDomain(wwwDomainConfig, state, logicalId);
+        }
+        if (previousWwwBindApex && previousDomainName) {
+            const previousWwwDomain = (0, domainUtils_1.deriveWwwDomain)(previousDomainName);
+            if (previousWwwDomain && previousWwwDomain !== wwwDomain) {
+                try {
+                    await client.apigw.unbindCustomDomain(groupId, previousWwwDomain);
+                }
+                catch (error) {
+                    logger_1.logger.warn(lang_1.lang.__('APIGW_WWW_DOMAIN_UNBIND_FAILED', {
+                        domain: previousWwwDomain,
+                        error: String(error),
+                    }));
+                }
+            }
+        }
+    }
+    else {
+        const existingDomain = existingState.definition?.domain;
+        if (existingDomain?.domainName) {
+            const previousDomain = existingDomain.domainName;
+            try {
+                await client.apigw.unbindCustomDomain(groupId, previousDomain);
+            }
+            catch (error) {
+                logger_1.logger.warn(lang_1.lang.__('APIGW_DOMAIN_UNBIND_FAILED', { domain: previousDomain, error: String(error) }));
+            }
+            if (existingDomain.wwwBindApex === true) {
+                const previousWwwDomain = (0, domainUtils_1.deriveWwwDomain)(previousDomain);
+                if (previousWwwDomain) {
+                    try {
+                        await client.apigw.unbindCustomDomain(groupId, previousWwwDomain);
+                    }
+                    catch (error) {
+                        logger_1.logger.warn(lang_1.lang.__('APIGW_WWW_DOMAIN_UNBIND_FAILED', {
+                            domain: previousWwwDomain,
+                            error: String(error),
+                        }));
+                    }
+                }
+            }
+        }
     }
     const groupDefinition = (0, apigwTypes_1.extractApigwGroupDefinition)(groupConfig);
     const resourceState = {
@@ -321,15 +369,7 @@ const updateApigwResource = async (context, event, serviceName, roleArn, state)
                 path: t.path,
                 backend: t.backend,
             })),
-            domain: event.domain
-                ? {
-                    domainName: event.domain.domain_name,
-                    certificateId: event.domain.certificate_id ?? null,
-                    certificateBody: event.domain.certificate_body ?? null,
-                    certificatePrivateKey: event.domain.certificate_private_key ? '(managed)' : null,
-                    protocol: event.domain.protocol ?? null,
-                }
-                : null,
+            domain: (0, apigwTypes_1.extractEventDomainDefinition)(event.domain),
         },
         instances,
         lastUpdated: new Date().toISOString(),
@@ -352,6 +392,30 @@ const deleteApigwResource = async (context, logicalId, state) => {
     }
     const groupId = groupInstance.id;
     state = await cleanupDnsRecords(context, logicalId, state);
+    const existingDomain = existingState.definition?.domain;
+    if (existingDomain?.domainName) {
+        const primaryDomain = existingDomain.domainName;
+        try {
+            await client.apigw.unbindCustomDomain(groupId, primaryDomain);
+        }
+        catch (error) {
+            logger_1.logger.warn(lang_1.lang.__('APIGW_DOMAIN_UNBIND_FAILED', { domain: primaryDomain, error: String(error) }));
+        }
+        if (existingDomain.wwwBindApex === true) {
+            const wwwDomain = (0, domainUtils_1.deriveWwwDomain)(primaryDomain);
+            if (wwwDomain) {
+                try {
+                    await client.apigw.unbindCustomDomain(groupId, wwwDomain);
+                }
+                catch (error) {
+                    logger_1.logger.warn(lang_1.lang.__('APIGW_WWW_DOMAIN_UNBIND_FAILED', {
+                        domain: wwwDomain,
+                        error: String(error),
+                    }));
+                }
+            }
+        }
+    }
     const deployments = existingInstances.filter((i) => i.type === 'ALIYUN_APIGW_DEPLOYMENT');
     for (const deployment of deployments) {
         try {

package/dist/src/stack/aliyunStack/apigwTypes.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.inferProtocolConfig = exports.extractApigwDeploymentDefinition = exports.extractApigwApiDefinition = exports.extractApigwGroupDefinition = exports.triggerToApigwApiConfig = exports.generateApiKey = exports.eventToApigwGroupConfig = void 0;
+exports.extractEventDomainDefinition = exports.inferProtocolConfig = exports.extractApigwDeploymentDefinition = exports.extractApigwApiDefinition = exports.extractApigwGroupDefinition = exports.triggerToApigwApiConfig = exports.generateApiKey = exports.eventToApigwGroupConfig = void 0;
 const common_1 = require("../../common");
 const lang_1 = require("../../lang");
 /**
@@ -155,3 +155,17 @@ const inferProtocolConfig = (protocol) => {
     return { requestProtocol: protocol };
 };
 exports.inferProtocolConfig = inferProtocolConfig;
+const extractEventDomainDefinition = (domain) => {
+    if (!domain) {
+        return null;
+    }
+    return {
+        domainName: domain.domain_name,
+        wwwBindApex: domain.www_bind_apex === true,
+        certificateId: domain.certificate_id ?? null,
+        certificateBody: domain.certificate_body ?? null,
+        certificatePrivateKey: domain.certificate_private_key ? '(managed)' : null,
+        protocol: domain.protocol ?? null,
+    };
+};
+exports.extractEventDomainDefinition = extractEventDomainDefinition;

package/dist/src/stack/aliyunStack/ossResource.js

@@ -12,6 +12,7 @@ const ossTypes_1 = require("./ossTypes");
 const logger_1 = require("../../common/logger");
 const lang_1 = require("../../lang");
 const node_path_1 = __importDefault(require("node:path"));
+const domainUtils_1 = require("../../common/domainUtils");
 const buildOssInstanceFromProvider = (info, sid) => {
     return {
         type: types_1.ResourceTypeEnum.ALIYUN_OSS_BUCKET,
@@ -149,35 +150,59 @@ const createBucketResource = async (context, bucket, state) => {
     let cnameInfo;
     if (bucket.website?.domain) {
         const certificate = await resolveBucketDomainCertificate(bucket, client);
+        const primaryDomain = bucket.website.domain;
+        const wwwBindApex = bucket.website.www_bind_apex ?? false;
         logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
-            domain: bucket.website.domain,
+            domain: primaryDomain,
             bucketName: config.bucketName,
         }));
         if (certificate) {
             logger_1.logger.info(lang_1.lang.__('OSS_BUCKET_CERT_BINDING', {
-                domain: bucket.website.domain,
+                domain: primaryDomain,
                 bucketName: config.bucketName,
             }));
         }
-        cnameInfo = await client.oss.bindCustomDomain(config.bucketName, bucket.website.domain, certificate);
+        cnameInfo = await client.oss.bindCustomDomain(config.bucketName, primaryDomain, certificate);
         if (cnameInfo) {
-            const instanceId = cnameInfo.dnsRecordId ?? bucket.website.domain;
+            const instanceId = cnameInfo.dnsRecordId ?? primaryDomain;
             const dnsInstance = {
                 sid: (0, common_1.buildSid)('aliyun', 'alidns', context.stage, instanceId),
                 id: instanceId,
                 type: types_1.ResourceTypeEnum.ALIYUN_OSS_DNS_CNAME,
-                domain: bucket.website.domain,
+                domain: primaryDomain,
                 cname: cnameInfo.cname,
                 ...(cnameInfo.dnsRecordId ? { dnsRecordId: cnameInfo.dnsRecordId } : {}),
                 ...(cnameInfo.txtRecordId ? { txtRecordId: cnameInfo.txtRecordId } : {}),
             };
             instances.push(dnsInstance);
-            // Refresh bucket info to capture auto-added CORS rule
-            bucketInfo = await client.oss.getBucket(config.bucketName);
-            if (bucketInfo) {
-                instances[0] = buildOssInstanceFromProvider(bucketInfo, sid);
+        }
+        const wwwDomain = wwwBindApex ? (0, domainUtils_1.deriveWwwDomain)(primaryDomain) : null;
+        if (wwwDomain) {
+            logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
+                domain: wwwDomain,
+                bucketName: config.bucketName,
+            }));
+            const wwwCnameInfo = await client.oss.bindCustomDomain(config.bucketName, wwwDomain, certificate);
+            if (wwwCnameInfo) {
+                const wwwInstanceId = wwwCnameInfo.dnsRecordId ?? wwwDomain;
+                const wwwDnsInstance = {
+                    sid: (0, common_1.buildSid)('aliyun', 'alidns', context.stage, wwwInstanceId),
+                    id: wwwInstanceId,
+                    type: types_1.ResourceTypeEnum.ALIYUN_OSS_DNS_CNAME,
+                    domain: wwwDomain,
+                    cname: wwwCnameInfo.cname,
+                    isWwwVariant: true,
+                    ...(wwwCnameInfo.dnsRecordId ? { dnsRecordId: wwwCnameInfo.dnsRecordId } : {}),
+                    ...(wwwCnameInfo.txtRecordId ? { txtRecordId: wwwCnameInfo.txtRecordId } : {}),
+                };
+                instances.push(wwwDnsInstance);
             }
         }
+        // Refresh bucket info to capture auto-added CORS rule
+        bucketInfo = await client.oss.getBucket(config.bucketName);
+        if (bucketInfo) {
+            instances[0] = buildOssInstanceFromProvider(bucketInfo, sid);
+        }
     }
     // Upload static files if code path is specified
     if (bucket.website?.code) {
@@ -236,46 +261,78 @@ const updateBucketResource = async (context, bucket, state) => {
     const logicalId = `buckets.${bucket.key}`;
     const instances = [buildOssInstanceFromProvider(bucketInfo, sid)];
     const existingState = state.resources[logicalId];
-    const existingDnsInstance = existingState?.instances?.find((i) => i.type === types_1.ResourceTypeEnum.ALIYUN_OSS_DNS_CNAME);
+    const existingDnsInstances = existingState?.instances?.filter((i) => i.type === types_1.ResourceTypeEnum.ALIYUN_OSS_DNS_CNAME);
+    const existingPrimaryDnsInstance = existingDnsInstances?.find((i) => !i.isWwwVariant);
+    const existingWwwDnsInstance = existingDnsInstances?.find((i) => i.isWwwVariant);
     let cnameInfo;
     if (bucket.website?.domain) {
-        const domainChanged = existingDnsInstance?.domain !== bucket.website.domain;
-        if (domainChanged && existingDnsInstance) {
-            await client.oss.unbindCustomDomain(config.bucketName, existingDnsInstance.domain, existingDnsInstance.dnsRecordId, existingDnsInstance.txtRecordId);
+        const primaryDomain = bucket.website.domain;
+        const wwwBindApex = bucket.website.www_bind_apex ?? false;
+        const domainChanged = existingPrimaryDnsInstance?.domain !== primaryDomain;
+        if (domainChanged && existingDnsInstances) {
+            for (const instance of existingDnsInstances) {
+                await client.oss.unbindCustomDomain(config.bucketName, instance.domain, instance.dnsRecordId, instance.txtRecordId);
+            }
         }
         const certificate = await resolveBucketDomainCertificate(bucket, client);
         logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
-            domain: bucket.website.domain,
+            domain: primaryDomain,
             bucketName: config.bucketName,
         }));
         if (certificate) {
             logger_1.logger.info(lang_1.lang.__('OSS_BUCKET_CERT_BINDING', {
-                domain: bucket.website.domain,
+                domain: primaryDomain,
                 bucketName: config.bucketName,
             }));
         }
-        cnameInfo = await client.oss.bindCustomDomain(config.bucketName, bucket.website.domain, certificate);
+        cnameInfo = await client.oss.bindCustomDomain(config.bucketName, primaryDomain, certificate);
         if (cnameInfo) {
-            const instanceId = cnameInfo.dnsRecordId ?? bucket.website.domain;
+            const instanceId = cnameInfo.dnsRecordId ?? primaryDomain;
             const dnsInstance = {
                 sid: (0, common_1.buildSid)('aliyun', 'alidns', context.stage, instanceId),
                 id: instanceId,
                 type: types_1.ResourceTypeEnum.ALIYUN_OSS_DNS_CNAME,
-                domain: bucket.website.domain,
+                domain: primaryDomain,
                 cname: cnameInfo.cname,
                 ...(cnameInfo.dnsRecordId ? { dnsRecordId: cnameInfo.dnsRecordId } : {}),
                 ...(cnameInfo.txtRecordId ? { txtRecordId: cnameInfo.txtRecordId } : {}),
             };
             instances.push(dnsInstance);
-            // Refresh bucket info to capture auto-added CORS rule
-            const refreshedInfo = await client.oss.getBucket(config.bucketName);
-            if (refreshedInfo) {
-                instances[0] = buildOssInstanceFromProvider(refreshedInfo, sid);
+        }
+        const wwwDomain = wwwBindApex ? (0, domainUtils_1.deriveWwwDomain)(primaryDomain) : null;
+        if (wwwDomain) {
+            logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
+                domain: wwwDomain,
+                bucketName: config.bucketName,
+            }));
+            const wwwCnameInfo = await client.oss.bindCustomDomain(config.bucketName, wwwDomain, certificate);
+            if (wwwCnameInfo) {
+                const wwwInstanceId = wwwCnameInfo.dnsRecordId ?? wwwDomain;
+                const wwwDnsInstance = {
+                    sid: (0, common_1.buildSid)('aliyun', 'alidns', context.stage, wwwInstanceId),
+                    id: wwwInstanceId,
+                    type: types_1.ResourceTypeEnum.ALIYUN_OSS_DNS_CNAME,
+                    domain: wwwDomain,
+                    cname: wwwCnameInfo.cname,
+                    isWwwVariant: true,
+                    ...(wwwCnameInfo.dnsRecordId ? { dnsRecordId: wwwCnameInfo.dnsRecordId } : {}),
+                    ...(wwwCnameInfo.txtRecordId ? { txtRecordId: wwwCnameInfo.txtRecordId } : {}),
+                };
+                instances.push(wwwDnsInstance);
             }
         }
+        else if (existingWwwDnsInstance && !wwwBindApex) {
+            await client.oss.unbindCustomDomain(config.bucketName, existingWwwDnsInstance.domain, existingWwwDnsInstance.dnsRecordId, existingWwwDnsInstance.txtRecordId);
+        }
+        const refreshedInfo = await client.oss.getBucket(config.bucketName);
+        if (refreshedInfo) {
+            instances[0] = buildOssInstanceFromProvider(refreshedInfo, sid);
+        }
     }
-    else if (existingDnsInstance) {
-        await client.oss.unbindCustomDomain(config.bucketName, existingDnsInstance.domain, existingDnsInstance.dnsRecordId, existingDnsInstance.txtRecordId);
+    else if (existingDnsInstances) {
+        for (const instance of existingDnsInstances) {
+            await client.oss.unbindCustomDomain(config.bucketName, instance.domain, instance.dnsRecordId, instance.txtRecordId);
+        }
     }
     const resourceState = {
         mode: 'managed',
@@ -295,9 +352,11 @@ exports.updateBucketResource = updateBucketResource;
 const deleteBucketResource = async (context, bucketName, logicalId, state) => {
     const client = (0, aliyunClient_1.createAliyunClient)(context);
     const existingState = state.resources[logicalId];
-    const dnsInstance = existingState?.instances?.find((i) => i.type === types_1.ResourceTypeEnum.ALIYUN_OSS_DNS_CNAME);
-    if (dnsInstance) {
-        await client.oss.unbindCustomDomain(bucketName, dnsInstance.domain, dnsInstance.dnsRecordId, dnsInstance.txtRecordId);
+    const dnsInstances = existingState?.instances?.filter((i) => i.type === types_1.ResourceTypeEnum.ALIYUN_OSS_DNS_CNAME);
+    if (dnsInstances) {
+        for (const dnsInstance of dnsInstances) {
+            await client.oss.unbindCustomDomain(bucketName, dnsInstance.domain, dnsInstance.dnsRecordId, dnsInstance.txtRecordId);
+        }
     }
     try {
         await client.oss.deleteBucket(bucketName);

package/dist/src/stack/aliyunStack/ossTypes.js

@@ -30,6 +30,9 @@ const bucketToOssBucketConfig = (bucket) => {
     if (bucket.website?.domain) {
         config.domain = bucket.website.domain;
     }
+    if (bucket.website?.www_bind_apex !== undefined) {
+        config.wwwBindApex = bucket.website.www_bind_apex;
+    }
     if (bucket.website?.domain_certificate_id) {
         config.domainCertificateId = bucket.website.domain_certificate_id;
     }
@@ -66,6 +69,7 @@ const extractOssBucketDefinition = (config) => {
             : {},
         storageClass: config.storageClass ?? null,
         domain: config.domain ?? null,
+        wwwBindApex: config.wwwBindApex ?? false,
         domainCertificateId: config.domainCertificateId ?? null,
         domainCertificateBody: config.domainCertificateBody ?? null,
         domainCertificatePrivateKey: config.domainCertificatePrivateKey ? '(managed)' : null,

package/dist/src/stack/scfStack/cosResource.js

@@ -8,6 +8,7 @@ const common_1 = require("../../common");
 const certUtils_1 = require("../../common/certUtils");
 const logger_1 = require("../../common/logger");
 const lang_1 = require("../../lang");
+const domainUtils_1 = require("../../common/domainUtils");
 const resolveBucketDomainCertificate = (bucket) => {
     const website = bucket.website;
     if (!website)
@@ -133,31 +134,56 @@ const createBucketResource = async (context, bucket, state) => {
     let cnameInfo;
     if (bucket.website?.domain) {
         const resolved = resolveBucketDomainCertificate(bucket);
+        const primaryDomain = bucket.website.domain;
+        const wwwBindApex = bucket.website.www_bind_apex ?? false;
         logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
-            domain: bucket.website.domain,
+            domain: primaryDomain,
             bucketName: bucket.name,
         }));
-        cnameInfo = await client.cos.bindCustomDomain(bucket.name, bucket.website.domain);
+        cnameInfo = await client.cos.bindCustomDomain(bucket.name, primaryDomain);
         if (cnameInfo) {
-            const instanceId = cnameInfo.dnsRecordId ?? bucket.website.domain;
+            const instanceId = cnameInfo.dnsRecordId ?? primaryDomain;
             const dnsInstance = {
                 sid: (0, common_1.buildSid)('tencent', 'dnspod', context.stage, instanceId),
                 id: instanceId,
                 type: types_1.ResourceTypeEnum.COS_DNS_CNAME,
-                domain: bucket.website.domain,
+                domain: primaryDomain,
                 cname: cnameInfo.cname,
                 ...(cnameInfo.dnsRecordId ? { dnsRecordId: cnameInfo.dnsRecordId } : {}),
             };
             instances.push(dnsInstance);
-            // Refresh bucket info to capture auto-added CORS rule
-            const refreshedInfo = await client.cos.getBucket(bucket.name, context.region);
-            if (refreshedInfo) {
-                instances[0] = buildCosInstanceFromProvider(refreshedInfo, sid);
-            }
             if (resolved && cnameInfo.bucketDomainBound) {
-                await deployCertificateToCosDomain(client, resolved, bucket.name, bucket.website.domain, context.region);
+                await deployCertificateToCosDomain(client, resolved, bucket.name, primaryDomain, context.region);
+            }
+        }
+        const wwwDomain = wwwBindApex ? (0, domainUtils_1.deriveWwwDomain)(primaryDomain) : null;
+        if (wwwDomain) {
+            logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
+                domain: wwwDomain,
+                bucketName: bucket.name,
+            }));
+            const wwwCnameInfo = await client.cos.bindCustomDomain(bucket.name, wwwDomain);
+            if (wwwCnameInfo) {
+                const wwwInstanceId = wwwCnameInfo.dnsRecordId ?? wwwDomain;
+                const wwwDnsInstance = {
+                    sid: (0, common_1.buildSid)('tencent', 'dnspod', context.stage, wwwInstanceId),
+                    id: wwwInstanceId,
+                    type: types_1.ResourceTypeEnum.COS_DNS_CNAME,
+                    domain: wwwDomain,
+                    cname: wwwCnameInfo.cname,
+                    isWwwVariant: true,
+                    ...(wwwCnameInfo.dnsRecordId ? { dnsRecordId: wwwCnameInfo.dnsRecordId } : {}),
+                };
+                instances.push(wwwDnsInstance);
+                if (resolved && wwwCnameInfo.bucketDomainBound) {
+                    await deployCertificateToCosDomain(client, resolved, bucket.name, wwwDomain, context.region);
+                }
             }
         }
+        const refreshedInfo = await client.cos.getBucket(bucket.name, context.region);
+        if (refreshedInfo) {
+            instances[0] = buildCosInstanceFromProvider(refreshedInfo, sid);
+        }
     }
     const resourceState = {
         mode: 'managed',
@@ -194,41 +220,75 @@ const updateBucketResource = async (context, bucket, state) => {
         buildCosInstanceFromProvider(bucketInfo, sid),
     ];
     const existingState = state.resources[logicalId];
-    const existingDnsInstance = existingState?.instances?.find((i) => i.type === types_1.ResourceTypeEnum.COS_DNS_CNAME);
+    const existingDnsInstances = existingState?.instances?.filter((i) => i.type === types_1.ResourceTypeEnum.COS_DNS_CNAME);
+    const existingPrimaryDnsInstance = existingDnsInstances?.find((i) => !i.isWwwVariant);
+    const existingWwwDnsInstance = existingDnsInstances?.find((i) => i.isWwwVariant);
     if (bucket.website?.domain) {
-        const domainChanged = existingDnsInstance?.domain !== bucket.website.domain;
-        if (domainChanged && existingDnsInstance) {
-            await client.cos.unbindCustomDomain(bucket.name, existingDnsInstance.domain, existingDnsInstance.dnsRecordId);
+        const primaryDomain = bucket.website.domain;
+        const wwwBindApex = bucket.website.www_bind_apex ?? false;
+        const domainChanged = existingPrimaryDnsInstance?.domain !== primaryDomain;
+        if (domainChanged && existingDnsInstances) {
+            for (const instance of existingDnsInstances) {
+                await client.cos.unbindCustomDomain(bucket.name, instance.domain, instance.dnsRecordId);
+            }
         }
         const resolved = resolveBucketDomainCertificate(bucket);
         logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
-            domain: bucket.website.domain,
+            domain: primaryDomain,
             bucketName: bucket.name,
         }));
-        const cnameInfo = await client.cos.bindCustomDomain(bucket.name, bucket.website.domain);
+        const cnameInfo = await client.cos.bindCustomDomain(bucket.name, primaryDomain);
         if (cnameInfo) {
-            const instanceId = cnameInfo.dnsRecordId ?? bucket.website.domain;
+            const instanceId = cnameInfo.dnsRecordId ?? primaryDomain;
             const dnsInstance = {
                 sid: (0, common_1.buildSid)('tencent', 'dnspod', context.stage, instanceId),
                 id: instanceId,
                 type: types_1.ResourceTypeEnum.COS_DNS_CNAME,
-                domain: bucket.website.domain,
+                domain: primaryDomain,
                 cname: cnameInfo.cname,
                 ...(cnameInfo.dnsRecordId ? { dnsRecordId: cnameInfo.dnsRecordId } : {}),
             };
             instances.push(dnsInstance);
-            // Refresh bucket info to capture auto-added CORS rule
-            const refreshedInfo = await client.cos.getBucket(bucket.name, context.region);
-            if (refreshedInfo) {
-                instances[0] = buildCosInstanceFromProvider(refreshedInfo, sid);
-            }
             if (resolved && cnameInfo.bucketDomainBound) {
-                await deployCertificateToCosDomain(client, resolved, bucket.name, bucket.website.domain, context.region);
+                await deployCertificateToCosDomain(client, resolved, bucket.name, primaryDomain, context.region);
             }
         }
+        const wwwDomain = wwwBindApex ? (0, domainUtils_1.deriveWwwDomain)(primaryDomain) : null;
+        if (wwwDomain) {
+            logger_1.logger.info(lang_1.lang.__('BINDING_CUSTOM_DOMAIN_TO_BUCKET', {
+                domain: wwwDomain,
+                bucketName: bucket.name,
+            }));
+            const wwwCnameInfo = await client.cos.bindCustomDomain(bucket.name, wwwDomain);
+            if (wwwCnameInfo) {
+                const wwwInstanceId = wwwCnameInfo.dnsRecordId ?? wwwDomain;
+                const wwwDnsInstance = {
+                    sid: (0, common_1.buildSid)('tencent', 'dnspod', context.stage, wwwInstanceId),
+                    id: wwwInstanceId,
+                    type: types_1.ResourceTypeEnum.COS_DNS_CNAME,
+                    domain: wwwDomain,
+                    cname: wwwCnameInfo.cname,
+                    isWwwVariant: true,
+                    ...(wwwCnameInfo.dnsRecordId ? { dnsRecordId: wwwCnameInfo.dnsRecordId } : {}),
+                };
+                instances.push(wwwDnsInstance);
+                if (resolved && wwwCnameInfo.bucketDomainBound) {
+                    await deployCertificateToCosDomain(client, resolved, bucket.name, wwwDomain, context.region);
+                }
+            }
+        }
+        else if (existingWwwDnsInstance && !wwwBindApex) {
+            await client.cos.unbindCustomDomain(bucket.name, existingWwwDnsInstance.domain, existingWwwDnsInstance.dnsRecordId);
+        }
+        const refreshedInfo = await client.cos.getBucket(bucket.name, context.region);
+        if (refreshedInfo) {
+            instances[0] = buildCosInstanceFromProvider(refreshedInfo, sid);
+        }
     }
-    else if (existingDnsInstance) {
-        await client.cos.unbindCustomDomain(bucket.name, existingDnsInstance.domain, existingDnsInstance.dnsRecordId);
+    else if (existingDnsInstances) {
+        for (const instance of existingDnsInstances) {
+            await client.cos.unbindCustomDomain(bucket.name, instance.domain, instance.dnsRecordId);
+        }
     }
     const resourceState = {
         mode: 'managed',
@@ -243,9 +303,11 @@ exports.updateBucketResource = updateBucketResource;
 const deleteBucketResource = async (context, bucketName, region, logicalId, state) => {
     const client = (0, tencentClient_1.createTencentClient)(context);
     const existingState = state.resources[logicalId];
-    const dnsInstance = existingState?.instances?.find((i) => i.type === types_1.ResourceTypeEnum.COS_DNS_CNAME);
-    if (dnsInstance) {
-        await client.cos.unbindCustomDomain(bucketName, dnsInstance.domain, dnsInstance.dnsRecordId);
+    const dnsInstances = existingState?.instances?.filter((i) => i.type === types_1.ResourceTypeEnum.COS_DNS_CNAME);
+    if (dnsInstances) {
+        for (const dnsInstance of dnsInstances) {
+            await client.cos.unbindCustomDomain(bucketName, dnsInstance.domain, dnsInstance.dnsRecordId);
+        }
     }
     try {
         await client.cos.deleteBucket(bucketName, region);

package/dist/src/stack/scfStack/cosTypes.js

@@ -29,6 +29,9 @@ const bucketToCosBucketConfig = (bucket, region) => {
         if (bucket.website.domain) {
             config.Domain = bucket.website.domain;
         }
+        if (bucket.website.www_bind_apex !== undefined) {
+            config.WwwBindApex = bucket.website.www_bind_apex;
+        }
         if (bucket.website.domain_certificate_id) {
             config.DomainCertificateId = bucket.website.domain_certificate_id;
         }
@@ -66,6 +69,7 @@ const extractCosBucketDefinition = (config) => {
             }
             : {},
         domain: config.Domain ?? null,
+        wwwBindApex: config.WwwBindApex ?? false,
         domainCertificateId: config.DomainCertificateId ?? null,
         domainCertificateBody: config.DomainCertificateBody ?? null,
         domainCertificatePrivateKey: config.DomainCertificatePrivateKey ? '(managed)' : null,

package/dist/src/validator/bucketSchema.js

@@ -73,6 +73,7 @@ exports.bucketSchema = {
                                                 },
                                             ],
                                         },
+                                        www_bind_apex: { type: 'boolean' },
                                     },
                                     required: ['domain_name'],
                                     additionalProperties: false,
@@ -110,6 +111,7 @@ exports.bucketSchema = {
                             type: 'string',
                         },
                         error_code: templateRefSchema_1.resolvableNumber,
+                        www_bind_apex: templateRefSchema_1.resolvableBoolean,
                     },
                     required: ['code'],
                     additionalProperties: false,

package/dist/src/validator/eventSchema.js

@@ -40,6 +40,7 @@ exports.eventSchema = {
                                 },
                             ],
                         },
+                        www_bind_apex: { type: 'boolean' },
                     },
                     oneOf: [
                         {

package/package.json

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