repositories
/
e-mobility-charging-stations-simulator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert types to native type
[e-mobility-charging-stations-simulator.git]
/
src
/
charging-station
/
ocpp
/
OCPPRequestService.ts
diff --git
a/src/charging-station/ocpp/OCPPRequestService.ts
b/src/charging-station/ocpp/OCPPRequestService.ts
index 25c8943564a7f91afc639c22a7f99a0a28d247d9..68338670aa1c4dd710ec1310568328e7d13dd198 100644
(file)
--- a/
src/charging-station/ocpp/OCPPRequestService.ts
+++ b/
src/charging-station/ocpp/OCPPRequestService.ts
@@
-37,6
+37,7
@@
export default abstract class OCPPRequestService {
this.ajv = new Ajv();
ajvFormats(this.ajv);
this.requestHandler.bind(this);
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);
this.sendResponse.bind(this);
this.sendError.bind(this);
this.internalSendMessage.bind(this);
@@
-70,7
+71,9
@@
export default abstract class OCPPRequestService {
commandName
);
} catch (error) {
commandName
);
} catch (error) {
- this.handleRequestError(chargingStation, commandName, error as Error);
+ this.handleSendMessageError(chargingStation, commandName, error as Error, {
+ throwError: true,
+ });
}
}
}
}
@@
-90,7
+93,7
@@
export default abstract class OCPPRequestService {
commandName
);
} catch (error) {
commandName
);
} catch (error) {
- this.handle
Request
Error(chargingStation, commandName, error as Error);
+ this.handle
SendMessage
Error(chargingStation, commandName, error as Error);
}
}
}
}
@@
-114,7
+117,7
@@
export default abstract class OCPPRequestService {
params
);
} catch (error) {
params
);
} catch (error) {
- this.handle
RequestError(chargingStation, commandName, error as Error, { throwError: false }
);
+ this.handle
SendMessageError(chargingStation, commandName, error as Error
);
}
}
}
}
@@
-124,7
+127,7
@@
export default abstract class OCPPRequestService {
schema: JSONSchemaType<T>,
payload: T
): boolean {
schema: JSONSchemaType<T>,
payload: T
): boolean {
- if (
!chargingStation.getPayloadSchemaValidation()
) {
+ if (
chargingStation.getPayloadSchemaValidation() === false
) {
return true;
}
const validate = this.ajv.compile(schema);
return true;
}
const validate = this.ajv.compile(schema);
@@
-135,6
+138,7
@@
export default abstract class OCPPRequestService {
`${chargingStation.logPrefix()} ${moduleName}.validateRequestPayload: Request PDU is invalid: %j`,
validate.errors
);
`${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',
throw new OCPPError(
OCPPServiceUtils.ajvErrorsToErrorType(validate.errors),
'Request PDU is invalid',
@@
-175,11
+179,11
@@
export default abstract class OCPPRequestService {
responseCallback,
errorCallback
);
responseCallback,
errorCallback
);
- if (chargingStation.getEnableStatistics()) {
+ if (chargingStation.getEnableStatistics()
=== true
) {
chargingStation.performanceStatistics.addRequestStatistic(commandName, messageType);
}
// Check if wsConnection opened
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
// Yes: Send Message
const beginId = PerformanceStatistics.beginMeasure(commandName);
// FIXME: Handle sending error
@@
-190,7
+194,7
@@
export default abstract class OCPPRequestService {
messageType
)} payload: ${messageToSend}`
);
messageType
)} payload: ${messageToSend}`
);
- } else if (
!params.skipBufferingOnError
) {
+ } else if (
params.skipBufferingOnError === false
) {
// Buffer it
chargingStation.bufferMessage(messageToSend);
const ocppError = new OCPPError(
// Buffer it
chargingStation.bufferMessage(messageToSend);
const ocppError = new OCPPError(
@@
-232,7
+236,7
@@
export default abstract class OCPPRequestService {
payload: JsonType,
requestPayload: JsonType
): Promise<void> {
payload: JsonType,
requestPayload: JsonType
): Promise<void> {
- if (chargingStation.getEnableStatistics()) {
+ if (chargingStation.getEnableStatistics()
=== true
) {
chargingStation.performanceStatistics.addRequestStatistic(
commandName,
MessageType.CALL_RESULT_MESSAGE
chargingStation.performanceStatistics.addRequestStatistic(
commandName,
MessageType.CALL_RESULT_MESSAGE
@@
-261,7
+265,7
@@
export default abstract class OCPPRequestService {
* @param requestStatistic
*/
function errorCallback(error: OCPPError, requestStatistic = true): void {
* @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
chargingStation.performanceStatistics.addRequestStatistic(
commandName,
MessageType.CALL_ERROR_MESSAGE
@@
-355,14
+359,14
@@
export default abstract class OCPPRequestService {
}
}
}
}
- private handle
Request
Error(
+ private handle
SendMessage
Error(
chargingStation: ChargingStation,
commandName: RequestCommand | IncomingRequestCommand,
error: Error,
chargingStation: ChargingStation,
commandName: RequestCommand | IncomingRequestCommand,
error: Error,
- params: HandleErrorParams<EmptyObject> = { throwError:
tru
e }
+ params: HandleErrorParams<EmptyObject> = { throwError:
fals
e }
): void {
): 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;
}
}
throw error;
}
}