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
Merge branch 'master' into Extend-charging-profile-support
[e-mobility-charging-stations-simulator.git]
/
src
/
charging-station
/
ui-websocket-services
/
AbstractUIService.ts
diff --git
a/src/charging-station/ui-websocket-services/AbstractUIService.ts
b/src/charging-station/ui-websocket-services/AbstractUIService.ts
index 4d950d05ebb8c3abcef62cf123bd17267520d297..42cfa428f1373cc36e1b67bca96661d1eebf6b19 100644
(file)
--- a/
src/charging-station/ui-websocket-services/AbstractUIService.ts
+++ b/
src/charging-station/ui-websocket-services/AbstractUIService.ts
@@
-1,6
+1,7
@@
-import { ProtocolCommand, ProtocolRequestHandler } from '../../types/U
i
Protocol';
+import { ProtocolCommand, ProtocolRequestHandler } from '../../types/U
I
Protocol';
import BaseError from '../../exception/BaseError';
import BaseError from '../../exception/BaseError';
+import { JsonType } from '../../types/JsonType';
import UIWebSocketServer from '../UIWebSocketServer';
import logger from '../../utils/Logger';
import UIWebSocketServer from '../UIWebSocketServer';
import logger from '../../utils/Logger';
@@
-15,12
+16,12
@@
export default abstract class AbstractUIService {
]);
}
]);
}
- public async
handleMessage(command: ProtocolCommand, payload: Record<string, unknown>
): Promise<void> {
- let messageResponse:
Record<string, unknown>
;
+ public async
messageHandler(command: ProtocolCommand, payload: JsonType
): Promise<void> {
+ let messageResponse:
JsonType
;
if (this.messageHandlers.has(command)) {
try {
// Call the method to build the message response
if (this.messageHandlers.has(command)) {
try {
// Call the method to build the message response
- messageResponse =
await this.messageHandlers.get(command)(payload) as Record<string, unknown>
;
+ messageResponse =
(await this.messageHandlers.get(command)(payload)) as JsonType
;
} catch (error) {
// Log
logger.error(this.uiWebSocketServer.logPrefix() + ' Handle message error: %j', error);
} catch (error) {
// Log
logger.error(this.uiWebSocketServer.logPrefix() + ' Handle message error: %j', error);
@@
-28,20
+29,23
@@
export default abstract class AbstractUIService {
}
} else {
// Throw exception
}
} else {
// Throw exception
- throw new BaseError(`${command} is not implemented to handle message payload ${JSON.stringify(payload, null, 2)}`);
+ throw new BaseError(
+ `${command} is not implemented to handle message payload ${JSON.stringify(
+ payload,
+ null,
+ 2
+ )}`
+ );
}
// Send the built message response
this.uiWebSocketServer.broadcastToClients(this.buildProtocolMessage(command, messageResponse));
}
}
// Send the built message response
this.uiWebSocketServer.broadcastToClients(this.buildProtocolMessage(command, messageResponse));
}
- protected buildProtocolMessage(
- command: ProtocolCommand,
- payload: Record<string, unknown>,
- ): string {
+ protected buildProtocolMessage(command: ProtocolCommand, payload: JsonType): string {
return JSON.stringify([command, payload]);
}
return JSON.stringify([command, payload]);
}
- private handleListChargingStations():
Set<string>
{
- return
this.uiWebSocketServer.chargingStations
;
+ private handleListChargingStations():
string[]
{
+ return
Array.from(this.uiWebSocketServer.chargingStations)
;
}
}
}
}