@webex/plugin-meetings 3.0.0-beta.39 → 3.0.0-beta.391

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

@@ -39,7 +39,7 @@ describe('plugin-meetings', () => {
               name: 'Breakout session 2',
               groupId: '0e73abb8-5584-49d8-be8d-806d2a8247ca',
               sessionId: '1cf41ab1-2e57-4d95-b7e9-5613acddfb0f',
-              sessionType: 'BREAKOUT'
+              sessionType: 'BREAKOUT',
             },
           ],
           allowed: [
@@ -47,9 +47,9 @@ describe('plugin-meetings', () => {
               name: 'Breakout session 2',
               groupId: '0e73abb8-5584-49d8-be8d-806d2a8247ca',
               sessionId: '1cf41ab1-2e57-4d95-b7e9-5613acddfb0f',
-              sessionType: 'BREAKOUT'
+              sessionType: 'BREAKOUT',
             },
-          ]
+          ],
         });
       });
 
@@ -76,9 +76,12 @@ describe('plugin-meetings', () => {
       });
     });
 
-    describe('getBreakouts', () => {
+    describe('getBreakoutSessions', () => {
       it('should return breakout sessions', () => {
-        assert.deepEqual(SelfUtils.getBreakouts({controls: {breakout: {sessions: 'SESSIONS'}}}), 'SESSIONS');
+        assert.deepEqual(
+          SelfUtils.getBreakoutSessions({controls: {breakout: {sessions: 'SESSIONS'}}}),
+          'SESSIONS'
+        );
       });
     });
 
@@ -91,10 +94,11 @@ describe('plugin-meetings', () => {
                 name: 'Breakout session 2',
                 groupId: '0e73abb8-5584-49d8-be8d-806d2a8247ca',
                 sessionId: '1cf41ab1-2e57-4d95-b7e9-5613acddfb0f',
-                sessionType: 'BREAKOUT'
+                sessionType: 'BREAKOUT',
               },
-            ]
-          }
+            ],
+          },
+          breakout: {},
         };
         const previous = {
           breakoutSessions: {
@@ -103,10 +107,11 @@ describe('plugin-meetings', () => {
                 name: 'Breakout session 2',
                 groupId: '0e73abb8-5584-49d8-be8d-806d2a8247ca',
                 sessionId: '1cf41ab1-2e57-4d95-b7e9-5613acddfb0f',
-                sessionType: 'BREAKOUT'
+                sessionType: 'BREAKOUT',
               },
-            ]
-          }
+            ],
+          },
+          breakout: {},
         };
 
         assert.isTrue(SelfUtils.breakoutsChanged(previous, current));
@@ -120,10 +125,11 @@ describe('plugin-meetings', () => {
                 name: 'Breakout session 2',
                 groupId: '0e73abb8-5584-49d8-be8d-806d2a8247ca',
                 sessionId: '1cf41ab1-2e57-4d95-b7e9-5613acddfb0f',
-                sessionType: 'BREAKOUT'
+                sessionType: 'BREAKOUT',
               },
-            ]
-          }
+            ],
+          },
+          breakout: {},
         };
         const previous = {
           breakoutSessions: {
@@ -132,10 +138,33 @@ describe('plugin-meetings', () => {
                 name: 'Breakout session 2',
                 groupId: '0e73abb8-5584-49d8-be8d-806d2a8247ca',
                 sessionId: '1cf41ab1-2e57-4d95-b7e9-5613acddfb0f',
-                sessionType: 'BREAKOUT'
+                sessionType: 'BREAKOUT',
               },
-            ]
-          }
+            ],
+          },
+          breakout: {},
+        };
+
+        assert.isFalse(SelfUtils.breakoutsChanged(previous, current));
+      });
+
+      it('should return false if no breakouts in current', () => {
+        const current = {
+          breakoutSessions: {
+          },
+        };
+        const previous = {
+          breakoutSessions: {
+            active: [
+              {
+                name: 'Breakout session 2',
+                groupId: '0e73abb8-5584-49d8-be8d-806d2a8247ca',
+                sessionId: '1cf41ab1-2e57-4d95-b7e9-5613acddfb0f',
+                sessionType: 'BREAKOUT',
+              },
+            ],
+          },
+          breakout: {},
         };
 
         assert.isFalse(SelfUtils.breakoutsChanged(previous, current));
@@ -222,6 +251,55 @@ describe('plugin-meetings', () => {
           assert.equal(updates.canNotViewTheParticipantListChanged, false);
         });
       });
+
+      describe('localAudioUnmuteRequestedByServer', () => {
+        it('should return localAudioUnmuteRequestedByServer = false when requestedToUnmute = false', () => {
+          const clonedSelf = cloneDeep(self);
+
+          const {updates} = SelfUtils.getSelves(self, clonedSelf);
+
+          assert.equal(updates.localAudioUnmuteRequestedByServer, false);
+        });
+
+        it('should return localAudioUnmuteRequestedByServer = true when first request is made with requestedToUnmute = true', () => {
+          const clonedSelf = cloneDeep(self);
+
+          //request to unmute with timestamp
+          clonedSelf.controls.audio.requestedToUnmute = true;
+          clonedSelf.controls.audio.lastModifiedRequestedToUnmute = '2023-06-16T18:25:04.369Z';
+
+          const {updates} = SelfUtils.getSelves(self, clonedSelf);
+
+          assert.equal(updates.localAudioUnmuteRequestedByServer, true);
+        });
+
+        it('should return localAudioUnmuteRequestedByServer = true when requestedToUnmute = true and new requests lastModifiedRequestedToUnmute timestamp is greater than old one', () => {
+          self.controls.audio.requestedToUnmute = true;
+          self.controls.audio.lastModifiedRequestedToUnmute = '2023-06-16T18:25:04.369Z';
+          const clonedSelf = cloneDeep(self);
+
+          //request to unmute with timestamp
+          clonedSelf.controls.audio.requestedToUnmute = true;
+          clonedSelf.controls.audio.lastModifiedRequestedToUnmute = '2023-06-16T19:25:04.369Z';
+
+          const {updates} = SelfUtils.getSelves(self, clonedSelf);
+
+          assert.equal(updates.localAudioUnmuteRequestedByServer, true);
+        });
+
+        it('should return localAudioUnmuteRequestedByServer = false when requestedToUnmute but lastModifiedRequestedToUnmute timestamps are same', () => {
+          self.controls.audio.requestedToUnmute = true;
+          self.controls.audio.lastModifiedRequestedToUnmute = '2023-06-16T18:25:04.369Z';
+          const clonedSelf = cloneDeep(self);
+
+          clonedSelf.controls.audio.requestedToUnmute = true;
+          clonedSelf.controls.audio.lastModifiedRequestedToUnmute = '2023-06-16T18:25:04.369Z'
+
+          const {updates} = SelfUtils.getSelves(self, clonedSelf);
+
+          assert.equal(updates.localAudioUnmuteRequestedByServer, false);
+        });
+      });
     });
 
     describe('isSharingBlocked', () => {
@@ -266,4 +344,117 @@ describe('plugin-meetings', () => {
       assert.deepEqual(SelfUtils.isJoined(customSelf), false);
     });
   });
+
+  describe('videoMutedByOthersChanged', () => {
+    it('returns true if changed', () => {
+      assert.equal(
+        SelfUtils.videoMutedByOthersChanged({remoteVideoMuted: true}, {remoteVideoMuted: false}),
+        true
+      );
+    });
+
+    it('returns true if changed from undefined', () => {
+      assert.equal(SelfUtils.videoMutedByOthersChanged({}, {remoteVideoMuted: false}), true);
+    });
+
+    it('returns false if not changed', () => {
+      assert.equal(
+        SelfUtils.videoMutedByOthersChanged({remoteVideoMuted: false}, {remoteVideoMuted: false}),
+        false
+      );
+    });
+  });
+
+  describe('getReplacedBreakoutMoveId', () => {
+    const deviceId = 'https://wdm-a.wbx2.com/wdm/api/v1/devices/20eabde3-4254-48da-9a24';
+    const breakoutMoveId = 'e5caeb2c-ffcc-4e06-a08a-1122e7710398';
+    const clonedSelf = cloneDeep(self);
+
+    it('get breakoutMoveId works', () => {
+
+      assert.deepEqual(SelfUtils.getReplacedBreakoutMoveId(self, deviceId), breakoutMoveId);
+
+    });
+
+    it('replaces is empty', () => {
+
+      clonedSelf.devices[0].replaces = undefined;
+      assert.deepEqual(SelfUtils.getReplacedBreakoutMoveId(clonedSelf, deviceId), null);
+
+    });
+
+    it('no self or self.devices is not array', () => {
+
+      assert.deepEqual(SelfUtils.getReplacedBreakoutMoveId(undefined, deviceId), null);
+
+      clonedSelf.devices =     {
+        url: 'https://wdm-a.wbx2.com/wdm/api/v1/devices/20eabde3-4254-48da-9a24',
+        deviceType: 'WEB',
+        mediaSessionsExternal: false,
+        replaces: [
+          {
+            breakoutMoveId: 'e5caeb2c-ffcc-4e06-a08a-1122e7710398',
+            lastActive: '2023-05-04T07:14:32.068Z',
+            locusUrl: 'https://locus-alpha-apdx.prod.meetapi.webex.com/locus/api/v1/loci/495061ca-7b3c-3b77-85ff-4e1bd58600d1',
+            replacedAt: '2023-05-04T07:16:04.905Z',
+            sessionId: 'be3147d4-c318-86d8-7611-8d24beaaca8d',
+          }
+        ],
+        state: 'JOINED',
+      };
+      assert.deepEqual(SelfUtils.getReplacedBreakoutMoveId(clonedSelf, deviceId), null);
+    });
+  });
+
+  describe('isRolesChanged', () => {
+    it('should return false if new self is null', () => {
+      const parsedSelf = SelfUtils.parse(self);
+
+      assert.deepEqual(SelfUtils.isRolesChanged(parsedSelf, null), false);
+    });
+
+    it('should return true if self roles has changed', () => {
+      const parsedSelf = SelfUtils.parse(self);
+      const clonedSelf = cloneDeep(parsedSelf);
+
+      clonedSelf.roles = ['COHOST'];
+
+      assert.deepEqual(SelfUtils.isRolesChanged(parsedSelf, clonedSelf), true);
+    });
+
+    it('should return false if self roles has not changed', () => {
+      const parsedSelf = SelfUtils.parse(self);
+      const clonedSelf = cloneDeep(parsedSelf);
+
+      clonedSelf.roles = ['PRESENTER'];
+
+      assert.deepEqual(SelfUtils.isRolesChanged(parsedSelf, clonedSelf), false);
+    });
+  });
+
+  describe('interpretationChanged', () => {
+    it('should return false if new self is null', () => {
+      const parsedSelf = SelfUtils.parse(self);
+
+      assert.deepEqual(SelfUtils.interpretationChanged(parsedSelf, null), false);
+    });
+
+    it('should return true if interpretation info has changed', () => {
+      const parsedSelf = SelfUtils.parse(self);
+      const clonedSelf = cloneDeep(parsedSelf);
+
+      clonedSelf.interpretation.sourceLanguage = 'ja';
+
+      assert.deepEqual(SelfUtils.interpretationChanged(parsedSelf, clonedSelf), true);
+    });
+
+    it('should return false if interpretation info  has not changed', () => {
+      const parsedSelf = SelfUtils.parse(self);
+      const clonedSelf = cloneDeep(parsedSelf);
+
+      clonedSelf.interpretation.sourceLanguage = 'en';
+
+      assert.deepEqual(SelfUtils.interpretationChanged(parsedSelf, clonedSelf), false);
+    });
+  });
 });

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

@@ -3,20 +3,46 @@ import Media from '@webex/plugin-meetings/src/media/index';
 import {assert} from '@webex/test-helper-chai';
 import sinon from 'sinon';
 import StaticConfig from '@webex/plugin-meetings/src/common/config';
+import {forEach} from 'lodash';
+import MockWebex from '@webex/test-helper-mock-webex';
 
 describe('createMediaConnection', () => {
+  const webex = MockWebex();
+
   const fakeRoapMediaConnection = {
     id: 'roap media connection',
   };
-  const fakeAudioTrack = {
-    id: 'audio track',
-    underlyingTrack: 'underlying audio track',
+  const fakeTrack = {
+    id: 'any fake track'
+  }
+  const fakeAudioStream = {
+    outputStream: {
+      getTracks: () => {
+        return [fakeTrack];
+      }
+    }
   };
-  const fakeVideoTrack = {
-    id: 'video track',
-    underlyingTrack: 'underlying video track',
+  const fakeVideoStream = {
+    outputStream: {
+      getTracks: () => {
+        return [fakeTrack];
+      }
+    }
+  };
+  const fakeShareVideoStream = {
+    outputStream: {
+      getTracks: () => {
+        return [fakeTrack];
+      }
+    }
+  };
+  const fakeShareAudioStream = {
+    outputStream: {
+      getTracks: () => {
+        return [fakeTrack];
+      }
+    }
   };
-
   afterEach(() => {
     sinon.restore();
   });
@@ -31,19 +57,20 @@ describe('createMediaConnection', () => {
     const ENABLE_EXTMAP = false;
     const ENABLE_RTX = true;
 
-    Media.createMediaConnection(false, 'some debug id', {
+    Media.createMediaConnection(false, 'some debug id', webex, 'meetingId', 'correlationId', {
       mediaProperties: {
         mediaDirection: {
-          sendAudio: true,
+          sendAudio: false,
           sendVideo: true,
           sendShare: false,
-          receiveAudio: true,
+          receiveAudio: false,
           receiveVideo: true,
           receiveShare: true,
         },
-        audioTrack: fakeAudioTrack,
-        videoTrack: fakeVideoTrack,
-        shareTrack: null,
+        audioStream: fakeAudioStream,
+        videoStream: fakeVideoStream,
+        shareVideoTrack: null,
+        shareAudioTrack: null,
       },
       remoteQualityLevel: 'HIGH',
       enableRtx: ENABLE_RTX,
@@ -81,17 +108,18 @@ describe('createMediaConnection', () => {
         },
       },
       {
-        send: {
-          audio: fakeAudioTrack.underlyingTrack,
-          video: fakeVideoTrack.underlyingTrack,
+        localTracks: {
+          audio: fakeTrack,
+          video: fakeTrack,
           screenShareVideo: undefined,
+          screenShareAudio: undefined,
         },
-        receive: {
-          audio: true,
-          video: true,
-          screenShareVideo: true,
-          remoteQualityLevel: 'HIGH',
+        direction: {
+          audio: 'inactive',
+          video: 'sendrecv',
+          screenShareVideo: 'recvonly',
         },
+        remoteQualityLevel: 'HIGH',
       },
       'some debug id'
     );
@@ -102,12 +130,23 @@ describe('createMediaConnection', () => {
       .stub(internalMediaModule, 'MultistreamRoapMediaConnection')
       .returns(fakeRoapMediaConnection);
 
-    Media.createMediaConnection(true, 'some debug id', {
+    Media.createMediaConnection(true, 'some debug id', webex, 'meeting id', 'correlationId', {
+      mediaProperties: {
+        mediaDirection: {
+          sendAudio: true,
+          sendVideo: true,
+          sendShare: false,
+          receiveAudio: true,
+          receiveVideo: true,
+          receiveShare: true,
+        },
+      },
       turnServerInfo: {
         url: 'turn server url',
         username: 'turn username',
         password: 'turn password',
       },
+      bundlePolicy: 'max-bundle',
     });
     assert.calledOnce(multistreamRoapMediaConnectionConstructorStub);
     assert.calledWith(
@@ -120,90 +159,143 @@ describe('createMediaConnection', () => {
             credential: 'turn password',
           },
         ],
+        bundlePolicy: 'max-bundle',
       },
-      'some debug id'
+      'meeting id'
     );
   });
 
-  it('passes empty ICE servers array to MultistreamRoapMediaConnection if turnServerInfo is undefined (multistream enabled)', () => {
+  [
+    {testCase: 'turnServerInfo is undefined', turnServerInfo: undefined},
+    {testCase: 'turnServerInfo.url is empty string', turnServerInfo: {url: '', username: 'turn username', password: 'turn password'}},
+  ].forEach(({testCase, turnServerInfo}) => {
+    it(`passes empty ICE servers array to MultistreamRoapMediaConnection if ${testCase} (multistream enabled)`, () => {
+      const multistreamRoapMediaConnectionConstructorStub = sinon
+        .stub(internalMediaModule, 'MultistreamRoapMediaConnection')
+        .returns(fakeRoapMediaConnection);
+  
+      Media.createMediaConnection(true, 'debug string', webex, 'meeting id', 'correlationId', {
+        mediaProperties: {
+          mediaDirection: {
+            sendAudio: true,
+            sendVideo: true,
+            sendShare: false,
+            receiveAudio: true,
+            receiveVideo: true,
+            receiveShare: true,
+          },
+        },
+        turnServerInfo,
+      });
+      assert.calledOnce(multistreamRoapMediaConnectionConstructorStub);
+      assert.calledWith(
+        multistreamRoapMediaConnectionConstructorStub,
+        {
+          iceServers: [],
+        },
+        'meeting id'
+        );
+    });
+  });
+      
+  it('does not pass bundlePolicy to MultistreamRoapMediaConnection if bundlePolicy is undefined', () => {
     const multistreamRoapMediaConnectionConstructorStub = sinon
       .stub(internalMediaModule, 'MultistreamRoapMediaConnection')
       .returns(fakeRoapMediaConnection);
 
-    Media.createMediaConnection(true, 'debug string', {});
-    assert.calledOnce(multistreamRoapMediaConnectionConstructorStub);
-    assert.calledWith(
-      multistreamRoapMediaConnectionConstructorStub,
-      {
-        iceServers: [],
-      },
-      'debug string'
-    );
-  });
-
-  it('passes empty ICE servers array to RoapMediaConnection if turnServerInfo is undefined (multistream disabled)', () => {
-    const roapMediaConnectionConstructorStub = sinon
-      .stub(internalMediaModule, 'RoapMediaConnection')
-      .returns(fakeRoapMediaConnection);
-
-    StaticConfig.set({bandwidth: {audio: 123, video: 456, startBitrate: 999}});
-
-    const ENABLE_EXTMAP = false;
-    const ENABLE_RTX = true;
-
-    Media.createMediaConnection(false, 'some debug id', {
+    Media.createMediaConnection(true, 'debug string', webex, 'meeting id', 'correlationId', {
       mediaProperties: {
         mediaDirection: {
           sendAudio: true,
           sendVideo: true,
-          sendShare: true,
+          sendShare: false,
           receiveAudio: true,
           receiveVideo: true,
           receiveShare: true,
         },
-        audioTrack: fakeAudioTrack,
-        videoTrack: null,
-        shareTrack: fakeVideoTrack,
       },
-      remoteQualityLevel: 'HIGH',
-      enableRtx: ENABLE_RTX,
-      enableExtmap: ENABLE_EXTMAP,
-      turnServerInfo: undefined,
+      bundlePolicy: undefined,
     });
-    assert.calledOnce(roapMediaConnectionConstructorStub);
+    assert.calledOnce(multistreamRoapMediaConnectionConstructorStub);
     assert.calledWith(
-      roapMediaConnectionConstructorStub,
+      multistreamRoapMediaConnectionConstructorStub,
       {
         iceServers: [],
-        skipInactiveTransceivers: false,
-        requireH264: true,
-        sdpMunging: {
-          convertPort9to0: false,
-          addContentSlides: true,
-          bandwidthLimits: {
-            audio: 123,
-            video: 456,
+      },
+      'meeting id'
+    );
+  });
+
+  [
+    {testCase: 'turnServerInfo is undefined', turnServerInfo: undefined},
+    {testCase: 'turnServerInfo.url is empty string', turnServerInfo: {url: '', username: 'turn username', password: 'turn password'}},
+  ].forEach(({testCase, turnServerInfo}) => {
+    it(`passes empty ICE servers array to RoapMediaConnection if ${testCase} (multistream disabled)`, () => {
+      const roapMediaConnectionConstructorStub = sinon
+        .stub(internalMediaModule, 'RoapMediaConnection')
+        .returns(fakeRoapMediaConnection);
+
+      StaticConfig.set({bandwidth: {audio: 123, video: 456, startBitrate: 999}});
+
+      const ENABLE_EXTMAP = false;
+      const ENABLE_RTX = true;
+
+      Media.createMediaConnection(false, 'some debug id', webex, 'meeting id', 'correlationId', {
+        mediaProperties: {
+          mediaDirection: {
+            sendAudio: true,
+            sendVideo: true,
+            sendShare: true,
+            receiveAudio: true,
+            receiveVideo: true,
+            receiveShare: true,
           },
-          startBitrate: 999,
-          periodicKeyframes: 20,
-          disableExtmap: !ENABLE_EXTMAP,
-          disableRtx: !ENABLE_RTX,
+          audioStream: fakeAudioStream,
+          videoStream: null,
+          shareVideoStream: fakeShareVideoStream,
+          shareAudioStream: fakeShareAudioStream,
         },
-      },
-      {
-        send: {
-          audio: fakeAudioTrack.underlyingTrack,
-          video: undefined,
-          screenShareVideo: fakeVideoTrack.underlyingTrack,
+        remoteQualityLevel: 'HIGH',
+        enableRtx: ENABLE_RTX,
+        enableExtmap: ENABLE_EXTMAP,
+        turnServerInfo,
+      });
+      assert.calledOnce(roapMediaConnectionConstructorStub);
+      assert.calledWith(
+        roapMediaConnectionConstructorStub,
+        {
+          iceServers: [],
+          skipInactiveTransceivers: false,
+          requireH264: true,
+          sdpMunging: {
+            convertPort9to0: false,
+            addContentSlides: true,
+            bandwidthLimits: {
+              audio: 123,
+              video: 456,
+            },
+            startBitrate: 999,
+            periodicKeyframes: 20,
+            disableExtmap: !ENABLE_EXTMAP,
+            disableRtx: !ENABLE_RTX,
+          },
         },
-        receive: {
-          audio: true,
-          video: true,
-          screenShareVideo: true,
+        {
+          localTracks: {
+            audio: fakeTrack,
+            video: undefined,
+            screenShareVideo: fakeTrack,
+            screenShareAudio: fakeTrack,
+          },
+          direction: {
+            audio: 'sendrecv',
+            video: 'sendrecv',
+            screenShareVideo: 'sendrecv',
+          },
           remoteQualityLevel: 'HIGH',
         },
-      },
-      'some debug id'
-    );
+        'some debug id'
+      );
+    });
   });
 });

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

@@ -4,7 +4,7 @@ import {ConnectionState, Event} from '@webex/internal-media-core';
 import MediaProperties from '@webex/plugin-meetings/src/media/properties';
 import MediaUtil from '@webex/plugin-meetings/src/media/util';
 import testUtils from '../../../utils/testUtils';
-import {PC_BAIL_TIMEOUT} from '@webex/plugin-meetings/src/constants';
+import {ICE_AND_DTLS_CONNECTION_TIMEOUT} from '@webex/plugin-meetings/src/constants';
 import {Defer} from '@webex/common';
 
 describe('MediaProperties', () => {
@@ -52,7 +52,7 @@ describe('MediaProperties', () => {
       assert.equal(promiseResolved, false);
       assert.equal(promiseRejected, false);
 
-      await clock.tickAsync(PC_BAIL_TIMEOUT);
+      await clock.tickAsync(ICE_AND_DTLS_CONNECTION_TIMEOUT);
       await testUtils.flushPromises();
 
       assert.equal(promiseResolved, false);