@zetra/citrineos-reporting 1.8.3-fork.13 → 1.8.3-fork.130
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 +2 -2
- package/dist/module/2.0.1/MessageApi.js +2 -2
- package/dist/module/module.d.ts +3 -3
- package/dist/module/module.js +7 -5
- package/dist/module/module.js.map +1 -1
- package/dist/module/services.d.ts +1 -1
- package/dist/module/services.js +2 -2
- package/package.json +8 -4
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { ILogObj } from 'tslog';
|
|
2
2
|
import { Logger } from 'tslog';
|
|
3
|
-
import type { CallAction, IMessageConfirmation } from '@citrineos
|
|
4
|
-
import { AbstractModuleApi, OCPP1_6 } from '@citrineos
|
|
3
|
+
import type { CallAction, IMessageConfirmation } from '@zetra/citrineos-base';
|
|
4
|
+
import { AbstractModuleApi, OCPP1_6 } from '@zetra/citrineos-base';
|
|
5
5
|
import type { FastifyInstance } from 'fastify';
|
|
6
6
|
import type { IReportingModuleApi } from '../interface.js';
|
|
7
7
|
import { ReportingModule } from '../module.js';
|
|
@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
12
12
|
};
|
|
13
13
|
import { Logger } from 'tslog';
|
|
14
|
-
import { AbstractModuleApi, AsMessageEndpoint, DEFAULT_TENANT_ID, OCPP1_6, OCPP1_6_CallAction, OCPPVersion, } from '@citrineos
|
|
14
|
+
import { AbstractModuleApi, AsMessageEndpoint, DEFAULT_TENANT_ID, OCPP1_6, OCPP1_6_CallAction, OCPPVersion, } from '@zetra/citrineos-base';
|
|
15
15
|
import { ReportingModule } from '../module.js';
|
|
16
16
|
/**
|
|
17
17
|
* Server API for the Reporting module (OCPP 1.6).
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { ILogObj } from 'tslog';
|
|
2
2
|
import { Logger } from 'tslog';
|
|
3
|
-
import type { CallAction, IMessageConfirmation } from '@citrineos
|
|
4
|
-
import { AbstractModuleApi, OCPP2_0_1 } from '@citrineos
|
|
3
|
+
import type { CallAction, IMessageConfirmation } from '@zetra/citrineos-base';
|
|
4
|
+
import { AbstractModuleApi, OCPP2_0_1 } from '@zetra/citrineos-base';
|
|
5
5
|
import type { FastifyInstance } from 'fastify';
|
|
6
6
|
import type { IReportingModuleApi } from '../interface.js';
|
|
7
7
|
import { ReportingModule } from '../module.js';
|
|
@@ -11,9 +11,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
12
12
|
};
|
|
13
13
|
import { Logger } from 'tslog';
|
|
14
|
-
import { AbstractModuleApi, AsMessageEndpoint, DEFAULT_TENANT_ID, OCPP2_0_1, OCPP2_0_1_CallAction, OCPPVersion, } from '@citrineos
|
|
14
|
+
import { AbstractModuleApi, AsMessageEndpoint, DEFAULT_TENANT_ID, OCPP2_0_1, OCPP2_0_1_CallAction, OCPPVersion, } from '@zetra/citrineos-base';
|
|
15
15
|
import { ReportingModule } from '../module.js';
|
|
16
|
-
import { getBatches, getSizeOfRequest } from '@citrineos
|
|
16
|
+
import { getBatches, getSizeOfRequest } from '@zetra/citrineos-util';
|
|
17
17
|
/**
|
|
18
18
|
* Server API for the Reporting module.
|
|
19
19
|
*/
|
package/dist/module/module.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
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 { IDeviceModelRepository, IOCPPMessageRepository, ISecurityEventRepository, IVariableMonitoringRepository } 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 { IDeviceModelRepository, IOCPPMessageRepository, ISecurityEventRepository, IVariableMonitoringRepository } from '@zetra/citrineos-data';
|
|
4
4
|
import type { ILogObj } from 'tslog';
|
|
5
5
|
import { Logger } from 'tslog';
|
|
6
6
|
import { DeviceModelService } from './services.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, ErrorCode, EventGroup, Namespace, OCPP1_6, OCPP1_6_CallAction, OCPP2_0_1, OCPP2_0_1_CallAction, OcppError, OCPPValidator, OCPPVersion, } from '@citrineos
|
|
11
|
-
import { Component, sequelize, Variable } from '@citrineos
|
|
12
|
-
import { RabbitMqReceiver, RabbitMqSender } from '@citrineos
|
|
10
|
+
import { AbstractModule, AsHandler, ErrorCode, EventGroup, maskOcppPayloadSecrets, Namespace, OCPP1_6, OCPP1_6_CallAction, OCPP2_0_1, OCPP2_0_1_CallAction, OcppError, OCPPValidator, OCPPVersion, omitReportedPasswordValues, } from '@zetra/citrineos-base';
|
|
11
|
+
import { Component, sequelize, Variable } from '@zetra/citrineos-data';
|
|
12
|
+
import { RabbitMqReceiver, RabbitMqSender } from '@zetra/citrineos-util';
|
|
13
13
|
import { Logger } from 'tslog';
|
|
14
14
|
import { DeviceModelService } from './services.js';
|
|
15
15
|
/**
|
|
@@ -133,10 +133,12 @@ export class ReportingModule extends AbstractModule {
|
|
|
133
133
|
this._logger.debug('NotifyMonitoringReport response sent: ', messageConfirmation);
|
|
134
134
|
}
|
|
135
135
|
async _handleNotifyReport(message, props) {
|
|
136
|
-
this._logger.info('NotifyReport received:', message, props);
|
|
136
|
+
this._logger.info('NotifyReport received:', { context: message.context, payload: maskOcppPayloadSecrets(message.payload) }, props);
|
|
137
137
|
const timestamp = message.payload.generatedAt;
|
|
138
138
|
try {
|
|
139
|
-
for (const
|
|
139
|
+
for (const reportedData of message.payload.reportData ? message.payload.reportData : []) {
|
|
140
|
+
// A value reported by the station must never replace the stored password hash.
|
|
141
|
+
const reportDataType = omitReportedPasswordValues(reportedData);
|
|
140
142
|
// To keep consistency with VariableAttributeType defined in OCPP 2.0.1:
|
|
141
143
|
// mutability: Default is ReadWrite when omitted.
|
|
142
144
|
// if it is not present, we set it to ReadWrite
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/module/module.ts"],"names":[],"mappings":";;;;;;;;;AAaA,OAAO,EACL,cAAc,EACd,SAAS,EACT,SAAS,EACT,UAAU,EACV,SAAS,EACT,OAAO,EACP,kBAAkB,EAClB,SAAS,EACT,oBAAoB,EACpB,SAAS,EACT,aAAa,EACb,WAAW,
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/module/module.ts"],"names":[],"mappings":"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"}
|
|
@@ -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);
|
package/dist/module/services.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { VariableAttribute } from '@citrineos
|
|
2
|
-
import { OCPP2_0_1 } from '@citrineos
|
|
1
|
+
import { VariableAttribute } from '@zetra/citrineos-data';
|
|
2
|
+
import { OCPP2_0_1 } from '@zetra/citrineos-base';
|
|
3
3
|
export class DeviceModelService {
|
|
4
4
|
_deviceModelRepository;
|
|
5
5
|
constructor(deviceModelRepository) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zetra/citrineos-reporting",
|
|
3
|
-
"version": "1.8.3-fork.
|
|
3
|
+
"version": "1.8.3-fork.130",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "The reporting 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.130",
|
|
22
|
+
"@zetra/citrineos-data": "1.8.3-fork.130",
|
|
23
|
+
"@zetra/citrineos-util": "1.8.3-fork.130"
|
|
24
|
+
},
|
|
25
|
+
"repository": {
|
|
26
|
+
"type": "git",
|
|
27
|
+
"url": "git+https://github.com/enexflow/citrineos-core.git"
|
|
24
28
|
}
|
|
25
29
|
}
|