@webex/calling 3.8.1 → 3.9.0-webinar5k.1

package/dist/CallingClient/CallingClient.js

@@ -203,7 +203,19 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
         method: _this.constructor.name
       });
     }
-    _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];
+
+    // 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.mobiusHost = '';
     _this.registerSessionsListener();
     _this.registerCallsClearedListener();
@@ -323,9 +335,9 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
     value: (function () {
       var _getClientRegionInfo = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
         var _this3 = this;
-        var regionInfo, _iterator, _step, mobius, temp, myIP, response, clientRegionInfo, extendedError;
-        return _regenerator.default.wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        var abort, regionInfo, _iterator, _step, _loop, _ret;
+        return _regenerator.default.wrap(function _callee6$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               _Logger.default.info(_constants.METHOD_START_MESSAGE, {
                 file: _constants2.CALLING_CLIENT_FILE,
@@ -333,77 +345,119 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
               });
               regionInfo = {};
               _iterator = _createForOfIteratorHelper(this.mobiusClusters);
-              _context6.prev = 3;
+              _context7.prev = 3;
+              _loop = /*#__PURE__*/_regenerator.default.mark(function _loop() {
+                var mobius, temp, myIP, response, clientRegionInfo, extendedError;
+                return _regenerator.default.wrap(function _loop$(_context6) {
+                  while (1) switch (_context6.prev = _context6.next) {
+                    case 0:
+                      mobius = _step.value;
+                      if (mobius.host) {
+                        _this3.mobiusHost = "https://".concat(mobius.host).concat(_constants2.API_V1);
+                      } else {
+                        _this3.mobiusHost = mobius;
+                      }
+                      _context6.prev = 2;
+                      _context6.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 = _context6.sent;
+                      myIP = temp.body.ipv4; // eslint-disable-next-line no-await-in-loop
+                      _context6.next = 9;
+                      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 9:
+                      response = _context6.sent;
+                      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 : '';
+                      return _context6.abrupt("return", 0);
+                    case 16:
+                      _context6.prev = 16;
+                      _context6.t0 = _context6["catch"](2);
+                      extendedError = new Error("Failed to get client region info: ".concat(_context6.t0));
+                      _Logger.default.error(extendedError, {
+                        method: _constants2.METHODS.GET_CLIENT_REGION_INFO,
+                        file: _constants2.CALLING_CLIENT_FILE
+                      });
+
+                      // eslint-disable-next-line no-await-in-loop
+                      _context6.next = 22;
+                      return (0, _Utils.handleCallingClientErrors)(_context6.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 = _context6.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 22:
+                      abort = _context6.sent;
+                      regionInfo.clientRegion = '';
+                      regionInfo.countryCode = '';
+                      if (!abort) {
+                        _context6.next = 27;
+                        break;
+                      }
+                      return _context6.abrupt("return", {
+                        v: regionInfo
+                      });
+                    case 27:
+                    case "end":
+                      return _context6.stop();
+                  }
+                }, _loop, null, [[2, 16]]);
+              });
               _iterator.s();
-            case 5:
+            case 6:
               if ((_step = _iterator.n()).done) {
-                _context6.next = 31;
+                _context7.next = 15;
                 break;
               }
-              mobius = _step.value;
-              this.mobiusHost = "https://".concat(mobius.host).concat(_constants2.API_V1);
-              _context6.prev = 8;
-              _context6.next = 11;
-              return this.webex.request({
-                uri: "".concat(this.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, this.webex.internal.device.url), _constants2.SPARK_USER_AGENT, _constants2.CALLING_USER_AGENT),
-                service: _types3.ALLOWED_SERVICES.MOBIUS
-              });
+              return _context7.delegateYield(_loop(), "t0", 8);
+            case 8:
+              _ret = _context7.t0;
+              if (!(_ret === 0)) {
+                _context7.next = 11;
+                break;
+              }
+              return _context7.abrupt("break", 15);
             case 11:
-              temp = _context6.sent;
-              myIP = temp.body.ipv4; // eslint-disable-next-line no-await-in-loop
-              _context6.next = 15;
-              return this.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 15:
-              response = _context6.sent;
-              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 : '';
-              return _context6.abrupt("break", 31);
-            case 22:
-              _context6.prev = 22;
-              _context6.t0 = _context6["catch"](8);
-              extendedError = new Error("Failed to get client region info: ".concat(_context6.t0));
-              _Logger.default.error(extendedError, {
-                method: _constants2.METHODS.GET_CLIENT_REGION_INFO,
-                file: _constants2.CALLING_CLIENT_FILE
-              });
-              (0, _Utils.handleCallingClientErrors)(_context6.t0, function (clientError) {
-                _this3.metricManager.submitRegistrationMetric(_types4.METRIC_EVENT.REGISTRATION_ERROR, _types4.REG_ACTION.REGISTER, _types4.METRIC_TYPE.BEHAVIORAL, clientError);
-                _this3.emit(_types2.CALLING_CLIENT_EVENT_KEYS.ERROR, clientError);
-              }, {
-                method: _constants2.GET_MOBIUS_SERVERS_UTIL,
-                file: _constants2.CALLING_CLIENT_FILE
-              });
-              regionInfo.clientRegion = '';
-              regionInfo.countryCode = '';
-            case 29:
-              _context6.next = 5;
+              if (!_ret) {
+                _context7.next = 13;
+                break;
+              }
+              return _context7.abrupt("return", _ret.v);
+            case 13:
+              _context7.next = 6;
               break;
-            case 31:
-              _context6.next = 36;
+            case 15:
+              _context7.next = 20;
               break;
-            case 33:
-              _context6.prev = 33;
-              _context6.t1 = _context6["catch"](3);
-              _iterator.e(_context6.t1);
-            case 36:
-              _context6.prev = 36;
+            case 17:
+              _context7.prev = 17;
+              _context7.t1 = _context7["catch"](3);
+              _iterator.e(_context7.t1);
+            case 20:
+              _context7.prev = 20;
               _iterator.f();
-              return _context6.finish(36);
-            case 39:
-              return _context6.abrupt("return", regionInfo);
-            case 40:
+              return _context7.finish(20);
+            case 23:
+              return _context7.abrupt("return", regionInfo);
+            case 24:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, this, [[3, 33, 36, 39], [8, 22]]);
+        }, _callee6, this, [[3, 17, 20, 23]]);
       }));
       function getClientRegionInfo() {
         return _getClientRegionInfo.apply(this, arguments);
@@ -424,8 +478,8 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
           _this$sdkConfig4$disc,
           _this4 = this;
         var useDefault, clientRegion, countryCode, _this$sdkConfig5, _this$sdkConfig5$disc, _this$sdkConfig6, _this$sdkConfig6$disc, regionInfo, temp, mobiusServers, mobiusUris, extendedError;
-        return _regenerator.default.wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+        return _regenerator.default.wrap(function _callee7$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               _Logger.default.info(_constants.METHOD_START_MESSAGE, {
                 file: _constants2.CALLING_CLIENT_FILE,
@@ -440,7 +494,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)) {
-                _context7.next = 9;
+                _context8.next = 9;
                 break;
               }
               _Logger.default.log('Updating region and country from the SDK config', {
@@ -450,27 +504,27 @@ 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;
-              _context7.next = 15;
+              _context8.next = 15;
               break;
             case 9:
               _Logger.default.log('Updating region and country through Region discovery', {
                 file: _constants2.CALLING_CLIENT_FILE,
                 method: _constants2.GET_MOBIUS_SERVERS_UTIL
               });
-              _context7.next = 12;
+              _context8.next = 12;
               return this.getClientRegionInfo();
             case 12:
-              regionInfo = _context7.sent;
+              regionInfo = _context8.sent;
               clientRegion = regionInfo.clientRegion;
               countryCode = regionInfo.countryCode;
             case 15:
               if (!(clientRegion && countryCode)) {
-                _context7.next = 37;
+                _context8.next = 37;
                 break;
               }
               _Logger.default.log("Found Region: ".concat(clientRegion, " and country: ").concat(countryCode, ", going to fetch Mobius server"), '');
-              _context7.prev = 17;
-              _context7.next = 20;
+              _context8.prev = 17;
+              _context8.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,
@@ -478,7 +532,7 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
                 service: _types3.ALLOWED_SERVICES.MOBIUS
               });
             case 20:
-              temp = _context7.sent;
+              temp = _context8.sent;
               _Logger.default.log('Mobius Server found for the region', '');
               mobiusServers = temp.body;
               /* update arrays of Mobius Uris. */
@@ -486,18 +540,19 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
               this.primaryMobiusUris = mobiusUris.primary;
               this.backupMobiusUris = mobiusUris.backup;
               _Logger.default.info("Final list of Mobius Servers, primary: ".concat(mobiusUris.primary, " and backup: ").concat(mobiusUris.backup), '');
-              _context7.next = 35;
+              _context8.next = 35;
               break;
             case 29:
-              _context7.prev = 29;
-              _context7.t0 = _context7["catch"](17);
-              extendedError = new Error("Failed to get Mobius servers: ".concat(_context7.t0));
+              _context8.prev = 29;
+              _context8.t0 = _context8["catch"](17);
+              extendedError = new Error("Failed to get Mobius servers: ".concat(_context8.t0));
               _Logger.default.error(extendedError, {
                 method: _constants2.METHODS.GET_MOBIUS_SERVERS,
                 file: _constants2.CALLING_CLIENT_FILE
               });
-              (0, _Utils.handleCallingClientErrors)(_context7.t0, function (clientError) {
-                _this4.metricManager.submitRegistrationMetric(_types4.METRIC_EVENT.REGISTRATION_ERROR, _types4.REG_ACTION.REGISTER, _types4.METRIC_TYPE.BEHAVIORAL, clientError);
+              (0, _Utils.handleCallingClientErrors)(_context8.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 = _context8.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,
@@ -505,7 +560,7 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
               });
               useDefault = true;
             case 35:
-              _context7.next = 38;
+              _context8.next = 38;
               break;
             case 37:
               /* Setting this to true because region info is possibly undefined */
@@ -522,7 +577,7 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
               }
             case 39:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
         }, _callee7, this, [[17, 29]]);
       }));
@@ -577,23 +632,23 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
       this.sdkConnector.registerListener(_types2.MOBIUS_EVENT_KEYS.CALL_SESSION_EVENT_INCLUSIVE, /*#__PURE__*/function () {
         var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8(event) {
           var sessionArr, i;
-          return _regenerator.default.wrap(function _callee8$(_context8) {
-            while (1) switch (_context8.prev = _context8.next) {
+          return _regenerator.default.wrap(function _callee8$(_context9) {
+            while (1) switch (_context9.prev = _context9.next) {
               case 0:
                 if (!(event && event.data.userSessions.userSessions)) {
-                  _context8.next = 7;
+                  _context9.next = 7;
                   break;
                 }
                 sessionArr = event === null || event === void 0 ? void 0 : event.data.userSessions.userSessions;
                 if (!(sessionArr.length === 1)) {
-                  _context8.next = 5;
+                  _context9.next = 5;
                   break;
                 }
                 if (!(sessionArr[0].sessionType !== _types2.SessionType.WEBEX_CALLING)) {
-                  _context8.next = 5;
+                  _context9.next = 5;
                   break;
                 }
-                return _context8.abrupt("return");
+                return _context9.abrupt("return");
               case 5:
                 for (i = 0; i < sessionArr.length; i += 1) {
                   if (sessionArr[i].sessionType !== _types2.SessionType.WEBEX_CALLING) {
@@ -603,7 +658,7 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
                 _this5.emit(_types2.CALLING_CLIENT_EVENT_KEYS.USER_SESSION_INFO, event);
               case 7:
               case "end":
-                return _context8.stop();
+                return _context9.stop();
             }
           }, _callee8);
         }));
@@ -623,8 +678,8 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
       var _createLine = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9() {
         var _this$sdkConfig7, _this$sdkConfig8;
         var line;
-        return _regenerator.default.wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+        return _regenerator.default.wrap(function _callee9$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
               _Logger.default.info(_constants.METHOD_START_MESSAGE, {
                 file: _constants2.CALLING_CLIENT_FILE,
@@ -634,7 +689,7 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
               this.lineDict[line.lineId] = line;
             case 3:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
         }, _callee9, this);
       }));
@@ -703,23 +758,23 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
     value: (function () {
       var _uploadLogs2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10() {
         var result;
-        return _regenerator.default.wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+        return _regenerator.default.wrap(function _callee10$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              _context10.next = 2;
+              _context11.next = 2;
               return (0, _Utils.uploadLogs)({}, true);
             case 2:
-              result = _context10.sent;
+              result = _context11.sent;
               if (result) {
-                _context10.next = 5;
+                _context11.next = 5;
                 break;
               }
               throw new Error('Failed to upload logs: No response received.');
             case 5:
-              return _context10.abrupt("return", result);
+              return _context11.abrupt("return", result);
             case 6:
             case "end":
-              return _context10.stop();
+              return _context11.stop();
           }
         }, _callee10);
       }));
@@ -739,17 +794,17 @@ var CallingClient = exports.CallingClient = /*#__PURE__*/function (_Eventing) {
 var createClient = exports.createClient = /*#__PURE__*/function () {
   var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11(webex, config) {
     var callingClientInstance;
-    return _regenerator.default.wrap(function _callee11$(_context11) {
-      while (1) switch (_context11.prev = _context11.next) {
+    return _regenerator.default.wrap(function _callee11$(_context12) {
+      while (1) switch (_context12.prev = _context12.next) {
         case 0:
           callingClientInstance = new CallingClient(webex, config);
-          _context11.next = 3;
+          _context12.next = 3;
           return callingClientInstance.init();
         case 3:
-          return _context11.abrupt("return", callingClientInstance);
+          return _context12.abrupt("return", callingClientInstance);
         case 4:
         case "end":
-          return _context11.stop();
+          return _context12.stop();
       }
     }, _callee11);
   }));