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
refactor: cleanup method namaspace
[e-mobility-charging-stations-simulator.git]
/
src
/
charging-station
/
ocpp
/
2.0
/
OCPP20RequestService.ts
diff --git
a/src/charging-station/ocpp/2.0/OCPP20RequestService.ts
b/src/charging-station/ocpp/2.0/OCPP20RequestService.ts
index 16eef116a37d5a9af9307db3690abf47623f77fb..e65ff3d41e8ad4caa44ca9dcfadba6f6098f5f56 100644
(file)
--- a/
src/charging-station/ocpp/2.0/OCPP20RequestService.ts
+++ b/
src/charging-station/ocpp/2.0/OCPP20RequestService.ts
@@
-17,8
+17,8
@@
import {
} from '../../../types';
import { Utils } from '../../../utils';
import {
} from '../../../types';
import { Utils } from '../../../utils';
import {
+ OCPP20Constants,
OCPP20ServiceUtils,
OCPP20ServiceUtils,
- OCPPConstants,
OCPPRequestService,
type OCPPResponseService,
} from '../internal';
OCPPRequestService,
type OCPPResponseService,
} from '../internal';
@@
-29,9
+29,9
@@
export class OCPP20RequestService extends OCPPRequestService {
protected jsonSchemas: Map<OCPP20RequestCommand, JSONSchemaType<JsonObject>>;
public constructor(ocppResponseService: OCPPResponseService) {
protected jsonSchemas: Map<OCPP20RequestCommand, JSONSchemaType<JsonObject>>;
public constructor(ocppResponseService: OCPPResponseService) {
- if (new.target?.name === moduleName) {
- throw new TypeError(`Cannot construct ${new.target?.name} instances directly`);
- }
+
//
if (new.target?.name === moduleName) {
+
//
throw new TypeError(`Cannot construct ${new.target?.name} instances directly`);
+
//
}
super(OCPPVersion.VERSION_20, ocppResponseService);
this.jsonSchemas = new Map<OCPP20RequestCommand, JSONSchemaType<JsonObject>>([
[
super(OCPPVersion.VERSION_20, ocppResponseService);
this.jsonSchemas = new Map<OCPP20RequestCommand, JSONSchemaType<JsonObject>>([
[
@@
-59,7
+59,11
@@
export class OCPP20RequestService extends OCPPRequestService {
),
],
]);
),
],
]);
- this.buildRequestPayload.bind(this);
+ this.buildRequestPayload = this.buildRequestPayload.bind(this) as <Request extends JsonType>(
+ chargingStation: ChargingStation,
+ commandName: OCPP20RequestCommand,
+ commandParams?: JsonType
+ ) => Request;
}
public async requestHandler<RequestType extends JsonType, ResponseType extends JsonType>(
}
public async requestHandler<RequestType extends JsonType, ResponseType extends JsonType>(
@@
-68,6
+72,7
@@
export class OCPP20RequestService extends OCPPRequestService {
commandParams?: JsonType,
params?: RequestParams
): Promise<ResponseType> {
commandParams?: JsonType,
params?: RequestParams
): Promise<ResponseType> {
+ // FIXME?: add sanity checks on charging station availability, connector availability, connector status, etc.
if (OCPP20ServiceUtils.isRequestCommandSupported(chargingStation, commandName) === true) {
return (await this.sendMessage(
chargingStation,
if (OCPP20ServiceUtils.isRequestCommandSupported(chargingStation, commandName) === true) {
return (await this.sendMessage(
chargingStation,
@@
-75,7
+80,7
@@
export class OCPP20RequestService extends OCPPRequestService {
this.buildRequestPayload<RequestType>(chargingStation, commandName, commandParams),
commandName,
params
this.buildRequestPayload<RequestType>(chargingStation, commandName, commandParams),
commandName,
params
- )) as
unknown as
ResponseType;
+ )) as ResponseType;
}
// OCPPError usage here is debatable: it's an error in the OCPP stack but not targeted to sendError().
throw new OCPPError(
}
// OCPPError usage here is debatable: it's an error in the OCPP stack but not targeted to sendError().
throw new OCPPError(
@@
-96,7
+101,7
@@
export class OCPP20RequestService extends OCPPRequestService {
case OCPP20RequestCommand.BOOT_NOTIFICATION:
return commandParams as unknown as Request;
case OCPP20RequestCommand.HEARTBEAT:
case OCPP20RequestCommand.BOOT_NOTIFICATION:
return commandParams as unknown as Request;
case OCPP20RequestCommand.HEARTBEAT:
- return OCPPConstants.OCPP_RESPONSE_EMPTY as unknown as Request;
+ return OCPP
20
Constants.OCPP_RESPONSE_EMPTY as unknown as Request;
case OCPP20RequestCommand.STATUS_NOTIFICATION:
return {
timestamp: new Date(),
case OCPP20RequestCommand.STATUS_NOTIFICATION:
return {
timestamp: new Date(),