repositories
/
e-mobility-charging-stations-simulator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
perf: minimize OCPPUtils exports
[e-mobility-charging-stations-simulator.git]
/
src
/
charging-station
/
ocpp
/
1.6
/
OCPP16IncomingRequestService.ts
diff --git
a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
index 4b565eb937d27728d7f98b02ab5f88ae3138d906..8faf05cf609676ebca14249de5139edd215a3055 100644
(file)
--- a/
src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
+++ b/
src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
@@
-6,7
+6,14
@@
import { URL, fileURLToPath } from 'node:url';
import type { JSONSchemaType } from 'ajv';
import { Client, type FTPResponse } from 'basic-ftp';
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 { create } from 'tar';
import { OCPP16Constants } from './OCPP16Constants';
@@
-25,8
+32,6
@@
import { OCPPError } from '../../../exception';
import {
type ChangeConfigurationRequest,
type ChangeConfigurationResponse,
import {
type ChangeConfigurationRequest,
type ChangeConfigurationResponse,
- type ClearChargingProfileRequest,
- type ClearChargingProfileResponse,
ErrorType,
type GenericResponse,
GenericStatus,
ErrorType,
type GenericResponse,
GenericStatus,
@@
-35,7
+40,6
@@
import {
type GetDiagnosticsRequest,
type GetDiagnosticsResponse,
type IncomingRequestHandler,
type GetDiagnosticsRequest,
type GetDiagnosticsResponse,
type IncomingRequestHandler,
- type JsonObject,
type JsonType,
OCPP16AuthorizationStatus,
OCPP16AvailabilityType,
type JsonType,
OCPP16AuthorizationStatus,
OCPP16AvailabilityType,
@@
-50,6
+54,8
@@
import {
OCPP16ChargingProfilePurposeType,
type OCPP16ChargingSchedule,
type OCPP16ClearCacheRequest,
OCPP16ChargingProfilePurposeType,
type OCPP16ChargingSchedule,
type OCPP16ClearCacheRequest,
+ type OCPP16ClearChargingProfileRequest,
+ type OCPP16ClearChargingProfileResponse,
type OCPP16DataTransferRequest,
type OCPP16DataTransferResponse,
OCPP16DataTransferVendorId,
type OCPP16DataTransferRequest,
type OCPP16DataTransferResponse,
OCPP16DataTransferVendorId,
@@
-109,7
+115,7
@@
import { OCPPIncomingRequestService } from '../OCPPIncomingRequestService';
const moduleName = 'OCPP16IncomingRequestService';
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
const moduleName = 'OCPP16IncomingRequestService';
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
- protected jsonSchemas: Map<OCPP16IncomingRequestCommand, JSONSchemaType<Json
Object
>>;
+ protected jsonSchemas: Map<OCPP16IncomingRequestCommand, JSONSchemaType<Json
Type
>>;
private incomingRequestHandlers: Map<OCPP16IncomingRequestCommand, IncomingRequestHandler>;
public constructor() {
private incomingRequestHandlers: Map<OCPP16IncomingRequestCommand, IncomingRequestHandler>;
public constructor() {
@@
-187,7
+193,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
this.handleRequestCancelReservation.bind(this) as unknown as IncomingRequestHandler,
],
]);
this.handleRequestCancelReservation.bind(this) as unknown as IncomingRequestHandler,
],
]);
- this.jsonSchemas = new Map<OCPP16IncomingRequestCommand, JSONSchemaType<Json
Object
>>([
+ this.jsonSchemas = new Map<OCPP16IncomingRequestCommand, JSONSchemaType<Json
Type
>>([
[
OCPP16IncomingRequestCommand.RESET,
OCPP16ServiceUtils.parseJsonSchemaFile<ResetRequest>(
[
OCPP16IncomingRequestCommand.RESET,
OCPP16ServiceUtils.parseJsonSchemaFile<ResetRequest>(
@@
-254,7
+260,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
],
[
OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE,
],
[
OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE,
- OCPP16ServiceUtils.parseJsonSchemaFile<ClearChargingProfileRequest>(
+ OCPP16ServiceUtils.parseJsonSchemaFile<
OCPP16
ClearChargingProfileRequest>(
'assets/json-schemas/ocpp/1.6/ClearChargingProfile.json',
moduleName,
'constructor',
'assets/json-schemas/ocpp/1.6/ClearChargingProfile.json',
moduleName,
'constructor',
@@
-340,7
+346,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
): Promise<void> {
let response: ResType;
if (
): 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)
chargingStation.inPendingState() === true &&
(commandName === OCPP16IncomingRequestCommand.REMOTE_START_TRANSACTION ||
commandName === OCPP16IncomingRequestCommand.REMOTE_STOP_TRANSACTION)
@@
-358,7
+364,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
}
if (
chargingStation.isRegistered() === true ||
}
if (
chargingStation.isRegistered() === true ||
- (chargingStation.
getOcppStrictCompliance()
=== false &&
+ (chargingStation.
stationInfo?.ocppStrictCompliance
=== false &&
chargingStation.inUnknownState() === true)
) {
if (
chargingStation.inUnknownState() === true)
) {
if (
@@
-512,7
+518,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
} else if (isNotEmptyArray(key) === true) {
for (const k of key!) {
const keyFound = getConfigurationKey(chargingStation, k, true);
} 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;
}
if (isUndefined(keyFound.visible) === true) {
keyFound.visible = true;
}
@@
-792,8
+798,8
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
private handleRequestClearChargingProfile(
chargingStation: ChargingStation,
private handleRequestClearChargingProfile(
chargingStation: ChargingStation,
- commandPayload: ClearChargingProfileRequest,
- ): ClearChargingProfileResponse {
+ commandPayload:
OCPP16
ClearChargingProfileRequest,
+ ):
OCPP16
ClearChargingProfileResponse {
if (
OCPP16ServiceUtils.checkFeatureProfile(
chargingStation,
if (
OCPP16ServiceUtils.checkFeatureProfile(
chargingStation,