From: Jérôme Benoit Date: Tue, 30 Jan 2024 16:19:53 +0000 (+0100) Subject: perf: 'await' on OCPP request handlers only when necessary X-Git-Tag: v1.2.34~19 X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=bcf95df12dfe4236db8c278eabea9f5058f40933;p=e-mobility-charging-stations-simulator.git perf: 'await' on OCPP request handlers only when necessary Signed-off-by: Jérôme Benoit --- diff --git a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts index 6ed7115c..c8bc557c 100644 --- a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts +++ b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts @@ -103,6 +103,7 @@ import { convertToInt, formatDurationMilliSeconds, getRandomInteger, + isAsyncFunction, isEmptyArray, isNotEmptyArray, isNotEmptyString, @@ -624,10 +625,12 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService { this.validatePayload(chargingStation, commandName, commandPayload) // Call the method to build the response // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - response = (await this.incomingRequestHandlers.get(commandName)!( - chargingStation, - commandPayload - )) as ResType + const incomingRequestHandler = this.incomingRequestHandlers.get(commandName)! + if (isAsyncFunction(incomingRequestHandler)) { + response = (await incomingRequestHandler(chargingStation, commandPayload)) as ResType + } else { + response = incomingRequestHandler(chargingStation, commandPayload) as ResType + } } catch (error) { // Log logger.error( diff --git a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts index 11be8493..be35a592 100644 --- a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts +++ b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts @@ -51,7 +51,7 @@ import { type SetChargingProfileResponse, type UnlockConnectorResponse } from '../../../types/index.js' -import { Constants, convertToInt, logger } from '../../../utils/index.js' +import { Constants, convertToInt, isAsyncFunction, logger } from '../../../utils/index.js' import { OCPPResponseService } from '../OCPPResponseService.js' const moduleName = 'OCPP16ResponseService' @@ -445,7 +445,18 @@ export class OCPP16ResponseService extends OCPPResponseService { try { this.validatePayload(chargingStation, commandName, payload) // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - await this.responseHandlers.get(commandName)!(chargingStation, payload, requestPayload) + const responseHandler = this.responseHandlers.get(commandName)! + if (isAsyncFunction(responseHandler)) { + await responseHandler(chargingStation, payload, requestPayload) + } else { + ( + responseHandler as ( + chargingStation: ChargingStation, + payload: JsonType, + requestPayload?: JsonType + ) => void + )(chargingStation, payload, requestPayload) + } } catch (error) { logger.error( `${chargingStation.logPrefix()} ${moduleName}.responseHandler: Handle response error:`, diff --git a/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts b/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts index 67f3a61b..5f6a029d 100644 --- a/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts +++ b/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts @@ -13,7 +13,7 @@ import { OCPP20IncomingRequestCommand, OCPPVersion } from '../../../types/index.js' -import { logger } from '../../../utils/index.js' +import { isAsyncFunction, logger } from '../../../utils/index.js' import { OCPPIncomingRequestService } from '../OCPPIncomingRequestService.js' const moduleName = 'OCPP20IncomingRequestService' @@ -91,10 +91,12 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService { this.validatePayload(chargingStation, commandName, commandPayload) // Call the method to build the response // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - response = (await this.incomingRequestHandlers.get(commandName)!( - chargingStation, - commandPayload - )) as ResType + const incomingRequestHandler = this.incomingRequestHandlers.get(commandName)! + if (isAsyncFunction(incomingRequestHandler)) { + response = (await incomingRequestHandler(chargingStation, commandPayload)) as ResType + } else { + response = incomingRequestHandler(chargingStation, commandPayload) as ResType + } } catch (error) { // Log logger.error( diff --git a/src/charging-station/ocpp/2.0/OCPP20ResponseService.ts b/src/charging-station/ocpp/2.0/OCPP20ResponseService.ts index bb12b006..d468260b 100644 --- a/src/charging-station/ocpp/2.0/OCPP20ResponseService.ts +++ b/src/charging-station/ocpp/2.0/OCPP20ResponseService.ts @@ -19,7 +19,7 @@ import { RegistrationStatusEnumType, type ResponseHandler } from '../../../types/index.js' -import { logger } from '../../../utils/index.js' +import { isAsyncFunction, logger } from '../../../utils/index.js' import { OCPPResponseService } from '../OCPPResponseService.js' const moduleName = 'OCPP20ResponseService' @@ -118,7 +118,18 @@ export class OCPP20ResponseService extends OCPPResponseService { try { this.validatePayload(chargingStation, commandName, payload) // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - await this.responseHandlers.get(commandName)!(chargingStation, payload, requestPayload) + const responseHandler = this.responseHandlers.get(commandName)! + if (isAsyncFunction(responseHandler)) { + await responseHandler(chargingStation, payload, requestPayload) + } else { + ( + responseHandler as ( + chargingStation: ChargingStation, + payload: JsonType, + requestPayload?: JsonType + ) => void + )(chargingStation, payload, requestPayload) + } } catch (error) { logger.error( `${chargingStation.logPrefix()} ${moduleName}.responseHandler: Handle response error:`, diff --git a/tests/utils/Utils.test.ts b/tests/utils/Utils.test.ts index bef31dd9..6db4e364 100644 --- a/tests/utils/Utils.test.ts +++ b/tests/utils/Utils.test.ts @@ -18,6 +18,7 @@ import { getRandomInteger, hasOwnProp, isArraySorted, + isAsyncFunction, isEmptyArray, isEmptyObject, isEmptyString, @@ -248,6 +249,82 @@ await describe('Utils test suite', async () => { expect(isObject(new WeakSet())).toBe(true) }) + await it('Verify isAsyncFunction()', () => { + expect(isAsyncFunction(null)).toBe(false) + expect(isAsyncFunction(undefined)).toBe(false) + expect(isAsyncFunction(true)).toBe(false) + expect(isAsyncFunction(false)).toBe(false) + expect(isAsyncFunction(0)).toBe(false) + expect(isAsyncFunction('')).toBe(false) + expect(isAsyncFunction([])).toBe(false) + expect(isAsyncFunction(new Date())).toBe(false) + // eslint-disable-next-line prefer-regex-literals + expect(isAsyncFunction(new RegExp('[a-z]', 'i'))).toBe(false) + expect(isAsyncFunction(new Error())).toBe(false) + expect(isAsyncFunction(new Map())).toBe(false) + expect(isAsyncFunction(new Set())).toBe(false) + expect(isAsyncFunction(new WeakMap())).toBe(false) + expect(isAsyncFunction(new WeakSet())).toBe(false) + expect(isAsyncFunction(new Int8Array())).toBe(false) + expect(isAsyncFunction(new Uint8Array())).toBe(false) + expect(isAsyncFunction(new Uint8ClampedArray())).toBe(false) + expect(isAsyncFunction(new Int16Array())).toBe(false) + expect(isAsyncFunction(new Uint16Array())).toBe(false) + expect(isAsyncFunction(new Int32Array())).toBe(false) + expect(isAsyncFunction(new Uint32Array())).toBe(false) + expect(isAsyncFunction(new Float32Array())).toBe(false) + expect(isAsyncFunction(new Float64Array())).toBe(false) + expect(isAsyncFunction(new BigInt64Array())).toBe(false) + expect(isAsyncFunction(new BigUint64Array())).toBe(false) + // eslint-disable-next-line @typescript-eslint/no-empty-function + expect(isAsyncFunction(new Promise(() => {}))).toBe(false) + expect(isAsyncFunction(new WeakRef({}))).toBe(false) + // eslint-disable-next-line @typescript-eslint/no-empty-function + expect(isAsyncFunction(new FinalizationRegistry(() => {}))).toBe(false) + expect(isAsyncFunction(new ArrayBuffer(16))).toBe(false) + expect(isAsyncFunction(new SharedArrayBuffer(16))).toBe(false) + expect(isAsyncFunction(new DataView(new ArrayBuffer(16)))).toBe(false) + expect(isAsyncFunction({})).toBe(false) + expect(isAsyncFunction({ a: 1 })).toBe(false) + // eslint-disable-next-line @typescript-eslint/no-empty-function + expect(isAsyncFunction(() => {})).toBe(false) + // eslint-disable-next-line @typescript-eslint/no-empty-function + expect(isAsyncFunction(function () {})).toBe(false) + // eslint-disable-next-line @typescript-eslint/no-empty-function + expect(isAsyncFunction(function named () {})).toBe(false) + // eslint-disable-next-line @typescript-eslint/no-empty-function + expect(isAsyncFunction(async () => {})).toBe(true) + // eslint-disable-next-line @typescript-eslint/no-empty-function + expect(isAsyncFunction(async function () {})).toBe(true) + // eslint-disable-next-line @typescript-eslint/no-empty-function + expect(isAsyncFunction(async function named () {})).toBe(true) + class TestClass { + // eslint-disable-next-line @typescript-eslint/no-empty-function + public testSync (): void {} + // eslint-disable-next-line @typescript-eslint/no-empty-function + public async testAsync (): Promise {} + // eslint-disable-next-line @typescript-eslint/no-empty-function + public testArrowSync = (): void => {} + // eslint-disable-next-line @typescript-eslint/no-empty-function + public testArrowAsync = async (): Promise => {} + // eslint-disable-next-line @typescript-eslint/no-empty-function + public static testStaticSync (): void {} + // eslint-disable-next-line @typescript-eslint/no-empty-function + public static async testStaticAsync (): Promise {} + } + const testClass = new TestClass() + // eslint-disable-next-line @typescript-eslint/unbound-method + expect(isAsyncFunction(testClass.testSync)).toBe(false) + // eslint-disable-next-line @typescript-eslint/unbound-method + expect(isAsyncFunction(testClass.testAsync)).toBe(true) + expect(isAsyncFunction(testClass.testArrowSync)).toBe(false) + expect(isAsyncFunction(testClass.testArrowAsync)).toBe(true) + // eslint-disable-next-line @typescript-eslint/unbound-method + expect(isAsyncFunction(TestClass.testStaticSync)).toBe(false) + // eslint-disable-next-line @typescript-eslint/unbound-method + expect(isAsyncFunction(TestClass.testStaticAsync)).toBe(true) + }) + await it('Verify clone()', () => { const obj = { 1: 1 } expect(clone(obj)).toStrictEqual(obj)