X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2F1.6%2FOCPP16IncomingRequestService.ts;h=f1ea435aac3fba768a8c76506e167494dacc574a;hb=a6ef1ece74c0d08e86a905571f4f6045c28131cb;hp=8faf05cf609676ebca14249de5139edd215a3055;hpb=41f3983a4f934199769f9ef1c46bfae2adc22b56;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts index 8faf05cf..f1ea435a 100644 --- a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts +++ b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts @@ -16,8 +16,8 @@ import { import { maxTime } from 'date-fns/constants'; import { create } from 'tar'; -import { OCPP16Constants } from './OCPP16Constants'; -import { OCPP16ServiceUtils } from './OCPP16ServiceUtils'; +import { OCPP16Constants } from './OCPP16Constants.js'; +import { OCPP16ServiceUtils } from './OCPP16ServiceUtils.js'; import { type ChargingStation, canProceedChargingProfile, @@ -27,8 +27,8 @@ import { prepareChargingProfileKind, removeExpiredReservations, setConfigurationKeyValue, -} from '../../../charging-station'; -import { OCPPError } from '../../../exception'; +} from '../../../charging-station/index.js'; +import { OCPPError } from '../../../exception/index.js'; import { type ChangeConfigurationRequest, type ChangeConfigurationResponse, @@ -95,7 +95,7 @@ import { type SetChargingProfileResponse, type UnlockConnectorRequest, type UnlockConnectorResponse, -} from '../../../types'; +} from '../../../types/index.js'; import { Constants, convertToDate, @@ -109,8 +109,8 @@ import { isUndefined, logger, sleep, -} from '../../../utils'; -import { OCPPIncomingRequestService } from '../OCPPIncomingRequestService'; +} from '../../../utils/index.js'; +import { OCPPIncomingRequestService } from '../OCPPIncomingRequestService.js'; const moduleName = 'OCPP16IncomingRequestService'; @@ -445,14 +445,9 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { commandPayload: ResetRequest, ): GenericResponse { const { type } = commandPayload; - this.runInAsyncScope( - chargingStation.reset.bind(chargingStation) as ( - this: ChargingStation, - ...args: unknown[] - ) => Promise, - chargingStation, - `${type}Reset` as OCPP16StopTransactionReason, - ).catch(Constants.EMPTY_FUNCTION); + chargingStation + .reset(`${type}Reset` as OCPP16StopTransactionReason) + .catch(Constants.EMPTY_FUNCTION); logger.info( `${chargingStation.logPrefix()} ${type} reset command received, simulating it. The station will be back online in ${formatDurationMilliSeconds( chargingStation.stationInfo.resetTime!, @@ -1122,25 +1117,11 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { retrieveDate = convertToDate(retrieveDate)!; const now = Date.now(); if (retrieveDate?.getTime() <= now) { - this.runInAsyncScope( - this.updateFirmwareSimulation.bind(this) as ( - this: OCPP16IncomingRequestService, - ...args: unknown[] - ) => Promise, - this, - chargingStation, - ).catch(Constants.EMPTY_FUNCTION); + this.updateFirmwareSimulation(chargingStation).catch(Constants.EMPTY_FUNCTION); } else { setTimeout( () => { - this.runInAsyncScope( - this.updateFirmwareSimulation.bind(this) as ( - this: OCPP16IncomingRequestService, - ...args: unknown[] - ) => Promise, - this, - chargingStation, - ).catch(Constants.EMPTY_FUNCTION); + this.updateFirmwareSimulation(chargingStation).catch(Constants.EMPTY_FUNCTION); }, retrieveDate?.getTime() - now, );