repositories
/
e-mobility-charging-stations-simulator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UI Server: rename defaults constants
[e-mobility-charging-stations-simulator.git]
/
src
/
utils
/
Configuration.ts
diff --git
a/src/utils/Configuration.ts
b/src/utils/Configuration.ts
index 67cf501b02e24eb2e7356affc556d79bca311aff..4fc46b059ffa9dfa1aa5ce4c99883e758eb12c68 100644
(file)
--- a/
src/utils/Configuration.ts
+++ b/
src/utils/Configuration.ts
@@
-1,22
+1,25
@@
-import ConfigurationData, {
- StationTemplateUrl,
- StorageConfiguration,
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+import chalk from 'chalk';
+
+import {
+ type ConfigurationData,
+ type StationTemplateUrl,
+ type StorageConfiguration,
SupervisionUrlDistribution,
SupervisionUrlDistribution,
- UIServerConfiguration,
- WorkerConfiguration,
+
type
UIServerConfiguration,
+
type
WorkerConfiguration,
} from '../types/ConfigurationData';
} 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 { FileType } from '../types/FileType';
-import { HandleErrorParams } from '../types/Error';
import { StorageType } from '../types/Storage';
import { StorageType } from '../types/Storage';
-import
WorkerConstants from '../worker/WorkerConstants
';
+import
{ ApplicationProtocol } from '../types/UIProtocol
';
import { WorkerProcessType } from '../types/Worker';
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(
export default class Configuration {
private static configurationFile = path.join(
@@
-56,10
+59,11
@@
export default class Configuration {
);
}
let uiServerConfiguration: UIServerConfiguration = {
);
}
let uiServerConfiguration: UIServerConfiguration = {
- enabled: true,
+ enabled: false,
+ type: ApplicationProtocol.WS,
options: {
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')) {
},
};
if (Configuration.objectHasOwnProperty(Configuration.getConfig(), 'uiServer')) {
@@
-68,6
+72,10
@@
export default class Configuration {
Configuration.getConfig().uiServer
);
}
Configuration.getConfig().uiServer
);
}
+ if (Configuration.isCFEnvironment() === true) {
+ delete uiServerConfiguration.options.host;
+ uiServerConfiguration.options.port = parseInt(process.env.PORT);
+ }
return uiServerConfiguration;
}
return uiServerConfiguration;
}
@@
-369,6
+377,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) {
private static getDefaultPerformanceStorageUri(storageType: StorageType) {
const SQLiteFileName = `${Constants.DEFAULT_PERFORMANCE_RECORDS_DB_NAME}.db`;
switch (storageType) {
@@
-388,7
+400,15
@@
export default class Configuration {
}
private static isObject(item): boolean {
}
private static isObject(item): boolean {
- return item && typeof item === 'object' && !Array.isArray(item);
+ return item && typeof item === 'object' && Array.isArray(item) === false;
+ }
+
+ private static objectHasOwnProperty(object: unknown, property: string): boolean {
+ return Object.prototype.hasOwnProperty.call(object, property) as boolean;
+ }
+
+ private static isUndefined(obj: unknown): boolean {
+ return typeof obj === 'undefined';
}
private static deepMerge(target: object, ...sources: object[]): object {
}
private static deepMerge(target: object, ...sources: object[]): object {
@@
-414,14
+434,6
@@
export default class Configuration {
return Configuration.deepMerge(target, ...sources);
}
return Configuration.deepMerge(target, ...sources);
}
- private static objectHasOwnProperty(object: unknown, property: string): boolean {
- return Object.prototype.hasOwnProperty.call(object, property) as boolean;
- }
-
- private static isUndefined(obj: unknown): boolean {
- return typeof obj === 'undefined';
- }
-
private static handleFileException(
logPrefix: string,
fileType: FileType,
private static handleFileException(
logPrefix: string,
fileType: FileType,