ClientServerdestroy: allow 'unsubscribed' event handler to retrieve S…

…erverClient by evicting nodeIds / clientIds later, after unsubscribe

server-client/index.js

@@ -164,9 +164,6 @@ export class ServerClient {
       }
     }
     if (this.clientId) {
-      this.app.clientIds.delete(this.clientId)
-      this.app.nodeIds.delete(this.nodeId)
-
       for (let channel in this.app.subscribers) {
         let subscriber = this.app.subscribers[channel][this.nodeId]
         if (subscriber) {
@@ -176,6 +173,8 @@ export class ServerClient {
           this.app.performUnsubscribe(this.nodeId, action, meta)
         }
       }
+      this.app.clientIds.delete(this.clientId)
+      this.app.nodeIds.delete(this.nodeId)
     }
     if (!this.app.destroying) {
       this.app.emitter.emit('disconnected', this)

server-client/index.test.ts

@@ -257,9 +257,15 @@ it('removes itself on destroy', async () => {
       '10:client2': { filters: { '{}': true } }
     }
   }
+  let unsubscribedClientNodeIds: string[] = []
+  test.app.on('unsubscribed', (action, meta, clientNodeId) => {
+      unsubscribedClientNodeIds.push(clientNodeId)
+      expect(test.app.nodeIds.get(clientNodeId)).toBeDefined()
+  })
   client1.destroy()
   await delay(1)
 
+  expect(unsubscribedClientNodeIds).toEqual(['10:client1'])
   expect(Array.from(test.app.userIds.keys())).toEqual(['10'])
   expect(test.app.subscribers).toEqual({
     'user/10': { '10:client2': { filters: { '{}': true } } }
@@ -272,6 +278,8 @@ it('removes itself on destroy', async () => {
 
   client2.destroy()
   await delay(1)
+
+  expect(unsubscribedClientNodeIds).toEqual(['10:client1', '10:client2'])
   expect(pullNewReports()).toMatchObject([
     ['unsubscribed', { channel: 'user/10' }],
     ['disconnect', { nodeId: '10:client2' }]