@zetra/citrineos-evdriver 1.8.3-fork.10 → 1.8.3-fork.101
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/module/1.6/MessageApi.d.ts +2 -2
- package/dist/module/1.6/MessageApi.js +1 -1
- package/dist/module/2.0.1/MessageApi.d.ts +4 -4
- package/dist/module/2.0.1/MessageApi.js +11 -11
- package/dist/module/2.0.1/MessageApi.js.map +1 -1
- package/dist/module/DataApi.d.ts +3 -3
- package/dist/module/DataApi.js +2 -2
- package/dist/module/LocalAuthListService.d.ts +3 -3
- package/dist/module/LocalAuthListService.js +2 -2
- package/dist/module/module.d.ts +6 -5
- package/dist/module/module.js +77 -30
- package/dist/module/module.js.map +1 -1
- package/package.json +8 -4
|
@@ -3,8 +3,8 @@ import type { ILogObj } from 'tslog';
|
|
|
3
3
|
import { Logger } from 'tslog';
|
|
4
4
|
import type { IEVDriverModuleApi } from '../interface.js';
|
|
5
5
|
import { EVDriverModule } from '../module.js';
|
|
6
|
-
import type { CallAction, IMessageConfirmation } from '@citrineos
|
|
7
|
-
import { AbstractModuleApi, OCPP1_6 } from '@citrineos
|
|
6
|
+
import type { CallAction, IMessageConfirmation } from '@zetra/citrineos-base';
|
|
7
|
+
import { AbstractModuleApi, OCPP1_6 } from '@zetra/citrineos-base';
|
|
8
8
|
export declare class EVDriverOcpp16Api extends AbstractModuleApi<EVDriverModule> implements IEVDriverModuleApi {
|
|
9
9
|
/**
|
|
10
10
|
* Constructs a new instance of the class.
|
|
@@ -12,7 +12,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
12
12
|
};
|
|
13
13
|
import { Logger } from 'tslog';
|
|
14
14
|
import { EVDriverModule } from '../module.js';
|
|
15
|
-
import { AbstractModuleApi, AsMessageEndpoint, DEFAULT_TENANT_ID, OCPP1_6, OCPP1_6_CallAction, OCPPVersion, } from '@citrineos
|
|
15
|
+
import { AbstractModuleApi, AsMessageEndpoint, DEFAULT_TENANT_ID, OCPP1_6, OCPP1_6_CallAction, OCPPVersion, } from '@zetra/citrineos-base';
|
|
16
16
|
export class EVDriverOcpp16Api extends AbstractModuleApi {
|
|
17
17
|
/**
|
|
18
18
|
* Constructs a new instance of the class.
|
|
@@ -3,8 +3,8 @@ import type { ILogObj } from 'tslog';
|
|
|
3
3
|
import { Logger } from 'tslog';
|
|
4
4
|
import type { IEVDriverModuleApi } from '../interface.js';
|
|
5
5
|
import { EVDriverModule } from '../module.js';
|
|
6
|
-
import type { CallAction, IMessageConfirmation } from '@citrineos
|
|
7
|
-
import { AbstractModuleApi, OCPP2_0_1 } from '@citrineos
|
|
6
|
+
import type { CallAction, IMessageConfirmation } from '@zetra/citrineos-base';
|
|
7
|
+
import { AbstractModuleApi, OCPP2_0_1 } from '@zetra/citrineos-base';
|
|
8
8
|
export declare class EVDriverOcpp201Api extends AbstractModuleApi<EVDriverModule> implements IEVDriverModuleApi {
|
|
9
9
|
/**
|
|
10
10
|
* Constructs a new instance of the class.
|
|
@@ -14,8 +14,8 @@ export declare class EVDriverOcpp201Api extends AbstractModuleApi<EVDriverModule
|
|
|
14
14
|
* @param {Logger<ILogObj>} [logger] - The logger for logging.
|
|
15
15
|
*/
|
|
16
16
|
constructor(evDriverModule: EVDriverModule, server: FastifyInstance, logger?: Logger<ILogObj>);
|
|
17
|
-
requestStartTransaction(identifier: string[], request: OCPP2_0_1.RequestStartTransactionRequest, callbackUrl?: string, tenantId?: number): Promise<IMessageConfirmation[]>;
|
|
18
|
-
requestStopTransaction(identifier: string[], request: OCPP2_0_1.RequestStopTransactionRequest, callbackUrl?: string, tenantId?: number): Promise<IMessageConfirmation[]>;
|
|
17
|
+
requestStartTransaction(identifier: string[], request: OCPP2_0_1.RequestStartTransactionRequest, callbackUrl?: string, tenantId?: number, extraQueries?: Record<string, any>): Promise<IMessageConfirmation[]>;
|
|
18
|
+
requestStopTransaction(identifier: string[], request: OCPP2_0_1.RequestStopTransactionRequest, callbackUrl?: string, tenantId?: number, extraQueries?: Record<string, any>): Promise<IMessageConfirmation[]>;
|
|
19
19
|
cancelReservation(identifiers: string[], request: OCPP2_0_1.CancelReservationRequest, callbackUrl?: string, tenantId?: number): Promise<IMessageConfirmation[]>;
|
|
20
20
|
reserveNow(identifier: string[], request: OCPP2_0_1.ReserveNowRequest, callbackUrl?: string, tenantId?: number): Promise<IMessageConfirmation[]>;
|
|
21
21
|
unlockConnector(identifier: string[], request: OCPP2_0_1.UnlockConnectorRequest, callbackUrl?: string, tenantId?: number): Promise<IMessageConfirmation[]>;
|
|
@@ -12,9 +12,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
12
12
|
};
|
|
13
13
|
import { Logger } from 'tslog';
|
|
14
14
|
import { EVDriverModule } from '../module.js';
|
|
15
|
-
import { AbstractModuleApi, AsMessageEndpoint, DEFAULT_TENANT_ID, OCPP2_0_1, OCPP2_0_1_CallAction, OCPPVersion, } from '@citrineos
|
|
16
|
-
import { validateChargingProfileType } from '@citrineos
|
|
17
|
-
import { OCPP2_0_1_Mapper } from '@citrineos
|
|
15
|
+
import { AbstractModuleApi, AsMessageEndpoint, DEFAULT_TENANT_ID, OCPP2_0_1, OCPP2_0_1_CallAction, OCPPVersion, } from '@zetra/citrineos-base';
|
|
16
|
+
import { validateChargingProfileType } from '@zetra/citrineos-util';
|
|
17
|
+
import { OCPP2_0_1_Mapper } from '@zetra/citrineos-data';
|
|
18
18
|
import { v4 as uuidv4 } from 'uuid';
|
|
19
19
|
export class EVDriverOcpp201Api extends AbstractModuleApi {
|
|
20
20
|
/**
|
|
@@ -27,7 +27,7 @@ export class EVDriverOcpp201Api extends AbstractModuleApi {
|
|
|
27
27
|
constructor(evDriverModule, server, logger) {
|
|
28
28
|
super(evDriverModule, server, OCPPVersion.OCPP2_0_1, logger);
|
|
29
29
|
}
|
|
30
|
-
async requestStartTransaction(identifier, request, callbackUrl, tenantId = DEFAULT_TENANT_ID) {
|
|
30
|
+
async requestStartTransaction(identifier, request, callbackUrl, tenantId = DEFAULT_TENANT_ID, extraQueries) {
|
|
31
31
|
const results = [];
|
|
32
32
|
for (const i of identifier) {
|
|
33
33
|
let payloadMessage;
|
|
@@ -75,7 +75,7 @@ export class EVDriverOcpp201Api extends AbstractModuleApi {
|
|
|
75
75
|
}
|
|
76
76
|
// Send the call to the station
|
|
77
77
|
try {
|
|
78
|
-
const confirmation = await this._module.sendCall(i, tenantId, OCPPVersion.OCPP2_0_1, OCPP2_0_1_CallAction.RequestStartTransaction, request, callbackUrl);
|
|
78
|
+
const confirmation = await this._module.sendCall(i, tenantId, OCPPVersion.OCPP2_0_1, OCPP2_0_1_CallAction.RequestStartTransaction, request, callbackUrl, extraQueries?.correlationId);
|
|
79
79
|
if (payloadMessage) {
|
|
80
80
|
// We have a valid confirmation, plus a warning message
|
|
81
81
|
results.push({
|
|
@@ -96,8 +96,8 @@ export class EVDriverOcpp201Api extends AbstractModuleApi {
|
|
|
96
96
|
}
|
|
97
97
|
return results;
|
|
98
98
|
}
|
|
99
|
-
async requestStopTransaction(identifier, request, callbackUrl, tenantId = DEFAULT_TENANT_ID) {
|
|
100
|
-
const results = identifier.map((id) => this._module.sendCall(id, tenantId, OCPPVersion.OCPP2_0_1, OCPP2_0_1_CallAction.RequestStopTransaction, request, callbackUrl));
|
|
99
|
+
async requestStopTransaction(identifier, request, callbackUrl, tenantId = DEFAULT_TENANT_ID, extraQueries) {
|
|
100
|
+
const results = identifier.map((id) => this._module.sendCall(id, tenantId, OCPPVersion.OCPP2_0_1, OCPP2_0_1_CallAction.RequestStopTransaction, request, callbackUrl, extraQueries?.correlationId));
|
|
101
101
|
return Promise.all(results);
|
|
102
102
|
}
|
|
103
103
|
async cancelReservation(identifiers, request, callbackUrl, tenantId = DEFAULT_TENANT_ID) {
|
|
@@ -196,15 +196,15 @@ export class EVDriverOcpp201Api extends AbstractModuleApi {
|
|
|
196
196
|
}
|
|
197
197
|
}
|
|
198
198
|
__decorate([
|
|
199
|
-
AsMessageEndpoint(OCPP2_0_1_CallAction.RequestStartTransaction, OCPP2_0_1.RequestStartTransactionRequestSchema),
|
|
199
|
+
AsMessageEndpoint(OCPP2_0_1_CallAction.RequestStartTransaction, OCPP2_0_1.RequestStartTransactionRequestSchema, { correlationId: { type: 'string' } }),
|
|
200
200
|
__metadata("design:type", Function),
|
|
201
|
-
__metadata("design:paramtypes", [Array, Object, String, Number]),
|
|
201
|
+
__metadata("design:paramtypes", [Array, Object, String, Number, Object]),
|
|
202
202
|
__metadata("design:returntype", Promise)
|
|
203
203
|
], EVDriverOcpp201Api.prototype, "requestStartTransaction", null);
|
|
204
204
|
__decorate([
|
|
205
|
-
AsMessageEndpoint(OCPP2_0_1_CallAction.RequestStopTransaction, OCPP2_0_1.RequestStopTransactionRequestSchema),
|
|
205
|
+
AsMessageEndpoint(OCPP2_0_1_CallAction.RequestStopTransaction, OCPP2_0_1.RequestStopTransactionRequestSchema, { correlationId: { type: 'string' } }),
|
|
206
206
|
__metadata("design:type", Function),
|
|
207
|
-
__metadata("design:paramtypes", [Array, Object, String, Number]),
|
|
207
|
+
__metadata("design:paramtypes", [Array, Object, String, Number, Object]),
|
|
208
208
|
__metadata("design:returntype", Promise)
|
|
209
209
|
], EVDriverOcpp201Api.prototype, "requestStopTransaction", null);
|
|
210
210
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MessageApi.js","sourceRoot":"","sources":["../../../src/module/2.0.1/MessageApi.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,EAAE;AACF,sCAAsC;;;;;;;;;;AAItC,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,EACjB,SAAS,EACT,oBAAoB,EACpB,WAAW,GACZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAEpC,MAAM,OAAO,kBACX,SAAQ,iBAAiC;IAGzC;;;;;;OAMG;IACH,YAAY,cAA8B,EAAE,MAAuB,EAAE,MAAwB;QAC3F,KAAK,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;
|
|
1
|
+
{"version":3,"file":"MessageApi.js","sourceRoot":"","sources":["../../../src/module/2.0.1/MessageApi.ts"],"names":[],"mappings":"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"}
|
package/dist/module/DataApi.d.ts
CHANGED
|
@@ -3,9 +3,9 @@ import type { ILogObj } from 'tslog';
|
|
|
3
3
|
import { Logger } from 'tslog';
|
|
4
4
|
import type { IEVDriverModuleApi } from './interface.js';
|
|
5
5
|
import { EVDriverModule } from './module.js';
|
|
6
|
-
import { AbstractModuleApi, Namespace, OCPP1_6_Namespace, OCPP2_0_1_Namespace } from '@citrineos
|
|
7
|
-
import type { ChargingStationKeyQuerystring } from '@citrineos
|
|
8
|
-
import { LocalListVersion } from '@citrineos
|
|
6
|
+
import { AbstractModuleApi, Namespace, OCPP1_6_Namespace, OCPP2_0_1_Namespace } from '@zetra/citrineos-base';
|
|
7
|
+
import type { ChargingStationKeyQuerystring } from '@zetra/citrineos-data';
|
|
8
|
+
import { LocalListVersion } from '@zetra/citrineos-data';
|
|
9
9
|
export declare class EVDriverDataApi extends AbstractModuleApi<EVDriverModule> implements IEVDriverModuleApi {
|
|
10
10
|
/**
|
|
11
11
|
* Constructs a new instance of the class.
|
package/dist/module/DataApi.js
CHANGED
|
@@ -12,8 +12,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
12
12
|
};
|
|
13
13
|
import { Logger } from 'tslog';
|
|
14
14
|
import { EVDriverModule } from './module.js';
|
|
15
|
-
import { AbstractModuleApi, AsDataEndpoint, HttpMethod, Namespace, OCPP1_6_Namespace, OCPP2_0_1_Namespace, } from '@citrineos
|
|
16
|
-
import { ChargingStationKeyQuerySchema, LocalListVersion } from '@citrineos
|
|
15
|
+
import { AbstractModuleApi, AsDataEndpoint, HttpMethod, Namespace, OCPP1_6_Namespace, OCPP2_0_1_Namespace, } from '@zetra/citrineos-base';
|
|
16
|
+
import { ChargingStationKeyQuerySchema, LocalListVersion } from '@zetra/citrineos-data';
|
|
17
17
|
export class EVDriverDataApi extends AbstractModuleApi {
|
|
18
18
|
/**
|
|
19
19
|
* Constructs a new instance of the class.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { OCPP2_0_1 } from '@citrineos
|
|
2
|
-
import type { IDeviceModelRepository, ILocalAuthListRepository } from '@citrineos
|
|
3
|
-
import { SendLocalList } from '@citrineos
|
|
1
|
+
import { OCPP2_0_1 } from '@zetra/citrineos-base';
|
|
2
|
+
import type { IDeviceModelRepository, ILocalAuthListRepository } from '@zetra/citrineos-data';
|
|
3
|
+
import { SendLocalList } from '@zetra/citrineos-data';
|
|
4
4
|
export declare class LocalAuthListService {
|
|
5
5
|
protected _localAuthListRepository: ILocalAuthListRepository;
|
|
6
6
|
protected _deviceModelRepository: IDeviceModelRepository;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
// SPDX-FileCopyrightText: 2025 Contributors to the CitrineOS Project
|
|
2
2
|
//
|
|
3
3
|
// SPDX-License-Identifier: Apache-2.0
|
|
4
|
-
import { OCPP2_0_1 } from '@citrineos
|
|
5
|
-
import { LocalListAuthorization, LocalListVersion, SendLocalList, VariableAttribute, VariableCharacteristics, } from '@citrineos
|
|
4
|
+
import { OCPP2_0_1 } from '@zetra/citrineos-base';
|
|
5
|
+
import { LocalListAuthorization, LocalListVersion, SendLocalList, VariableAttribute, VariableCharacteristics, } from '@zetra/citrineos-data';
|
|
6
6
|
export class LocalAuthListService {
|
|
7
7
|
_localAuthListRepository;
|
|
8
8
|
_deviceModelRepository;
|
package/dist/module/module.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type { BootstrapConfig, CallAction, HandlerProperties, IAuthorizer, ICache, IMessage, IMessageHandler, IMessageSender, SystemConfig } from '@citrineos
|
|
2
|
-
import { AbstractModule, OCPP1_6, OCPP2_0_1, OCPPValidator } from '@citrineos
|
|
3
|
-
import type { IAuthorizationRepository, IChargingProfileRepository, IDeviceModelRepository, ILocalAuthListRepository, ILocationRepository, IOCPPMessageRepository, IReservationRepository, ITariffRepository, ITransactionEventRepository } from '@citrineos
|
|
4
|
-
import { CertificateAuthorityService, IdGenerator } from '@citrineos
|
|
1
|
+
import type { BootstrapConfig, CallAction, HandlerProperties, IAuthorizer, ICache, IMessage, IMessageHandler, IMessageSender, SystemConfig } from '@zetra/citrineos-base';
|
|
2
|
+
import { AbstractModule, OCPP1_6, OCPP2_0_1, OCPPValidator } from '@zetra/citrineos-base';
|
|
3
|
+
import type { IAuthorizationRepository, IChargingProfileRepository, IDeviceModelRepository, ILocalAuthListRepository, ILocationRepository, IOCPPMessageRepository, IReservationRepository, ITariffRepository, ITransactionEventRepository } from '@zetra/citrineos-data';
|
|
4
|
+
import { CertificateAuthorityService, IdGenerator, UnknownTokenOcpiAuthorizer } from '@zetra/citrineos-util';
|
|
5
5
|
import type { ILogObj } from 'tslog';
|
|
6
6
|
import { Logger } from 'tslog';
|
|
7
7
|
import { LocalAuthListService } from './LocalAuthListService.js';
|
|
@@ -18,6 +18,7 @@ export declare class EVDriverModule extends AbstractModule {
|
|
|
18
18
|
protected _locationRepository: ILocationRepository;
|
|
19
19
|
private _certificateAuthorityService;
|
|
20
20
|
private _authorizers;
|
|
21
|
+
private _unknownTokenOcpiAuthorizer?;
|
|
21
22
|
private _idGenerator;
|
|
22
23
|
/**
|
|
23
24
|
* This is the constructor function that initializes the {@link EVDriverModule}.
|
|
@@ -83,7 +84,7 @@ export declare class EVDriverModule extends AbstractModule {
|
|
|
83
84
|
* @param {IdGenerator} [idGenerator] - An optional parameter of type {@link IdGenerator} which generates
|
|
84
85
|
* unique identifiers.
|
|
85
86
|
*/
|
|
86
|
-
constructor(config: BootstrapConfig & SystemConfig, cache: ICache, sender?: IMessageSender, handler?: IMessageHandler, logger?: Logger<ILogObj>, ocppValidator?: OCPPValidator, authorizeRepository?: IAuthorizationRepository, localAuthListRepository?: ILocalAuthListRepository, deviceModelRepository?: IDeviceModelRepository, tariffRepository?: ITariffRepository, transactionEventRepository?: ITransactionEventRepository, chargingProfileRepository?: IChargingProfileRepository, reservationRepository?: IReservationRepository, ocppMessageRepository?: IOCPPMessageRepository, locationRepository?: ILocationRepository, certificateAuthorityService?: CertificateAuthorityService, realTimeAuthorizer?: IAuthorizer, authorizers?: IAuthorizer[], idGenerator?: IdGenerator);
|
|
87
|
+
constructor(config: BootstrapConfig & SystemConfig, cache: ICache, sender?: IMessageSender, handler?: IMessageHandler, logger?: Logger<ILogObj>, ocppValidator?: OCPPValidator, authorizeRepository?: IAuthorizationRepository, localAuthListRepository?: ILocalAuthListRepository, deviceModelRepository?: IDeviceModelRepository, tariffRepository?: ITariffRepository, transactionEventRepository?: ITransactionEventRepository, chargingProfileRepository?: IChargingProfileRepository, reservationRepository?: IReservationRepository, ocppMessageRepository?: IOCPPMessageRepository, locationRepository?: ILocationRepository, certificateAuthorityService?: CertificateAuthorityService, realTimeAuthorizer?: IAuthorizer, authorizers?: IAuthorizer[], idGenerator?: IdGenerator, unknownTokenOcpiAuthorizer?: UnknownTokenOcpiAuthorizer);
|
|
87
88
|
protected _authorizeRepository: IAuthorizationRepository;
|
|
88
89
|
get authorizeRepository(): IAuthorizationRepository;
|
|
89
90
|
protected _localAuthListRepository: ILocalAuthListRepository;
|
package/dist/module/module.js
CHANGED
|
@@ -7,9 +7,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
|
-
import { AbstractModule, AsHandler, AuthorizationStatusEnum, ChargingLimitSourceEnum, ChargingStationSequenceTypeEnum, ErrorCode, EventGroup, MessageOrigin, OCPP1_6, OCPP1_6_CallAction, OCPP2_0_1, OCPP2_0_1_CallAction, OcppError, OCPPValidator, OCPPVersion, } from '@citrineos
|
|
11
|
-
import { Authorization, OCPP1_6_Mapper, OCPP2_0_1_Mapper, sequelize, SequelizeChargingStationSequenceRepository,
|
|
12
|
-
import { CertificateAuthorityService, IdGenerator, RabbitMqReceiver, RabbitMqSender, RealTimeAuthorizer, validateIdToken, } from '@citrineos
|
|
10
|
+
import { AbstractModule, AsHandler, AuthMethodEnum, AuthorizationStatusEnum, ChargingLimitSourceEnum, ChargingStationSequenceTypeEnum, ErrorCode, EventGroup, MessageOrigin, OCPP1_6, OCPP1_6_CallAction, OCPP2_0_1, OCPP2_0_1_CallAction, OcppError, OCPPValidator, OCPPVersion, } from '@zetra/citrineos-base';
|
|
11
|
+
import { Authorization, OCPP1_6_Mapper, OCPP2_0_1_Mapper, sequelize, SequelizeChargingStationSequenceRepository, VariableAttribute, } from '@zetra/citrineos-data';
|
|
12
|
+
import { CertificateAuthorityService, IdGenerator, RabbitMqReceiver, RabbitMqSender, RealTimeAuthorizer, UnknownTokenOcpiAuthorizer, validateIdToken, } from '@zetra/citrineos-util';
|
|
13
13
|
import { Logger } from 'tslog';
|
|
14
14
|
import { LocalAuthListService } from './LocalAuthListService.js';
|
|
15
15
|
/**
|
|
@@ -25,6 +25,7 @@ export class EVDriverModule extends AbstractModule {
|
|
|
25
25
|
_locationRepository;
|
|
26
26
|
_certificateAuthorityService;
|
|
27
27
|
_authorizers;
|
|
28
|
+
_unknownTokenOcpiAuthorizer;
|
|
28
29
|
_idGenerator;
|
|
29
30
|
/**
|
|
30
31
|
* This is the constructor function that initializes the {@link EVDriverModule}.
|
|
@@ -90,7 +91,7 @@ export class EVDriverModule extends AbstractModule {
|
|
|
90
91
|
* @param {IdGenerator} [idGenerator] - An optional parameter of type {@link IdGenerator} which generates
|
|
91
92
|
* unique identifiers.
|
|
92
93
|
*/
|
|
93
|
-
constructor(config, cache, sender, handler, logger, ocppValidator, authorizeRepository, localAuthListRepository, deviceModelRepository, tariffRepository, transactionEventRepository, chargingProfileRepository, reservationRepository, ocppMessageRepository, locationRepository, certificateAuthorityService, realTimeAuthorizer, authorizers, idGenerator) {
|
|
94
|
+
constructor(config, cache, sender, handler, logger, ocppValidator, authorizeRepository, localAuthListRepository, deviceModelRepository, tariffRepository, transactionEventRepository, chargingProfileRepository, reservationRepository, ocppMessageRepository, locationRepository, certificateAuthorityService, realTimeAuthorizer, authorizers, idGenerator, unknownTokenOcpiAuthorizer) {
|
|
94
95
|
super(config, cache, handler || new RabbitMqReceiver(config, logger), sender || new RabbitMqSender(config, logger), EventGroup.EVDriver, logger, ocppValidator);
|
|
95
96
|
this._requests = config.modules.evdriver.requests;
|
|
96
97
|
this._responses = config.modules.evdriver.responses;
|
|
@@ -119,6 +120,7 @@ export class EVDriverModule extends AbstractModule {
|
|
|
119
120
|
const _realTimeAuthorizer = realTimeAuthorizer ||
|
|
120
121
|
new RealTimeAuthorizer(this._locationRepository, this.config, this._logger);
|
|
121
122
|
this._authorizers = [_realTimeAuthorizer, ...(authorizers || [])];
|
|
123
|
+
this._unknownTokenOcpiAuthorizer = unknownTokenOcpiAuthorizer;
|
|
122
124
|
this._idGenerator =
|
|
123
125
|
idGenerator ||
|
|
124
126
|
new IdGenerator(new SequelizeChargingStationSequenceRepository(config, this._logger));
|
|
@@ -209,10 +211,27 @@ export class EVDriverModule extends AbstractModule {
|
|
|
209
211
|
return;
|
|
210
212
|
}
|
|
211
213
|
}
|
|
212
|
-
const
|
|
214
|
+
const auth = await this._authorizeRepository.readOnlyOneByQuerystring(context.tenantId, {
|
|
213
215
|
idToken: request.idToken.idToken,
|
|
214
216
|
type: OCPP2_0_1_Mapper.AuthorizationMapper.fromIdTokenEnumType(request.idToken.type),
|
|
215
217
|
});
|
|
218
|
+
// If the authorization is a command or auth request, we don't use it
|
|
219
|
+
// those authorisation were used for Start Session or RTA and should not be authorised again
|
|
220
|
+
let authorization;
|
|
221
|
+
if (!auth) {
|
|
222
|
+
authorization = undefined;
|
|
223
|
+
}
|
|
224
|
+
else if (auth.ocpiAuthMethod === AuthMethodEnum.COMMAND) {
|
|
225
|
+
const expired = auth.cacheExpiryDateTime != null && new Date() > new Date(auth.cacheExpiryDateTime);
|
|
226
|
+
authorization = expired ? undefined : auth;
|
|
227
|
+
}
|
|
228
|
+
else if (auth.ocpiAuthMethod === AuthMethodEnum.AUTH_REQUEST) {
|
|
229
|
+
authorization = undefined;
|
|
230
|
+
}
|
|
231
|
+
else {
|
|
232
|
+
authorization = auth;
|
|
233
|
+
}
|
|
234
|
+
const skipAuthorizers = authorization?.ocpiAuthMethod === AuthMethodEnum.COMMAND;
|
|
216
235
|
if (authorization) {
|
|
217
236
|
// Use flat fields directly instead of authorization.idTokenInfo
|
|
218
237
|
const idTokenInfo = OCPP2_0_1_Mapper.AuthorizationMapper.toIdTokenInfo(authorization);
|
|
@@ -226,6 +245,21 @@ export class EVDriverModule extends AbstractModule {
|
|
|
226
245
|
};
|
|
227
246
|
}
|
|
228
247
|
else {
|
|
248
|
+
// Check if charging station location is allowed
|
|
249
|
+
const station = await this._locationRepository.readChargingStationByStationId(context.tenantId, message.context.stationId);
|
|
250
|
+
const allowedLocationIds = authorization.locations?.map((l) => l.locationId) ?? [];
|
|
251
|
+
if (allowedLocationIds.length > 0) {
|
|
252
|
+
const stationLocationId = station?.locationId;
|
|
253
|
+
if (stationLocationId && !allowedLocationIds.includes(stationLocationId)) {
|
|
254
|
+
response.idTokenInfo = {
|
|
255
|
+
status: OCPP2_0_1.AuthorizationStatusEnumType.NotAtThisLocation,
|
|
256
|
+
groupIdToken: idTokenInfo.groupIdToken,
|
|
257
|
+
};
|
|
258
|
+
this._logger.warn(`Authorization not allowed at this location. Station location ID: ${stationLocationId} - Allowed location IDs: ${allowedLocationIds.join(', ')}`);
|
|
259
|
+
await this.sendCallResultWithMessage(message, response);
|
|
260
|
+
return;
|
|
261
|
+
}
|
|
262
|
+
}
|
|
229
263
|
// If charging station does not have values and evses associated with the component/variable pairs below,
|
|
230
264
|
// this logic will break. CSMS's aiming to use the allowedConnectorTypes or disallowedEvseIdPrefixes
|
|
231
265
|
// Authorization restrictions MUST provide these variable attributes as defined in Physical Component
|
|
@@ -292,13 +326,15 @@ export class EVDriverModule extends AbstractModule {
|
|
|
292
326
|
}
|
|
293
327
|
}
|
|
294
328
|
}
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
329
|
+
if (!skipAuthorizers) {
|
|
330
|
+
for (const authorizer of this._authorizers) {
|
|
331
|
+
if (response.idTokenInfo.status !== OCPP2_0_1.AuthorizationStatusEnumType.Accepted) {
|
|
332
|
+
break;
|
|
333
|
+
}
|
|
334
|
+
const result = await authorizer.authorize(authorization, context);
|
|
335
|
+
response.idTokenInfo.status =
|
|
336
|
+
OCPP2_0_1_Mapper.AuthorizationMapper.fromAuthorizationStatusEnumType(result);
|
|
298
337
|
}
|
|
299
|
-
const result = await authorizer.authorize(authorization, context);
|
|
300
|
-
response.idTokenInfo.status =
|
|
301
|
-
OCPP2_0_1_Mapper.AuthorizationMapper.fromAuthorizationStatusEnumType(result);
|
|
302
338
|
}
|
|
303
339
|
}
|
|
304
340
|
else {
|
|
@@ -307,17 +343,20 @@ export class EVDriverModule extends AbstractModule {
|
|
|
307
343
|
}
|
|
308
344
|
}
|
|
309
345
|
else {
|
|
310
|
-
//
|
|
346
|
+
// No local authorization found. Default to Unknown, but optionally delegate a
|
|
347
|
+
// real-time authorization to the OCPI module for unknown tokens.
|
|
311
348
|
response.idTokenInfo = {
|
|
312
349
|
status: OCPP2_0_1.AuthorizationStatusEnumType.Unknown,
|
|
313
350
|
// TODO determine how/if to set personalMessage
|
|
314
351
|
};
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
352
|
+
if (this._unknownTokenOcpiAuthorizer) {
|
|
353
|
+
const result = await this._unknownTokenOcpiAuthorizer.authorize(request.idToken.idToken, OCPP2_0_1_Mapper.AuthorizationMapper.fromIdTokenEnumType(request.idToken.type), context);
|
|
354
|
+
response.idTokenInfo.status =
|
|
355
|
+
OCPP2_0_1_Mapper.AuthorizationMapper.fromAuthorizationStatusEnumType(result);
|
|
356
|
+
}
|
|
318
357
|
}
|
|
319
358
|
if (response.idTokenInfo.status === OCPP2_0_1.AuthorizationStatusEnumType.Accepted) {
|
|
320
|
-
|
|
359
|
+
await this._deviceModelRepository.readAllByQuerystring(context.tenantId, {
|
|
321
360
|
tenantId: context.tenantId,
|
|
322
361
|
stationId: message.context.stationId,
|
|
323
362
|
component_name: 'TariffCostCtrlr',
|
|
@@ -325,27 +364,35 @@ export class EVDriverModule extends AbstractModule {
|
|
|
325
364
|
variable_instance: 'Tariff',
|
|
326
365
|
type: OCPP2_0_1.AttributeEnumType.Actual,
|
|
327
366
|
});
|
|
328
|
-
|
|
367
|
+
await this._deviceModelRepository.readAllByQuerystring(context.tenantId, {
|
|
329
368
|
tenantId: context.tenantId,
|
|
330
369
|
stationId: message.context.stationId,
|
|
331
370
|
component_name: 'DisplayMessageCtrlr',
|
|
332
371
|
variable_name: 'Available',
|
|
333
372
|
type: OCPP2_0_1.AttributeEnumType.Actual,
|
|
334
373
|
});
|
|
374
|
+
// TODO: Remove this once the tariff implementation is finalized
|
|
375
|
+
// This code has been commented out because the tariff implementation is not yet finalized.
|
|
376
|
+
// the tariff logic right now if for OCPI only. Tariffs are linked to Connector of the Station.
|
|
377
|
+
// if we want to calculate the cost in the futur we need a new logic
|
|
335
378
|
// only send the tariff information if the Charging Station supports the tariff or DisplayMessage functionality
|
|
336
|
-
if (
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
}
|
|
379
|
+
// if (
|
|
380
|
+
// (tariffAvailable.length > 0 && Boolean(tariffAvailable[0].value)) ||
|
|
381
|
+
// (displayMessageAvailable.length > 0 && Boolean(displayMessageAvailable[0].value))
|
|
382
|
+
// ) {
|
|
383
|
+
// const tariff: Tariff | undefined = await this._tariffRepository.findByStationId(
|
|
384
|
+
// context.tenantId,
|
|
385
|
+
// message.context.stationId,
|
|
386
|
+
// );
|
|
387
|
+
// if (tariff) {
|
|
388
|
+
// if (!response.idTokenInfo.personalMessage) {
|
|
389
|
+
// response.idTokenInfo.personalMessage = {
|
|
390
|
+
// format: OCPP2_0_1.MessageFormatEnumType.ASCII,
|
|
391
|
+
// } as OCPP2_0_1.MessageContentType;
|
|
392
|
+
// }
|
|
393
|
+
// response.idTokenInfo.personalMessage.content = `${tariff.pricePerKwh}/kWh`;
|
|
394
|
+
// }
|
|
395
|
+
// }
|
|
349
396
|
}
|
|
350
397
|
const messageConfirmation = await this.sendCallResultWithMessage(message, response);
|
|
351
398
|
this._logger.debug('Authorize response sent:', messageConfirmation);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/module/module.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/module/module.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zetra/citrineos-evdriver",
|
|
3
|
-
"version": "1.8.3-fork.
|
|
3
|
+
"version": "1.8.3-fork.101",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "The EVDriver module for OCPP v2.0.1. This module is not intended to be used directly, but rather as a dependency for other modules.",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -18,8 +18,12 @@
|
|
|
18
18
|
],
|
|
19
19
|
"license": "Apache-2.0",
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@zetra/citrineos-base": "1.8.3-fork.
|
|
22
|
-
"@zetra/citrineos-data": "1.8.3-fork.
|
|
23
|
-
"@zetra/citrineos-util": "1.8.3-fork.
|
|
21
|
+
"@zetra/citrineos-base": "1.8.3-fork.101",
|
|
22
|
+
"@zetra/citrineos-data": "1.8.3-fork.101",
|
|
23
|
+
"@zetra/citrineos-util": "1.8.3-fork.101"
|
|
24
|
+
},
|
|
25
|
+
"repository": {
|
|
26
|
+
"type": "git",
|
|
27
|
+
"url": "git+https://github.com/enexflow/citrineos-core.git"
|
|
24
28
|
}
|
|
25
29
|
}
|