@webex/plugin-meetings 3.0.0-beta.65 → 3.0.0-beta.67

package/test/unit/spec/locus-info/index.js

@@ -504,6 +504,7 @@ describe('plugin-meetings', () => {
             selfIdentity: '123',
             selfId: '2',
             hostId: '3',
+            isReplace: undefined,
           }
         );
         // note: in a real use case, recordingId, selfId, and hostId would all be the same
@@ -511,6 +512,43 @@ describe('plugin-meetings', () => {
         // are being correctly grabbed from locusInfo.parsedLocus within updateParticipants
       });
 
+      it('should call with breakout control info', () => {
+        locusInfo.parsedLocus = {
+          controls: {
+            record: {
+              modifiedBy: '1',
+            },
+          },
+          self: {
+            selfIdentity: '123',
+            selfId: '2',
+          },
+          host: {
+            hostId: '3',
+          },
+        };
+
+        locusInfo.emitScoped = sinon.stub();
+        locusInfo.updateParticipants({}, true);
+
+        assert.calledWith(
+          locusInfo.emitScoped,
+          {
+            file: 'locus-info',
+            function: 'updateParticipants',
+          },
+          EVENTS.LOCUS_INFO_UPDATE_PARTICIPANTS,
+          {
+            participants: {},
+            recordingId: '1',
+            selfIdentity: '123',
+            selfId: '2',
+            hostId: '3',
+            isReplace: true,
+          }
+        );
+      });
+
       it('should update the deltaParticipants object', () => {
         const prev = locusInfo.deltaParticipants;
 
@@ -1444,6 +1482,31 @@ describe('plugin-meetings', () => {
           assert.calledOnce(locusInfo.locusParser.resume);
         });
       });
+
+      it('onDeltaLocus handle delta data', () => {
+        fakeLocus.participants = {};
+        const fakeBreakout = {
+          sessionId: 'sessionId',
+          groupId: 'groupId',
+        };
+
+        fakeLocus.controls = {
+          breakout: fakeBreakout
+        };
+        locusInfo.controls = {
+          breakout: {
+            sessionId: 'sessionId',
+            groupId: 'groupId',
+          }
+        }
+        locusInfo.updateParticipants = sinon.stub();
+        locusInfo.onDeltaLocus(fakeLocus);
+        assert.calledWith(locusInfo.updateParticipants, {}, false);
+
+        fakeBreakout.sessionId = 'sessionId2';
+        locusInfo.onDeltaLocus(fakeLocus);
+        assert.calledWith(locusInfo.updateParticipants, {}, false);
+      });
     });
 
     describe('#handleOneonOneEvent', () => {

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

@@ -48,5 +48,19 @@ describe('plugin-meetings', () => {
         assert.deepEqual(meetingCollection.getByKey('value', 'test'), {value: 'test', id: uuid1});
       });
     });
+
+    describe('#getActiveBreakoutLocus', () => {
+      beforeEach(() => {
+        meetingCollection.meetings.test = {breakouts: {url: 'url', isActiveBreakout: true}, id: uuid1};
+      });
+      it('return null if empty breakoutUrl', () => {
+        assert.deepEqual(meetingCollection.getActiveBreakoutLocus(), null);
+      });
+
+      it('should get the meeting which joined breakout by breakoutUrl', () => {
+        assert.deepEqual(meetingCollection.getActiveBreakoutLocus('url'), {
+          breakouts: {url: 'url', isActiveBreakout: true}, id: uuid1});
+      });
+    });
   });
 });

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

@@ -11,6 +11,7 @@ import sinon from 'sinon';
 import uuid from 'uuid';
 import StaticConfig from '@webex/plugin-meetings/src/common/config';
 import TriggerProxy from '@webex/plugin-meetings/src/common/events/trigger-proxy';
+import LoggerProxy from '@webex/plugin-meetings/src/common/logs/logger-proxy';
 import LoggerConfig from '@webex/plugin-meetings/src/common/logs/logger-config';
 import Meeting from '@webex/plugin-meetings/src/meeting';
 import MeetingUtil from '@webex/plugin-meetings/src/meeting/util';
@@ -478,7 +479,7 @@ describe('plugin-meetings', () => {
             it('tests the sync meeting calls for not existing meeting', async () => {
               await webex.meetings.syncMeetings();
               assert.calledOnce(webex.meetings.request.getActiveMeetings);
-              assert.callCount(webex.meetings.meetingCollection.getByKey, 4);
+              assert.callCount(webex.meetings.meetingCollection.getByKey, 5);
               assert.calledOnce(initialSetup);
               assert.calledOnce(webex.meetings.create);
               assert.calledWith(webex.meetings.request.getActiveMeetings);
@@ -709,6 +710,7 @@ describe('plugin-meetings', () => {
         });
         describe('there was not a meeting', () => {
           let initialSetup;
+          const webExMeetingId = '123456';
 
           beforeEach(() => {
             initialSetup = sinon.stub().returns(true);
@@ -735,12 +737,16 @@ describe('plugin-meetings', () => {
                     callbackAddress: uri1,
                   },
                 },
+                info: {
+                  webExMeetingId
+                },
               },
               eventType: 'locus.difference',
               locusUrl: url1,
             });
-            assert.callCount(webex.meetings.meetingCollection.getByKey, 5);
+            assert.callCount(webex.meetings.meetingCollection.getByKey, 6);
             assert.calledWith(webex.meetings.meetingCollection.getByKey, 'locusUrl', url1);
+            assert.calledWith(webex.meetings.meetingCollection.getByKey, 'meetingNumber', webExMeetingId);
             assert.calledOnce(initialSetup);
             assert.calledWith(initialSetup, {
               id: uuid1,
@@ -754,6 +760,9 @@ describe('plugin-meetings', () => {
                   callbackAddress: uri1,
                 },
               },
+              info: {
+                webExMeetingId
+              },
             });
           });
           it('should setup the meeting by difference event without replaces', async () => {
@@ -765,12 +774,16 @@ describe('plugin-meetings', () => {
                     callbackAddress: uri1,
                   },
                 },
+                info: {
+                  webExMeetingId
+                },
               },
               eventType: 'locus.difference',
               locusUrl: url1,
             });
-            assert.callCount(webex.meetings.meetingCollection.getByKey, 4);
+            assert.callCount(webex.meetings.meetingCollection.getByKey, 5);
             assert.calledWith(webex.meetings.meetingCollection.getByKey, 'locusUrl', url1);
+            assert.calledWith(webex.meetings.meetingCollection.getByKey, 'meetingNumber', webExMeetingId);
             assert.calledOnce(initialSetup);
             assert.calledWith(initialSetup, {
               id: uuid1,
@@ -779,6 +792,9 @@ describe('plugin-meetings', () => {
                   callbackAddress: uri1,
                 },
               },
+              info: {
+                webExMeetingId
+              },
             });
           });
           it('should setup the meeting by a not difference event', async () => {
@@ -790,12 +806,16 @@ describe('plugin-meetings', () => {
                     callbackAddress: uri1,
                   },
                 },
+                info: {
+                  webExMeetingId
+                },
               },
               eventType: test1,
               locusUrl: url1,
             });
-            assert.callCount(webex.meetings.meetingCollection.getByKey, 4);
+            assert.callCount(webex.meetings.meetingCollection.getByKey, 5);
             assert.calledWith(webex.meetings.meetingCollection.getByKey, 'locusUrl', url1);
+            assert.calledWith(webex.meetings.meetingCollection.getByKey, 'meetingNumber', webExMeetingId);
             assert.calledOnce(initialSetup);
             assert.calledWith(initialSetup, {
               id: uuid1,
@@ -804,6 +824,9 @@ describe('plugin-meetings', () => {
                   callbackAddress: uri1,
                 },
               },
+              info: {
+                webExMeetingId
+              },
             });
           });
 
@@ -826,7 +849,7 @@ describe('plugin-meetings', () => {
 
           it('should not try to match USM meetings by conversation url', async () => {
             await webex.meetings.handleLocusEvent(generateFakeLocusData(true));
-            assert.callCount(webex.meetings.meetingCollection.getByKey, 3);
+            assert.callCount(webex.meetings.meetingCollection.getByKey, 4);
             assert.deepEqual(webex.meetings.meetingCollection.getByKey.getCall(0).args, [
               'locusUrl',
               url1,
@@ -843,7 +866,7 @@ describe('plugin-meetings', () => {
           });
           it('should try to match non-USM meetings by conversation url', async () => {
             await webex.meetings.handleLocusEvent(generateFakeLocusData(false));
-            assert.callCount(webex.meetings.meetingCollection.getByKey, 4);
+            assert.callCount(webex.meetings.meetingCollection.getByKey, 5);
             assert.deepEqual(webex.meetings.meetingCollection.getByKey.getCall(0).args, [
               'locusUrl',
               url1,
@@ -1368,5 +1391,159 @@ describe('plugin-meetings', () => {
         );
       });
     });
+
+    describe('#isNeedHandleMainLocus', () => {
+      let meeting;
+      let newLocus;
+      beforeEach(() => {
+        meeting = {
+          controls: {},
+          self: {},
+        };
+        newLocus = {
+          controls: {},
+          self: {},
+        }
+      });
+      afterEach(() => {
+        sinon.restore();
+      });
+      it('check normal case will return true', () => {
+        sinon.stub(webex.meetings.meetingCollection, 'getActiveBreakoutLocus').returns(null);
+        LoggerProxy.logger.log = sinon.stub();
+        const result = webex.meetings.isNeedHandleMainLocus(meeting, newLocus);
+        assert.equal(result, true);
+        assert.calledWith(
+          LoggerProxy.logger.log,
+          'Meetings:index#isNeedHandleMainLocus --> this is a normal main session locusDTO update case'
+        );
+      });
+
+      it('check self joined and joined on this device, return true', () => {
+        sinon.stub(webex.meetings.meetingCollection, 'getActiveBreakoutLocus').returns(null);
+        newLocus.self.state = 'JOINED';
+        sinon.stub(MeetingsUtil, 'joinedOnThisDevice').returns(true);
+
+        LoggerProxy.logger.log = sinon.stub();
+        const result = webex.meetings.isNeedHandleMainLocus(meeting, newLocus);
+        assert.equal(result, true);
+        assert.calledWith(
+          LoggerProxy.logger.log,
+          'Meetings:index#isNeedHandleMainLocus --> self this device shown as JOINED in the main session'
+        );
+      });
+
+      it('if newLocus replaceAt time is expired, then return false', () => {
+        sinon.stub(webex.meetings.meetingCollection, 'getActiveBreakoutLocus').returns({joinedWith: {replaces: [{
+              replaceAt: '2023-03-27T02:17:02.506Z',
+            }]}});
+        newLocus.self.state = 'JOINED';
+        sinon.stub(MeetingsUtil, 'joinedOnThisDevice').returns(true);
+        sinon.stub(MeetingsUtil, 'getThisDevice').returns({
+          replaces: [{
+            replaceAt: '2023-03-27T02:17:01.506Z'
+          }]
+        })
+
+        LoggerProxy.logger.log = sinon.stub();
+        const result = webex.meetings.isNeedHandleMainLocus(meeting, newLocus);
+        assert.equal(result, false);
+        assert.calledWith(
+          LoggerProxy.logger.log,
+          `Meetings:index#isNeedHandleMainLocus --> this is expired main joined status locus_dto replacedAt 2023-03-27T02:17:01.506Z bo replacedAt 2023-03-27T02:17:02.506Z`
+        );
+      });
+
+      it('check current is in breakout join with this device, return false', () => {
+        sinon.stub(webex.meetings.meetingCollection, 'getActiveBreakoutLocus').returns({
+          joinedWith: {
+            correlationId: '111',
+          },
+        });
+        newLocus.controls.breakout = {url: 'url'};
+        meeting.correlationId = '111';
+
+        LoggerProxy.logger.log = sinon.stub();
+        const result = webex.meetings.isNeedHandleMainLocus(meeting, newLocus);
+        assert.equal(result, false);
+        assert.calledWith(
+          LoggerProxy.logger.log,
+          `Meetings:index#isNeedHandleMainLocus --> there is active breakout session and joined on this device, and don't need to handle main session: url`
+        );
+      });
+
+      it('check self is moved and removed, return false', () => {
+        webex.meetings.meetingCollection.getActiveBreakoutLocus = sinon.stub().returns(null);
+        newLocus.self.state = 'LEFT';
+        newLocus.self.reason = 'MOVED';
+        newLocus.self.removed = true;
+        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, not need to handle'
+        );
+      });
+    });
+
+    describe('#isNeedHandleLocusDTO', () => {
+      let meeting;
+      let newLocus;
+      beforeEach(() => {
+        meeting = {
+          controls: {},
+          self: {},
+        };
+        newLocus = {
+          controls: {},
+          self: {},
+        }
+      });
+      afterEach(() => {
+        sinon.restore();
+      });
+      it('initial DTO , joined breakout session, return true', () => {
+        newLocus.controls.breakout = {
+          sessionType: 'BREAKOUT',
+        };
+        newLocus.self.state = 'JOINED';
+        newLocus.fullState = {
+          active: true,
+        };
+        LoggerProxy.logger.log = sinon.stub();
+        const result = webex.meetings.isNeedHandleLocusDTO(null, newLocus);
+        assert.equal(result, true);
+        assert.calledWith(
+          LoggerProxy.logger.log,
+          `Meetings:index#isNeedHandleLocusDTO --> the first breakout session locusDTO active status: true`
+        );
+      });
+      it('others go to check isNeedHandleMainLocus', () => {
+        newLocus.controls.breakout = {
+          sessionType: 'MAIN',
+        };
+        newLocus.self.state = 'JOINED';
+
+        LoggerProxy.logger.log = sinon.stub();
+        const result = webex.meetings.isNeedHandleLocusDTO(meeting, newLocus);
+        assert.equal(result, true);
+        assert.calledWith(
+          LoggerProxy.logger.log,
+          'Meetings:index#isNeedHandleMainLocus --> this is a normal main session locusDTO update case'
+        );
+      });
+      it('joined breakout session, self status is moved, return false', () => {
+        newLocus.controls.breakout = {
+          sessionType: 'BREAKOUT',
+        };
+        newLocus.self.state = 'LEFT';
+        newLocus.self.reason = 'MOVED';
+
+        LoggerProxy.logger.log = sinon.stub();
+        const result = webex.meetings.isNeedHandleLocusDTO(meeting, newLocus);
+        assert.equal(result, false);
+      });
+    });
   });
 });

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

@@ -62,5 +62,51 @@ describe('plugin-meetings', () => {
         assert.equal(MeetingsUtil.parseDefaultSiteFromMeetingPreferences(userPreferences), '');
       });
     });
+
+    describe('#getThisDevice', () => {
+      it('return null if no devices in self', () => {
+        const newLocus = {};
+        assert.equal(MeetingsUtil.getThisDevice(newLocus), null);
+      });
+      it('return first device as this device', () => {
+        const newLocus = {
+          self: {
+            devices: [{state: 'JOINED'}]
+          }
+        };
+        assert.deepEqual(MeetingsUtil.getThisDevice(newLocus), {state: 'JOINED'});
+      })
+    });
+
+    describe('#joinedOnThisDevice', () => {
+      it('return false if no devices in self', () => {
+        const newLocus = {};
+        assert.equal(MeetingsUtil.joinedOnThisDevice(null, newLocus), false);
+      });
+      it('return true if joined on this device', () => {
+        const newLocus = {
+          self: {
+            devices: [{state: 'JOINED', correlationId: '111'}]
+          }
+        };
+        const meeting = {
+          correlationId: '111'
+        };
+
+        assert.equal(MeetingsUtil.joinedOnThisDevice(meeting, newLocus), true);
+      });
+      it('return true if selfMoved on this device', () => {
+        const newLocus = {
+          self: {
+            devices: [{state: 'LEFT', reason: 'MOVED', correlationId: '111'}]
+          }
+        };
+        const meeting = {
+          correlationId: '111'
+        };
+
+        assert.equal(MeetingsUtil.joinedOnThisDevice(meeting, newLocus), true);
+      });
+    });
   });
 });

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

@@ -14,6 +14,8 @@ import ParameterError from '@webex/plugin-meetings/src/common/errors/parameter';
 import Meetings from '@webex/plugin-meetings';
 import Members from '@webex/plugin-meetings/src/members';
 import MembersUtil from '@webex/plugin-meetings/src/members/util';
+import Trigger from '@webex/plugin-meetings/src/common/events/trigger-proxy';
+import {EVENT_TRIGGERS} from "@webex/plugin-meetings/src/constants";
 
 const {assert} = chai;
 
@@ -205,6 +207,42 @@ describe('plugin-meetings', () => {
       });
     });
 
+    describe('#clearMembers', () => {
+      it('should send clear event if clear members', () => {
+        const members = createMembers({url: url1});
+        members.membersCollection.setAll(fakeMembersCollection);
+        Trigger.trigger = sinon.stub();
+        members.clearMembers();
+        assert.deepEqual(members.membersCollection.members, {});
+        assert.calledWith(Trigger.trigger, members, {
+          file: 'members',
+          function: 'clearMembers',
+        }, EVENT_TRIGGERS.MEMBERS_CLEAR, {})
+      });
+    });
+    describe('#locusParticipantsUpdate', () => {
+      it('should send member update event with session info', () => {
+        const members = createMembers({url: url1});
+        Trigger.trigger = sinon.stub();
+        const fakePayload = {
+          participants: {
+            forEach: sinon.stub(),
+          },
+          isReplace: true,
+        };
+
+        members.locusParticipantsUpdate(fakePayload);
+
+        assert.calledWith(Trigger.trigger, members, {
+          file: 'members',
+          function: 'locusParticipantsUpdate',
+        }, EVENT_TRIGGERS.MEMBERS_UPDATE, {
+          delta: {added: [], updated: []},
+          full: {},
+          isReplace: true,
+        })
+      });
+    });
     describe('#sendDialPadKey', () => {
       it('should throw a rejection when calling sendDialPadKey with no tones', async () => {
         const members = createMembers({url: url1});

package/test/unit/spec/multistream/mediaRequestManager.ts

@@ -552,28 +552,28 @@ describe('MediaRequestManager', () => {
     ]);
   });
 
-  it('clears all the requests on reset()', () => {
+  it('avoids sending duplicate requests and clears all the requests on reset()', () => {
     // send some requests and commit them one by one
-    addReceiverSelectedRequest(1500, fakeReceiveSlots[0], RECEIVER_SELECTED_MAX_FS, true);
-    addReceiverSelectedRequest(1501, fakeReceiveSlots[1], RECEIVER_SELECTED_MAX_FS, true);
+    addReceiverSelectedRequest(1500, fakeReceiveSlots[0], RECEIVER_SELECTED_MAX_FS, false);
+    addReceiverSelectedRequest(1501, fakeReceiveSlots[1], RECEIVER_SELECTED_MAX_FS, false);
     addActiveSpeakerRequest(
       255,
       [fakeReceiveSlots[2], fakeReceiveSlots[3], fakeReceiveSlots[4]],
       ACTIVE_SPEAKER_MAX_FS,
-      true
+      false
     );
     addActiveSpeakerRequest(
       254,
       [fakeReceiveSlots[5], fakeReceiveSlots[6], fakeReceiveSlots[7]],
       ACTIVE_SPEAKER_MAX_FS,
-      true
+      false
     );
 
-    sendMediaRequestsCallback.resetHistory();
+    // nothing should be sent out as we didn't commit the requests
+    assert.notCalled(sendMediaRequestsCallback);
 
-    // check that when calling commit() all requests are re-sent again
-    mediaRequestManager.commit();
 
+    mediaRequestManager.commit();
     checkMediaRequestsSent([
       {
         policy: 'receiver-selected',
@@ -601,6 +601,13 @@ describe('MediaRequestManager', () => {
       },
     ]);
 
+
+    // check that when calling commit()
+    // all requests are not re-sent again (avoid duplicate requests)
+    mediaRequestManager.commit();
+
+    assert.notCalled(sendMediaRequestsCallback);
+
     // now reset everything
     mediaRequestManager.reset();
 
@@ -609,6 +616,46 @@ describe('MediaRequestManager', () => {
     checkMediaRequestsSent([]);
   });
 
+  it('makes sure to call requests correctly after reset was called and another request was added', () => {
+    addReceiverSelectedRequest(1500, fakeReceiveSlots[0], RECEIVER_SELECTED_MAX_FS, false);
+
+    assert.notCalled(sendMediaRequestsCallback);
+
+
+    mediaRequestManager.commit();
+    checkMediaRequestsSent([
+      {
+        policy: 'receiver-selected',
+        csi: 1500,
+        receiveSlot: fakeWcmeSlots[0],
+        maxFs: RECEIVER_SELECTED_MAX_FS,
+      },
+    ]);
+
+    // now reset everything
+    mediaRequestManager.reset();
+
+     // calling commit now should not cause any requests to be sent out
+     mediaRequestManager.commit();
+     checkMediaRequestsSent([]);
+
+     //add new request
+    addReceiverSelectedRequest(1501, fakeReceiveSlots[1], RECEIVER_SELECTED_MAX_FS, false);
+
+    // commit
+    mediaRequestManager.commit();
+
+    // check the new request was sent
+    checkMediaRequestsSent([
+      {
+        policy: 'receiver-selected',
+        csi: 1501,
+        receiveSlot: fakeWcmeSlots[1],
+        maxFs: RECEIVER_SELECTED_MAX_FS,
+      },
+    ])
+  })
+
   it('re-sends media requests after degradation preferences are set', () => {
     // set max macroblocks limit
     mediaRequestManager.setDegradationPreferences({maxMacroblocksLimit: 32400});