@webex/internal-plugin-mercury 3.11.0 → 3.12.0-llmrefactor.2

package/README.md

@@ -29,6 +29,60 @@ const webex = new WebexCore();
 webex.internal.mercury.WHATEVER;
 ```
 
+### Multiple Connections
+
+Mercury now supports multiple simultaneous websocket connections scoped by `sessionId`.
+
+```js
+const mercury = webex.internal.mercury;
+
+// Default session
+await mercury.connect();
+
+// Additional session
+await mercury.connect(undefined, 'secondary-session');
+
+// Disconnect only one session
+await mercury.disconnect(undefined, 'secondary-session');
+
+// Disconnect everything
+await mercury.disconnectAll();
+```
+
+#### Listening to multiple connections
+
+```js
+const mercury = webex.internal.mercury;
+const secondarySessionId = 'secondary-session';
+
+// Connect both sessions first.
+await mercury.connect();
+await mercury.connect(undefined, secondarySessionId);
+
+// Default session listeners use the base event name.
+mercury.on('online', () => {
+  console.log('[default] online');
+});
+
+mercury.on('event:conversation.activity', (envelope) => {
+  console.log('[default] activity', envelope.data?.eventType);
+});
+
+// Non-default sessions use :<sessionId> suffix.
+mercury.on(`online:${secondarySessionId}`, () => {
+  console.log(`[${secondarySessionId}] online`);
+});
+
+mercury.on(`event:conversation.activity:${secondarySessionId}`, (envelope) => {
+  console.log(`[${secondarySessionId}] activity`, envelope.data?.eventType);
+});
+```
+
+Notes:
+- `connect(webSocketUrl, sessionId)` and `disconnect(options, sessionId)` are session-aware.
+- Non-default sessions emit events with a `:<sessionId>` suffix (for example, `online:secondary-session`).
+- `getSocket(sessionId)` returns the socket for a specific session.
+
 ## Config Options
 
 ### Using A Proxy Agent To Open A Websocket Connection

package/dist/index.js

@@ -1,6 +1,9 @@
 "use strict";
 
+var _typeof = require("@babel/runtime-corejs2/helpers/typeof");
+var _WeakMap = require("@babel/runtime-corejs2/core-js/weak-map");
 var _Object$defineProperty = require("@babel/runtime-corejs2/core-js/object/define-property");
+var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs2/core-js/object/get-own-property-descriptor");
 var _interopRequireDefault = require("@babel/runtime-corejs2/helpers/interopRequireDefault");
 _Object$defineProperty(exports, "__esModule", {
   value: true
@@ -29,6 +32,12 @@ _Object$defineProperty(exports, "Mercury", {
     return _mercury.default;
   }
 });
+_Object$defineProperty(exports, "MercuryPlugin", {
+  enumerable: true,
+  get: function get() {
+    return _mercuryPlugin.MercuryPlugin;
+  }
+});
 _Object$defineProperty(exports, "NotAuthorized", {
   enumerable: true,
   get: function get() {
@@ -63,15 +72,17 @@ require("@webex/internal-plugin-device");
 require("@webex/internal-plugin-feature");
 require("@webex/internal-plugin-metrics");
 var _webexCore = require("@webex/webex-core");
-var _mercury = _interopRequireDefault(require("./mercury"));
+var _mercuryPlugin = _interopRequireWildcard(require("./mercury-plugin"));
 var _config = _interopRequireDefault(require("./config"));
+var _mercury = _interopRequireDefault(require("./mercury"));
 var _socket = _interopRequireDefault(require("./socket"));
 var _errors = require("./errors");
+function _interopRequireWildcard(e, t) { if ("function" == typeof _WeakMap) var r = new _WeakMap(), n = new _WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = _Object$defineProperty) && _Object$getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 /*!
  * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
  */
 
-(0, _webexCore.registerInternalPlugin)('mercury', _mercury.default, {
+(0, _webexCore.registerInternalPlugin)('mercury', _mercuryPlugin.default, {
   config: _config.default,
   onBeforeLogout: function onBeforeLogout() {
     return this.logout();

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["require","_webexCore","_mercury","_interopRequireDefault","_config","_socket","_errors","registerInternalPlugin","Mercury","config","onBeforeLogout","logout"],"sources":["index.js"],"sourcesContent":["/*!\n * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.\n */\n\nimport '@webex/internal-plugin-device';\nimport '@webex/internal-plugin-feature';\nimport '@webex/internal-plugin-metrics';\n\nimport {registerInternalPlugin} from '@webex/webex-core';\n\nimport Mercury from './mercury';\nimport config from './config';\n\nregisterInternalPlugin('mercury', Mercury, {\n  config,\n  onBeforeLogout() {\n    return this.logout();\n  },\n});\n\nexport {default} from './mercury';\nexport {default as Mercury} from './mercury';\nexport {default as Socket} from './socket';\nexport {default as config} from './config';\nexport {\n  BadRequest,\n  ConnectionError,\n  Forbidden,\n  NotAuthorized,\n  UnknownResponse,\n  // NotFound\n} from './errors';\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIAA,OAAA;AACAA,OAAA;AACAA,OAAA;AAEA,IAAAC,UAAA,GAAAD,OAAA;AAEA,IAAAE,QAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,OAAA,GAAAD,sBAAA,CAAAH,OAAA;AAWA,IAAAK,OAAA,GAAAF,sBAAA,CAAAH,OAAA;AAEA,IAAAM,OAAA,GAAAN,OAAA;AAxBA;AACA;AACA;;AAWA,IAAAO,iCAAsB,EAAC,SAAS,EAAEC,gBAAO,EAAE;EACzCC,MAAM,EAANA,eAAM;EACNC,cAAc,WAAdA,cAAcA,CAAA,EAAG;IACf,OAAO,IAAI,CAACC,MAAM,CAAC,CAAC;EACtB;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["require","_webexCore","_mercuryPlugin","_interopRequireWildcard","_config","_interopRequireDefault","_mercury","_socket","_errors","e","t","_WeakMap","r","n","__esModule","o","i","f","__proto__","default","_typeof","has","get","set","_t","hasOwnProperty","call","_Object$defineProperty","_Object$getOwnPropertyDescriptor","registerInternalPlugin","MercuryPlugin","config","onBeforeLogout","logout"],"sources":["index.js"],"sourcesContent":["/*!\n * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.\n */\n\nimport '@webex/internal-plugin-device';\nimport '@webex/internal-plugin-feature';\nimport '@webex/internal-plugin-metrics';\n\nimport {registerInternalPlugin} from '@webex/webex-core';\n\nimport MercuryPlugin from './mercury-plugin';\nimport config from './config';\n\nregisterInternalPlugin('mercury', MercuryPlugin, {\n  config,\n  onBeforeLogout() {\n    return this.logout();\n  },\n});\n\nexport {default} from './mercury';\nexport {default as Mercury} from './mercury';\nexport {MercuryPlugin} from './mercury-plugin';\nexport {default as Socket} from './socket';\nexport {default as config} from './config';\nexport {\n  BadRequest,\n  ConnectionError,\n  Forbidden,\n  NotAuthorized,\n  UnknownResponse,\n  // NotFound\n} from './errors';\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIAA,OAAA;AACAA,OAAA;AACAA,OAAA;AAEA,IAAAC,UAAA,GAAAD,OAAA;AAEA,IAAAE,cAAA,GAAAC,uBAAA,CAAAH,OAAA;AACA,IAAAI,OAAA,GAAAC,sBAAA,CAAAL,OAAA;AASA,IAAAM,QAAA,GAAAD,sBAAA,CAAAL,OAAA;AAGA,IAAAO,OAAA,GAAAF,sBAAA,CAAAL,OAAA;AAEA,IAAAQ,OAAA,GAAAR,OAAA;AAOkB,SAAAG,wBAAAM,CAAA,EAAAC,CAAA,6BAAAC,QAAA,MAAAC,CAAA,OAAAD,QAAA,IAAAE,CAAA,OAAAF,QAAA,YAAAR,uBAAA,YAAAA,wBAAAM,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,gBAAAW,OAAA,CAAAX,CAAA,0BAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAM,GAAA,CAAAZ,CAAA,UAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,GAAAM,CAAA,CAAAQ,GAAA,CAAAd,CAAA,EAAAQ,CAAA,cAAAO,EAAA,IAAAf,CAAA,gBAAAe,EAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAjB,CAAA,EAAAe,EAAA,OAAAR,CAAA,IAAAD,CAAA,GAAAY,sBAAA,KAAAC,gCAAA,CAAAnB,CAAA,EAAAe,EAAA,OAAAR,CAAA,CAAAM,GAAA,IAAAN,CAAA,CAAAO,GAAA,IAAAR,CAAA,CAAAE,CAAA,EAAAO,EAAA,EAAAR,CAAA,IAAAC,CAAA,CAAAO,EAAA,IAAAf,CAAA,CAAAe,EAAA,WAAAP,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAhClB;AACA;AACA;;AAWA,IAAAmB,iCAAsB,EAAC,SAAS,EAAEC,sBAAa,EAAE;EAC/CC,MAAM,EAANA,eAAM;EACNC,cAAc,WAAdA,cAAcA,CAAA,EAAG;IACf,OAAO,IAAI,CAACC,MAAM,CAAC,CAAC;EACtB;AACF,CAAC,CAAC","ignoreList":[]}

package/dist/mercury-plugin.js

@@ -0,0 +1,125 @@
+"use strict";
+
+var _Reflect$construct = require("@babel/runtime-corejs2/core-js/reflect/construct");
+var _Object$defineProperty = require("@babel/runtime-corejs2/core-js/object/define-property");
+var _interopRequireDefault = require("@babel/runtime-corejs2/helpers/interopRequireDefault");
+_Object$defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MercuryPlugin = void 0;
+_Object$defineProperty(exports, "config", {
+  enumerable: true,
+  get: function get() {
+    return _config.default;
+  }
+});
+exports.default = void 0;
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/createClass"));
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/possibleConstructorReturn"));
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/getPrototypeOf"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/inherits"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/defineProperty"));
+var _webexCore = require("@webex/webex-core");
+var _config = _interopRequireDefault(require("./config"));
+function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? _Reflect$construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(_Reflect$construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /* eslint-disable require-jsdoc */ /*!
+ * Copyright (c) 2015-2024 Cisco Systems, Inc. See LICENSE file.
+ */ // @ts-ignore
+// since mercury-plugin.ts is a .ts file, the TS language server tries to parse mercury.js and chokes on the @deprecated decorator.
+// using a require() call instead of import to avoid TS parsing the file:
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+var Mercury = require('./mercury').default;
+var MercuryPlugin = exports.MercuryPlugin = /*#__PURE__*/function (_ref) {
+  function MercuryPlugin() {
+    var _this;
+    (0, _classCallCheck2.default)(this, MercuryPlugin);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _callSuper(this, MercuryPlugin, [].concat(args));
+    (0, _defineProperty2.default)(_this, "namespace", 'Mercury');
+    (0, _defineProperty2.default)(_this, "_mercury", void 0);
+    _this._mercury = new Mercury({
+      parent: _this.webex
+    });
+
+    // Re-emit every event from Mercury on this plugin so listeners attached to
+    // `this.webex.internal.mercury` continue to work.
+    _this._mercury.on('all', function (eventName) {
+      var _ref2;
+      for (var _len2 = arguments.length, rest = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+        rest[_key2 - 1] = arguments[_key2];
+      }
+      (_ref2 = _this).trigger.apply(_ref2, [eventName].concat(rest));
+    });
+    return _this;
+  }
+
+  /** True when the primary Mercury socket is connected. */
+  (0, _inherits2.default)(MercuryPlugin, _ref);
+  return (0, _createClass2.default)(MercuryPlugin, [{
+    key: "connected",
+    get: function get() {
+      var _this$_mercury$connec, _this$_mercury;
+      return (_this$_mercury$connec = (_this$_mercury = this._mercury) === null || _this$_mercury === void 0 ? void 0 : _this$_mercury.connected) !== null && _this$_mercury$connec !== void 0 ? _this$_mercury$connec : false;
+    }
+
+    /** The primary socket, if connected. */
+  }, {
+    key: "socket",
+    get: function get() {
+      var _this$_mercury2;
+      return (_this$_mercury2 = this._mercury) === null || _this$_mercury2 === void 0 ? void 0 : _this$_mercury2.socket;
+    }
+
+    /** Cluster service URLs received from registration status event. */
+  }, {
+    key: "localClusterServiceUrls",
+    get: function get() {
+      var _this$_mercury3;
+      return (_this$_mercury3 = this._mercury) === null || _this$_mercury3 === void 0 ? void 0 : _this$_mercury3.localClusterServiceUrls;
+    }
+  }, {
+    key: "getLastError",
+    value: function getLastError() {
+      var _this$_mercury4;
+      return (_this$_mercury4 = this._mercury) === null || _this$_mercury4 === void 0 ? void 0 : _this$_mercury4.getLastError();
+    }
+  }, {
+    key: "hasEverConnected",
+    get: function get() {
+      var _this$_mercury$hasEve, _this$_mercury5;
+      return (_this$_mercury$hasEve = (_this$_mercury5 = this._mercury) === null || _this$_mercury5 === void 0 ? void 0 : _this$_mercury5.hasEverConnected) !== null && _this$_mercury$hasEve !== void 0 ? _this$_mercury$hasEve : false;
+    }
+  }, {
+    key: "connect",
+    value: function connect(webSocketUrl) {
+      return this._mercury.connect(webSocketUrl);
+    }
+  }, {
+    key: "disconnect",
+    value: function disconnect(options) {
+      return this._mercury.disconnect(options);
+    }
+  }, {
+    key: "logout",
+    value: function logout() {
+      var normalReconnectReasons = ['idle', 'done (forced)', 'pong not received', 'pong mismatch'];
+      var reason = this.config.beforeLogoutOptionsCloseReason;
+      var options = reason && !normalReconnectReasons.includes(reason) ? {
+        code: 3050,
+        reason: reason
+      } : undefined;
+      return this._mercury.disconnect(options);
+    }
+  }, {
+    key: "processRegistrationStatusEvent",
+    value: function processRegistrationStatusEvent(message) {
+      return this._mercury.processRegistrationStatusEvent(message);
+    }
+  }]);
+}(_webexCore.WebexPlugin);
+var _default = exports.default = MercuryPlugin;
+//# sourceMappingURL=mercury-plugin.js.map

package/dist/mercury-plugin.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_webexCore","require","_config","_interopRequireDefault","_callSuper","t","o","e","_getPrototypeOf2","default","_possibleConstructorReturn2","_isNativeReflectConstruct","_Reflect$construct","constructor","apply","Boolean","prototype","valueOf","call","Mercury","MercuryPlugin","exports","_ref","_this","_classCallCheck2","_len","arguments","length","args","Array","_key","concat","_defineProperty2","_mercury","parent","webex","on","eventName","_ref2","_len2","rest","_key2","trigger","_inherits2","_createClass2","key","get","_this$_mercury$connec","_this$_mercury","connected","_this$_mercury2","socket","_this$_mercury3","localClusterServiceUrls","value","getLastError","_this$_mercury4","_this$_mercury$hasEve","_this$_mercury5","hasEverConnected","connect","webSocketUrl","disconnect","options","logout","normalReconnectReasons","reason","config","beforeLogoutOptionsCloseReason","includes","code","undefined","processRegistrationStatusEvent","message","WebexPlugin","_default"],"sources":["mercury-plugin.ts"],"sourcesContent":["/* eslint-disable require-jsdoc */\n/*!\n * Copyright (c) 2015-2024 Cisco Systems, Inc. See LICENSE file.\n */\n\n// @ts-ignore\nimport {WebexPlugin} from '@webex/webex-core';\n\nimport config from './config';\n\n// since mercury-plugin.ts is a .ts file, the TS language server tries to parse mercury.js and chokes on the @deprecated decorator.\n// using a require() call instead of import to avoid TS parsing the file:\n\n// eslint-disable-next-line @typescript-eslint/no-var-requires\nconst Mercury = require('./mercury').default;\n\nexport class MercuryPlugin extends (WebexPlugin as any) {\n  namespace = 'Mercury';\n\n  private _mercury: any;\n\n  constructor(...args: any[]) {\n    super(...args);\n    this._mercury = new (Mercury as any)({parent: (this as any).webex});\n\n    // Re-emit every event from Mercury on this plugin so listeners attached to\n    // `this.webex.internal.mercury` continue to work.\n    this._mercury.on('all', (eventName: string, ...rest: any[]) => {\n      (this as any).trigger(eventName, ...rest);\n    });\n  }\n\n  /** True when the primary Mercury socket is connected. */\n  get connected(): boolean {\n    return this._mercury?.connected ?? false;\n  }\n\n  /** The primary socket, if connected. */\n  get socket(): any {\n    return this._mercury?.socket;\n  }\n\n  /** Cluster service URLs received from registration status event. */\n  get localClusterServiceUrls(): any {\n    return this._mercury?.localClusterServiceUrls;\n  }\n\n  getLastError(): any {\n    return this._mercury?.getLastError();\n  }\n\n  get hasEverConnected(): boolean {\n    return this._mercury?.hasEverConnected ?? false;\n  }\n\n  connect(webSocketUrl?: string): Promise<void> {\n    return this._mercury.connect(webSocketUrl);\n  }\n\n  disconnect(options?: any): Promise<void> {\n    return this._mercury.disconnect(options);\n  }\n\n  logout(): Promise<void> {\n    const normalReconnectReasons = ['idle', 'done (forced)', 'pong not received', 'pong mismatch'];\n    const reason = this.config.beforeLogoutOptionsCloseReason;\n    const options =\n      reason && !normalReconnectReasons.includes(reason) ? {code: 3050, reason} : undefined;\n\n    return this._mercury.disconnect(options);\n  }\n\n  processRegistrationStatusEvent(message: any): void {\n    return this._mercury.processRegistrationStatusEvent(message);\n  }\n}\n\nexport {config};\nexport default MercuryPlugin;\n"],"mappings":"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","ignoreList":[]}

package/dist/mercury.js

@@ -13,6 +13,7 @@ _Object$defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _now = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/date/now"));
 var _promise = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/promise"));
+var _stringify = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/json/stringify"));
 var _keys = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/keys"));
 var _assign = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/assign"));
 var _deleteProperty = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/reflect/delete-property"));
@@ -56,7 +57,14 @@ var Mercury = _webexCore.WebexPlugin.extend((_dec = (0, _common.deprecated)('Mer
     mercuryTimeOffset: {
       default: undefined,
       type: 'number'
-    }
+    },
+    backoffCall: 'object',
+    _connectPromise: 'object',
+    _shutdownSwitchoverBackoffCall: 'object',
+    _shutdownSwitchoverId: 'string',
+    // Store the resolved (pre-proxy) URL so reconnection uses a catalog-valid host
+    // instead of the potentially rewritten socket.url from an interceptor.
+    resolvedWebSocketUrl: 'string'
   },
   derived: {
     listening: {
@@ -139,12 +147,12 @@ var Mercury = _webexCore.WebexPlugin.extend((_dec = (0, _common.deprecated)('Mer
    */
   _handleImminentShutdown: function _handleImminentShutdown() {
     var _this3 = this;
+    var oldSocket = this.socket;
     try {
-      if (this._shutdownSwitchoverInProgress) {
+      if (this._shutdownSwitchoverBackoffCall) {
         this.logger.info("".concat(this.namespace, ": [shutdown] switchover already in progress"));
         return;
       }
-      this._shutdownSwitchoverInProgress = true;
       this._shutdownSwitchoverId = "".concat((0, _now.default)());
       this.logger.info("".concat(this.namespace, ": [shutdown] switchover start, id=").concat(this._shutdownSwitchoverId));
       this._connectWithBackoff(undefined, {
@@ -153,7 +161,7 @@ var Mercury = _webexCore.WebexPlugin.extend((_dec = (0, _common.deprecated)('Mer
           isShutdownSwitchover: true,
           onSuccess: function onSuccess(newSocket, webSocketUrl) {
             _this3.logger.info("".concat(_this3.namespace, ": [shutdown] switchover connected, url: ").concat(webSocketUrl));
-            var oldSocket = _this3.socket;
+
             // Atomically switch active socket reference
             _this3.socket = newSocket;
             _this3.connected = true; // remain connected throughout
@@ -177,7 +185,7 @@ var Mercury = _webexCore.WebexPlugin.extend((_dec = (0, _common.deprecated)('Mer
       });
     } catch (e) {
       this.logger.error("".concat(this.namespace, ": [shutdown] error during switchover"), e);
-      this._shutdownSwitchoverInProgress = false;
+      this._shutdownSwitchoverBackoffCall = undefined;
       this._emit('event:mercury_shutdown_switchover_failed', {
         reason: e
       });
@@ -190,30 +198,38 @@ var Mercury = _webexCore.WebexPlugin.extend((_dec = (0, _common.deprecated)('Mer
   getLastError: function getLastError() {
     return this.lastError;
   },
+  /**
+   * Get the underlying WebSocket.
+   * @returns {any} The socket instance, or undefined if not connected.
+   */
+  getSocket: function getSocket() {
+    return this.socket;
+  },
   connect: function connect(webSocketUrl) {
     var _this4 = this;
     if (this.connected) {
       this.logger.info("".concat(this.namespace, ": already connected, will not connect again"));
       return _promise.default.resolve();
     }
+
+    // If already connecting, return the existing promise so callers can await it
+    if (this._connectPromise) {
+      this.logger.info("".concat(this.namespace, ": connection already in progress, returning existing promise"));
+      return this._connectPromise;
+    }
     this.connecting = true;
     this.logger.info("".concat(this.namespace, ": starting connection attempt"));
-    this.logger.info("".concat(this.namespace, ": debug_mercury_logging stack: "), new Error('debug_mercury_logging').stack);
-    return _promise.default.resolve(this.webex.internal.device.registered || this.webex.internal.device.register()).then(function () {
+    this._connectPromise = _promise.default.resolve(this.webex.internal.device.registered || this.webex.internal.device.register()).then(function () {
       _this4.logger.info("".concat(_this4.namespace, ": connecting"));
       return _this4._connectWithBackoff(webSocketUrl);
+    }).finally(function () {
+      _this4._connectPromise = null;
     });
-  },
-  logout: function logout() {
-    this.logger.info("".concat(this.namespace, ": logout() called"));
-    this.logger.info("".concat(this.namespace, ": debug_mercury_logging stack: "), new Error('debug_mercury_logging').stack);
-    return this.disconnect(this.config.beforeLogoutOptionsCloseReason && !normalReconnectReasons.includes(this.config.beforeLogoutOptionsCloseReason) ? {
-      code: 3050,
-      reason: this.config.beforeLogoutOptionsCloseReason
-    } : undefined);
+    return this._connectPromise;
   },
   disconnect: function disconnect(options) {
     var _this5 = this;
+    this.logger.info("".concat(this.namespace, "#disconnect: connecting state: ").concat(this.connecting, ", connected state: ").concat(this.connected, ", socket exists: ").concat(!!this.socket, ", options: ").concat((0, _stringify.default)(options)));
     return new _promise.default(function (resolve) {
       if (_this5.backoffCall) {
         _this5.logger.info("".concat(_this5.namespace, ": aborting connection"));
@@ -226,7 +242,8 @@ var Mercury = _webexCore.WebexPlugin.extend((_dec = (0, _common.deprecated)('Mer
       if (_this5.socket) {
         _this5.socket.removeAllListeners('message');
         _this5.once('offline', resolve);
-        resolve(_this5.socket.close(options || undefined));
+        _this5.socket.close(options || undefined);
+        return;
       }
       resolve();
     });
@@ -301,6 +318,7 @@ var Mercury = _webexCore.WebexPlugin.extend((_dec = (0, _common.deprecated)('Mer
         webSocketUrl.query.multipleConnections = true;
       }
       webSocketUrl.query.clientTimestamp = (0, _now.default)();
+      delete webSocketUrl.search;
       return _url.default.format(webSocketUrl);
     });
   },
@@ -332,6 +350,8 @@ var Mercury = _webexCore.WebexPlugin.extend((_dec = (0, _common.deprecated)('Mer
 
       // Call the callback with the error before rejecting
       callback(_err);
+
+      // eslint-disable-next-line no-unreachable
       return _promise.default.reject(_err);
     }
 
@@ -413,9 +433,14 @@ var Mercury = _webexCore.WebexPlugin.extend((_dec = (0, _common.deprecated)('Mer
       }
       if (reason instanceof _errors.ConnectionError) {
         return _this7.webex.internal.feature.getFeature('developer', 'web-high-availability').then(function (haMessagingEnabled) {
+          var wsUrl = newWSUrl || reason.webSocketUrl;
           if (haMessagingEnabled) {
-            _this7.logger.info("".concat(_this7.namespace, ": received a generic connection error, will try to connect to another datacenter. failed, action: 'failed', url: ").concat(newWSUrl, " error: ").concat(reason.message));
-            return _this7.webex.internal.services.markFailedUrl(newWSUrl);
+            _this7.logger.info("".concat(_this7.namespace, ": received a generic connection error, will try to connect to another datacenter. failed, action: 'failed', url: ").concat(wsUrl, " error: ").concat(reason.message));
+            if (wsUrl) {
+              _this7.logger.info("".concat(_this7.namespace, ": marking ").concat(wsUrl, " as failed due to connection error"));
+              return _this7.webex.internal.services.markFailedUrl(wsUrl);
+            }
+            _this7.logger.info("".concat(_this7.namespace, ": no socket url available to mark as failed due to connection error"));
           }
           return null;
         }).then(function () {
@@ -450,8 +475,18 @@ var Mercury = _webexCore.WebexPlugin.extend((_dec = (0, _common.deprecated)('Mer
         options = _objectSpread(_objectSpread({}, options), _this8.webex.config.defaultMercuryOptions);
       }
       _this8.logger.info("".concat(_this8.namespace, ": ").concat(logPrefix, " url: ").concat(webSocketUrl));
+
+      // Store the resolved URL before socket.open(), which may be rewritten by
+      // an interceptor (e.g. same-site websocket proxy). On reconnection we need
+      // the original catalog-valid URL, not the post-proxy one from socket.url.
+      if (!isShutdownSwitchover) {
+        _this8.resolvedWebSocketUrl = webSocketUrl;
+      }
       return socket.open(webSocketUrl, options).then(function () {
         return webSocketUrl;
+      }).catch(function (err) {
+        err.webSocketUrl = webSocketUrl;
+        return _promise.default.reject(err);
       });
     });
   },
@@ -469,7 +504,6 @@ var Mercury = _webexCore.WebexPlugin.extend((_dec = (0, _common.deprecated)('Mer
       var onComplete = function onComplete(err) {
         // Clear state flags based on connection type
         if (isShutdownSwitchover) {
-          _this9._shutdownSwitchoverInProgress = false;
           _this9._shutdownSwitchoverBackoffCall = undefined;
         } else {
           _this9.connecting = false;
@@ -543,10 +577,19 @@ var Mercury = _webexCore.WebexPlugin.extend((_dec = (0, _common.deprecated)('Mer
     try {
       this.trigger.apply(this, args);
     } catch (error) {
-      this.logger.error("".concat(this.namespace, ": error occurred in event handler:"), error, ' with args: ', args);
+      try {
+        this.logger.error("".concat(this.namespace, ": error occurred in event handler:"), error, ' with args: ', args);
+      } catch (logError) {
+        // If even logging fails, just ignore to prevent cascading errors during cleanup
+        // eslint-disable-next-line no-console
+        console.error('Mercury _emit error handling failed:', logError);
+      }
     }
   },
   _getEventHandlers: function _getEventHandlers(eventType) {
+    if (!eventType) {
+      return [];
+    }
     var _eventType$split = eventType.split('.'),
       _eventType$split2 = (0, _slicedToArray2.default)(_eventType$split, 2),
       namespace = _eventType$split2[0],
@@ -571,14 +614,10 @@ var Mercury = _webexCore.WebexPlugin.extend((_dec = (0, _common.deprecated)('Mer
     try {
       var isActiveSocket = sourceSocket === this.socket;
       var reason = event.reason && event.reason.toLowerCase();
-      var socketUrl;
-      if (isActiveSocket && this.socket) {
-        // Active socket closed - get URL from current socket reference
-        socketUrl = this.socket.url;
-      } else if (sourceSocket) {
-        // Old socket closed - get URL from the closed socket
-        socketUrl = sourceSocket.url;
-      }
+
+      // Use the stored resolved URL for reconnection instead of sourceSocket.url,
+      // which may have been rewritten by an interceptor to a non-catalog host.
+      var socketUrl = this.resolvedWebSocketUrl || sourceSocket && sourceSocket.url;
       if (isActiveSocket) {
         // Only tear down state if the currently active socket closed
         if (this.socket) {
@@ -677,6 +716,10 @@ var Mercury = _webexCore.WebexPlugin.extend((_dec = (0, _common.deprecated)('Mer
       return _promise.default.resolve();
     }
     var data = envelope.data;
+    if (!data || !data.eventType) {
+      this._emit('event', envelope);
+      return _promise.default.resolve();
+    }
     this._applyOverrides(data);
     return this._getEventHandlers(data.eventType).reduce(function (promise, handler) {
       return promise.then(function () {
@@ -690,9 +733,9 @@ var Mercury = _webexCore.WebexPlugin.extend((_dec = (0, _common.deprecated)('Mer
       });
     }, _promise.default.resolve()).then(function () {
       _this0._emit('event', event.data);
-      var _data$eventType$split = data.eventType.split('.'),
-        _data$eventType$split2 = (0, _slicedToArray2.default)(_data$eventType$split, 1),
-        namespace = _data$eventType$split2[0];
+      var _ref3 = data.eventType ? data.eventType.split('.') : [],
+        _ref4 = (0, _slicedToArray2.default)(_ref3, 1),
+        namespace = _ref4[0];
       if (namespace === data.eventType) {
         _this0._emit("event:".concat(namespace), envelope);
       } else {
@@ -713,7 +756,7 @@ var Mercury = _webexCore.WebexPlugin.extend((_dec = (0, _common.deprecated)('Mer
     this.logger.info("".concat(this.namespace, ": reconnecting"));
     return this.connect(webSocketUrl);
   },
-  version: "0.0.0"
-}, (0, _applyDecoratedDescriptor2.default)(_obj, "connect", [_common.oneFlight], (0, _getOwnPropertyDescriptor.default)(_obj, "connect"), _obj), (0, _applyDecoratedDescriptor2.default)(_obj, "disconnect", [_common.oneFlight], (0, _getOwnPropertyDescriptor.default)(_obj, "disconnect"), _obj), (0, _applyDecoratedDescriptor2.default)(_obj, "listen", [_dec], (0, _getOwnPropertyDescriptor.default)(_obj, "listen"), _obj), (0, _applyDecoratedDescriptor2.default)(_obj, "stopListening", [_dec2], (0, _getOwnPropertyDescriptor.default)(_obj, "stopListening"), _obj), _obj));
+  version: "3.12.0-llmrefactor.2"
+}, (0, _applyDecoratedDescriptor2.default)(_obj, "listen", [_dec], (0, _getOwnPropertyDescriptor.default)(_obj, "listen"), _obj), (0, _applyDecoratedDescriptor2.default)(_obj, "stopListening", [_dec2], (0, _getOwnPropertyDescriptor.default)(_obj, "stopListening"), _obj), _obj));
 var _default = exports.default = Mercury;
 //# sourceMappingURL=mercury.js.map