@webex/internal-plugin-mercury 3.12.0-next.9 → 3.12.0-task-refactor.1

package/test/unit/spec/mercury.js

@@ -100,32 +100,9 @@ describe('plugin-mercury', () => {
       });
 
       mercury = webex.internal.mercury;
-      mercury.defaultSessionId = 'mercury-default-session';
     });
 
-    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
-        }
-      }
-
+    afterEach(() => {
       if (socketOpenStub) {
         socketOpenStub.restore();
       }
@@ -133,9 +110,6 @@ 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()', () => {
@@ -525,13 +499,9 @@ describe('plugin-mercury', () => {
 
         // skipping due to apparent bug with lolex in all browsers but Chrome.
         skipInBrowser(it)('does not continue attempting to connect', () => {
-          const promise = mercury.connect();
+          mercury.connect();
 
-          // Wait for the connection to be established before proceeding
-          mockWebSocket.open();
-
-          return promise.then(() =>
-            promiseTick(2)
+          return promiseTick(2)
             .then(() => {
               clock.tick(6 * webex.internal.mercury.config.backoffTimeReset);
 
@@ -539,8 +509,7 @@ describe('plugin-mercury', () => {
             })
             .then(() => {
               assert.calledOnce(Socket.prototype.open);
-              })
-          );
+            });
         });
       });
 
@@ -615,11 +584,11 @@ describe('plugin-mercury', () => {
     });
 
     describe('#logout()', () => {
-      it('calls disconnectAll and logs', () => {
+      it('calls disconnect and logs', () => {
         sinon.stub(mercury.logger, 'info');
-        sinon.stub(mercury, 'disconnectAll');
+        sinon.stub(mercury, 'disconnect');
         mercury.logout();
-        assert.called(mercury.disconnectAll);
+        assert.called(mercury.disconnect);
         assert.calledTwice(mercury.logger.info);
 
         assert.calledWith(mercury.logger.info.getCall(0), 'Mercury: logout() called');
@@ -631,24 +600,24 @@ describe('plugin-mercury', () => {
       });
 
       it('uses the config.beforeLogoutOptionsCloseReason to disconnect and will send code 3050 for logout', () => {
-        sinon.stub(mercury, 'disconnectAll');
+        sinon.stub(mercury, 'disconnect');
         mercury.config.beforeLogoutOptionsCloseReason = 'done (permanent)';
         mercury.logout();
-        assert.calledWith(mercury.disconnectAll, {code: 3050, reason: 'done (permanent)'});
+        assert.calledWith(mercury.disconnect, {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, 'disconnectAll');
+        sinon.stub(mercury, 'disconnect');
         mercury.config.beforeLogoutOptionsCloseReason = 'test';
         mercury.logout();
-        assert.calledWith(mercury.disconnectAll, {code: 3050, reason: 'test'});
+        assert.calledWith(mercury.disconnect, {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, 'disconnectAll');
+        sinon.stub(mercury, 'disconnect');
         mercury.config.beforeLogoutOptionsCloseReason = 'done (forced)';
         mercury.logout();
-        assert.calledWith(mercury.disconnectAll, undefined);
+        assert.calledWith(mercury.disconnect, undefined);
       });
     });
 
@@ -754,12 +723,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.backoffCalls.get('mercury-default-session'), 'Mercury backoffCall is not defined');
+            assert.isDefined(mercury.backoffCall, '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.backoffCalls.get('mercury-default-session'), 'Mercury backoffCall is still defined');
+            assert.isUndefined(mercury.backoffCall, 'Mercury backoffCall is still defined');
             // The socket will never be unset (which seems bad)
             assert.isDefined(mercury.socket, 'Mercury socket is not defined');
 
@@ -777,24 +746,16 @@ describe('plugin-mercury', () => {
 
           let reason;
 
-          mercury.backoffCalls.clear();
-
-          const promise = mercury._attemptConnection(
-            'ws://example.com',
-            'mercury-default-session',
-            (_reason) => {
-              reason = _reason;
-            }
-          );
+          mercury.backoffCall = undefined;
+          mercury._attemptConnection('ws://example.com', (_reason) => {
+            reason = _reason;
+          });
 
           return promiseTick(webex.internal.mercury.config.backoffTimeReset).then(() => {
             assert.equal(
               reason.message,
-              `Mercury: prevent socket open when backoffCall no longer defined for ${mercury.defaultSessionId}`
+              'Mercury: prevent socket open when backoffCall no longer defined'
             );
-
-            // Ensure the promise was actually rejected (short-circuited)
-            return assert.isRejected(promise);
           });
         });
 
@@ -815,7 +776,7 @@ describe('plugin-mercury', () => {
             return assert.isRejected(promise).then((error) => {
               const lastError = mercury.getLastError();
 
-              assert.equal(error.message, `Mercury Connection Aborted for ${mercury.defaultSessionId}`);
+              assert.equal(error.message, 'Mercury Connection Aborted');
               assert.isDefined(lastError);
               assert.equal(lastError, realError);
             });
@@ -909,7 +870,7 @@ describe('plugin-mercury', () => {
           },
         };
         assert.isUndefined(mercury.mercuryTimeOffset);
-        mercury._setTimeOffset('mercury-default-session', event);
+        mercury._setTimeOffset(event);
         assert.isDefined(mercury.mercuryTimeOffset);
         assert.isTrue(mercury.mercuryTimeOffset > 0);
       });
@@ -919,7 +880,7 @@ describe('plugin-mercury', () => {
             wsWriteTimestamp: Date.now() + 60000,
           },
         };
-        mercury._setTimeOffset('mercury-default-session', event);
+        mercury._setTimeOffset(event);
         assert.isTrue(mercury.mercuryTimeOffset < 0);
       });
       it('handles invalid wsWriteTimestamp', () => {
@@ -930,7 +891,7 @@ describe('plugin-mercury', () => {
               wsWriteTimestamp: invalidTimestamp,
             },
           };
-          mercury._setTimeOffset('mercury-default-session', event);
+          mercury._setTimeOffset(event);
           assert.isUndefined(mercury.mercuryTimeOffset);
         });
       });
@@ -1037,15 +998,13 @@ describe('plugin-mercury', () => {
     describe('shutdown protocol', () => {
       describe('#_handleImminentShutdown()', () => {
         let connectWithBackoffStub;
-        const sessionId = 'mercury-default-session';
 
         beforeEach(() => {
           mercury.connected = true;
-          mercury.sockets.set(sessionId, {
+          mercury.socket = {
             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');
@@ -1054,47 +1013,32 @@ describe('plugin-mercury', () => {
         afterEach(() => {
           connectWithBackoffStub.restore();
           mercury._emit.restore();
-          mercury.sockets.clear();
         });
 
         it('should be idempotent - no-op if already in progress', () => {
-          // Simulate an existing switchover in progress by seeding the backoff map
-          mercury._shutdownSwitchoverBackoffCalls.set(sessionId, {placeholder: true});
+          mercury._shutdownSwitchoverInProgress = true;
 
-          mercury._handleImminentShutdown(sessionId);
+          mercury._handleImminentShutdown();
 
           assert.notCalled(connectWithBackoffStub);
         });
 
         it('should set switchover flags when called', () => {
-          mercury._handleImminentShutdown(sessionId);
+          mercury._handleImminentShutdown();
 
-          // 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.isTrue(mercury._shutdownSwitchoverInProgress);
           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(sessionId);
+          mercury._handleImminentShutdown();
 
           process.nextTick(() => {
             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);
+            assert.isObject(callArgs[1]); // context
+            assert.isTrue(callArgs[1].isShutdownSwitchover);
             done();
           });
         });
@@ -1103,17 +1047,12 @@ describe('plugin-mercury', () => {
           connectWithBackoffStub.restore();
           sinon.stub(mercury, '_connectWithBackoff').throws(new Error('Connection failed'));
 
-          mercury._handleImminentShutdown(sessionId);
+          mercury._handleImminentShutdown();
 
-          // 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();
+          assert.isFalse(mercury._shutdownSwitchoverInProgress);
         });
       });
 
-
       describe('#_onmessage() with shutdown message', () => {
         beforeEach(() => {
           sinon.stub(mercury, '_handleImminentShutdown');
@@ -1134,15 +1073,10 @@ describe('plugin-mercury', () => {
             },
           };
 
-          const result = mercury._onmessage(mercury.defaultSessionId, shutdownEvent);
+          const result = mercury._onmessage(shutdownEvent);
 
           assert.calledOnce(mercury._handleImminentShutdown);
-          assert.calledWith(
-            mercury._emit,
-            mercury.defaultSessionId,
-            'event:mercury_shutdown_imminent',
-            shutdownEvent.data
-          );
+          assert.calledWith(mercury._emit, 'event:mercury_shutdown_imminent', shutdownEvent.data);
           assert.instanceOf(result, Promise);
         });
 
@@ -1153,7 +1087,7 @@ describe('plugin-mercury', () => {
             },
           };
 
-          mercury._onmessage(mercury.defaultSessionId, shutdownEvent);
+          mercury._onmessage(shutdownEvent);
 
           assert.calledOnce(mercury._handleImminentShutdown);
         });
@@ -1168,118 +1102,12 @@ describe('plugin-mercury', () => {
             },
           };
 
-          mercury._onmessage(mercury.defaultSessionId, regularEvent);
+          mercury._onmessage(regularEvent);
 
           assert.notCalled(mercury._handleImminentShutdown);
         });
       });
 
-      describe('#_onmessage() with missing data or eventType', () => {
-        beforeEach(() => {
-          sinon.stub(mercury, '_emit');
-          sinon.stub(mercury, '_setTimeOffset');
-          sinon.stub(mercury, '_applyOverrides');
-        });
-
-        afterEach(() => {
-          mercury._emit.restore();
-          mercury._setTimeOffset.restore();
-          mercury._applyOverrides.restore();
-        });
-
-        it('should not throw when envelope.data is undefined', () => {
-          const event = {
-            data: {
-              type: 'someType',
-              // no nested data property
-            },
-          };
-
-          const result = mercury._onmessage(mercury.defaultSessionId, event);
-
-          assert.instanceOf(result, Promise);
-          assert.calledWith(mercury._emit, mercury.defaultSessionId, 'event', event.data);
-        });
-
-        it('should not throw when data.eventType is undefined', () => {
-          const event = {
-            data: {
-              type: 'someType',
-              data: {
-                // no eventType property
-                someField: 'value',
-              },
-            },
-          };
-
-          const result = mercury._onmessage(mercury.defaultSessionId, event);
-
-          assert.instanceOf(result, Promise);
-          assert.calledWith(mercury._emit, mercury.defaultSessionId, 'event', event.data);
-        });
-
-        it('should emit generic event for messages without eventType (e.g. subscription responses)', () => {
-          const event = {
-            data: {
-              id: 'msg-123',
-              sequenceNumber: 5,
-              data: {
-                statusCode: 200,
-              },
-            },
-          };
-
-          const result = mercury._onmessage(mercury.defaultSessionId, event);
-
-          assert.instanceOf(result, Promise);
-          assert.calledOnce(mercury._emit);
-          assert.calledWith(mercury._emit, mercury.defaultSessionId, 'event', event.data);
-        });
-
-        it('should still process messages with a valid eventType', async () => {
-          const event = {
-            data: {
-              data: {
-                eventType: 'conversation.activity',
-              },
-            },
-          };
-
-          await mercury._onmessage(mercury.defaultSessionId, event);
-
-          // Normal flow emits namespace-specific events after processing handlers.
-          // The early-return guard only emits 'event', so asserting these proves the normal path was taken.
-          assert.calledWith(mercury._emit, mercury.defaultSessionId, 'event:conversation', event.data);
-          assert.calledWith(mercury._emit, mercury.defaultSessionId, 'event:conversation.activity', event.data);
-        });
-      });
-
-      describe('#_getEventHandlers()', () => {
-        it('should return an empty array when eventType is undefined', () => {
-          const result = mercury._getEventHandlers(undefined);
-
-          assert.deepEqual(result, []);
-        });
-
-        it('should return an empty array when eventType is null', () => {
-          const result = mercury._getEventHandlers(null);
-
-          assert.deepEqual(result, []);
-        });
-
-        it('should return an empty array when eventType is an empty string', () => {
-          const result = mercury._getEventHandlers('');
-
-          assert.deepEqual(result, []);
-        });
-
-        it('should return an empty array when namespace is not registered', () => {
-          const result = mercury._getEventHandlers('unknownNamespace.someEvent');
-
-          assert.deepEqual(result, []);
-        });
-      });
-
       describe('#_onclose() with code 4001 (shutdown replacement)', () => {
         let mockSocket, anotherSocket;
 
@@ -1293,7 +1121,6 @@ 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');
@@ -1312,9 +1139,9 @@ describe('plugin-mercury', () => {
             reason: 'replaced during shutdown',
           };
 
-          mercury._onclose(mercury.defaultSessionId, closeEvent, mockSocket);
+          mercury._onclose(closeEvent, mockSocket);
 
-          assert.calledWith(mercury._emit, mercury.defaultSessionId, 'offline.permanent', closeEvent);
+          assert.calledWith(mercury._emit, 'offline.permanent', closeEvent);
           assert.notCalled(mercury._reconnect); // No reconnect for 4001 on active socket
           assert.isFalse(mercury.connected);
         });
@@ -1325,9 +1152,9 @@ describe('plugin-mercury', () => {
             reason: 'replaced during shutdown',
           };
 
-          mercury._onclose(mercury.defaultSessionId, closeEvent, anotherSocket);
+          mercury._onclose(closeEvent, anotherSocket);
 
-          assert.calledWith(mercury._emit, mercury.defaultSessionId, 'offline.replaced', closeEvent);
+          assert.calledWith(mercury._emit, 'offline.replaced', closeEvent);
           assert.notCalled(mercury._reconnect);
           assert.isTrue(mercury.connected); // Should remain connected
           assert.notCalled(mercury.unset);
@@ -1340,16 +1167,15 @@ describe('plugin-mercury', () => {
           };
 
           // Test non-active socket
-          mercury._onclose(mercury.defaultSessionId, closeEvent, anotherSocket);
-          assert.calledWith(mercury._emit, mercury.defaultSessionId, 'offline.replaced', closeEvent);
+          mercury._onclose(closeEvent, anotherSocket);
+          assert.calledWith(mercury._emit, 'offline.replaced', closeEvent);
 
           // Reset the spy call history
           mercury._emit.resetHistory();
 
           // Test active socket
-          mercury.sockets.set(mercury.defaultSessionId, mockSocket);
-          mercury._onclose(mercury.defaultSessionId, closeEvent, mockSocket);
-          assert.calledWith(mercury._emit, mercury.defaultSessionId, 'offline.permanent', closeEvent);
+          mercury._onclose(closeEvent, mockSocket);
+          assert.calledWith(mercury._emit, 'offline.permanent', closeEvent);
         });
 
         it('should handle missing sourceSocket parameter (treats as non-active)', () => {
@@ -1358,10 +1184,10 @@ describe('plugin-mercury', () => {
             reason: 'replaced during shutdown',
           };
 
-          mercury._onclose(mercury.defaultSessionId, closeEvent); // No sourceSocket parameter
+          mercury._onclose(closeEvent); // No sourceSocket parameter
 
           // With simplified logic, undefined !== this.socket, so isActiveSocket = false
-          assert.calledWith(mercury._emit, mercury.defaultSessionId, 'offline.replaced', closeEvent);
+          assert.calledWith(mercury._emit, 'offline.replaced', closeEvent);
           assert.notCalled(mercury._reconnect);
         });
 
@@ -1372,7 +1198,7 @@ describe('plugin-mercury', () => {
           };
 
           // Close non-active socket (not the active one)
-          mercury._onclose(mercury.defaultSessionId, closeEvent, anotherSocket);
+          mercury._onclose(closeEvent, anotherSocket);
 
           // Verify listeners were removed from the old socket
           // The _onclose method checks if sourceSocket !== this.socket (non-active)
@@ -1387,7 +1213,7 @@ describe('plugin-mercury', () => {
           };
 
           // Close active socket
-          mercury._onclose(mercury.defaultSessionId, closeEvent, mockSocket);
+          mercury._onclose(closeEvent, mockSocket);
 
           // Verify listeners were removed from active socket
           assert.calledOnce(mockSocket.removeAllListeners);
@@ -1396,15 +1222,13 @@ describe('plugin-mercury', () => {
 
       describe('shutdown switchover with retry logic', () => {
         let connectWithBackoffStub;
-        const sessionId = 'mercury-default-session';
 
         beforeEach(() => {
           mercury.connected = true;
-          mercury.sockets.set(sessionId, {
+          mercury.socket = {
             url: 'ws://old-socket.com',
             removeAllListeners: sinon.stub(),
-          });
-          mercury.socket = mercury.sockets.get(sessionId);
+          };
           connectWithBackoffStub = sinon.stub(mercury, '_connectWithBackoff');
           sinon.stub(mercury, '_emit');
         });
@@ -1412,46 +1236,39 @@ 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(sessionId);
+          mercury._handleImminentShutdown();
 
+          // 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
-            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);
+            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);
             done();
           });
         });
 
         it('should set _shutdownSwitchoverInProgress flag during switchover', () => {
-          // 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
-          });
+          connectWithBackoffStub.returns(new Promise(() => {})); // Never resolves
 
-          mercury._handleImminentShutdown(sessionId);
+          mercury._handleImminentShutdown();
 
-          const switchoverBackoffCall = mercury._shutdownSwitchoverBackoffCalls.get(sessionId);
-          assert.isOk(switchoverBackoffCall);
+          assert.isTrue(mercury._shutdownSwitchoverInProgress);
         });
 
         it('should emit success event when switchover completes', async () => {
-          connectWithBackoffStub.callsFake((url, sid, context) => {
+          // We need to actually call the onSuccess callback to trigger the event
+          connectWithBackoffStub.callsFake((url, context) => {
+            // Simulate successful connection by calling onSuccess
             if (context && context.attemptOptions && context.attemptOptions.onSuccess) {
               const mockSocket = {url: 'ws://new-socket.com'};
               context.attemptOptions.onSuccess(mockSocket, 'ws://new-socket.com');
@@ -1459,15 +1276,14 @@ describe('plugin-mercury', () => {
             return Promise.resolve();
           });
 
-          mercury._handleImminentShutdown(sessionId);
+          mercury._handleImminentShutdown();
 
+          // Wait for async operations
           await promiseTick(50);
 
           const emitCalls = mercury._emit.getCalls();
           const hasCompleteEvent = emitCalls.some(
-            (call) =>
-              call.args[0] === sessionId &&
-              call.args[1] === 'event:mercury_shutdown_switchover_complete'
+            (call) => call.args[0] === 'event:mercury_shutdown_switchover_complete'
           );
 
           assert.isTrue(hasCompleteEvent, 'Should emit switchover complete event');
@@ -1478,16 +1294,16 @@ describe('plugin-mercury', () => {
 
           connectWithBackoffStub.returns(Promise.reject(testError));
 
-          mercury._handleImminentShutdown(sessionId);
+          mercury._handleImminentShutdown();
           await promiseTick(50);
 
+          // Check if failure event was emitted
           const emitCalls = mercury._emit.getCalls();
           const hasFailureEvent = emitCalls.some(
             (call) =>
-              call.args[0] === sessionId &&
-              call.args[1] === 'event:mercury_shutdown_switchover_failed' &&
-              call.args[2] &&
-              call.args[2].reason === testError
+              call.args[0] === 'event:mercury_shutdown_switchover_failed' &&
+              call.args[1] &&
+              call.args[1].reason === testError
           );
 
           assert.isTrue(hasFailureEvent, 'Should emit switchover failed event');
@@ -1496,9 +1312,10 @@ 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(sessionId);
+          mercury._handleImminentShutdown();
           await promiseTick(50);
 
+          // Old socket should not be closed immediately - server will close it
           assert.equal(mercury.socket.removeAllListeners.callCount, 0);
         });
       });
@@ -1595,16 +1412,18 @@ describe('plugin-mercury', () => {
       });
 
       describe('#_attemptConnection() with shutdown switchover', () => {
-        let prepareAndOpenSocketStub, callback;
-        const sessionId = 'mercury-default-session';
+        let mockSocket, prepareAndOpenSocketStub, callback;
 
         beforeEach(() => {
+          mockSocket = {
+            url: 'ws://test.com',
+          };
           prepareAndOpenSocketStub = sinon
             .stub(mercury, '_prepareAndOpenSocket')
             .returns(Promise.resolve('ws://new-socket.com'));
           callback = sinon.stub();
-          mercury._shutdownSwitchoverBackoffCalls.set(sessionId, {abort: sinon.stub()});
-          mercury.socket = {url: 'ws://test.com'};
+          mercury._shutdownSwitchoverBackoffCall = {}; // Mock backoff call
+          mercury.socket = mockSocket;
           mercury.connected = true;
           sinon.stub(mercury, '_emit');
           sinon.stub(mercury, '_attachSocketEventListeners');
@@ -1614,26 +1433,28 @@ 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', sessionId, callback, {
+          await mercury._attemptConnection('ws://test.com', 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', sessionId, callback, {
+          await mercury._attemptConnection('ws://test.com', callback, {
             isShutdownSwitchover: true,
             onSuccess: onSuccessStub,
           });
@@ -1643,22 +1464,20 @@ describe('plugin-mercury', () => {
         });
 
         it('should emit shutdown switchover complete event', async () => {
-          await mercury._attemptConnection('ws://test.com', sessionId, callback, {
+          const oldSocket = mercury.socket;
+
+          await mercury._attemptConnection('ws://test.com', callback, {
             isShutdownSwitchover: true,
             onSuccess: (newSocket, url) => {
+              // Simulate the onSuccess callback behavior
               mercury.socket = newSocket;
               mercury.connected = true;
-              mercury._emit(
-                sessionId,
-                'event:mercury_shutdown_switchover_complete',
-                {url}
-              );
+              mercury._emit('event:mercury_shutdown_switchover_complete', {url});
             },
           });
 
           assert.calledWith(
             mercury._emit,
-            sessionId,
             'event:mercury_shutdown_switchover_complete',
             sinon.match.has('url', 'ws://new-socket.com')
           );
@@ -1667,25 +1486,25 @@ describe('plugin-mercury', () => {
         it('should use simpler error handling for shutdown switchover failures', async () => {
           prepareAndOpenSocketStub.returns(Promise.reject(new Error('Connection failed')));
 
-          await mercury
-            ._attemptConnection('ws://test.com', sessionId, callback, {
+          try {
+            await mercury._attemptConnection('ws://test.com', callback, {
               isShutdownSwitchover: true,
-            })
-            .catch(() => {});
+            });
+          } catch (err) {
+            // Error should be caught and passed to callback
+          }
 
+          // 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._shutdownSwitchoverBackoffCalls.clear();
+          mercury._shutdownSwitchoverBackoffCall = undefined;
 
-          const result = mercury._attemptConnection(
-            'ws://test.com',
-            sessionId,
-            callback,
-            {isShutdownSwitchover: true}
-          );
+          const result = mercury._attemptConnection('ws://test.com', callback, {
+            isShutdownSwitchover: true,
+          });
 
           return result.catch((err) => {
             assert.instanceOf(err, Error);
@@ -1695,28 +1514,35 @@ describe('plugin-mercury', () => {
       });
 
       describe('#_connectWithBackoff() with shutdown switchover', () => {
-        const sessionId = 'mercury-default-session';
+        // 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.
 
         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(sessionId);
+          mercury._handleImminentShutdown();
 
+          // Verify it was called with shutdown context
           assert.calledOnce(connectWithBackoffStub);
           const callArgs = connectWithBackoffStub.firstCall.args;
-          assert.equal(callArgs[1], sessionId);
-          assert.isObject(callArgs[2]);
-          assert.isTrue(callArgs[2].isShutdownSwitchover);
+          assert.isObject(callArgs[1]); // context
+          assert.isTrue(callArgs[1].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, sid, cb) => cb());
+          attemptStub.callsFake((url, callback) => {
+            // Immediately succeed
+            callback();
+          });
 
+          // Call _connectWithBackoff with shutdown context
           const context = {
             isShutdownSwitchover: true,
             attemptOptions: {
@@ -1725,30 +1551,34 @@ describe('plugin-mercury', () => {
             },
           };
 
-          const promise = mercury._connectWithBackoff(undefined, sessionId, context);
+          // Start the backoff
+          const promise = mercury._connectWithBackoff(undefined, context);
 
+          // Check that _attemptConnection was called with shutdown options
           return promise.then(() => {
             assert.calledOnce(attemptStub);
             const callArgs = attemptStub.firstCall.args;
-            assert.equal(callArgs[1], sessionId);
-            assert.isObject(callArgs[3]);
-            assert.isTrue(callArgs[3].isShutdownSwitchover);
+            assert.isObject(callArgs[2]); // options parameter
+            assert.isTrue(callArgs[2].isShutdownSwitchover);
+
             attemptStub.restore();
           });
         });
 
         it('should set and clear state flags appropriately', () => {
-          sinon.stub(mercury, '_attemptConnection').callsFake((url, sid, cb) => cb());
+          // Stub to prevent actual connection
+          sinon.stub(mercury, '_attemptConnection').callsFake((url, callback) => callback());
 
-          mercury._shutdownSwitchoverBackoffCalls.set(sessionId, {placeholder: true});
+          mercury._shutdownSwitchoverInProgress = true;
 
-          const promise = mercury._connectWithBackoff(undefined, sessionId, {
+          const promise = mercury._connectWithBackoff(undefined, {
             isShutdownSwitchover: true,
             attemptOptions: {isShutdownSwitchover: true, onSuccess: () => {}},
           });
 
           return promise.then(() => {
-            assert.isUndefined(mercury._shutdownSwitchoverBackoffCalls.get(sessionId));
+            // Should be cleared after completion
+            assert.isFalse(mercury._shutdownSwitchoverInProgress);
             mercury._attemptConnection.restore();
           });
         });
@@ -1756,30 +1586,32 @@ describe('plugin-mercury', () => {
 
       describe('#disconnect() with shutdown switchover in progress', () => {
         let abortStub;
-        const sessionId = 'mercury-default-session';
 
         beforeEach(() => {
-          mercury.sockets.clear();
-          mercury.sockets.set(sessionId, {
+          mercury.socket = {
             close: sinon.stub().returns(Promise.resolve()),
             removeAllListeners: sinon.stub(),
-          });
+          };
           abortStub = sinon.stub();
-          mercury._shutdownSwitchoverBackoffCalls.set(sessionId, {abort: abortStub});
+          mercury._shutdownSwitchoverBackoffCall = {
+            abort: abortStub,
+          };
         });
 
         it('should abort shutdown switchover backoff call on disconnect', async () => {
-          await mercury.disconnect(undefined, sessionId);
+          await mercury.disconnect();
 
           assert.calledOnce(abortStub);
         });
 
         it('should handle disconnect when no switchover is in progress', async () => {
-          mercury._shutdownSwitchoverBackoffCalls.clear();
+          mercury._shutdownSwitchoverBackoffCall = undefined;
 
-          await mercury.disconnect(undefined, sessionId);
+          // Should not throw
+          await mercury.disconnect();
 
-          assert.calledOnce(mercury.sockets.get(sessionId).close);
+          // Should still close the socket
+          assert.calledOnce(mercury.socket.close);
         });
       });
     });