@webex/plugin-meetings 3.0.0-next.25 → 3.0.0-next.27

package/dist/breakouts/breakout.js

@@ -209,7 +209,7 @@ var Breakout = _webexCore.WebexPlugin.extend({
       sessionId: this.sessionId
     });
   },
-  version: "3.0.0-next.25"
+  version: "3.0.0-next.27"
 });
 var _default = exports.default = Breakout;
 //# sourceMappingURL=breakout.js.map

package/dist/breakouts/index.js

@@ -1041,7 +1041,7 @@ var Breakouts = _webexCore.WebexPlugin.extend({
       this.trigger(_constants.BREAKOUTS.EVENTS.ASK_RETURN_TO_MAIN);
     }
   },
-  version: "3.0.0-next.25"
+  version: "3.0.0-next.27"
 });
 var _default = exports.default = Breakouts;
 //# sourceMappingURL=index.js.map

package/dist/interpretation/index.js

@@ -373,7 +373,7 @@ var SimultaneousInterpretation = _webexCore.WebexPlugin.extend({
       throw error;
     });
   },
-  version: "3.0.0-next.25"
+  version: "3.0.0-next.27"
 });
 var _default = exports.default = SimultaneousInterpretation;
 //# sourceMappingURL=index.js.map

package/dist/interpretation/siLanguage.js

@@ -18,7 +18,7 @@ var SILanguage = _webexCore.WebexPlugin.extend({
     languageCode: 'number',
     languageName: 'string'
   },
-  version: "3.0.0-next.25"
+  version: "3.0.0-next.27"
 });
 var _default = exports.default = SILanguage;
 //# sourceMappingURL=siLanguage.js.map

package/dist/media/MediaConnectionAwaiter.d.ts

@@ -0,0 +1,61 @@
+export interface MediaConnectionAwaiterProps {
+    webrtcMediaConnection: any;
+}
+/**
+ * @class MediaConnectionAwaiter
+ */
+export default class MediaConnectionAwaiter {
+    private webrtcMediaConnection;
+    private timer;
+    private defer;
+    private retried;
+    private onTimeoutCallback;
+    private connectionStateCallback;
+    private iceGatheringStateCallback;
+    /**
+     * @param {MediaConnectionAwaiterProps} mediaConnectionAwaiterProps
+     */
+    constructor({ webrtcMediaConnection }: MediaConnectionAwaiterProps);
+    /**
+     * Returns true if the connection is connected, false otherwise.
+     *
+     * @returns {boolean}
+     */
+    private isConnected;
+    /**
+     * Returns true if the ICE Gathering is completed, false otherwise.
+     *
+     * @returns {boolean}
+     */
+    private isIceGatheringCompleted;
+    /**
+     * Clears the callbacks.
+     *
+     * @returns {void}
+     */
+    private clearCallbacks;
+    /**
+     * Listener for connection state change.
+     *
+     * @returns {void}
+     */
+    connectionStateListenerCallback(): void;
+    /**
+     * Listener for ICE gathering state change.
+     *
+     * @returns {void}
+     */
+    iceGatheringStateListenerCallback(): void;
+    /**
+     * Function called when the timeout is reached.
+     *
+     * @returns {void}
+     */
+    onTimeout(): void;
+    /**
+     * Waits for the webrtc media connection to be connected.
+     *
+     * @returns {Promise}
+     */
+    waitForMediaConnectionConnected(): Promise<void>;
+}

package/dist/media/MediaConnectionAwaiter.js

@@ -0,0 +1,163 @@
+"use strict";
+
+var _Object$defineProperty = require("@babel/runtime-corejs2/core-js/object/define-property");
+var _interopRequireDefault = require("@babel/runtime-corejs2/helpers/interopRequireDefault");
+_Object$defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _promise = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/promise"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/defineProperty"));
+var _common = require("@webex/common");
+var _internalMediaCore = require("@webex/internal-media-core");
+var _loggerProxy = _interopRequireDefault(require("../common/logs/logger-proxy"));
+var _constants = require("../constants");
+/**
+ * @class MediaConnectionAwaiter
+ */
+var MediaConnectionAwaiter = exports.default = /*#__PURE__*/function () {
+  /**
+   * @param {MediaConnectionAwaiterProps} mediaConnectionAwaiterProps
+   */
+  function MediaConnectionAwaiter(_ref) {
+    var webrtcMediaConnection = _ref.webrtcMediaConnection;
+    (0, _classCallCheck2.default)(this, MediaConnectionAwaiter);
+    (0, _defineProperty2.default)(this, "webrtcMediaConnection", void 0);
+    (0, _defineProperty2.default)(this, "timer", void 0);
+    (0, _defineProperty2.default)(this, "defer", void 0);
+    (0, _defineProperty2.default)(this, "retried", void 0);
+    (0, _defineProperty2.default)(this, "onTimeoutCallback", void 0);
+    (0, _defineProperty2.default)(this, "connectionStateCallback", void 0);
+    (0, _defineProperty2.default)(this, "iceGatheringStateCallback", void 0);
+    this.webrtcMediaConnection = webrtcMediaConnection;
+    this.defer = new _common.Defer();
+    this.retried = false;
+    this.onTimeoutCallback = this.onTimeout.bind(this);
+    this.connectionStateCallback = this.connectionStateListenerCallback.bind(this);
+    this.iceGatheringStateCallback = this.iceGatheringStateListenerCallback.bind(this);
+  }
+
+  /**
+   * Returns true if the connection is connected, false otherwise.
+   *
+   * @returns {boolean}
+   */
+  (0, _createClass2.default)(MediaConnectionAwaiter, [{
+    key: "isConnected",
+    value: function isConnected() {
+      return this.webrtcMediaConnection.getConnectionState() === _internalMediaCore.ConnectionState.Connected;
+    }
+
+    /**
+     * Returns true if the ICE Gathering is completed, false otherwise.
+     *
+     * @returns {boolean}
+     */
+  }, {
+    key: "isIceGatheringCompleted",
+    value: function isIceGatheringCompleted() {
+      return this.webrtcMediaConnection.getIceGatheringState() === 'complete';
+    }
+
+    /**
+     * Clears the callbacks.
+     *
+     * @returns {void}
+     */
+  }, {
+    key: "clearCallbacks",
+    value: function clearCallbacks() {
+      this.webrtcMediaConnection.off(_internalMediaCore.Event.ICE_GATHERING_STATE_CHANGED, this.iceGatheringStateCallback);
+      this.webrtcMediaConnection.off(_internalMediaCore.Event.CONNECTION_STATE_CHANGED, this.connectionStateCallback);
+    }
+
+    /**
+     * Listener for connection state change.
+     *
+     * @returns {void}
+     */
+  }, {
+    key: "connectionStateListenerCallback",
+    value: function connectionStateListenerCallback() {
+      _loggerProxy.default.logger.log("Media:MediaConnectionAwaiter#connectionStateListenerCallback --> connection state: ".concat(this.webrtcMediaConnection.getConnectionState()));
+      if (!this.isConnected()) {
+        return;
+      }
+      clearTimeout(this.timer);
+      this.clearCallbacks();
+      this.defer.resolve();
+    }
+
+    /**
+     * Listener for ICE gathering state change.
+     *
+     * @returns {void}
+     */
+  }, {
+    key: "iceGatheringStateListenerCallback",
+    value: function iceGatheringStateListenerCallback() {
+      var iceGatheringState = this.webrtcMediaConnection.getIceGatheringState();
+      _loggerProxy.default.logger.log("Media:MediaConnectionAwaiter#iceGatheringStateListenerCallback --> ICE gathering state change -> ".concat(iceGatheringState));
+      if (!this.isIceGatheringCompleted()) {
+        return;
+      }
+      if (this.isConnected()) {
+        return;
+      }
+      clearTimeout(this.timer);
+      this.timer = setTimeout(this.onTimeoutCallback, _constants.ICE_AND_DTLS_CONNECTION_TIMEOUT);
+    }
+
+    /**
+     * Function called when the timeout is reached.
+     *
+     * @returns {void}
+     */
+  }, {
+    key: "onTimeout",
+    value: function onTimeout() {
+      if (this.isConnected()) {
+        this.clearCallbacks();
+        this.defer.resolve();
+        return;
+      }
+      if (!this.isIceGatheringCompleted()) {
+        if (!this.retried) {
+          _loggerProxy.default.logger.warn('Media:MediaConnectionAwaiter#onTimeout --> ICE gathering did not complete within the timeout for the first time, retrying once');
+
+          // retry once if ICE gathering is not completed
+          this.retried = true;
+          clearTimeout(this.timer);
+          this.timer = setTimeout(this.onTimeoutCallback, _constants.ICE_AND_DTLS_CONNECTION_TIMEOUT);
+          return;
+        }
+        _loggerProxy.default.logger.warn('Media:MediaConnectionAwaiter#onTimeout --> ICE gathering did not complete within the timeout for the second time, rejecting');
+      } else {
+        _loggerProxy.default.logger.warn('Media:MediaConnectionAwaiter#onTimeout --> ICE gathering completed, but connection state is not connected, rejecting');
+      }
+      this.clearCallbacks();
+      this.defer.reject();
+    }
+
+    /**
+     * Waits for the webrtc media connection to be connected.
+     *
+     * @returns {Promise}
+     */
+  }, {
+    key: "waitForMediaConnectionConnected",
+    value: function waitForMediaConnectionConnected() {
+      if (this.isConnected()) {
+        return _promise.default.resolve();
+      }
+      this.webrtcMediaConnection.on(_internalMediaCore.Event.CONNECTION_STATE_CHANGED, this.connectionStateCallback);
+      this.webrtcMediaConnection.on(_internalMediaCore.Event.ICE_GATHERING_STATE_CHANGED, this.iceGatheringStateCallback);
+      this.timer = setTimeout(this.onTimeoutCallback, _constants.ICE_AND_DTLS_CONNECTION_TIMEOUT);
+      return this.defer.promise;
+    }
+  }]);
+  return MediaConnectionAwaiter;
+}();
+//# sourceMappingURL=MediaConnectionAwaiter.js.map

package/dist/media/MediaConnectionAwaiter.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_common","require","_internalMediaCore","_loggerProxy","_interopRequireDefault","_constants","MediaConnectionAwaiter","exports","default","_ref","webrtcMediaConnection","_classCallCheck2","_defineProperty2","defer","Defer","retried","onTimeoutCallback","onTimeout","bind","connectionStateCallback","connectionStateListenerCallback","iceGatheringStateCallback","iceGatheringStateListenerCallback","_createClass2","key","value","isConnected","getConnectionState","ConnectionState","Connected","isIceGatheringCompleted","getIceGatheringState","clearCallbacks","off","Event","ICE_GATHERING_STATE_CHANGED","CONNECTION_STATE_CHANGED","LoggerProxy","logger","log","concat","clearTimeout","timer","resolve","iceGatheringState","setTimeout","ICE_AND_DTLS_CONNECTION_TIMEOUT","warn","reject","waitForMediaConnectionConnected","_promise","on","promise"],"sources":["MediaConnectionAwaiter.ts"],"sourcesContent":["import {Defer} from '@webex/common';\nimport {ConnectionState, Event} from '@webex/internal-media-core';\nimport LoggerProxy from '../common/logs/logger-proxy';\nimport {ICE_AND_DTLS_CONNECTION_TIMEOUT} from '../constants';\n\nexport interface MediaConnectionAwaiterProps {\n  webrtcMediaConnection: any;\n}\n\n/**\n * @class MediaConnectionAwaiter\n */\nexport default class MediaConnectionAwaiter {\n  private webrtcMediaConnection: any;\n  private timer: any;\n  private defer: Defer;\n  private retried: boolean;\n  private onTimeoutCallback: () => void;\n  private connectionStateCallback: () => void;\n  private iceGatheringStateCallback: () => void;\n\n  /**\n   * @param {MediaConnectionAwaiterProps} mediaConnectionAwaiterProps\n   */\n  constructor({webrtcMediaConnection}: MediaConnectionAwaiterProps) {\n    this.webrtcMediaConnection = webrtcMediaConnection;\n    this.defer = new Defer();\n    this.retried = false;\n    this.onTimeoutCallback = this.onTimeout.bind(this);\n    this.connectionStateCallback = this.connectionStateListenerCallback.bind(this);\n    this.iceGatheringStateCallback = this.iceGatheringStateListenerCallback.bind(this);\n  }\n\n  /**\n   * Returns true if the connection is connected, false otherwise.\n   *\n   * @returns {boolean}\n   */\n  private isConnected(): boolean {\n    return this.webrtcMediaConnection.getConnectionState() === ConnectionState.Connected;\n  }\n\n  /**\n   * Returns true if the ICE Gathering is completed, false otherwise.\n   *\n   * @returns {boolean}\n   */\n  private isIceGatheringCompleted(): boolean {\n    return this.webrtcMediaConnection.getIceGatheringState() === 'complete';\n  }\n\n  /**\n   * Clears the callbacks.\n   *\n   * @returns {void}\n   */\n  private clearCallbacks(): void {\n    this.webrtcMediaConnection.off(\n      Event.ICE_GATHERING_STATE_CHANGED,\n      this.iceGatheringStateCallback\n    );\n    this.webrtcMediaConnection.off(Event.CONNECTION_STATE_CHANGED, this.connectionStateCallback);\n  }\n\n  /**\n   * Listener for connection state change.\n   *\n   * @returns {void}\n   */\n  connectionStateListenerCallback(): void {\n    LoggerProxy.logger.log(\n      `Media:MediaConnectionAwaiter#connectionStateListenerCallback --> connection state: ${this.webrtcMediaConnection.getConnectionState()}`\n    );\n\n    if (!this.isConnected()) {\n      return;\n    }\n\n    clearTimeout(this.timer);\n\n    this.clearCallbacks();\n\n    this.defer.resolve();\n  }\n\n  /**\n   * Listener for ICE gathering state change.\n   *\n   * @returns {void}\n   */\n  iceGatheringStateListenerCallback(): void {\n    const iceGatheringState = this.webrtcMediaConnection.getIceGatheringState();\n\n    LoggerProxy.logger.log(\n      `Media:MediaConnectionAwaiter#iceGatheringStateListenerCallback --> ICE gathering state change -> ${iceGatheringState}`\n    );\n\n    if (!this.isIceGatheringCompleted()) {\n      return;\n    }\n\n    if (this.isConnected()) {\n      return;\n    }\n\n    clearTimeout(this.timer);\n\n    this.timer = setTimeout(this.onTimeoutCallback, ICE_AND_DTLS_CONNECTION_TIMEOUT);\n  }\n\n  /**\n   * Function called when the timeout is reached.\n   *\n   * @returns {void}\n   */\n  onTimeout(): void {\n    if (this.isConnected()) {\n      this.clearCallbacks();\n\n      this.defer.resolve();\n\n      return;\n    }\n\n    if (!this.isIceGatheringCompleted()) {\n      if (!this.retried) {\n        LoggerProxy.logger.warn(\n          'Media:MediaConnectionAwaiter#onTimeout --> ICE gathering did not complete within the timeout for the first time, retrying once'\n        );\n\n        // retry once if ICE gathering is not completed\n        this.retried = true;\n        clearTimeout(this.timer);\n        this.timer = setTimeout(this.onTimeoutCallback, ICE_AND_DTLS_CONNECTION_TIMEOUT);\n\n        return;\n      }\n\n      LoggerProxy.logger.warn(\n        'Media:MediaConnectionAwaiter#onTimeout --> ICE gathering did not complete within the timeout for the second time, rejecting'\n      );\n    } else {\n      LoggerProxy.logger.warn(\n        'Media:MediaConnectionAwaiter#onTimeout --> ICE gathering completed, but connection state is not connected, rejecting'\n      );\n    }\n\n    this.clearCallbacks();\n\n    this.defer.reject();\n  }\n\n  /**\n   * Waits for the webrtc media connection to be connected.\n   *\n   * @returns {Promise}\n   */\n  waitForMediaConnectionConnected(): Promise<void> {\n    if (this.isConnected()) {\n      return Promise.resolve();\n    }\n\n    this.webrtcMediaConnection.on(Event.CONNECTION_STATE_CHANGED, this.connectionStateCallback);\n\n    this.webrtcMediaConnection.on(\n      Event.ICE_GATHERING_STATE_CHANGED,\n      this.iceGatheringStateCallback\n    );\n\n    this.timer = setTimeout(this.onTimeoutCallback, ICE_AND_DTLS_CONNECTION_TIMEOUT);\n\n    return this.defer.promise;\n  }\n}\n"],"mappings":";;;;;;;;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,kBAAA,GAAAD,OAAA;AACA,IAAAE,YAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,UAAA,GAAAJ,OAAA;AAMA;AACA;AACA;AAFA,IAGqBK,sBAAsB,GAAAC,OAAA,CAAAC,OAAA;EASzC;AACF;AACA;EACE,SAAAF,uBAAAG,IAAA,EAAkE;IAAA,IAArDC,qBAAqB,GAAAD,IAAA,CAArBC,qBAAqB;IAAA,IAAAC,gBAAA,CAAAH,OAAA,QAAAF,sBAAA;IAAA,IAAAM,gBAAA,CAAAJ,OAAA;IAAA,IAAAI,gBAAA,CAAAJ,OAAA;IAAA,IAAAI,gBAAA,CAAAJ,OAAA;IAAA,IAAAI,gBAAA,CAAAJ,OAAA;IAAA,IAAAI,gBAAA,CAAAJ,OAAA;IAAA,IAAAI,gBAAA,CAAAJ,OAAA;IAAA,IAAAI,gBAAA,CAAAJ,OAAA;IAChC,IAAI,CAACE,qBAAqB,GAAGA,qBAAqB;IAClD,IAAI,CAACG,KAAK,GAAG,IAAIC,aAAK,CAAC,CAAC;IACxB,IAAI,CAACC,OAAO,GAAG,KAAK;IACpB,IAAI,CAACC,iBAAiB,GAAG,IAAI,CAACC,SAAS,CAACC,IAAI,CAAC,IAAI,CAAC;IAClD,IAAI,CAACC,uBAAuB,GAAG,IAAI,CAACC,+BAA+B,CAACF,IAAI,CAAC,IAAI,CAAC;IAC9E,IAAI,CAACG,yBAAyB,GAAG,IAAI,CAACC,iCAAiC,CAACJ,IAAI,CAAC,IAAI,CAAC;EACpF;;EAEA;AACF;AACA;AACA;AACA;EAJE,IAAAK,aAAA,CAAAf,OAAA,EAAAF,sBAAA;IAAAkB,GAAA;IAAAC,KAAA,EAKA,SAAAC,YAAA,EAA+B;MAC7B,OAAO,IAAI,CAAChB,qBAAqB,CAACiB,kBAAkB,CAAC,CAAC,KAAKC,kCAAe,CAACC,SAAS;IACtF;;IAEA;AACF;AACA;AACA;AACA;EAJE;IAAAL,GAAA;IAAAC,KAAA,EAKA,SAAAK,wBAAA,EAA2C;MACzC,OAAO,IAAI,CAACpB,qBAAqB,CAACqB,oBAAoB,CAAC,CAAC,KAAK,UAAU;IACzE;;IAEA;AACF;AACA;AACA;AACA;EAJE;IAAAP,GAAA;IAAAC,KAAA,EAKA,SAAAO,eAAA,EAA+B;MAC7B,IAAI,CAACtB,qBAAqB,CAACuB,GAAG,CAC5BC,wBAAK,CAACC,2BAA2B,EACjC,IAAI,CAACd,yBACP,CAAC;MACD,IAAI,CAACX,qBAAqB,CAACuB,GAAG,CAACC,wBAAK,CAACE,wBAAwB,EAAE,IAAI,CAACjB,uBAAuB,CAAC;IAC9F;;IAEA;AACF;AACA;AACA;AACA;EAJE;IAAAK,GAAA;IAAAC,KAAA,EAKA,SAAAL,gCAAA,EAAwC;MACtCiB,oBAAW,CAACC,MAAM,CAACC,GAAG,uFAAAC,MAAA,CACkE,IAAI,CAAC9B,qBAAqB,CAACiB,kBAAkB,CAAC,CAAC,CACvI,CAAC;MAED,IAAI,CAAC,IAAI,CAACD,WAAW,CAAC,CAAC,EAAE;QACvB;MACF;MAEAe,YAAY,CAAC,IAAI,CAACC,KAAK,CAAC;MAExB,IAAI,CAACV,cAAc,CAAC,CAAC;MAErB,IAAI,CAACnB,KAAK,CAAC8B,OAAO,CAAC,CAAC;IACtB;;IAEA;AACF;AACA;AACA;AACA;EAJE;IAAAnB,GAAA;IAAAC,KAAA,EAKA,SAAAH,kCAAA,EAA0C;MACxC,IAAMsB,iBAAiB,GAAG,IAAI,CAAClC,qBAAqB,CAACqB,oBAAoB,CAAC,CAAC;MAE3EM,oBAAW,CAACC,MAAM,CAACC,GAAG,qGAAAC,MAAA,CACgFI,iBAAiB,CACvH,CAAC;MAED,IAAI,CAAC,IAAI,CAACd,uBAAuB,CAAC,CAAC,EAAE;QACnC;MACF;MAEA,IAAI,IAAI,CAACJ,WAAW,CAAC,CAAC,EAAE;QACtB;MACF;MAEAe,YAAY,CAAC,IAAI,CAACC,KAAK,CAAC;MAExB,IAAI,CAACA,KAAK,GAAGG,UAAU,CAAC,IAAI,CAAC7B,iBAAiB,EAAE8B,0CAA+B,CAAC;IAClF;;IAEA;AACF;AACA;AACA;AACA;EAJE;IAAAtB,GAAA;IAAAC,KAAA,EAKA,SAAAR,UAAA,EAAkB;MAChB,IAAI,IAAI,CAACS,WAAW,CAAC,CAAC,EAAE;QACtB,IAAI,CAACM,cAAc,CAAC,CAAC;QAErB,IAAI,CAACnB,KAAK,CAAC8B,OAAO,CAAC,CAAC;QAEpB;MACF;MAEA,IAAI,CAAC,IAAI,CAACb,uBAAuB,CAAC,CAAC,EAAE;QACnC,IAAI,CAAC,IAAI,CAACf,OAAO,EAAE;UACjBsB,oBAAW,CAACC,MAAM,CAACS,IAAI,CACrB,gIACF,CAAC;;UAED;UACA,IAAI,CAAChC,OAAO,GAAG,IAAI;UACnB0B,YAAY,CAAC,IAAI,CAACC,KAAK,CAAC;UACxB,IAAI,CAACA,KAAK,GAAGG,UAAU,CAAC,IAAI,CAAC7B,iBAAiB,EAAE8B,0CAA+B,CAAC;UAEhF;QACF;QAEAT,oBAAW,CAACC,MAAM,CAACS,IAAI,CACrB,6HACF,CAAC;MACH,CAAC,MAAM;QACLV,oBAAW,CAACC,MAAM,CAACS,IAAI,CACrB,sHACF,CAAC;MACH;MAEA,IAAI,CAACf,cAAc,CAAC,CAAC;MAErB,IAAI,CAACnB,KAAK,CAACmC,MAAM,CAAC,CAAC;IACrB;;IAEA;AACF;AACA;AACA;AACA;EAJE;IAAAxB,GAAA;IAAAC,KAAA,EAKA,SAAAwB,gCAAA,EAAiD;MAC/C,IAAI,IAAI,CAACvB,WAAW,CAAC,CAAC,EAAE;QACtB,OAAOwB,QAAA,CAAA1C,OAAA,CAAQmC,OAAO,CAAC,CAAC;MAC1B;MAEA,IAAI,CAACjC,qBAAqB,CAACyC,EAAE,CAACjB,wBAAK,CAACE,wBAAwB,EAAE,IAAI,CAACjB,uBAAuB,CAAC;MAE3F,IAAI,CAACT,qBAAqB,CAACyC,EAAE,CAC3BjB,wBAAK,CAACC,2BAA2B,EACjC,IAAI,CAACd,yBACP,CAAC;MAED,IAAI,CAACqB,KAAK,GAAGG,UAAU,CAAC,IAAI,CAAC7B,iBAAiB,EAAE8B,0CAA+B,CAAC;MAEhF,OAAO,IAAI,CAACjC,KAAK,CAACuC,OAAO;IAC3B;EAAC;EAAA,OAAA9C,sBAAA;AAAA"}

package/dist/media/properties.js

@@ -7,15 +7,14 @@ _Object$defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs2/regenerator"));
-var _promise = _interopRequireDefault(require("@babel/runtime-corejs2/core-js/promise"));
 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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/defineProperty"));
-var _internalMediaCore = require("@webex/internal-media-core");
 var _constants = require("../constants");
 var _loggerProxy = _interopRequireDefault(require("../common/logs/logger-proxy"));
+var _MediaConnectionAwaiter = _interopRequireDefault(require("./MediaConnectionAwaiter"));
 /**
  * @class MediaProperties
  */
@@ -198,29 +197,10 @@ var MediaProperties = exports.default = /*#__PURE__*/function () {
   }, {
     key: "waitForMediaConnectionConnected",
     value: function waitForMediaConnectionConnected() {
-      var _this = this;
-      var isConnected = function isConnected() {
-        return _this.webrtcMediaConnection.getConnectionState() === _internalMediaCore.ConnectionState.Connected;
-      };
-      if (isConnected()) {
-        return _promise.default.resolve();
-      }
-      return new _promise.default(function (resolve, reject) {
-        var timer;
-        var connectionStateListener = function connectionStateListener() {
-          _loggerProxy.default.logger.log("Media:properties#waitForMediaConnectionConnected --> connection state: ".concat(_this.webrtcMediaConnection.getConnectionState()));
-          if (isConnected()) {
-            clearTimeout(timer);
-            _this.webrtcMediaConnection.off(_internalMediaCore.Event.CONNECTION_STATE_CHANGED, connectionStateListener);
-            resolve();
-          }
-        };
-        timer = setTimeout(function () {
-          _this.webrtcMediaConnection.off(_internalMediaCore.Event.CONNECTION_STATE_CHANGED, connectionStateListener);
-          reject();
-        }, _constants.ICE_AND_DTLS_CONNECTION_TIMEOUT);
-        _this.webrtcMediaConnection.on(_internalMediaCore.Event.CONNECTION_STATE_CHANGED, connectionStateListener);
+      var mediaConnectionAwaiter = new _MediaConnectionAwaiter.default({
+        webrtcMediaConnection: this.webrtcMediaConnection
       });
+      return mediaConnectionAwaiter.waitForMediaConnectionConnected();
     }
 
     /**

package/dist/media/properties.js.map

@@ -1 +1 @@
-{"version":3,"names":["_internalMediaCore","require","_constants","_loggerProxy","_interopRequireDefault","MediaProperties","exports","default","_classCallCheck2","_defineProperty2","MEETINGS","webrtcMediaConnection","mediaDirection","receiveAudio","receiveVideo","receiveShare","sendAudio","sendVideo","sendShare","videoStream","audioStream","shareVideoStream","shareAudioStream","remoteShareStream","undefined","remoteAudioStream","remoteVideoStream","remoteQualityLevel","QUALITY_LEVELS","HIGH","mediaSettings","videoDeviceId","_createClass2","key","value","getVideoDeviceId","setMediaDirection","setMediaSettings","type","values","setMediaPeerConnection","mediaPeerConnection","setLocalVideoStream","setLocalAudioStream","setLocalShareVideoStream","setLocalShareAudioStream","setRemoteQualityLevel","setRemoteShareStream","setRemoteAudioStream","setRemoteVideoStream","setVideoDeviceId","deviceId","unsetPeerConnection","unsetRemoteMedia","unsetRemoteShareStream","unsetRemoteStreams","hasLocalShareStream","waitForMediaConnectionConnected","_this","isConnected","getConnectionState","ConnectionState","Connected","_promise","resolve","reject","timer","connectionStateListener","LoggerProxy","logger","log","concat","clearTimeout","off","Event","CONNECTION_STATE_CHANGED","setTimeout","ICE_AND_DTLS_CONNECTION_TIMEOUT","on","_getCurrentConnectionType","_asyncToGenerator2","_regenerator","mark","_callee","allStatsReports","statsResult","successfulCandidatePairs","foundConnectionType","candidatePairStates","wrap","_callee$","_context","prev","next","getStats","sent","forEach","report","push","t0","warn","filter","_report$state","state","toLowerCase","some","pair","localCandidate","find","id","localCandidateId","connectionType","relayProtocol","toUpperCase","_localCandidate$proto","protocol","candidateType","map","_stringify","abrupt","stop","getCurrentConnectionType","apply","arguments"],"sources":["properties.ts"],"sourcesContent":["import {ConnectionState, Event} from '@webex/internal-media-core';\n\nimport {\n  LocalCameraStream,\n  LocalMicrophoneStream,\n  LocalDisplayStream,\n  LocalSystemAudioStream,\n  RemoteStream,\n} from '@webex/media-helpers';\n\nimport {MEETINGS, ICE_AND_DTLS_CONNECTION_TIMEOUT, QUALITY_LEVELS} from '../constants';\nimport LoggerProxy from '../common/logs/logger-proxy';\n\nexport type MediaDirection = {\n  sendAudio: boolean;\n  sendVideo: boolean;\n  sendShare: boolean;\n  receiveAudio: boolean;\n  receiveVideo: boolean;\n  receiveShare: boolean;\n};\n\n/**\n * @class MediaProperties\n */\nexport default class MediaProperties {\n  audioStream?: LocalMicrophoneStream;\n  mediaDirection: MediaDirection;\n  mediaSettings: any;\n  webrtcMediaConnection: any;\n  remoteAudioStream: RemoteStream;\n  remoteQualityLevel: any;\n  remoteShareStream: RemoteStream;\n  remoteVideoStream: RemoteStream;\n  shareVideoStream?: LocalDisplayStream;\n  shareAudioStream?: LocalSystemAudioStream;\n  videoDeviceId: any;\n  videoStream?: LocalCameraStream;\n  namespace = MEETINGS;\n\n  /**\n   * @param {Object} [options] -- to auto construct\n   * @returns {MediaProperties}\n   */\n  constructor() {\n    this.webrtcMediaConnection = null;\n    this.mediaDirection = {\n      receiveAudio: false,\n      receiveVideo: false,\n      receiveShare: false,\n      sendAudio: false,\n      sendVideo: false,\n      sendShare: false,\n    };\n    this.videoStream = null;\n    this.audioStream = null;\n    this.shareVideoStream = null;\n    this.shareAudioStream = null;\n    this.remoteShareStream = undefined;\n    this.remoteAudioStream = undefined;\n    this.remoteVideoStream = undefined;\n    this.remoteQualityLevel = QUALITY_LEVELS.HIGH;\n    this.mediaSettings = {};\n    this.videoDeviceId = null;\n  }\n\n  /**\n   * Retrieves the preferred video input device\n   * @returns {Object|null}\n   */\n  getVideoDeviceId() {\n    return this.videoDeviceId || null;\n  }\n\n  setMediaDirection(mediaDirection) {\n    this.mediaDirection = mediaDirection;\n  }\n\n  setMediaSettings(type, values) {\n    this.mediaSettings[type] = values;\n  }\n\n  setMediaPeerConnection(mediaPeerConnection) {\n    this.webrtcMediaConnection = mediaPeerConnection;\n  }\n\n  setLocalVideoStream(videoStream?: LocalCameraStream) {\n    this.videoStream = videoStream;\n  }\n\n  setLocalAudioStream(audioStream?: LocalMicrophoneStream) {\n    this.audioStream = audioStream;\n  }\n\n  setLocalShareVideoStream(shareVideoStream?: LocalDisplayStream) {\n    this.shareVideoStream = shareVideoStream;\n  }\n\n  setLocalShareAudioStream(shareAudioStream?: LocalSystemAudioStream) {\n    this.shareAudioStream = shareAudioStream;\n  }\n\n  setRemoteQualityLevel(remoteQualityLevel) {\n    this.remoteQualityLevel = remoteQualityLevel;\n  }\n\n  setRemoteShareStream(remoteShareStream: RemoteStream) {\n    this.remoteShareStream = remoteShareStream;\n  }\n\n  /**\n   * Sets the remote audio stream\n   * @param {RemoteStream} remoteAudioStream RemoteStream to save\n   * @returns {void}\n   */\n  setRemoteAudioStream(remoteAudioStream: RemoteStream) {\n    this.remoteAudioStream = remoteAudioStream;\n  }\n\n  /**\n   * Sets the remote video stream\n   * @param {RemoteStream} remoteVideoStream RemoteStream to save\n   * @returns {void}\n   */\n  setRemoteVideoStream(remoteVideoStream: RemoteStream) {\n    this.remoteVideoStream = remoteVideoStream;\n  }\n\n  /**\n   * Stores the preferred video input device\n   * @param {string} deviceId Preferred video input device\n   * @returns {void}\n   */\n  setVideoDeviceId(deviceId: string) {\n    this.videoDeviceId = deviceId;\n  }\n\n  unsetPeerConnection() {\n    this.webrtcMediaConnection = null;\n  }\n\n  /**\n   * Removes both remote audio and video from class instance\n   * @returns {void}\n   */\n  unsetRemoteMedia() {\n    this.remoteAudioStream = null;\n    this.remoteVideoStream = null;\n  }\n\n  unsetRemoteShareStream() {\n    this.remoteShareStream = null;\n  }\n\n  /**\n   * Unsets all remote streams\n   * @returns {void}\n   */\n  unsetRemoteStreams() {\n    this.unsetRemoteMedia();\n    this.unsetRemoteShareStream();\n  }\n\n  /**\n   * Returns if we have at least one local share stream or not.\n   * @returns {Boolean}\n   */\n  hasLocalShareStream() {\n    return !!(this.shareAudioStream || this.shareVideoStream);\n  }\n\n  /**\n   * Waits for the webrtc media connection to be connected.\n   *\n   * @returns {Promise<void>}\n   */\n  waitForMediaConnectionConnected(): Promise<void> {\n    const isConnected = () =>\n      this.webrtcMediaConnection.getConnectionState() === ConnectionState.Connected;\n\n    if (isConnected()) {\n      return Promise.resolve();\n    }\n\n    return new Promise<void>((resolve, reject) => {\n      let timer;\n\n      const connectionStateListener = () => {\n        LoggerProxy.logger.log(\n          `Media:properties#waitForMediaConnectionConnected --> connection state: ${this.webrtcMediaConnection.getConnectionState()}`\n        );\n\n        if (isConnected()) {\n          clearTimeout(timer);\n          this.webrtcMediaConnection.off(Event.CONNECTION_STATE_CHANGED, connectionStateListener);\n          resolve();\n        }\n      };\n\n      timer = setTimeout(() => {\n        this.webrtcMediaConnection.off(Event.CONNECTION_STATE_CHANGED, connectionStateListener);\n        reject();\n      }, ICE_AND_DTLS_CONNECTION_TIMEOUT);\n\n      this.webrtcMediaConnection.on(Event.CONNECTION_STATE_CHANGED, connectionStateListener);\n    });\n  }\n\n  /**\n   * Returns the type of a connection that has been established\n   *\n   * @returns {Promise<'UDP' | 'TCP' | 'TURN-TLS' | 'TURN-TCP' | 'TURN-UDP' | 'unknown'>}\n   */\n  async getCurrentConnectionType() {\n    // we can only get the connection type after ICE connection has been established\n    await this.waitForMediaConnectionConnected();\n\n    const allStatsReports = [];\n\n    try {\n      const statsResult = await this.webrtcMediaConnection.getStats();\n      statsResult.forEach((report) => allStatsReports.push(report));\n    } catch (error) {\n      LoggerProxy.logger.warn(\n        `Media:properties#getCurrentConnectionType --> getStats() failed: ${error}`\n      );\n    }\n\n    const successfulCandidatePairs = allStatsReports.filter(\n      (report) => report.type === 'candidate-pair' && report.state?.toLowerCase() === 'succeeded'\n    );\n\n    let foundConnectionType = 'unknown';\n\n    // all of the successful pairs should have the same connection type, so just return the type for the first one\n    successfulCandidatePairs.some((pair) => {\n      const localCandidate = allStatsReports.find(\n        (report) => report.type === 'local-candidate' && report.id === pair.localCandidateId\n      );\n\n      if (localCandidate === undefined) {\n        LoggerProxy.logger.warn(\n          `Media:properties#getCurrentConnectionType --> failed to find local candidate \"${pair.localCandidateId}\" in getStats() results`\n        );\n\n        return false;\n      }\n\n      let connectionType;\n\n      if (localCandidate.relayProtocol) {\n        connectionType = `TURN-${localCandidate.relayProtocol.toUpperCase()}`;\n      } else {\n        connectionType = localCandidate.protocol?.toUpperCase(); // it will be UDP or TCP\n      }\n\n      if (connectionType) {\n        foundConnectionType = connectionType;\n\n        return true;\n      }\n      LoggerProxy.logger.warn(\n        `Media:properties#getCurrentConnectionType --> missing localCandidate.protocol, candidateType=${localCandidate.candidateType}`\n      );\n\n      return false;\n    });\n\n    if (foundConnectionType === 'unknown') {\n      const candidatePairStates = allStatsReports\n        .filter((report) => report.type === 'candidate-pair')\n        .map((report) => report.state);\n\n      LoggerProxy.logger.warn(\n        `Media:properties#getCurrentConnectionType --> all candidate pair states: ${JSON.stringify(\n          candidatePairStates\n        )}`\n      );\n    }\n\n    return foundConnectionType;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"names":["_constants","require","_loggerProxy","_interopRequireDefault","_MediaConnectionAwaiter","MediaProperties","exports","default","_classCallCheck2","_defineProperty2","MEETINGS","webrtcMediaConnection","mediaDirection","receiveAudio","receiveVideo","receiveShare","sendAudio","sendVideo","sendShare","videoStream","audioStream","shareVideoStream","shareAudioStream","remoteShareStream","undefined","remoteAudioStream","remoteVideoStream","remoteQualityLevel","QUALITY_LEVELS","HIGH","mediaSettings","videoDeviceId","_createClass2","key","value","getVideoDeviceId","setMediaDirection","setMediaSettings","type","values","setMediaPeerConnection","mediaPeerConnection","setLocalVideoStream","setLocalAudioStream","setLocalShareVideoStream","setLocalShareAudioStream","setRemoteQualityLevel","setRemoteShareStream","setRemoteAudioStream","setRemoteVideoStream","setVideoDeviceId","deviceId","unsetPeerConnection","unsetRemoteMedia","unsetRemoteShareStream","unsetRemoteStreams","hasLocalShareStream","waitForMediaConnectionConnected","mediaConnectionAwaiter","MediaConnectionAwaiter","_getCurrentConnectionType","_asyncToGenerator2","_regenerator","mark","_callee","allStatsReports","statsResult","successfulCandidatePairs","foundConnectionType","candidatePairStates","wrap","_callee$","_context","prev","next","getStats","sent","forEach","report","push","t0","LoggerProxy","logger","warn","concat","filter","_report$state","state","toLowerCase","some","pair","localCandidate","find","id","localCandidateId","connectionType","relayProtocol","toUpperCase","_localCandidate$proto","protocol","candidateType","map","_stringify","abrupt","stop","getCurrentConnectionType","apply","arguments"],"sources":["properties.ts"],"sourcesContent":["import {\n  LocalCameraStream,\n  LocalMicrophoneStream,\n  LocalDisplayStream,\n  LocalSystemAudioStream,\n  RemoteStream,\n} from '@webex/media-helpers';\n\nimport {MEETINGS, QUALITY_LEVELS} from '../constants';\nimport LoggerProxy from '../common/logs/logger-proxy';\nimport MediaConnectionAwaiter from './MediaConnectionAwaiter';\n\nexport type MediaDirection = {\n  sendAudio: boolean;\n  sendVideo: boolean;\n  sendShare: boolean;\n  receiveAudio: boolean;\n  receiveVideo: boolean;\n  receiveShare: boolean;\n};\n\n/**\n * @class MediaProperties\n */\nexport default class MediaProperties {\n  audioStream?: LocalMicrophoneStream;\n  mediaDirection: MediaDirection;\n  mediaSettings: any;\n  webrtcMediaConnection: any;\n  remoteAudioStream: RemoteStream;\n  remoteQualityLevel: any;\n  remoteShareStream: RemoteStream;\n  remoteVideoStream: RemoteStream;\n  shareVideoStream?: LocalDisplayStream;\n  shareAudioStream?: LocalSystemAudioStream;\n  videoDeviceId: any;\n  videoStream?: LocalCameraStream;\n  namespace = MEETINGS;\n\n  /**\n   * @param {Object} [options] -- to auto construct\n   * @returns {MediaProperties}\n   */\n  constructor() {\n    this.webrtcMediaConnection = null;\n    this.mediaDirection = {\n      receiveAudio: false,\n      receiveVideo: false,\n      receiveShare: false,\n      sendAudio: false,\n      sendVideo: false,\n      sendShare: false,\n    };\n    this.videoStream = null;\n    this.audioStream = null;\n    this.shareVideoStream = null;\n    this.shareAudioStream = null;\n    this.remoteShareStream = undefined;\n    this.remoteAudioStream = undefined;\n    this.remoteVideoStream = undefined;\n    this.remoteQualityLevel = QUALITY_LEVELS.HIGH;\n    this.mediaSettings = {};\n    this.videoDeviceId = null;\n  }\n\n  /**\n   * Retrieves the preferred video input device\n   * @returns {Object|null}\n   */\n  getVideoDeviceId() {\n    return this.videoDeviceId || null;\n  }\n\n  setMediaDirection(mediaDirection) {\n    this.mediaDirection = mediaDirection;\n  }\n\n  setMediaSettings(type, values) {\n    this.mediaSettings[type] = values;\n  }\n\n  setMediaPeerConnection(mediaPeerConnection) {\n    this.webrtcMediaConnection = mediaPeerConnection;\n  }\n\n  setLocalVideoStream(videoStream?: LocalCameraStream) {\n    this.videoStream = videoStream;\n  }\n\n  setLocalAudioStream(audioStream?: LocalMicrophoneStream) {\n    this.audioStream = audioStream;\n  }\n\n  setLocalShareVideoStream(shareVideoStream?: LocalDisplayStream) {\n    this.shareVideoStream = shareVideoStream;\n  }\n\n  setLocalShareAudioStream(shareAudioStream?: LocalSystemAudioStream) {\n    this.shareAudioStream = shareAudioStream;\n  }\n\n  setRemoteQualityLevel(remoteQualityLevel) {\n    this.remoteQualityLevel = remoteQualityLevel;\n  }\n\n  setRemoteShareStream(remoteShareStream: RemoteStream) {\n    this.remoteShareStream = remoteShareStream;\n  }\n\n  /**\n   * Sets the remote audio stream\n   * @param {RemoteStream} remoteAudioStream RemoteStream to save\n   * @returns {void}\n   */\n  setRemoteAudioStream(remoteAudioStream: RemoteStream) {\n    this.remoteAudioStream = remoteAudioStream;\n  }\n\n  /**\n   * Sets the remote video stream\n   * @param {RemoteStream} remoteVideoStream RemoteStream to save\n   * @returns {void}\n   */\n  setRemoteVideoStream(remoteVideoStream: RemoteStream) {\n    this.remoteVideoStream = remoteVideoStream;\n  }\n\n  /**\n   * Stores the preferred video input device\n   * @param {string} deviceId Preferred video input device\n   * @returns {void}\n   */\n  setVideoDeviceId(deviceId: string) {\n    this.videoDeviceId = deviceId;\n  }\n\n  unsetPeerConnection() {\n    this.webrtcMediaConnection = null;\n  }\n\n  /**\n   * Removes both remote audio and video from class instance\n   * @returns {void}\n   */\n  unsetRemoteMedia() {\n    this.remoteAudioStream = null;\n    this.remoteVideoStream = null;\n  }\n\n  unsetRemoteShareStream() {\n    this.remoteShareStream = null;\n  }\n\n  /**\n   * Unsets all remote streams\n   * @returns {void}\n   */\n  unsetRemoteStreams() {\n    this.unsetRemoteMedia();\n    this.unsetRemoteShareStream();\n  }\n\n  /**\n   * Returns if we have at least one local share stream or not.\n   * @returns {Boolean}\n   */\n  hasLocalShareStream() {\n    return !!(this.shareAudioStream || this.shareVideoStream);\n  }\n\n  /**\n   * Waits for the webrtc media connection to be connected.\n   *\n   * @returns {Promise<void>}\n   */\n  waitForMediaConnectionConnected(): Promise<void> {\n    const mediaConnectionAwaiter = new MediaConnectionAwaiter({\n      webrtcMediaConnection: this.webrtcMediaConnection,\n    });\n\n    return mediaConnectionAwaiter.waitForMediaConnectionConnected();\n  }\n\n  /**\n   * Returns the type of a connection that has been established\n   *\n   * @returns {Promise<'UDP' | 'TCP' | 'TURN-TLS' | 'TURN-TCP' | 'TURN-UDP' | 'unknown'>}\n   */\n  async getCurrentConnectionType() {\n    // we can only get the connection type after ICE connection has been established\n    await this.waitForMediaConnectionConnected();\n\n    const allStatsReports = [];\n\n    try {\n      const statsResult = await this.webrtcMediaConnection.getStats();\n      statsResult.forEach((report) => allStatsReports.push(report));\n    } catch (error) {\n      LoggerProxy.logger.warn(\n        `Media:properties#getCurrentConnectionType --> getStats() failed: ${error}`\n      );\n    }\n\n    const successfulCandidatePairs = allStatsReports.filter(\n      (report) => report.type === 'candidate-pair' && report.state?.toLowerCase() === 'succeeded'\n    );\n\n    let foundConnectionType = 'unknown';\n\n    // all of the successful pairs should have the same connection type, so just return the type for the first one\n    successfulCandidatePairs.some((pair) => {\n      const localCandidate = allStatsReports.find(\n        (report) => report.type === 'local-candidate' && report.id === pair.localCandidateId\n      );\n\n      if (localCandidate === undefined) {\n        LoggerProxy.logger.warn(\n          `Media:properties#getCurrentConnectionType --> failed to find local candidate \"${pair.localCandidateId}\" in getStats() results`\n        );\n\n        return false;\n      }\n\n      let connectionType;\n\n      if (localCandidate.relayProtocol) {\n        connectionType = `TURN-${localCandidate.relayProtocol.toUpperCase()}`;\n      } else {\n        connectionType = localCandidate.protocol?.toUpperCase(); // it will be UDP or TCP\n      }\n\n      if (connectionType) {\n        foundConnectionType = connectionType;\n\n        return true;\n      }\n      LoggerProxy.logger.warn(\n        `Media:properties#getCurrentConnectionType --> missing localCandidate.protocol, candidateType=${localCandidate.candidateType}`\n      );\n\n      return false;\n    });\n\n    if (foundConnectionType === 'unknown') {\n      const candidatePairStates = allStatsReports\n        .filter((report) => report.type === 'candidate-pair')\n        .map((report) => report.state);\n\n      LoggerProxy.logger.warn(\n        `Media:properties#getCurrentConnectionType --> all candidate pair states: ${JSON.stringify(\n          candidatePairStates\n        )}`\n      );\n    }\n\n    return foundConnectionType;\n  }\n}\n"],"mappings":"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"}

package/dist/webinar/index.js

@@ -62,7 +62,7 @@ var Webinar = _webexCore.WebexPlugin.extend({
   updateCanManageWebcast: function updateCanManageWebcast(canManageWebcast) {
     this.set('canManageWebcast', canManageWebcast);
   },
-  version: "3.0.0-next.25"
+  version: "3.0.0-next.27"
 });
 var _default = exports.default = Webinar;
 //# sourceMappingURL=index.js.map

package/package.json

@@ -43,13 +43,13 @@
     "@webex/eslint-config-legacy": "0.0.0",
     "@webex/jest-config-legacy": "0.0.0",
     "@webex/legacy-tools": "0.0.0",
-    "@webex/plugin-meetings": "3.0.0-next.25",
-    "@webex/plugin-rooms": "3.0.0-next.15",
-    "@webex/test-helper-chai": "3.0.0-next.13",
-    "@webex/test-helper-mocha": "3.0.0-next.13",
-    "@webex/test-helper-mock-webex": "3.0.0-next.13",
-    "@webex/test-helper-retry": "3.0.0-next.13",
-    "@webex/test-helper-test-users": "3.0.0-next.13",
+    "@webex/plugin-meetings": "3.0.0-next.27",
+    "@webex/plugin-rooms": "3.0.0-next.16",
+    "@webex/test-helper-chai": "3.0.0-next.14",
+    "@webex/test-helper-mocha": "3.0.0-next.14",
+    "@webex/test-helper-mock-webex": "3.0.0-next.14",
+    "@webex/test-helper-retry": "3.0.0-next.14",
+    "@webex/test-helper-test-users": "3.0.0-next.14",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.24.0",
@@ -61,20 +61,20 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@webex/common": "3.0.0-next.13",
-    "@webex/internal-media-core": "2.3.3",
-    "@webex/internal-plugin-conversation": "3.0.0-next.15",
-    "@webex/internal-plugin-device": "3.0.0-next.13",
-    "@webex/internal-plugin-llm": "3.0.0-next.15",
-    "@webex/internal-plugin-mercury": "3.0.0-next.15",
-    "@webex/internal-plugin-metrics": "3.0.0-next.13",
-    "@webex/internal-plugin-support": "3.0.0-next.15",
-    "@webex/internal-plugin-user": "3.0.0-next.13",
-    "@webex/internal-plugin-voicea": "3.0.0-next.25",
-    "@webex/media-helpers": "3.0.1-next.14",
-    "@webex/plugin-people": "3.0.0-next.15",
-    "@webex/plugin-rooms": "3.0.0-next.15",
-    "@webex/webex-core": "3.0.0-next.13",
+    "@webex/common": "3.0.0-next.14",
+    "@webex/internal-media-core": "2.4.0",
+    "@webex/internal-plugin-conversation": "3.0.0-next.16",
+    "@webex/internal-plugin-device": "3.0.0-next.14",
+    "@webex/internal-plugin-llm": "3.0.0-next.16",
+    "@webex/internal-plugin-mercury": "3.0.0-next.16",
+    "@webex/internal-plugin-metrics": "3.0.0-next.14",
+    "@webex/internal-plugin-support": "3.0.0-next.16",
+    "@webex/internal-plugin-user": "3.0.0-next.14",
+    "@webex/internal-plugin-voicea": "3.0.0-next.27",
+    "@webex/media-helpers": "3.0.1-next.16",
+    "@webex/plugin-people": "3.0.0-next.16",
+    "@webex/plugin-rooms": "3.0.0-next.16",
+    "@webex/webex-core": "3.0.0-next.14",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",
@@ -91,5 +91,5 @@
   "//": [
     "TODO: upgrade jwt-decode when moving to node 18"
   ],
-  "version": "3.0.0-next.25"
+  "version": "3.0.0-next.27"
 }

package/src/media/MediaConnectionAwaiter.ts

@@ -0,0 +1,174 @@
+import {Defer} from '@webex/common';
+import {ConnectionState, Event} from '@webex/internal-media-core';
+import LoggerProxy from '../common/logs/logger-proxy';
+import {ICE_AND_DTLS_CONNECTION_TIMEOUT} from '../constants';
+
+export interface MediaConnectionAwaiterProps {
+  webrtcMediaConnection: any;
+}
+
+/**
+ * @class MediaConnectionAwaiter
+ */
+export default class MediaConnectionAwaiter {
+  private webrtcMediaConnection: any;
+  private timer: any;
+  private defer: Defer;
+  private retried: boolean;
+  private onTimeoutCallback: () => void;
+  private connectionStateCallback: () => void;
+  private iceGatheringStateCallback: () => void;
+
+  /**
+   * @param {MediaConnectionAwaiterProps} mediaConnectionAwaiterProps
+   */
+  constructor({webrtcMediaConnection}: MediaConnectionAwaiterProps) {
+    this.webrtcMediaConnection = webrtcMediaConnection;
+    this.defer = new Defer();
+    this.retried = false;
+    this.onTimeoutCallback = this.onTimeout.bind(this);
+    this.connectionStateCallback = this.connectionStateListenerCallback.bind(this);
+    this.iceGatheringStateCallback = this.iceGatheringStateListenerCallback.bind(this);
+  }
+
+  /**
+   * Returns true if the connection is connected, false otherwise.
+   *
+   * @returns {boolean}
+   */
+  private isConnected(): boolean {
+    return this.webrtcMediaConnection.getConnectionState() === ConnectionState.Connected;
+  }
+
+  /**
+   * Returns true if the ICE Gathering is completed, false otherwise.
+   *
+   * @returns {boolean}
+   */
+  private isIceGatheringCompleted(): boolean {
+    return this.webrtcMediaConnection.getIceGatheringState() === 'complete';
+  }
+
+  /**
+   * Clears the callbacks.
+   *
+   * @returns {void}
+   */
+  private clearCallbacks(): void {
+    this.webrtcMediaConnection.off(
+      Event.ICE_GATHERING_STATE_CHANGED,
+      this.iceGatheringStateCallback
+    );
+    this.webrtcMediaConnection.off(Event.CONNECTION_STATE_CHANGED, this.connectionStateCallback);
+  }
+
+  /**
+   * Listener for connection state change.
+   *
+   * @returns {void}
+   */
+  connectionStateListenerCallback(): void {
+    LoggerProxy.logger.log(
+      `Media:MediaConnectionAwaiter#connectionStateListenerCallback --> connection state: ${this.webrtcMediaConnection.getConnectionState()}`
+    );
+
+    if (!this.isConnected()) {
+      return;
+    }
+
+    clearTimeout(this.timer);
+
+    this.clearCallbacks();
+
+    this.defer.resolve();
+  }
+
+  /**
+   * Listener for ICE gathering state change.
+   *
+   * @returns {void}
+   */
+  iceGatheringStateListenerCallback(): void {
+    const iceGatheringState = this.webrtcMediaConnection.getIceGatheringState();
+
+    LoggerProxy.logger.log(
+      `Media:MediaConnectionAwaiter#iceGatheringStateListenerCallback --> ICE gathering state change -> ${iceGatheringState}`
+    );
+
+    if (!this.isIceGatheringCompleted()) {
+      return;
+    }
+
+    if (this.isConnected()) {
+      return;
+    }
+
+    clearTimeout(this.timer);
+
+    this.timer = setTimeout(this.onTimeoutCallback, ICE_AND_DTLS_CONNECTION_TIMEOUT);
+  }
+
+  /**
+   * Function called when the timeout is reached.
+   *
+   * @returns {void}
+   */
+  onTimeout(): void {
+    if (this.isConnected()) {
+      this.clearCallbacks();
+
+      this.defer.resolve();
+
+      return;
+    }
+
+    if (!this.isIceGatheringCompleted()) {
+      if (!this.retried) {
+        LoggerProxy.logger.warn(
+          'Media:MediaConnectionAwaiter#onTimeout --> ICE gathering did not complete within the timeout for the first time, retrying once'
+        );
+
+        // retry once if ICE gathering is not completed
+        this.retried = true;
+        clearTimeout(this.timer);
+        this.timer = setTimeout(this.onTimeoutCallback, ICE_AND_DTLS_CONNECTION_TIMEOUT);
+
+        return;
+      }
+
+      LoggerProxy.logger.warn(
+        'Media:MediaConnectionAwaiter#onTimeout --> ICE gathering did not complete within the timeout for the second time, rejecting'
+      );
+    } else {
+      LoggerProxy.logger.warn(
+        'Media:MediaConnectionAwaiter#onTimeout --> ICE gathering completed, but connection state is not connected, rejecting'
+      );
+    }
+
+    this.clearCallbacks();
+
+    this.defer.reject();
+  }
+
+  /**
+   * Waits for the webrtc media connection to be connected.
+   *
+   * @returns {Promise}
+   */
+  waitForMediaConnectionConnected(): Promise<void> {
+    if (this.isConnected()) {
+      return Promise.resolve();
+    }
+
+    this.webrtcMediaConnection.on(Event.CONNECTION_STATE_CHANGED, this.connectionStateCallback);
+
+    this.webrtcMediaConnection.on(
+      Event.ICE_GATHERING_STATE_CHANGED,
+      this.iceGatheringStateCallback
+    );
+
+    this.timer = setTimeout(this.onTimeoutCallback, ICE_AND_DTLS_CONNECTION_TIMEOUT);
+
+    return this.defer.promise;
+  }
+}

package/src/media/properties.ts

@@ -1,5 +1,3 @@
-import {ConnectionState, Event} from '@webex/internal-media-core';
-
 import {
   LocalCameraStream,
   LocalMicrophoneStream,
@@ -8,8 +6,9 @@ import {
   RemoteStream,
 } from '@webex/media-helpers';
 
-import {MEETINGS, ICE_AND_DTLS_CONNECTION_TIMEOUT, QUALITY_LEVELS} from '../constants';
+import {MEETINGS, QUALITY_LEVELS} from '../constants';
 import LoggerProxy from '../common/logs/logger-proxy';
+import MediaConnectionAwaiter from './MediaConnectionAwaiter';
 
 export type MediaDirection = {
   sendAudio: boolean;
@@ -175,35 +174,11 @@ export default class MediaProperties {
    * @returns {Promise<void>}
    */
   waitForMediaConnectionConnected(): Promise<void> {
-    const isConnected = () =>
-      this.webrtcMediaConnection.getConnectionState() === ConnectionState.Connected;
-
-    if (isConnected()) {
-      return Promise.resolve();
-    }
-
-    return new Promise<void>((resolve, reject) => {
-      let timer;
-
-      const connectionStateListener = () => {
-        LoggerProxy.logger.log(
-          `Media:properties#waitForMediaConnectionConnected --> connection state: ${this.webrtcMediaConnection.getConnectionState()}`
-        );
-
-        if (isConnected()) {
-          clearTimeout(timer);
-          this.webrtcMediaConnection.off(Event.CONNECTION_STATE_CHANGED, connectionStateListener);
-          resolve();
-        }
-      };
-
-      timer = setTimeout(() => {
-        this.webrtcMediaConnection.off(Event.CONNECTION_STATE_CHANGED, connectionStateListener);
-        reject();
-      }, ICE_AND_DTLS_CONNECTION_TIMEOUT);
-
-      this.webrtcMediaConnection.on(Event.CONNECTION_STATE_CHANGED, connectionStateListener);
+    const mediaConnectionAwaiter = new MediaConnectionAwaiter({
+      webrtcMediaConnection: this.webrtcMediaConnection,
     });
+
+    return mediaConnectionAwaiter.waitForMediaConnectionConnected();
   }
 
   /**

package/test/unit/spec/media/MediaConnectionAwaiter.ts

@@ -0,0 +1,344 @@
+import {assert} from '@webex/test-helper-chai';
+import sinon from 'sinon';
+import {ConnectionState, Event} from '@webex/internal-media-core';
+import testUtils from '../../../utils/testUtils';
+import {ICE_AND_DTLS_CONNECTION_TIMEOUT} from '@webex/plugin-meetings/src/constants';
+import MediaConnectionAwaiter from '../../../../src/media/MediaConnectionAwaiter';
+
+describe('MediaConnectionAwaiter', () => {
+  let mediaConnectionAwaiter;
+  let mockMC;
+  let clock;
+
+  beforeEach(() => {
+    clock = sinon.useFakeTimers();
+
+    mockMC = {
+      getStats: sinon.stub().resolves([]),
+      on: sinon.stub(),
+      off: sinon.stub(),
+      getConnectionState: sinon.stub().returns(ConnectionState.New),
+      getIceGatheringState: sinon.stub().returns('new'),
+    };
+
+    mediaConnectionAwaiter = new MediaConnectionAwaiter({
+      webrtcMediaConnection: mockMC,
+    });
+  });
+
+  afterEach(() => {
+    clock.restore();
+    sinon.restore();
+  });
+
+  describe('waitForMediaConnectionConnected', () => {
+    it('resolves immediately if connection state is connected', async () => {
+      mockMC.getConnectionState.returns(ConnectionState.Connected);
+
+      await mediaConnectionAwaiter.waitForMediaConnectionConnected();
+
+      assert.neverCalledWith(mockMC.on);
+    });
+
+    it('rejects after timeout if ice state is not connected', async () => {
+      mockMC.getConnectionState.returns(ConnectionState.Connecting);
+      mockMC.getIceGatheringState.returns('gathering');
+
+      let promiseResolved = false;
+      let promiseRejected = false;
+
+      mediaConnectionAwaiter
+        .waitForMediaConnectionConnected()
+        .then(() => {
+          promiseResolved = true;
+        })
+        .catch(() => {
+          promiseRejected = true;
+        });
+
+      await testUtils.flushPromises();
+      assert.equal(promiseResolved, false);
+      assert.equal(promiseRejected, false);
+
+      // check the right listener was registered
+      assert.calledTwice(mockMC.on);
+      assert.equal(mockMC.on.getCall(0).args[0], Event.CONNECTION_STATE_CHANGED);
+      assert.equal(mockMC.on.getCall(1).args[0], Event.ICE_GATHERING_STATE_CHANGED);
+      const listener = mockMC.on.getCall(1).args[1];
+
+      mockMC.getIceGatheringState.returns('complete');
+      listener();
+
+      await clock.tickAsync(ICE_AND_DTLS_CONNECTION_TIMEOUT);
+      await testUtils.flushPromises();
+
+      assert.equal(promiseResolved, false);
+      assert.equal(promiseRejected, true);
+
+      assert.calledTwice(mockMC.off);
+    });
+
+    it('resolves after timeout if connection state reach connected/completed', async () => {
+      mockMC.getConnectionState.returns(ConnectionState.Connecting);
+      mockMC.getIceGatheringState.returns('gathering');
+
+      let promiseResolved = false;
+      let promiseRejected = false;
+
+      mediaConnectionAwaiter
+        .waitForMediaConnectionConnected()
+        .then(() => {
+          promiseResolved = true;
+        })
+        .catch(() => {
+          promiseRejected = true;
+        });
+
+      await testUtils.flushPromises();
+      assert.equal(promiseResolved, false);
+      assert.equal(promiseRejected, false);
+
+      // check the right listener was registered
+      assert.calledTwice(mockMC.on);
+      assert.equal(mockMC.on.getCall(0).args[0], Event.CONNECTION_STATE_CHANGED);
+      assert.equal(mockMC.on.getCall(1).args[0], Event.ICE_GATHERING_STATE_CHANGED);
+
+      mockMC.getConnectionState.returns(ConnectionState.Connected);
+
+      await clock.tickAsync(ICE_AND_DTLS_CONNECTION_TIMEOUT);
+      await testUtils.flushPromises();
+
+      assert.equal(promiseResolved, true);
+      assert.equal(promiseRejected, false);
+
+      assert.calledTwice(mockMC.off);
+    });
+
+    it(`resolves when media connection reaches "connected" state`, async () => {
+      mockMC.getConnectionState.returns(ConnectionState.Connecting);
+      mockMC.getIceGatheringState.returns('gathering');
+
+      const clearTimeoutSpy = sinon.spy(clock, 'clearTimeout');
+
+      let promiseResolved = false;
+      let promiseRejected = false;
+
+      mediaConnectionAwaiter
+        .waitForMediaConnectionConnected()
+        .then(() => {
+          promiseResolved = true;
+        })
+        .catch(() => {
+          promiseRejected = true;
+        });
+
+      await testUtils.flushPromises();
+      assert.equal(promiseResolved, false);
+      assert.equal(promiseRejected, false);
+
+      // check the right listener was registered
+      assert.calledTwice(mockMC.on);
+      assert.equal(mockMC.on.getCall(0).args[0], Event.CONNECTION_STATE_CHANGED);
+      assert.equal(mockMC.on.getCall(1).args[0], Event.ICE_GATHERING_STATE_CHANGED);
+      const listener = mockMC.on.getCall(0).args[1];
+
+      // call the listener and pretend we are now connected
+      mockMC.getConnectionState.returns(ConnectionState.Connected);
+      listener();
+      await testUtils.flushPromises();
+
+      assert.equal(promiseResolved, true);
+      assert.equal(promiseRejected, false);
+
+      // check that listener was removed
+      assert.calledTwice(mockMC.off);
+
+      assert.calledOnce(clearTimeoutSpy);
+    });
+
+    it(`ice gathering state update to "gathering" state does not update timer`, async () => {
+      mockMC.getConnectionState.returns(ConnectionState.Connecting);
+      mockMC.getIceGatheringState.returns('new');
+
+      const clearTimeoutSpy = sinon.spy(clock, 'clearTimeout');
+
+      let promiseResolved = false;
+      let promiseRejected = false;
+
+      mediaConnectionAwaiter
+        .waitForMediaConnectionConnected()
+        .then(() => {
+          promiseResolved = true;
+        })
+        .catch(() => {
+          promiseRejected = true;
+        });
+
+      await testUtils.flushPromises();
+      assert.equal(promiseResolved, false);
+      assert.equal(promiseRejected, false);
+
+      // check the right listener was registered
+      assert.calledTwice(mockMC.on);
+      assert.equal(mockMC.on.getCall(0).args[0], Event.CONNECTION_STATE_CHANGED);
+      assert.equal(mockMC.on.getCall(1).args[0], Event.ICE_GATHERING_STATE_CHANGED);
+      const listener = mockMC.on.getCall(1).args[1];
+
+      // call the listener and pretend we are now connected
+      mockMC.getIceGatheringState.returns('gathering');
+      listener();
+
+      mockMC.getConnectionState.returns(ConnectionState.Connected);
+
+      await clock.tickAsync(ICE_AND_DTLS_CONNECTION_TIMEOUT);
+      await testUtils.flushPromises();
+
+      assert.equal(promiseResolved, true);
+      assert.equal(promiseRejected, false);
+
+      // check that listener was removed
+      assert.calledTwice(mockMC.off);
+
+      assert.neverCalledWith(clearTimeoutSpy);
+    });
+
+    it(`ice gathering update to 'complete' state restarts the timer`, async () => {
+      mockMC.getConnectionState.returns(ConnectionState.Connecting);
+      mockMC.getIceGatheringState.returns('new');
+
+      const setTimeoutSpy = sinon.spy(clock, 'setTimeout');
+      const clearTimeoutSpy = sinon.spy(clock, 'clearTimeout');
+
+      let promiseResolved = false;
+      let promiseRejected = false;
+
+      mediaConnectionAwaiter
+        .waitForMediaConnectionConnected()
+        .then(() => {
+          promiseResolved = true;
+        })
+        .catch(() => {
+          promiseRejected = true;
+        });
+
+      await testUtils.flushPromises();
+      assert.equal(promiseResolved, false);
+      assert.equal(promiseRejected, false);
+
+      assert.calledOnce(setTimeoutSpy);
+
+      // check the right listener was registered
+      assert.calledTwice(mockMC.on);
+      assert.equal(mockMC.on.getCall(0).args[0], Event.CONNECTION_STATE_CHANGED);
+      assert.equal(mockMC.on.getCall(1).args[0], Event.ICE_GATHERING_STATE_CHANGED);
+      const listener = mockMC.on.getCall(1).args[1];
+
+      // call the listener and pretend we are now connected
+      mockMC.getIceGatheringState.returns('complete');
+      listener();
+
+      assert.calledOnce(clearTimeoutSpy);
+      assert.calledTwice(setTimeoutSpy);
+
+      mockMC.getConnectionState.returns(ConnectionState.Connected);
+
+      await clock.tickAsync(ICE_AND_DTLS_CONNECTION_TIMEOUT);
+      await testUtils.flushPromises();
+
+      assert.equal(promiseResolved, true);
+      assert.equal(promiseRejected, false);
+
+      // check that listener was removed
+      assert.calledTwice(mockMC.off);
+    });
+
+    it(`reject with restart timer once if gathering state is not complete`, async () => {
+      mockMC.getConnectionState.returns(ConnectionState.Connecting);
+      mockMC.getIceGatheringState.returns('new');
+
+      const setTimeoutSpy = sinon.spy(clock, 'setTimeout');
+      const clearTimeoutSpy = sinon.spy(clock, 'clearTimeout');
+
+      let promiseResolved = false;
+      let promiseRejected = false;
+
+      mediaConnectionAwaiter
+        .waitForMediaConnectionConnected()
+        .then(() => {
+          promiseResolved = true;
+        })
+        .catch(() => {
+          promiseRejected = true;
+        });
+
+      await testUtils.flushPromises();
+      assert.equal(promiseResolved, false);
+      assert.equal(promiseRejected, false);
+
+      // check the right listener was registered
+      assert.calledTwice(mockMC.on);
+      assert.equal(mockMC.on.getCall(0).args[0], Event.CONNECTION_STATE_CHANGED);
+      assert.equal(mockMC.on.getCall(1).args[0], Event.ICE_GATHERING_STATE_CHANGED);
+
+      await clock.tickAsync(ICE_AND_DTLS_CONNECTION_TIMEOUT * 2);
+      await testUtils.flushPromises();
+
+      assert.equal(promiseResolved, false);
+      assert.equal(promiseRejected, true);
+
+      // check that listener was removed
+      assert.calledTwice(mockMC.off);
+
+      assert.calledOnce(clearTimeoutSpy);
+      assert.calledTwice(setTimeoutSpy);
+    });
+
+    it(`resolves gathering and connection state complete right after`, async () => {
+      mockMC.getConnectionState.returns(ConnectionState.Connecting);
+      mockMC.getIceGatheringState.returns('new');
+
+      const setTimeoutSpy = sinon.spy(clock, 'setTimeout');
+      const clearTimeoutSpy = sinon.spy(clock, 'clearTimeout');
+
+      let promiseResolved = false;
+      let promiseRejected = false;
+
+      mediaConnectionAwaiter
+        .waitForMediaConnectionConnected()
+        .then(() => {
+          promiseResolved = true;
+        })
+        .catch(() => {
+          promiseRejected = true;
+        });
+
+      await testUtils.flushPromises();
+      assert.equal(promiseResolved, false);
+      assert.equal(promiseRejected, false);
+
+      // check the right listener was registered
+      assert.calledTwice(mockMC.on);
+      assert.equal(mockMC.on.getCall(0).args[0], Event.CONNECTION_STATE_CHANGED);
+      assert.equal(mockMC.on.getCall(1).args[0], Event.ICE_GATHERING_STATE_CHANGED);
+      const connectionStateListener = mockMC.on.getCall(0).args[1];
+      const iceGatheringListener = mockMC.on.getCall(1).args[1];
+
+      mockMC.getIceGatheringState.returns('complete');
+      iceGatheringListener();
+
+      mockMC.getConnectionState.returns(ConnectionState.Connected);
+      connectionStateListener();
+
+      await testUtils.flushPromises();
+
+      assert.equal(promiseResolved, true);
+      assert.equal(promiseRejected, false);
+
+      // check that listener was removed
+      assert.calledTwice(mockMC.off);
+
+      assert.calledTwice(clearTimeoutSpy);
+      assert.calledTwice(setTimeoutSpy);
+    });
+  });
+});

package/test/unit/spec/media/properties.ts

@@ -1,11 +1,10 @@
 import {assert} from '@webex/test-helper-chai';
 import sinon from 'sinon';
-import {ConnectionState, Event} from '@webex/internal-media-core';
+import {ConnectionState} from '@webex/internal-media-core';
 import MediaProperties from '@webex/plugin-meetings/src/media/properties';
-import MediaUtil from '@webex/plugin-meetings/src/media/util';
 import testUtils from '../../../utils/testUtils';
-import {ICE_AND_DTLS_CONNECTION_TIMEOUT} from '@webex/plugin-meetings/src/constants';
 import {Defer} from '@webex/common';
+import MediaConnectionAwaiter from '../../../../src/media/MediaConnectionAwaiter';
 
 describe('MediaProperties', () => {
   let mediaProperties;
@@ -31,80 +30,27 @@ describe('MediaProperties', () => {
     sinon.restore();
   });
   describe('waitForMediaConnectionConnected', () => {
-    it('resolves immediately if ice state is connected', async () => {
-      await mediaProperties.waitForMediaConnectionConnected();
-    });
-    it('rejects after timeout if ice state does not reach connected/completed', async () => {
-      mockMC.getConnectionState.returns(ConnectionState.Connecting);
-
-      let promiseResolved = false;
-      let promiseRejected = false;
-
-      mediaProperties
-        .waitForMediaConnectionConnected()
-        .then(() => {
-          promiseResolved = true;
-        })
-        .catch(() => {
-          promiseRejected = true;
-        });
-
-      assert.equal(promiseResolved, false);
-      assert.equal(promiseRejected, false);
-
-      await clock.tickAsync(ICE_AND_DTLS_CONNECTION_TIMEOUT);
-      await testUtils.flushPromises();
+    it('resolves if media connection is connected', async () => {
+      const waitForMediaConnectionConnectedResult = new Defer();
 
-      assert.equal(promiseResolved, false);
-      assert.equal(promiseRejected, true);
+      sinon
+        .stub(MediaConnectionAwaiter.prototype, 'waitForMediaConnectionConnected')
+        .returns(waitForMediaConnectionConnectedResult.promise);
 
-      // check that listener was registered and removed
-      assert.calledOnce(mockMC.on);
-      assert.equal(mockMC.on.getCall(0).args[0], Event.CONNECTION_STATE_CHANGED);
-      const listener = mockMC.on.getCall(0).args[1];
+      waitForMediaConnectionConnectedResult.resolve();
 
-      assert.calledOnce(mockMC.off);
-      assert.calledWith(mockMC.off, Event.CONNECTION_STATE_CHANGED, listener);
+      await mediaProperties.waitForMediaConnectionConnected();
     });
+    it('rejects if media connection is not connected', async () => {
+      const waitForMediaConnectionConnectedResult = new Defer();
 
-    it(`resolves when media connection reaches "connected" state`, async () => {
-      mockMC.getConnectionState.returns(ConnectionState.Connecting);
-
-      const clearTimeoutSpy = sinon.spy(clock, 'clearTimeout');
-
-      let promiseResolved = false;
-      let promiseRejected = false;
-
-      mediaProperties
-        .waitForMediaConnectionConnected()
-        .then(() => {
-          promiseResolved = true;
-        })
-        .catch(() => {
-          promiseRejected = true;
-        });
-
-      assert.equal(promiseResolved, false);
-      assert.equal(promiseRejected, false);
-
-      // check the right listener was registered
-      assert.calledOnce(mockMC.on);
-      assert.equal(mockMC.on.getCall(0).args[0], Event.CONNECTION_STATE_CHANGED);
-      const listener = mockMC.on.getCall(0).args[1];
-
-      // call the listener and pretend we are now connected
-      mockMC.getConnectionState.returns(ConnectionState.Connected);
-      listener();
-      await testUtils.flushPromises();
-
-      assert.equal(promiseResolved, true);
-      assert.equal(promiseRejected, false);
+      sinon
+        .stub(MediaConnectionAwaiter.prototype, 'waitForMediaConnectionConnected')
+        .returns(waitForMediaConnectionConnectedResult.promise);
 
-      // check that listener was removed
-      assert.calledOnce(mockMC.off);
-      assert.calledWith(mockMC.off, Event.CONNECTION_STATE_CHANGED, listener);
+      waitForMediaConnectionConnectedResult.reject();
 
-      assert.calledOnce(clearTimeoutSpy);
+      await assert.isRejected(mediaProperties.waitForMediaConnectionConnected());
     });
   });