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
build(deps-dev): Bump jsdom from 23.0.1 to 23.1.0 in /ui/web
[e-mobility-charging-stations-simulator.git]
/
ui
/
web
/
src
/
composables
/
UIClient.ts
diff --git
a/ui/web/src/composables/UIClient.ts
b/ui/web/src/composables/UIClient.ts
index 745accdfb8d0e60aa0883bd7133656cf6d4e9654..10f2d3dea0b42ad2fe08fe549b7f1fb475802d41 100644
(file)
--- a/
ui/web/src/composables/UIClient.ts
+++ b/
ui/web/src/composables/UIClient.ts
@@
-4,197
+4,198
@@
import {
type RequestPayload,
type ResponsePayload,
ResponseStatus,
type RequestPayload,
type ResponsePayload,
ResponseStatus,
-} from '@/types'
;
-import config from '@/assets/config'
;
+} from '@/types'
+import config from '@/assets/config'
type ResponseHandler = {
type ResponseHandler = {
- procedureName: ProcedureName
;
- resolve: (value: ResponsePayload | PromiseLike<ResponsePayload>) => void
;
- reject: (reason?: unknown) => void
;
-}
;
+ procedureName: ProcedureName
+ resolve: (value: ResponsePayload | PromiseLike<ResponsePayload>) => void
+ reject: (reason?: unknown) => void
+}
export class UIClient {
export class UIClient {
- private static instance: UIClient | null = null
;
+ private static instance: UIClient | null = null
- private ws!: WebSocket
;
- private responseHandlers: Map<string, ResponseHandler>
;
+ private ws!: WebSocket
+ private responseHandlers: Map<string, ResponseHandler>
private constructor() {
private constructor() {
- this.openWS()
;
- this.responseHandlers = new Map<string, ResponseHandler>()
;
+ this.openWS()
+ this.responseHandlers = new Map<string, ResponseHandler>()
}
public static getInstance() {
if (UIClient.instance === null) {
}
public static getInstance() {
if (UIClient.instance === null) {
- UIClient.instance = new UIClient()
;
+ UIClient.instance = new UIClient()
}
}
- return UIClient.instance
;
+ return UIClient.instance
}
public registerWSonOpenListener(listener: (event: Event) => void) {
}
public registerWSonOpenListener(listener: (event: Event) => void) {
- this.ws.addEventListener('open', listener)
;
+ this.ws.addEventListener('open', listener)
}
public async startSimulator(): Promise<ResponsePayload> {
}
public async startSimulator(): Promise<ResponsePayload> {
- return this.sendRequest(ProcedureName.START_SIMULATOR, {})
;
+ return this.sendRequest(ProcedureName.START_SIMULATOR, {})
}
public async stopSimulator(): Promise<ResponsePayload> {
}
public async stopSimulator(): Promise<ResponsePayload> {
- return this.sendRequest(ProcedureName.STOP_SIMULATOR, {})
;
+ return this.sendRequest(ProcedureName.STOP_SIMULATOR, {})
}
public async listChargingStations(): Promise<ResponsePayload> {
}
public async listChargingStations(): Promise<ResponsePayload> {
- return this.sendRequest(ProcedureName.LIST_CHARGING_STATIONS, {})
;
+ return this.sendRequest(ProcedureName.LIST_CHARGING_STATIONS, {})
}
public async startChargingStation(hashId: string): Promise<ResponsePayload> {
}
public async startChargingStation(hashId: string): Promise<ResponsePayload> {
- return this.sendRequest(ProcedureName.START_CHARGING_STATION, { hashIds: [hashId] })
;
+ return this.sendRequest(ProcedureName.START_CHARGING_STATION, { hashIds: [hashId] })
}
public async stopChargingStation(hashId: string): Promise<ResponsePayload> {
}
public async stopChargingStation(hashId: string): Promise<ResponsePayload> {
- return this.sendRequest(ProcedureName.STOP_CHARGING_STATION, { hashIds: [hashId] })
;
+ return this.sendRequest(ProcedureName.STOP_CHARGING_STATION, { hashIds: [hashId] })
}
public async openConnection(hashId: string): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.OPEN_CONNECTION, {
hashIds: [hashId],
}
public async openConnection(hashId: string): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.OPEN_CONNECTION, {
hashIds: [hashId],
- })
;
+ })
}
public async closeConnection(hashId: string): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.CLOSE_CONNECTION, {
hashIds: [hashId],
}
public async closeConnection(hashId: string): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.CLOSE_CONNECTION, {
hashIds: [hashId],
- })
;
+ })
}
public async startTransaction(
hashId: string,
connectorId: number,
}
public async startTransaction(
hashId: string,
connectorId: number,
- idTag: string | undefined
,
+ idTag: string | undefined
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.START_TRANSACTION, {
hashIds: [hashId],
connectorId,
idTag,
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.START_TRANSACTION, {
hashIds: [hashId],
connectorId,
idTag,
- })
;
+ })
}
public async stopTransaction(
hashId: string,
}
public async stopTransaction(
hashId: string,
- transactionId: number | undefined
,
+ transactionId: number | undefined
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.STOP_TRANSACTION, {
hashIds: [hashId],
transactionId,
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.STOP_TRANSACTION, {
hashIds: [hashId],
transactionId,
- })
;
+ })
}
public async startAutomaticTransactionGenerator(
hashId: string,
}
public async startAutomaticTransactionGenerator(
hashId: string,
- connectorId: number
,
+ connectorId: number
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.START_AUTOMATIC_TRANSACTION_GENERATOR, {
hashIds: [hashId],
connectorIds: [connectorId],
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.START_AUTOMATIC_TRANSACTION_GENERATOR, {
hashIds: [hashId],
connectorIds: [connectorId],
- })
;
+ })
}
public async stopAutomaticTransactionGenerator(
hashId: string,
}
public async stopAutomaticTransactionGenerator(
hashId: string,
- connectorId: number
,
+ connectorId: number
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.STOP_AUTOMATIC_TRANSACTION_GENERATOR, {
hashIds: [hashId],
connectorIds: [connectorId],
): Promise<ResponsePayload> {
return this.sendRequest(ProcedureName.STOP_AUTOMATIC_TRANSACTION_GENERATOR, {
hashIds: [hashId],
connectorIds: [connectorId],
- })
;
+ })
}
private openWS(): void {
this.ws = new WebSocket(
`ws://${config.uiServer.host}:${config.uiServer.port}`,
}
private openWS(): void {
this.ws = new WebSocket(
`ws://${config.uiServer.host}:${config.uiServer.port}`,
- config.uiServer.protocol
,
- )
;
- this.ws.onmessage = this.responseHandler.bind(this)
;
+ config.uiServer.protocol
+ )
+ this.ws.onmessage = this.responseHandler.bind(this)
this.ws.onerror = (errorEvent) => {
this.ws.onerror = (errorEvent) => {
- console.error('WebSocket error: ', errorEvent)
;
- }
;
+ console.error('WebSocket error: ', errorEvent)
+ }
this.ws.onclose = (closeEvent) => {
this.ws.onclose = (closeEvent) => {
- console.info('WebSocket closed: ', closeEvent)
;
- }
;
+ console.info('WebSocket closed: ', closeEvent)
+ }
}
private setResponseHandler(
id: string,
procedureName: ProcedureName,
resolve: (value: ResponsePayload | PromiseLike<ResponsePayload>) => void,
}
private setResponseHandler(
id: string,
procedureName: ProcedureName,
resolve: (value: ResponsePayload | PromiseLike<ResponsePayload>) => void,
- reject: (reason?: unknown) => void
,
+ reject: (reason?: unknown) => void
): void {
): void {
- this.responseHandlers.set(id, { procedureName, resolve, reject })
;
+ this.responseHandlers.set(id, { procedureName, resolve, reject })
}
private getResponseHandler(id: string): ResponseHandler | undefined {
}
private getResponseHandler(id: string): ResponseHandler | undefined {
- return this.responseHandlers.get(id)
;
+ return this.responseHandlers.get(id)
}
private deleteResponseHandler(id: string): boolean {
}
private deleteResponseHandler(id: string): boolean {
- return this.responseHandlers.delete(id)
;
+ return this.responseHandlers.delete(id)
}
private async sendRequest(
command: ProcedureName,
}
private async sendRequest(
command: ProcedureName,
- data: RequestPayload
,
+ data: RequestPayload
): Promise<ResponsePayload> {
): Promise<ResponsePayload> {
- let uuid: string;
- return await new Promise<ResponsePayload>((resolve, reject) => {
- uuid = crypto.randomUUID();
- const msg = JSON.stringify([uuid, command, data]);
-
+ return new Promise<ResponsePayload>((resolve, reject) => {
if (this.ws.readyState !== WebSocket.OPEN) {
if (this.ws.readyState !== WebSocket.OPEN) {
- this.openWS()
;
+ this.openWS()
}
if (this.ws.readyState === WebSocket.OPEN) {
}
if (this.ws.readyState === WebSocket.OPEN) {
+ const uuid = crypto.randomUUID()
+ const msg = JSON.stringify([uuid, command, data])
const sendTimeout = setTimeout(() => {
const sendTimeout = setTimeout(() => {
- this.deleteResponseHandler(uuid)
;
- return reject(new Error(`Send request '${command}' message timeout`))
;
- }, 60 * 1000)
;
+ this.deleteResponseHandler(uuid)
+ return reject(new Error(`Send request '${command}' message timeout`))
+ }, 60 * 1000)
try {
try {
- this.ws.send(msg);
+ this.ws.send(msg)
+ this.setResponseHandler(uuid, command, resolve, reject)
} catch (error) {
} catch (error) {
- reject(error);
+ this.deleteResponseHandler(uuid)
+ reject(error)
} finally {
} finally {
- clearTimeout(sendTimeout)
;
+ clearTimeout(sendTimeout)
}
} else {
}
} else {
- throw new Error(`Send request '${command}' message: connection not opened`)
;
+ throw new Error(`Send request '${command}' message: connection not opened`)
}
}
-
- this.setResponseHandler(uuid, command, resolve, reject);
- });
+ })
}
private responseHandler(messageEvent: MessageEvent<string>): void {
}
private responseHandler(messageEvent: MessageEvent<string>): void {
- const response = JSON.parse(messageEvent.data) as ProtocolResponse
;
+ const response = JSON.parse(messageEvent.data) as ProtocolResponse
if (Array.isArray(response) === false) {
if (Array.isArray(response) === false) {
- throw new Error(`Response not an array: ${JSON.stringify(response, undefined, 2)}`)
;
+ throw new Error(`Response not an array: ${JSON.stringify(response, undefined, 2)}`)
}
}
- const [uuid, responsePayload] = response
;
+ const [uuid, responsePayload] = response
if (this.responseHandlers.has(uuid) === true) {
if (this.responseHandlers.has(uuid) === true) {
+ const { procedureName, resolve, reject } = this.getResponseHandler(uuid)!
switch (responsePayload.status) {
case ResponseStatus.SUCCESS:
switch (responsePayload.status) {
case ResponseStatus.SUCCESS:
- this.getResponseHandler(uuid)?.resolve(responsePayload);
- break
;
+ resolve(responsePayload)
+ break
case ResponseStatus.FAILURE:
case ResponseStatus.FAILURE:
- this.getResponseHandler(uuid)?.reject(responsePayload);
- break
;
+ reject(responsePayload)
+ break
default:
default:
- console.error(`Response status not supported: ${responsePayload.status}`);
+ console.error(
+ `Response status for procedure '${procedureName}' not supported: '${responsePayload.status}'`
+ )
}
}
- this.deleteResponseHandler(uuid)
;
+ this.deleteResponseHandler(uuid)
} else {
} else {
- throw new Error(`Not a response to a request: ${JSON.stringify(response, undefined, 2)}`)
;
+ throw new Error(`Not a response to a request: ${JSON.stringify(response, undefined, 2)}`)
}
}
}
}
}
}