-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 ProtocolResponse,
type ProtocolVersion,
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';
+} from '../../../types';
+import { Utils, logger } from '../../../utils';
+import { Bootstrap } from '../../Bootstrap';
+import { UIServiceWorkerBroadcastChannel } from '../../broadcast-channel/UIServiceWorkerBroadcastChannel';
import type { AbstractUIServer } from '../AbstractUIServer';
const moduleName = 'AbstractUIService';
-export default abstract class AbstractUIService {
+export abstract class AbstractUIService {
protected static readonly ProcedureNameToBroadCastChannelProcedureNameMap: Omit<
Record<ProcedureName, BroadcastChannelProcedureName>,
| ProcedureName.START_SIMULATOR
BroadcastChannelProcedureName.START_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,
this.broadcastChannelRequests = new Map<string, number>();
}
- public async requestHandler(request: ProtocolRequest): Promise<void> {
+ public async requestHandler(request: ProtocolRequest): Promise<ProtocolResponse | undefined> {
let messageId: string;
let command: ProcedureName;
let requestPayload: RequestPayload | undefined;
- let responsePayload: ResponsePayload;
+ let responsePayload: ResponsePayload | undefined;
try {
[messageId, command, requestPayload] = request;
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,
errorStack: (error as Error).stack,
errorDetails: (error as OCPPError).details,
};
- } finally {
- // Send response for payload not forwarded to broadcast channel
- if (responsePayload !== undefined) {
- this.sendResponse(messageId, responsePayload);
- }
+ }
+ if (!Utils.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 => {
procedureName: BroadcastChannelProcedureName,
payload: BroadcastChannelRequestPayload
): void {
- if (!Utils.isEmptyArray(payload.hashIds)) {
+ if (Utils.isNotEmptyArray(payload.hashIds)) {
payload.hashIds = payload.hashIds
+ .filter((hashId) => !Utils.isNullOrUndefined(hashId))
.map((hashId) => {
if (this.uiServer.chargingStations.has(hashId) === true) {
return hashId;
'sendBroadcastChannelRequest'
)} Charging station with hashId '${hashId}' not found`
);
- })
- .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]);