Merge pull request #2 from shiv3/fix/connector

fix
shiv3 · Jul 7, 2024 · 500a8b7 · 500a8b7
2 parents 54af9ab + 0d50f68
commit 500a8b7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/components/ChargePoint.tsx b/src/components/ChargePoint.tsx
@@ -31,7 +31,6 @@ const ChargePoint: React.FC = () => {
 
   const statusChangeCb = (s: string, msg?: string) => {
     setCpStatus(s);
-    if (msg) logMsg(msg);
   };
 
   const logMsg = (msg: string) => {

diff --git a/src/components/Logger.tsx b/src/components/Logger.tsx
@@ -9,7 +9,6 @@ const Logger: React.FC = () => {
     const oldConsoleLog = console.log;
     console.log = (message: string) => {
       setLogs((prevLogs) => [...prevLogs, message]);
-      oldConsoleLog.apply(console, [message]);
     };
 
     return () => {

diff --git a/src/cp/ChargePoint.ts b/src/cp/ChargePoint.ts
@@ -13,7 +13,7 @@ export class ChargePoint {
   private _logger: Logger;
 
   private _status: OCPPStatus = OCPPStatus.Unavailable;
-  private _error:string = "";
+  private _error: string = "";
 
   private _heartbeat: number | null = null;
   private _statusChangeCallback: ((status: string, message?: string) => void) | null = null;
@@ -48,7 +48,7 @@ export class ChargePoint {
     this._logger.loggingCallback = callback;
   }
 
-  setConnectorTransactionIDChangeCallback(connectorId: number, callback: (transactionId: number|null) => void): void {
+  setConnectorTransactionIDChangeCallback(connectorId: number, callback: (transactionId: number | null) => void): void {
     this.connectors.get(connectorId)?.setTransactionIDChangeCallbacks(callback);
   }
 
@@ -67,15 +67,16 @@ export class ChargePoint {
         this.updateStatus(OCPPStatus.Available);
         this.updateAllConnectorsStatus(OCPPStatus.Available);
       },
-      (msg: MessageEvent,ev: CloseEvent) => {
-        this._logger.error(`WebSocket closed code: ${ev.code} reason: ${ev.reason}`);
+      (msg: MessageEvent, ev: CloseEvent) => {
         this.updateStatus(OCPPStatus.Unavailable);
         this.updateAllConnectorsStatus(OCPPStatus.Unavailable);
+        this._logger.error(`WebSocket closed code: ${msg.code} reason: ${ev.reason}`);
       }
     );
   }
 
   public disconnect(): void {
+    this._logger.info("Disconnecting from WebSocket");
     this._webSocket.disconnect();
   }
 
@@ -91,7 +92,7 @@ export class ChargePoint {
   public startTransaction(tagId: string, connectorId: number): void {
     const connector = this.getConnector(connectorId);
     if (connector) {
-      const transaction :Transaction= {
+      const transaction: Transaction = {
         id: 0,
         connectorId: connectorId,
         tagId: tagId,
@@ -107,7 +108,7 @@ export class ChargePoint {
     }
   }
 
-  public stopTransaction(tagId: number,connectorId: number): void {
+  public stopTransaction(tagId: number, connectorId: number): void {
     const connector = this.getConnector(connectorId);
     if (connector) {
       connector.transaction.stopTime = new Date();

diff --git a/src/cp/OCPPWebSocket.ts b/src/cp/OCPPWebSocket.ts
@@ -80,7 +80,7 @@ export class OCPPWebSocket {
   }
 
   private handleMessage(data: WebSocket.Data): void {
-    this._logger.log(`Received: ${data}`);
+    this._logger.log(`Received: ${JSON.stringify(data)}`);
     try {
       const messageArray = JSON.parse(data.data.toString());
       const len = messageArray.length