@webex/plugin-meetings 3.0.0-beta.157 → 3.0.0-beta.159

package/src/meeting/index.ts

@@ -160,7 +160,7 @@ export type AddMediaOptions = {
 
 export const MEDIA_UPDATE_TYPE = {
   TRANSCODED_MEDIA_CONNECTION: 'TRANSCODED_MEDIA_CONNECTION',
-  LAMBDA: 'LAMBDA',
+  SHARE_FLOOR_REQUEST: 'SHARE_FLOOR_REQUEST',
   UPDATE_MEDIA: 'UPDATE_MEDIA',
 };
 
@@ -1213,6 +1213,16 @@ export default class Meeting extends StatelessWebexPlugin {
     };
   }
 
+  /**
+   * returns meeting is joined
+   * @private
+   * @memberof Meeting
+   * @returns {Boolean}
+   */
+  private isJoined() {
+    return this.joinedWith?.state === 'JOINED';
+  }
+
   /**
    * Fetches meeting information.
    * @param {Object} options
@@ -1502,14 +1512,16 @@ export default class Meeting extends StatelessWebexPlugin {
     });
 
     this.breakouts.on(BREAKOUTS.EVENTS.ASK_RETURN_TO_MAIN, () => {
-      Trigger.trigger(
-        this,
-        {
-          file: 'meeting/index',
-          function: 'setUpBreakoutsListener',
-        },
-        EVENT_TRIGGERS.MEETING_BREAKOUTS_ASK_RETURN_TO_MAIN
-      );
+      if (this.isJoined()) {
+        Trigger.trigger(
+          this,
+          {
+            file: 'meeting/index',
+            function: 'setUpBreakoutsListener',
+          },
+          EVENT_TRIGGERS.MEETING_BREAKOUTS_ASK_RETURN_TO_MAIN
+        );
+      }
     });
 
     this.breakouts.on(BREAKOUTS.EVENTS.LEAVE_BREAKOUT, () => {
@@ -4178,7 +4190,7 @@ export default class Meeting extends StatelessWebexPlugin {
     // @ts-ignore - Fix type
     const {url, info: {datachannelUrl} = {}} = this.locusInfo;
 
-    const isJoined = this.joinedWith && this.joinedWith.state === 'JOINED';
+    const isJoined = this.isJoined();
 
     // @ts-ignore - Fix type
     if (this.webex.internal.llm.isConnected()) {
@@ -5196,11 +5208,7 @@ export default class Meeting extends StatelessWebexPlugin {
       )
       .then(() => {
         if (localTracks?.screenShare?.video) {
-          this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.LAMBDA, {
-            lambda: async () => {
-              return this.requestScreenShareFloor();
-            },
-          });
+          this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.SHARE_FLOOR_REQUEST);
         }
       })
       .then(() => this.mediaProperties.getCurrentConnectionType())
@@ -5296,12 +5304,7 @@ export default class Meeting extends StatelessWebexPlugin {
    * @private
    * @memberof Meeting
    */
-  private enqueueMediaUpdate(mediaUpdateType: string, options: any): Promise<void> {
-    if (mediaUpdateType === MEDIA_UPDATE_TYPE.LAMBDA && typeof options?.lambda !== 'function') {
-      return Promise.reject(
-        new Error('lambda must be specified when enqueuing MEDIA_UPDATE_TYPE.LAMBDA')
-      );
-    }
+  private enqueueMediaUpdate(mediaUpdateType: string, options: any = {}): Promise<void> {
     const canUpdateMediaNow = this.canUpdateMedia();
 
     return new Promise((resolve, reject) => {
@@ -5365,8 +5368,8 @@ export default class Meeting extends StatelessWebexPlugin {
         case MEDIA_UPDATE_TYPE.TRANSCODED_MEDIA_CONNECTION:
           mediaUpdate = this.updateTranscodedMediaConnection();
           break;
-        case MEDIA_UPDATE_TYPE.LAMBDA:
-          mediaUpdate = options.lambda();
+        case MEDIA_UPDATE_TYPE.SHARE_FLOOR_REQUEST:
+          mediaUpdate = this.requestScreenShareFloor();
           break;
         case MEDIA_UPDATE_TYPE.UPDATE_MEDIA:
           mediaUpdate = this.updateMedia(options);
@@ -6641,7 +6644,7 @@ export default class Meeting extends StatelessWebexPlugin {
     LoggerProxy.logger.info(`${LOG_HEADER} starting`);
 
     if (!this.canUpdateMedia()) {
-      return this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.TRANSCODED_MEDIA_CONNECTION, {});
+      return this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.TRANSCODED_MEDIA_CONNECTION);
     }
 
     return this.mediaProperties.webrtcMediaConnection
@@ -6770,11 +6773,7 @@ export default class Meeting extends StatelessWebexPlugin {
       // we're sending the http request to Locus to request the screen share floor
       // only after the SDP update, because that's how it's always been done for transcoded meetings
       // and also if sharing from the start, we need confluence to have been created
-      await this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.LAMBDA, {
-        lambda: async () => {
-          return this.requestScreenShareFloor();
-        },
-      });
+      await this.enqueueMediaUpdate(MEDIA_UPDATE_TYPE.SHARE_FLOOR_REQUEST);
     }
   }
 

package/src/meetings/index.ts

@@ -261,6 +261,9 @@ export default class Meetings extends WebexPlugin {
     const isSelfMoved = newLocus?.self?.state === _LEFT_ && newLocus?.self?.reason === _MOVED_;
     // @ts-ignore
     const deviceFromNewLocus = MeetingsUtil.getThisDevice(newLocus, this.webex.internal.device.url);
+    const isResourceMovedOnThisDevice =
+      deviceFromNewLocus?.state === _LEFT_ && deviceFromNewLocus?.reason === _MOVED_;
+
     const isNewLocusJoinThisDevice = MeetingsUtil.joinedOnThisDevice(
       meeting,
       newLocus,
@@ -300,9 +303,16 @@ export default class Meetings extends WebexPlugin {
 
       return false;
     }
-    if (isSelfMoved && newLocus?.self?.removed) {
+    if (isSelfMoved && (newLocus?.self?.removed || isResourceMovedOnThisDevice)) {
+      LoggerProxy.logger.log(
+        'Meetings:index#isNeedHandleMainLocus --> self moved main locus with self removed status or with device resource moved, not need to handle'
+      );
+
+      return false;
+    }
+    if (isSelfJoined && isResourceMovedOnThisDevice) {
       LoggerProxy.logger.log(
-        'Meetings:index#isNeedHandleMainLocus --> self moved main locus with self removed status, not need to handle'
+        'Meetings:index#isNeedHandleMainLocus --> self device left&moved in main locus with self joined status, not need to handle'
       );
 
       return false;

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

@@ -2710,6 +2710,19 @@ describe('plugin-meetings', () => {
         });
       });
 
+      describe("#isJoined", () => {
+        it("should returns isJoined correctly", () => {
+          meeting.joinedWith = undefined;
+          assert.equal(meeting.isJoined(), false);
+
+          meeting.joinedWith = {state: "NOT_JOINED"};
+          assert.equal(meeting.isJoined(), false);
+          
+          meeting.joinedWith = {state: "JOINED"};
+          assert.equal(meeting.isJoined(), true);
+        });
+      });
+
       describe('#fetchMeetingInfo', () => {
         const FAKE_DESTINATION = 'something@somecompany.com';
         const FAKE_TYPE = _SIP_URI_;
@@ -4463,8 +4476,16 @@ describe('plugin-meetings', () => {
           );
         });
 
+        it('should not trigger ASK_RETURN_TO_MAIN before joined', () => {
+          TriggerProxy.trigger.reset();
+          meeting.joinedWith = {state: "NOT_JOINED"};
+          meeting.breakouts.trigger('ASK_RETURN_TO_MAIN');
+          assert.notCalled(TriggerProxy.trigger);
+        });
+
         it('listens to the ask return to main event from breakouts and triggers the ask return to main event from meeting', () => {
           TriggerProxy.trigger.reset();
+          meeting.joinedWith = {state: "JOINED"};
           meeting.breakouts.trigger('ASK_RETURN_TO_MAIN');
           assert.calledWith(
             TriggerProxy.trigger,

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

@@ -1083,7 +1083,7 @@ describe('plugin-meetings', () => {
               'meeting:meetingInfoAvailable'
             );
           };
-          
+
           it('creates the meeting from a successful meeting info fetch promise testing', async () => {
             const meeting = await webex.meetings.createMeeting('test destination', 'test type');
 
@@ -1104,7 +1104,7 @@ describe('plugin-meetings', () => {
                 permissionToken: 'PT',
                 meetingJoinUrl: 'meetingJoinUrl',
               };
-  
+
               assert.instanceOf(
                 meeting,
                 Meeting,
@@ -1112,7 +1112,7 @@ describe('plugin-meetings', () => {
               );
               checkCreateWithoutDelay(meeting, 'test destination', 'test type', infoExtraParamsProvided ? infoExtraParams : {}, expectedMeetingData);
             });
-  
+
             it(`creates the meeting from a successful meeting info fetch with random delay${infoExtraParamsProvided ? ' with infoExtraParams' : ''}`, async () => {
               const FAKE_LOCUS_MEETING = {
                 conversationUrl: 'locusConvURL',
@@ -1129,14 +1129,14 @@ describe('plugin-meetings', () => {
                   active: false,
                 },
               };
-  
+
               const meeting = await webex.meetings.createMeeting(
                 FAKE_LOCUS_MEETING,
                 'test type',
                 true,
                 infoExtraParams
               );
-  
+
               assert.instanceOf(
                 meeting,
                 Meeting,
@@ -1144,7 +1144,7 @@ describe('plugin-meetings', () => {
               );
               assert.notCalled(webex.meetings.meetingInfo.fetchMeetingInfo);
               assert.calledOnce(setTimeoutSpy);
-  
+
               // Parse meeting info with locus object
               assert.equal(meeting.conversationUrl, 'locusConvURL');
               assert.equal(meeting.locusUrl, 'locusUrl');
@@ -1153,7 +1153,7 @@ describe('plugin-meetings', () => {
               assert.isUndefined(meeting.meetingJoinUrl);
               assert.equal(meeting.owner, 'locusOwner');
               assert.isUndefined(meeting.permissionToken);
-  
+
               // Add meeting and send trigger
               assert.calledWith(MeetingsUtil.getMeetingAddedType, 'test type');
               assert.calledTwice(TriggerProxy.trigger);
@@ -1170,7 +1170,7 @@ describe('plugin-meetings', () => {
                   type: 'test meeting added type',
                 }
               );
-  
+
               // When timer expires
               clock.tick(FAKE_TIME_TO_START);
               assert.calledWith(
@@ -1183,7 +1183,7 @@ describe('plugin-meetings', () => {
                 undefined,
                 infoExtraParamsProvided ? infoExtraParams : {}
               );
-  
+
               // Parse meeting info is called again with new meeting info
               await testUtils.flushPromises();
               assert.equal(meeting.conversationUrl, 'locusConvURL');
@@ -1193,7 +1193,7 @@ describe('plugin-meetings', () => {
               assert.equal(meeting.meetingJoinUrl, 'meetingJoinUrl');
               assert.equal(meeting.owner, 'locusOwner');
               assert.equal(meeting.permissionToken, 'PT');
-  
+
               assert.calledWith(
                 TriggerProxy.trigger,
                 meeting,
@@ -1744,7 +1744,41 @@ describe('plugin-meetings', () => {
         assert.equal(result, false);
         assert.calledWith(
           LoggerProxy.logger.log,
-          'Meetings:index#isNeedHandleMainLocus --> self moved main locus with self removed status, not need to handle'
+          'Meetings:index#isNeedHandleMainLocus --> self moved main locus with self removed status or with device resource moved, not need to handle'
+        );
+      });
+
+      it('check self is moved and device resource removed, return false', () => {
+        webex.meetings.meetingCollection.getActiveBreakoutLocus = sinon.stub().returns(null);
+        newLocus.self.state = 'LEFT';
+        newLocus.self.reason = 'MOVED';
+        sinon.stub(MeetingsUtil, 'getThisDevice').returns({
+          state: 'LEFT',
+          reason: 'MOVED',
+        });
+        LoggerProxy.logger.log = sinon.stub();
+        const result = webex.meetings.isNeedHandleMainLocus(meeting, newLocus);
+        assert.equal(result, false);
+        assert.calledWith(
+          LoggerProxy.logger.log,
+          'Meetings:index#isNeedHandleMainLocus --> self moved main locus with self removed status or with device resource moved, not need to handle'
+        );
+      });
+
+      it('check self is joined but device resource removed, return false', () => {
+        webex.meetings.meetingCollection.getActiveBreakoutLocus = sinon.stub().returns(null);
+        sinon.stub(MeetingsUtil, 'joinedOnThisDevice').returns(false);
+        newLocus.self.state = 'JOINED';
+        sinon.stub(MeetingsUtil, 'getThisDevice').returns({
+          state: 'LEFT',
+          reason: 'MOVED',
+        });
+        LoggerProxy.logger.log = sinon.stub();
+        const result = webex.meetings.isNeedHandleMainLocus(meeting, newLocus);
+        assert.equal(result, false);
+        assert.calledWith(
+          LoggerProxy.logger.log,
+          'Meetings:index#isNeedHandleMainLocus --> self device left&moved in main locus with self joined status, not need to handle'
         );
       });
     });