@webex/internal-plugin-mercury 3.11.0 → 3.12.0

package/test/unit/spec/mercury.js

@@ -100,9 +100,32 @@ describe('plugin-mercury', () => {
       });
 
       mercury = webex.internal.mercury;
+      mercury.defaultSessionId = 'mercury-default-session';
     });
 
-    afterEach(() => {
+    afterEach(async () => {
+      // Clean up Mercury connections and internal state
+      if (mercury) {
+        try {
+          await mercury.disconnectAll();
+        } catch (e) {
+          // Ignore cleanup errors
+        }
+        // Clear any remaining connection promises
+        if (mercury._connectPromises) {
+          mercury._connectPromises.clear();
+        }
+      }
+
+      // Ensure mock socket is properly closed
+      if (mockWebSocket && typeof mockWebSocket.close === 'function') {
+        try {
+          mockWebSocket.close();
+        } catch (e) {
+          // Ignore cleanup errors
+        }
+      }
+
       if (socketOpenStub) {
         socketOpenStub.restore();
       }
@@ -110,6 +133,9 @@ describe('plugin-mercury', () => {
       if (Socket.getWebSocketConstructor.restore) {
         Socket.getWebSocketConstructor.restore();
       }
+
+      // Small delay to ensure all async operations complete
+      await new Promise(resolve => setTimeout(resolve, 10));
     });
 
     describe('#listen()', () => {
@@ -499,9 +525,13 @@ describe('plugin-mercury', () => {
 
         // skipping due to apparent bug with lolex in all browsers but Chrome.
         skipInBrowser(it)('does not continue attempting to connect', () => {
-          mercury.connect();
+          const promise = mercury.connect();
 
-          return promiseTick(2)
+          // Wait for the connection to be established before proceeding
+          mockWebSocket.open();
+
+          return promise.then(() =>
+            promiseTick(2)
             .then(() => {
               clock.tick(6 * webex.internal.mercury.config.backoffTimeReset);
 
@@ -509,7 +539,8 @@ describe('plugin-mercury', () => {
             })
             .then(() => {
               assert.calledOnce(Socket.prototype.open);
-            });
+              })
+          );
         });
       });
 
@@ -584,11 +615,11 @@ describe('plugin-mercury', () => {
     });
 
     describe('#logout()', () => {
-      it('calls disconnect and logs', () => {
+      it('calls disconnectAll and logs', () => {
         sinon.stub(mercury.logger, 'info');
-        sinon.stub(mercury, 'disconnect');
+        sinon.stub(mercury, 'disconnectAll');
         mercury.logout();
-        assert.called(mercury.disconnect);
+        assert.called(mercury.disconnectAll);
         assert.calledTwice(mercury.logger.info);
 
         assert.calledWith(mercury.logger.info.getCall(0), 'Mercury: logout() called');
@@ -600,24 +631,24 @@ describe('plugin-mercury', () => {
       });
 
       it('uses the config.beforeLogoutOptionsCloseReason to disconnect and will send code 3050 for logout', () => {
-        sinon.stub(mercury, 'disconnect');
+        sinon.stub(mercury, 'disconnectAll');
         mercury.config.beforeLogoutOptionsCloseReason = 'done (permanent)';
         mercury.logout();
-        assert.calledWith(mercury.disconnect, {code: 3050, reason: 'done (permanent)'});
+        assert.calledWith(mercury.disconnectAll, {code: 3050, reason: 'done (permanent)'});
       });
 
       it('uses the config.beforeLogoutOptionsCloseReason to disconnect and will send code 3050 for logout if the reason is different than standard', () => {
-        sinon.stub(mercury, 'disconnect');
+        sinon.stub(mercury, 'disconnectAll');
         mercury.config.beforeLogoutOptionsCloseReason = 'test';
         mercury.logout();
-        assert.calledWith(mercury.disconnect, {code: 3050, reason: 'test'});
+        assert.calledWith(mercury.disconnectAll, {code: 3050, reason: 'test'});
       });
 
       it('uses the config.beforeLogoutOptionsCloseReason to disconnect and will send undefined for logout if the reason is same as standard', () => {
-        sinon.stub(mercury, 'disconnect');
+        sinon.stub(mercury, 'disconnectAll');
         mercury.config.beforeLogoutOptionsCloseReason = 'done (forced)';
         mercury.logout();
-        assert.calledWith(mercury.disconnect, undefined);
+        assert.calledWith(mercury.disconnectAll, undefined);
       });
     });
 
@@ -723,12 +754,12 @@ describe('plugin-mercury', () => {
           return promiseTick(webex.internal.mercury.config.backoffTimeReset).then(() => {
             // By this time backoffCall and mercury socket should be defined by the
             // 'connect' call
-            assert.isDefined(mercury.backoffCall, 'Mercury backoffCall is not defined');
+            assert.isDefined(mercury.backoffCalls.get('mercury-default-session'), 'Mercury backoffCall is not defined');
             assert.isDefined(mercury.socket, 'Mercury socket is not defined');
             // Calling disconnect will abort the backoffCall, close the socket, and
             // reject the connect
             mercury.disconnect();
-            assert.isUndefined(mercury.backoffCall, 'Mercury backoffCall is still defined');
+            assert.isUndefined(mercury.backoffCalls.get('mercury-default-session'), 'Mercury backoffCall is still defined');
             // The socket will never be unset (which seems bad)
             assert.isDefined(mercury.socket, 'Mercury socket is not defined');
 
@@ -746,16 +777,24 @@ describe('plugin-mercury', () => {
 
           let reason;
 
-          mercury.backoffCall = undefined;
-          mercury._attemptConnection('ws://example.com', (_reason) => {
-            reason = _reason;
-          });
+          mercury.backoffCalls.clear();
+
+          const promise = mercury._attemptConnection(
+            'ws://example.com',
+            'mercury-default-session',
+            (_reason) => {
+              reason = _reason;
+            }
+          );
 
           return promiseTick(webex.internal.mercury.config.backoffTimeReset).then(() => {
             assert.equal(
               reason.message,
-              'Mercury: prevent socket open when backoffCall no longer defined'
+              `Mercury: prevent socket open when backoffCall no longer defined for ${mercury.defaultSessionId}`
             );
+
+            // Ensure the promise was actually rejected (short-circuited)
+            return assert.isRejected(promise);
           });
         });
 
@@ -776,7 +815,7 @@ describe('plugin-mercury', () => {
             return assert.isRejected(promise).then((error) => {
               const lastError = mercury.getLastError();
 
-              assert.equal(error.message, 'Mercury Connection Aborted');
+              assert.equal(error.message, `Mercury Connection Aborted for ${mercury.defaultSessionId}`);
               assert.isDefined(lastError);
               assert.equal(lastError, realError);
             });
@@ -870,7 +909,7 @@ describe('plugin-mercury', () => {
           },
         };
         assert.isUndefined(mercury.mercuryTimeOffset);
-        mercury._setTimeOffset(event);
+        mercury._setTimeOffset('mercury-default-session', event);
         assert.isDefined(mercury.mercuryTimeOffset);
         assert.isTrue(mercury.mercuryTimeOffset > 0);
       });
@@ -880,7 +919,7 @@ describe('plugin-mercury', () => {
             wsWriteTimestamp: Date.now() + 60000,
           },
         };
-        mercury._setTimeOffset(event);
+        mercury._setTimeOffset('mercury-default-session', event);
         assert.isTrue(mercury.mercuryTimeOffset < 0);
       });
       it('handles invalid wsWriteTimestamp', () => {
@@ -891,7 +930,7 @@ describe('plugin-mercury', () => {
               wsWriteTimestamp: invalidTimestamp,
             },
           };
-          mercury._setTimeOffset(event);
+          mercury._setTimeOffset('mercury-default-session', event);
           assert.isUndefined(mercury.mercuryTimeOffset);
         });
       });
@@ -998,13 +1037,15 @@ describe('plugin-mercury', () => {
     describe('shutdown protocol', () => {
       describe('#_handleImminentShutdown()', () => {
         let connectWithBackoffStub;
+        const sessionId = 'mercury-default-session';
 
         beforeEach(() => {
           mercury.connected = true;
-          mercury.socket = {
+          mercury.sockets.set(sessionId, {
             url: 'ws://old-socket.com',
             removeAllListeners: sinon.stub(),
-          };
+          });
+          mercury.socket = mercury.sockets.get(sessionId);
           connectWithBackoffStub = sinon.stub(mercury, '_connectWithBackoff');
           connectWithBackoffStub.returns(Promise.resolve());
           sinon.stub(mercury, '_emit');
@@ -1013,32 +1054,47 @@ describe('plugin-mercury', () => {
         afterEach(() => {
           connectWithBackoffStub.restore();
           mercury._emit.restore();
+          mercury.sockets.clear();
         });
 
         it('should be idempotent - no-op if already in progress', () => {
-          mercury._shutdownSwitchoverInProgress = true;
+          // Simulate an existing switchover in progress by seeding the backoff map
+          mercury._shutdownSwitchoverBackoffCalls.set(sessionId, {placeholder: true});
 
-          mercury._handleImminentShutdown();
+          mercury._handleImminentShutdown(sessionId);
 
           assert.notCalled(connectWithBackoffStub);
         });
 
         it('should set switchover flags when called', () => {
-          mercury._handleImminentShutdown();
+          mercury._handleImminentShutdown(sessionId);
 
-          assert.isTrue(mercury._shutdownSwitchoverInProgress);
+          // With _connectWithBackoff stubbed, the backoff map entry may not be created here.
+          // Assert that switchover initiation state was set and a shutdown switchover connect was requested.
           assert.isDefined(mercury._shutdownSwitchoverId);
+
+          assert.calledOnce(connectWithBackoffStub);
+          const callArgs = connectWithBackoffStub.firstCall.args;
+          assert.isUndefined(callArgs[0]); // webSocketUrl
+          assert.equal(callArgs[1], sessionId); // sessionId
+          assert.isObject(callArgs[2]); // context
+          assert.isTrue(callArgs[2].isShutdownSwitchover);
+          assert.isObject(callArgs[2].attemptOptions);
+          assert.isTrue(callArgs[2].attemptOptions.isShutdownSwitchover);
         });
 
         it('should call _connectWithBackoff with correct parameters', (done) => {
-          mercury._handleImminentShutdown();
+          mercury._handleImminentShutdown(sessionId);
 
           process.nextTick(() => {
             assert.calledOnce(connectWithBackoffStub);
             const callArgs = connectWithBackoffStub.firstCall.args;
             assert.isUndefined(callArgs[0]); // webSocketUrl
-            assert.isObject(callArgs[1]); // context
-            assert.isTrue(callArgs[1].isShutdownSwitchover);
+            assert.equal(callArgs[1], sessionId); // sessionId
+            assert.isObject(callArgs[2]); // context
+            assert.isTrue(callArgs[2].isShutdownSwitchover);
+            assert.isObject(callArgs[2].attemptOptions);
+            assert.isTrue(callArgs[2].attemptOptions.isShutdownSwitchover);
             done();
           });
         });
@@ -1047,12 +1103,17 @@ describe('plugin-mercury', () => {
           connectWithBackoffStub.restore();
           sinon.stub(mercury, '_connectWithBackoff').throws(new Error('Connection failed'));
 
-          mercury._handleImminentShutdown();
+          mercury._handleImminentShutdown(sessionId);
 
-          assert.isFalse(mercury._shutdownSwitchoverInProgress);
+          // When an exception happens synchronously, the placeholder entry
+          // should be removed from the map.
+          const switchoverCall = mercury._shutdownSwitchoverBackoffCalls.get(sessionId);
+          assert.isUndefined(switchoverCall);
+          mercury._connectWithBackoff.restore();
         });
       });
 
+
       describe('#_onmessage() with shutdown message', () => {
         beforeEach(() => {
           sinon.stub(mercury, '_handleImminentShutdown');
@@ -1073,10 +1134,15 @@ describe('plugin-mercury', () => {
             },
           };
 
-          const result = mercury._onmessage(shutdownEvent);
+          const result = mercury._onmessage(mercury.defaultSessionId, shutdownEvent);
 
           assert.calledOnce(mercury._handleImminentShutdown);
-          assert.calledWith(mercury._emit, 'event:mercury_shutdown_imminent', shutdownEvent.data);
+          assert.calledWith(
+            mercury._emit,
+            mercury.defaultSessionId,
+            'event:mercury_shutdown_imminent',
+            shutdownEvent.data
+          );
           assert.instanceOf(result, Promise);
         });
 
@@ -1087,7 +1153,7 @@ describe('plugin-mercury', () => {
             },
           };
 
-          mercury._onmessage(shutdownEvent);
+          mercury._onmessage(mercury.defaultSessionId, shutdownEvent);
 
           assert.calledOnce(mercury._handleImminentShutdown);
         });
@@ -1102,7 +1168,7 @@ describe('plugin-mercury', () => {
             },
           };
 
-          mercury._onmessage(regularEvent);
+          mercury._onmessage(mercury.defaultSessionId, regularEvent);
 
           assert.notCalled(mercury._handleImminentShutdown);
         });
@@ -1121,6 +1187,7 @@ describe('plugin-mercury', () => {
             removeAllListeners: sinon.stub(),
           };
           mercury.socket = mockSocket;
+          mercury.sockets.set(mercury.defaultSessionId, mockSocket);
           mercury.connected = true;
           sinon.stub(mercury, '_emit');
           sinon.stub(mercury, '_reconnect');
@@ -1139,9 +1206,9 @@ describe('plugin-mercury', () => {
             reason: 'replaced during shutdown',
           };
 
-          mercury._onclose(closeEvent, mockSocket);
+          mercury._onclose(mercury.defaultSessionId, closeEvent, mockSocket);
 
-          assert.calledWith(mercury._emit, 'offline.permanent', closeEvent);
+          assert.calledWith(mercury._emit, mercury.defaultSessionId, 'offline.permanent', closeEvent);
           assert.notCalled(mercury._reconnect); // No reconnect for 4001 on active socket
           assert.isFalse(mercury.connected);
         });
@@ -1152,9 +1219,9 @@ describe('plugin-mercury', () => {
             reason: 'replaced during shutdown',
           };
 
-          mercury._onclose(closeEvent, anotherSocket);
+          mercury._onclose(mercury.defaultSessionId, closeEvent, anotherSocket);
 
-          assert.calledWith(mercury._emit, 'offline.replaced', closeEvent);
+          assert.calledWith(mercury._emit, mercury.defaultSessionId, 'offline.replaced', closeEvent);
           assert.notCalled(mercury._reconnect);
           assert.isTrue(mercury.connected); // Should remain connected
           assert.notCalled(mercury.unset);
@@ -1167,15 +1234,16 @@ describe('plugin-mercury', () => {
           };
 
           // Test non-active socket
-          mercury._onclose(closeEvent, anotherSocket);
-          assert.calledWith(mercury._emit, 'offline.replaced', closeEvent);
+          mercury._onclose(mercury.defaultSessionId, closeEvent, anotherSocket);
+          assert.calledWith(mercury._emit, mercury.defaultSessionId, 'offline.replaced', closeEvent);
 
           // Reset the spy call history
           mercury._emit.resetHistory();
 
           // Test active socket
-          mercury._onclose(closeEvent, mockSocket);
-          assert.calledWith(mercury._emit, 'offline.permanent', closeEvent);
+          mercury.sockets.set(mercury.defaultSessionId, mockSocket);
+          mercury._onclose(mercury.defaultSessionId, closeEvent, mockSocket);
+          assert.calledWith(mercury._emit, mercury.defaultSessionId, 'offline.permanent', closeEvent);
         });
 
         it('should handle missing sourceSocket parameter (treats as non-active)', () => {
@@ -1184,10 +1252,10 @@ describe('plugin-mercury', () => {
             reason: 'replaced during shutdown',
           };
 
-          mercury._onclose(closeEvent); // No sourceSocket parameter
+          mercury._onclose(mercury.defaultSessionId, closeEvent); // No sourceSocket parameter
 
           // With simplified logic, undefined !== this.socket, so isActiveSocket = false
-          assert.calledWith(mercury._emit, 'offline.replaced', closeEvent);
+          assert.calledWith(mercury._emit, mercury.defaultSessionId, 'offline.replaced', closeEvent);
           assert.notCalled(mercury._reconnect);
         });
 
@@ -1198,7 +1266,7 @@ describe('plugin-mercury', () => {
           };
 
           // Close non-active socket (not the active one)
-          mercury._onclose(closeEvent, anotherSocket);
+          mercury._onclose(mercury.defaultSessionId, closeEvent, anotherSocket);
 
           // Verify listeners were removed from the old socket
           // The _onclose method checks if sourceSocket !== this.socket (non-active)
@@ -1213,7 +1281,7 @@ describe('plugin-mercury', () => {
           };
 
           // Close active socket
-          mercury._onclose(closeEvent, mockSocket);
+          mercury._onclose(mercury.defaultSessionId, closeEvent, mockSocket);
 
           // Verify listeners were removed from active socket
           assert.calledOnce(mockSocket.removeAllListeners);
@@ -1222,13 +1290,15 @@ describe('plugin-mercury', () => {
 
       describe('shutdown switchover with retry logic', () => {
         let connectWithBackoffStub;
+        const sessionId = 'mercury-default-session';
 
         beforeEach(() => {
           mercury.connected = true;
-          mercury.socket = {
+          mercury.sockets.set(sessionId, {
             url: 'ws://old-socket.com',
             removeAllListeners: sinon.stub(),
-          };
+          });
+          mercury.socket = mercury.sockets.get(sessionId);
           connectWithBackoffStub = sinon.stub(mercury, '_connectWithBackoff');
           sinon.stub(mercury, '_emit');
         });
@@ -1236,39 +1306,46 @@ describe('plugin-mercury', () => {
         afterEach(() => {
           connectWithBackoffStub.restore();
           mercury._emit.restore();
+          mercury.sockets.clear();
         });
 
         it('should call _connectWithBackoff with shutdown switchover context', (done) => {
           connectWithBackoffStub.returns(Promise.resolve());
 
-          mercury._handleImminentShutdown();
+          mercury._handleImminentShutdown(sessionId);
 
-          // Give it a tick for the async call to happen
           process.nextTick(() => {
             assert.calledOnce(connectWithBackoffStub);
             const callArgs = connectWithBackoffStub.firstCall.args;
 
-            assert.isUndefined(callArgs[0]); // webSocketUrl is undefined
-            assert.isObject(callArgs[1]); // context object
-            assert.isTrue(callArgs[1].isShutdownSwitchover);
-            assert.isObject(callArgs[1].attemptOptions);
-            assert.isTrue(callArgs[1].attemptOptions.isShutdownSwitchover);
+            assert.isUndefined(callArgs[0]); // webSocketUrl
+            assert.equal(callArgs[1], sessionId);
+            assert.isObject(callArgs[2]);
+            assert.isTrue(callArgs[2].isShutdownSwitchover);
+            assert.isObject(callArgs[2].attemptOptions);
+            assert.isTrue(callArgs[2].attemptOptions.isShutdownSwitchover);
             done();
           });
         });
 
         it('should set _shutdownSwitchoverInProgress flag during switchover', () => {
-          connectWithBackoffStub.returns(new Promise(() => {})); // Never resolves
+          // With the new behavior, "in progress" is represented by the presence
+          // of an entry in _shutdownSwitchoverBackoffCalls.
+          // Since _connectWithBackoff is stubbed in this suite, simulate its side-effect
+          // of seeding the backoff-call map entry.
+          connectWithBackoffStub.callsFake(() => {
+            mercury._shutdownSwitchoverBackoffCalls.set(sessionId, {placeholder: true});
+            return new Promise(() => {}); // Never resolves
+          });
 
-          mercury._handleImminentShutdown();
+          mercury._handleImminentShutdown(sessionId);
 
-          assert.isTrue(mercury._shutdownSwitchoverInProgress);
+          const switchoverBackoffCall = mercury._shutdownSwitchoverBackoffCalls.get(sessionId);
+          assert.isOk(switchoverBackoffCall);
         });
 
         it('should emit success event when switchover completes', async () => {
-          // We need to actually call the onSuccess callback to trigger the event
-          connectWithBackoffStub.callsFake((url, context) => {
-            // Simulate successful connection by calling onSuccess
+          connectWithBackoffStub.callsFake((url, sid, context) => {
             if (context && context.attemptOptions && context.attemptOptions.onSuccess) {
               const mockSocket = {url: 'ws://new-socket.com'};
               context.attemptOptions.onSuccess(mockSocket, 'ws://new-socket.com');
@@ -1276,14 +1353,15 @@ describe('plugin-mercury', () => {
             return Promise.resolve();
           });
 
-          mercury._handleImminentShutdown();
+          mercury._handleImminentShutdown(sessionId);
 
-          // Wait for async operations
           await promiseTick(50);
 
           const emitCalls = mercury._emit.getCalls();
           const hasCompleteEvent = emitCalls.some(
-            (call) => call.args[0] === 'event:mercury_shutdown_switchover_complete'
+            (call) =>
+              call.args[0] === sessionId &&
+              call.args[1] === 'event:mercury_shutdown_switchover_complete'
           );
 
           assert.isTrue(hasCompleteEvent, 'Should emit switchover complete event');
@@ -1294,16 +1372,16 @@ describe('plugin-mercury', () => {
 
           connectWithBackoffStub.returns(Promise.reject(testError));
 
-          mercury._handleImminentShutdown();
+          mercury._handleImminentShutdown(sessionId);
           await promiseTick(50);
 
-          // Check if failure event was emitted
           const emitCalls = mercury._emit.getCalls();
           const hasFailureEvent = emitCalls.some(
             (call) =>
-              call.args[0] === 'event:mercury_shutdown_switchover_failed' &&
-              call.args[1] &&
-              call.args[1].reason === testError
+              call.args[0] === sessionId &&
+              call.args[1] === 'event:mercury_shutdown_switchover_failed' &&
+              call.args[2] &&
+              call.args[2].reason === testError
           );
 
           assert.isTrue(hasFailureEvent, 'Should emit switchover failed event');
@@ -1312,10 +1390,9 @@ describe('plugin-mercury', () => {
         it('should allow old socket to be closed by server after switchover failure', async () => {
           connectWithBackoffStub.returns(Promise.reject(new Error('Failed')));
 
-          mercury._handleImminentShutdown();
+          mercury._handleImminentShutdown(sessionId);
           await promiseTick(50);
 
-          // Old socket should not be closed immediately - server will close it
           assert.equal(mercury.socket.removeAllListeners.callCount, 0);
         });
       });
@@ -1412,18 +1489,16 @@ describe('plugin-mercury', () => {
       });
 
       describe('#_attemptConnection() with shutdown switchover', () => {
-        let mockSocket, prepareAndOpenSocketStub, callback;
+        let prepareAndOpenSocketStub, callback;
+        const sessionId = 'mercury-default-session';
 
         beforeEach(() => {
-          mockSocket = {
-            url: 'ws://test.com',
-          };
           prepareAndOpenSocketStub = sinon
             .stub(mercury, '_prepareAndOpenSocket')
             .returns(Promise.resolve('ws://new-socket.com'));
           callback = sinon.stub();
-          mercury._shutdownSwitchoverBackoffCall = {}; // Mock backoff call
-          mercury.socket = mockSocket;
+          mercury._shutdownSwitchoverBackoffCalls.set(sessionId, {abort: sinon.stub()});
+          mercury.socket = {url: 'ws://test.com'};
           mercury.connected = true;
           sinon.stub(mercury, '_emit');
           sinon.stub(mercury, '_attachSocketEventListeners');
@@ -1433,28 +1508,26 @@ describe('plugin-mercury', () => {
           prepareAndOpenSocketStub.restore();
           mercury._emit.restore();
           mercury._attachSocketEventListeners.restore();
+          mercury._shutdownSwitchoverBackoffCalls.clear();
         });
 
         it('should not set socket reference before opening for shutdown switchover', async () => {
           const originalSocket = mercury.socket;
 
-          await mercury._attemptConnection('ws://test.com', callback, {
+          await mercury._attemptConnection('ws://test.com', sessionId, callback, {
             isShutdownSwitchover: true,
             onSuccess: (newSocket, url) => {
-              // During onSuccess, verify original socket is still set
-              // (socket swap happens inside onSuccess callback in _handleImminentShutdown)
               assert.equal(mercury.socket, originalSocket);
             },
           });
 
-          // After onSuccess, socket should still be original since we only swap in _handleImminentShutdown
           assert.equal(mercury.socket, originalSocket);
         });
 
         it('should call onSuccess callback with new socket and URL for shutdown', async () => {
           const onSuccessStub = sinon.stub();
 
-          await mercury._attemptConnection('ws://test.com', callback, {
+          await mercury._attemptConnection('ws://test.com', sessionId, callback, {
             isShutdownSwitchover: true,
             onSuccess: onSuccessStub,
           });
@@ -1464,20 +1537,22 @@ describe('plugin-mercury', () => {
         });
 
         it('should emit shutdown switchover complete event', async () => {
-          const oldSocket = mercury.socket;
-
-          await mercury._attemptConnection('ws://test.com', callback, {
+          await mercury._attemptConnection('ws://test.com', sessionId, callback, {
             isShutdownSwitchover: true,
             onSuccess: (newSocket, url) => {
-              // Simulate the onSuccess callback behavior
               mercury.socket = newSocket;
               mercury.connected = true;
-              mercury._emit('event:mercury_shutdown_switchover_complete', {url});
+              mercury._emit(
+                sessionId,
+                'event:mercury_shutdown_switchover_complete',
+                {url}
+              );
             },
           });
 
           assert.calledWith(
             mercury._emit,
+            sessionId,
             'event:mercury_shutdown_switchover_complete',
             sinon.match.has('url', 'ws://new-socket.com')
           );
@@ -1486,25 +1561,25 @@ describe('plugin-mercury', () => {
         it('should use simpler error handling for shutdown switchover failures', async () => {
           prepareAndOpenSocketStub.returns(Promise.reject(new Error('Connection failed')));
 
-          try {
-            await mercury._attemptConnection('ws://test.com', callback, {
+          await mercury
+            ._attemptConnection('ws://test.com', sessionId, callback, {
               isShutdownSwitchover: true,
-            });
-          } catch (err) {
-            // Error should be caught and passed to callback
-          }
+            })
+            .catch(() => {});
 
-          // Should call callback with error for retry
           assert.calledOnce(callback);
           assert.instanceOf(callback.firstCall.args[0], Error);
         });
 
         it('should check _shutdownSwitchoverBackoffCall for shutdown connections', () => {
-          mercury._shutdownSwitchoverBackoffCall = undefined;
+          mercury._shutdownSwitchoverBackoffCalls.clear();
 
-          const result = mercury._attemptConnection('ws://test.com', callback, {
-            isShutdownSwitchover: true,
-          });
+          const result = mercury._attemptConnection(
+            'ws://test.com',
+            sessionId,
+            callback,
+            {isShutdownSwitchover: true}
+          );
 
           return result.catch((err) => {
             assert.instanceOf(err, Error);
@@ -1514,35 +1589,28 @@ describe('plugin-mercury', () => {
       });
 
       describe('#_connectWithBackoff() with shutdown switchover', () => {
-        // Note: These tests verify the parameterization logic without running real backoff timers
-        // to avoid test hangs. The backoff mechanism itself is tested in other test suites.
+        const sessionId = 'mercury-default-session';
 
         it('should use shutdown-specific parameters when called', () => {
-          // Stub _connectWithBackoff to prevent real execution
           const connectWithBackoffStub = sinon
             .stub(mercury, '_connectWithBackoff')
             .returns(Promise.resolve());
 
-          mercury._handleImminentShutdown();
+          mercury._handleImminentShutdown(sessionId);
 
-          // Verify it was called with shutdown context
           assert.calledOnce(connectWithBackoffStub);
           const callArgs = connectWithBackoffStub.firstCall.args;
-          assert.isObject(callArgs[1]); // context
-          assert.isTrue(callArgs[1].isShutdownSwitchover);
+          assert.equal(callArgs[1], sessionId);
+          assert.isObject(callArgs[2]);
+          assert.isTrue(callArgs[2].isShutdownSwitchover);
 
           connectWithBackoffStub.restore();
         });
 
         it('should pass shutdown switchover options to _attemptConnection', () => {
-          // Stub _attemptConnection to verify it receives correct options
           const attemptStub = sinon.stub(mercury, '_attemptConnection');
-          attemptStub.callsFake((url, callback) => {
-            // Immediately succeed
-            callback();
-          });
+          attemptStub.callsFake((url, sid, cb) => cb());
 
-          // Call _connectWithBackoff with shutdown context
           const context = {
             isShutdownSwitchover: true,
             attemptOptions: {
@@ -1551,34 +1619,30 @@ describe('plugin-mercury', () => {
             },
           };
 
-          // Start the backoff
-          const promise = mercury._connectWithBackoff(undefined, context);
+          const promise = mercury._connectWithBackoff(undefined, sessionId, context);
 
-          // Check that _attemptConnection was called with shutdown options
           return promise.then(() => {
             assert.calledOnce(attemptStub);
             const callArgs = attemptStub.firstCall.args;
-            assert.isObject(callArgs[2]); // options parameter
-            assert.isTrue(callArgs[2].isShutdownSwitchover);
-
+            assert.equal(callArgs[1], sessionId);
+            assert.isObject(callArgs[3]);
+            assert.isTrue(callArgs[3].isShutdownSwitchover);
             attemptStub.restore();
           });
         });
 
         it('should set and clear state flags appropriately', () => {
-          // Stub to prevent actual connection
-          sinon.stub(mercury, '_attemptConnection').callsFake((url, callback) => callback());
+          sinon.stub(mercury, '_attemptConnection').callsFake((url, sid, cb) => cb());
 
-          mercury._shutdownSwitchoverInProgress = true;
+          mercury._shutdownSwitchoverBackoffCalls.set(sessionId, {placeholder: true});
 
-          const promise = mercury._connectWithBackoff(undefined, {
+          const promise = mercury._connectWithBackoff(undefined, sessionId, {
             isShutdownSwitchover: true,
             attemptOptions: {isShutdownSwitchover: true, onSuccess: () => {}},
           });
 
           return promise.then(() => {
-            // Should be cleared after completion
-            assert.isFalse(mercury._shutdownSwitchoverInProgress);
+            assert.isUndefined(mercury._shutdownSwitchoverBackoffCalls.get(sessionId));
             mercury._attemptConnection.restore();
           });
         });
@@ -1586,32 +1650,30 @@ describe('plugin-mercury', () => {
 
       describe('#disconnect() with shutdown switchover in progress', () => {
         let abortStub;
+        const sessionId = 'mercury-default-session';
 
         beforeEach(() => {
-          mercury.socket = {
+          mercury.sockets.clear();
+          mercury.sockets.set(sessionId, {
             close: sinon.stub().returns(Promise.resolve()),
             removeAllListeners: sinon.stub(),
-          };
+          });
           abortStub = sinon.stub();
-          mercury._shutdownSwitchoverBackoffCall = {
-            abort: abortStub,
-          };
+          mercury._shutdownSwitchoverBackoffCalls.set(sessionId, {abort: abortStub});
         });
 
         it('should abort shutdown switchover backoff call on disconnect', async () => {
-          await mercury.disconnect();
+          await mercury.disconnect(undefined, sessionId);
 
           assert.calledOnce(abortStub);
         });
 
         it('should handle disconnect when no switchover is in progress', async () => {
-          mercury._shutdownSwitchoverBackoffCall = undefined;
+          mercury._shutdownSwitchoverBackoffCalls.clear();
 
-          // Should not throw
-          await mercury.disconnect();
+          await mercury.disconnect(undefined, sessionId);
 
-          // Should still close the socket
-          assert.calledOnce(mercury.socket.close);
+          assert.calledOnce(mercury.sockets.get(sessionId).close);
         });
       });
     });