-import BaseError from '../../../exception/BaseError';
-import type OCPPError from '../../../exception/OCPPError';
-import { Bootstrap } from '../../../internal';
+import { BaseError, type OCPPError } from '../../../exception';
import {
+ BroadcastChannelProcedureName,
+ type BroadcastChannelRequestPayload,
ProcedureName,
type ProtocolRequest,
type ProtocolRequestHandler,
type RequestPayload,
type ResponsePayload,
ResponseStatus,
-} from '../../../types/UIProtocol';
-import {
- BroadcastChannelProcedureName,
- type BroadcastChannelRequestPayload,
-} from '../../../types/WorkerBroadcastChannel';
-import logger from '../../../utils/Logger';
-import Utils from '../../../utils/Utils';
-import UIServiceWorkerBroadcastChannel from '../../UIServiceWorkerBroadcastChannel';
-import type { AbstractUIServer } from '../AbstractUIServer';
+} from '../../../types';
+import { logger } from '../../../utils/Logger';
+import { Utils } from '../../../utils/Utils';
+import { type AbstractUIServer, Bootstrap } from '../../internal';
+import { UIServiceWorkerBroadcastChannel } from '../../UIServiceWorkerBroadcastChannel';
const moduleName = 'AbstractUIService';
-export default abstract class AbstractUIService {
+export abstract class AbstractUIService {
protected static readonly ProcedureNameToBroadCastChannelProcedureNameMap: Omit<
Record<ProcedureName, BroadcastChannelProcedureName>,
- 'startSimulator' | 'stopSimulator' | 'listChargingStations'
+ | 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.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]:
+ BroadcastChannelProcedureName.FIRMWARE_STATUS_NOTIFICATION,
};
protected readonly requestHandlers: Map<ProcedureName, ProtocolRequestHandler>;
// Log
logger.error(`${this.logPrefix(moduleName, 'messageHandler')} Handle request error:`, error);
responsePayload = {
- hashIds: requestPayload.hashIds,
+ hashIds: requestPayload?.hashIds,
status: ResponseStatus.FAILURE,
command,
requestPayload,
this.uiServer.sendResponse(this.uiServer.buildProtocolResponse(messageId, responsePayload));
}
- public logPrefix(modName: string, methodName: string): string {
+ public logPrefix = (modName: string, methodName: string): string => {
return this.uiServer.logPrefix(modName, methodName, this.version);
- }
+ };
public deleteBroadcastChannelRequest(uuid: string): void {
this.broadcastChannelRequests.delete(uuid);
return this.broadcastChannelRequests.get(uuid) ?? 0;
}
- protected sendBroadcastChannelRequest(
+ protected handleProtocolRequest(
+ uuid: string,
+ procedureName: ProcedureName,
+ payload: RequestPayload
+ ): void {
+ this.sendBroadcastChannelRequest(
+ uuid,
+ AbstractUIService.ProcedureNameToBroadCastChannelProcedureNameMap[
+ procedureName
+ ] as BroadcastChannelProcedureName,
+ payload
+ );
+ }
+
+ private sendBroadcastChannelRequest(
uuid: string,
procedureName: BroadcastChannelProcedureName,
payload: BroadcastChannelRequestPayload
): void {
- if (!Utils.isEmptyArray(payload.hashIds)) {
+ if (Utils.isNotEmptyArray(payload.hashIds)) {
payload.hashIds = payload.hashIds
.map((hashId) => {
if (this.uiServer.chargingStations.has(hashId) === true) {
})
.filter((hashId) => hashId !== undefined);
}
- const expectedNumberOfResponses = !Utils.isEmptyArray(payload.hashIds)
+ const expectedNumberOfResponses = Utils.isNotEmptyArray(payload.hashIds)
? payload.hashIds.length
: this.uiServer.chargingStations.size;
this.uiServiceWorkerBroadcastChannel.sendRequest([uuid, procedureName, payload]);
this.broadcastChannelRequests.set(uuid, expectedNumberOfResponses);
}
- protected handleProtocolRequest(
- uuid: string,
- procedureName: ProcedureName,
- payload: RequestPayload
- ): void {
- this.sendBroadcastChannelRequest(
- uuid,
- AbstractUIService.ProcedureNameToBroadCastChannelProcedureNameMap[
- procedureName
- ] as BroadcastChannelProcedureName,
- payload
- );
- }
-
private handleListChargingStations(): ResponsePayload {
return {
status: ResponseStatus.SUCCESS,
}
private async handleStartSimulator(): Promise<ResponsePayload> {
- await Bootstrap.getInstance().start();
- return { status: ResponseStatus.SUCCESS };
+ try {
+ await Bootstrap.getInstance().start();
+ return { status: ResponseStatus.SUCCESS };
+ } catch (error) {
+ return { status: ResponseStatus.FAILURE };
+ }
}
private async handleStopSimulator(): Promise<ResponsePayload> {
- await Bootstrap.getInstance().stop();
- return { status: ResponseStatus.SUCCESS };
+ try {
+ await Bootstrap.getInstance().stop();
+ return { status: ResponseStatus.SUCCESS };
+ } catch (error) {
+ return { status: ResponseStatus.FAILURE };
+ }
}
}