@webex/plugin-meetings 3.0.0-beta.39 → 3.0.0-beta.391

package/dist/roap/request.js

@@ -14,6 +14,7 @@ _Object$defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs2/regenerator"));
 var _keys = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/object/keys"));
+var _promise = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/promise"));
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/json/stringify"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/asyncToGenerator"));
@@ -25,8 +26,6 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime-corejs2/he
 var _webexCore = require("@webex/webex-core");
 var _loggerProxy = _interopRequireDefault(require("../common/logs/logger-proxy"));
 var _constants = require("../constants");
-var _metrics = _interopRequireDefault(require("../metrics"));
-var _config = require("../metrics/config");
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys2(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = _Reflect$construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -51,24 +50,16 @@ var RoapRequest = /*#__PURE__*/function (_StatelessWebexPlugin) {
      */
     function () {
       var _attachReachabilityData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(localSdp) {
-        var joinCookie, reachabilityData, reachabilityResult, joinCookieRaw;
+        var joinCookie, reachabilityResult, joinCookieRaw;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _context.next = 2;
-              return this.webex.boundedStorage.get(_constants.REACHABILITY.namespace, _constants.REACHABILITY.localStorageResult).catch(function () {});
+              return this.webex.meetings.reachability.getReachabilityResults();
             case 2:
-              reachabilityData = _context.sent;
-              if (reachabilityData) {
-                try {
-                  reachabilityResult = JSON.parse(reachabilityData);
-                  /* istanbul ignore else */
-                  if (reachabilityResult && (0, _keys.default)(reachabilityResult).length) {
-                    localSdp.reachability = reachabilityResult;
-                  }
-                } catch (e) {
-                  _loggerProxy.default.logger.error("Roap:request#attachReachabilityData --> Error in parsing reachability data: ".concat(e));
-                }
+              reachabilityResult = _context.sent;
+              if (reachabilityResult && (0, _keys.default)(reachabilityResult).length) {
+                localSdp.reachability = reachabilityResult;
               }
 
               // @ts-ignore
@@ -105,71 +96,63 @@ var RoapRequest = /*#__PURE__*/function (_StatelessWebexPlugin) {
      * @param {String} options.locusSelfUrl
      * @param {String} options.mediaId
      * @param {String} options.correlationId
-     * @param {Boolean} options.audioMuted
-     * @param {Boolean} options.videoMuted
      * @param {String} options.meetingId
-     * @param {Boolean} options.preferTranscoding
+     * @param {IP_VERSION} options.ipVersion only required for offers
      * @returns {Promise} returns the response/failure of the request
      */
   }, {
     key: "sendRoap",
     value: function () {
       var _sendRoap = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(options) {
-        var _options$preferTransc;
-        var roapMessage, locusSelfUrl, mediaId, correlationId, meetingId, _yield$this$attachRea, localSdpWithReachabilityData, joinCookie, mediaUrl, deviceUrl;
+        var _this = this;
+        var roapMessage, locusSelfUrl, mediaId, meetingId, locusMediaRequest, ipVersion, _yield$this$attachRea, localSdpWithReachabilityData, joinCookie;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              roapMessage = options.roapMessage, locusSelfUrl = options.locusSelfUrl, mediaId = options.mediaId, correlationId = options.correlationId, meetingId = options.meetingId;
+              roapMessage = options.roapMessage, locusSelfUrl = options.locusSelfUrl, mediaId = options.mediaId, meetingId = options.meetingId, locusMediaRequest = options.locusMediaRequest, ipVersion = options.ipVersion;
               if (!mediaId) {
-                _loggerProxy.default.logger.info('Roap:request#sendRoap --> Race Condition /call mediaID not present');
+                _loggerProxy.default.logger.info('Roap:request#sendRoap --> sending empty mediaID');
               }
-              _context2.next = 4;
+              if (locusMediaRequest) {
+                _context2.next = 5;
+                break;
+              }
+              _loggerProxy.default.logger.warn('Roap:request#sendRoap --> locusMediaRequest unavailable, not sending roap');
+              return _context2.abrupt("return", _promise.default.reject(new Error('sendRoap called when locusMediaRequest is undefined')));
+            case 5:
+              _context2.next = 7;
               return this.attachReachabilityData({
-                roapMessage: roapMessage,
-                // eslint-disable-next-line no-warning-comments
-                // TODO: check whats the need for video and audiomute
-                audioMuted: !!options.audioMuted,
-                videoMuted: !!options.videoMuted
+                roapMessage: roapMessage
               });
-            case 4:
+            case 7:
               _yield$this$attachRea = _context2.sent;
               localSdpWithReachabilityData = _yield$this$attachRea.localSdp;
               joinCookie = _yield$this$attachRea.joinCookie;
-              mediaUrl = "".concat(locusSelfUrl, "/").concat(_constants.MEDIA); // @ts-ignore
-              deviceUrl = this.webex.internal.device.url;
-              _loggerProxy.default.logger.info("Roap:request#sendRoap --> ".concat(mediaUrl, " \n ").concat(roapMessage.messageType, " \n seq:").concat(roapMessage.seq));
-              _metrics.default.postEvent({
-                event: _config.eventType.MEDIA_REQUEST,
-                meetingId: meetingId
-              });
+              _loggerProxy.default.logger.info("Roap:request#sendRoap --> ".concat(locusSelfUrl, " \n ").concat(roapMessage.messageType, " \n seq:").concat(roapMessage.seq));
 
               // @ts-ignore
-              return _context2.abrupt("return", this.request({
-                uri: mediaUrl,
-                method: _constants.HTTP_VERBS.PUT,
-                body: {
-                  device: {
-                    url: deviceUrl,
-                    // @ts-ignore
-                    deviceType: this.config.meetings.deviceType
-                  },
-                  correlationId: correlationId,
-                  localMedias: [{
-                    localSdp: (0, _stringify.default)(localSdpWithReachabilityData),
-                    mediaId: options.mediaId
-                  }],
-                  clientMediaPreferences: {
-                    preferTranscoding: (_options$preferTransc = options.preferTranscoding) !== null && _options$preferTransc !== void 0 ? _options$preferTransc : true,
-                    joinCookie: joinCookie
-                  }
+              this.webex.internal.newMetrics.submitClientEvent({
+                name: 'client.locus.media.request',
+                options: {
+                  meetingId: meetingId
                 }
+              });
+              return _context2.abrupt("return", locusMediaRequest.send({
+                type: 'RoapMessage',
+                selfUrl: locusSelfUrl,
+                joinCookie: joinCookie,
+                mediaId: mediaId,
+                roapMessage: roapMessage,
+                reachability: localSdpWithReachabilityData.reachability,
+                ipVersion: ipVersion
               }).then(function (res) {
-                _metrics.default.postEvent({
-                  event: _config.eventType.MEDIA_RESPONSE,
-                  meetingId: meetingId
+                // @ts-ignore
+                _this.webex.internal.newMetrics.submitClientEvent({
+                  name: 'client.locus.media.response',
+                  options: {
+                    meetingId: meetingId
+                  }
                 });
-
                 // always it will be the first mediaConnection Object
                 var mediaConnections = res.body.mediaConnections && res.body.mediaConnections.length > 0 && res.body.mediaConnections[0];
                 _loggerProxy.default.logger.debug("Roap:request#sendRoap --> response:".concat((0, _stringify.default)(mediaConnections, null, 2), "'\n StatusCode:'").concat(res.statusCode));
@@ -181,18 +164,19 @@ var RoapRequest = /*#__PURE__*/function (_StatelessWebexPlugin) {
                   mediaConnections: res.body.mediaConnections
                 });
               }).catch(function (err) {
-                _metrics.default.postEvent({
-                  event: _config.eventType.MEDIA_RESPONSE,
-                  meetingId: meetingId,
-                  data: {
-                    error: _metrics.default.parseLocusError(err, true)
+                // @ts-ignore
+                _this.webex.internal.newMetrics.submitClientEvent({
+                  name: 'client.locus.media.response',
+                  options: {
+                    meetingId: meetingId,
+                    rawError: err
                   }
                 });
                 _loggerProxy.default.logger.error("Roap:request#sendRoap --> Error:".concat((0, _stringify.default)(err, null, 2)));
                 _loggerProxy.default.logger.error("Roap:request#sendRoapRequest --> errorBody:".concat((0, _stringify.default)(roapMessage, null, 2), " + '\\n mediaId:'").concat(options.mediaId));
                 throw err;
               }));
-            case 12:
+            case 13:
             case "end":
               return _context2.stop();
           }

package/dist/roap/request.js.map

@@ -1 +1 @@
-{"version":3,"names":["RoapRequest","localSdp","webex","boundedStorage","get","REACHABILITY","namespace","localStorageResult","catch","reachabilityData","reachabilityResult","JSON","parse","length","reachability","e","LoggerProxy","logger","error","localStorageJoinCookie","joinCookieRaw","joinCookie","options","roapMessage","locusSelfUrl","mediaId","correlationId","meetingId","info","attachReachabilityData","audioMuted","videoMuted","localSdpWithReachabilityData","mediaUrl","MEDIA","deviceUrl","internal","device","url","messageType","seq","Metrics","postEvent","event","eventType","MEDIA_REQUEST","request","uri","method","HTTP_VERBS","PUT","body","deviceType","config","meetings","localMedias","clientMediaPreferences","preferTranscoding","then","res","MEDIA_RESPONSE","mediaConnections","debug","statusCode","locus","roapSeq","err","data","parseLocusError","StatelessWebexPlugin"],"sources":["request.ts"],"sourcesContent":["/* global window */\n// @ts-ignore\nimport {StatelessWebexPlugin} from '@webex/webex-core';\n\nimport LoggerProxy from '../common/logs/logger-proxy';\nimport {MEDIA, HTTP_VERBS, REACHABILITY} from '../constants';\nimport Metrics from '../metrics';\nimport {eventType} from '../metrics/config';\n\n/**\n * @class RoapRequest\n */\nexport default class RoapRequest extends StatelessWebexPlugin {\n  /**\n   * Returns reachability data.\n   * @param {Object} localSdp\n   * @returns {Object}\n   */\n  async attachReachabilityData(localSdp) {\n    let joinCookie;\n\n    // @ts-ignore\n    const reachabilityData = await this.webex.boundedStorage\n      .get(REACHABILITY.namespace, REACHABILITY.localStorageResult)\n      .catch(() => {});\n\n    if (reachabilityData) {\n      try {\n        const reachabilityResult = JSON.parse(reachabilityData);\n\n        /* istanbul ignore else */\n        if (reachabilityResult && Object.keys(reachabilityResult).length) {\n          localSdp.reachability = reachabilityResult;\n        }\n      } catch (e) {\n        LoggerProxy.logger.error(\n          `Roap:request#attachReachabilityData --> Error in parsing reachability data: ${e}`\n        );\n      }\n    }\n\n    // @ts-ignore\n    const joinCookieRaw = await this.webex.boundedStorage\n      .get(REACHABILITY.namespace, REACHABILITY.localStorageJoinCookie)\n      .catch(() => {});\n\n    if (joinCookieRaw) {\n      try {\n        joinCookie = JSON.parse(joinCookieRaw);\n      } catch (e) {\n        LoggerProxy.logger.error(\n          `MeetingRequest#constructor --> Error in parsing join cookie data: ${e}`\n        );\n      }\n    }\n\n    return {localSdp, joinCookie};\n  }\n\n  /**\n   * Sends a ROAP message\n   * @param {Object} options\n   * @param {Object} options.roapMessage\n   * @param {String} options.locusSelfUrl\n   * @param {String} options.mediaId\n   * @param {String} options.correlationId\n   * @param {Boolean} options.audioMuted\n   * @param {Boolean} options.videoMuted\n   * @param {String} options.meetingId\n   * @param {Boolean} options.preferTranscoding\n   * @returns {Promise} returns the response/failure of the request\n   */\n  async sendRoap(options: {\n    roapMessage: any;\n    locusSelfUrl: string;\n    mediaId: string;\n    correlationId: string;\n    audioMuted: boolean;\n    videoMuted: boolean;\n    meetingId: string;\n    preferTranscoding?: boolean;\n  }) {\n    const {roapMessage, locusSelfUrl, mediaId, correlationId, meetingId} = options;\n\n    if (!mediaId) {\n      LoggerProxy.logger.info('Roap:request#sendRoap --> Race Condition /call mediaID not present');\n    }\n\n    const {localSdp: localSdpWithReachabilityData, joinCookie} = await this.attachReachabilityData({\n      roapMessage,\n      // eslint-disable-next-line no-warning-comments\n      // TODO: check whats the need for video and audiomute\n      audioMuted: !!options.audioMuted,\n      videoMuted: !!options.videoMuted,\n    });\n\n    const mediaUrl = `${locusSelfUrl}/${MEDIA}`;\n    // @ts-ignore\n    const deviceUrl = this.webex.internal.device.url;\n\n    LoggerProxy.logger.info(\n      `Roap:request#sendRoap --> ${mediaUrl} \\n ${roapMessage.messageType} \\n seq:${roapMessage.seq}`\n    );\n\n    Metrics.postEvent({event: eventType.MEDIA_REQUEST, meetingId});\n\n    // @ts-ignore\n    return this.request({\n      uri: mediaUrl,\n      method: HTTP_VERBS.PUT,\n      body: {\n        device: {\n          url: deviceUrl,\n          // @ts-ignore\n          deviceType: this.config.meetings.deviceType,\n        },\n        correlationId,\n        localMedias: [\n          {\n            localSdp: JSON.stringify(localSdpWithReachabilityData),\n            mediaId: options.mediaId,\n          },\n        ],\n        clientMediaPreferences: {\n          preferTranscoding: options.preferTranscoding ?? true,\n          joinCookie,\n        },\n      },\n    })\n      .then((res) => {\n        Metrics.postEvent({event: eventType.MEDIA_RESPONSE, meetingId});\n\n        // always it will be the first mediaConnection Object\n        const mediaConnections =\n          res.body.mediaConnections &&\n          res.body.mediaConnections.length > 0 &&\n          res.body.mediaConnections[0];\n\n        LoggerProxy.logger.debug(\n          `Roap:request#sendRoap --> response:${JSON.stringify(\n            mediaConnections,\n            null,\n            2\n          )}'\\n StatusCode:'${res.statusCode}`\n        );\n        const {locus} = res.body;\n\n        locus.roapSeq = options.roapMessage.seq;\n\n        return {\n          locus,\n          ...(mediaConnections && {mediaConnections: res.body.mediaConnections}),\n        };\n      })\n      .catch((err) => {\n        Metrics.postEvent({\n          event: eventType.MEDIA_RESPONSE,\n          meetingId,\n          data: {error: Metrics.parseLocusError(err, true)},\n        });\n        LoggerProxy.logger.error(`Roap:request#sendRoap --> Error:${JSON.stringify(err, null, 2)}`);\n        LoggerProxy.logger.error(\n          `Roap:request#sendRoapRequest --> errorBody:${JSON.stringify(\n            roapMessage,\n            null,\n            2\n          )} + '\\\\n mediaId:'${options.mediaId}`\n        );\n        throw err;\n      });\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["RoapRequest","localSdp","webex","meetings","reachability","getReachabilityResults","reachabilityResult","length","boundedStorage","get","REACHABILITY","namespace","localStorageJoinCookie","catch","joinCookieRaw","joinCookie","JSON","parse","e","LoggerProxy","logger","error","options","roapMessage","locusSelfUrl","mediaId","meetingId","locusMediaRequest","ipVersion","info","warn","reject","Error","attachReachabilityData","localSdpWithReachabilityData","messageType","seq","internal","newMetrics","submitClientEvent","name","send","type","selfUrl","then","res","mediaConnections","body","debug","statusCode","locus","roapSeq","err","rawError","StatelessWebexPlugin"],"sources":["request.ts"],"sourcesContent":["// @ts-ignore\nimport {StatelessWebexPlugin} from '@webex/webex-core';\n\nimport LoggerProxy from '../common/logs/logger-proxy';\nimport {IP_VERSION, REACHABILITY} from '../constants';\nimport {LocusMediaRequest} from '../meeting/locusMediaRequest';\n\n/**\n * @class RoapRequest\n */\nexport default class RoapRequest extends StatelessWebexPlugin {\n  /**\n   * Returns reachability data.\n   * @param {Object} localSdp\n   * @returns {Object}\n   */\n  async attachReachabilityData(localSdp) {\n    let joinCookie;\n\n    // @ts-ignore\n    const reachabilityResult = await this.webex.meetings.reachability.getReachabilityResults();\n\n    if (reachabilityResult && Object.keys(reachabilityResult).length) {\n      localSdp.reachability = reachabilityResult;\n    }\n\n    // @ts-ignore\n    const joinCookieRaw = await this.webex.boundedStorage\n      .get(REACHABILITY.namespace, REACHABILITY.localStorageJoinCookie)\n      .catch(() => {});\n\n    if (joinCookieRaw) {\n      try {\n        joinCookie = JSON.parse(joinCookieRaw);\n      } catch (e) {\n        LoggerProxy.logger.error(\n          `MeetingRequest#constructor --> Error in parsing join cookie data: ${e}`\n        );\n      }\n    }\n\n    return {localSdp, joinCookie};\n  }\n\n  /**\n   * Sends a ROAP message\n   * @param {Object} options\n   * @param {Object} options.roapMessage\n   * @param {String} options.locusSelfUrl\n   * @param {String} options.mediaId\n   * @param {String} options.correlationId\n   * @param {String} options.meetingId\n   * @param {IP_VERSION} options.ipVersion only required for offers\n   * @returns {Promise} returns the response/failure of the request\n   */\n  async sendRoap(options: {\n    roapMessage: any;\n    locusSelfUrl: string;\n    mediaId: string;\n    meetingId: string;\n    ipVersion?: IP_VERSION;\n    locusMediaRequest?: LocusMediaRequest;\n  }) {\n    const {roapMessage, locusSelfUrl, mediaId, meetingId, locusMediaRequest, ipVersion} = options;\n\n    if (!mediaId) {\n      LoggerProxy.logger.info('Roap:request#sendRoap --> sending empty mediaID');\n    }\n\n    if (!locusMediaRequest) {\n      LoggerProxy.logger.warn(\n        'Roap:request#sendRoap --> locusMediaRequest unavailable, not sending roap'\n      );\n\n      return Promise.reject(new Error('sendRoap called when locusMediaRequest is undefined'));\n    }\n    const {localSdp: localSdpWithReachabilityData, joinCookie} = await this.attachReachabilityData({\n      roapMessage,\n    });\n\n    LoggerProxy.logger.info(\n      `Roap:request#sendRoap --> ${locusSelfUrl} \\n ${roapMessage.messageType} \\n seq:${roapMessage.seq}`\n    );\n\n    // @ts-ignore\n    this.webex.internal.newMetrics.submitClientEvent({\n      name: 'client.locus.media.request',\n      options: {\n        meetingId,\n      },\n    });\n\n    return locusMediaRequest\n      .send({\n        type: 'RoapMessage',\n        selfUrl: locusSelfUrl,\n        joinCookie,\n        mediaId,\n        roapMessage,\n        reachability: localSdpWithReachabilityData.reachability,\n        ipVersion,\n      })\n      .then((res) => {\n        // @ts-ignore\n        this.webex.internal.newMetrics.submitClientEvent({\n          name: 'client.locus.media.response',\n          options: {\n            meetingId,\n          },\n        });\n        // always it will be the first mediaConnection Object\n        const mediaConnections =\n          res.body.mediaConnections &&\n          res.body.mediaConnections.length > 0 &&\n          res.body.mediaConnections[0];\n\n        LoggerProxy.logger.debug(\n          `Roap:request#sendRoap --> response:${JSON.stringify(\n            mediaConnections,\n            null,\n            2\n          )}'\\n StatusCode:'${res.statusCode}`\n        );\n        const {locus} = res.body;\n\n        locus.roapSeq = options.roapMessage.seq;\n\n        return {\n          locus,\n          ...(mediaConnections && {mediaConnections: res.body.mediaConnections}),\n        };\n      })\n      .catch((err) => {\n        // @ts-ignore\n        this.webex.internal.newMetrics.submitClientEvent({\n          name: 'client.locus.media.response',\n          options: {\n            meetingId,\n            rawError: err,\n          },\n        });\n        LoggerProxy.logger.error(`Roap:request#sendRoap --> Error:${JSON.stringify(err, null, 2)}`);\n        LoggerProxy.logger.error(\n          `Roap:request#sendRoapRequest --> errorBody:${JSON.stringify(\n            roapMessage,\n            null,\n            2\n          )} + '\\\\n mediaId:'${options.mediaId}`\n        );\n        throw err;\n      });\n  }\n}\n"],"mappings":"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"}

package/dist/roap/turnDiscovery.js

@@ -18,6 +18,7 @@ var _metrics = _interopRequireDefault(require("../metrics"));
 var _constants = _interopRequireDefault(require("../metrics/constants"));
 var _loggerProxy = _interopRequireDefault(require("../common/logs/logger-proxy"));
 var _constants2 = require("../constants");
+var _util = _interopRequireDefault(require("../meeting/util"));
 // @ts-ignore - Types not available for @webex/common
 
 var TURN_DISCOVERY_TIMEOUT = 10; // in seconds
@@ -81,20 +82,23 @@ var TurnDiscovery = /*#__PURE__*/function () {
      * handles TURN_DISCOVERY_RESPONSE roap message
      *
      * @param {Object} roapMessage
+     * @param {string} from string to indicate how we got the response (used just for logging)
      * @returns {void}
      * @public
      * @memberof Roap
      */
   }, {
     key: "handleTurnDiscoveryResponse",
-    value: function handleTurnDiscoveryResponse(roapMessage) {
+    value: function handleTurnDiscoveryResponse(roapMessage, from) {
       var _this = this;
-      // @ts-ignore - Fix missing type
       var headers = roapMessage.headers;
       if (!this.defer) {
-        _loggerProxy.default.logger.warn('Roap:turnDiscovery#handleTurnDiscoveryResponse --> unexpected TURN discovery response');
+        _loggerProxy.default.logger.warn("Roap:turnDiscovery#handleTurnDiscoveryResponse --> unexpected TURN discovery response ".concat(from));
         return;
       }
+      if (roapMessage.messageType !== _constants2.ROAP.ROAP_TYPES.TURN_DISCOVERY_RESPONSE) {
+        this.defer.reject(new Error("TURN_DISCOVERY_RESPONSE ".concat(from, " has unexpected messageType: ").concat((0, _stringify.default)(roapMessage))));
+      }
       var expectedHeaders = [{
         headerName: 'x-cisco-turn-url',
         field: 'url'
@@ -118,14 +122,43 @@ var TurnDiscovery = /*#__PURE__*/function () {
       clearTimeout(this.responseTimer);
       this.responseTimer = undefined;
       if (foundHeaders !== expectedHeaders.length) {
-        _loggerProxy.default.logger.warn("Roap:turnDiscovery#handleTurnDiscoveryResponse --> missing some headers, received: ".concat((0, _stringify.default)(headers)));
-        this.defer.reject(new Error("TURN_DISCOVERY_RESPONSE missing some headers: ".concat((0, _stringify.default)(headers))));
+        _loggerProxy.default.logger.warn("Roap:turnDiscovery#handleTurnDiscoveryResponse --> missing some headers, received ".concat(from, ": ").concat((0, _stringify.default)(headers)));
+        this.defer.reject(new Error("TURN_DISCOVERY_RESPONSE ".concat(from, " missing some headers: ").concat((0, _stringify.default)(headers))));
       } else {
-        _loggerProxy.default.logger.info("Roap:turnDiscovery#handleTurnDiscoveryResponse --> received a valid response, url=".concat(this.turnInfo.url));
-        this.defer.resolve();
+        _loggerProxy.default.logger.info("Roap:turnDiscovery#handleTurnDiscoveryResponse --> received a valid response ".concat(from, ", url=").concat(this.turnInfo.url));
+        this.defer.resolve({
+          isOkRequired: !(headers !== null && headers !== void 0 && headers.includes('noOkInTransaction'))
+        });
       }
     }
 
+    /**
+     * handles TURN_DISCOVERY_RESPONSE roap message that came in http response
+     *
+     * @param {Object} roapMessage
+     * @returns {Promise}
+     * @memberof Roap
+     */
+  }, {
+    key: "handleTurnDiscoveryResponseInHttpResponse",
+    value: function () {
+      var _handleTurnDiscoveryResponseInHttpResponse = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(roapMessage) {
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              this.handleTurnDiscoveryResponse(roapMessage, 'in http response');
+              return _context.abrupt("return", this.defer.promise);
+            case 2:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function handleTurnDiscoveryResponseInHttpResponse(_x) {
+        return _handleTurnDiscoveryResponseInHttpResponse.apply(this, arguments);
+      }
+      return handleTurnDiscoveryResponseInHttpResponse;
+    }()
     /**
      * sends the TURN_DISCOVERY_REQUEST roap request
      *
@@ -138,7 +171,6 @@ var TurnDiscovery = /*#__PURE__*/function () {
   }, {
     key: "sendRoapTurnDiscoveryRequest",
     value: function sendRoapTurnDiscoveryRequest(meeting, isReconnecting) {
-      var _meeting$audio, _meeting$video;
       if (this.defer) {
         _loggerProxy.default.logger.warn('Roap:turnDiscovery#sendRoapTurnDiscoveryRequest --> already in progress');
         return _promise.default.resolve();
@@ -147,25 +179,54 @@ var TurnDiscovery = /*#__PURE__*/function () {
       var roapMessage = {
         messageType: _constants2.ROAP.ROAP_TYPES.TURN_DISCOVERY_REQUEST,
         version: _constants2.ROAP.ROAP_VERSION,
-        seq: TURN_DISCOVERY_SEQ
+        seq: TURN_DISCOVERY_SEQ,
+        headers: ['includeAnswerInHttpResponse', 'noOkInTransaction']
       };
       _loggerProxy.default.logger.info('Roap:turnDiscovery#sendRoapTurnDiscoveryRequest --> sending TURN_DISCOVERY_REQUEST');
       return this.roapRequest.sendRoap({
         roapMessage: roapMessage,
-        correlationId: meeting.correlationId,
         // @ts-ignore - Fix missing type
         locusSelfUrl: meeting.selfUrl,
         // @ts-ignore - Fix missing type
         mediaId: isReconnecting ? '' : meeting.mediaId,
-        audioMuted: (_meeting$audio = meeting.audio) === null || _meeting$audio === void 0 ? void 0 : _meeting$audio.isLocallyMuted(),
-        videoMuted: (_meeting$video = meeting.video) === null || _meeting$video === void 0 ? void 0 : _meeting$video.isLocallyMuted(),
         meetingId: meeting.id,
-        preferTranscoding: !meeting.isMultistream
-      }).then(function (_ref) {
-        var mediaConnections = _ref.mediaConnections;
+        locusMediaRequest: meeting.locusMediaRequest,
+        // @ts-ignore - because of meeting.webex
+        ipVersion: _util.default.getIpVersion(meeting.webex)
+      }).then(function (response) {
+        var mediaConnections = response.mediaConnections;
+        var turnDiscoveryResponse;
         if (mediaConnections) {
+          var _mediaConnections$;
           meeting.updateMediaConnections(mediaConnections);
+          if ((_mediaConnections$ = mediaConnections[0]) !== null && _mediaConnections$ !== void 0 && _mediaConnections$.remoteSdp) {
+            var remoteSdp = JSON.parse(mediaConnections[0].remoteSdp);
+            if (remoteSdp.roapMessage) {
+              // yes, it's misleading that remoteSdp actually contains a TURN discovery response, but that's how the backend works...
+              var _remoteSdp$roapMessag = remoteSdp.roapMessage,
+                seq = _remoteSdp$roapMessag.seq,
+                messageType = _remoteSdp$roapMessag.messageType,
+                errorType = _remoteSdp$roapMessag.errorType,
+                errorCause = _remoteSdp$roapMessag.errorCause,
+                headers = _remoteSdp$roapMessag.headers;
+              turnDiscoveryResponse = {
+                seq: seq,
+                messageType: messageType,
+                errorType: errorType,
+                errorCause: errorCause,
+                headers: headers
+              };
+            }
+          }
+        }
+        if (!turnDiscoveryResponse) {
+          _metrics.default.sendBehavioralMetric(_constants.default.ROAP_HTTP_RESPONSE_MISSING, {
+            correlationId: meeting.correlationId,
+            messageType: 'TURN_DISCOVERY_RESPONSE',
+            isMultistream: meeting.isMultistream
+          });
         }
+        return turnDiscoveryResponse;
       });
     }
 
@@ -179,7 +240,6 @@ var TurnDiscovery = /*#__PURE__*/function () {
   }, {
     key: "sendRoapOK",
     value: function sendRoapOK(meeting) {
-      var _meeting$audio2, _meeting$video2;
       _loggerProxy.default.logger.info('Roap:turnDiscovery#sendRoapOK --> sending OK');
       return this.roapRequest.sendRoap({
         roapMessage: {
@@ -191,14 +251,78 @@ var TurnDiscovery = /*#__PURE__*/function () {
         locusSelfUrl: meeting.selfUrl,
         // @ts-ignore - fix type
         mediaId: meeting.mediaId,
-        correlationId: meeting.correlationId,
-        audioMuted: (_meeting$audio2 = meeting.audio) === null || _meeting$audio2 === void 0 ? void 0 : _meeting$audio2.isLocallyMuted(),
-        videoMuted: (_meeting$video2 = meeting.video) === null || _meeting$video2 === void 0 ? void 0 : _meeting$video2.isLocallyMuted(),
         meetingId: meeting.id,
-        preferTranscoding: !meeting.isMultistream
+        locusMediaRequest: meeting.locusMediaRequest
       });
     }
 
+    /**
+     * Gets the reason why reachability is skipped.
+     *
+     * @param {Meeting} meeting
+     * @returns {Promise<string>} Promise with empty string if reachability is not skipped or a reason if it is skipped
+     */
+  }, {
+    key: "getSkipReason",
+    value: function () {
+      var _getSkipReason = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(meeting) {
+        var isAnyPublicClusterReachable;
+        return _regenerator.default.wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
+              return meeting.webex.meetings.reachability.isAnyPublicClusterReachable();
+            case 2:
+              isAnyPublicClusterReachable = _context2.sent;
+              if (!isAnyPublicClusterReachable) {
+                _context2.next = 6;
+                break;
+              }
+              _loggerProxy.default.logger.info('Roap:turnDiscovery#getSkipReason --> reachability has not failed, skipping TURN discovery');
+              return _context2.abrupt("return", 'reachability');
+            case 6:
+              return _context2.abrupt("return", '');
+            case 7:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }));
+      function getSkipReason(_x2) {
+        return _getSkipReason.apply(this, arguments);
+      }
+      return getSkipReason;
+    }()
+    /**
+     * Checks if TURN discovery is skipped.
+     *
+     * @param {Meeting} meeting
+     * @returns {Boolean} true if TURN discovery is being skipped, false if it is being done
+     */
+  }, {
+    key: "isSkipped",
+    value: function () {
+      var _isSkipped = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(meeting) {
+        var skipReason;
+        return _regenerator.default.wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.next = 2;
+              return this.getSkipReason(meeting);
+            case 2:
+              skipReason = _context3.sent;
+              return _context3.abrupt("return", !!skipReason);
+            case 4:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this);
+      }));
+      function isSkipped(_x3) {
+        return _isSkipped.apply(this, arguments);
+      }
+      return isSkipped;
+    }()
     /**
      * Retrieves TURN server information from the backend by doing
      * a roap message exchange:
@@ -212,75 +336,101 @@ var TurnDiscovery = /*#__PURE__*/function () {
      * so it works fine no matter if TURN discovery is done or not.
      *
      * @param {Meeting} meeting
-     * @param {Boolean} isReconnecting should be set to true if this is a new
+     * @param {Boolean} [isReconnecting] should be set to true if this is a new
      *                                 media connection just after a reconnection
+     * @param {Boolean} [isForced]
      * @returns {Promise}
      */
   }, {
     key: "doTurnDiscovery",
     value: function () {
-      var _doTurnDiscovery = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(meeting, isReconnecting) {
-        var _this2 = this;
-        var isAnyClusterReachable;
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+      var _doTurnDiscovery = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(meeting, isReconnecting, isForced) {
+        var turnDiscoverySkippedReason, httpResponse, _ref, isOkRequired;
+        return _regenerator.default.wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context.next = 2;
-              return meeting.webex.meetings.reachability.isAnyClusterReachable();
-            case 2:
-              isAnyClusterReachable = _context.sent;
-              if (!isAnyClusterReachable) {
-                _context.next = 6;
+              if (isForced) {
+                _context4.next = 4;
+                break;
+              }
+              _context4.next = 3;
+              return this.getSkipReason(meeting);
+            case 3:
+              turnDiscoverySkippedReason = _context4.sent;
+            case 4:
+              if (!turnDiscoverySkippedReason) {
+                _context4.next = 6;
                 break;
               }
-              _loggerProxy.default.logger.info('Roap:turnDiscovery#doTurnDiscovery --> reachability has not failed, skipping TURN discovery');
-              return _context.abrupt("return", {
+              return _context4.abrupt("return", {
                 turnServerInfo: undefined,
-                turnDiscoverySkippedReason: 'reachability'
+                turnDiscoverySkippedReason: turnDiscoverySkippedReason
               });
             case 6:
-              if (meeting.config.experimental.enableTurnDiscovery) {
-                _context.next = 9;
+              _context4.prev = 6;
+              _context4.next = 9;
+              return this.sendRoapTurnDiscoveryRequest(meeting, isReconnecting);
+            case 9:
+              httpResponse = _context4.sent;
+              if (!httpResponse) {
+                _context4.next = 16;
                 break;
               }
-              _loggerProxy.default.logger.info('Roap:turnDiscovery#doTurnDiscovery --> TURN discovery disabled in config, skipping it');
-              return _context.abrupt("return", {
+              _context4.next = 13;
+              return this.handleTurnDiscoveryResponseInHttpResponse(httpResponse);
+            case 13:
+              _context4.t0 = _context4.sent;
+              _context4.next = 19;
+              break;
+            case 16:
+              _context4.next = 18;
+              return this.waitForTurnDiscoveryResponse();
+            case 18:
+              _context4.t0 = _context4.sent;
+            case 19:
+              _ref = _context4.t0;
+              isOkRequired = _ref.isOkRequired;
+              if (!isOkRequired) {
+                _context4.next = 26;
+                break;
+              }
+              _context4.next = 24;
+              return this.sendRoapOK(meeting);
+            case 24:
+              _loggerProxy.default.logger.info('Roap:turnDiscovery#doTurnDiscovery --> TURN discovery response requires OK');
+              _metrics.default.sendBehavioralMetric(_constants.default.TURN_DISCOVERY_REQUIRES_OK, {
+                correlation_id: meeting.correlationId,
+                locus_id: meeting.locusUrl.split('/').pop()
+              });
+            case 26:
+              this.defer = undefined;
+              _loggerProxy.default.logger.info('Roap:turnDiscovery#doTurnDiscovery --> TURN discovery completed');
+              return _context4.abrupt("return", {
+                turnServerInfo: this.turnInfo,
+                turnDiscoverySkippedReason: undefined
+              });
+            case 31:
+              _context4.prev = 31;
+              _context4.t1 = _context4["catch"](6);
+              // we catch any errors and resolve with no turn information so that the normal call join flow can continue without TURN
+              _loggerProxy.default.logger.info("Roap:turnDiscovery#doTurnDiscovery --> TURN discovery failed, continuing without TURN: ".concat(_context4.t1));
+              _metrics.default.sendBehavioralMetric(_constants.default.TURN_DISCOVERY_FAILURE, {
+                correlation_id: meeting.correlationId,
+                locus_id: meeting.locusUrl.split('/').pop(),
+                reason: _context4.t1.message,
+                stack: _context4.t1.stack
+              });
+              return _context4.abrupt("return", {
                 turnServerInfo: undefined,
-                turnDiscoverySkippedReason: 'config'
+                turnDiscoverySkippedReason: undefined
               });
-            case 9:
-              return _context.abrupt("return", this.sendRoapTurnDiscoveryRequest(meeting, isReconnecting).then(function () {
-                return _this2.waitForTurnDiscoveryResponse();
-              }).then(function () {
-                return _this2.sendRoapOK(meeting);
-              }).then(function () {
-                _this2.defer = undefined;
-                _loggerProxy.default.logger.info('Roap:turnDiscovery#doTurnDiscovery --> TURN discovery completed');
-                return {
-                  turnServerInfo: _this2.turnInfo,
-                  turnDiscoverySkippedReason: undefined
-                };
-              }).catch(function (e) {
-                // we catch any errors and resolve with no turn information so that the normal call join flow can continue without TURN
-                _loggerProxy.default.logger.info("Roap:turnDiscovery#doTurnDiscovery --> TURN discovery failed, continuing without TURN: ".concat(e));
-                _metrics.default.sendBehavioralMetric(_constants.default.TURN_DISCOVERY_FAILURE, {
-                  correlation_id: meeting.correlationId,
-                  locus_id: meeting.locusUrl.split('/').pop(),
-                  reason: e.message,
-                  stack: e.stack
-                });
-                return {
-                  turnServerInfo: undefined,
-                  turnDiscoverySkippedReason: undefined
-                };
-              }));
-            case 10:
+            case 36:
             case "end":
-              return _context.stop();
+              return _context4.stop();
           }
-        }, _callee, this);
+        }, _callee4, this, [[6, 31]]);
       }));
-      function doTurnDiscovery(_x, _x2) {
+      function doTurnDiscovery(_x4, _x5, _x6) {
         return _doTurnDiscovery.apply(this, arguments);
       }
       return doTurnDiscovery;