From 658e2d16622bc69a4a0c5df02fae29fd0cc7efac Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Wed, 9 Mar 2022 23:38:12 +0100 Subject: [PATCH] Fix docker image build MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- docker/Dockerfile | 2 +- .../ocpp/1.6/OCPP16IncomingRequestService.ts | 48 +++++++------------ 2 files changed, 17 insertions(+), 33 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index c8a684fa..f6578c3d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -6,7 +6,7 @@ COPY package.json package-lock.json ./ RUN npm set progress=false && npm config set depth 0 && npm cache clean --force RUN npm install -COPY tsconfig.json rollup.config.js ./ +COPY tsconfig.json rollup.config.js prepare.js ./ COPY src ./src COPY docker/config.json ./src/assets/config.json RUN npm run build diff --git a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts index bd998504..6f076865 100644 --- a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts +++ b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts @@ -400,7 +400,8 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer private handleRequestClearChargingProfile( commandPayload: ClearChargingProfileRequest ): ClearChargingProfileResponse { - if (!this.chargingStation.getConnectorStatus(commandPayload.connectorId)) { + const connectorStatus = this.chargingStation.getConnectorStatus(commandPayload.connectorId); + if (!connectorStatus) { logger.error( `${this.chargingStation.logPrefix()} Trying to clear a charging profile(s) to a non existing connector Id ${ commandPayload.connectorId @@ -408,16 +409,11 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer ); return Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_UNKNOWN; } - if ( - commandPayload.connectorId && - !Utils.isEmptyArray( - this.chargingStation.getConnectorStatus(commandPayload.connectorId).chargingProfiles - ) - ) { - this.chargingStation.getConnectorStatus(commandPayload.connectorId).chargingProfiles = []; + if (commandPayload.connectorId && !Utils.isEmptyArray(connectorStatus.chargingProfiles)) { + connectorStatus.chargingProfiles = []; logger.debug( `${this.chargingStation.logPrefix()} Charging profile(s) cleared, dump their stack: %j`, - this.chargingStation.getConnectorStatus(commandPayload.connectorId).chargingProfiles + connectorStatus.chargingProfiles ); return Constants.OCPP_CLEAR_CHARGING_PROFILE_RESPONSE_ACCEPTED; } @@ -453,13 +449,10 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer clearCurrentCP = true; } if (clearCurrentCP) { - this.chargingStation.getConnectorStatus( - commandPayload.connectorId - ).chargingProfiles[index] = {} as OCPP16ChargingProfile; + connectorStatus.chargingProfiles[index] = {} as OCPP16ChargingProfile; logger.debug( `${this.chargingStation.logPrefix()} Charging profile(s) cleared, dump their stack: %j`, - this.chargingStation.getConnectorStatus(commandPayload.connectorId) - .chargingProfiles + connectorStatus.chargingProfiles ); clearedCP = true; } @@ -533,7 +526,8 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer private async handleRequestRemoteStartTransaction( commandPayload: RemoteStartTransactionRequest ): Promise { - const transactionConnectorId: number = commandPayload.connectorId; + const transactionConnectorId = commandPayload.connectorId; + const connectorStatus = this.chargingStation.getConnectorStatus(transactionConnectorId); if (transactionConnectorId) { await this.chargingStation.ocppRequestService.sendMessageHandler( OCPP16RequestCommand.STATUS_NOTIFICATION, @@ -543,12 +537,8 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer errorCode: OCPP16ChargePointErrorCode.NO_ERROR, } ); - this.chargingStation.getConnectorStatus(transactionConnectorId).status = - OCPP16ChargePointStatus.PREPARING; - if ( - this.chargingStation.isChargingStationAvailable() && - this.chargingStation.isConnectorAvailable(transactionConnectorId) - ) { + connectorStatus.status = OCPP16ChargePointStatus.PREPARING; + if (this.chargingStation.isChargingStationAvailable() && connectorStatus) { // Check if authorized if (this.chargingStation.getAuthorizeRemoteTxRequests()) { let authorized = false; @@ -557,14 +547,11 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer this.chargingStation.hasAuthorizedTags() && this.chargingStation.authorizedTags.find((value) => value === commandPayload.idTag) ) { - this.chargingStation.getConnectorStatus(transactionConnectorId).localAuthorizeIdTag = - commandPayload.idTag; - this.chargingStation.getConnectorStatus(transactionConnectorId).idTagLocalAuthorized = - true; + connectorStatus.localAuthorizeIdTag = commandPayload.idTag; + connectorStatus.idTagLocalAuthorized = true; authorized = true; } else if (this.chargingStation.getMayAuthorizeAtRemoteStart()) { - this.chargingStation.getConnectorStatus(transactionConnectorId).authorizeIdTag = - commandPayload.idTag; + connectorStatus.authorizeIdTag = commandPayload.idTag; const authorizeResponse: OCPP16AuthorizeResponse = (await this.chargingStation.ocppRequestService.sendMessageHandler( OCPP16RequestCommand.AUTHORIZE, @@ -588,9 +575,7 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer commandPayload.chargingProfile ) ) { - this.chargingStation.getConnectorStatus( - transactionConnectorId - ).transactionRemoteStarted = true; + connectorStatus.transactionRemoteStarted = true; if ( ( (await this.chargingStation.ocppRequestService.sendMessageHandler( @@ -635,8 +620,7 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer commandPayload.chargingProfile ) ) { - this.chargingStation.getConnectorStatus(transactionConnectorId).transactionRemoteStarted = - true; + connectorStatus.transactionRemoteStarted = true; if ( ( (await this.chargingStation.ocppRequestService.sendMessageHandler( -- 2.34.1