-import { parentPort } from 'worker_threads';
-
import type { JSONSchemaType } from 'ajv';
import Ajv from 'ajv-draft-04';
import ajvFormats from 'ajv-formats';
import logger from '../../utils/Logger';
import Utils from '../../utils/Utils';
import type ChargingStation from '../ChargingStation';
-import { MessageChannelUtils } from '../MessageChannelUtils';
import type OCPPResponseService from './OCPPResponseService';
import { OCPPServiceUtils } from './OCPPServiceUtils';
export default abstract class OCPPRequestService {
private static instance: OCPPRequestService | null = null;
- private ajv: Ajv;
+ private readonly ajv: Ajv;
private readonly ocppResponseService: OCPPResponseService;
this.ajv = new Ajv();
ajvFormats(this.ajv);
this.requestHandler.bind(this);
+ this.sendMessage.bind(this);
this.sendResponse.bind(this);
this.sendError.bind(this);
this.internalSendMessage.bind(this);
commandName
);
} catch (error) {
- this.handleRequestError(chargingStation, commandName, error as Error);
+ this.handleSendMessageError(chargingStation, commandName, error as Error, {
+ throwError: true,
+ });
}
}
commandName
);
} catch (error) {
- this.handleRequestError(chargingStation, commandName, error as Error);
+ this.handleSendMessageError(chargingStation, commandName, error as Error);
}
}
params
);
} catch (error) {
- this.handleRequestError(chargingStation, commandName, error as Error, { throwError: false });
+ this.handleSendMessageError(chargingStation, commandName, error as Error);
}
}
schema: JSONSchemaType<T>,
payload: T
): boolean {
- if (!chargingStation.getPayloadSchemaValidation()) {
+ if (chargingStation.getPayloadSchemaValidation() === false) {
return true;
}
const validate = this.ajv.compile(schema);
`${chargingStation.logPrefix()} ${moduleName}.validateRequestPayload: Request PDU is invalid: %j`,
validate.errors
);
+ // OCPPError usage here is debatable: it's an error in the OCPP stack but not targeted to sendError().
throw new OCPPError(
OCPPServiceUtils.ajvErrorsToErrorType(validate.errors),
'Request PDU is invalid',
}
): Promise<ResponseType> {
if (
- (chargingStation.isInUnknownState() && commandName === RequestCommand.BOOT_NOTIFICATION) ||
- (!chargingStation.getOcppStrictCompliance() && chargingStation.isInUnknownState()) ||
- chargingStation.isInAcceptedState() ||
- (chargingStation.isInPendingState() &&
- (params.triggerMessage || messageType === MessageType.CALL_RESULT_MESSAGE))
+ (chargingStation.isInUnknownState() === true &&
+ commandName === RequestCommand.BOOT_NOTIFICATION) ||
+ (chargingStation.getOcppStrictCompliance() === false &&
+ chargingStation.isInUnknownState() === true) ||
+ chargingStation.isInAcceptedState() === true ||
+ (chargingStation.isInPendingState() === true &&
+ (params.triggerMessage === true || messageType === MessageType.CALL_RESULT_MESSAGE))
) {
// eslint-disable-next-line @typescript-eslint/no-this-alias
const self = this;
responseCallback,
errorCallback
);
- if (chargingStation.getEnableStatistics()) {
+ if (chargingStation.getEnableStatistics() === true) {
chargingStation.performanceStatistics.addRequestStatistic(commandName, messageType);
}
// Check if wsConnection opened
- if (chargingStation.isWebSocketConnectionOpened()) {
+ if (chargingStation.isWebSocketConnectionOpened() === true) {
// Yes: Send Message
const beginId = PerformanceStatistics.beginMeasure(commandName);
// FIXME: Handle sending error
messageType
)} payload: ${messageToSend}`
);
- } else if (!params.skipBufferingOnError) {
+ } else if (params.skipBufferingOnError === false) {
// Buffer it
chargingStation.bufferMessage(messageToSend);
const ocppError = new OCPPError(
payload: JsonType,
requestPayload: JsonType
): Promise<void> {
- if (chargingStation.getEnableStatistics()) {
+ if (chargingStation.getEnableStatistics() === true) {
chargingStation.performanceStatistics.addRequestStatistic(
commandName,
MessageType.CALL_RESULT_MESSAGE
reject(error);
} finally {
chargingStation.requests.delete(messageId);
- // parentPort.postMessage(MessageChannelUtils.buildUpdatedMessage(chargingStation));
}
}
* @param requestStatistic
*/
function errorCallback(error: OCPPError, requestStatistic = true): void {
- if (requestStatistic && chargingStation.getEnableStatistics()) {
+ if (requestStatistic === true && chargingStation.getEnableStatistics() === true) {
chargingStation.performanceStatistics.addRequestStatistic(
commandName,
MessageType.CALL_ERROR_MESSAGE
error
);
chargingStation.requests.delete(messageId);
- // parentPort.postMessage(MessageChannelUtils.buildUpdatedMessage(chargingStation));
reject(error);
}
}),
}
}
- private handleRequestError(
+ private handleSendMessageError(
chargingStation: ChargingStation,
commandName: RequestCommand | IncomingRequestCommand,
error: Error,
- params: HandleErrorParams<EmptyObject> = { throwError: true }
+ params: HandleErrorParams<EmptyObject> = { throwError: false }
): void {
- logger.error(`${chargingStation.logPrefix()} Request command ${commandName} error:`, error);
- if (params?.throwError) {
+ logger.error(`${chargingStation.logPrefix()} Request command '${commandName}' error:`, error);
+ if (params?.throwError === true) {
throw error;
}
}