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

package/src/socket/socket-base.js

@@ -17,7 +17,6 @@ import {
   UnknownResponse,
   // NotFound
 } from '../errors';
-import {SOCKET_READY_STATE} from './constants';
 
 const sockets = new WeakMap();
 
@@ -34,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(10);
   }
 
   /**
@@ -117,10 +114,7 @@ export default class Socket extends EventEmitter {
       // logger is defined once open is called
       this.logger.info(`socket,${this._domain}: closing`);
 
-      if (
-        socket.readyState === SOCKET_READY_STATE.CLOSING ||
-        socket.readyState === SOCKET_READY_STATE.CLOSED
-      ) {
+      if (socket.readyState === 2 || socket.readyState === 3) {
         this.logger.info(`socket,${this._domain}: already closed`);
         resolve();
 
@@ -167,27 +161,7 @@ export default class Socket extends EventEmitter {
         resolve(event);
       };
 
-      // If socket is still connecting, manually trigger close handler with desired code
-      // because calling close() on a CONNECTING socket may not preserve custom codes
-      if (socket.readyState === SOCKET_READY_STATE.CONNECTING) {
-        this.logger.info(
-          `socket,${this._domain}: socket still connecting, triggering close manually`
-        );
-        clearTimeout(closeTimer);
-        const closeEvent = {code: options.code, reason: options.reason};
-        this.onclose(closeEvent);
-        resolve(closeEvent);
-        try {
-          socket.close(options.code, options.reason);
-        } catch (error) {
-          this.logger.info(
-            `socket,${this._domain}: error while closing CONNECTING socket, likely due to browser incompatibility with custom close codes`,
-            error
-          );
-        }
-      } else {
-        socket.close(options.code, options.reason);
-      }
+      socket.close(options.code, options.reason);
     });
   }
 
@@ -354,7 +328,7 @@ export default class Socket extends EventEmitter {
    */
   send(data) {
     return new Promise((resolve, reject) => {
-      if (this.readyState !== SOCKET_READY_STATE.OPEN) {
+      if (this.readyState !== 1) {
         return reject(new Error('INVALID_STATE_ERROR'));
       }
 
@@ -384,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 !== SOCKET_READY_STATE.OPEN) {
-      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);