diff --git a/src/interfaces/extendedWebsocket.ts b/src/interfaces/extendedWebsocket.ts index 259c69d..f653644 100644 --- a/src/interfaces/extendedWebsocket.ts +++ b/src/interfaces/extendedWebsocket.ts @@ -6,5 +6,4 @@ export interface ExtendedWebSocket extends WebSocket { payload: DecodedToken; isAlive: boolean; user: IUser; - asyncUpdates: Map } diff --git a/src/services/spotifyApiService.ts b/src/services/spotifyApiService.ts index b756847..08076a9 100644 --- a/src/services/spotifyApiService.ts +++ b/src/services/spotifyApiService.ts @@ -1,4 +1,4 @@ -import axios, { AxiosError } from "axios"; +import axios from "axios"; import {CurrentlyPlaying} from "../interfaces/CurrentlyPlaying"; export class SpotifyApiService { diff --git a/src/utils/websocket/websocketEventHandler.ts b/src/utils/websocket/websocketEventHandler.ts index 588115d..dc3f040 100644 --- a/src/utils/websocket/websocketEventHandler.ts +++ b/src/utils/websocket/websocketEventHandler.ts @@ -24,10 +24,7 @@ export class WebsocketEventHandler { this.webSocket.onclose = (event) => { console.log("WebSocket closed:", event.code, event.reason, event.wasClean, event.type); console.log(`User: ${this.webSocket.payload.username} disconnected`); - for (const [key, value] of this.webSocket.asyncUpdates) { - console.log("Stopping Update:", key); - clearInterval(value); - } + callback(); }; } diff --git a/src/utils/websocket/websocketServerEventHandler.ts b/src/utils/websocket/websocketServerEventHandler.ts index 2bd5643..fe56cdc 100644 --- a/src/utils/websocket/websocketServerEventHandler.ts +++ b/src/utils/websocket/websocketServerEventHandler.ts @@ -29,7 +29,6 @@ export class WebsocketServerEventHandler { // second: set the isAlive flag to true ws.isAlive = true; - ws.asyncUpdates = new Map(); // last: call the callback function callback(ws, request); diff --git a/tests/utils/websocket/websocketEventHandler.test.ts b/tests/utils/websocket/websocketEventHandler.test.ts index ac64289..d623b35 100644 --- a/tests/utils/websocket/websocketEventHandler.test.ts +++ b/tests/utils/websocket/websocketEventHandler.test.ts @@ -77,7 +77,6 @@ describe("WebsocketEventHandler", () => { it("should handle disconnect with no async updates", () => { const mockCallback = vi.fn(); - mockWebSocket.asyncUpdates = new Map(); const clearIntervalSpy = vi.spyOn(global, "clearInterval"); websocketEventHandler.enableDisconnectEvent(mockCallback);