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: Improve error handling
[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 26bbe6dd48519806862bd21fccad1233384853c9..2e5245329b9b70485a8796f92bd2b661124c602d 100644
(file)
--- a/
src/charging-station/ui-server/UIServerFactory.ts
+++ b/
src/charging-station/ui-server/UIServerFactory.ts
@@
-1,10
+1,12
@@
-import { AbstractUIServer } from './AbstractUIServer';
+import chalk from 'chalk';
+
+import type { UIServerConfiguration } from '../../types/ConfigurationData';
import { ApplicationProtocol } from '../../types/UIProtocol';
import Configuration from '../../utils/Configuration';
import { ApplicationProtocol } from '../../types/UIProtocol';
import Configuration from '../../utils/Configuration';
-import
{ ServerOptions } from '../../types/ConfigurationData
';
+import
type { AbstractUIServer } from './AbstractUIServer
';
import { UIServiceUtils } from './ui-services/UIServiceUtils';
import { UIServiceUtils } from './ui-services/UIServiceUtils';
+import UIHttpServer from './UIHttpServer';
import UIWebSocketServer from './UIWebSocketServer';
import UIWebSocketServer from './UIWebSocketServer';
-import chalk from 'chalk';
export default class UIServerFactory {
private constructor() {
export default class UIServerFactory {
private constructor() {
@@
-12,19
+14,20
@@
export default class UIServerFactory {
}
public static getUIServerImplementation(
}
public static getUIServerImplementation(
- applicationProtocol: ApplicationProtocol,
- options?: ServerOptions
+ uiServerConfiguration?: UIServerConfiguration
): AbstractUIServer | null {
): AbstractUIServer | null {
- if (
!UIServiceUtils.isLoopback(options?.host)
) {
+ if (
UIServiceUtils.isLoopback(uiServerConfiguration.options?.host) === false
) {
console.warn(
chalk.magenta(
'Loopback address not detected in UI server configuration. This is not recommended.'
)
);
}
console.warn(
chalk.magenta(
'Loopback address not detected in UI server configuration. This is not recommended.'
)
);
}
- switch (
applicationProtocol
) {
+ switch (
uiServerConfiguration?.type ?? Configuration.getUIServer().type
) {
case ApplicationProtocol.WS:
case ApplicationProtocol.WS:
- return new UIWebSocketServer(options ?? Configuration.getUIServer().options);
+ return new UIWebSocketServer(uiServerConfiguration ?? Configuration.getUIServer());
+ case ApplicationProtocol.HTTP:
+ return new UIHttpServer(uiServerConfiguration ?? Configuration.getUIServer());
default:
return null;
}
default:
return null;
}