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 build failure
[e-mobility-charging-stations-simulator.git]
/
src
/
charging-station
/
ocpp
/
OCPPIncomingRequestService.ts
diff --git
a/src/charging-station/ocpp/OCPPIncomingRequestService.ts
b/src/charging-station/ocpp/OCPPIncomingRequestService.ts
index 3fc960a9bef4dc27ebee284491b90e40110c8ff6..5fadfb95d5ee5227327fe8fc0304a1aee2998f9b 100644
(file)
--- a/
src/charging-station/ocpp/OCPPIncomingRequestService.ts
+++ b/
src/charging-station/ocpp/OCPPIncomingRequestService.ts
@@
-1,4
+1,5
@@
import type ChargingStation from '../ChargingStation';
import type ChargingStation from '../ChargingStation';
+import { HandleErrorParams } from '../../types/Error';
import { IncomingRequestCommand } from '../../types/ocpp/Requests';
import { JsonType } from '../../types/JsonType';
import logger from '../../utils/Logger';
import { IncomingRequestCommand } from '../../types/ocpp/Requests';
import { JsonType } from '../../types/JsonType';
import logger from '../../utils/Logger';
@@
-18,12
+19,17
@@
export default abstract class OCPPIncomingRequestService {
return OCPPIncomingRequestService.instances.get(chargingStation.id) as T;
}
return OCPPIncomingRequestService.instances.get(chargingStation.id) as T;
}
- protected handleIncomingRequestError<T>(commandName: IncomingRequestCommand, error: Error,
errorOcppResponse?: T
): T {
+ protected handleIncomingRequestError<T>(commandName: IncomingRequestCommand, error: Error,
params: HandleErrorParams<T> = { throwError: true }
): T {
logger.error(this.chargingStation.logPrefix() + ' Incoming request command %s error: %j', commandName, error);
logger.error(this.chargingStation.logPrefix() + ' Incoming request command %s error: %j', commandName, error);
- if (errorOcppResponse) {
- return errorOcppResponse;
+ if (!params?.throwError && params?.errorResponse) {
+ return params?.errorResponse;
+ }
+ if (params?.throwError && !params?.errorResponse) {
+ throw error;
+ }
+ if (params?.throwError && params?.errorResponse) {
+ return params?.errorResponse;
}
}
- throw error;
}
public abstract handleRequest(messageId: string, commandName: IncomingRequestCommand, commandPayload: JsonType): Promise<void>;
}
public abstract handleRequest(messageId: string, commandName: IncomingRequestCommand, commandPayload: JsonType): Promise<void>;