X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Fui-server%2Fui-services%2FAbstractUIService.ts;h=20531c6f37ce4002d48ac5fe255628086ab5c0e2;hb=44ebef4c21047693fbc194aa9b7f90578465e29a;hp=900b79d5d1789fc7e5757166b920ab85330c67d2;hpb=9bb1159e3a17ace0e8502e7c4e727219a2b033f2;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ui-server/ui-services/AbstractUIService.ts b/src/charging-station/ui-server/ui-services/AbstractUIService.ts index 900b79d5..20531c6f 100644 --- a/src/charging-station/ui-server/ui-services/AbstractUIService.ts +++ b/src/charging-station/ui-server/ui-services/AbstractUIService.ts @@ -5,45 +5,54 @@ import { ProcedureName, type ProtocolRequest, type ProtocolRequestHandler, + type ProtocolResponse, type ProtocolVersion, type RequestPayload, type ResponsePayload, ResponseStatus, } from '../../../types'; -import { Utils, logger } from '../../../utils'; -import { type AbstractUIServer, Bootstrap, UIServiceWorkerBroadcastChannel } from '../../internal'; +import { isNotEmptyArray, isNullOrUndefined, logger } from '../../../utils'; +import { Bootstrap } from '../../Bootstrap'; +import { UIServiceWorkerBroadcastChannel } from '../../broadcast-channel/UIServiceWorkerBroadcastChannel'; +import type { AbstractUIServer } from '../AbstractUIServer'; const moduleName = 'AbstractUIService'; export abstract class AbstractUIService { - protected static readonly ProcedureNameToBroadCastChannelProcedureNameMap: Omit< - Record, - | ProcedureName.START_SIMULATOR - | ProcedureName.STOP_SIMULATOR - | ProcedureName.LIST_CHARGING_STATIONS - > = { - [ProcedureName.START_CHARGING_STATION]: BroadcastChannelProcedureName.START_CHARGING_STATION, - [ProcedureName.STOP_CHARGING_STATION]: BroadcastChannelProcedureName.STOP_CHARGING_STATION, - [ProcedureName.CLOSE_CONNECTION]: BroadcastChannelProcedureName.CLOSE_CONNECTION, - [ProcedureName.OPEN_CONNECTION]: BroadcastChannelProcedureName.OPEN_CONNECTION, - [ProcedureName.START_AUTOMATIC_TRANSACTION_GENERATOR]: + protected static readonly ProcedureNameToBroadCastChannelProcedureNameMapping = new Map< + ProcedureName, + BroadcastChannelProcedureName + >([ + [ProcedureName.START_CHARGING_STATION, BroadcastChannelProcedureName.START_CHARGING_STATION], + [ProcedureName.STOP_CHARGING_STATION, BroadcastChannelProcedureName.STOP_CHARGING_STATION], + [ProcedureName.CLOSE_CONNECTION, BroadcastChannelProcedureName.CLOSE_CONNECTION], + [ProcedureName.OPEN_CONNECTION, BroadcastChannelProcedureName.OPEN_CONNECTION], + [ + ProcedureName.START_AUTOMATIC_TRANSACTION_GENERATOR, BroadcastChannelProcedureName.START_AUTOMATIC_TRANSACTION_GENERATOR, - [ProcedureName.STOP_AUTOMATIC_TRANSACTION_GENERATOR]: + ], + [ + ProcedureName.STOP_AUTOMATIC_TRANSACTION_GENERATOR, BroadcastChannelProcedureName.STOP_AUTOMATIC_TRANSACTION_GENERATOR, - [ProcedureName.SET_SUPERVISION_URL]: BroadcastChannelProcedureName.SET_SUPERVISION_URL, - [ProcedureName.START_TRANSACTION]: BroadcastChannelProcedureName.START_TRANSACTION, - [ProcedureName.STOP_TRANSACTION]: BroadcastChannelProcedureName.STOP_TRANSACTION, - [ProcedureName.AUTHORIZE]: BroadcastChannelProcedureName.AUTHORIZE, - [ProcedureName.BOOT_NOTIFICATION]: BroadcastChannelProcedureName.BOOT_NOTIFICATION, - [ProcedureName.STATUS_NOTIFICATION]: BroadcastChannelProcedureName.STATUS_NOTIFICATION, - [ProcedureName.HEARTBEAT]: BroadcastChannelProcedureName.HEARTBEAT, - [ProcedureName.METER_VALUES]: BroadcastChannelProcedureName.METER_VALUES, - [ProcedureName.DATA_TRANSFER]: BroadcastChannelProcedureName.DATA_TRANSFER, - [ProcedureName.DIAGNOSTICS_STATUS_NOTIFICATION]: + ], + [ProcedureName.SET_SUPERVISION_URL, BroadcastChannelProcedureName.SET_SUPERVISION_URL], + [ProcedureName.START_TRANSACTION, BroadcastChannelProcedureName.START_TRANSACTION], + [ProcedureName.STOP_TRANSACTION, BroadcastChannelProcedureName.STOP_TRANSACTION], + [ProcedureName.AUTHORIZE, BroadcastChannelProcedureName.AUTHORIZE], + [ProcedureName.BOOT_NOTIFICATION, BroadcastChannelProcedureName.BOOT_NOTIFICATION], + [ProcedureName.STATUS_NOTIFICATION, BroadcastChannelProcedureName.STATUS_NOTIFICATION], + [ProcedureName.HEARTBEAT, BroadcastChannelProcedureName.HEARTBEAT], + [ProcedureName.METER_VALUES, BroadcastChannelProcedureName.METER_VALUES], + [ProcedureName.DATA_TRANSFER, BroadcastChannelProcedureName.DATA_TRANSFER], + [ + ProcedureName.DIAGNOSTICS_STATUS_NOTIFICATION, BroadcastChannelProcedureName.DIAGNOSTICS_STATUS_NOTIFICATION, - [ProcedureName.FIRMWARE_STATUS_NOTIFICATION]: + ], + [ + ProcedureName.FIRMWARE_STATUS_NOTIFICATION, BroadcastChannelProcedureName.FIRMWARE_STATUS_NOTIFICATION, - }; + ], + ]); protected readonly requestHandlers: Map; private readonly version: ProtocolVersion; @@ -63,11 +72,11 @@ export abstract class AbstractUIService { this.broadcastChannelRequests = new Map(); } - public async requestHandler(request: ProtocolRequest): Promise { - let messageId: string; - let command: ProcedureName; + public async requestHandler(request: ProtocolRequest): Promise { + let messageId: string | undefined; + let command: ProcedureName | undefined; let requestPayload: RequestPayload | undefined; - let responsePayload: ResponsePayload; + let responsePayload: ResponsePayload | undefined; try { [messageId, command, requestPayload] = request; @@ -75,17 +84,21 @@ export abstract class AbstractUIService { throw new BaseError( `${command} is not implemented to handle message payload ${JSON.stringify( requestPayload, - null, - 2 - )}` + undefined, + 2, + )}`, ); } // Call the request handler to build the response payload - responsePayload = await this.requestHandlers.get(command)(messageId, command, requestPayload); + responsePayload = await this.requestHandlers.get(command)!( + messageId, + command, + requestPayload, + ); } catch (error) { // Log - logger.error(`${this.logPrefix(moduleName, 'messageHandler')} Handle request error:`, error); + logger.error(`${this.logPrefix(moduleName, 'requestHandler')} Handle request error:`, error); responsePayload = { hashIds: requestPayload?.hashIds, status: ResponseStatus.FAILURE, @@ -96,26 +109,26 @@ export abstract class AbstractUIService { errorStack: (error as Error).stack, errorDetails: (error as OCPPError).details, }; - } finally { - // Send response for payload not forwarded to broadcast channel - if (!Utils.isNullOrUndefined(responsePayload)) { - this.sendResponse(messageId, responsePayload); - } + } + if (!isNullOrUndefined(responsePayload)) { + return this.uiServer.buildProtocolResponse(messageId!, responsePayload!); } } - public sendRequest( - messageId: string, - procedureName: ProcedureName, - requestPayload: RequestPayload - ): void { - this.uiServer.sendRequest( - this.uiServer.buildProtocolRequest(messageId, procedureName, requestPayload) - ); - } + // public sendRequest( + // messageId: string, + // procedureName: ProcedureName, + // requestPayload: RequestPayload, + // ): void { + // this.uiServer.sendRequest( + // this.uiServer.buildProtocolRequest(messageId, procedureName, requestPayload), + // ); + // } public sendResponse(messageId: string, responsePayload: ResponsePayload): void { - this.uiServer.sendResponse(this.uiServer.buildProtocolResponse(messageId, responsePayload)); + if (this.uiServer.hasResponseHandler(messageId)) { + this.uiServer.sendResponse(this.uiServer.buildProtocolResponse(messageId, responsePayload)); + } } public logPrefix = (modName: string, methodName: string): string => { @@ -133,39 +146,37 @@ export abstract class AbstractUIService { protected handleProtocolRequest( uuid: string, procedureName: ProcedureName, - payload: RequestPayload + payload: RequestPayload, ): void { this.sendBroadcastChannelRequest( uuid, - AbstractUIService.ProcedureNameToBroadCastChannelProcedureNameMap[ - procedureName - ] as BroadcastChannelProcedureName, - payload + AbstractUIService.ProcedureNameToBroadCastChannelProcedureNameMapping.get(procedureName)!, + payload, ); } private sendBroadcastChannelRequest( uuid: string, procedureName: BroadcastChannelProcedureName, - payload: BroadcastChannelRequestPayload + payload: BroadcastChannelRequestPayload, ): void { - if (Utils.isNotEmptyArray(payload.hashIds)) { + if (isNotEmptyArray(payload.hashIds)) { payload.hashIds = payload.hashIds - .filter((hashId) => !Utils.isNullOrUndefined(hashId)) - .map((hashId) => { + ?.filter((hashId) => !isNullOrUndefined(hashId)) + ?.map((hashId) => { if (this.uiServer.chargingStations.has(hashId) === true) { return hashId; } logger.warn( `${this.logPrefix( moduleName, - 'sendBroadcastChannelRequest' - )} Charging station with hashId '${hashId}' not found` + 'sendBroadcastChannelRequest', + )} Charging station with hashId '${hashId}' not found`, ); - }); + }) as string[]; } - const expectedNumberOfResponses = Utils.isNotEmptyArray(payload.hashIds) - ? payload.hashIds.length + const expectedNumberOfResponses = isNotEmptyArray(payload.hashIds) + ? payload.hashIds!.length : this.uiServer.chargingStations.size; this.uiServiceWorkerBroadcastChannel.sendRequest([uuid, procedureName, payload]); this.broadcastChannelRequests.set(uuid, expectedNumberOfResponses); @@ -182,7 +193,7 @@ export abstract class AbstractUIService { try { await Bootstrap.getInstance().start(); return { status: ResponseStatus.SUCCESS }; - } catch (error) { + } catch { return { status: ResponseStatus.FAILURE }; } } @@ -191,7 +202,7 @@ export abstract class AbstractUIService { try { await Bootstrap.getInstance().stop(); return { status: ResponseStatus.SUCCESS }; - } catch (error) { + } catch { return { status: ResponseStatus.FAILURE }; } }