@zetra/citrineos-configuration 1.8.3-fork.1 → 1.8.3-fork.100
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 +3 -3
- package/dist/module/2.0.1/MessageApi.js +7 -7
- package/dist/module/2.0.1/MessageApi.js.map +1 -1
- package/dist/module/BootNotificationService.d.ts +4 -4
- package/dist/module/BootNotificationService.js +2 -2
- package/dist/module/DataApi.d.ts +4 -4
- package/dist/module/DataApi.js +3 -3
- package/dist/module/DeviceModelService.d.ts +1 -1
- package/dist/module/DeviceModelService.js +2 -2
- package/dist/module/module.d.ts +4 -4
- package/dist/module/module.js +3 -3
- package/package.json +9 -5
|
@@ -3,8 +3,8 @@ import type { ILogObj } from 'tslog';
|
|
|
3
3
|
import { Logger } from 'tslog';
|
|
4
4
|
import type { IConfigurationModuleApi } from '../interface.js';
|
|
5
5
|
import { ConfigurationModule } 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
|
/**
|
|
9
9
|
* Server API for the Configuration component.
|
|
10
10
|
*/
|
|
@@ -12,7 +12,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
12
12
|
};
|
|
13
13
|
import { Logger } from 'tslog';
|
|
14
14
|
import { ConfigurationModule } from '../module.js';
|
|
15
|
-
import { AbstractModuleApi, AsMessageEndpoint, DEFAULT_TENANT_ID, OCPP1_6, OCPP1_6_CallAction, OCPP2_0_1_CallAction, OCPPVersion, } from '@citrineos
|
|
15
|
+
import { AbstractModuleApi, AsMessageEndpoint, DEFAULT_TENANT_ID, OCPP1_6, OCPP1_6_CallAction, OCPP2_0_1_CallAction, OCPPVersion, } from '@zetra/citrineos-base';
|
|
16
16
|
import { v4 as uuidv4 } from 'uuid';
|
|
17
17
|
/**
|
|
18
18
|
* Server API for the Configuration component.
|
|
@@ -3,8 +3,8 @@ import type { ILogObj } from 'tslog';
|
|
|
3
3
|
import { Logger } from 'tslog';
|
|
4
4
|
import type { IConfigurationModuleApi } from '../interface.js';
|
|
5
5
|
import { ConfigurationModule } 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
|
/**
|
|
9
9
|
* Server API for the Configuration component.
|
|
10
10
|
*/
|
|
@@ -25,7 +25,7 @@ export declare class ConfigurationOcpp201Api extends AbstractModuleApi<Configura
|
|
|
25
25
|
unpublishFirmware(identifier: string[], request: OCPP2_0_1.UnpublishFirmwareRequest, callbackUrl?: string, tenantId?: number): Promise<IMessageConfirmation[]>;
|
|
26
26
|
updateFirmware(identifier: string[], request: OCPP2_0_1.UpdateFirmwareRequest, callbackUrl?: string, tenantId?: number): Promise<IMessageConfirmation[]>;
|
|
27
27
|
reset(identifier: string[], request: OCPP2_0_1.ResetRequest, callbackUrl?: string, tenantId?: number): Promise<IMessageConfirmation[]>;
|
|
28
|
-
changeAvailability(identifier: string[], request: OCPP2_0_1.ChangeAvailabilityRequest, callbackUrl?: string, tenantId?: number): Promise<IMessageConfirmation[]>;
|
|
28
|
+
changeAvailability(identifier: string[], request: OCPP2_0_1.ChangeAvailabilityRequest, callbackUrl?: string, tenantId?: number, extraQueries?: Record<string, any>): Promise<IMessageConfirmation[]>;
|
|
29
29
|
triggerMessage(identifier: string[], request: OCPP2_0_1.TriggerMessageRequest, callbackUrl?: string, tenantId?: number): Promise<IMessageConfirmation[]>;
|
|
30
30
|
dataTransfer(identifier: string[], request: OCPP2_0_1.DataTransferRequest, callbackUrl?: string, tenantId?: number): Promise<IMessageConfirmation[]>;
|
|
31
31
|
/**
|
|
@@ -12,9 +12,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
12
12
|
};
|
|
13
13
|
import { Logger } from 'tslog';
|
|
14
14
|
import { ConfigurationModule } from '../module.js';
|
|
15
|
-
import { AbstractModuleApi, AsMessageEndpoint, DEFAULT_TENANT_ID, OCPP2_0_1, OCPP2_0_1_CallAction, OCPPVersion, } from '@citrineos
|
|
16
|
-
import { SetNetworkProfile } from '@citrineos
|
|
17
|
-
import { validateLanguageTag } from '@citrineos
|
|
15
|
+
import { AbstractModuleApi, AsMessageEndpoint, DEFAULT_TENANT_ID, OCPP2_0_1, OCPP2_0_1_CallAction, OCPPVersion, } from '@zetra/citrineos-base';
|
|
16
|
+
import { SetNetworkProfile } from '@zetra/citrineos-data';
|
|
17
|
+
import { validateLanguageTag } from '@zetra/citrineos-util';
|
|
18
18
|
import { v4 as uuidv4 } from 'uuid';
|
|
19
19
|
var SetNetworkProfileExtraQuerystrings;
|
|
20
20
|
(function (SetNetworkProfileExtraQuerystrings) {
|
|
@@ -91,8 +91,8 @@ export class ConfigurationOcpp201Api extends AbstractModuleApi {
|
|
|
91
91
|
const results = identifier.map((id) => this._module.sendCall(id, tenantId, OCPPVersion.OCPP2_0_1, OCPP2_0_1_CallAction.Reset, request, callbackUrl));
|
|
92
92
|
return Promise.all(results);
|
|
93
93
|
}
|
|
94
|
-
changeAvailability(identifier, request, callbackUrl, tenantId = DEFAULT_TENANT_ID) {
|
|
95
|
-
const results = identifier.map((id) => this._module.sendCall(id, tenantId, OCPPVersion.OCPP2_0_1, OCPP2_0_1_CallAction.ChangeAvailability, request, callbackUrl));
|
|
94
|
+
changeAvailability(identifier, request, callbackUrl, tenantId = DEFAULT_TENANT_ID, extraQueries) {
|
|
95
|
+
const results = identifier.map((id) => this._module.sendCall(id, tenantId, OCPPVersion.OCPP2_0_1, OCPP2_0_1_CallAction.ChangeAvailability, request, callbackUrl, extraQueries?.correlationId));
|
|
96
96
|
return Promise.all(results);
|
|
97
97
|
}
|
|
98
98
|
triggerMessage(identifier, request, callbackUrl, tenantId = DEFAULT_TENANT_ID) {
|
|
@@ -163,9 +163,9 @@ __decorate([
|
|
|
163
163
|
__metadata("design:returntype", Promise)
|
|
164
164
|
], ConfigurationOcpp201Api.prototype, "reset", null);
|
|
165
165
|
__decorate([
|
|
166
|
-
AsMessageEndpoint(OCPP2_0_1_CallAction.ChangeAvailability, OCPP2_0_1.ChangeAvailabilityRequestSchema),
|
|
166
|
+
AsMessageEndpoint(OCPP2_0_1_CallAction.ChangeAvailability, OCPP2_0_1.ChangeAvailabilityRequestSchema, { correlationId: { type: 'string' } }),
|
|
167
167
|
__metadata("design:type", Function),
|
|
168
|
-
__metadata("design:paramtypes", [Array, Object, String, Number]),
|
|
168
|
+
__metadata("design:paramtypes", [Array, Object, String, Number, Object]),
|
|
169
169
|
__metadata("design:returntype", Promise)
|
|
170
170
|
], ConfigurationOcpp201Api.prototype, "changeAvailability", null);
|
|
171
171
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MessageApi.js","sourceRoot":"","sources":["../../../src/module/2.0.1/MessageApi.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"MessageApi.js","sourceRoot":"","sources":["../../../src/module/2.0.1/MessageApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type { IBootRepository } from '@citrineos
|
|
2
|
-
import { Boot } from '@citrineos
|
|
3
|
-
import type { BootConfig, ICache, IMessageConfirmation, SystemConfig } from '@citrineos
|
|
4
|
-
import { OCPP1_6, OCPP2_0_1 } from '@citrineos
|
|
1
|
+
import type { IBootRepository } from '@zetra/citrineos-data';
|
|
2
|
+
import { Boot } from '@zetra/citrineos-data';
|
|
3
|
+
import type { BootConfig, ICache, IMessageConfirmation, SystemConfig } from '@zetra/citrineos-base';
|
|
4
|
+
import { OCPP1_6, OCPP2_0_1 } from '@zetra/citrineos-base';
|
|
5
5
|
import type { ILogObj } from 'tslog';
|
|
6
6
|
import { Logger } from 'tslog';
|
|
7
7
|
type Configuration = SystemConfig['modules']['configuration'];
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Boot, OCPP1_6_Mapper, OCPP2_0_1_Mapper } from '@citrineos
|
|
2
|
-
import { BOOT_STATUS, OCPP1_6, OCPP1_6_CALL_SCHEMA_MAP, OCPP1_6_CallAction, OCPP2_0_1, OCPP2_0_1_CALL_SCHEMA_MAP, OCPP2_0_1_CallAction, } from '@citrineos
|
|
1
|
+
import { Boot, OCPP1_6_Mapper, OCPP2_0_1_Mapper } from '@zetra/citrineos-data';
|
|
2
|
+
import { BOOT_STATUS, OCPP1_6, OCPP1_6_CALL_SCHEMA_MAP, OCPP1_6_CallAction, OCPP2_0_1, OCPP2_0_1_CALL_SCHEMA_MAP, OCPP2_0_1_CallAction, } from '@zetra/citrineos-base';
|
|
3
3
|
import { Logger } from 'tslog';
|
|
4
4
|
export class BootNotificationService {
|
|
5
5
|
_bootRepository;
|
package/dist/module/DataApi.d.ts
CHANGED
|
@@ -3,10 +3,10 @@ import type { ILogObj } from 'tslog';
|
|
|
3
3
|
import { Logger } from 'tslog';
|
|
4
4
|
import type { IConfigurationModuleApi } from './interface.js';
|
|
5
5
|
import { ConfigurationModule } from './module.js';
|
|
6
|
-
import type { BootConfig, IMessageConfirmation, UpdateChargingStationPasswordRequest } from '@citrineos
|
|
7
|
-
import { AbstractModuleApi, Namespace, OCPP1_6_Namespace, OCPP2_0_1, OCPP2_0_1_Namespace } from '@citrineos
|
|
8
|
-
import type { ChargingStationKeyQuerystring, NetworkProfileDeleteQuerystring, NetworkProfileQuerystring, UpdateChargingStationPasswordQueryString } from '@citrineos
|
|
9
|
-
import { Boot, ChargingStationNetworkProfile } from '@citrineos
|
|
6
|
+
import type { BootConfig, IMessageConfirmation, UpdateChargingStationPasswordRequest } from '@zetra/citrineos-base';
|
|
7
|
+
import { AbstractModuleApi, Namespace, OCPP1_6_Namespace, OCPP2_0_1, OCPP2_0_1_Namespace } from '@zetra/citrineos-base';
|
|
8
|
+
import type { ChargingStationKeyQuerystring, NetworkProfileDeleteQuerystring, NetworkProfileQuerystring, UpdateChargingStationPasswordQueryString } from '@zetra/citrineos-data';
|
|
9
|
+
import { Boot, ChargingStationNetworkProfile } from '@zetra/citrineos-data';
|
|
10
10
|
/**
|
|
11
11
|
* Server API for the Configuration component.
|
|
12
12
|
*/
|
package/dist/module/DataApi.js
CHANGED
|
@@ -12,10 +12,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
12
12
|
};
|
|
13
13
|
import { Logger } from 'tslog';
|
|
14
14
|
import { ConfigurationModule } from './module.js';
|
|
15
|
-
import { AbstractModuleApi, AsDataEndpoint, BootConfigSchema, HttpMethod, Namespace, OCPP1_6_Namespace, OCPP2_0_1, OCPP2_0_1_CallAction, OCPP2_0_1_Namespace, OCPPVersion, UpdateChargingStationPasswordSchema, } from '@citrineos
|
|
16
|
-
import { Boot, ChargingStationKeyQuerySchema, ChargingStationNetworkProfile, Component, NetworkProfileDeleteQuerySchema, NetworkProfileQuerySchema, ServerNetworkProfile, SetNetworkProfile, UpdateChargingStationPasswordQuerySchema, Variable, VariableAttribute, } from '@citrineos
|
|
15
|
+
import { AbstractModuleApi, AsDataEndpoint, BootConfigSchema, HttpMethod, Namespace, OCPP1_6_Namespace, OCPP2_0_1, OCPP2_0_1_CallAction, OCPP2_0_1_Namespace, OCPPVersion, UpdateChargingStationPasswordSchema, } from '@zetra/citrineos-base';
|
|
16
|
+
import { Boot, ChargingStationKeyQuerySchema, ChargingStationNetworkProfile, Component, NetworkProfileDeleteQuerySchema, NetworkProfileQuerySchema, ServerNetworkProfile, SetNetworkProfile, UpdateChargingStationPasswordQuerySchema, Variable, VariableAttribute, } from '@zetra/citrineos-data';
|
|
17
17
|
import { Op } from 'sequelize';
|
|
18
|
-
import { generatePassword, isValidPassword } from '@citrineos
|
|
18
|
+
import { generatePassword, isValidPassword } from '@zetra/citrineos-util';
|
|
19
19
|
import { v4 as uuidv4 } from 'uuid';
|
|
20
20
|
/**
|
|
21
21
|
* Server API for the Configuration component.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { IDeviceModelRepository } from '@citrineos
|
|
1
|
+
import type { IDeviceModelRepository } from '@zetra/citrineos-data';
|
|
2
2
|
export declare class DeviceModelService {
|
|
3
3
|
protected _deviceModelRepository: IDeviceModelRepository;
|
|
4
4
|
constructor(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 { VariableAttribute } from '@citrineos
|
|
4
|
+
import { OCPP2_0_1 } from '@zetra/citrineos-base';
|
|
5
|
+
import { VariableAttribute } from '@zetra/citrineos-data';
|
|
6
6
|
export class DeviceModelService {
|
|
7
7
|
_deviceModelRepository;
|
|
8
8
|
constructor(deviceModelRepository) {
|
package/dist/module/module.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type { BootstrapConfig, CallAction, HandlerProperties, ICache, IMessage, IMessageHandler, IMessageSender, SystemConfig } from '@citrineos
|
|
2
|
-
import { AbstractModule, OCPP1_6, OCPP2_0_1, OCPPValidator } from '@citrineos
|
|
3
|
-
import type { IBootRepository, IChangeConfigurationRepository, IDeviceModelRepository, ILocationRepository, IMessageInfoRepository, IOCPPMessageRepository, ITenantRepository } from '@citrineos
|
|
4
|
-
import { IdGenerator } from '@citrineos
|
|
1
|
+
import type { BootstrapConfig, CallAction, HandlerProperties, 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 { IBootRepository, IChangeConfigurationRepository, IDeviceModelRepository, ILocationRepository, IMessageInfoRepository, IOCPPMessageRepository, ITenantRepository } from '@zetra/citrineos-data';
|
|
4
|
+
import { IdGenerator } from '@zetra/citrineos-util';
|
|
5
5
|
import type { ILogObj } from 'tslog';
|
|
6
6
|
import { Logger } from 'tslog';
|
|
7
7
|
import { BootNotificationService } from './BootNotificationService.js';
|
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, BOOT_STATUS, ChargingStationSequenceTypeEnum, ErrorCode, EventGroup, MessageOrigin, Namespace, OCPP1_6, OCPP1_6_CallAction, OCPP2_0_1, OCPP2_0_1_CallAction, OcppError, OCPPValidator, OCPPVersion, } from '@citrineos
|
|
11
|
-
import { Boot, ChangeConfiguration, ChargingStation, ChargingStationNetworkProfile, Component, sequelize, SequelizeChangeConfigurationRepository, SequelizeChargingStationSequenceRepository, SequelizeOCPPMessageRepository, ServerNetworkProfile, SetNetworkProfile, } from '@citrineos
|
|
12
|
-
import { IdGenerator, RabbitMqReceiver, RabbitMqSender, validateMessageContentType, } from '@citrineos
|
|
10
|
+
import { AbstractModule, AsHandler, BOOT_STATUS, ChargingStationSequenceTypeEnum, ErrorCode, EventGroup, MessageOrigin, Namespace, OCPP1_6, OCPP1_6_CallAction, OCPP2_0_1, OCPP2_0_1_CallAction, OcppError, OCPPValidator, OCPPVersion, } from '@zetra/citrineos-base';
|
|
11
|
+
import { Boot, ChangeConfiguration, ChargingStation, ChargingStationNetworkProfile, Component, sequelize, SequelizeChangeConfigurationRepository, SequelizeChargingStationSequenceRepository, SequelizeOCPPMessageRepository, ServerNetworkProfile, SetNetworkProfile, } from '@zetra/citrineos-data';
|
|
12
|
+
import { IdGenerator, RabbitMqReceiver, RabbitMqSender, validateMessageContentType, } from '@zetra/citrineos-util';
|
|
13
13
|
import { Logger } from 'tslog';
|
|
14
14
|
import { v4 as uuidv4 } from 'uuid';
|
|
15
15
|
import { BootNotificationService } from './BootNotificationService.js';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zetra/citrineos-configuration",
|
|
3
|
-
"version": "1.8.3-fork.
|
|
3
|
+
"version": "1.8.3-fork.100",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "The configuration 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.100",
|
|
22
|
+
"@zetra/citrineos-data": "1.8.3-fork.100",
|
|
23
|
+
"@zetra/citrineos-util": "1.8.3-fork.100"
|
|
24
|
+
},
|
|
25
|
+
"repository": {
|
|
26
|
+
"type": "git",
|
|
27
|
+
"url": "git+https://github.com/enexflow/citrineos-core.git"
|
|
24
28
|
}
|
|
25
|
-
}
|
|
29
|
+
}
|