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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/plugin-meetings",
-  "version": "2.35.0",
+  "version": "3.0.0-beta.0",
   "description": "",
   "license": "Cisco EULA (https://www.cisco.com/c/en/us/products/end-user-license-agreement.html)",
   "contributors": [
@@ -13,9 +13,13 @@
   ],
   "main": "dist/index.js",
   "devMain": "src/index.js",
-  "repository": "https://github.com/webex/webex-js-sdk/tree/master/packages/@webex/plugin-meetings",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/webex/webex-js-sdk.git",
+    "directory": "packages/@webex/plugin-meetings"
+  },
   "engines": {
-    "node": ">=14"
+    "node": ">=16"
   },
   "browserify": {
     "transform": [
@@ -24,30 +28,30 @@
     ]
   },
   "devDependencies": {
-    "@webex/plugin-meetings": "2.35.0",
-    "@webex/test-helper-chai": "2.35.0",
-    "@webex/test-helper-mocha": "2.35.0",
-    "@webex/test-helper-mock-webex": "2.35.0",
-    "@webex/test-helper-retry": "2.35.0",
-    "@webex/test-helper-test-users": "2.35.0",
+    "@webex/plugin-meetings": "3.0.0-beta.0",
+    "@webex/test-helper-chai": "3.0.0-beta.0",
+    "@webex/test-helper-mocha": "3.0.0-beta.0",
+    "@webex/test-helper-mock-webex": "3.0.0-beta.0",
+    "@webex/test-helper-retry": "3.0.0-beta.0",
+    "@webex/test-helper-test-users": "3.0.0-beta.0",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "jsdom-global": "3.0.2",
     "sinon": "^9.2.4"
   },
   "dependencies": {
-    "@webex/common": "2.35.0",
+    "@webex/common": "3.0.0-beta.0",
     "@webex/internal-media-core": "^0.0.7-beta",
-    "@webex/internal-plugin-conversation": "2.35.0",
-    "@webex/internal-plugin-device": "2.35.0",
-    "@webex/internal-plugin-mercury": "2.35.0",
-    "@webex/internal-plugin-metrics": "2.35.0",
-    "@webex/internal-plugin-support": "2.35.0",
-    "@webex/internal-plugin-user": "2.35.0",
-    "@webex/plugin-people": "2.35.0",
-    "@webex/plugin-rooms": "2.35.0",
+    "@webex/internal-plugin-conversation": "3.0.0-beta.0",
+    "@webex/internal-plugin-device": "3.0.0-beta.0",
+    "@webex/internal-plugin-mercury": "3.0.0-beta.0",
+    "@webex/internal-plugin-metrics": "3.0.0-beta.0",
+    "@webex/internal-plugin-support": "3.0.0-beta.0",
+    "@webex/internal-plugin-user": "3.0.0-beta.0",
+    "@webex/plugin-people": "3.0.0-beta.0",
+    "@webex/plugin-rooms": "3.0.0-beta.0",
     "@webex/ts-sdp": "^1.0.1",
-    "@webex/webex-core": "2.35.0",
+    "@webex/webex-core": "3.0.0-beta.0",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",
     "dotenv": "^4.0.0",

package/src/meeting/index.js

@@ -36,6 +36,7 @@ import {
   _INCOMING_,
   _JOIN_,
   AUDIO,
+  CONNECTION_STATE,
   CONTENT,
   ENDED,
   EVENT_TRIGGERS,
@@ -57,6 +58,7 @@ import {
   ONLINE,
   OFFLINE,
   PASSWORD_STATUS,
+  PC_BAIL_TIMEOUT,
   PSTN_STATUS,
   QUALITY_LEVELS,
   RECORDING_STATE,
@@ -4254,110 +4256,129 @@ export default class Meeting extends StatelessWebexPlugin {
         enableRtx: this.config.enableRtx,
         enableExtmap: this.config.enableExtmap,
         setStartLocalSDPGenRemoteSDPRecvDelay: this.setStartLocalSDPGenRemoteSDPRecvDelay.bind(this)
-      }))
-      .then((peerConnection) => this.getDevices().then((devices) => {
-        MeetingUtil.handleDeviceLogging(devices);
-
-        return peerConnection;
-      }))
-      .then((peerConnection) => {
-        this.handleMediaLogging(this.mediaProperties);
-        LoggerProxy.logger.info(`${LOG_HEADER} PeerConnection Received from attachMedia `);
-
-        this.setRemoteStream(peerConnection);
-        if (this.config.stats.enableStatsAnalyzer) {
-          // TODO: ** Dont re create StatsAnalyzer on reconnect or rejoin
-          this.networkQualityMonitor = new NetworkQualityMonitor(this.config.stats);
-          this.statsAnalyzer = new StatsAnalyzer(this.config.stats, this.networkQualityMonitor);
-          this.setupStatsAnalyzerEventHandlers();
-          this.networkQualityMonitor.on(EVENT_TRIGGERS.NETWORK_QUALITY, this.sendNetworkQualityEvent.bind(this));
-        }
       })
-      .catch((error) => {
-        LoggerProxy.logger.error(`${LOG_HEADER} Error adding media , setting up peerconnection, `, error);
+        .then((peerConnection) => this.getDevices().then((devices) => {
+          MeetingUtil.handleDeviceLogging(devices);
 
-        Metrics.sendBehavioralMetric(
-          BEHAVIORAL_METRICS.ADD_MEDIA_FAILURE,
-          {
-            correlation_id: this.correlationId,
-            locus_id: this.locusUrl.split('/').pop(),
-            reason: error.message,
-            stack: error.stack,
-            turnDiscoverySkippedReason,
-            turnServerUsed
+          return peerConnection;
+        }))
+        .then((peerConnection) => {
+          this.handleMediaLogging(this.mediaProperties);
+          LoggerProxy.logger.info(`${LOG_HEADER} PeerConnection Received from attachMedia `);
+
+          this.setRemoteStream(peerConnection);
+          if (this.config.stats.enableStatsAnalyzer) {
+            // TODO: ** Dont re create StatsAnalyzer on reconnect or rejoin
+            this.networkQualityMonitor = new NetworkQualityMonitor(this.config.stats);
+            this.statsAnalyzer = new StatsAnalyzer(this.config.stats, this.networkQualityMonitor);
+            this.setupStatsAnalyzerEventHandlers();
+            this.networkQualityMonitor.on(EVENT_TRIGGERS.NETWORK_QUALITY, this.sendNetworkQualityEvent.bind(this));
           }
-        );
+        })
+        .catch((error) => {
+          LoggerProxy.logger.error(`${LOG_HEADER} Error adding media , setting up peerconnection, `, error);
 
-        throw error;
-      })
-      .then(() => new Promise((resolve, reject) => {
-        let timerCount = 0;
+          Metrics.sendBehavioralMetric(
+            BEHAVIORAL_METRICS.ADD_MEDIA_FAILURE,
+            {
+              correlation_id: this.correlationId,
+              locus_id: this.locusUrl.split('/').pop(),
+              reason: error.message,
+              stack: error.stack,
+              turnDiscoverySkippedReason,
+              turnServerUsed
+            }
+          );
 
-        // eslint-disable-next-line func-names
-        // eslint-disable-next-line prefer-arrow-callback
-        if (this.type === _CALL_) {
-          resolve();
-        }
-        const joiningTimer = setInterval(() => {
-          timerCount += 1;
-          if (this.meetingState === FULL_STATE.ACTIVE) {
-            clearInterval(joiningTimer);
+          throw error;
+        })
+        .then(() => new Promise((resolve, reject) => {
+          let timerCount = 0;
+
+          // eslint-disable-next-line func-names
+          // eslint-disable-next-line prefer-arrow-callback
+          if (this.type === _CALL_) {
             resolve();
           }
+          const joiningTimer = setInterval(() => {
+            timerCount += 1;
+            if (this.meetingState === FULL_STATE.ACTIVE) {
+              clearInterval(joiningTimer);
+              resolve();
+            }
 
-          if (timerCount === 4) {
-            clearInterval(joiningTimer);
-            reject(new Error('Meeting is still not active '));
-          }
-        }, 1000);
-      }))
-      .then(() =>
-        logRequest(this.roap
-          .sendRoapMediaRequest({
-            sdp: this.mediaProperties.peerConnection.sdp,
-            roapSeq: this.roapSeq,
-            meeting: this // or can pass meeting ID
-          }), {
-          header: `${LOG_HEADER} Send Roap Media Request.`,
-          success: `${LOG_HEADER} Successfully send roap media request`,
-          failure: `${LOG_HEADER} Error joining the call on send roap media request, `
+            if (timerCount === 4) {
+              clearInterval(joiningTimer);
+              reject(new Error('Meeting is still not active '));
+            }
+          }, 1000);
         }))
-      .then(
-        () => this.mediaProperties.waitForIceConnectedState()
-          .catch(() => {
-            throw createMeetingsError(30202, 'Meeting connection failed');
-          })
-      )
-      .then(() => {
-        LoggerProxy.logger.info(`${LOG_HEADER} PeerConnection CONNECTED`);
+        .then(() =>
+          logRequest(this.roap
+            .sendRoapMediaRequest({
+              sdp: this.mediaProperties.peerConnection.sdp,
+              roapSeq: this.roapSeq,
+              meeting: this // or can pass meeting ID
+            }), {
+            header: `${LOG_HEADER} Send Roap Media Request.`,
+            success: `${LOG_HEADER} Successfully send roap media request`,
+            failure: `${LOG_HEADER} Error joining the call on send roap media request, `
+          }))
+        .then(() => {
+          const {peerConnection} = this.mediaProperties;
 
-        if (mediaSettings && mediaSettings.sendShare && localShare) {
-          if (this.state === MEETING_STATE.STATES.JOINED) {
-            return this.share();
-          }
+          return new Promise((resolve, reject) => {
+            if (peerConnection.connectionState === CONNECTION_STATE.CONNECTED) {
+              LoggerProxy.logger.info(`${LOG_HEADER} PeerConnection CONNECTED`);
 
-          // When the self state changes to JOINED then request the floor
-          this.floorGrantPending = true;
-        }
+              resolve(peerConnection);
 
-        return {};
-      })
-      .then(() => this.mediaProperties.getCurrentConnectionType())
-      .then((connectionType) => {
-        Metrics.sendBehavioralMetric(
-          BEHAVIORAL_METRICS.ADD_MEDIA_SUCCESS,
-          {
-            correlation_id: this.correlationId,
-            locus_id: this.locusUrl.split('/').pop(),
-            connectionType
+              return;
+            }
+            // Check if Peer Connection is STABLE (connected)
+            const stabilityTimeout = setTimeout(() => {
+              if (peerConnection.connectionState !== CONNECTION_STATE.CONNECTED) {
+                // TODO: Fix this after the error code pr goes in
+                reject(createMeetingsError(30202, 'Meeting connection failed'));
+              }
+              else {
+                LoggerProxy.logger.info(`${LOG_HEADER} PeerConnection CONNECTED`);
+                resolve(peerConnection);
+              }
+            }, PC_BAIL_TIMEOUT);
+
+            this.once(EVENT_TRIGGERS.MEDIA_READY, () => {
+              LoggerProxy.logger.info(`${LOG_HEADER} PeerConnection CONNECTED, clearing stability timer.`);
+              clearTimeout(stabilityTimeout);
+              resolve(peerConnection);
+            });
+          });
+        })
+        .then(() => {
+          if (mediaSettings && mediaSettings.sendShare && localShare) {
+            if (this.state === MEETING_STATE.STATES.JOINED) {
+              return this.share();
+            }
+
+            // When the self state changes to JOINED then request the floor
+            this.floorGrantPending = true;
           }
-        );
-      })
+
+          Metrics.sendBehavioralMetric(
+            BEHAVIORAL_METRICS.ADD_MEDIA_SUCCESS,
+            {
+              correlation_id: this.correlationId,
+              locus_id: this.locusUrl.split('/').pop()
+            }
+          );
+
+          return Promise.resolve();
+        }))
       .catch((error) => {
         // Clean up stats analyzer, peer connection, and turn off listeners
         const stopStatsAnalyzer = (this.statsAnalyzer) ? this.statsAnalyzer.stopAnalyzer() : Promise.resolve();
 
-        return stopStatsAnalyzer
+        stopStatsAnalyzer
           .then(() => {
             this.statsAnalyzer = null;