refactor: revert internal exports

[e-mobility-charging-stations-simulator.git] / src / charging-station / ui-server / UIWebSocketServer.ts

diff --git a/src/charging-station/ui-server/UIWebSocketServer.ts b/src/charging-station/ui-server/UIWebSocketServer.ts
index d5e6ff808afbee13a4f3eee9c35a433203c8247a..cc00db13f233af42975062331f054992135ce510 100644 (file)
--- a/src/charging-station/ui-server/UIWebSocketServer.ts
+++ b/src/charging-station/ui-server/UIWebSocketServer.ts
@@ -1,9 +1,10 @@
-import type { IncomingMessage } from 'http';
-import type internal from 'stream';
+import type { IncomingMessage } from 'node:http';
+import type { Duplex } from 'node:stream';
 
 import { StatusCodes } from 'http-status-codes';
 import WebSocket, { type RawData, WebSocketServer } from 'ws';
 
+import { AbstractUIServer } from './AbstractUIServer';
 import { UIServerUtils } from './UIServerUtils';
 import {
   type ProtocolRequest,
@@ -11,9 +12,7 @@ import {
   type UIServerConfiguration,
   WebSocketCloseEventStatusCode,
 } from '../../types';
-import { logger } from '../../utils/Logger';
-import { Utils } from '../../utils/Utils';
-import { AbstractUIServer } from '../internal';
+import { Constants, Utils, logger } from '../../utils';
 
 const moduleName = 'UIWebSocketServer';
 
@@ -50,12 +49,7 @@ export class UIWebSocketServer extends AbstractUIServer {
         }
         const [requestId] = request as ProtocolRequest;
         this.responseHandlers.set(requestId, ws);
-        this.uiServices
-          .get(version)
-          ?.requestHandler(request)
-          .catch(() => {
-            /* Error caught by AbstractUIService */
-          });
+        this.uiServices.get(version)?.requestHandler(request).catch(Constants.EMPTY_FUNCTION);
       });
       ws.on('error', (error) => {
         logger.error(`${this.logPrefix(moduleName, 'start.ws.onerror')} WebSocket error:`, error);
@@ -72,37 +66,34 @@ export class UIWebSocketServer extends AbstractUIServer {
       });
     });
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    this.httpServer.on('connect', (req: IncomingMessage, socket: internal.Duplex, head: Buffer) => {
+    this.httpServer.on('connect', (req: IncomingMessage, socket: Duplex, head: Buffer) => {
       if (req.headers?.connection !== 'Upgrade' || req.headers?.upgrade !== 'websocket') {
         socket.write(`HTTP/1.1 ${StatusCodes.BAD_REQUEST} Bad Request\r\n\r\n`);
         socket.destroy();
       }
     });
-    this.httpServer.on(
-      'upgrade',
-      (req: IncomingMessage, socket: internal.Duplex, head: Buffer): void => {
-        this.authenticate(req, (err) => {
-          if (err) {
-            socket.write(`HTTP/1.1 ${StatusCodes.UNAUTHORIZED} Unauthorized\r\n\r\n`);
-            socket.destroy();
-            return;
-          }
-          try {
-            this.webSocketServer.handleUpgrade(req, socket, head, (ws: WebSocket) => {
-              this.webSocketServer.emit('connection', ws, req);
-            });
-          } catch (error) {
-            logger.error(
-              `${this.logPrefix(
-                moduleName,
-                'start.httpServer.on.upgrade'
-              )} Error at handling connection upgrade:`,
-              error
-            );
-          }
-        });
-      }
-    );
+    this.httpServer.on('upgrade', (req: IncomingMessage, socket: Duplex, head: Buffer): void => {
+      this.authenticate(req, (err) => {
+        if (err) {
+          socket.write(`HTTP/1.1 ${StatusCodes.UNAUTHORIZED} Unauthorized\r\n\r\n`);
+          socket.destroy();
+          return;
+        }
+        try {
+          this.webSocketServer.handleUpgrade(req, socket, head, (ws: WebSocket) => {
+            this.webSocketServer.emit('connection', ws, req);
+          });
+        } catch (error) {
+          logger.error(
+            `${this.logPrefix(
+              moduleName,
+              'start.httpServer.on.upgrade'
+            )} Error at handling connection upgrade:`,
+            error
+          );
+        }
+      });
+    });
     this.startHttpServer();
   }