X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcharging-station%2Fui-server%2FUIHttpServer.ts;h=ee12b3f4de996ed3a8f86b2a4db97949e9ebaf4e;hb=4a3807d16c54137840a60af41877f3b21de12950;hp=159559df1f4cacb6eebaa1f67b8e6cca66ac030a;hpb=d58b442097da31f8b974d51aef63c64470d9ab48;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ui-server/UIHttpServer.ts b/src/charging-station/ui-server/UIHttpServer.ts index 159559df..ee12b3f4 100644 --- a/src/charging-station/ui-server/UIHttpServer.ts +++ b/src/charging-station/ui-server/UIHttpServer.ts @@ -15,7 +15,14 @@ import { ResponseStatus, type UIServerConfiguration, } from '../../types'; -import { Constants, Utils, logger } from '../../utils'; +import { + Constants, + generateUUID, + isNotEmptyString, + isNullOrUndefined, + logPrefix, + logger, +} from '../../utils'; const moduleName = 'UIHttpServer'; @@ -53,13 +60,13 @@ export class UIHttpServer extends AbstractUIServer { .end(JSON.stringify(payload)); } else { logger.error( - `${this.logPrefix(moduleName, 'sendResponse')} Response for unknown request id: ${uuid}` + `${this.logPrefix(moduleName, 'sendResponse')} Response for unknown request id: ${uuid}`, ); } } catch (error) { logger.error( `${this.logPrefix(moduleName, 'sendResponse')} Error at sending response id '${uuid}':`, - error + error, ); } finally { this.responseHandlers.delete(uuid); @@ -69,10 +76,10 @@ export class UIHttpServer extends AbstractUIServer { public logPrefix = (modName?: string, methodName?: string, prefixSuffix?: string): string => { const logMsgPrefix = prefixSuffix ? `UI HTTP Server ${prefixSuffix}` : 'UI HTTP Server'; const logMsg = - Utils.isNotEmptyString(modName) && Utils.isNotEmptyString(methodName) + isNotEmptyString(modName) && isNotEmptyString(methodName) ? ` ${logMsgPrefix} | ${modName}.${methodName}:` : ` ${logMsgPrefix} |`; - return Utils.logPrefix(logMsg); + return logPrefix(logMsg); }; private requestListener(req: IncomingMessage, res: ServerResponse): void { @@ -92,9 +99,9 @@ export class UIHttpServer extends AbstractUIServer { const [protocol, version, procedureName] = req.url?.split('/').slice(1) as [ Protocol, ProtocolVersion, - ProcedureName + ProcedureName, ]; - const uuid = Utils.generateUUID(); + const uuid = generateUUID(); this.responseHandlers.set(uuid, res); try { const fullProtocol = `${protocol}${version}`; @@ -105,13 +112,13 @@ export class UIHttpServer extends AbstractUIServer { req.on('error', (error) => { logger.error( `${this.logPrefix(moduleName, 'requestListener.req.onerror')} Error on HTTP request:`, - error + error, ); }); if (req.method === HttpMethods.POST) { - const bodyBuffer = []; + const bodyBuffer: Uint8Array[] = []; req - .on('data', (chunk) => { + .on('data', (chunk: Uint8Array) => { bodyBuffer.push(chunk); }) .on('end', () => { @@ -122,12 +129,12 @@ export class UIHttpServer extends AbstractUIServer { this.buildProtocolRequest( uuid, procedureName, - body ?? Constants.EMPTY_FREEZED_OBJECT - ) + body ?? Constants.EMPTY_FREEZED_OBJECT, + ), ) - .then((protocolResponse: ProtocolResponse) => { - if (!Utils.isNullOrUndefined(protocolResponse)) { - this.sendResponse(protocolResponse); + .then((protocolResponse?: ProtocolResponse) => { + if (!isNullOrUndefined(protocolResponse)) { + this.sendResponse(protocolResponse!); } }) .catch(Constants.EMPTY_FUNCTION); @@ -138,7 +145,7 @@ export class UIHttpServer extends AbstractUIServer { } catch (error) { logger.error( `${this.logPrefix(moduleName, 'requestListener')} Handle HTTP request error:`, - error + error, ); this.sendResponse(this.buildProtocolResponse(uuid, { status: ResponseStatus.FAILURE })); }