@webex/calling 3.12.0-next.52 → 3.12.0-next.54

package/dist/CallingClient/CallingClient.js

@@ -44,7 +44,7 @@ var _types5 = require("../Metrics/types");
 var _Metrics = require("../Metrics");
 var _windowsChromiumIceWarmupUtils = _interopRequireDefault(require("./windowsChromiumIceWarmupUtils"));
 var _request = require("./utils/request");
-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 _t11 in e) "default" !== _t11 && {}.hasOwnProperty.call(e, _t11) && ((i = (o = _Object$defineProperty) && _Object$getOwnPropertyDescriptor(e, _t11)) && (i.get || i.set) ? o(f, _t11, i) : f[_t11] = e[_t11]); 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 _t1 in e) "default" !== _t1 && {}.hasOwnProperty.call(e, _t1) && ((i = (o = _Object$defineProperty) && _Object$getOwnPropertyDescriptor(e, _t1)) && (i.get || i.set) ? o(f, _t1, i) : f[_t1] = e[_t1]); 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; }
@@ -940,7 +940,7 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
     key: "connectToMobiusSocket",
     value: (function () {
       var _connectToMobiusSocket = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee10() {
-        var loggerContext, _iterator3, _step3, wssUri, _iterator4, _step4, _wssUri, _t7, _t8, _t9, _t0;
+        var loggerContext, _iterator3, _step3, wssUri, _t7, _t8;
         return _regenerator.default.wrap(function (_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
@@ -949,18 +949,15 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
                 method: _constants2.METHODS.CONNECT_TO_MOBIUS_SOCKET
               };
               _Logger.default.info(_constants.METHOD_START_MESSAGE, loggerContext);
-              if (!(!this.primaryWssMobiusUris.length && !this.backupWssMobiusUris.length)) {
+              if (this.primaryWssMobiusUris.length) {
                 _context12.next = 1;
                 break;
               }
-              _Logger.default.warn('No WSS URIs available from Mobius discovery, skipping socket connection', loggerContext);
+              _Logger.default.warn('No WSS URIs available from Mobius discovery for primary, skipping socket connection', loggerContext);
               return _context12.abrupt("return");
             case 1:
-              if (!this.primaryWssMobiusUris.length) {
-                _context12.next = 12;
-                break;
-              }
-              _Logger.default.log("Attempting Mobius socket connection using primary WSS URIs (".concat(this.primaryWssMobiusUris.length, " available)"), loggerContext);
+              // Attempt to establish the socket connection with mobius if primary wss urls are present
+              // If wss url is not present for primary/backup, registration will be attempted with http even when feature flag is enabled for mobius socket
               _iterator3 = _createForOfIteratorHelper(this.primaryWssMobiusUris);
               _context12.prev = 2;
               _iterator3.s();
@@ -998,67 +995,11 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
               return _context12.finish(10);
             case 11:
               _Logger.default.warn('All primary WSS URI connection attempts failed', loggerContext);
-              _context12.next = 13;
-              break;
             case 12:
-              _Logger.default.warn('No primary WSS URIs available, skipping to backup', loggerContext);
-            case 13:
-              if (!this.backupWssMobiusUris.length) {
-                _context12.next = 24;
-                break;
-              }
-              _Logger.default.log("Attempting Mobius socket connection using backup WSS URIs (".concat(this.backupWssMobiusUris.length, " available)"), loggerContext);
-              _iterator4 = _createForOfIteratorHelper(this.backupWssMobiusUris);
-              _context12.prev = 14;
-              _iterator4.s();
-            case 15:
-              if ((_step4 = _iterator4.n()).done) {
-                _context12.next = 20;
-                break;
-              }
-              _wssUri = _step4.value;
-              _context12.prev = 16;
-              _Logger.default.log("Trying backup WSS URI: ".concat(_wssUri), loggerContext);
-              // eslint-disable-next-line no-await-in-loop
-              _context12.next = 17;
-              return this.apiRequest.connectToMobiusSocket(_wssUri);
-            case 17:
-              _Logger.default.log("Successfully connected to Mobius socket on backup WSS URI: ".concat(_wssUri), loggerContext);
-              return _context12.abrupt("return");
-            case 18:
-              _context12.prev = 18;
-              _t9 = _context12["catch"](16);
-              _Logger.default.warn("Backup WSS URI connection failed for ".concat(_wssUri, ": ").concat(_t9), loggerContext);
-            case 19:
-              _context12.next = 15;
-              break;
-            case 20:
-              _context12.next = 22;
-              break;
-            case 21:
-              _context12.prev = 21;
-              _t0 = _context12["catch"](14);
-              _iterator4.e(_t0);
-            case 22:
-              _context12.prev = 22;
-              _iterator4.f();
-              return _context12.finish(22);
-            case 23:
-              _Logger.default.warn('All backup WSS URI connection attempts failed', loggerContext);
-              _context12.next = 25;
-              break;
-            case 24:
-              _Logger.default.warn('No backup WSS URIs available', loggerContext);
-            case 25:
-              // Throwing an error is not required here. Connection will be attempted again during registration if no connection is established.
-              // We might remove this connection attempt logic during optimization since we are anyway going to try to connect to Mobius during
-              // registration and without registration the connection will be closed automatically by the mobius server.
-              _Logger.default.warn('All Mobius socket connection attempts exhausted for both primary and backup, continuing without socket', loggerContext);
-            case 26:
             case "end":
               return _context12.stop();
           }
-        }, _callee10, this, [[2, 9, 10, 11], [4, 6], [14, 21, 22, 23], [16, 18]]);
+        }, _callee10, this, [[2, 9, 10, 11], [4, 6]]);
       }));
       function connectToMobiusSocket() {
         return _connectToMobiusSocket.apply(this, arguments);
@@ -1156,7 +1097,7 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
     value: (function () {
       var _createLine = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee12() {
         var _this$sdkConfig8;
-        var line;
+        var socketEnabled, primaryUris, backupUris, line;
         return _regenerator.default.wrap(function (_context14) {
           while (1) switch (_context14.prev = _context14.next) {
             case 0:
@@ -1164,7 +1105,13 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
                 file: _constants2.CALLING_CLIENT_FILE,
                 method: _constants2.METHODS.CREATE_LINE
               });
-              line = new _line.default(this.webex.internal.device.userId, this.webex.internal.device.url, this.mutex, this.apiRequest.isSocketEnabled() ? (0, _Utils.normalizeMobiusUris)(this.primaryWssMobiusUris) : this.primaryMobiusUris, this.apiRequest.isSocketEnabled() ? (0, _Utils.normalizeMobiusUris)(this.backupWssMobiusUris) : this.backupMobiusUris, this.getLoggingLevel(), this.serviceData, (_this$sdkConfig8 = this.sdkConfig) === null || _this$sdkConfig8 === void 0 ? void 0 : _this$sdkConfig8.jwe);
+              // When the Mobius socket is enabled, fall back to the HTTP URIs per group when that
+              // group has no WSS URL, so registration is still attempted (primary and backup are
+              // resolved independently). When the socket is disabled, always use the HTTP URIs.
+              socketEnabled = this.apiRequest.isSocketEnabled();
+              primaryUris = socketEnabled && this.primaryWssMobiusUris.length ? (0, _Utils.normalizeMobiusUris)(this.primaryWssMobiusUris) : this.primaryMobiusUris;
+              backupUris = socketEnabled && this.backupWssMobiusUris.length ? (0, _Utils.normalizeMobiusUris)(this.backupWssMobiusUris) : this.backupMobiusUris;
+              line = new _line.default(this.webex.internal.device.userId, this.webex.internal.device.url, this.mutex, primaryUris, backupUris, this.getLoggingLevel(), this.serviceData, (_this$sdkConfig8 = this.sdkConfig) === null || _this$sdkConfig8 === void 0 ? void 0 : _this$sdkConfig8.jwe);
               this.lineDict[line.lineId] = line;
             case 1:
             case "end":
@@ -1195,7 +1142,7 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
     key: "getDevices",
     value: (function () {
       var _getDevices = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee13(userId) {
-        var userid, mobiusUrls, finalError, _iterator5, _step5, mobiusUrl, normalizedMobiusUrl, uri, _body$devices, response, body, _t1, _t10;
+        var userid, mobiusUrls, finalError, _iterator4, _step4, mobiusUrl, normalizedMobiusUrl, uri, _body$devices, response, body, _t9, _t0;
         return _regenerator.default.wrap(function (_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
@@ -1217,15 +1164,15 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
               }
               throw new Error('Mobius URLs are not available');
             case 2:
-              _iterator5 = _createForOfIteratorHelper(mobiusUrls);
+              _iterator4 = _createForOfIteratorHelper(mobiusUrls);
               _context15.prev = 3;
-              _iterator5.s();
+              _iterator4.s();
             case 4:
-              if ((_step5 = _iterator5.n()).done) {
+              if ((_step4 = _iterator4.n()).done) {
                 _context15.next = 10;
                 break;
               }
-              mobiusUrl = _step5.value;
+              mobiusUrl = _step4.value;
               normalizedMobiusUrl = mobiusUrl.replace(/\/+$/, '/');
               uri = "".concat(normalizedMobiusUrl).concat(_constants2.DEVICES_ENDPOINT_RESOURCE, "?userid=").concat(encodeURIComponent(userid));
               _context15.prev = 5;
@@ -1250,8 +1197,8 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
               return _context15.abrupt("return", (_body$devices = body.devices) !== null && _body$devices !== void 0 ? _body$devices : []);
             case 8:
               _context15.prev = 8;
-              _t1 = _context15["catch"](5);
-              finalError = _t1;
+              _t9 = _context15["catch"](5);
+              finalError = _t9;
             case 9:
               _context15.next = 4;
               break;
@@ -1260,11 +1207,11 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
               break;
             case 11:
               _context15.prev = 11;
-              _t10 = _context15["catch"](3);
-              _iterator5.e(_t10);
+              _t0 = _context15["catch"](3);
+              _iterator4.e(_t0);
             case 12:
               _context15.prev = 12;
-              _iterator5.f();
+              _iterator4.f();
               return _context15.finish(12);
             case 13:
               _Logger.default.error("Failed to fetch devices for userId ".concat(userId, ": ").concat((0, _stringify.default)(finalError)), {