X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Futils%2FConfiguration.ts;h=fb77ff2ea810653294e6558d1539dd251e49fbba;hb=4b65fe711865b86ae13b9217ddce2d92e3cb6254;hp=67cf501b02e24eb2e7356affc556d79bca311aff;hpb=d5bd1c008c3b2fbe6426ae12e1e12afe97807c57;p=e-mobility-charging-stations-simulator.git

diff --git a/src/utils/Configuration.ts b/src/utils/Configuration.ts
index 67cf501b..fb77ff2e 100644
--- a/src/utils/Configuration.ts
+++ b/src/utils/Configuration.ts
@@ -1,22 +1,27 @@
-import ConfigurationData, {
-  StationTemplateUrl,
-  StorageConfiguration,
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+import chalk from 'chalk';
+import merge from 'just-merge';
+import { WorkerChoiceStrategies } from 'poolifier';
+
+import {
+  type ConfigurationData,
+  type StationTemplateUrl,
+  type StorageConfiguration,
   SupervisionUrlDistribution,
-  UIServerConfiguration,
-  WorkerConfiguration,
+  type UIServerConfiguration,
+  type WorkerConfiguration,
 } from '../types/ConfigurationData';
-
-import Constants from './Constants';
-import { EmptyObject } from '../types/EmptyObject';
+import type { EmptyObject } from '../types/EmptyObject';
+import type { HandleErrorParams } from '../types/Error';
 import { FileType } from '../types/FileType';
-import { HandleErrorParams } from '../types/Error';
 import { StorageType } from '../types/Storage';
-import WorkerConstants from '../worker/WorkerConstants';
+import { ApplicationProtocol } from '../types/UIProtocol';
 import { WorkerProcessType } from '../types/Worker';
-import chalk from 'chalk';
-import { fileURLToPath } from 'url';
-import fs from 'fs';
-import path from 'path';
+import WorkerConstants from '../worker/WorkerConstants';
+import Constants from './Constants';
 
 export default class Configuration {
   private static configurationFile = path.join(
@@ -56,17 +61,19 @@ export default class Configuration {
       );
     }
     let uiServerConfiguration: UIServerConfiguration = {
-      enabled: true,
+      enabled: false,
+      type: ApplicationProtocol.WS,
       options: {
-        host: Constants.DEFAULT_UI_WEBSOCKET_SERVER_HOST,
-        port: Constants.DEFAULT_UI_WEBSOCKET_SERVER_PORT,
+        host: Constants.DEFAULT_UI_SERVER_HOST,
+        port: Constants.DEFAULT_UI_SERVER_PORT,
       },
     };
     if (Configuration.objectHasOwnProperty(Configuration.getConfig(), 'uiServer')) {
-      uiServerConfiguration = Configuration.deepMerge(
-        uiServerConfiguration,
-        Configuration.getConfig().uiServer
-      );
+      uiServerConfiguration = merge(uiServerConfiguration, Configuration.getConfig().uiServer);
+    }
+    if (Configuration.isCFEnvironment() === true) {
+      delete uiServerConfiguration.options.host;
+      uiServerConfiguration.options.port = parseInt(process.env.PORT);
     }
     return uiServerConfiguration;
   }
@@ -209,7 +216,8 @@ export default class Configuration {
       )
         ? Configuration.getConfig().workerPoolMaxSize
         : WorkerConstants.DEFAULT_POOL_MAX_SIZE,
-      poolStrategy: Configuration.getConfig().workerPoolStrategy,
+      poolStrategy:
+        Configuration.getConfig().workerPoolStrategy ?? WorkerChoiceStrategies.ROUND_ROBIN,
     };
     if (Configuration.objectHasOwnProperty(Configuration.getConfig(), 'worker')) {
       workerConfiguration = { ...workerConfiguration, ...Configuration.getConfig().worker };
@@ -236,10 +244,18 @@ export default class Configuration {
       : true;
   }
 
-  static getLogMaxFiles(): number {
-    return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'logMaxFiles')
-      ? Configuration.getConfig().logMaxFiles
-      : 7;
+  static getLogMaxFiles(): number | string | undefined {
+    return (
+      Configuration.objectHasOwnProperty(Configuration.getConfig(), 'logMaxFiles') &&
+      Configuration.getConfig().logMaxFiles
+    );
+  }
+
+  static getLogMaxSize(): number | string | undefined {
+    return (
+      Configuration.objectHasOwnProperty(Configuration.getConfig(), 'logMaxFiles') &&
+      Configuration.getConfig().logMaxSize
+    );
   }
 
   static getLogLevel(): string {
@@ -369,6 +385,10 @@ export default class Configuration {
     }
   }
 
+  private static isCFEnvironment(): boolean {
+    return process.env.VCAP_APPLICATION !== undefined;
+  }
+
   private static getDefaultPerformanceStorageUri(storageType: StorageType) {
     const SQLiteFileName = `${Constants.DEFAULT_PERFORMANCE_RECORDS_DB_NAME}.db`;
     switch (storageType) {
@@ -387,33 +407,6 @@ export default class Configuration {
     }
   }
 
-  private static isObject(item): boolean {
-    return item && typeof item === 'object' && !Array.isArray(item);
-  }
-
-  private static deepMerge(target: object, ...sources: object[]): object {
-    if (!sources.length) {
-      return target;
-    }
-    const source = sources.shift();
-
-    if (Configuration.isObject(target) && Configuration.isObject(source)) {
-      for (const key in source) {
-        if (Configuration.isObject(source[key])) {
-          if (!target[key]) {
-            Object.assign(target, { [key]: {} });
-          }
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-          Configuration.deepMerge(target[key], source[key]);
-        } else {
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-          Object.assign(target, { [key]: source[key] });
-        }
-      }
-    }
-    return Configuration.deepMerge(target, ...sources);
-  }
-
   private static objectHasOwnProperty(object: unknown, property: string): boolean {
     return Object.prototype.hasOwnProperty.call(object, property) as boolean;
   }