@webex/calling 3.10.0 → 3.11.0-next.1

package/dist/CallingClient/CallingClient.js

@@ -17,13 +17,13 @@ exports.createClient = exports.CallingClient = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs2/regenerator"));
 var _values = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/values"));
 var _keys = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/keys"));
+var _stringify = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/json/stringify"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/createClass"));
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/assertThisInitialized"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/inherits"));
 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 Media = _interopRequireWildcard(require("@webex/internal-media-core"));
 var _asyncMutex = require("async-mutex");
@@ -41,11 +41,11 @@ var _line = _interopRequireDefault(require("./line"));
 var _types4 = require("../Metrics/types");
 var _Metrics = require("../Metrics");
 var _windowsChromiumIceWarmupUtils = _interopRequireDefault(require("./windowsChromiumIceWarmupUtils"));
-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); }
+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 _t7 in e) "default" !== _t7 && {}.hasOwnProperty.call(e, _t7) && ((i = (o = _Object$defineProperty) && _Object$getOwnPropertyDescriptor(e, _t7)) && (i.get || i.set) ? o(f, _t7, i) : f[_t7] = e[_t7]); return f; })(e, t); }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof _Symbol && r[_Symbol$iterator] || r["@@iterator"]; if (!t) { if (_Array$isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? _Array$from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2.default)(t); if (r) { var s = (0, _getPrototypeOf2.default)(this).constructor; e = _Reflect$construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2.default)(this, e); }; }
+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 no-underscore-dangle */ /* eslint-disable valid-jsdoc */ /* eslint-disable @typescript-eslint/no-shadow */
 /**
  * The `CallingClient` module provides a set of APIs for line registration and calling functionalities within the SDK.
@@ -58,8 +58,6 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * ```
  */
 var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
-  (0, _inherits2.default)(CallingClient, _Eventing);
-  var _super = _createSuper(CallingClient);
   /**
    * @ignore
    */
@@ -67,33 +65,33 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
     var _this$sdkConfig, _this$sdkConfig$servi, _this$sdkConfig2, _this$sdkConfig2$logg;
     var _this;
     (0, _classCallCheck2.default)(this, CallingClient);
-    _this = _super.call(this);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "sdkConnector", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "webex", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "mutex", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "callManager", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "metricManager", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "sdkConfig", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "primaryMobiusUris", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "backupMobiusUris", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "mobiusClusters", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "mobiusHost", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "mediaEngine", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "lineDict", {});
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isNetworkDown", false);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "networkDownTimestamp", '');
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "networkUpTimestamp", '');
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "mercuryDownTimestamp", '');
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "mercuryUpTimestamp", '');
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleNetworkOffline", /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee() {
+    _this = _callSuper(this, CallingClient);
+    (0, _defineProperty2.default)(_this, "sdkConnector", void 0);
+    (0, _defineProperty2.default)(_this, "webex", void 0);
+    (0, _defineProperty2.default)(_this, "mutex", void 0);
+    (0, _defineProperty2.default)(_this, "callManager", void 0);
+    (0, _defineProperty2.default)(_this, "metricManager", void 0);
+    (0, _defineProperty2.default)(_this, "sdkConfig", void 0);
+    (0, _defineProperty2.default)(_this, "primaryMobiusUris", void 0);
+    (0, _defineProperty2.default)(_this, "backupMobiusUris", void 0);
+    (0, _defineProperty2.default)(_this, "mobiusClusters", void 0);
+    (0, _defineProperty2.default)(_this, "mobiusHost", void 0);
+    (0, _defineProperty2.default)(_this, "mediaEngine", void 0);
+    (0, _defineProperty2.default)(_this, "lineDict", {});
+    (0, _defineProperty2.default)(_this, "isNetworkDown", false);
+    (0, _defineProperty2.default)(_this, "networkDownTimestamp", '');
+    (0, _defineProperty2.default)(_this, "networkUpTimestamp", '');
+    (0, _defineProperty2.default)(_this, "mercuryDownTimestamp", '');
+    (0, _defineProperty2.default)(_this, "mercuryUpTimestamp", '');
+    (0, _defineProperty2.default)(_this, "handleNetworkOffline", /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee() {
       var line;
-      return _regenerator.default.wrap(function _callee$(_context) {
+      return _regenerator.default.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _this.networkDownTimestamp = new Date().toISOString();
-            _context.next = 3;
+            _context.next = 1;
             return _this.checkNetworkReachability();
-          case 3:
+          case 1:
             _this.isNetworkDown = !_context.sent;
             _Logger.default.warn("Network has gone down, wait for it to come back up", {
               file: _constants2.CALLING_CLIENT_FILE,
@@ -103,21 +101,21 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
               line = (0, _values.default)(_this.lineDict)[0];
               line.registration.clearKeepaliveTimer();
             }
-          case 6:
+          case 2:
           case "end":
             return _context.stop();
         }
       }, _callee);
     })));
     // Wondering if we should keep this for timestamp recording purpose
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleNetworkOnline", function () {
+    (0, _defineProperty2.default)(_this, "handleNetworkOnline", function () {
       _Logger.default.info(_constants.METHOD_START_MESSAGE, {
         file: _constants2.CALLING_CLIENT_FILE,
         method: _constants2.METHODS.NETWORK_ONLINE
       });
       _this.networkUpTimestamp = new Date().toISOString();
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleMercuryOffline", function () {
+    (0, _defineProperty2.default)(_this, "handleMercuryOffline", function () {
       _Logger.default.warn("Mercury down, waiting for connection to be up", {
         file: _constants2.CALLING_CLIENT_FILE,
         method: _constants2.METHODS.MERCURY_OFFLINE
@@ -125,9 +123,9 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
       _this.mercuryDownTimestamp = new Date().toISOString();
       _this.metricManager.submitConnectionMetrics(_types4.METRIC_EVENT.CONNECTION_ERROR, _types4.CONNECTION_ACTION.MERCURY_DOWN, _types4.METRIC_TYPE.BEHAVIORAL, _this.mercuryDownTimestamp, _this.mercuryUpTimestamp);
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "handleMercuryOnline", /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3() {
+    (0, _defineProperty2.default)(_this, "handleMercuryOnline", /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee3() {
       var callCheckInterval;
-      return _regenerator.default.wrap(function _callee3$(_context3) {
+      return _regenerator.default.wrap(function (_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             _Logger.default.info(_constants.METHOD_START_MESSAGE, {
@@ -136,58 +134,58 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
             });
             _this.mercuryUpTimestamp = new Date().toISOString();
             if (!_this.isNetworkDown) {
-              _context3.next = 10;
+              _context3.next = 2;
               break;
             }
             callCheckInterval = setInterval(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee2() {
               var line;
-              return _regenerator.default.wrap(function _callee2$(_context2) {
+              return _regenerator.default.wrap(function (_context2) {
                 while (1) switch (_context2.prev = _context2.next) {
                   case 0:
                     if ((0, _keys.default)(_this.callManager.getActiveCalls()).length) {
-                      _context2.next = 10;
+                      _context2.next = 3;
                       break;
                     }
                     clearInterval(callCheckInterval);
                     line = (0, _values.default)(_this.lineDict)[0];
                     if (!(line.getStatus() !== _types3.RegistrationStatus.IDLE)) {
-                      _context2.next = 9;
+                      _context2.next = 2;
                       break;
                     }
-                    _context2.next = 6;
+                    _context2.next = 1;
                     return line.registration.handleConnectionRestoration(_this.isNetworkDown);
-                  case 6:
+                  case 1:
                     _this.isNetworkDown = _context2.sent;
-                    _context2.next = 10;
+                    _context2.next = 3;
                     break;
-                  case 9:
+                  case 2:
                     _this.isNetworkDown = false;
-                  case 10:
+                  case 3:
                   case "end":
                     return _context2.stop();
                 }
               }, _callee2);
             })), _constants2.NETWORK_FLAP_TIMEOUT);
             if (!(0, _keys.default)(_this.callManager.getActiveCalls()).length) {
-              _context3.next = 7;
+              _context3.next = 1;
               break;
             }
-            _context3.next = 7;
+            _context3.next = 1;
             return _this.checkCallStatus();
-          case 7:
+          case 1:
             _this.metricManager.submitConnectionMetrics(_types4.METRIC_EVENT.CONNECTION_ERROR, _types4.CONNECTION_ACTION.NETWORK_FLAP, _types4.METRIC_TYPE.BEHAVIORAL, _this.networkDownTimestamp, _this.networkUpTimestamp);
-            _context3.next = 14;
+            _context3.next = 4;
             break;
-          case 10:
+          case 2:
             if (!(0, _keys.default)(_this.callManager.getActiveCalls()).length) {
-              _context3.next = 13;
+              _context3.next = 3;
               break;
             }
-            _context3.next = 13;
+            _context3.next = 3;
             return _this.checkCallStatus();
-          case 13:
+          case 3:
             _this.metricManager.submitConnectionMetrics(_types4.METRIC_EVENT.CONNECTION_ERROR, _types4.CONNECTION_ACTION.MERCURY_UP, _types4.METRIC_TYPE.BEHAVIORAL, _this.mercuryDownTimestamp, _this.mercuryUpTimestamp);
-          case 14:
+          case 4:
           case "end":
             return _context3.stop();
         }
@@ -200,9 +198,9 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
      * will be attempted here on receiving a notification from callManager that all
      * calls are cleaned up.
      */
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "callsClearedHandler", /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee5() {
+    (0, _defineProperty2.default)(_this, "callsClearedHandler", /*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee5() {
       var registration;
-      return _regenerator.default.wrap(function _callee5$(_context5) {
+      return _regenerator.default.wrap(function (_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
             _Logger.default.info(_constants.METHOD_START_MESSAGE, {
@@ -213,31 +211,31 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
             // it will change once we have proper lineId and multiple lines as well
             registration = (0, _values.default)(_this.lineDict)[0].registration;
             if (registration.isDeviceRegistered()) {
-              _context5.next = 5;
+              _context5.next = 1;
               break;
             }
-            _context5.next = 5;
+            _context5.next = 1;
             return _this.mutex.runExclusive(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee4() {
-              return _regenerator.default.wrap(function _callee4$(_context4) {
+              return _regenerator.default.wrap(function (_context4) {
                 while (1) switch (_context4.prev = _context4.next) {
                   case 0:
                     if (!registration.isReconnectPending()) {
-                      _context4.next = 4;
+                      _context4.next = 1;
                       break;
                     }
                     _Logger.default.info('All calls cleared, reconnecting', {
                       file: _constants2.CALLING_CLIENT_FILE,
                       method: _constants2.CALLS_CLEARED_HANDLER_UTIL
                     });
-                    _context4.next = 4;
+                    _context4.next = 1;
                     return registration.reconnectOnFailure(_constants2.CALLS_CLEARED_HANDLER_UTIL);
-                  case 4:
+                  case 1:
                   case "end":
                     return _context4.stop();
                 }
               }, _callee4);
             })));
-          case 5:
+          case 1:
           case "end":
             return _context5.stop();
         }
@@ -306,28 +304,7 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
     _this.mediaEngine.setLogger(adaptedLogger);
     _this.primaryMobiusUris = [];
     _this.backupMobiusUris = [];
-    var mobiusServiceHost = '';
-    try {
-      mobiusServiceHost = new URL(_this.webex.internal.services._serviceUrls.mobius).host;
-    } catch (error) {
-      _Logger.default.warn("Failed to parse mobius service URL", {
-        file: _constants2.CALLING_CLIENT_FILE,
-        method: _this.constructor.name
-      });
-    }
-
-    // TODO: This is a temp fix - https://jira-eng-sjc12.cisco.com/jira/browse/CAI-6809
-    if (_this.webex.internal.services._hostCatalog) {
-      _this.mobiusClusters = mobiusServiceHost && _this.webex.internal.services._hostCatalog[mobiusServiceHost] || _this.webex.internal.services._hostCatalog[_constants2.MOBIUS_US_PROD] || _this.webex.internal.services._hostCatalog[_constants2.MOBIUS_EU_PROD] || _this.webex.internal.services._hostCatalog[_constants2.MOBIUS_US_INT] || _this.webex.internal.services._hostCatalog[_constants2.MOBIUS_EU_INT];
-    } else {
-      // @ts-ignore
-      var mobiusObject = _this.webex.internal.services._services.find(
-      // @ts-ignore
-      function (item) {
-        return item.serviceName === 'mobius';
-      });
-      _this.mobiusClusters = [mobiusObject.serviceUrls[0].baseUrl];
-    }
+    _this.mobiusClusters = _this.webex.internal.services.getMobiusClusters();
     _this.mobiusHost = '';
     _this.registerSessionsListener();
     _this.registerCallsClearedListener();
@@ -346,61 +323,62 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
    * @returns A promise that resolves when the initialization is complete.
    * @ignore
    */
-  (0, _createClass2.default)(CallingClient, [{
+  (0, _inherits2.default)(CallingClient, _Eventing);
+  return (0, _createClass2.default)(CallingClient, [{
     key: "init",
     value: (function () {
       var _init = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee6() {
         var _window, _window$navigator;
-        var ua;
-        return _regenerator.default.wrap(function _callee6$(_context6) {
+        var ua, _t;
+        return _regenerator.default.wrap(function (_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               if (!(typeof window !== 'undefined' && (_window = window) !== null && _window !== void 0 && (_window$navigator = _window.navigator) !== null && _window$navigator !== void 0 && _window$navigator.userAgent)) {
-                _context6.next = 13;
+                _context6.next = 4;
                 break;
               }
               ua = window.navigator.userAgent;
               if (!ua.toLowerCase().includes('windows')) {
-                _context6.next = 13;
+                _context6.next = 4;
                 break;
               }
               _Logger.default.info('Starting ICE warmup for Windows Chromium based browser', {
                 file: _constants2.CALLING_CLIENT_FILE,
                 method: 'init'
               });
-              _context6.prev = 4;
-              _context6.next = 7;
+              _context6.prev = 1;
+              _context6.next = 2;
               return (0, _windowsChromiumIceWarmupUtils.default)({
                 iceServers: [],
                 timeoutMs: 1000
               });
-            case 7:
+            case 2:
               _Logger.default.info("ICE warmup completed", {
                 file: _constants2.CALLING_CLIENT_FILE,
                 method: 'init'
               });
-              _context6.next = 13;
+              _context6.next = 4;
               break;
-            case 10:
-              _context6.prev = 10;
-              _context6.t0 = _context6["catch"](4);
-              _Logger.default.warn("ICE warmup failed: ".concat(_context6.t0), {
+            case 3:
+              _context6.prev = 3;
+              _t = _context6["catch"](1);
+              _Logger.default.warn("ICE warmup failed: ".concat(_t), {
                 file: _constants2.CALLING_CLIENT_FILE,
                 method: 'init'
               });
-            case 13:
-              _context6.next = 15;
+            case 4:
+              _context6.next = 5;
               return this.getMobiusServers();
-            case 15:
-              _context6.next = 17;
+            case 5:
+              _context6.next = 6;
               return this.createLine();
-            case 17:
+            case 6:
               this.setupNetworkEventListeners();
-            case 18:
+            case 7:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[4, 10]]);
+        }, _callee6, this, [[1, 3]]);
       }));
       function init() {
         return _init.apply(this, arguments);
@@ -415,8 +393,8 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
     key: "checkNetworkReachability",
     value: (function () {
       var _checkNetworkReachability = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee7() {
-        var controller, timeoutId;
-        return _regenerator.default.wrap(function _callee7$(_context7) {
+        var controller, timeoutId, _t2;
+        return _regenerator.default.wrap(function (_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
               _context7.prev = 0;
@@ -425,29 +403,29 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
                 return controller.abort();
               }, 3000); // Using a common connectivity check endpoint that returns 204 with minimal payload.
               // no-cors mode yields an opaque response but a successful fetch implies reachability.
-              _context7.next = 5;
+              _context7.next = 1;
               return fetch('https://www.google.com/generate_204', {
                 method: 'GET',
                 cache: 'no-cache',
                 mode: 'no-cors',
                 signal: controller.signal
               });
-            case 5:
+            case 1:
               clearTimeout(timeoutId);
               return _context7.abrupt("return", true);
-            case 9:
-              _context7.prev = 9;
-              _context7.t0 = _context7["catch"](0);
-              _Logger.default.warn("Network connectivity probe failed: ".concat(_context7.t0), {
+            case 2:
+              _context7.prev = 2;
+              _t2 = _context7["catch"](0);
+              _Logger.default.warn("Network connectivity probe failed: ".concat(_t2), {
                 file: _constants2.CALLING_CLIENT_FILE,
                 method: 'pingExternal'
               });
               return _context7.abrupt("return", false);
-            case 13:
+            case 3:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, null, [[0, 9]]);
+        }, _callee7, null, [[0, 2]]);
       }));
       function checkNetworkReachability() {
         return _checkNetworkReachability.apply(this, arguments);
@@ -458,8 +436,8 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
     key: "checkCallStatus",
     value: function () {
       var _checkCallStatus = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee8() {
-        var loggerContext, calls, _iterator, _step, _loop;
-        return _regenerator.default.wrap(function _callee8$(_context9) {
+        var loggerContext, calls, _iterator, _step, _loop, _t3;
+        return _regenerator.default.wrap(function (_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
               loggerContext = {
@@ -468,10 +446,10 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
               };
               calls = (0, _values.default)(this.callManager.getActiveCalls());
               _iterator = _createForOfIteratorHelper(calls);
-              _context9.prev = 3;
+              _context9.prev = 1;
               _loop = /*#__PURE__*/_regenerator.default.mark(function _loop() {
                 var call;
-                return _regenerator.default.wrap(function _loop$(_context8) {
+                return _regenerator.default.wrap(function (_context8) {
                   while (1) switch (_context8.prev = _context8.next) {
                     case 0:
                       call = _step.value;
@@ -487,38 +465,38 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
                           type: 'E_SEND_CALL_DISCONNECT'
                         });
                       });
-                    case 2:
+                    case 1:
                     case "end":
                       return _context8.stop();
                   }
                 }, _loop);
               });
               _iterator.s();
-            case 6:
+            case 2:
               if ((_step = _iterator.n()).done) {
-                _context9.next = 10;
+                _context9.next = 4;
                 break;
               }
-              return _context9.delegateYield(_loop(), "t0", 8);
-            case 8:
-              _context9.next = 6;
+              return _context9.delegateYield(_loop(), "t0", 3);
+            case 3:
+              _context9.next = 2;
               break;
-            case 10:
-              _context9.next = 15;
+            case 4:
+              _context9.next = 6;
               break;
-            case 12:
-              _context9.prev = 12;
-              _context9.t1 = _context9["catch"](3);
-              _iterator.e(_context9.t1);
-            case 15:
-              _context9.prev = 15;
+            case 5:
+              _context9.prev = 5;
+              _t3 = _context9["catch"](1);
+              _iterator.e(_t3);
+            case 6:
+              _context9.prev = 6;
               _iterator.f();
-              return _context9.finish(15);
-            case 18:
+              return _context9.finish(6);
+            case 7:
             case "end":
               return _context9.stop();
           }
-        }, _callee8, this, [[3, 12, 15, 18]]);
+        }, _callee8, this, [[1, 5, 6, 7]]);
       }));
       function checkCallStatus() {
         return _checkCallStatus.apply(this, arguments);
@@ -549,147 +527,72 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
     value: (function () {
       var _getClientRegionInfo = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee9() {
         var _this3 = this;
-        var abort, regionInfo, _iterator2, _step2, _loop2, _ret;
-        return _regenerator.default.wrap(function _callee9$(_context1) {
-          while (1) switch (_context1.prev = _context1.next) {
+        var abort, regionInfo, _response$headers, _response$headers$tra, _response$headers2, response, clientRegionInfo, _t4;
+        return _regenerator.default.wrap(function (_context0) {
+          while (1) switch (_context0.prev = _context0.next) {
             case 0:
               _Logger.default.info(_constants.METHOD_START_MESSAGE, {
                 file: _constants2.CALLING_CLIENT_FILE,
                 method: _constants2.METHODS.GET_CLIENT_REGION_INFO
               });
               regionInfo = {};
-              _iterator2 = _createForOfIteratorHelper(this.mobiusClusters);
-              _context1.prev = 3;
-              _loop2 = /*#__PURE__*/_regenerator.default.mark(function _loop2() {
-                var mobius, _temp$headers, _response$headers, _response$headers2, _response$headers$tra, _response$headers3, temp, myIP, response, clientRegionInfo, extendedError;
-                return _regenerator.default.wrap(function _loop2$(_context0) {
-                  while (1) switch (_context0.prev = _context0.next) {
-                    case 0:
-                      mobius = _step2.value;
-                      if (mobius.host) {
-                        _this3.mobiusHost = "https://".concat(mobius.host).concat(_constants2.API_V1);
-                      } else {
-                        _this3.mobiusHost = mobius;
-                      }
-                      _context0.prev = 2;
-                      _context0.next = 5;
-                      return _this3.webex.request({
-                        uri: "".concat(_this3.mobiusHost).concat(_constants2.URL_ENDPOINT).concat(_constants2.IP_ENDPOINT),
-                        method: _types3.HTTP_METHODS.GET,
-                        headers: (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _constants2.CISCO_DEVICE_URL, _this3.webex.internal.device.url), _constants2.SPARK_USER_AGENT, _constants2.CALLING_USER_AGENT),
-                        service: _types3.ALLOWED_SERVICES.MOBIUS
-                      });
-                    case 5:
-                      temp = _context0.sent;
-                      _Logger.default.log("Response trackingId: ".concat(temp === null || temp === void 0 ? void 0 : (_temp$headers = temp.headers) === null || _temp$headers === void 0 ? void 0 : _temp$headers.trackingid), {
-                        file: _constants2.CALLING_CLIENT_FILE,
-                        method: _constants2.METHODS.GET_CLIENT_REGION_INFO
-                      });
-                      myIP = temp.body.ipv4; // eslint-disable-next-line no-await-in-loop
-                      _context0.next = 10;
-                      return _this3.webex.request({
-                        uri: "".concat(_constants2.DISCOVERY_URL, "/").concat(myIP),
-                        method: _types3.HTTP_METHODS.GET,
-                        addAuthHeader: false,
-                        headers: (0, _defineProperty2.default)({}, _constants2.SPARK_USER_AGENT, null)
-                      });
-                    case 10:
-                      response = _context0.sent;
-                      _Logger.default.log("Response trackingId: ".concat(response === null || response === void 0 ? void 0 : (_response$headers = response.headers) === null || _response$headers === void 0 ? void 0 : _response$headers.trackingid), {
-                        file: _constants2.CALLING_CLIENT_FILE,
-                        method: _constants2.METHODS.GET_CLIENT_REGION_INFO
-                      });
-                      clientRegionInfo = response.body;
-                      regionInfo.clientRegion = clientRegionInfo !== null && clientRegionInfo !== void 0 && clientRegionInfo.clientRegion ? clientRegionInfo.clientRegion : '';
-                      regionInfo.countryCode = clientRegionInfo !== null && clientRegionInfo !== void 0 && clientRegionInfo.countryCode ? clientRegionInfo.countryCode : '';
-                      _Logger.default.log("Successfully fetched Client region info: ".concat(regionInfo.clientRegion, ", countryCode: ").concat(regionInfo.countryCode, ", and response trackingid: ").concat(response === null || response === void 0 ? void 0 : (_response$headers2 = response.headers) === null || _response$headers2 === void 0 ? void 0 : _response$headers2.trackingid), {
-                        file: _constants2.CALLING_CLIENT_FILE,
-                        method: _constants2.METHODS.GET_CLIENT_REGION_INFO
-                      });
-
-                      // Metrics for region info - trying clusters in loop
-                      _this3.metricManager.submitRegionInfoMetric(_types4.METRIC_EVENT.MOBIUS_DISCOVERY, _types4.MOBIUS_SERVER_ACTION.REGION_INFO, _types4.METRIC_TYPE.BEHAVIORAL, _this3.mobiusHost, clientRegionInfo.clientRegion, clientRegionInfo.countryCode, (_response$headers$tra = response === null || response === void 0 ? void 0 : (_response$headers3 = response.headers) === null || _response$headers3 === void 0 ? void 0 : _response$headers3.trackingid) !== null && _response$headers$tra !== void 0 ? _response$headers$tra : '');
-                      return _context0.abrupt("return", 0);
-                    case 20:
-                      _context0.prev = 20;
-                      _context0.t0 = _context0["catch"](2);
-                      extendedError = new Error("Failed to get client region info: ".concat(_context0.t0));
-                      _Logger.default.error(extendedError, {
-                        method: _constants2.METHODS.GET_CLIENT_REGION_INFO,
-                        file: _constants2.CALLING_CLIENT_FILE
-                      });
+              _context0.prev = 1;
+              _context0.next = 2;
+              return this.webex.request({
+                uri: "".concat(_constants2.DISCOVERY_URL),
+                method: _types3.HTTP_METHODS.GET,
+                addAuthHeader: false,
+                headers: (0, _defineProperty2.default)({}, _constants2.SPARK_USER_AGENT, null)
+              });
+            case 2:
+              response = _context0.sent;
+              clientRegionInfo = response.body;
+              regionInfo.clientRegion = (clientRegionInfo === null || clientRegionInfo === void 0 ? void 0 : clientRegionInfo.clientRegion) || '';
+              regionInfo.countryCode = (clientRegionInfo === null || clientRegionInfo === void 0 ? void 0 : clientRegionInfo.countryCode) || '';
+              _Logger.default.log("Successfully fetched Client region info: ".concat(regionInfo.clientRegion, ", countryCode: ").concat(regionInfo.countryCode, ", and response trackingid: ").concat(response === null || response === void 0 ? void 0 : (_response$headers = response.headers) === null || _response$headers === void 0 ? void 0 : _response$headers.trackingid), {
+                file: _constants2.CALLING_CLIENT_FILE,
+                method: _constants2.METHODS.GET_CLIENT_REGION_INFO
+              });
+              this.metricManager.submitRegionInfoMetric(_types4.METRIC_EVENT.MOBIUS_DISCOVERY, _types4.MOBIUS_SERVER_ACTION.REGION_INFO, _types4.METRIC_TYPE.BEHAVIORAL, this.mobiusHost, clientRegionInfo.clientRegion, clientRegionInfo.countryCode, (_response$headers$tra = response === null || response === void 0 ? void 0 : (_response$headers2 = response.headers) === null || _response$headers2 === void 0 ? void 0 : _response$headers2.trackingid) !== null && _response$headers$tra !== void 0 ? _response$headers$tra : '');
+              _context0.next = 6;
+              break;
+            case 3:
+              _context0.prev = 3;
+              _t4 = _context0["catch"](1);
+              _Logger.default.error("Failed to get client region info: ".concat((0, _stringify.default)(_t4)), {
+                method: _constants2.METHODS.GET_CLIENT_REGION_INFO,
+                file: _constants2.CALLING_CLIENT_FILE
+              });
 
-                      // eslint-disable-next-line no-await-in-loop
-                      _context0.next = 26;
-                      return (0, _Utils.handleCallingClientErrors)(_context0.t0, function (clientError) {
-                        var _headers$trackingId, _headers3;
-                        _this3.metricManager.submitRegistrationMetric(_types4.METRIC_EVENT.REGISTRATION_ERROR, _types4.REG_ACTION.REGISTER, _types4.METRIC_TYPE.BEHAVIORAL, _constants2.GET_MOBIUS_SERVERS_UTIL, 'UNKNOWN', (_headers$trackingId = (_headers3 = _context0.t0.headers) === null || _headers3 === void 0 ? void 0 : _headers3.trackingId) !== null && _headers$trackingId !== void 0 ? _headers$trackingId : '', undefined, clientError);
-                        _this3.emit(_types2.CALLING_CLIENT_EVENT_KEYS.ERROR, clientError);
-                      }, {
-                        method: _constants2.GET_MOBIUS_SERVERS_UTIL,
-                        file: _constants2.CALLING_CLIENT_FILE
-                      });
-                    case 26:
-                      abort = _context0.sent;
-                      regionInfo.clientRegion = '';
-                      regionInfo.countryCode = '';
-                      if (!abort) {
-                        _context0.next = 33;
-                        break;
-                      }
-                      _context0.next = 32;
-                      return (0, _Utils.uploadLogs)();
-                    case 32:
-                      return _context0.abrupt("return", {
-                        v: regionInfo
-                      });
-                    case 33:
-                    case "end":
-                      return _context0.stop();
-                  }
-                }, _loop2, null, [[2, 20]]);
+              // eslint-disable-next-line no-await-in-loop
+              _context0.next = 4;
+              return (0, _Utils.handleCallingClientErrors)(_t4, function (clientError) {
+                var _headers$trackingId, _headers2;
+                _this3.metricManager.submitRegistrationMetric(_types4.METRIC_EVENT.REGISTRATION_ERROR, _types4.REG_ACTION.REGISTER, _types4.METRIC_TYPE.BEHAVIORAL, _constants2.GET_MOBIUS_SERVERS_UTIL, 'UNKNOWN', (_headers$trackingId = (_headers2 = _t4.headers) === null || _headers2 === void 0 ? void 0 : _headers2.trackingId) !== null && _headers$trackingId !== void 0 ? _headers$trackingId : '', undefined, clientError);
+                _this3.emit(_types2.CALLING_CLIENT_EVENT_KEYS.ERROR, clientError);
+              }, {
+                method: _constants2.GET_MOBIUS_SERVERS_UTIL,
+                file: _constants2.CALLING_CLIENT_FILE
               });
-              _iterator2.s();
-            case 6:
-              if ((_step2 = _iterator2.n()).done) {
-                _context1.next = 15;
-                break;
-              }
-              return _context1.delegateYield(_loop2(), "t0", 8);
-            case 8:
-              _ret = _context1.t0;
-              if (!(_ret === 0)) {
-                _context1.next = 11;
-                break;
-              }
-              return _context1.abrupt("break", 15);
-            case 11:
-              if (!_ret) {
-                _context1.next = 13;
+            case 4:
+              abort = _context0.sent;
+              regionInfo.clientRegion = '';
+              regionInfo.countryCode = '';
+              if (!abort) {
+                _context0.next = 6;
                 break;
               }
-              return _context1.abrupt("return", _ret.v);
-            case 13:
-              _context1.next = 6;
-              break;
-            case 15:
-              _context1.next = 20;
-              break;
-            case 17:
-              _context1.prev = 17;
-              _context1.t1 = _context1["catch"](3);
-              _iterator2.e(_context1.t1);
-            case 20:
-              _context1.prev = 20;
-              _iterator2.f();
-              return _context1.finish(20);
-            case 23:
-              return _context1.abrupt("return", regionInfo);
-            case 24:
+              _context0.next = 5;
+              return (0, _Utils.uploadLogs)();
+            case 5:
+              return _context0.abrupt("return", regionInfo);
+            case 6:
+              return _context0.abrupt("return", regionInfo);
+            case 7:
             case "end":
-              return _context1.stop();
+              return _context0.stop();
           }
-        }, _callee9, this, [[3, 17, 20, 23]]);
+        }, _callee9, this, [[1, 3]]);
       }));
       function getClientRegionInfo() {
         return _getClientRegionInfo.apply(this, arguments);
@@ -709,8 +612,8 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
           _this$sdkConfig4,
           _this$sdkConfig4$disc,
           _this4 = this;
-        var useDefault, clientRegion, countryCode, _this$sdkConfig5, _this$sdkConfig5$disc, _this$sdkConfig6, _this$sdkConfig6$disc, regionInfo, _response$headers4, _response$headers$tra2, _response$headers5, response, mobiusServers, mobiusUris, extendedError, abort;
-        return _regenerator.default.wrap(function _callee0$(_context10) {
+        var useDefault, clientRegion, countryCode, _this$sdkConfig5, _this$sdkConfig5$disc, _this$sdkConfig6, _this$sdkConfig6$disc, _this$webex$internal$, regionInfo, _iterator2, _step2, _loop2, _ret, _t6;
+        return _regenerator.default.wrap(function (_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
               _Logger.default.info(_constants.METHOD_START_MESSAGE, {
@@ -726,7 +629,7 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
                   */
               useDefault = false;
               if (!((_this$sdkConfig3 = this.sdkConfig) !== null && _this$sdkConfig3 !== void 0 && (_this$sdkConfig3$disc = _this$sdkConfig3.discovery) !== null && _this$sdkConfig3$disc !== void 0 && _this$sdkConfig3$disc.country && (_this$sdkConfig4 = this.sdkConfig) !== null && _this$sdkConfig4 !== void 0 && (_this$sdkConfig4$disc = _this$sdkConfig4.discovery) !== null && _this$sdkConfig4$disc !== void 0 && _this$sdkConfig4$disc.region)) {
-                _context10.next = 9;
+                _context10.next = 1;
                 break;
               }
               _Logger.default.log('Updating region and country from the SDK config', {
@@ -735,90 +638,139 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
               });
               clientRegion = (_this$sdkConfig5 = this.sdkConfig) === null || _this$sdkConfig5 === void 0 ? void 0 : (_this$sdkConfig5$disc = _this$sdkConfig5.discovery) === null || _this$sdkConfig5$disc === void 0 ? void 0 : _this$sdkConfig5$disc.region;
               countryCode = (_this$sdkConfig6 = this.sdkConfig) === null || _this$sdkConfig6 === void 0 ? void 0 : (_this$sdkConfig6$disc = _this$sdkConfig6.discovery) === null || _this$sdkConfig6$disc === void 0 ? void 0 : _this$sdkConfig6$disc.country;
-              this.mobiusHost = this.webex.internal.services._serviceUrls.mobius;
-              _context10.next = 15;
+              this.mobiusHost = ((_this$webex$internal$ = this.webex.internal.services._serviceUrls) === null || _this$webex$internal$ === void 0 ? void 0 : _this$webex$internal$.mobius) || this.webex.internal.services.get(this.webex.internal.services._activeServices.mobius);
+              _context10.next = 3;
               break;
-            case 9:
+            case 1:
               _Logger.default.log('Updating region and country through Region discovery', {
                 file: _constants2.CALLING_CLIENT_FILE,
                 method: _constants2.GET_MOBIUS_SERVERS_UTIL
               });
-              _context10.next = 12;
+              _context10.next = 2;
               return this.getClientRegionInfo();
-            case 12:
+            case 2:
               regionInfo = _context10.sent;
               clientRegion = regionInfo.clientRegion;
               countryCode = regionInfo.countryCode;
-            case 15:
+            case 3:
               if (!(clientRegion && countryCode)) {
-                _context10.next = 43;
+                _context10.next = 12;
                 break;
               }
               _Logger.default.log("Found Region: ".concat(clientRegion, " and country: ").concat(countryCode, ", going to fetch Mobius server"), {
                 file: _constants2.CALLING_CLIENT_FILE,
                 method: _constants2.GET_MOBIUS_SERVERS_UTIL
               });
-              _context10.prev = 17;
-              _context10.next = 20;
-              return this.webex.request({
-                uri: "".concat(this.mobiusHost).concat(_constants2.URL_ENDPOINT, "?regionCode=").concat(clientRegion, "&countryCode=").concat(countryCode),
-                method: _types3.HTTP_METHODS.GET,
-                headers: (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _constants2.CISCO_DEVICE_URL, this.webex.internal.device.url), _constants2.SPARK_USER_AGENT, _constants2.CALLING_USER_AGENT),
-                service: _types3.ALLOWED_SERVICES.MOBIUS
-              });
-            case 20:
-              response = _context10.sent;
-              _Logger.default.log("Mobius Server found for the region. Response trackingId: ".concat(response === null || response === void 0 ? void 0 : (_response$headers4 = response.headers) === null || _response$headers4 === void 0 ? void 0 : _response$headers4.trackingid), {
-                file: _constants2.CALLING_CLIENT_FILE,
-                method: _constants2.GET_MOBIUS_SERVERS_UTIL
-              });
-              mobiusServers = response.body; // Metrics for mobius servers
-              this.metricManager.submitMobiusServersMetric(_types4.METRIC_EVENT.MOBIUS_DISCOVERY, _types4.MOBIUS_SERVER_ACTION.MOBIUS_SERVERS, _types4.METRIC_TYPE.BEHAVIORAL, mobiusServers, (_response$headers$tra2 = response === null || response === void 0 ? void 0 : (_response$headers5 = response.headers) === null || _response$headers5 === void 0 ? void 0 : _response$headers5.trackingid) !== null && _response$headers$tra2 !== void 0 ? _response$headers$tra2 : '');
+              _iterator2 = _createForOfIteratorHelper(this.mobiusClusters);
+              _context10.prev = 4;
+              _loop2 = /*#__PURE__*/_regenerator.default.mark(function _loop2() {
+                var mobius, _response$headers3, _response$headers$tra2, _response$headers4, response, mobiusServers, mobiusUris, abort, _t5;
+                return _regenerator.default.wrap(function (_context1) {
+                  while (1) switch (_context1.prev = _context1.next) {
+                    case 0:
+                      mobius = _step2.value;
+                      if (mobius.host) {
+                        _this4.mobiusHost = "https://".concat(mobius.host).concat(_constants2.API_V1);
+                      } else {
+                        _this4.mobiusHost = mobius;
+                      }
+                      _context1.prev = 1;
+                      _context1.next = 2;
+                      return _this4.webex.request({
+                        uri: "".concat(_this4.mobiusHost).concat(_constants2.URL_ENDPOINT, "?regionCode=").concat(clientRegion, "&countryCode=").concat(countryCode),
+                        method: _types3.HTTP_METHODS.GET,
+                        headers: (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _constants2.CISCO_DEVICE_URL, _this4.webex.internal.device.url), _constants2.SPARK_USER_AGENT, _constants2.CALLING_USER_AGENT),
+                        service: _types3.ALLOWED_SERVICES.MOBIUS
+                      });
+                    case 2:
+                      response = _context1.sent;
+                      _Logger.default.log("Mobius Server found for the region. Response trackingId: ".concat(response === null || response === void 0 ? void 0 : (_response$headers3 = response.headers) === null || _response$headers3 === void 0 ? void 0 : _response$headers3.trackingid), {
+                        file: _constants2.CALLING_CLIENT_FILE,
+                        method: _constants2.GET_MOBIUS_SERVERS_UTIL
+                      });
+                      mobiusServers = response.body; // Metrics for mobius servers
+                      _this4.metricManager.submitMobiusServersMetric(_types4.METRIC_EVENT.MOBIUS_DISCOVERY, _types4.MOBIUS_SERVER_ACTION.MOBIUS_SERVERS, _types4.METRIC_TYPE.BEHAVIORAL, mobiusServers, (_response$headers$tra2 = response === null || response === void 0 ? void 0 : (_response$headers4 = response.headers) === null || _response$headers4 === void 0 ? void 0 : _response$headers4.trackingid) !== null && _response$headers$tra2 !== void 0 ? _response$headers$tra2 : '');
 
-              /* update arrays of Mobius Uris. */
-              mobiusUris = (0, _Utils.filterMobiusUris)(mobiusServers, this.mobiusHost);
-              this.primaryMobiusUris = mobiusUris.primary;
-              this.backupMobiusUris = mobiusUris.backup;
-              _Logger.default.log("Final list of Mobius Servers, primary: ".concat(mobiusUris.primary, " and backup: ").concat(mobiusUris.backup), {
-                file: _constants2.CALLING_CLIENT_FILE,
-                method: _constants2.GET_MOBIUS_SERVERS_UTIL
-              });
-              _context10.next = 41;
-              break;
-            case 30:
-              _context10.prev = 30;
-              _context10.t0 = _context10["catch"](17);
-              extendedError = new Error("Failed to get Mobius servers: ".concat(_context10.t0));
-              _Logger.default.error(extendedError, {
-                method: _constants2.METHODS.GET_MOBIUS_SERVERS,
-                file: _constants2.CALLING_CLIENT_FILE
-              });
-              _context10.next = 36;
-              return (0, _Utils.handleCallingClientErrors)(_context10.t0, function (clientError) {
-                var _headers$trackingId2, _headers5;
-                _this4.metricManager.submitRegistrationMetric(_types4.METRIC_EVENT.REGISTRATION_ERROR, _types4.REG_ACTION.REGISTER, _types4.METRIC_TYPE.BEHAVIORAL, _constants2.GET_MOBIUS_SERVERS_UTIL, 'UNKNOWN', (_headers$trackingId2 = (_headers5 = _context10.t0.headers) === null || _headers5 === void 0 ? void 0 : _headers5.trackingId) !== null && _headers$trackingId2 !== void 0 ? _headers$trackingId2 : '', undefined, clientError);
-                _this4.emit(_types2.CALLING_CLIENT_EVENT_KEYS.ERROR, clientError);
-              }, {
-                method: _constants2.GET_MOBIUS_SERVERS_UTIL,
-                file: _constants2.CALLING_CLIENT_FILE
+                      /* update arrays of Mobius Uris. */
+                      mobiusUris = (0, _Utils.filterMobiusUris)(mobiusServers, _this4.mobiusHost);
+                      _this4.primaryMobiusUris = mobiusUris.primary;
+                      _this4.backupMobiusUris = mobiusUris.backup;
+                      _Logger.default.log("Final list of Mobius Servers, primary: ".concat(mobiusUris.primary, " and backup: ").concat(mobiusUris.backup), {
+                        file: _constants2.CALLING_CLIENT_FILE,
+                        method: _constants2.GET_MOBIUS_SERVERS_UTIL
+                      });
+                      return _context1.abrupt("return", 0);
+                    case 3:
+                      _context1.prev = 3;
+                      _t5 = _context1["catch"](1);
+                      _Logger.default.error("Failed to get Mobius servers: ".concat((0, _stringify.default)(_t5)), {
+                        method: _constants2.METHODS.GET_MOBIUS_SERVERS,
+                        file: _constants2.CALLING_CLIENT_FILE
+                      });
+
+                      // eslint-disable-next-line no-await-in-loop
+                      _context1.next = 4;
+                      return (0, _Utils.handleCallingClientErrors)(_t5, function (clientError) {
+                        var _headers$trackingId2, _headers4;
+                        _this4.metricManager.submitRegistrationMetric(_types4.METRIC_EVENT.REGISTRATION_ERROR, _types4.REG_ACTION.REGISTER, _types4.METRIC_TYPE.BEHAVIORAL, _constants2.GET_MOBIUS_SERVERS_UTIL, 'UNKNOWN', (_headers$trackingId2 = (_headers4 = _t5.headers) === null || _headers4 === void 0 ? void 0 : _headers4.trackingId) !== null && _headers$trackingId2 !== void 0 ? _headers$trackingId2 : '', undefined, clientError);
+                        _this4.emit(_types2.CALLING_CLIENT_EVENT_KEYS.ERROR, clientError);
+                      }, {
+                        method: _constants2.GET_MOBIUS_SERVERS_UTIL,
+                        file: _constants2.CALLING_CLIENT_FILE
+                      });
+                    case 4:
+                      abort = _context1.sent;
+                      if (!abort) {
+                        _context1.next = 6;
+                        break;
+                      }
+                      useDefault = true;
+                      // eslint-disable-next-line no-await-in-loop
+                      _context1.next = 5;
+                      return (0, _Utils.uploadLogs)();
+                    case 5:
+                      return _context1.abrupt("return", 0);
+                    case 6:
+                    case "end":
+                      return _context1.stop();
+                  }
+                }, _loop2, null, [[1, 3]]);
               });
-            case 36:
-              abort = _context10.sent;
-              if (!abort) {
-                _context10.next = 40;
+              _iterator2.s();
+            case 5:
+              if ((_step2 = _iterator2.n()).done) {
+                _context10.next = 8;
                 break;
               }
-              _context10.next = 40;
-              return (0, _Utils.uploadLogs)();
-            case 40:
-              useDefault = true;
-            case 41:
-              _context10.next = 44;
+              return _context10.delegateYield(_loop2(), "t0", 6);
+            case 6:
+              _ret = _context10.t0;
+              if (!(_ret === 0)) {
+                _context10.next = 7;
+                break;
+              }
+              return _context10.abrupt("continue", 8);
+            case 7:
+              _context10.next = 5;
+              break;
+            case 8:
+              _context10.next = 10;
+              break;
+            case 9:
+              _context10.prev = 9;
+              _t6 = _context10["catch"](4);
+              _iterator2.e(_t6);
+            case 10:
+              _context10.prev = 10;
+              _iterator2.f();
+              return _context10.finish(10);
+            case 11:
+              _context10.next = 13;
               break;
-            case 43:
+            case 12:
               /* Setting this to true because region info is possibly undefined */
               useDefault = true;
-            case 44:
+            case 13:
               /* Use a default URL if Mobius discovery fails either because of region info failure
                * or because the discovered Mobius couldn't be reached
                */
@@ -831,11 +783,11 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
                 this.mobiusHost = "https://".concat(this.mobiusClusters[0].host).concat(_constants2.API_V1);
                 this.primaryMobiusUris = ["".concat(this.mobiusHost).concat(_constants2.URL_ENDPOINT)];
               }
-            case 45:
+            case 14:
             case "end":
               return _context10.stop();
           }
-        }, _callee0, this, [[17, 30]]);
+        }, _callee0, this, [[4, 9, 10, 11]]);
       }));
       function getMobiusServers() {
         return _getMobiusServers.apply(this, arguments);
@@ -888,31 +840,31 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
       this.sdkConnector.registerListener(_types2.MOBIUS_EVENT_KEYS.CALL_SESSION_EVENT_INCLUSIVE, /*#__PURE__*/function () {
         var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee1(event) {
           var sessionArr, i;
-          return _regenerator.default.wrap(function _callee1$(_context11) {
+          return _regenerator.default.wrap(function (_context11) {
             while (1) switch (_context11.prev = _context11.next) {
               case 0:
                 if (!(event && event.data.userSessions.userSessions)) {
-                  _context11.next = 7;
+                  _context11.next = 2;
                   break;
                 }
                 sessionArr = event === null || event === void 0 ? void 0 : event.data.userSessions.userSessions;
                 if (!(sessionArr.length === 1)) {
-                  _context11.next = 5;
+                  _context11.next = 1;
                   break;
                 }
                 if (!(sessionArr[0].sessionType !== _types2.SessionType.WEBEX_CALLING)) {
-                  _context11.next = 5;
+                  _context11.next = 1;
                   break;
                 }
                 return _context11.abrupt("return");
-              case 5:
+              case 1:
                 for (i = 0; i < sessionArr.length; i += 1) {
                   if (sessionArr[i].sessionType !== _types2.SessionType.WEBEX_CALLING) {
                     sessionArr.splice(i, 1);
                   }
                 }
                 _this5.emit(_types2.CALLING_CLIENT_EVENT_KEYS.USER_SESSION_INFO, event);
-              case 7:
+              case 2:
               case "end":
                 return _context11.stop();
             }
@@ -934,7 +886,7 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
       var _createLine = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee10() {
         var _this$sdkConfig7, _this$sdkConfig8;
         var line;
-        return _regenerator.default.wrap(function _callee10$(_context12) {
+        return _regenerator.default.wrap(function (_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
               _Logger.default.info(_constants.METHOD_START_MESSAGE, {
@@ -943,7 +895,7 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
               });
               line = new _line.default(this.webex.internal.device.userId, this.webex.internal.device.url, this.mutex, this.primaryMobiusUris, this.backupMobiusUris, this.getLoggingLevel(), (_this$sdkConfig7 = this.sdkConfig) === null || _this$sdkConfig7 === void 0 ? void 0 : _this$sdkConfig7.serviceData, (_this$sdkConfig8 = this.sdkConfig) === null || _this$sdkConfig8 === void 0 ? void 0 : _this$sdkConfig8.jwe);
               this.lineDict[line.lineId] = line;
-            case 3:
+            case 1:
             case "end":
               return _context12.stop();
           }
@@ -1014,21 +966,21 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
     value: (function () {
       var _uploadLogs2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee11() {
         var result;
-        return _regenerator.default.wrap(function _callee11$(_context13) {
+        return _regenerator.default.wrap(function (_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              _context13.next = 2;
+              _context13.next = 1;
               return (0, _Utils.uploadLogs)({}, true);
-            case 2:
+            case 1:
               result = _context13.sent;
               if (result) {
-                _context13.next = 5;
+                _context13.next = 2;
                 break;
               }
               throw new Error('Failed to upload logs: No response received.');
-            case 5:
+            case 2:
               return _context13.abrupt("return", result);
-            case 6:
+            case 3:
             case "end":
               return _context13.stop();
           }
@@ -1040,7 +992,6 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
       return uploadLogs;
     }())
   }]);
-  return CallingClient;
 }(_impl.Eventing);
 /**
  * Create the `CallingClient` instance using the `webex` object and callingSdk `config`
@@ -1050,15 +1001,15 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
 var createClient = exports.createClient = /*#__PURE__*/function () {
   var _ref7 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee12(webex, config) {
     var callingClientInstance;
-    return _regenerator.default.wrap(function _callee12$(_context14) {
+    return _regenerator.default.wrap(function (_context14) {
       while (1) switch (_context14.prev = _context14.next) {
         case 0:
           callingClientInstance = new CallingClient(webex, config);
-          _context14.next = 3;
+          _context14.next = 1;
           return callingClientInstance.init();
-        case 3:
+        case 1:
           return _context14.abrupt("return", callingClientInstance);
-        case 4:
+        case 2:
         case "end":
           return _context14.stop();
       }