@geek-fun/serverlessinsight 0.6.7 → 0.6.9

package/dist/package.json

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

@@ -23,7 +23,10 @@ const plan = async (options) => {
     const iac = (0, parser_1.revalYaml)(iacLocation, context);
     // Store IAC in context for access by all functions
     (0, common_1.setIac)(iac);
-    common_1.logger.info(lang_1.lang.__('GENERATING_PLAN_FOR_SCF'));
+    const providerDisplayName = iac.provider.name === common_1.ProviderEnum.ALIYUN
+        ? lang_1.lang.__('PROVIDER_ALIYUN')
+        : lang_1.lang.__('PROVIDER_TENCENT');
+    common_1.logger.info(lang_1.lang.__('GENERATING_PLAN_FOR_PROVIDER', { provider: providerDisplayName }));
     const backend = (0, stateBackend_1.createStateBackend)(iac.backend, context);
     let planResult;
     if (iac.provider.name === common_1.ProviderEnum.TENCENT) {

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

@@ -78,115 +78,211 @@ const isDuplicateSecurityGroupRuleError = (error) => {
     ]);
     return duplicateCodes.has(error.code);
 };
-const createEcsOperations = (ecsClient, context) => ({
-    createSecurityGroup: async (securityGroupName, vpcId, ingressRules, egressRules, description) => {
-        const createRequest = new ecs.CreateSecurityGroupRequest({
-            regionId: context.region,
-            securityGroupName,
-            vpcId,
-            description: description ?? `ServerlessInsight security group for ${securityGroupName}`,
-        });
-        const response = await ecsClient.createSecurityGroup(createRequest);
-        const securityGroupId = response.body?.securityGroupId;
-        if (!securityGroupId) {
-            throw new Error('Failed to create security group');
-        }
-        // Add ingress rules
-        for (const rule of ingressRules) {
-            let parsedRule;
-            try {
-                parsedRule = (0, exports.parseSecurityGroupRule)(rule);
-            }
-            catch (error) {
-                logger_1.logger.warn(`Skipping invalid ingress rule: ${rule}. ${String(error)}`);
-                continue;
-            }
-            const ingressRequest = new ecs.AuthorizeSecurityGroupRequest({
+const createEcsOperations = (ecsClient, context) => {
+    const operations = {
+        createSecurityGroup: async (securityGroupName, vpcId, ingressRules, egressRules, description) => {
+            const createRequest = new ecs.CreateSecurityGroupRequest({
                 regionId: context.region,
-                securityGroupId,
-                ipProtocol: parsedRule.protocol.toLowerCase(),
-                sourceCidrIp: parsedRule.cidr,
-                portRange: transformPortRange(parsedRule.protocol, parsedRule.portRange),
+                securityGroupName,
+                vpcId,
+                description: description ?? `ServerlessInsight security group for ${securityGroupName}`,
             });
-            try {
-                await ecsClient.authorizeSecurityGroup(ingressRequest);
+            const response = await ecsClient.createSecurityGroup(createRequest);
+            const securityGroupId = response.body?.securityGroupId;
+            if (!securityGroupId) {
+                throw new Error('Failed to create security group');
             }
-            catch (error) {
-                if (isDuplicateSecurityGroupRuleError(error)) {
-                    logger_1.logger.debug(`Ingress rule already exists, skipping: ${rule}`);
+            // Add ingress rules
+            for (const rule of ingressRules) {
+                let parsedRule;
+                try {
+                    parsedRule = (0, exports.parseSecurityGroupRule)(rule);
+                }
+                catch (error) {
+                    logger_1.logger.warn(`Skipping invalid ingress rule: ${rule}. ${String(error)}`);
                     continue;
                 }
-                logger_1.logger.warn(`Failed to add ingress rule: ${rule}. ${String(error)}`);
+                const ingressRequest = new ecs.AuthorizeSecurityGroupRequest({
+                    regionId: context.region,
+                    securityGroupId,
+                    ipProtocol: parsedRule.protocol.toLowerCase(),
+                    sourceCidrIp: parsedRule.cidr,
+                    portRange: transformPortRange(parsedRule.protocol, parsedRule.portRange),
+                });
+                try {
+                    await ecsClient.authorizeSecurityGroup(ingressRequest);
+                }
+                catch (error) {
+                    if (isDuplicateSecurityGroupRuleError(error)) {
+                        logger_1.logger.debug(`Ingress rule already exists, skipping: ${rule}`);
+                        continue;
+                    }
+                    logger_1.logger.warn(`Failed to add ingress rule: ${rule}. ${String(error)}`);
+                }
             }
-        }
-        // Add egress rules
-        for (const rule of egressRules) {
-            let parsedRule;
+            // Add egress rules
+            for (const rule of egressRules) {
+                let parsedRule;
+                try {
+                    parsedRule = (0, exports.parseSecurityGroupRule)(rule);
+                }
+                catch (error) {
+                    logger_1.logger.warn(`Skipping invalid egress rule: ${rule}. ${String(error)}`);
+                    continue;
+                }
+                const egressRequest = new ecs.AuthorizeSecurityGroupEgressRequest({
+                    regionId: context.region,
+                    securityGroupId,
+                    ipProtocol: parsedRule.protocol.toLowerCase(),
+                    destCidrIp: parsedRule.cidr,
+                    portRange: transformPortRange(parsedRule.protocol, parsedRule.portRange),
+                });
+                try {
+                    await ecsClient.authorizeSecurityGroupEgress(egressRequest);
+                }
+                catch (error) {
+                    if (isDuplicateSecurityGroupRuleError(error)) {
+                        logger_1.logger.debug(`Egress rule already exists, skipping: ${rule}`);
+                        continue;
+                    }
+                    logger_1.logger.warn(`Failed to add egress rule: ${rule}. ${String(error)}`);
+                }
+            }
+            const sg = await operations.getSecurityGroup(securityGroupId);
+            if (!sg) {
+                return {
+                    securityGroupId,
+                    securityGroupName,
+                    vpcId,
+                    description,
+                };
+            }
+            return sg;
+        },
+        getSecurityGroupRules: async (securityGroupId) => {
+            const ingressRules = [];
+            const egressRules = [];
             try {
-                parsedRule = (0, exports.parseSecurityGroupRule)(rule);
+                const request = new ecs.DescribeSecurityGroupAttributeRequest({
+                    regionId: context.region,
+                    securityGroupId,
+                    direction: 'ingress',
+                });
+                const response = await ecsClient.describeSecurityGroupAttribute(request);
+                if (response?.body?.permissions?.permission) {
+                    for (const perm of response.body.permissions.permission) {
+                        ingressRules.push({
+                            direction: 'ingress',
+                            ipProtocol: perm.ipProtocol ?? '',
+                            portRange: perm.portRange ?? '',
+                            sourceCidrIp: perm.sourceCidrIp,
+                            priority: perm.priority,
+                            policy: perm.policy,
+                            description: perm.description,
+                            ruleId: perm.ruleId,
+                        });
+                    }
+                }
             }
             catch (error) {
-                logger_1.logger.warn(`Skipping invalid egress rule: ${rule}. ${String(error)}`);
-                continue;
+                logger_1.logger.debug(`Failed to get ingress rules: ${String(error)}`);
             }
-            const egressRequest = new ecs.AuthorizeSecurityGroupEgressRequest({
-                regionId: context.region,
-                securityGroupId,
-                ipProtocol: parsedRule.protocol.toLowerCase(),
-                destCidrIp: parsedRule.cidr,
-                portRange: transformPortRange(parsedRule.protocol, parsedRule.portRange),
-            });
             try {
-                await ecsClient.authorizeSecurityGroupEgress(egressRequest);
+                const request = new ecs.DescribeSecurityGroupAttributeRequest({
+                    regionId: context.region,
+                    securityGroupId,
+                    direction: 'egress',
+                });
+                const response = await ecsClient.describeSecurityGroupAttribute(request);
+                if (response?.body?.permissions?.permission) {
+                    for (const perm of response.body.permissions.permission) {
+                        egressRules.push({
+                            direction: 'egress',
+                            ipProtocol: perm.ipProtocol ?? '',
+                            portRange: perm.portRange ?? '',
+                            destCidrIp: perm.destCidrIp,
+                            priority: perm.priority,
+                            policy: perm.policy,
+                            description: perm.description,
+                            ruleId: perm.ruleId,
+                        });
+                    }
+                }
             }
             catch (error) {
-                if (isDuplicateSecurityGroupRuleError(error)) {
-                    logger_1.logger.debug(`Egress rule already exists, skipping: ${rule}`);
-                    continue;
+                logger_1.logger.debug(`Failed to get egress rules: ${String(error)}`);
+            }
+            return { ingressRules, egressRules };
+        },
+        getSecurityGroup: async (securityGroupId) => {
+            try {
+                const request = new ecs.DescribeSecurityGroupsRequest({
+                    regionId: context.region,
+                    securityGroupId,
+                });
+                const response = await ecsClient.describeSecurityGroups(request);
+                if (!response ||
+                    !response.body ||
+                    !response.body.securityGroups ||
+                    !response.body.securityGroups.securityGroup ||
+                    response.body.securityGroups.securityGroup.length === 0) {
+                    return null;
                 }
-                logger_1.logger.warn(`Failed to add egress rule: ${rule}. ${String(error)}`);
+                const sg = response.body.securityGroups.securityGroup[0];
+                const rules = await operations.getSecurityGroupRules(securityGroupId);
+                return {
+                    securityGroupId: sg.securityGroupId ?? securityGroupId,
+                    securityGroupName: sg.securityGroupName,
+                    vpcId: sg.vpcId,
+                    description: sg.description,
+                    createTime: sg.creationTime,
+                    ingressRules: rules.ingressRules,
+                    egressRules: rules.egressRules,
+                };
             }
-        }
-        return {
-            securityGroupId,
-            securityGroupName,
-            vpcId,
-            description,
-        };
-    },
-    getSecurityGroup: async (securityGroupId) => {
-        try {
-            const request = new ecs.DescribeSecurityGroupsRequest({
+            catch {
+                return null;
+            }
+        },
+        getSecurityGroupByName: async (securityGroupName, vpcId) => {
+            try {
+                const request = new ecs.DescribeSecurityGroupsRequest({
+                    regionId: context.region,
+                    securityGroupName,
+                    vpcId,
+                });
+                const response = await ecsClient.describeSecurityGroups(request);
+                if (!response ||
+                    !response.body ||
+                    !response.body.securityGroups ||
+                    !response.body.securityGroups.securityGroup ||
+                    response.body.securityGroups.securityGroup.length === 0) {
+                    return null;
+                }
+                const sg = response.body.securityGroups.securityGroup[0];
+                const rules = await operations.getSecurityGroupRules(sg.securityGroupId);
+                return {
+                    securityGroupId: sg.securityGroupId,
+                    securityGroupName: sg.securityGroupName,
+                    vpcId: sg.vpcId,
+                    description: sg.description,
+                    createTime: sg.creationTime,
+                    ingressRules: rules.ingressRules,
+                    egressRules: rules.egressRules,
+                };
+            }
+            catch {
+                return null;
+            }
+        },
+        deleteSecurityGroup: async (securityGroupId) => {
+            const request = new ecs.DeleteSecurityGroupRequest({
                 regionId: context.region,
                 securityGroupId,
             });
-            const response = await ecsClient.describeSecurityGroups(request);
-            if (!response ||
-                !response.body ||
-                !response.body.securityGroups ||
-                !response.body.securityGroups.securityGroup ||
-                response.body.securityGroups.securityGroup.length === 0) {
-                return null;
-            }
-            const sg = response.body.securityGroups.securityGroup[0];
-            return {
-                securityGroupId: sg.securityGroupId ?? securityGroupId,
-                securityGroupName: sg.securityGroupName,
-                vpcId: sg.vpcId,
-                description: sg.description,
-                createTime: sg.creationTime,
-            };
-        }
-        catch {
-            return null;
-        }
-    },
-    deleteSecurityGroup: async (securityGroupId) => {
-        const request = new ecs.DeleteSecurityGroupRequest({
-            regionId: context.region,
-            securityGroupId,
-        });
-        await ecsClient.deleteSecurityGroup(request);
-    },
-});
+            await ecsClient.deleteSecurityGroup(request);
+        },
+    };
+    return operations;
+};
 exports.createEcsOperations = createEcsOperations;

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

@@ -97,6 +97,13 @@ const createNasOperations = (nasClient) => {
                 priority: 1,
             });
             await nasClient.createAccessRule(request);
+            return {
+                accessGroupName,
+                sourceCidrIp,
+                rwAccessType: 'RDWR',
+                userAccessType: 'no_squash',
+                priority: 1,
+            };
         },
         createFileSystem: async (storageClass, functionName) => {
             const { fileSystemType, storageType } = storageClassMap[storageClass];
@@ -149,6 +156,11 @@ const createNasOperations = (nasClient) => {
                     protocolType: fs.protocolType,
                     status: fs.status,
                     createTime: fs.createTime,
+                    description: fs.description,
+                    zoneId: fs.zoneId,
+                    capacity: fs.capacity,
+                    encrypted: fs.encrypted,
+                    mountTargetCount: fs.mountTargetCount,
                 };
             }
             catch {

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

@@ -131,6 +131,7 @@ const createRamOperations = (ramClient) => {
                 throw error;
             }
         }
+        return policyName;
     };
     return {
         createRole: async (roleName, trustedServices, description) => {
@@ -148,9 +149,12 @@ const createRamOperations = (ramClient) => {
                     arn: response.body?.role?.arn,
                     description: response.body?.role?.description,
                     createDate: response.body?.role?.createDate,
+                    updateDate: response.body?.role?.updateDate,
+                    maxSessionDuration: response.body?.role?.maxSessionDuration,
+                    assumeRolePolicyDocument: assumeRolePolicy,
                 };
-                await attachRolePolicyForFc(roleName);
-                return roleInfo;
+                const policyName = await attachRolePolicyForFc(roleName);
+                return { ...roleInfo, policyName };
             }
             catch (error) {
                 if (error &&
@@ -166,13 +170,17 @@ const createRamOperations = (ramClient) => {
                             newAssumeRolePolicyDocument: assumeRolePolicy,
                         });
                         await ramClient.updateRole(updateRequest);
-                        await attachRolePolicyForFc(roleName);
+                        const policyName = await attachRolePolicyForFc(roleName);
                         return {
                             roleName,
                             roleId: getResponse.body?.role?.roleId,
                             arn: getResponse.body?.role?.arn,
                             description: getResponse.body?.role?.description,
                             createDate: getResponse.body?.role?.createDate,
+                            updateDate: getResponse.body?.role?.updateDate,
+                            maxSessionDuration: getResponse.body?.role?.maxSessionDuration,
+                            assumeRolePolicyDocument: assumeRolePolicy,
+                            policyName,
                         };
                     }
                     catch (recoveryError) {
@@ -197,6 +205,10 @@ const createRamOperations = (ramClient) => {
                     arn: getResponse.body?.role?.arn,
                     description: getResponse.body?.role?.description,
                     createDate: getResponse.body?.role?.createDate,
+                    updateDate: getResponse.body?.role?.updateDate,
+                    maxSessionDuration: getResponse.body?.role?.maxSessionDuration,
+                    assumeRolePolicyDocument: assumeRolePolicy,
+                    policyName: `${roleName}-policy`,
                 };
                 const updateRequest = new ram.UpdateRoleRequest({
                     roleName,
@@ -231,6 +243,10 @@ const createRamOperations = (ramClient) => {
                     arn: response.body.role.arn,
                     description: response.body.role.description,
                     createDate: response.body.role.createDate,
+                    updateDate: response.body.role.updateDate,
+                    maxSessionDuration: response.body.role.maxSessionDuration,
+                    assumeRolePolicyDocument: response.body.role.assumeRolePolicyDocument,
+                    policyName: `${roleName}-policy`,
                 };
             }
             catch (error) {

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/common/imsClient.js

@@ -37,14 +37,18 @@ exports.getIamInfo = void 0;
 const ims20190815_1 = __importStar(require("@alicloud/ims20190815")), ims20190815 = ims20190815_1;
 const openApi = __importStar(require("@alicloud/openapi-client"));
 const providerEnum_1 = require("./providerEnum");
+const constants_1 = require("./constants");
 const getIamInfo = async (context) => {
     if (context.provider !== providerEnum_1.ProviderEnum.ALIYUN) {
         return undefined;
     }
-    const imsClient = new ims20190815_1.default(new openApi.Config({
+    const imsConfig = new openApi.Config({
         accessKeyId: context.accessKeyId,
         accessKeySecret: context.accessKeySecret,
-    }));
+    });
+    imsConfig.connectTimeout = constants_1.ALIYUN_FC3_CONNECT_TIMEOUT_MS;
+    imsConfig.readTimeout = constants_1.ALIYUN_FC3_READ_TIMEOUT_MS;
+    const imsClient = new ims20190815_1.default(imsConfig);
     const { body } = await imsClient.getUser(new ims20190815.GetUserRequest({ userAccessKeyId: context.accessKeyId }));
     return body?.user
         ? {

package/dist/src/lang/en.js

@@ -79,6 +79,9 @@ exports.en = {
     // Plan command messages
     PLAN_COMMAND_TENCENT_ONLY: 'Plan command is currently only supported for Tencent provider',
     GENERATING_PLAN_FOR_SCF: 'Generating plan for Tencent SCF resources...',
+    GENERATING_PLAN_FOR_PROVIDER: 'Generating plan for {{provider}} resources...',
+    PROVIDER_ALIYUN: 'Alibaba Cloud',
+    PROVIDER_TENCENT: 'Tencent Cloud',
     DEPLOYMENT_PLAN: 'DEPLOYMENT PLAN',
     NO_CHANGES_INFRASTRUCTURE_UP_TO_DATE: 'No changes. Infrastructure is up to date.',
     CREATE: 'CREATE',
@@ -220,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.',
@@ -365,6 +370,7 @@ exports.en = {
     CREATING_SLS_INDEX: 'Creating SLS index for: {{logstoreName}}',
     CREATING_RAM_ROLE: 'Creating RAM role: {{roleName}}',
     CREATING_SECURITY_GROUP: 'Creating security group: {{sgName}}',
+    SECURITY_GROUP_NOT_FOUND: 'Security group "{{sgName}}" not found in VPC "{{vpcId}}"',
     CREATING_NAS_ACCESS_GROUP: 'Creating NAS access group: {{accessGroupName}}',
     CREATING_NAS_ACCESS_RULE: 'Creating NAS access rule for: {{accessGroupName}}',
     CREATING_NAS_FILE_SYSTEM: 'Creating NAS file system for: {{name}}',

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

@@ -79,6 +79,9 @@ exports.zhCN = {
     // Plan command messages
     PLAN_COMMAND_TENCENT_ONLY: 'Plan 命令目前仅支持腾讯云提供商',
     GENERATING_PLAN_FOR_SCF: '正在为腾讯云 SCF 资源生成计划...',
+    GENERATING_PLAN_FOR_PROVIDER: '正在为{{provider}}资源生成计划...',
+    PROVIDER_ALIYUN: '阿里云',
+    PROVIDER_TENCENT: '腾讯云',
     DEPLOYMENT_PLAN: '部署计划',
     NO_CHANGES_INFRASTRUCTURE_UP_TO_DATE: '无变更。基础设施已是最新状态。',
     CREATE: '创建',
@@ -218,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 记录。',
@@ -362,6 +367,7 @@ exports.zhCN = {
     CREATING_SLS_INDEX: '正在为 SLS 日志库创建索引: {{logstoreName}}',
     CREATING_RAM_ROLE: '正在创建 RAM 角色: {{roleName}}',
     CREATING_SECURITY_GROUP: '正在创建安全组: {{sgName}}',
+    SECURITY_GROUP_NOT_FOUND: '在 VPC "{{vpcId}}" 中未找到安全组 "{{sgName}}"',
     CREATING_NAS_ACCESS_GROUP: '正在创建 NAS 权限组: {{accessGroupName}}',
     CREATING_NAS_ACCESS_RULE: '正在为 NAS 权限组创建访问规则: {{accessGroupName}}',
     CREATING_NAS_FILE_SYSTEM: '正在为 {{name}} 创建 NAS 文件系统',

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,13 +40,7 @@ const generateApigwPlan = async (context, state, events, serviceName) => {
                 path: t.path,
                 backend: t.backend,
             })),
-            domain: event.domain
-                ? {
-                    domainName: event.domain.domain_name,
-                    hasCertificate: !!(event.domain.certificate_body || event.domain.certificate_id),
-                    protocol: event.domain.protocol ?? null,
-                }
-                : null,
+            domain: (0, apigwTypes_1.extractEventDomainDefinition)(event.domain),
         };
         if (!currentState) {
             // No state exists, check if resource exists remotely