@webex/plugin-meetings 2.35.0 → 3.0.0-beta.0

package/dist/meeting/index.js

@@ -4619,105 +4619,125 @@ var Meeting = /*#__PURE__*/function (_StatelessWebexPlugin) {
           enableRtx: _this38.config.enableRtx,
           enableExtmap: _this38.config.enableExtmap,
           setStartLocalSDPGenRemoteSDPRecvDelay: _this38.setStartLocalSDPGenRemoteSDPRecvDelay.bind(_this38)
-        });
-      }).then(function (peerConnection) {
-        return _this38.getDevices().then(function (devices) {
-          _util.default.handleDeviceLogging(devices);
-
-          return peerConnection;
-        });
-      }).then(function (peerConnection) {
-        _this38.handleMediaLogging(_this38.mediaProperties);
+        }).then(function (peerConnection) {
+          return _this38.getDevices().then(function (devices) {
+            _util.default.handleDeviceLogging(devices);
 
-        _loggerProxy.default.logger.info("".concat(LOG_HEADER, " PeerConnection Received from attachMedia "));
+            return peerConnection;
+          });
+        }).then(function (peerConnection) {
+          _this38.handleMediaLogging(_this38.mediaProperties);
 
-        _this38.setRemoteStream(peerConnection);
+          _loggerProxy.default.logger.info("".concat(LOG_HEADER, " PeerConnection Received from attachMedia "));
 
-        if (_this38.config.stats.enableStatsAnalyzer) {
-          // TODO: ** Dont re create StatsAnalyzer on reconnect or rejoin
-          _this38.networkQualityMonitor = new _networkQualityMonitor.default(_this38.config.stats);
-          _this38.statsAnalyzer = new _statsAnalyzer.StatsAnalyzer(_this38.config.stats, _this38.networkQualityMonitor);
+          _this38.setRemoteStream(peerConnection);
 
-          _this38.setupStatsAnalyzerEventHandlers();
+          if (_this38.config.stats.enableStatsAnalyzer) {
+            // TODO: ** Dont re create StatsAnalyzer on reconnect or rejoin
+            _this38.networkQualityMonitor = new _networkQualityMonitor.default(_this38.config.stats);
+            _this38.statsAnalyzer = new _statsAnalyzer.StatsAnalyzer(_this38.config.stats, _this38.networkQualityMonitor);
 
-          _this38.networkQualityMonitor.on(_constants.EVENT_TRIGGERS.NETWORK_QUALITY, _this38.sendNetworkQualityEvent.bind(_this38));
-        }
-      }).catch(function (error) {
-        _loggerProxy.default.logger.error("".concat(LOG_HEADER, " Error adding media , setting up peerconnection, "), error);
-
-        _metrics.default.sendBehavioralMetric(_constants2.default.ADD_MEDIA_FAILURE, {
-          correlation_id: _this38.correlationId,
-          locus_id: _this38.locusUrl.split('/').pop(),
-          reason: error.message,
-          stack: error.stack,
-          turnDiscoverySkippedReason: turnDiscoverySkippedReason,
-          turnServerUsed: turnServerUsed
-        });
-
-        throw error;
-      }).then(function () {
-        return new _promise.default(function (resolve, reject) {
-          var timerCount = 0; // eslint-disable-next-line func-names
-          // eslint-disable-next-line prefer-arrow-callback
+            _this38.setupStatsAnalyzerEventHandlers();
 
-          if (_this38.type === _constants._CALL_) {
-            resolve();
+            _this38.networkQualityMonitor.on(_constants.EVENT_TRIGGERS.NETWORK_QUALITY, _this38.sendNetworkQualityEvent.bind(_this38));
           }
+        }).catch(function (error) {
+          _loggerProxy.default.logger.error("".concat(LOG_HEADER, " Error adding media , setting up peerconnection, "), error);
 
-          var joiningTimer = setInterval(function () {
-            timerCount += 1;
+          _metrics.default.sendBehavioralMetric(_constants2.default.ADD_MEDIA_FAILURE, {
+            correlation_id: _this38.correlationId,
+            locus_id: _this38.locusUrl.split('/').pop(),
+            reason: error.message,
+            stack: error.stack,
+            turnDiscoverySkippedReason: turnDiscoverySkippedReason,
+            turnServerUsed: turnServerUsed
+          });
+
+          throw error;
+        }).then(function () {
+          return new _promise.default(function (resolve, reject) {
+            var timerCount = 0; // eslint-disable-next-line func-names
+            // eslint-disable-next-line prefer-arrow-callback
 
-            if (_this38.meetingState === _constants.FULL_STATE.ACTIVE) {
-              clearInterval(joiningTimer);
+            if (_this38.type === _constants._CALL_) {
               resolve();
             }
 
-            if (timerCount === 4) {
-              clearInterval(joiningTimer);
-              reject(new Error('Meeting is still not active '));
-            }
-          }, 1000);
-        });
-      }).then(function () {
-        return logRequest(_this38.roap.sendRoapMediaRequest({
-          sdp: _this38.mediaProperties.peerConnection.sdp,
-          roapSeq: _this38.roapSeq,
-          meeting: _this38 // or can pass meeting ID
-
-        }), {
-          header: "".concat(LOG_HEADER, " Send Roap Media Request."),
-          success: "".concat(LOG_HEADER, " Successfully send roap media request"),
-          failure: "".concat(LOG_HEADER, " Error joining the call on send roap media request, ")
-        });
-      }).then(function () {
-        return _this38.mediaProperties.waitForIceConnectedState().catch(function () {
-          throw (0, _webexErrors.createMeetingsError)(30202, 'Meeting connection failed');
-        });
-      }).then(function () {
-        _loggerProxy.default.logger.info("".concat(LOG_HEADER, " PeerConnection CONNECTED"));
+            var joiningTimer = setInterval(function () {
+              timerCount += 1;
 
-        if (mediaSettings && mediaSettings.sendShare && localShare) {
-          if (_this38.state === _constants.MEETING_STATE.STATES.JOINED) {
-            return _this38.share();
-          } // When the self state changes to JOINED then request the floor
+              if (_this38.meetingState === _constants.FULL_STATE.ACTIVE) {
+                clearInterval(joiningTimer);
+                resolve();
+              }
 
+              if (timerCount === 4) {
+                clearInterval(joiningTimer);
+                reject(new Error('Meeting is still not active '));
+              }
+            }, 1000);
+          });
+        }).then(function () {
+          return logRequest(_this38.roap.sendRoapMediaRequest({
+            sdp: _this38.mediaProperties.peerConnection.sdp,
+            roapSeq: _this38.roapSeq,
+            meeting: _this38 // or can pass meeting ID
 
-          _this38.floorGrantPending = true;
-        }
+          }), {
+            header: "".concat(LOG_HEADER, " Send Roap Media Request."),
+            success: "".concat(LOG_HEADER, " Successfully send roap media request"),
+            failure: "".concat(LOG_HEADER, " Error joining the call on send roap media request, ")
+          });
+        }).then(function () {
+          var peerConnection = _this38.mediaProperties.peerConnection;
+          return new _promise.default(function (resolve, reject) {
+            if (peerConnection.connectionState === _constants.CONNECTION_STATE.CONNECTED) {
+              _loggerProxy.default.logger.info("".concat(LOG_HEADER, " PeerConnection CONNECTED"));
 
-        return {};
-      }).then(function () {
-        return _this38.mediaProperties.getCurrentConnectionType();
-      }).then(function (connectionType) {
-        _metrics.default.sendBehavioralMetric(_constants2.default.ADD_MEDIA_SUCCESS, {
-          correlation_id: _this38.correlationId,
-          locus_id: _this38.locusUrl.split('/').pop(),
-          connectionType: connectionType
+              resolve(peerConnection);
+              return;
+            } // Check if Peer Connection is STABLE (connected)
+
+
+            var stabilityTimeout = setTimeout(function () {
+              if (peerConnection.connectionState !== _constants.CONNECTION_STATE.CONNECTED) {
+                // TODO: Fix this after the error code pr goes in
+                reject((0, _webexErrors.createMeetingsError)(30202, 'Meeting connection failed'));
+              } else {
+                _loggerProxy.default.logger.info("".concat(LOG_HEADER, " PeerConnection CONNECTED"));
+
+                resolve(peerConnection);
+              }
+            }, _constants.PC_BAIL_TIMEOUT);
+
+            _this38.once(_constants.EVENT_TRIGGERS.MEDIA_READY, function () {
+              _loggerProxy.default.logger.info("".concat(LOG_HEADER, " PeerConnection CONNECTED, clearing stability timer."));
+
+              clearTimeout(stabilityTimeout);
+              resolve(peerConnection);
+            });
+          });
+        }).then(function () {
+          if (mediaSettings && mediaSettings.sendShare && localShare) {
+            if (_this38.state === _constants.MEETING_STATE.STATES.JOINED) {
+              return _this38.share();
+            } // When the self state changes to JOINED then request the floor
+
+
+            _this38.floorGrantPending = true;
+          }
+
+          _metrics.default.sendBehavioralMetric(_constants2.default.ADD_MEDIA_SUCCESS, {
+            correlation_id: _this38.correlationId,
+            locus_id: _this38.locusUrl.split('/').pop()
+          });
+
+          return _promise.default.resolve();
         });
       }).catch(function (error) {
         // Clean up stats analyzer, peer connection, and turn off listeners
         var stopStatsAnalyzer = _this38.statsAnalyzer ? _this38.statsAnalyzer.stopAnalyzer() : _promise.default.resolve();
-        return stopStatsAnalyzer.then(function () {
+        stopStatsAnalyzer.then(function () {
           _this38.statsAnalyzer = null;
 
           if (_this38.mediaProperties.peerConnection) {