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
Merge branch 'main' into reservation-feature
[e-mobility-charging-stations-simulator.git]
/
src
/
charging-station
/
ocpp
/
OCPPRequestService.ts
diff --git
a/src/charging-station/ocpp/OCPPRequestService.ts
b/src/charging-station/ocpp/OCPPRequestService.ts
index 06258fe4a1e071f7f1581420116329a80906dcd7..a3b78ca63ec8e40d44a07c7a12f9689ed38eee63 100644
(file)
--- a/
src/charging-station/ocpp/OCPPRequestService.ts
+++ b/
src/charging-station/ocpp/OCPPRequestService.ts
@@
-23,10
+23,16
@@
import {
type ResponseCallback,
type ResponseType,
} from '../../types';
type ResponseCallback,
type ResponseType,
} from '../../types';
-import { Constants,
ErrorUtils, Utils
, logger } from '../../utils';
+import { Constants,
Utils, handleSendMessageError
, logger } from '../../utils';
const moduleName = 'OCPPRequestService';
const moduleName = 'OCPPRequestService';
+const defaultRequestParams: RequestParams = {
+ skipBufferingOnError: false,
+ triggerMessage: false,
+ throwError: false,
+};
+
export abstract class OCPPRequestService {
private static instance: OCPPRequestService | null = null;
private readonly version: OCPPVersion;
export abstract class OCPPRequestService {
private static instance: OCPPRequestService | null = null;
private readonly version: OCPPVersion;
@@
-127,7
+133,7
@@
export abstract class OCPPRequestService {
commandName
);
} catch (error) {
commandName
);
} catch (error) {
-
ErrorUtils.
handleSendMessageError(chargingStation, commandName, error as Error, {
+ handleSendMessageError(chargingStation, commandName, error as Error, {
throwError: true,
});
}
throwError: true,
});
}
@@
-149,7
+155,7
@@
export abstract class OCPPRequestService {
commandName
);
} catch (error) {
commandName
);
} catch (error) {
-
ErrorUtils.
handleSendMessageError(chargingStation, commandName, error as Error);
+ handleSendMessageError(chargingStation, commandName, error as Error);
}
}
}
}
@@
-158,12
+164,12
@@
export abstract class OCPPRequestService {
messageId: string,
messagePayload: JsonType,
commandName: RequestCommand,
messageId: string,
messagePayload: JsonType,
commandName: RequestCommand,
- params: RequestParams = {
- skipBufferingOnError: false,
- triggerMessage: false,
- throwError: false,
- }
+ params: RequestParams = defaultRequestParams
): Promise<ResponseType> {
): Promise<ResponseType> {
+ params = {
+ ...defaultRequestParams,
+ ...params,
+ };
try {
return await this.internalSendMessage(
chargingStation,
try {
return await this.internalSendMessage(
chargingStation,
@@
-174,7
+180,7
@@
export abstract class OCPPRequestService {
params
);
} catch (error) {
params
);
} catch (error) {
-
ErrorUtils.
handleSendMessageError(chargingStation, commandName, error as Error, {
+ handleSendMessageError(chargingStation, commandName, error as Error, {
throwError: params.throwError,
});
}
throwError: params.throwError,
});
}
@@
-260,11
+266,12
@@
export abstract class OCPPRequestService {
messagePayload: JsonType | OCPPError,
messageType: MessageType,
commandName: RequestCommand | IncomingRequestCommand,
messagePayload: JsonType | OCPPError,
messageType: MessageType,
commandName: RequestCommand | IncomingRequestCommand,
- params: RequestParams = {
- skipBufferingOnError: false,
- triggerMessage: false,
- }
+ params: RequestParams = defaultRequestParams
): Promise<ResponseType> {
): Promise<ResponseType> {
+ params = {
+ ...defaultRequestParams,
+ ...params,
+ };
if (
(chargingStation.inUnknownState() === true &&
commandName === RequestCommand.BOOT_NOTIFICATION) ||
if (
(chargingStation.inUnknownState() === true &&
commandName === RequestCommand.BOOT_NOTIFICATION) ||