proteum 1.0.2 → 2.0.0-1

package/server/app/container/config.ts

@@ -15,14 +15,15 @@ import yaml from 'yaml';
 import type { TDomainsList } from '@common/router';
 import type { TLogProfile } from './console';
 
+declare const PROTEUM_ROUTER_PORT_OVERRIDE: number | null;
+
 /*----------------------------------
 - TYPES
 ----------------------------------*/
 
 declare global {
     namespace Config {
-
-        type EnvName = TEnvConfig["name"];
+        type EnvName = TEnvConfig['name'];
 
         type Env = TEnvConfig;
         type Identity = AppIdentityConfig;
@@ -59,74 +60,60 @@ declare global {
         level: 'log'
 */
 
-export type TEnvName = TEnvConfig["name"];
+export type TEnvName = TEnvConfig['name'];
 export type TEnvConfig = {
-    name: 'local' | 'server',
-    profile: 'dev' | 'testing' | 'prod',
-    
-    router: {
-        port: number,
-        domains: TDomainsList
-    },
-    console: {
-        enable: boolean,
-        debug: boolean,
-        bufferLimit: number,
-        level: TLogProfile,
-    },
-}
-
-type AppIdentityConfig = {
+    name: 'local' | 'server';
+    profile: 'dev' | 'testing' | 'prod';
 
-    name: string,
-    identifier: string,
-    description: string,
-    author: {
-        name: string,
-        url: string,
-        email: string
-    },
+    router: { port: number; domains: TDomainsList };
+    console: { enable: boolean; debug: boolean; bufferLimit: number; level: TLogProfile };
+};
 
-    social: {
+type AppIdentityConfig = {
+    name: string;
+    identifier: string;
+    description: string;
+    author: { name: string; url: string; email: string };
 
-    },
+    social: {};
 
-    locale: string
-    language: string
-    maincolor: string, 
-    iconsPack?: string,
+    locale: string;
+    language: string;
+    maincolor: string;
+    iconsPack?: string;
 
     web: {
-        title: string,
-        titleSuffix: string,
-        fullTitle: string,
-        description: string,
-        version: string,
-        metas?: {[name: string]: string},
-        jsonld?: {[name: string]: string},
-    }                         
-}
-
-export type AppConfig = { 
-    env: Config.Env, 
-    identity: Config.Identity,
-}
+        title: string;
+        titleSuffix: string;
+        fullTitle: string;
+        description: string;
+        version: string;
+        metas?: { [name: string]: string };
+        jsonld?: { [name: string]: string };
+    };
+};
+
+export type AppConfig = { env: Config.Env; identity: Config.Identity };
 
 const debug = false;
 
+const getRouterPortOverride = () => {
+    if (typeof PROTEUM_ROUTER_PORT_OVERRIDE !== 'undefined' && PROTEUM_ROUTER_PORT_OVERRIDE !== null)
+        return PROTEUM_ROUTER_PORT_OVERRIDE;
+
+    return undefined;
+};
+
 /*----------------------------------
 - LOADE
 ----------------------------------*/
 export default class ConfigParser {
-
     public constructor(
         public appDir: string,
-        public envName?: string
-    ) {
+        public envName?: string,
+    ) {}
 
-    }
-
-    private loadYaml( filepath: string ) {
+    private loadYaml(filepath: string) {
         debug && console.info(`Loading config ${filepath}`);
         const rawConfig = fs.readFileSync(filepath, 'utf-8');
         return yaml.parse(rawConfig);
@@ -135,19 +122,21 @@ export default class ConfigParser {
     public env(): TEnvConfig {
         // We assume that when we run 5htp dev, we're in local
         // Otherwise, we're in production environment (docker)
-        console.log("[app] Using environment:", process.env.NODE_ENV);
+        console.log('[app] Using environment:', process.env.NODE_ENV);
         const envFileName = this.appDir + '/env.yaml';
-        const envFile = this.loadYaml( envFileName );
+        const envFile = this.loadYaml(envFileName);
+        const routerPortOverride = getRouterPortOverride();
         return {
             ...envFile,
-            version: BUILD_DATE
-        }
+            router: routerPortOverride === undefined ? envFile.router : { ...envFile.router, port: routerPortOverride },
+            version: BUILD_DATE,
+        };
     }
 
     public identity() {
         const identityFile = this.appDir + '/identity.yaml';
         debug && console.info(`Loading identity ${identityFile}`);
-        return this.loadYaml( identityFile );
+        return this.loadYaml(identityFile);
     }
 }
 
@@ -200,4 +189,4 @@ export default class ConfigParser {
             deepExtend(fileConfig, loadYaml(fullpath));
 
     }
-}*/
+}*/