X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Fui-server%2Fui-services%2FUIService001.ts;h=b02bac82cbb029e654e35e69769c45080a4a0fd2;hb=7cb5b17fac198fe3ecd009ac4c692c0d88dd051e;hp=4be6a2f2b16f1903a78c0941016a65d1ce594eb5;hpb=1984f1944eeb7468c2f3adbf03b83fbc98910dff;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ui-server/ui-services/UIService001.ts b/src/charging-station/ui-server/ui-services/UIService001.ts index 4be6a2f2..b02bac82 100644 --- a/src/charging-station/ui-server/ui-services/UIService001.ts +++ b/src/charging-station/ui-server/ui-services/UIService001.ts @@ -1,10 +1,8 @@ import { ProcedureName, - ProtocolRequestHandler, + type ProtocolRequestHandler, ProtocolVersion, - RequestPayload, } from '../../../types/UIProtocol'; -import { BroadcastChannelProcedureName } from '../../../types/WorkerBroadcastChannel'; import type { AbstractUIServer } from '../AbstractUIServer'; import AbstractUIService from './AbstractUIService'; @@ -13,115 +11,55 @@ export default class UIService001 extends AbstractUIService { super(uiServer, ProtocolVersion['0.0.1']); this.requestHandlers.set( ProcedureName.START_CHARGING_STATION, - this.handleStartChargingStation.bind(this) as ProtocolRequestHandler + this.handleProtocolRequest.bind(this) as ProtocolRequestHandler ); this.requestHandlers.set( ProcedureName.STOP_CHARGING_STATION, - this.handleStopChargingStation.bind(this) as ProtocolRequestHandler + this.handleProtocolRequest.bind(this) as ProtocolRequestHandler ); this.requestHandlers.set( ProcedureName.OPEN_CONNECTION, - this.handleOpenConnection.bind(this) as ProtocolRequestHandler + this.handleProtocolRequest.bind(this) as ProtocolRequestHandler ); this.requestHandlers.set( ProcedureName.CLOSE_CONNECTION, - this.handleCloseConnection.bind(this) as ProtocolRequestHandler + this.handleProtocolRequest.bind(this) as ProtocolRequestHandler ); this.requestHandlers.set( - ProcedureName.START_TRANSACTION, - this.handleStartTransaction.bind(this) as ProtocolRequestHandler + ProcedureName.START_AUTOMATIC_TRANSACTION_GENERATOR, + this.handleProtocolRequest.bind(this) as ProtocolRequestHandler ); this.requestHandlers.set( - ProcedureName.STOP_TRANSACTION, - this.handleStopTransaction.bind(this) as ProtocolRequestHandler + ProcedureName.STOP_AUTOMATIC_TRANSACTION_GENERATOR, + this.handleProtocolRequest.bind(this) as ProtocolRequestHandler ); this.requestHandlers.set( - ProcedureName.START_AUTOMATIC_TRANSACTION_GENERATOR, - this.handleStartAutomaticTransactionGenerator.bind(this) as ProtocolRequestHandler + ProcedureName.START_TRANSACTION, + this.handleProtocolRequest.bind(this) as ProtocolRequestHandler ); this.requestHandlers.set( - ProcedureName.STOP_AUTOMATIC_TRANSACTION_GENERATOR, - this.handleStopAutomaticTransactionGenerator.bind(this) as ProtocolRequestHandler + ProcedureName.STOP_TRANSACTION, + this.handleProtocolRequest.bind(this) as ProtocolRequestHandler ); this.requestHandlers.set( ProcedureName.AUTHORIZE, - this.handleAuthorize.bind(this) as ProtocolRequestHandler + this.handleProtocolRequest.bind(this) as ProtocolRequestHandler + ); + this.requestHandlers.set( + ProcedureName.BOOT_NOTIFICATION, + this.handleProtocolRequest.bind(this) as ProtocolRequestHandler ); this.requestHandlers.set( ProcedureName.STATUS_NOTIFICATION, - this.handleStatusNotification.bind(this) as ProtocolRequestHandler + this.handleProtocolRequest.bind(this) as ProtocolRequestHandler ); this.requestHandlers.set( ProcedureName.HEARTBEAT, - this.handleHeartbeat.bind(this) as ProtocolRequestHandler - ); - } - - private handleStartChargingStation(uuid: string, payload: RequestPayload): void { - this.sendBroadcastChannelRequest( - uuid, - BroadcastChannelProcedureName.START_CHARGING_STATION, - payload - ); - } - - private handleStopChargingStation(uuid: string, payload: RequestPayload): void { - this.sendBroadcastChannelRequest( - uuid, - BroadcastChannelProcedureName.STOP_CHARGING_STATION, - payload - ); - } - - private handleOpenConnection(uuid: string, payload: RequestPayload): void { - this.sendBroadcastChannelRequest(uuid, BroadcastChannelProcedureName.OPEN_CONNECTION, payload); - } - - private handleCloseConnection(uuid: string, payload: RequestPayload): void { - this.sendBroadcastChannelRequest(uuid, BroadcastChannelProcedureName.CLOSE_CONNECTION, payload); - } - - private handleStartTransaction(uuid: string, payload: RequestPayload): void { - this.sendBroadcastChannelRequest( - uuid, - BroadcastChannelProcedureName.START_TRANSACTION, - payload - ); - } - - private handleStopTransaction(uuid: string, payload: RequestPayload): void { - this.sendBroadcastChannelRequest(uuid, BroadcastChannelProcedureName.STOP_TRANSACTION, payload); - } - - private handleStartAutomaticTransactionGenerator(uuid: string, payload: RequestPayload): void { - this.sendBroadcastChannelRequest( - uuid, - BroadcastChannelProcedureName.START_AUTOMATIC_TRANSACTION_GENERATOR, - payload + this.handleProtocolRequest.bind(this) as ProtocolRequestHandler ); - } - - private handleStopAutomaticTransactionGenerator(uuid: string, payload: RequestPayload): void { - this.sendBroadcastChannelRequest( - uuid, - BroadcastChannelProcedureName.STOP_AUTOMATIC_TRANSACTION_GENERATOR, - payload - ); - } - - private handleAuthorize(uuid: string, payload: RequestPayload): void { - this.sendBroadcastChannelRequest(uuid, BroadcastChannelProcedureName.AUTHORIZE, payload); - } - - private handleStatusNotification(uuid: string, payload: RequestPayload): void { - this.sendBroadcastChannelRequest( - uuid, - BroadcastChannelProcedureName.STATUS_NOTIFICATION, - payload + this.requestHandlers.set( + ProcedureName.METER_VALUES, + this.handleProtocolRequest.bind(this) as ProtocolRequestHandler ); } - - private handleHeartbeat(uuid: string, payload: RequestPayload): void { - this.sendBroadcastChannelRequest(uuid, BroadcastChannelProcedureName.HEARTBEAT, payload); - } }