@webex/plugin-meetings 3.0.0-beta.170 → 3.0.0-beta.172

package/test/integration/spec/journey.js

@@ -657,7 +657,7 @@ skipInNode(describe)('plugin-meetings', () => {
         await startedSharingRemote;
         await bobReceivesMembersUpdate;
 
-        assert.equal(alice.meeting.isSharing, true);
+        assert.equal(alice.meeting.screenShareFloorState, 'floor_request_granted');
         assert.equal(alice.meeting.shareStatus, 'local_share_active');
         assert.equal(bob.meeting.shareStatus, 'remote_share_active');
         console.log(
@@ -699,7 +699,7 @@ skipInNode(describe)('plugin-meetings', () => {
         localTracks.alice.screenShare.video.stop();
         localTracks.alice.screenShare.video = undefined;
 
-        assert.equal(bob.meeting.isSharing, true);
+        assert.equal(bob.meeting.screenShareFloorState, 'floor_request_granted');
         assert.equal(bob.meeting.shareStatus, 'local_share_active');
         assert.equal(alice.meeting.shareStatus, 'remote_share_active');
 
@@ -720,7 +720,7 @@ skipInNode(describe)('plugin-meetings', () => {
         localTracks.bob.screenShare.video.stop();
         localTracks.bob.screenShare.video = undefined;
 
-        assert.equal(bob.meeting.isSharing, false);
+        assert.equal(bob.meeting.screenShareFloorState, 'floor_released');
         assert.equal(bob.meeting.shareStatus, 'no_share');
         assert.equal(alice.meeting.shareStatus, 'no_share');
 
@@ -750,7 +750,7 @@ skipInNode(describe)('plugin-meetings', () => {
               );
             }),
         ]).then(() => {
-          assert.equal(alice.meeting.isSharing, false);
+          assert.equal(alice.meeting.screenShareFloorState, 'floor_released');
           assert.equal(alice.meeting.shareStatus, 'whiteboard_share_active');
           assert.equal(bob.meeting.shareStatus, 'whiteboard_share_active');
         }));
@@ -778,7 +778,7 @@ skipInNode(describe)('plugin-meetings', () => {
               );
             }),
         ]).then(() => {
-          assert.equal(bob.meeting.isSharing, false);
+          assert.equal(bob.meeting.screenShareFloorState, 'floor_released');
           assert.equal(alice.meeting.shareStatus, 'whiteboard_share_active');
           assert.equal(bob.meeting.shareStatus, 'whiteboard_share_active');
         }));
@@ -795,7 +795,7 @@ skipInNode(describe)('plugin-meetings', () => {
             {scope: alice.meeting, event: 'meeting:stoppedSharingWhiteboard'},
           ]),
         ]).then(() => {
-          assert.equal(bob.meeting.isSharing, false);
+          assert.equal(bob.meeting.screenShareFloorState, 'floor_released');
           assert.equal(bob.meeting.shareStatus, 'no_share');
           assert.equal(alice.meeting.shareStatus, 'no_share');
         }));
@@ -823,7 +823,7 @@ skipInNode(describe)('plugin-meetings', () => {
               );
             }),
         ]).then(() => {
-          assert.equal(alice.meeting.isSharing, false);
+          assert.equal(alice.meeting.screenShareFloorState, 'floor_released');
           assert.equal(alice.meeting.shareStatus, 'whiteboard_share_active');
           assert.equal(bob.meeting.shareStatus, 'whiteboard_share_active');
         }));
@@ -854,7 +854,7 @@ skipInNode(describe)('plugin-meetings', () => {
         await startedSharingRemote;
         await aliceReceivesMembersUpdate;
 
-        assert.equal(bob.meeting.isSharing, true);
+        assert.equal(bob.meeting.screenShareFloorState, 'floor_request_granted');
         assert.equal(bob.meeting.shareStatus, 'local_share_active');
         assert.equal(alice.meeting.shareStatus, 'remote_share_active');
 
@@ -884,7 +884,7 @@ skipInNode(describe)('plugin-meetings', () => {
               );
             }),
         ]).then(() => {
-          assert.equal(bob.meeting.isSharing, false);
+          assert.equal(bob.meeting.screenShareFloorState, 'floor_released');
           assert.equal(alice.meeting.shareStatus, 'whiteboard_share_active');
           assert.equal(bob.meeting.shareStatus, 'whiteboard_share_active');
         }));

package/test/unit/spec/media/index.ts

@@ -17,6 +17,14 @@ describe('createMediaConnection', () => {
     id: 'video track',
     underlyingTrack: 'underlying video track',
   };
+  const fakeShareVideoTrack = {
+    id: 'share video track',
+    underlyingTrack: 'underlying share video track',
+  };
+  const fakeShareAudioTrack = {
+    id: 'share audio track',
+    underlyingTrack: 'underlying share audio track',
+  };
 
   afterEach(() => {
     sinon.restore();
@@ -44,7 +52,8 @@ describe('createMediaConnection', () => {
         },
         audioTrack: fakeAudioTrack,
         videoTrack: fakeVideoTrack,
-        shareTrack: null,
+        shareVideoTrack: null,
+        shareAudioTrack: null,
       },
       remoteQualityLevel: 'HIGH',
       enableRtx: ENABLE_RTX,
@@ -257,7 +266,8 @@ describe('createMediaConnection', () => {
         },
         audioTrack: fakeAudioTrack,
         videoTrack: null,
-        shareTrack: fakeVideoTrack,
+        shareVideoTrack: fakeShareVideoTrack,
+        shareAudioTrack: fakeShareAudioTrack,
       },
       remoteQualityLevel: 'HIGH',
       enableRtx: ENABLE_RTX,
@@ -288,7 +298,7 @@ describe('createMediaConnection', () => {
         localTracks: {
           audio: fakeAudioTrack.underlyingTrack,
           video: undefined,
-          screenShareVideo: fakeVideoTrack.underlyingTrack,
+          screenShareVideo: fakeShareVideoTrack.underlyingTrack,
         },
         direction: {
           audio: 'sendrecv',

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

@@ -1707,6 +1707,7 @@ describe('plugin-meetings', () => {
               audio: undefined,
               video: undefined,
               screenShareVideo: undefined,
+              screenShareAudio: undefined,
             },
             direction: {
               audio: 'sendrecv',
@@ -1735,6 +1736,7 @@ describe('plugin-meetings', () => {
               audio: fakeMicrophoneTrack,
               video: undefined,
               screenShareVideo: undefined,
+              screenShareAudio: undefined,
             },
             direction: {
               audio: 'sendrecv',
@@ -1765,6 +1767,7 @@ describe('plugin-meetings', () => {
               audio: fakeMicrophoneTrack,
               video: undefined,
               screenShareVideo: undefined,
+              screenShareAudio: undefined,
             },
             direction: {
               audio: 'sendrecv',
@@ -1793,6 +1796,7 @@ describe('plugin-meetings', () => {
               audio: fakeMicrophoneTrack,
               video: undefined,
               screenShareVideo: undefined,
+              screenShareAudio: undefined,
             },
             direction: {
               audio: 'inactive',
@@ -1821,6 +1825,7 @@ describe('plugin-meetings', () => {
               audio: undefined,
               video: undefined,
               screenShareVideo: undefined,
+              screenShareAudio: undefined,
             },
             direction: {
               audio: 'inactive',
@@ -2270,7 +2275,7 @@ describe('plugin-meetings', () => {
           meeting.locusInfo.mediaShares = [{name: 'content', url: url1}];
           meeting.locusInfo.self = {url: url1};
           meeting.meetingRequest.changeMeetingFloor = sinon.stub().returns(Promise.resolve());
-          meeting.mediaProperties.shareTrack = {}
+          meeting.mediaProperties.shareVideoTrack = {};
           meeting.mediaProperties.mediaDirection.sendShare = true;
           meeting.state = 'JOINED';
         });
@@ -2337,7 +2342,7 @@ describe('plugin-meetings', () => {
           meeting.video = { enable: sinon.stub()};
           meeting.mediaProperties.audioTrack = createFakeLocalTrack();
           meeting.mediaProperties.videoTrack = createFakeLocalTrack();
-          meeting.mediaProperties.shareTrack = createFakeLocalTrack();
+          meeting.mediaProperties.shareVideoTrack = createFakeLocalTrack();
           meeting.mediaProperties.mediaDirection = {
             sendAudio: true,
             sendVideo: true,
@@ -2408,7 +2413,7 @@ describe('plugin-meetings', () => {
               localTracks: {
                 audio: meeting.mediaProperties.audioTrack.underlyingTrack,
                 video: meeting.mediaProperties.videoTrack.underlyingTrack,
-                screenShareVideo: meeting.mediaProperties.shareTrack.underlyingTrack,
+                screenShareVideo: meeting.mediaProperties.shareVideoTrack.underlyingTrack,
               },
               direction: {
                 audio: 'inactive',
@@ -3624,6 +3629,7 @@ describe('plugin-meetings', () => {
       describe('Local tracks publishing', () => {
         let audioTrack;
         let videoTrack;
+        let audioShareTrack;
         let videoShareTrack;
         let createMuteStateStub;
         let LocalDisplayTrackConstructorStub;
@@ -3646,6 +3652,12 @@ describe('plugin-meetings', () => {
             on: sinon.stub(),
             off: sinon.stub(),
           };
+          audioShareTrack = {
+            id: 'share track',
+            on: sinon.stub(),
+            off: sinon.stub(),
+            getSettings: sinon.stub(),
+          }
           videoShareTrack = {
             id: 'share track',
             on: sinon.stub(),
@@ -3734,7 +3746,18 @@ describe('plugin-meetings', () => {
               meeting.mediaProperties.webrtcMediaConnection.publishTrack,
               track
             );
-            assert.equal(meeting.mediaProperties.shareTrack, track);
+            assert.equal(meeting.mediaProperties.shareVideoTrack, track);
+            assert.equal(meeting.mediaProperties.mediaDirection.sendShare, true);
+          };
+          
+          const checkScreenShareAudioPublished = (track) => {
+            assert.calledOnce(meeting.requestScreenShareFloor);
+
+            assert.calledWith(
+              meeting.mediaProperties.webrtcMediaConnection.publishTrack,
+              track
+            );
+            assert.equal(meeting.mediaProperties.shareAudioTrack, track);
             assert.equal(meeting.mediaProperties.mediaDirection.sendShare, true);
           };
 
@@ -3744,6 +3767,31 @@ describe('plugin-meetings', () => {
             assert.calledOnce(meeting.mediaProperties.webrtcMediaConnection.publishTrack);
             checkScreenShareVideoPublished(videoShareTrack);
           });
+          
+          it('requests screen share floor and publishes the screen share audio track', async () => {
+            await meeting.publishTracks({screenShare: {audio: audioShareTrack}});
+            
+            assert.calledOnce(meeting.mediaProperties.webrtcMediaConnection.publishTrack);
+            checkScreenShareAudioPublished(audioShareTrack);
+          });
+          
+          it('does not request screen share floor when publishing video share track if already sharing audio', async () => {
+            await meeting.publishTracks({screenShare: {audio: audioShareTrack}});
+            assert.calledOnce(meeting.requestScreenShareFloor);
+            
+            meeting.requestScreenShareFloor.reset();
+            await meeting.publishTracks({screenShare: {video: videoShareTrack}});
+            assert.notCalled(meeting.requestScreenShareFloor);
+          })
+          
+          it('does not request screen share floor when publishing audio share track if already sharing video', async () => {
+            await meeting.publishTracks({screenShare: {video: videoShareTrack}});
+            assert.calledOnce(meeting.requestScreenShareFloor);
+            
+            meeting.requestScreenShareFloor.reset();
+            await meeting.publishTracks({screenShare: {audio: audioShareTrack}});
+            assert.notCalled(meeting.requestScreenShareFloor);
+          })
 
           it('updates MuteState instance and publishes the track for main audio', async () => {
             await meeting.publishTracks({microphone: audioTrack});
@@ -3765,13 +3813,15 @@ describe('plugin-meetings', () => {
               camera: videoTrack,
               screenShare: {
                 video: videoShareTrack,
+                audio: audioShareTrack,
               },
             });
 
-            assert.calledThrice(meeting.mediaProperties.webrtcMediaConnection.publishTrack);
+            assert.callCount(meeting.mediaProperties.webrtcMediaConnection.publishTrack, 4);
             checkAudioPublished(audioTrack);
             checkVideoPublished(videoTrack);
             checkScreenShareVideoPublished(videoShareTrack);
+            checkScreenShareAudioPublished(audioShareTrack);
           });
         });
         it('creates instance and publishes with annotation info', async () => {
@@ -3788,7 +3838,7 @@ describe('plugin-meetings', () => {
             await meeting.publishTracks({
               microphone: audioTrack,
               camera: videoTrack,
-              screenShare: {video: videoShareTrack},
+              screenShare: {video: videoShareTrack, audio: audioShareTrack},
             });
           });
 
@@ -3812,7 +3862,8 @@ describe('plugin-meetings', () => {
             assert.equal(meeting.mediaProperties.mediaDirection.sendVideo, 'fake value');
           };
 
-          const checkScreenShareVideoUnpublished = () => {
+          // share direction will remain true if only one of the two share tracks are unpublished
+          const checkScreenShareVideoUnpublished = (shareDirection = true) => {
             assert.calledWith(
               meeting.mediaProperties.webrtcMediaConnection.unpublishTrack,
               videoShareTrack
@@ -3820,24 +3871,38 @@ describe('plugin-meetings', () => {
 
             assert.calledOnce(meeting.requestScreenShareFloor);
 
-            assert.equal(meeting.mediaProperties.shareTrack, null);
-            assert.equal(meeting.mediaProperties.mediaDirection.sendShare, false);
+            assert.equal(meeting.mediaProperties.shareVideoTrack, null);
+            assert.equal(meeting.mediaProperties.mediaDirection.sendShare, shareDirection);
+          };
+
+          // share direction will remain true if only one of the two share tracks are unpublished
+          const checkScreenShareAudioUnpublished = (shareDirection = true) => {
+            assert.calledWith(
+              meeting.mediaProperties.webrtcMediaConnection.unpublishTrack,
+              audioShareTrack
+            );
+
+            assert.calledOnce(meeting.requestScreenShareFloor);
+
+            assert.equal(meeting.mediaProperties.shareAudioTrack, null);
+            assert.equal(meeting.mediaProperties.mediaDirection.sendShare, shareDirection);
           };
 
           it('fails if there is no media connection', async () => {
             meeting.mediaProperties.webrtcMediaConnection = undefined;
             await assert.isRejected(
-              meeting.unpublishTracks([audioTrack, videoTrack, videoShareTrack])
+              meeting.unpublishTracks([audioTrack, videoTrack, videoShareTrack, audioShareTrack])
             );
           });
 
-          it('un-publishes the tracks correctly (all 3 together)', async () => {
-            await meeting.unpublishTracks([audioTrack, videoTrack, videoShareTrack]);
+          it('un-publishes the tracks correctly (all 4 together)', async () => {
+            await meeting.unpublishTracks([audioTrack, videoTrack, videoShareTrack, audioShareTrack]);
 
-            assert.calledThrice(meeting.mediaProperties.webrtcMediaConnection.unpublishTrack);
+            assert.equal(meeting.mediaProperties.webrtcMediaConnection.unpublishTrack.callCount, 4);
             checkAudioUnpublished();
             checkVideoUnpublished();
-            checkScreenShareVideoUnpublished();
+            checkScreenShareVideoUnpublished(false);
+            checkScreenShareAudioUnpublished(false);
           });
 
           it('un-publishes the audio track correctly', async () => {
@@ -3860,6 +3925,30 @@ describe('plugin-meetings', () => {
             assert.calledOnce(meeting.mediaProperties.webrtcMediaConnection.unpublishTrack);
             checkScreenShareVideoUnpublished();
           });
+          
+          it('un-publishes the screen share audio track correctly', async () => {
+            await meeting.unpublishTracks([audioShareTrack]);
+            
+            assert.calledOnce(meeting.mediaProperties.webrtcMediaConnection.unpublishTrack);
+            checkScreenShareAudioUnpublished();
+          });
+          
+          it('releases share floor and sets send direction to false when both screen share tracks are undefined', async () => {
+            await meeting.unpublishTracks([videoShareTrack, audioShareTrack]);
+            
+            assert.calledOnce(meeting.releaseScreenShareFloor);
+            assert.equal(meeting.mediaProperties.mediaDirection.sendShare, false);
+          });
+          
+          it('does not release share floor when audio is released and video still exists', async () => {
+            await meeting.unpublishTracks([audioShareTrack]);
+            assert.notCalled(meeting.releaseScreenShareFloor);
+          });
+          
+          it('does not release share floor when video is released and audio still exists', async () => {
+            await meeting.unpublishTracks([videoShareTrack]);
+            assert.notCalled(meeting.releaseScreenShareFloor);
+          });
         });
       });
     });
@@ -3912,7 +4001,8 @@ describe('plugin-meetings', () => {
         sandbox.stub(Media, 'stopTracks').returns(Promise.resolve());
         sandbox.stub(meeting.mediaProperties, 'audioTrack').value(fakeMediaTrack());
         sandbox.stub(meeting.mediaProperties, 'videoTrack').value(fakeMediaTrack());
-        sandbox.stub(meeting.mediaProperties, 'shareTrack').value(fakeMediaTrack());
+        sandbox.stub(meeting.mediaProperties, 'shareVideoTrack').value(fakeMediaTrack());
+        sandbox.stub(meeting.mediaProperties, 'shareAudioTrack').value(fakeMediaTrack());
         sandbox.stub(meeting.mediaProperties, 'remoteAudioTrack').value(fakeMediaTrack());
         sandbox.stub(meeting.mediaProperties, 'remoteVideoTrack').value(fakeMediaTrack());
         sandbox.stub(meeting.mediaProperties, 'remoteShare').value(fakeMediaTrack());
@@ -5083,6 +5173,7 @@ describe('plugin-meetings', () => {
           meeting.meetingRequest.changeMeetingFloor = sinon.stub().returns(Promise.resolve());
         });
         it('should call changeMeetingFloor()', async () => {
+          meeting.screenShareFloorState = 'GRANTED';
           const share = meeting.releaseScreenShareFloor();
 
           assert.exists(share.then);

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

@@ -5,22 +5,21 @@ import MemberUtil from '@webex/plugin-meetings/src/member/util';
 import Member from '@webex/plugin-meetings/src/member';
 
 describe('member', () => {
+  const participant = {controls: {}, status: {}};
+
+  const member = new Member(participant);
+
   afterEach(() => {
     sinon.restore();
   });
 
   it('checks member properties', () => {
-    const member = new Member({});
     assert.exists(member.supportsInterpretation);
     assert.exists(member.supportsBreakouts);
     assert.exists(member.supportLiveAnnotation);
   });
 
   it('checks that processParticipant calls isHandRaised', () => {
-    const participant = {controls: {}};
-
-    const member = new Member({});
-
     sinon.spy(MemberUtil, 'isHandRaised');
     member.processParticipant(participant);
 
@@ -29,10 +28,6 @@ describe('member', () => {
 
   describe('roles', () => {
     it('checks that processParticipant calls processRoles', () => {
-      const participant = {};
-
-      const member = new Member({});
-
       sinon.spy(member, 'processRoles');
       member.processParticipant(participant);
 
@@ -40,14 +35,42 @@ describe('member', () => {
     });
 
     it('checks that processRoles calls extractControlRoles', () => {
-      const participant = {};
-
-      const member = new Member({});
-
       sinon.spy(MemberUtil, 'extractControlRoles');
       member.processParticipant(participant);
 
       assert.calledOnceWithExactly(MemberUtil.extractControlRoles, participant);
     });
+  });
+
+  describe('#processParticipant', () => {
+    it('checks that processParticipant calls isHandRaised', () => {
+      sinon.spy(MemberUtil, 'isHandRaised');
+      member.processParticipant(participant);
+
+      assert.calledOnceWithExactly(MemberUtil.isHandRaised, participant);
+    });
+  })
+
+  describe('#processMember', () => {
+    it('checks that processMember calls isRemovable', () => {
+      sinon.spy(MemberUtil, 'isRemovable');
+      member.processMember();
+
+      assert.calledOnce(MemberUtil.isRemovable);
+    });
+
+    it('checks that processMember calls isMutable', () => {
+      sinon.spy(MemberUtil, 'isMutable');
+      member.processMember();
+
+      assert.calledOnce(MemberUtil.isMutable);
+    });
+
+    it('checks that processMember calls extractMediaStatus', () => {
+      sinon.spy(MemberUtil, 'extractMediaStatus');
+      member.processMember();
+
+      assert.calledOnceWithExactly(MemberUtil.extractMediaStatus, participant);
+    });
   })
 });

package/test/unit/spec/member/util.js

@@ -423,3 +423,34 @@ describe('plugin-meetings', () => {
     });
   });
 });
+
+describe('extractMediaStatus', () => {
+  it('throws error when there is no participant', () => {
+    assert.throws(() => {
+      MemberUtil.extractMediaStatus()
+    }, 'Media status could not be extracted, participant is undefined.');
+  });
+
+  it('returns undefined media status when participant audio/video status is not present', () => {
+    const participant = {
+      status: {}
+    };
+    
+    const mediaStatus = MemberUtil.extractMediaStatus(participant)
+
+    assert.deepEqual(mediaStatus, {audio: undefined, video: undefined});
+  });
+
+  it('returns correct media status when participant audio/video status is present', () => {
+    const participant = {
+      status: {
+        audioStatus: 'RECVONLY',
+        videoStatus: 'SENDRECV'
+      }
+    };
+    
+    const mediaStatus = MemberUtil.extractMediaStatus(participant)
+
+    assert.deepEqual(mediaStatus, {audio: 'RECVONLY', video: 'SENDRECV'});
+  });
+});