X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2F1.6%2FOCPP16RequestService.ts;h=124ffba16b48a7dfaea2dbbaea9fdfefb209e27a;hb=2466918c081644f9a1dc4722efbd002d7baf2925;hp=b238dc66018a50563217065e08f42cfcaf427888;hpb=5398cecf45b4bdab604d0e6aff8a96dcc67d5ae9;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/1.6/OCPP16RequestService.ts b/src/charging-station/ocpp/1.6/OCPP16RequestService.ts index b238dc66..124ffba1 100644 --- a/src/charging-station/ocpp/1.6/OCPP16RequestService.ts +++ b/src/charging-station/ocpp/1.6/OCPP16RequestService.ts @@ -1,11 +1,11 @@ // Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved. -import type { JSONSchemaType } from 'ajv'; +import type { JSONSchemaType } from 'ajv' -import { OCPP16Constants } from './OCPP16Constants'; -import { OCPP16ServiceUtils } from './OCPP16ServiceUtils'; -import type { ChargingStation } from '../../../charging-station'; -import { OCPPError } from '../../../exception'; +import { OCPP16Constants } from './OCPP16Constants.js' +import { OCPP16ServiceUtils } from './OCPP16ServiceUtils.js' +import type { ChargingStation } from '../../../charging-station/index.js' +import { OCPPError } from '../../../exception/index.js' import { ErrorType, type JsonObject, @@ -23,144 +23,144 @@ import { type OCPP16StatusNotificationRequest, type OCPP16StopTransactionRequest, OCPPVersion, - type RequestParams, -} from '../../../types'; -import { Constants, generateUUID } from '../../../utils'; -import { OCPPRequestService } from '../OCPPRequestService'; -import type { OCPPResponseService } from '../OCPPResponseService'; + type RequestParams +} from '../../../types/index.js' +import { Constants, generateUUID } from '../../../utils/index.js' +import { OCPPRequestService } from '../OCPPRequestService.js' +import type { OCPPResponseService } from '../OCPPResponseService.js' -const moduleName = 'OCPP16RequestService'; +const moduleName = 'OCPP16RequestService' export class OCPP16RequestService extends OCPPRequestService { - protected jsonSchemas: Map>; + protected jsonSchemas: Map> - public constructor(ocppResponseService: OCPPResponseService) { - // if (new.target?.name === moduleName) { - // throw new TypeError(`Cannot construct ${new.target?.name} instances directly`); + public constructor (ocppResponseService: OCPPResponseService) { + // if (new.target.name === moduleName) { + // throw new TypeError(`Cannot construct ${new.target.name} instances directly`) // } - super(OCPPVersion.VERSION_16, ocppResponseService); + super(OCPPVersion.VERSION_16, ocppResponseService) this.jsonSchemas = new Map>([ [ OCPP16RequestCommand.AUTHORIZE, OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/Authorize.json', moduleName, - 'constructor', - ), + 'constructor' + ) ], [ OCPP16RequestCommand.BOOT_NOTIFICATION, OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/BootNotification.json', moduleName, - 'constructor', - ), + 'constructor' + ) ], [ OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/DiagnosticsStatusNotification.json', moduleName, - 'constructor', - ), + 'constructor' + ) ], [ OCPP16RequestCommand.HEARTBEAT, OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/Heartbeat.json', moduleName, - 'constructor', - ), + 'constructor' + ) ], [ OCPP16RequestCommand.METER_VALUES, OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/MeterValues.json', moduleName, - 'constructor', - ), + 'constructor' + ) ], [ OCPP16RequestCommand.STATUS_NOTIFICATION, OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/StatusNotification.json', moduleName, - 'constructor', - ), + 'constructor' + ) ], [ OCPP16RequestCommand.START_TRANSACTION, OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/StartTransaction.json', moduleName, - 'constructor', - ), + 'constructor' + ) ], [ OCPP16RequestCommand.STOP_TRANSACTION, OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/StopTransaction.json', moduleName, - 'constructor', - ), + 'constructor' + ) ], [ OCPP16RequestCommand.DATA_TRANSFER, OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/DataTransfer.json', moduleName, - 'constructor', - ), + 'constructor' + ) ], [ OCPP16RequestCommand.FIRMWARE_STATUS_NOTIFICATION, OCPP16ServiceUtils.parseJsonSchemaFile( 'assets/json-schemas/ocpp/1.6/FirmwareStatusNotification.json', moduleName, - 'constructor', - ), - ], - ]); + 'constructor' + ) + ] + ]) this.buildRequestPayload = this.buildRequestPayload.bind(this) as ( chargingStation: ChargingStation, commandName: OCPP16RequestCommand, - commandParams?: JsonType, - ) => Request; + commandParams?: JsonType + ) => Request } public async requestHandler( chargingStation: ChargingStation, commandName: OCPP16RequestCommand, commandParams?: JsonType, - params?: RequestParams, + params?: RequestParams ): Promise { // FIXME?: add sanity checks on charging station availability, connector availability, connector status, etc. - if (OCPP16ServiceUtils.isRequestCommandSupported(chargingStation, commandName) === true) { + if (OCPP16ServiceUtils.isRequestCommandSupported(chargingStation, commandName)) { return (await this.sendMessage( chargingStation, generateUUID(), this.buildRequestPayload(chargingStation, commandName, commandParams), commandName, - params, - )) as ResponseType; + params + )) as ResponseType } // OCPPError usage here is debatable: it's an error in the OCPP stack but not targeted to sendError(). throw new OCPPError( ErrorType.NOT_SUPPORTED, `Unsupported OCPP command '${commandName}'`, commandName, - commandParams, - ); + commandParams + ) } private buildRequestPayload( chargingStation: ChargingStation, commandName: OCPP16RequestCommand, - commandParams?: JsonType, + commandParams?: JsonType ): Request { - let connectorId: number | undefined; - let energyActiveImportRegister: number; - commandParams = commandParams as JsonObject; + let connectorId: number | undefined + let energyActiveImportRegister: number + commandParams = commandParams as JsonObject switch (commandName) { case OCPP16RequestCommand.BOOT_NOTIFICATION: case OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION: @@ -168,61 +168,65 @@ export class OCPP16RequestService extends OCPPRequestService { case OCPP16RequestCommand.METER_VALUES: case OCPP16RequestCommand.STATUS_NOTIFICATION: case OCPP16RequestCommand.DATA_TRANSFER: - return commandParams as unknown as Request; + return commandParams as unknown as Request case OCPP16RequestCommand.AUTHORIZE: return { idTag: Constants.DEFAULT_IDTAG, - ...commandParams, - } as unknown as Request; + ...commandParams + } as unknown as Request case OCPP16RequestCommand.HEARTBEAT: - return OCPP16Constants.OCPP_REQUEST_EMPTY as unknown as Request; + return OCPP16Constants.OCPP_REQUEST_EMPTY as unknown as Request case OCPP16RequestCommand.START_TRANSACTION: return { idTag: Constants.DEFAULT_IDTAG, meterStart: chargingStation.getEnergyActiveImportRegisterByConnectorId( - commandParams?.connectorId as number, - true, + commandParams.connectorId as number, + true ), timestamp: new Date(), ...(OCPP16ServiceUtils.hasReservation( chargingStation, - commandParams?.connectorId as number, - commandParams?.idTag as string, + commandParams.connectorId as number, + commandParams.idTag as string ) && { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion reservationId: chargingStation.getReservationBy( 'connectorId', chargingStation.getConnectorStatus(0)?.status === OCPP16ChargePointStatus.Reserved ? 0 - : (commandParams?.connectorId as number), - )!.reservationId, + : (commandParams.connectorId as number) + )!.reservationId }), - ...commandParams, - } as unknown as Request; + ...commandParams + } as unknown as Request case OCPP16RequestCommand.STOP_TRANSACTION: - chargingStation.stationInfo?.transactionDataMeterValues && + chargingStation.stationInfo?.transactionDataMeterValues === true && + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion (connectorId = chargingStation.getConnectorIdByTransactionId( - commandParams?.transactionId as number, - )!); + commandParams.transactionId as number + )!) energyActiveImportRegister = chargingStation.getEnergyActiveImportRegisterByTransactionId( - commandParams?.transactionId as number, - true, - ); + commandParams.transactionId as number, + true + ) return { - idTag: chargingStation.getTransactionIdTag(commandParams?.transactionId as number), + idTag: chargingStation.getTransactionIdTag(commandParams.transactionId as number), meterStop: energyActiveImportRegister, timestamp: new Date(), - ...(chargingStation.stationInfo?.transactionDataMeterValues && { + ...(chargingStation.stationInfo?.transactionDataMeterValues === true && { transactionData: OCPP16ServiceUtils.buildTransactionDataMeterValues( + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion chargingStation.getConnectorStatus(connectorId!)!.transactionBeginMeterValue!, OCPP16ServiceUtils.buildTransactionEndMeterValue( chargingStation, + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion connectorId!, - energyActiveImportRegister, - ), - ), + energyActiveImportRegister + ) + ) }), - ...commandParams, - } as unknown as Request; + ...commandParams + } as unknown as Request default: // OCPPError usage here is debatable: it's an error in the OCPP stack but not targeted to sendError(). throw new OCPPError( @@ -230,8 +234,8 @@ export class OCPP16RequestService extends OCPPRequestService { // eslint-disable-next-line @typescript-eslint/restrict-template-expressions `Unsupported OCPP command '${commandName}'`, commandName, - commandParams, - ); + commandParams + ) } } }