From: Jérôme Benoit Date: Sat, 2 Jan 2021 00:58:02 +0000 (+0100) Subject: Cleanups. X-Git-Tag: v1.0.1-0~152^2~5 X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=d0641efac20e7bc7c114a3183574b6cad8667733;p=e-mobility-charging-stations-simulator.git Cleanups. Signed-off-by: Jérôme Benoit --- diff --git a/src/charging-station/ChargingStation.ts b/src/charging-station/ChargingStation.ts index 63a011dd..6797515f 100644 --- a/src/charging-station/ChargingStation.ts +++ b/src/charging-station/ChargingStation.ts @@ -688,6 +688,10 @@ export default class ChargingStation { async onMessage(messageEvent: MessageEvent): Promise { let [messageType, messageId, commandName, commandPayload, errorDetails]: IncomingRequest = [0, '', '' as IncomingRequestCommand, '', '']; + let responseCallback: (payload?, requestPayload?) => void; + let rejectCallback: (error: OCPPError) => void; + let requestPayload: Record; + let errMsg: string; try { // Parse the message [messageType, messageId, commandName, commandPayload, errorDetails] = JSON.parse(messageEvent.toString()) as IncomingRequest; @@ -697,16 +701,14 @@ export default class ChargingStation { // Incoming Message case MessageType.CALL_MESSAGE: if (this.getEnableStatistics()) { - this._statistics.addMessage(commandName , messageType); + this._statistics.addMessage(commandName, messageType); } // Process the call - await this.handleRequest(messageId, commandName , commandPayload); + await this.handleRequest(messageId, commandName, commandPayload); break; // Outcome Message case MessageType.CALL_RESULT_MESSAGE: // Respond - // eslint-disable-next-line no-case-declarations - let responseCallback; let requestPayload; if (Utils.isIterable(this._requests[messageId])) { [responseCallback, , requestPayload] = this._requests[messageId]; } else { @@ -725,8 +727,6 @@ export default class ChargingStation { // Error throw new Error(`Error request for unknown message id ${messageId}`); } - // eslint-disable-next-line no-case-declarations - let rejectCallback; if (Utils.isIterable(this._requests[messageId])) { [, rejectCallback] = this._requests[messageId]; } else { @@ -737,8 +737,7 @@ export default class ChargingStation { break; // Error default: - // eslint-disable-next-line no-case-declarations - const errMsg = `${this._logPrefix()} Wrong message type ${messageType}`; + errMsg = `${this._logPrefix()} Wrong message type ${messageType}`; logger.error(errMsg); throw new Error(errMsg); } diff --git a/src/types/ocpp/1.6/RequestResponses.ts b/src/types/ocpp/1.6/RequestResponses.ts index baf66c15..b737ed97 100644 --- a/src/types/ocpp/1.6/RequestResponses.ts +++ b/src/types/ocpp/1.6/RequestResponses.ts @@ -47,7 +47,7 @@ export interface BootNotificationResponse { } // eslint-disable-next-line @typescript-eslint/no-empty-interface -export interface StatusNotificationResponse {} +export interface StatusNotificationResponse { } export interface GetConfigurationResponse { configurationKey: ConfigurationKey[]; diff --git a/src/types/ocpp/1.6/Requests.ts b/src/types/ocpp/1.6/Requests.ts index d318dafb..71f8384f 100644 --- a/src/types/ocpp/1.6/Requests.ts +++ b/src/types/ocpp/1.6/Requests.ts @@ -34,7 +34,7 @@ export enum IncomingRequestCommand { } // eslint-disable-next-line @typescript-eslint/no-empty-interface -export interface HeartbeatRequest {} +export interface HeartbeatRequest { } export interface BootNotificationRequest { chargeBoxSerialNumber?: string; diff --git a/src/utils/CircularArray.ts b/src/utils/CircularArray.ts index e7edb3dd..ba3eba19 100644 --- a/src/utils/CircularArray.ts +++ b/src/utils/CircularArray.ts @@ -22,7 +22,7 @@ export default class CircularArray extends Array { return super.unshift(...items); } - concat(...items: (T|ConcatArray)[]): T[] { + concat(...items: (T | ConcatArray)[]): T[] { if (this.length + items.length > this.size) { super.splice(0, (this.length + items.length) - this.size); }