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
Empty string handling fixes
[e-mobility-charging-stations-simulator.git]
/
src
/
charging-station
/
ui-server
/
UIServerFactory.ts
diff --git
a/src/charging-station/ui-server/UIServerFactory.ts
b/src/charging-station/ui-server/UIServerFactory.ts
index 392d1ee010f6ab1447cea880fdd311f8d19c21f7..9d2bc5741c7c30caee778135635e2b98e830e3b3 100644
(file)
--- a/
src/charging-station/ui-server/UIServerFactory.ts
+++ b/
src/charging-station/ui-server/UIServerFactory.ts
@@
-1,12
+1,12
@@
import chalk from 'chalk';
import chalk from 'chalk';
-import type { UIServerConfiguration } from '../../types/ConfigurationData';
-import { ApplicationProtocol } from '../../types/UIProtocol';
-import Configuration from '../../utils/Configuration';
import type { AbstractUIServer } from './AbstractUIServer';
import type { AbstractUIServer } from './AbstractUIServer';
-import { UIServiceUtils } from './ui-services/UIServiceUtils';
import UIHttpServer from './UIHttpServer';
import UIHttpServer from './UIHttpServer';
+import { UIServerUtils } from './UIServerUtils';
import UIWebSocketServer from './UIWebSocketServer';
import UIWebSocketServer from './UIWebSocketServer';
+import type { UIServerConfiguration } from '../../types/ConfigurationData';
+import { ApplicationProtocol } from '../../types/UIProtocol';
+import Configuration from '../../utils/Configuration';
export default class UIServerFactory {
private constructor() {
export default class UIServerFactory {
private constructor() {
@@
-14,17
+14,16
@@
export default class UIServerFactory {
}
public static getUIServerImplementation(
}
public static getUIServerImplementation(
- applicationProtocol: ApplicationProtocol,
uiServerConfiguration?: UIServerConfiguration
): AbstractUIServer | null {
uiServerConfiguration?: UIServerConfiguration
): AbstractUIServer | null {
- if (UIServ
ice
Utils.isLoopback(uiServerConfiguration.options?.host) === false) {
+ if (UIServ
er
Utils.isLoopback(uiServerConfiguration.options?.host) === false) {
console.warn(
console.warn(
- chalk.
magenta
(
+ chalk.
yellow
(
'Loopback address not detected in UI server configuration. This is not recommended.'
)
);
}
'Loopback address not detected in UI server configuration. This is not recommended.'
)
);
}
- switch (
applicationProtocol
) {
+ switch (
uiServerConfiguration?.type ?? Configuration.getUIServer().type
) {
case ApplicationProtocol.WS:
return new UIWebSocketServer(uiServerConfiguration ?? Configuration.getUIServer());
case ApplicationProtocol.HTTP:
case ApplicationProtocol.WS:
return new UIWebSocketServer(uiServerConfiguration ?? Configuration.getUIServer());
case ApplicationProtocol.HTTP: