import type { JSONSchemaType } from 'ajv';
import { Client, type FTPResponse } from 'basic-ftp';
-import { addSeconds, differenceInSeconds, isDate, maxTime, secondsToMilliseconds } from 'date-fns';
+import {
+ type Interval,
+ addSeconds,
+ differenceInSeconds,
+ isDate,
+ secondsToMilliseconds,
+} from 'date-fns';
+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,
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,
- type ClearChargingProfileRequest,
- type ClearChargingProfileResponse,
ErrorType,
type GenericResponse,
GenericStatus,
type GetDiagnosticsRequest,
type GetDiagnosticsResponse,
type IncomingRequestHandler,
- type JsonObject,
type JsonType,
OCPP16AuthorizationStatus,
OCPP16AvailabilityType,
OCPP16ChargingProfilePurposeType,
type OCPP16ChargingSchedule,
type OCPP16ClearCacheRequest,
+ type OCPP16ClearChargingProfileRequest,
+ type OCPP16ClearChargingProfileResponse,
type OCPP16DataTransferRequest,
type OCPP16DataTransferResponse,
OCPP16DataTransferVendorId,
type SetChargingProfileResponse,
type UnlockConnectorRequest,
type UnlockConnectorResponse,
-} from '../../../types';
+} from '../../../types/index.js';
import {
Constants,
convertToDate,
isUndefined,
logger,
sleep,
-} from '../../../utils';
-import { OCPPIncomingRequestService } from '../OCPPIncomingRequestService';
+} from '../../../utils/index.js';
+import { OCPPIncomingRequestService } from '../OCPPIncomingRequestService.js';
const moduleName = 'OCPP16IncomingRequestService';
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
- protected jsonSchemas: Map<OCPP16IncomingRequestCommand, JSONSchemaType<JsonObject>>;
+ protected jsonSchemas: Map<OCPP16IncomingRequestCommand, JSONSchemaType<JsonType>>;
private incomingRequestHandlers: Map<OCPP16IncomingRequestCommand, IncomingRequestHandler>;
public constructor() {
this.handleRequestCancelReservation.bind(this) as unknown as IncomingRequestHandler,
],
]);
- this.jsonSchemas = new Map<OCPP16IncomingRequestCommand, JSONSchemaType<JsonObject>>([
+ this.jsonSchemas = new Map<OCPP16IncomingRequestCommand, JSONSchemaType<JsonType>>([
[
OCPP16IncomingRequestCommand.RESET,
OCPP16ServiceUtils.parseJsonSchemaFile<ResetRequest>(
],
[
OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE,
- OCPP16ServiceUtils.parseJsonSchemaFile<ClearChargingProfileRequest>(
+ OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16ClearChargingProfileRequest>(
'assets/json-schemas/ocpp/1.6/ClearChargingProfile.json',
moduleName,
'constructor',
): Promise<void> {
let response: ResType;
if (
- chargingStation.getOcppStrictCompliance() === true &&
+ chargingStation.stationInfo?.ocppStrictCompliance === true &&
chargingStation.inPendingState() === true &&
(commandName === OCPP16IncomingRequestCommand.REMOTE_START_TRANSACTION ||
commandName === OCPP16IncomingRequestCommand.REMOTE_STOP_TRANSACTION)
}
if (
chargingStation.isRegistered() === true ||
- (chargingStation.getOcppStrictCompliance() === false &&
+ (chargingStation.stationInfo?.ocppStrictCompliance === false &&
chargingStation.inUnknownState() === true)
) {
if (
commandPayload: ResetRequest,
): GenericResponse {
const { type } = commandPayload;
- this.runInAsyncScope(
- chargingStation.reset.bind(chargingStation) as (
- this: ChargingStation,
- ...args: unknown[]
- ) => Promise<void>,
- 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!,
} else if (isNotEmptyArray(key) === true) {
for (const k of key!) {
const keyFound = getConfigurationKey(chargingStation, k, true);
- if (keyFound) {
+ if (keyFound !== undefined) {
if (isUndefined(keyFound.visible) === true) {
keyFound.visible = true;
}
private handleRequestClearChargingProfile(
chargingStation: ChargingStation,
- commandPayload: ClearChargingProfileRequest,
- ): ClearChargingProfileResponse {
+ commandPayload: OCPP16ClearChargingProfileRequest,
+ ): OCPP16ClearChargingProfileResponse {
if (
OCPP16ServiceUtils.checkFeatureProfile(
chargingStation,
retrieveDate = convertToDate(retrieveDate)!;
const now = Date.now();
if (retrieveDate?.getTime() <= now) {
- this.runInAsyncScope(
- this.updateFirmwareSimulation.bind(this) as (
- this: OCPP16IncomingRequestService,
- ...args: unknown[]
- ) => Promise<void>,
- 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<void>,
- this,
- chargingStation,
- ).catch(Constants.EMPTY_FUNCTION);
+ this.updateFirmwareSimulation(chargingStation).catch(Constants.EMPTY_FUNCTION);
},
retrieveDate?.getTime() - now,
);