@webex/internal-plugin-mercury 3.10.0-multi-llms.1 → 3.10.0-next.10

package/src/socket/socket-base.js

@@ -33,8 +33,6 @@ export default class Socket extends EventEmitter {
     this._domain = 'unknown-domain';
     this.onmessage = this.onmessage.bind(this);
     this.onclose = this.onclose.bind(this);
-    // Increase max listeners to avoid memory leak warning in tests
-    this.setMaxListeners(5);
   }
 
   /**
@@ -360,20 +358,9 @@ export default class Socket extends EventEmitter {
       return Promise.reject(new Error('`event.data.id` is required'));
     }
 
-    // Don't try to acknowledge if socket is not in open state
-    if (this.readyState !== 1) {
-      return Promise.resolve(); // Silently ignore acknowledgment for closed sockets
-    }
-
     return this.send({
       messageId: event.data.id,
       type: 'ack',
-    }).catch((error) => {
-      // Gracefully handle send errors (like INVALID_STATE_ERROR) to prevent test issues
-      if (error.message === 'INVALID_STATE_ERROR') {
-        return Promise.resolve(); // Socket was closed, ignore the acknowledgment
-      }
-      throw error; // Re-throw other errors
     });
   }
 

package/test/unit/spec/mercury-events.js

@@ -38,31 +38,14 @@ describe('plugin-mercury', () => {
         },
         timestamp: Date.now(),
         trackingId: `suffix_${uuid.v4()}_${Date.now()}`,
-        sessionId: 'mercury-default-session',
       };
 
       beforeEach(() => {
         clock = FakeTimers.install({now: Date.now()});
       });
 
-      afterEach(async () => {
+      afterEach(() => {
         clock.uninstall();
-        // Clean up mercury socket and mockWebSocket
-        if (mercury && mercury.socket) {
-          try {
-            await mercury.socket.close();
-          } catch (e) {}
-        }
-        if (mockWebSocket && typeof mockWebSocket.close === 'function') {
-          mockWebSocket.close();
-        }
-        // Restore stubs
-        if (Socket.getWebSocketConstructor.restore) {
-          Socket.getWebSocketConstructor.restore();
-        }
-        if (socketOpenStub && socketOpenStub.restore) {
-          socketOpenStub.restore();
-        }
       });
 
       beforeEach(() => {
@@ -93,7 +76,6 @@ describe('plugin-mercury', () => {
         });
 
         mercury = webex.internal.mercury;
-        mercury.defaultSessionId = 'mercury-default-session';
       });
 
       afterEach(() => {
@@ -319,7 +301,7 @@ describe('plugin-mercury', () => {
                 })
                 .then(() => {
                   assert.called(offlineSpy);
-                  assert.calledWith(offlineSpy, {code, reason, sessionId: 'mercury-default-session'});
+                  assert.calledWith(offlineSpy, {code, reason});
                   switch (action) {
                     case 'close':
                       assert.called(permanentSpy);

package/test/unit/spec/mercury.js

@@ -77,6 +77,7 @@ describe('plugin-mercury', () => {
         markFailedUrl: sinon.stub().returns(Promise.resolve()),
         switchActiveClusterIds: sinon.stub(),
         invalidateCache: sinon.stub(),
+        isValidHost: sinon.stub().returns(Promise.resolve(true)),
       };
       webex.internal.metrics.submitClientMetrics = sinon.stub();
       webex.internal.newMetrics.callDiagnosticMetrics.setMercuryConnectedStatus = sinon.stub();
@@ -99,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();
       }
@@ -132,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()', () => {
@@ -524,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();
-
-          // Wait for the connection to be established before proceeding
-          mockWebSocket.open();
+          mercury.connect();
 
-          return promise.then(() =>
-            promiseTick(2)
+          return promiseTick(2)
             .then(() => {
               clock.tick(6 * webex.internal.mercury.config.backoffTimeReset);
 
@@ -538,8 +509,7 @@ describe('plugin-mercury', () => {
             })
             .then(() => {
               assert.calledOnce(Socket.prototype.open);
-              })
-          );
+            });
         });
       });
 
@@ -614,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');
@@ -630,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);
       });
     });
 
@@ -753,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');
 
@@ -776,15 +746,15 @@ describe('plugin-mercury', () => {
 
           let reason;
 
-          mercury.backoffCalls.clear();
-          mercury._attemptConnection('ws://example.com', 'mercury-default-session',(_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'
             );
           });
         });
@@ -806,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);
             });
@@ -900,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);
       });
@@ -910,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', () => {
@@ -921,7 +891,7 @@ describe('plugin-mercury', () => {
               wsWriteTimestamp: invalidTimestamp,
             },
           };
-          mercury._setTimeOffset('mercury-default-session', event);
+          mercury._setTimeOffset(event);
           assert.isUndefined(mercury.mercuryTimeOffset);
         });
       });
@@ -967,6 +937,15 @@ describe('plugin-mercury', () => {
             ._prepareUrl()
             .then((wsUrl) => assert.match(wsUrl, /example-2.com/));
         });
+        it('uses high priority url instead of provided webSocketUrl', () => {
+          webex.internal.feature.getFeature.onCall(0).returns(Promise.resolve(true));
+          webex.internal.services.convertUrlToPriorityHostUrl = sinon
+            .stub()
+            .returns(Promise.resolve('ws://example-2.com'));
+          return webex.internal.mercury
+            ._prepareUrl('ws://provided.com')
+            .then((wsUrl) => assert.match(wsUrl, /example-2.com/));
+        });
       });
 
       describe("when 'web-shared-socket' is enabled", () => {