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
fix: avoid concurrent ATG startup
[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 a7d02dcaac6d4098240ba10c2e60b06848232f03..f01034a30029b31e40bbcbb8808326d72203a716 100644
(file)
--- a/
src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
+++ b/
src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
@@
-8,6
+8,8
@@
import type { JSONSchemaType } from 'ajv';
import { Client, type FTPResponse } from 'basic-ftp';
import tar from 'tar';
import { Client, type FTPResponse } from 'basic-ftp';
import tar from 'tar';
+import { OCPP16Constants } from './OCPP16Constants';
+import { OCPP16ServiceUtils } from './OCPP16ServiceUtils';
import {
type ChargingStation,
ChargingStationConfigurationUtils,
import {
type ChargingStation,
ChargingStationConfigurationUtils,
@@
-46,7
+48,6
@@
import {
type OCPP16ClearCacheRequest,
type OCPP16DataTransferRequest,
type OCPP16DataTransferResponse,
type OCPP16ClearCacheRequest,
type OCPP16DataTransferRequest,
type OCPP16DataTransferResponse,
- OCPP16DataTransferStatus,
OCPP16DataTransferVendorId,
OCPP16DiagnosticsStatus,
type OCPP16DiagnosticsStatusNotificationRequest,
OCPP16DataTransferVendorId,
OCPP16DiagnosticsStatus,
type OCPP16DiagnosticsStatusNotificationRequest,
@@
-83,7
+84,7
@@
import {
type UnlockConnectorResponse,
} from '../../../types';
import { Constants, Utils, logger } from '../../../utils';
type UnlockConnectorResponse,
} from '../../../types';
import { Constants, Utils, logger } from '../../../utils';
-import { OCPP
16Constants, OCPP16ServiceUtils, OCPPIncomingRequestService } from '../internal
';
+import { OCPP
IncomingRequestService } from '../OCPPIncomingRequestService
';
const moduleName = 'OCPP16IncomingRequestService';
const moduleName = 'OCPP16IncomingRequestService';
@@
-141,7
+142,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
[
OCPP16IncomingRequestCommand.RESET,
OCPP16ServiceUtils.parseJsonSchemaFile<ResetRequest>(
[
OCPP16IncomingRequestCommand.RESET,
OCPP16ServiceUtils.parseJsonSchemaFile<ResetRequest>(
- '
../../../
assets/json-schemas/ocpp/1.6/Reset.json',
+ 'assets/json-schemas/ocpp/1.6/Reset.json',
moduleName,
'constructor'
),
moduleName,
'constructor'
),
@@
-149,7
+150,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
[
OCPP16IncomingRequestCommand.CLEAR_CACHE,
OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16ClearCacheRequest>(
[
OCPP16IncomingRequestCommand.CLEAR_CACHE,
OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16ClearCacheRequest>(
- '
../../../
assets/json-schemas/ocpp/1.6/ClearCache.json',
+ 'assets/json-schemas/ocpp/1.6/ClearCache.json',
moduleName,
'constructor'
),
moduleName,
'constructor'
),
@@
-157,7
+158,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
[
OCPP16IncomingRequestCommand.UNLOCK_CONNECTOR,
OCPP16ServiceUtils.parseJsonSchemaFile<UnlockConnectorRequest>(
[
OCPP16IncomingRequestCommand.UNLOCK_CONNECTOR,
OCPP16ServiceUtils.parseJsonSchemaFile<UnlockConnectorRequest>(
- '
../../../
assets/json-schemas/ocpp/1.6/UnlockConnector.json',
+ 'assets/json-schemas/ocpp/1.6/UnlockConnector.json',
moduleName,
'constructor'
),
moduleName,
'constructor'
),
@@
-165,7
+166,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
[
OCPP16IncomingRequestCommand.GET_CONFIGURATION,
OCPP16ServiceUtils.parseJsonSchemaFile<GetConfigurationRequest>(
[
OCPP16IncomingRequestCommand.GET_CONFIGURATION,
OCPP16ServiceUtils.parseJsonSchemaFile<GetConfigurationRequest>(
- '
../../../
assets/json-schemas/ocpp/1.6/GetConfiguration.json',
+ 'assets/json-schemas/ocpp/1.6/GetConfiguration.json',
moduleName,
'constructor'
),
moduleName,
'constructor'
),
@@
-173,7
+174,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
[
OCPP16IncomingRequestCommand.CHANGE_CONFIGURATION,
OCPP16ServiceUtils.parseJsonSchemaFile<ChangeConfigurationRequest>(
[
OCPP16IncomingRequestCommand.CHANGE_CONFIGURATION,
OCPP16ServiceUtils.parseJsonSchemaFile<ChangeConfigurationRequest>(
- '
../../../
assets/json-schemas/ocpp/1.6/ChangeConfiguration.json',
+ 'assets/json-schemas/ocpp/1.6/ChangeConfiguration.json',
moduleName,
'constructor'
),
moduleName,
'constructor'
),
@@
-181,7
+182,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
[
OCPP16IncomingRequestCommand.GET_DIAGNOSTICS,
OCPP16ServiceUtils.parseJsonSchemaFile<GetDiagnosticsRequest>(
[
OCPP16IncomingRequestCommand.GET_DIAGNOSTICS,
OCPP16ServiceUtils.parseJsonSchemaFile<GetDiagnosticsRequest>(
- '
../../../
assets/json-schemas/ocpp/1.6/GetDiagnostics.json',
+ 'assets/json-schemas/ocpp/1.6/GetDiagnostics.json',
moduleName,
'constructor'
),
moduleName,
'constructor'
),
@@
-189,7
+190,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
[
OCPP16IncomingRequestCommand.GET_COMPOSITE_SCHEDULE,
OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16GetCompositeScheduleRequest>(
[
OCPP16IncomingRequestCommand.GET_COMPOSITE_SCHEDULE,
OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16GetCompositeScheduleRequest>(
- '
../../../
assets/json-schemas/ocpp/1.6/GetCompositeSchedule.json',
+ 'assets/json-schemas/ocpp/1.6/GetCompositeSchedule.json',
moduleName,
'constructor'
),
moduleName,
'constructor'
),
@@
-197,7
+198,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
[
OCPP16IncomingRequestCommand.SET_CHARGING_PROFILE,
OCPP16ServiceUtils.parseJsonSchemaFile<SetChargingProfileRequest>(
[
OCPP16IncomingRequestCommand.SET_CHARGING_PROFILE,
OCPP16ServiceUtils.parseJsonSchemaFile<SetChargingProfileRequest>(
- '
../../../
assets/json-schemas/ocpp/1.6/SetChargingProfile.json',
+ 'assets/json-schemas/ocpp/1.6/SetChargingProfile.json',
moduleName,
'constructor'
),
moduleName,
'constructor'
),
@@
-205,7
+206,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
[
OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE,
OCPP16ServiceUtils.parseJsonSchemaFile<ClearChargingProfileRequest>(
[
OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE,
OCPP16ServiceUtils.parseJsonSchemaFile<ClearChargingProfileRequest>(
- '
../../../
assets/json-schemas/ocpp/1.6/ClearChargingProfile.json',
+ 'assets/json-schemas/ocpp/1.6/ClearChargingProfile.json',
moduleName,
'constructor'
),
moduleName,
'constructor'
),
@@
-213,7
+214,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
[
OCPP16IncomingRequestCommand.CHANGE_AVAILABILITY,
OCPP16ServiceUtils.parseJsonSchemaFile<ChangeAvailabilityRequest>(
[
OCPP16IncomingRequestCommand.CHANGE_AVAILABILITY,
OCPP16ServiceUtils.parseJsonSchemaFile<ChangeAvailabilityRequest>(
- '
../../../
assets/json-schemas/ocpp/1.6/ChangeAvailability.json',
+ 'assets/json-schemas/ocpp/1.6/ChangeAvailability.json',
moduleName,
'constructor'
),
moduleName,
'constructor'
),
@@
-221,7
+222,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
[
OCPP16IncomingRequestCommand.REMOTE_START_TRANSACTION,
OCPP16ServiceUtils.parseJsonSchemaFile<RemoteStartTransactionRequest>(
[
OCPP16IncomingRequestCommand.REMOTE_START_TRANSACTION,
OCPP16ServiceUtils.parseJsonSchemaFile<RemoteStartTransactionRequest>(
- '
../../../
assets/json-schemas/ocpp/1.6/RemoteStartTransaction.json',
+ 'assets/json-schemas/ocpp/1.6/RemoteStartTransaction.json',
moduleName,
'constructor'
),
moduleName,
'constructor'
),
@@
-229,7
+230,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
[
OCPP16IncomingRequestCommand.REMOTE_STOP_TRANSACTION,
OCPP16ServiceUtils.parseJsonSchemaFile<RemoteStopTransactionRequest>(
[
OCPP16IncomingRequestCommand.REMOTE_STOP_TRANSACTION,
OCPP16ServiceUtils.parseJsonSchemaFile<RemoteStopTransactionRequest>(
- '
../../../
assets/json-schemas/ocpp/1.6/RemoteStopTransaction.json',
+ 'assets/json-schemas/ocpp/1.6/RemoteStopTransaction.json',
moduleName,
'constructor'
),
moduleName,
'constructor'
),
@@
-237,7
+238,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
[
OCPP16IncomingRequestCommand.TRIGGER_MESSAGE,
OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16TriggerMessageRequest>(
[
OCPP16IncomingRequestCommand.TRIGGER_MESSAGE,
OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16TriggerMessageRequest>(
- '
../../../
assets/json-schemas/ocpp/1.6/TriggerMessage.json',
+ 'assets/json-schemas/ocpp/1.6/TriggerMessage.json',
moduleName,
'constructor'
),
moduleName,
'constructor'
),
@@
-245,7
+246,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
[
OCPP16IncomingRequestCommand.DATA_TRANSFER,
OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16DataTransferRequest>(
[
OCPP16IncomingRequestCommand.DATA_TRANSFER,
OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16DataTransferRequest>(
- '
../../../
assets/json-schemas/ocpp/1.6/DataTransfer.json',
+ 'assets/json-schemas/ocpp/1.6/DataTransfer.json',
moduleName,
'constructor'
),
moduleName,
'constructor'
),
@@
-253,7
+254,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
[
OCPP16IncomingRequestCommand.UPDATE_FIRMWARE,
OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16UpdateFirmwareRequest>(
[
OCPP16IncomingRequestCommand.UPDATE_FIRMWARE,
OCPP16ServiceUtils.parseJsonSchemaFile<OCPP16UpdateFirmwareRequest>(
- '
../../../
assets/json-schemas/ocpp/1.6/UpdateFirmware.json',
+ 'assets/json-schemas/ocpp/1.6/UpdateFirmware.json',
moduleName,
'constructor'
),
moduleName,
'constructor'
),
@@
-1242,7
+1243,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
let ftpClient: Client;
try {
const logFiles = fs
let ftpClient: Client;
try {
const logFiles = fs
- .readdirSync(path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../
../../../
'))
+ .readdirSync(path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../'))
.filter((file) => file.endsWith('.log'))
.map((file) => path.join('./', file));
const diagnosticsArchive = `${chargingStation.stationInfo.chargingStationId}_logs.tar.gz`;
.filter((file) => file.endsWith('.log'))
.map((file) => path.join('./', file));
const diagnosticsArchive = `${chargingStation.stationInfo.chargingStationId}_logs.tar.gz`;
@@
-1280,7
+1281,7
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
});
uploadResponse = await ftpClient.uploadFrom(
path.join(
});
uploadResponse = await ftpClient.uploadFrom(
path.join(
- path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../
../../../
'),
+ path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../'),
diagnosticsArchive
),
`${uri.pathname}${diagnosticsArchive}`
diagnosticsArchive
),
`${uri.pathname}${diagnosticsArchive}`
@@
-1486,13
+1487,9
@@
export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
): OCPP16DataTransferResponse {
try {
if (Object.values(OCPP16DataTransferVendorId).includes(commandPayload.vendorId)) {
): OCPP16DataTransferResponse {
try {
if (Object.values(OCPP16DataTransferVendorId).includes(commandPayload.vendorId)) {
- return {
- status: OCPP16DataTransferStatus.ACCEPTED,
- };
+ return OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_ACCEPTED;
}
}
- return {
- status: OCPP16DataTransferStatus.UNKNOWN_VENDOR_ID,
- };
+ return OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_UNKNOWN_VENDOR_ID;
} catch (error) {
return this.handleIncomingRequestError(
chargingStation,
} catch (error) {
return this.handleIncomingRequestError(
chargingStation,