@webex/plugin-meetings 2.20.1 → 2.20.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/plugin-meetings",
-  "version": "2.20.1",
+  "version": "2.20.2",
   "description": "",
   "license": "MIT",
   "contributors": [
@@ -24,15 +24,15 @@
   },
   "dependencies": {
     "@babel/runtime-corejs2": "^7.14.8",
-    "@webex/webex-core": "2.20.1",
-    "@webex/internal-plugin-mercury": "2.20.1",
-    "@webex/internal-plugin-conversation": "2.20.1",
+    "@webex/webex-core": "2.20.2",
+    "@webex/internal-plugin-mercury": "2.20.2",
+    "@webex/internal-plugin-conversation": "2.20.2",
     "webrtc-adapter": "^7.7.0",
     "lodash": "^4.17.21",
     "uuid": "^3.3.2",
     "global": "^4.4.0",
     "ip-anonymize": "^0.1.0",
-    "@webex/common": "2.20.1",
+    "@webex/common": "2.20.2",
     "bowser": "^2.11.0",
     "sdp-transform": "^2.12.0",
     "btoa": "^1.2.1",

package/test/integration/spec/journey.js

@@ -247,14 +247,14 @@ skipInNode(describe)('plugin-meetings', () => {
         .then(() => assert(enumerateSpy.called)));
 
       it('bob joins the meeting', () => {
-        bob.meeting.acknowledge('INCOMING');
-
         const checkBobIsInMeeting = (event) => !!event.delta.updated.find((member) => bob.meeting.members.selfId === member.id && member.status === 'IN_MEETING');
 
-        return bob.meeting.join()
-          .then(() => testUtils.waitForEvents([{
+        return Promise.all([
+          bob.meeting.acknowledge('INCOMING').then(() => bob.meeting.join()),
+          testUtils.waitForEvents([{
             scope: alice.meeting.members, event: 'members:update', user: alice, match: checkBobIsInMeeting
-          }]));
+          }])
+        ]);
       });
 
       it('bob adds media to the meeting', () => Promise.all([
@@ -688,12 +688,7 @@ skipInNode(describe)('plugin-meetings', () => {
 
           return Promise.all([
             testUtils.delayedPromise(chris.meeting.join()),
-            testUtils.waitForEvents([{scope: alice.meeting.members, event: 'members:update'}])
-              .then((response) => {
-                const chrisParticipant = response[0].result.delta.updated.find((member) => member.participant.identity === chris.id);
-
-                assert.equal(chrisParticipant.status, 'IN_MEETING');
-              })
+            testUtils.waitForEvents([{scope: alice.meeting.members, event: 'members:update', match: testUtils.checkParticipantUpdatedStatus(chris, 'IN_MEETING')}])
           ])
             .then(() => {
               assert.equal(alice.meeting.members.membersCollection.get(chris.meeting.members.selfId).participant.state, 'JOINED');
@@ -704,12 +699,7 @@ skipInNode(describe)('plugin-meetings', () => {
         })
         .then(() => Promise.all([
           testUtils.delayedPromise(chris.meeting.leave()),
-          testUtils.waitForEvents([{scope: alice.meeting.members, event: 'members:update'}])
-            .then((response) => {
-              const chrisParticipant = response[0].result.delta.updated.find((member) => member.participant.identity === chris.id);
-
-              assert.equal(chrisParticipant.status, 'NOT_IN_MEETING');
-            })
+          testUtils.waitForEvents([{scope: alice.meeting.members, event: 'members:update', match: testUtils.checkParticipantUpdatedStatus(chris, 'NOT_IN_MEETING')}])
         ]))
         .catch((e) => {
           console.error('Error chris joining the meeting ', e);

package/test/integration/spec/space-meeting.js

@@ -2,6 +2,7 @@
 import {assert} from '@webex/test-helper-chai';
 import {skipInNode, jenkinsOnly} from '@webex/test-helper-mocha';
 import {patterns} from '@webex/common';
+
 import MeetingInfoUtil from '@webex/plugin-meetings/src/meeting-info/utilv2';
 
 import CMR from '../../utils/cmr';
@@ -152,32 +153,18 @@ skipInNode(describe)('plugin-meetings', () => {
       .then(() => testUtils.addMedia(guest))
       .catch((e) => { console.error('Error chris joining the meeting ', e); throw e; }));
 
-    it('alice Leaves the meeting', () =>
-      Promise.all([
-        testUtils.delayedPromise(alice.meeting.leave()),
-        testUtils.waitForEvents([{scope: chris.meeting.members, event: 'members:update'}])
-          .then((response) => {
-            const aliceParticipant = response[0].result.delta.updated.find((member) => alice.meeting.members.selfId === member.id);
-
-            assert.equal(aliceParticipant.status, 'NOT_IN_MEETING');
-          })
-      ]).then(() => testUtils.waitForStateChange(alice.meeting, 'LEFT')));
-
-    it('bob and chris leave meeting', () => Promise.all([
-      testUtils.delayedPromise(bob.meeting.leave()),
-      testUtils.waitForEvents([{scope: chris.meeting.members, event: 'members:update'}])
-        .then((response) => {
-          const bobParticipant = response[0].result.delta.updated.find((member) => bob.meeting.members.selfId === member.id);
-
-          assert.equal(bobParticipant.status, 'NOT_IN_MEETING');
-        })
-    ]).then(() => testUtils.waitForStateChange(bob.meeting, 'LEFT'))
-      .then(() => {
-        console.log('CHRIS MEETING', chris.meeting.locusInfo);
+    it('alice Leaves the meeting', () => Promise.all([
+      testUtils.delayedPromise(alice.meeting.leave()),
+      testUtils.waitForEvents([{scope: chris.meeting.members, event: 'members:update', match: testUtils.checkParticipantUpdatedStatus(alice, 'NOT_IN_MEETING')}])
+    ]).then(() => testUtils.waitForStateChange(alice.meeting, 'LEFT')));
 
-        return chris.meeting.leave();
-      })
-      .then(() => testUtils.waitUntil(4000)));
+    it('bob and chris leave meeting', () =>
+      Promise.all([
+        testUtils.delayedPromise(bob.meeting.leave()),
+        testUtils.waitForEvents([{scope: chris.meeting.members, event: 'members:update', match: testUtils.checkParticipantUpdatedStatus(bob, 'NOT_IN_MEETING')}])
+      ]).then(() => testUtils.waitForStateChange(bob.meeting, 'LEFT'))
+        .then(() => chris.meeting.leave())
+        .then(() => testUtils.waitUntil(4000)));
 
 
     it('check for meeting cleanup', () => {
@@ -323,13 +310,10 @@ skipInNode(describe)('plugin-meetings', () => {
           return Promise.all([
             testUtils.delayedPromise(guest.meeting.join()),
             testUtils.waitForEvents([{scope: guest.meeting, event: 'meeting:self:lobbyWaiting'}]),
-            testUtils.waitForEvents([{scope: alice.meeting.members, event: 'members:update'}])
-              .then((response) => {
-                const guestParticipant = response[0].result.delta.updated.find((member) => guest.meeting.members.selfId === member.id);
-
-                assert.equal(guestParticipant.status, 'IN_LOBBY');
+            testUtils.waitForEvents([{scope: alice.meeting.members, event: 'members:update', match: testUtils.checkParticipantUpdatedStatus(guest, 'IN_LOBBY')}])
+              .then(() => {
                 Promise.all([
-                  testUtils.delayedPromise(alice.meeting.admit(guestParticipant.id)),
+                  testUtils.delayedPromise(alice.meeting.admit(guest.meeting.members.selfId)),
                   testUtils.waitForEvents([{scope: guest.meeting, event: 'meeting:self:guestAdmitted'}])
                 ]);
               })
@@ -337,17 +321,12 @@ skipInNode(describe)('plugin-meetings', () => {
             .then(() => testUtils.waitForStateChange(guest.meeting, 'JOINED'))
             .then(() => testUtils.addMedia(guest));
         })
+        .catch((e) => { console.error('Error guest joining the meeting ', e); throw e; })
         .then(() => Promise.all([
           testUtils.delayedPromise(chris.meeting.leave()),
-          testUtils.waitForEvents([{scope: alice.meeting.members, event: 'members:update'}])
-            .then((response) => {
-              console.log('CHRIS RESPONSE ', response[0]);
-              const chrisParticipant = response[0].result.delta.updated.find((member) => chris.meeting.members.selfId === member.id);
-
-              assert.equal(chrisParticipant.status, 'NOT_IN_MEETING');
-            })
+          testUtils.waitForEvents([{scope: alice.meeting.members, event: 'members:update', match: testUtils.checkParticipantUpdatedStatus(chris, 'NOT_IN_MEETING')}])
         ]))
-        .catch((e) => { console.error('Error chris joining the meeting ', e); throw e; }));
+        .catch((e) => { console.error('Error chris leaving the meeting ', e); throw e; }));
 
       it('leave claimed PMR', () => alice.meeting.leave()
         .then(() => bob.meeting.leave())

package/test/utils/testUtils.js

@@ -1,4 +1,5 @@
 import {assert} from '@webex/test-helper-chai';
+import {Defer} from '@webex/common';
 
 const max = 30000;
 const waitForSpy = (spy, event) => {
@@ -192,12 +193,18 @@ const delayedTest = (callback, timeout) => new Promise((resolve) => {
 });
 
 const addMedia = (user) => {
-  const mediaReadyEvent = {};
+  const mediaReadyPromises = {
+    local: new Defer(),
+    remoteAudio: new Defer(),
+    remoteVideo: new Defer(),
+  };
   const mediaReady = (media) => {
     if (!media) {
       return;
     }
-    mediaReadyEvent[media.type] = media.type;
+    if (mediaReadyPromises[media.type]) {
+      mediaReadyPromises[media.type].resolve();
+    }
   };
 
   user.meeting.on('media:ready', mediaReady);
@@ -219,13 +226,11 @@ const addMedia = (user) => {
       localShare,
       localStream
     }))
-    .then(() => delayedTest(() => {
-      assert.exists(mediaReadyEvent.local, 'local stream event not triggered');
-      assert.exists(mediaReadyEvent.remoteAudio, 'remoteAudio event not triggered');
-      assert.exists(mediaReadyEvent.remoteVideo, 'remoteVideo event not triggered');
+    .then(() => Promise.all(Object.values(mediaReadyPromises).map((defer) => defer.promise)))
+    .then(() => {
       assert.exists(user.meeting.mediaProperties.audioTrack, 'audioTrack not present');
       assert.exists(user.meeting.mediaProperties.videoTrack, 'videoTrack not present');
-    }, 10000));
+    });
 };
 
 const waitUntil = (waitTime) => new Promise((resolve) => {
@@ -252,12 +257,17 @@ const getCircularReplacer = () => {
   };
 };
 
+// this function is meant to be used as the "match" callback with waitForEvents()
+// when you want to wait for a particular users's status to reach a certain value
+const checkParticipantUpdatedStatus = (user, expectedStatus) => (event) => !!event.delta.updated.find((member) => user.meeting.members.selfId === member.id && member.status === expectedStatus);
+
 export default {
   waitForSpy,
   waitForStateChange,
   waitForCallEnded,
   syncAndEndMeeting,
   waitForEvents,
+  checkParticipantUpdatedStatus,
   delayedPromise,
   addMedia,
   waitUntil,