@webex/plugin-meetings 3.0.0-beta.313 → 3.0.0-beta.314

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-beta.313"
+  version: "3.0.0-beta.314"
 });
 var _default = Webinar;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/plugin-meetings",
-  "version": "3.0.0-beta.313",
+  "version": "3.0.0-beta.314",
   "description": "",
   "license": "Cisco EULA (https://www.cisco.com/c/en/us/products/end-user-license-agreement.html)",
   "contributors": [
@@ -32,12 +32,12 @@
     "build": "yarn run -T tsc --declaration true --declarationDir ./dist/types"
   },
   "devDependencies": {
-    "@webex/plugin-meetings": "3.0.0-beta.313",
-    "@webex/test-helper-chai": "3.0.0-beta.313",
-    "@webex/test-helper-mocha": "3.0.0-beta.313",
-    "@webex/test-helper-mock-webex": "3.0.0-beta.313",
-    "@webex/test-helper-retry": "3.0.0-beta.313",
-    "@webex/test-helper-test-users": "3.0.0-beta.313",
+    "@webex/plugin-meetings": "3.0.0-beta.314",
+    "@webex/test-helper-chai": "3.0.0-beta.314",
+    "@webex/test-helper-mocha": "3.0.0-beta.314",
+    "@webex/test-helper-mock-webex": "3.0.0-beta.314",
+    "@webex/test-helper-retry": "3.0.0-beta.314",
+    "@webex/test-helper-test-users": "3.0.0-beta.314",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "jsdom-global": "3.0.2",
@@ -46,19 +46,19 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@webex/common": "3.0.0-beta.313",
+    "@webex/common": "3.0.0-beta.314",
     "@webex/internal-media-core": "2.2.1",
-    "@webex/internal-plugin-conversation": "3.0.0-beta.313",
-    "@webex/internal-plugin-device": "3.0.0-beta.313",
-    "@webex/internal-plugin-llm": "3.0.0-beta.313",
-    "@webex/internal-plugin-mercury": "3.0.0-beta.313",
-    "@webex/internal-plugin-metrics": "3.0.0-beta.313",
-    "@webex/internal-plugin-support": "3.0.0-beta.313",
-    "@webex/internal-plugin-user": "3.0.0-beta.313",
-    "@webex/media-helpers": "3.0.0-beta.313",
-    "@webex/plugin-people": "3.0.0-beta.313",
-    "@webex/plugin-rooms": "3.0.0-beta.313",
-    "@webex/webex-core": "3.0.0-beta.313",
+    "@webex/internal-plugin-conversation": "3.0.0-beta.314",
+    "@webex/internal-plugin-device": "3.0.0-beta.314",
+    "@webex/internal-plugin-llm": "3.0.0-beta.314",
+    "@webex/internal-plugin-mercury": "3.0.0-beta.314",
+    "@webex/internal-plugin-metrics": "3.0.0-beta.314",
+    "@webex/internal-plugin-support": "3.0.0-beta.314",
+    "@webex/internal-plugin-user": "3.0.0-beta.314",
+    "@webex/media-helpers": "3.0.0-beta.314",
+    "@webex/plugin-people": "3.0.0-beta.314",
+    "@webex/plugin-rooms": "3.0.0-beta.314",
+    "@webex/webex-core": "3.0.0-beta.314",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",

package/src/meeting/index.ts

@@ -5924,9 +5924,17 @@ export default class Meeting extends StatelessWebexPlugin {
     bundlePolicy?: BundlePolicy
   ): Promise<void> {
     this.retriedWithTurnServer = true;
+    const LOG_HEADER = 'Meeting:index#addMedia():retryWithForcedTurnDiscovery -->';
 
     await this.cleanUpBeforeRetryWithTurnServer();
 
+    if (this.state === MEETING_STATE.STATES.LEFT) {
+      LoggerProxy.logger.info(
+        `${LOG_HEADER} meeting state was LEFT after first attempt to establish media connection. Attempting to rejoin. `
+      );
+      await this.join({rejoin: true});
+    }
+
     await this.retryEstablishMediaConnectionWithForcedTurnDiscovery(
       remoteMediaManagerConfig,
       bundlePolicy

package/test/unit/spec/meeting/index.js

@@ -1992,6 +1992,90 @@ describe('plugin-meetings', () => {
           assert.isNotOk(errorThrown);
         });
 
+        it('should call join if state is LEFT after first media connection attempt', async () => {
+          const FAKE_TURN_URL = 'turns:webex.com:3478';
+          const FAKE_TURN_USER = 'some-turn-username';
+          const FAKE_TURN_PASSWORD = 'some-password';
+          let errorThrown = undefined;
+
+          meeting.meetingState = 'ACTIVE';
+          meeting.state = 'LEFT';
+          meeting.roap.doTurnDiscovery = sinon.stub().onFirstCall().returns({
+            turnServerInfo: undefined,
+            turnDiscoverySkippedReason: 'reachability',
+          }).onSecondCall().returns({
+            turnServerInfo: {
+              url: FAKE_TURN_URL,
+              username: FAKE_TURN_USER,
+              password: FAKE_TURN_PASSWORD,
+            },
+            turnDiscoverySkippedReason: undefined,
+          });
+          meeting.mediaProperties.waitForMediaConnectionConnected = sinon.stub().onFirstCall().rejects().onSecondCall().resolves();
+          meeting.join = sinon.stub().resolves();
+
+          const closeMediaConnectionStub = sinon.stub();
+          Media.createMediaConnection = sinon.stub().returns({
+            close: closeMediaConnectionStub,
+            getConnectionState: sinon.stub().returns(ConnectionState.Connected),
+            initiateOffer: sinon.stub().resolves({}),
+            on: sinon.stub(),
+          });
+
+          await meeting
+            .addMedia({
+              mediaSettings: {},
+            })
+            .catch((err) => {
+              errorThrown = err;
+            });
+
+          assert.isNotOk(errorThrown);
+          assert.calledOnceWithExactly(meeting.join, {rejoin: true});
+        });
+
+        it('should reject if join attempt fails if state is LEFT after first media connection attempt', async () => {
+          const FAKE_TURN_URL = 'turns:webex.com:3478';
+          const FAKE_TURN_USER = 'some-turn-username';
+          const FAKE_TURN_PASSWORD = 'some-password';
+          let errorThrown = undefined;
+
+          meeting.meetingState = 'ACTIVE';
+          meeting.state = 'LEFT';
+          meeting.roap.doTurnDiscovery = sinon.stub().onFirstCall().returns({
+            turnServerInfo: undefined,
+            turnDiscoverySkippedReason: 'reachability',
+          }).onSecondCall().returns({
+            turnServerInfo: {
+              url: FAKE_TURN_URL,
+              username: FAKE_TURN_USER,
+              password: FAKE_TURN_PASSWORD,
+            },
+            turnDiscoverySkippedReason: undefined,
+          });
+          meeting.mediaProperties.waitForMediaConnectionConnected = sinon.stub().onFirstCall().rejects().onSecondCall().resolves();
+          meeting.join = sinon.stub().rejects();
+
+          const closeMediaConnectionStub = sinon.stub();
+          Media.createMediaConnection = sinon.stub().returns({
+            close: closeMediaConnectionStub,
+            getConnectionState: sinon.stub().returns(ConnectionState.Connected),
+            initiateOffer: sinon.stub().resolves({}),
+            on: sinon.stub(),
+          });
+
+          await meeting
+            .addMedia({
+              mediaSettings: {},
+            })
+            .catch((err) => {
+              errorThrown = err;
+            });
+
+          assert.isOk(errorThrown);
+          assert.calledOnceWithExactly(meeting.join, {rejoin: true});
+        });
+
         it('should send ADD_MEDIA_SUCCESS metrics', async () => {
           meeting.meetingState = 'ACTIVE';
           meeting.webex.meetings.reachability = {