@reldens/server-utils 0.29.0 → 0.30.0

package/lib/app-server-factory.js

@@ -97,12 +97,30 @@ class AppServerFactory
         };
     }
 
+    parseUrl(url)
+    {
+        if(!url || 'string' !== typeof url){
+            return false;
+        }
+        let cleanUrl = url.trim();
+        if(!cleanUrl.startsWith('http://') && !cleanUrl.startsWith('https://')){
+            return false;
+        }
+        let isHttps = cleanUrl.startsWith('https://');
+        let domain = cleanUrl.replace(/^https?:\/\//, '').split(':')[0];
+        return {
+            isHttps,
+            domain,
+            protocol: isHttps ? 'https' : 'http'
+        };
+    }
+
     createAppServer(appServerConfig)
     {
         if(appServerConfig){
             Object.assign(this, appServerConfig);
         }
-        this.addHttpDomainsAsDevelopment();
+        this.processEnvironmentUrls();
         this.detectDevelopmentMode();
         this.setupDevelopmentConfiguration();
         this.setupProtocolEnforcement();
@@ -124,23 +142,23 @@ class AppServerFactory
         return {app: this.app, appServer: this.appServer};
     }
 
-    extractDomainFromHttpUrl(url)
+    processEnvironmentUrls()
     {
-        if(!url || !url.startsWith('http://')){
-            return false;
-        }
-        return url.replace(/^http:\/\//, '').split(':')[0];
-    }
-
-    addHttpDomainsAsDevelopment()
-    {
-        let hostDomain = this.extractDomainFromHttpUrl(process.env.RELDENS_APP_HOST);
-        let publicDomain = this.extractDomainFromHttpUrl(process.env.RELDENS_PUBLIC_URL);
-        if(hostDomain && !this.developmentDomains.includes(hostDomain)){
-            this.developmentDomains.push(hostDomain);
+        let publicUrlInfo = this.parseUrl(process.env.RELDENS_PUBLIC_URL);
+        let hostUrlInfo = this.parseUrl(process.env.RELDENS_APP_HOST);
+        if(publicUrlInfo){
+            this.useHttps = publicUrlInfo.isHttps;
+            if(!this.developmentDomains.includes(publicUrlInfo.domain)){
+                this.developmentDomains.push(publicUrlInfo.domain);
+            }
         }
-        if(publicDomain && !this.developmentDomains.includes(publicDomain)){
-            this.developmentDomains.push(publicDomain);
+        if(hostUrlInfo){
+            if(!publicUrlInfo){
+                this.useHttps = hostUrlInfo.isHttps;
+            }
+            if(!this.developmentDomains.includes(hostUrlInfo.domain)){
+                this.developmentDomains.push(hostUrlInfo.domain);
+            }
         }
     }
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/server-utils",
     "scope": "@reldens",
-    "version": "0.29.0",
+    "version": "0.30.0",
     "description": "Reldens - Server Utils",
     "author": "Damian A. Pastorini",
     "license": "MIT",