refactor: minor refactor

Author: ZanzyTHEbar

GUI/ETVR/src/components/WebSocket/index.tsx GUI/ETVR/src/components/WebSocket/index.ts

@@ -2,11 +2,15 @@ import { createMemo } from 'solid-js'
 import { restState, endpointsMap } from './restAPI'
 import { rtcState } from './websocket'
 
+/********************************* rest *************************************/
+
 export const restStatus = createMemo(() => restState().status)
 export const restDevice = createMemo(() => restState().device)
 export const restResponse = createMemo(() => restState().response)
 export const endpoints = createMemo(() => endpointsMap)
 
+/********************************* websockets *************************************/
+
 /**
  * @description
  * @returns {RTCState}
@@ -17,9 +21,7 @@ export const endpoints = createMemo(() => endpointsMap)
  * }
  */
 export const rtcStatus = createMemo(() => rtcState().status)
-
 export const rtcMessageType = createMemo(() => rtcState().messageType)
-
 /**
  * @description get the current websocket instance
  * @returns {WebSocket} the current websocket instance
@@ -28,7 +30,7 @@ export const rtcMessageType = createMemo(() => rtcState().messageType)
  * ws.send(JSON.stringify({ msg: 'hello' }))
  *
  * Note: must use a try catch block to catch any errors that may occur do to possible null values
- * 
+ *
  * try {
  *   const ws = rtcWebSocket()
  *   ws.send(JSON.stringify({ msg: 'hello' }))
@@ -37,7 +39,6 @@ export const rtcMessageType = createMemo(() => rtcState().messageType)
  * }
  */
 export const rtcWebSocket = createMemo(() => rtcState().ws)
-
 export const rtcConnectedPeers = createMemo(() => rtcState().connectedPeers)
 export const rtcConnectInterval = createMemo(() => rtcState().connectInterval)
 export const rtcTimeout = createMemo(() => rtcState().timeout)

GUI/ETVR/src/store/api/selectors.ts

@@ -47,7 +47,7 @@ const initWebSocket = () => {
     //* TODO: Add notification to the user
     rtcWebSocket().onerror = (e) => {
         setRTCStatus(RTCState.ERROR)
-        console.error('Socket encountered error: ', e, 'Closing socket')
+        console.error('[WebSocket Client]: Socket encountered error: ', e, 'Closing socket')
         rtcWebSocket().close()
     }
     //* TODO: Add notification to the user
@@ -57,7 +57,7 @@ const initWebSocket = () => {
         //call check function after timeout
         setConnectInterval(setTimeout(check, Math.min(10000, rtcTimeout() as number)))
         console.log(
-            `Socket is closed. Reconnect will be attempted in ${Math.min(
+            `[WebSocket Client]: Socket is closed. Reconnect will be attempted in ${Math.min(
                 10000 / 1000,
                 ((rtcTimeout() as number) + (rtcTimeout() as number)) / 1000,
             )} second.`,