@fy-stack/cdn-construct 0.0.143 → 0.0.145

package/dist/lib/cdn-construct.d.ts

@@ -1,3 +1,4 @@
+import type { Attachable } from '@fy-stack/types';
 import * as cloudfront from 'aws-cdk-lib/aws-cloudfront';
 import { Construct } from 'constructs';
 import { CDNConstructProps } from './types';
@@ -5,9 +6,11 @@ import { CDNConstructProps } from './types';
  * CDNConstruct is a custom construct that sets up a CloudFront distribution
  * based on provided routing and resource configurations.
  */
-export declare class CDNConstruct extends Construct {
+export declare class CDNConstruct extends Construct implements Attachable {
     distribution: cloudfront.Distribution;
+    domainName: string | undefined;
     constructor(scope: Construct, id: string, props: CDNConstructProps);
     private parseDomain;
+    attachable(): Record<string, string>;
 }
 //# sourceMappingURL=cdn-construct.d.ts.map

package/dist/lib/cdn-construct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cdn-construct.d.ts","sourceRoot":"","sources":["../../src/lib/cdn-construct.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AAGzD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE5C;;;GAGG;AACH,qBAAa,YAAa,SAAQ,SAAS;IAClC,YAAY,EAAE,UAAU,CAAC,YAAY,CAAC;gBAEjC,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB;IAwHlE,OAAO,CAAC,WAAW;CAIpB"}
+{"version":3,"file":"cdn-construct.d.ts","sourceRoot":"","sources":["../../src/lib/cdn-construct.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAe,MAAM,iBAAiB,CAAC;AAE/D,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AAGzD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE5C;;;GAGG;AACH,qBAAa,YAAa,SAAQ,SAAU,YAAW,UAAU;IACxD,YAAY,EAAE,UAAU,CAAC,YAAY,CAAC;IACtC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;gBAE1B,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB;IA2HlE,OAAO,CAAC,WAAW;IAKnB,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;CAKrC"}

package/dist/lib/cdn-construct.js

@@ -13,6 +13,7 @@ const constructs_1 = require("constructs");
  */
 class CDNConstruct extends constructs_1.Construct {
     distribution;
+    domainName;
     constructor(scope, id, props) {
         super(scope, id);
         const routes = {};
@@ -25,23 +26,24 @@ class CDNConstruct extends constructs_1.Construct {
         const { '/*': base, ...otherRoutes } = routes;
         if (!base)
             throw new Error('no base route');
-        const { '/*': defaultBehavior, ...additionalBehaviors } = base.cloudfront('');
+        const { '/*': defaultBehavior, ...additionalDefaultBehaviors } = base.cloudfront('');
         if (!defaultBehavior)
             throw new Error('no default behaviour');
+        const additionalBehaviors = {};
         for (const i in otherRoutes) {
             Object.assign(additionalBehaviors, otherRoutes[i]?.cloudfront(i));
         }
+        Object.assign(additionalBehaviors, additionalDefaultBehaviors);
         let certificate;
-        let defaultDomainName;
         const subjectAlternativeNames = [];
         const zones = {};
         if (props.domains) {
             const [defaultDomain, ...otherRecords] = props.domains;
             if (defaultDomain) {
                 const { records: [defaultDomainRecord, ...otherDefaultDomainRecords], } = defaultDomain;
-                defaultDomainName = this.parseDomain(defaultDomainRecord, defaultDomain.domain);
+                this.domainName = this.parseDomain(defaultDomainRecord, defaultDomain.domain);
                 zones[defaultDomain.domain] = route53.HostedZone.fromLookup(this, 'Zone0', { domainName: defaultDomain.domain });
-                zones[defaultDomainName] = zones[defaultDomain.domain];
+                zones[this.domainName] = zones[defaultDomain.domain];
                 for (const i in otherDefaultDomainRecords) {
                     const recordDomain = this.parseDomain(otherDefaultDomainRecords[i], defaultDomain.domain);
                     zones[recordDomain] = zones[defaultDomain.domain];
@@ -56,7 +58,7 @@ class CDNConstruct extends constructs_1.Construct {
                     }
                 }
                 certificate = new acm.Certificate(this, 'DomainCertificate', {
-                    domainName: defaultDomainName,
+                    domainName: this.domainName,
                     subjectAlternativeNames,
                     validation: acm.CertificateValidation.fromDnsMultiZone(zones),
                 });
@@ -66,8 +68,8 @@ class CDNConstruct extends constructs_1.Construct {
             defaultBehavior,
             additionalBehaviors,
             certificate,
-            domainNames: defaultDomainName
-                ? [defaultDomainName, ...subjectAlternativeNames]
+            domainNames: this.domainName
+                ? [this.domainName, ...subjectAlternativeNames]
                 : undefined,
             priceClass: cloudfront.PriceClass.PRICE_CLASS_100,
         });
@@ -92,5 +94,10 @@ class CDNConstruct extends constructs_1.Construct {
         else
             return `${record}.${domain}`;
     }
+    attachable() {
+        return {
+            domain: 'https://' + (this.domainName ?? this.distribution.domainName),
+        };
+    }
 }
 exports.CDNConstruct = CDNConstruct;

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@fy-stack/cdn-construct",
-  "version": "0.0.143",
+  "version": "0.0.145",
   "repository": "https://github.com/festusyuma/fy-stack",
   "dependencies": {
-    "@fy-stack/types": "0.0.143",
+    "@fy-stack/types": "0.0.145",
     "tslib": "^2.3.0"
   },
   "peerDependencies": {