fix: Websockets are now properly removed on dispose

src/NovaClient.ts

@@ -130,9 +130,13 @@ export class NovaClient {
         this.makeWebsocketURL(path),
         {
           mock: this.mock,
+          onDispose: () => {
+            delete this.websocketsByPath[path]
+          },
         },
       )
       this.websocketsByPath[path] = newWebsocket
+
       return newWebsocket
     }
   }

src/lib/AutoReconnectingWebsocket.ts

@@ -1,5 +1,6 @@
 import ReconnectingWebSocket, { type ErrorEvent } from "reconnecting-websocket"
 import type { MockNovaInstance } from "../mock/MockNovaInstance"
+import type { WebSocketEventListenerMap } from "reconnecting-websocket/dist/events"
 
 export class AutoReconnectingWebsocket extends ReconnectingWebSocket {
   receivedFirstMessage?: MessageEvent
@@ -8,7 +9,10 @@ export class AutoReconnectingWebsocket extends ReconnectingWebSocket {
 
   constructor(
     targetUrl: string,
-    readonly opts: { mock?: MockNovaInstance } = {},
+    readonly opts: {
+      mock?: MockNovaInstance
+      onDispose?: () => void
+    } = {},
   ) {
     console.log("Opening websocket to", targetUrl)
 
@@ -72,7 +76,9 @@ export class AutoReconnectingWebsocket extends ReconnectingWebSocket {
   dispose() {
     this.close()
     this.disposed = true
-    this.dispatchEvent(new Event("dispose"))
+    if (this.opts.onDispose) {
+      this.opts.onDispose()
+    }
   }
 
   /**

src/lib/JoggerConnection.ts

@@ -67,11 +67,11 @@ export class JoggerConnection {
 
   async dispose() {
     if (this.cartesianWebsocket) {
-      this.cartesianWebsocket.close()
+      this.cartesianWebsocket.dispose()
     }
 
     if (this.jointWebsocket) {
-      this.jointWebsocket.close()
+      this.jointWebsocket.dispose()
     }
   }
 

test/websockets.test.ts

@@ -26,7 +26,7 @@ test("websocket handling", async () => {
   // Unless the websocket was disposed
   ws.dispose()
   const ws3 = nova.openReconnectingWebsocket(
-    "/motion-groups/0@mock-ur5e/state-stream?tcp=foo",
+    "/motion-groups/0@mock-ur5e/state-stream",
   )
   expect(ws3).not.toBe(ws)
 })