From a4bc29426a2f56c987ec161d86baf9a83c0398ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Fri, 8 Oct 2021 00:22:59 +0200 Subject: [PATCH] Improve OCPP request's response error handling MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- src/charging-station/Bootstrap.ts | 30 +++++++++---------- .../ocpp/1.6/OCPP16ResponseService.ts | 6 +++- .../ocpp/OCPPRequestService.ts | 14 ++++++--- 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/src/charging-station/Bootstrap.ts b/src/charging-station/Bootstrap.ts index 809c623a..4f49a3d9 100644 --- a/src/charging-station/Bootstrap.ts +++ b/src/charging-station/Bootstrap.ts @@ -15,9 +15,9 @@ import { version } from '../../package.json'; export default class Bootstrap { private static instance: Bootstrap | null = null; - private static workerImplementation: WorkerAbstract | null = null; - private static storage: Storage; - private static numberOfChargingStations: number; + private workerImplementation: WorkerAbstract | null = null; + private readonly storage: Storage; + private numberOfChargingStations: number; private readonly version: string = version; private started: boolean; private readonly workerScript: string; @@ -26,7 +26,7 @@ export default class Bootstrap { this.started = false; this.workerScript = path.join(path.resolve(__dirname, '../'), 'charging-station', 'ChargingStationWorker.js'); this.initWorkerImplementation(); - Bootstrap.storage = StorageFactory.getStorage(Configuration.getPerformanceStorage().type, Configuration.getPerformanceStorage().URI, this.logPrefix()); + this.storage = StorageFactory.getStorage(Configuration.getPerformanceStorage().type, Configuration.getPerformanceStorage().URI, this.logPrefix()); Configuration.setConfigurationChangeCallback(async () => Bootstrap.getInstance().restart()); } @@ -40,9 +40,9 @@ export default class Bootstrap { public async start(): Promise { if (isMainThread && !this.started) { try { - Bootstrap.numberOfChargingStations = 0; - await Bootstrap.storage.open(); - await Bootstrap.workerImplementation.start(); + this.numberOfChargingStations = 0; + await this.storage.open(); + await this.workerImplementation.start(); // Start ChargingStation object in worker thread if (Configuration.getStationTemplateURLs()) { for (const stationURL of Configuration.getStationTemplateURLs()) { @@ -53,8 +53,8 @@ export default class Bootstrap { index, templateFile: path.join(path.resolve(__dirname, '../'), 'assets', 'station-templates', path.basename(stationURL.file)) }; - await Bootstrap.workerImplementation.addElement(workerData); - Bootstrap.numberOfChargingStations++; + await this.workerImplementation.addElement(workerData); + this.numberOfChargingStations++; } } catch (error) { console.error(chalk.red('Charging station start with template file ' + stationURL.file + ' error '), error); @@ -63,10 +63,10 @@ export default class Bootstrap { } else { console.warn(chalk.yellow('No stationTemplateURLs defined in configuration, exiting')); } - if (Bootstrap.numberOfChargingStations === 0) { + if (this.numberOfChargingStations === 0) { console.warn(chalk.yellow('No charging station template enabled in configuration, exiting')); } else { - console.log(chalk.green(`Charging stations simulator ${this.version} started with ${Bootstrap.numberOfChargingStations.toString()} charging station(s) and ${Utils.workerDynamicPoolInUse() ? `${Configuration.getWorkerPoolMinSize().toString()}/` : ''}${Bootstrap.workerImplementation.size}${Utils.workerPoolInUse() ? `/${Configuration.getWorkerPoolMaxSize().toString()}` : ''} worker(s) concurrently running in '${Configuration.getWorkerProcess()}' mode${Bootstrap.workerImplementation.maxElementsPerWorker ? ` (${Bootstrap.workerImplementation.maxElementsPerWorker} charging station(s) per worker)` : ''}`)); + console.log(chalk.green(`Charging stations simulator ${this.version} started with ${this.numberOfChargingStations.toString()} charging station(s) and ${Utils.workerDynamicPoolInUse() ? `${Configuration.getWorkerPoolMinSize().toString()}/` : ''}${this.workerImplementation.size}${Utils.workerPoolInUse() ? `/${Configuration.getWorkerPoolMaxSize().toString()}` : ''} worker(s) concurrently running in '${Configuration.getWorkerProcess()}' mode${this.workerImplementation.maxElementsPerWorker ? ` (${this.workerImplementation.maxElementsPerWorker} charging station(s) per worker)` : ''}`)); } this.started = true; } catch (error) { @@ -79,8 +79,8 @@ export default class Bootstrap { public async stop(): Promise { if (isMainThread && this.started) { - await Bootstrap.workerImplementation.stop(); - await Bootstrap.storage.close(); + await this.workerImplementation.stop(); + await this.storage.close(); } else { console.error(chalk.red('Trying to stop the charging stations simulator while not started')); } @@ -94,7 +94,7 @@ export default class Bootstrap { } private initWorkerImplementation(): void { - Bootstrap.workerImplementation = WorkerFactory.getWorkerImplementation(this.workerScript, Configuration.getWorkerProcess(), + this.workerImplementation = WorkerFactory.getWorkerImplementation(this.workerScript, Configuration.getWorkerProcess(), { startDelay: Configuration.getWorkerStartDelay(), poolMaxSize: Configuration.getWorkerPoolMaxSize(), @@ -105,7 +105,7 @@ export default class Bootstrap { }, messageHandler: async (msg: ChargingStationWorkerMessage) => { if (msg.id === ChargingStationWorkerMessageEvents.PERFORMANCE_STATISTICS) { - await Bootstrap.storage.storePerformanceStatistics(msg.data); + await this.storage.storePerformanceStatistics(msg.data); } } }); diff --git a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts index 2c2b8048..3e63c84a 100644 --- a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts +++ b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts @@ -6,9 +6,11 @@ import { HeartbeatResponse, OCPP16BootNotificationResponse, OCPP16RegistrationSt import { MeterValuesRequest, MeterValuesResponse } from '../../../types/ocpp/1.6/MeterValues'; import ChargingStation from '../../ChargingStation'; +import { ErrorType } from '../../../types/ocpp/ErrorType'; import { OCPP16ChargePointStatus } from '../../../types/ocpp/1.6/ChargePointStatus'; import { OCPP16ServiceUtils } from './OCPP16ServiceUtils'; import { OCPP16StandardParametersKey } from '../../../types/ocpp/1.6/Configuration'; +import OCPPError from '../OCPPError'; import OCPPResponseService from '../OCPPResponseService'; import { ResponseHandler } from '../../../types/ocpp/Responses'; import Utils from '../../../utils/Utils'; @@ -36,9 +38,11 @@ export default class OCPP16ResponseService extends OCPPResponseService { await this.responseHandlers.get(commandName)(payload, requestPayload); } catch (error) { logger.error(this.chargingStation.logPrefix() + ' Handle request response error: %j', error); + throw error; } } else { - logger.error(`${this.chargingStation.logPrefix()} %s is not implemented to handle request response payload %j`, commandName, payload); + // Throw exception + throw new OCPPError(ErrorType.NOT_IMPLEMENTED, `${commandName} is not implemented to handle request response payload ${JSON.stringify(payload, null, 2)}`, commandName); } } diff --git a/src/charging-station/ocpp/OCPPRequestService.ts b/src/charging-station/ocpp/OCPPRequestService.ts index 5d767f0c..2076a296 100644 --- a/src/charging-station/ocpp/OCPPRequestService.ts +++ b/src/charging-station/ocpp/OCPPRequestService.ts @@ -70,10 +70,16 @@ export default abstract class OCPPRequestService { if (self.chargingStation.getEnableStatistics()) { self.chargingStation.performanceStatistics.addRequestStatistic(commandName, MessageType.CALL_RESULT_MESSAGE); } - // Send the response - await self.ocppResponseService.handleResponse(commandName as RequestCommand, payload, requestPayload); - self.chargingStation.requests.delete(messageId); - resolve(payload); + // Handle the request's response + try { + await self.ocppResponseService.handleResponse(commandName as RequestCommand, payload, requestPayload); + resolve(payload); + } catch (error) { + reject(error); + throw error; + } finally { + self.chargingStation.requests.delete(messageId); + } } /** -- 2.34.1