@reldens/cms 0.33.0 → 0.35.0

package/lib/frontend.js

@@ -38,6 +38,7 @@ class Frontend
         this.domainMapping = sc.get(props, 'domainMapping', {});
         this.siteKeyMapping = sc.get(props, 'siteKeyMapping', {});
         this.domainPublicUrlMapping = sc.get(props, 'domainPublicUrlMapping', {});
+        this.domainCdnMapping = sc.get(props, 'domainCdnMapping', {});
         this.defaultPublicUrl = sc.get(props, 'defaultPublicUrl', '');
         this.entitiesConfig = sc.get(props, 'entitiesConfig', {});
         this.templateEngine = false;
@@ -129,6 +130,7 @@ class Frontend
             projectRoot: this.projectRoot,
             publicPath: this.publicPath,
             domainPublicUrlMapping: this.domainPublicUrlMapping,
+            domainCdnMapping: this.domainCdnMapping,
             defaultPublicUrl: this.defaultPublicUrl,
             dynamicForm: this.dynamicForm,
             dynamicFormRenderer: this.dynamicFormRenderer

package/lib/manager.js

@@ -63,7 +63,12 @@ class Manager
         this.domainPublicUrlMapping = sc.get(
             props,
             'domainPublicUrlMapping',
-            sc.toJson(process.env.RELDENS_DOMAIN_PUBLIC_URL_MAPPING)
+            sc.toJson(process.env.RELDENS_DOMAIN_PUBLIC_URL_MAPPING, {})
+        );
+        this.domainCdnMapping = sc.get(
+            props,
+            'domainCdnMapping',
+            sc.toJson(process.env.RELDENS_DOMAIN_CDN_MAPPING, {})
         );
         this.templateExtensions = sc.get(props, 'templateExtensions', ['.html', '.template']);
         this.cache = sc.get(props, 'cache', false);
@@ -249,6 +254,7 @@ class Manager
         };
         let appServerConfig = Object.assign({}, baseConfig, this.appServerConfig);
         if(this.domainMapping && 'object' === typeof this.domainMapping){
+            this.validateCdnMappingsInDevelopment();
             let mappingKeys = Object.keys(this.domainMapping);
             for(let domain of mappingKeys){
                 this.appServerFactory.addDevelopmentDomain(domain);
@@ -263,6 +269,34 @@ class Manager
         return appServerConfig;
     }
 
+    validateCdnMappingsInDevelopment()
+    {
+        if(!sc.isObject(this.domainCdnMapping) || sc.isArray(this.domainCdnMapping)){
+            return;
+        }
+        if(0 === Object.keys(this.domainCdnMapping).length){
+            return;
+        }
+        if(!sc.isObject(this.developmentExternalDomains) || sc.isArray(this.developmentExternalDomains)){
+            Logger.warning('CDN mappings configured but developmentExternalDomains not provided. '
+                +'CDN assets may fail in development mode due to CORS. '
+                +'Add CDN domains to developmentExternalDomains configuration.');
+            return;
+        }
+        let cdnUrls = Object.keys(this.domainCdnMapping).map(domain => this.domainCdnMapping[domain]);
+        let missingCDNs = [];
+        for(let cdnUrl of cdnUrls){
+            let cdnHostname = cdnUrl.replace(/^https?:\/\//, '').split('/')[0];
+            if(!sc.hasOwn(this.developmentExternalDomains, cdnHostname)){
+                missingCDNs.push(cdnHostname);
+            }
+        }
+        if(0 < missingCDNs.length){
+            Logger.warning('CDN domains not found in developmentExternalDomains: '+missingCDNs.join(', ')
+                +'. Add them to avoid CORS issues in development mode.');
+        }
+    }
+
     async initializeCmsAfterInstall(props)
     {
         try {
@@ -533,6 +567,7 @@ class Manager
             domainMapping: this.domainMapping,
             siteKeyMapping: this.siteKeyMapping,
             domainPublicUrlMapping: this.domainPublicUrlMapping,
+            domainCdnMapping: this.domainCdnMapping,
             defaultPublicUrl: this.config.publicUrl,
             templateExtensions: this.templateExtensions,
             entitiesConfig: this.entitiesConfig,

package/lib/template-engine/asset-transformer.js

@@ -33,9 +33,7 @@ class AssetTransformer
         if(!assetPath || assetPath.startsWith('http')){
             return assetPath;
         }
-        return sc.get(currentRequest, 'publicUrl', '')
-            +'/assets'
-            +(assetPath.startsWith('/') ? assetPath : '/'+assetPath);
+        return sc.get(currentRequest, 'assetUrl', '')+'/assets'+(assetPath.startsWith('/') ? assetPath : '/'+assetPath);
     }
 
 }

package/lib/template-engine/system-variables-provider.js

@@ -16,6 +16,7 @@ class SystemVariablesProvider
         this.publicPath = sc.get(props, 'publicPath', './public');
         this.domainPublicUrlMapping = sc.get(props, 'domainPublicUrlMapping', {});
         this.defaultPublicUrl = sc.get(props, 'defaultPublicUrl', '');
+        this.domainCdnMapping = sc.get(props, 'domainCdnMapping', {});
     }
 
     buildSystemVariables(req, route, domain)
@@ -28,6 +29,7 @@ class SystemVariablesProvider
             currentRequest,
             currentRoute,
             currentDomain,
+            domainCdnMapping: this.domainCdnMapping,
             systemInfo
         };
     }
@@ -59,6 +61,7 @@ class SystemVariablesProvider
         if('' === baseUrl && '' !== this.defaultPublicUrl){
             baseUrl = this.defaultPublicUrl;
         }
+        let assetUrl = domain ? sc.get(this.domainCdnMapping, domain, publicUrl) : publicUrl;
         let fullUrl = protocol+'://'+host+originalUrl;
         return {
             method: sc.get(req, 'method', 'GET'),
@@ -75,6 +78,7 @@ class SystemVariablesProvider
             ip: sc.get(req, 'ip', ''),
             baseUrl,
             publicUrl,
+            assetUrl,
             defaultPublicUrl: this.defaultPublicUrl,
             timestamp: sc.getCurrentDate(),
             isSecure: 'https' === protocol

package/lib/template-engine.js

@@ -29,8 +29,9 @@ class TemplateEngine
         this.defaultDomain = sc.get(props, 'defaultDomain', 'default');
         this.projectRoot = sc.get(props, 'projectRoot', './');
         this.publicPath = sc.get(props, 'publicPath', './public');
-        this.domainPublicUrlMapping = sc.get(props, 'domainPublicUrlMapping', {});
+        this.domainPublicUrlMapping = sc.isObject(props.domainPublicUrlMapping) && !sc.isArray(props.domainPublicUrlMapping) ? props.domainPublicUrlMapping : {};
         this.defaultPublicUrl = sc.get(props, 'defaultPublicUrl', '');
+        this.domainCdnMapping = sc.isObject(props.domainCdnMapping) && !sc.isArray(props.domainCdnMapping) ? props.domainCdnMapping : {};
         this.dynamicForm = sc.get(props, 'dynamicForm', false);
         this.dynamicFormRenderer = sc.get(props, 'dynamicFormRenderer', false);
         this.jsonFieldsParser = new JsonFieldsParser({entitiesConfig: sc.get(props, 'entitiesConfig', {})});
@@ -39,6 +40,7 @@ class TemplateEngine
             projectRoot: this.projectRoot,
             publicPath: this.publicPath,
             domainPublicUrlMapping: this.domainPublicUrlMapping,
+            domainCdnMapping: this.domainCdnMapping,
             defaultPublicUrl: this.defaultPublicUrl
         });
         this.entitiesTransformer = new EntitiesTransformer({

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/cms",
     "scope": "@reldens",
-    "version": "0.33.0",
+    "version": "0.35.0",
     "description": "Reldens - CMS",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -33,10 +33,10 @@
         "url": "https://github.com/damian-pastorini/reldens-cms/issues"
     },
     "dependencies": {
-        "@reldens/server-utils": "^0.33.0",
+        "@reldens/server-utils": "^0.36.0",
         "@reldens/storage": "^0.73.0",
         "@reldens/utils": "^0.53.0",
-        "dotenv": "17.2.2",
+        "dotenv": "17.2.3",
         "mustache": "4.2.0"
     }
 }