@webex/plugin-meetings 3.8.1-next.11 → 3.8.1-next.13

package/dist/types/meeting/index.d.ts

@@ -66,6 +66,13 @@ export type AddMediaOptions = {
     remoteMediaManagerConfig?: RemoteMediaManagerConfiguration;
     bundlePolicy?: BundlePolicy;
     allowMediaInLobby?: boolean;
+    additionalMediaOptions?: AdditionalMediaOptions;
+};
+export type AdditionalMediaOptions = {
+    sendVideo?: boolean;
+    receiveVideo?: boolean;
+    sendAudio?: boolean;
+    receiveAudio?: boolean;
 };
 export type CallStateForMetrics = {
     correlationId?: string;

package/dist/webinar/index.js

@@ -458,7 +458,7 @@ var Webinar = _webexCore.WebexPlugin.extend({
       }, _callee7);
     }))();
   },
-  version: "3.8.1-next.11"
+  version: "3.8.1-next.13"
 });
 var _default = exports.default = Webinar;
 //# sourceMappingURL=index.js.map

package/package.json

@@ -43,7 +43,7 @@
     "@webex/eslint-config-legacy": "0.0.0",
     "@webex/jest-config-legacy": "0.0.0",
     "@webex/legacy-tools": "0.0.0",
-    "@webex/plugin-meetings": "3.8.1-next.11",
+    "@webex/plugin-meetings": "3.8.1-next.13",
     "@webex/plugin-rooms": "3.8.1-next.2",
     "@webex/test-helper-chai": "3.8.1-next.5",
     "@webex/test-helper-mocha": "3.8.1-next.5",
@@ -71,7 +71,7 @@
     "@webex/internal-plugin-metrics": "3.8.1-next.5",
     "@webex/internal-plugin-support": "3.8.1-next.5",
     "@webex/internal-plugin-user": "3.8.1-next.5",
-    "@webex/internal-plugin-voicea": "3.8.1-next.11",
+    "@webex/internal-plugin-voicea": "3.8.1-next.13",
     "@webex/media-helpers": "3.8.1-next.7",
     "@webex/plugin-people": "3.8.1-next.5",
     "@webex/plugin-rooms": "3.8.1-next.2",
@@ -93,5 +93,5 @@
   "//": [
     "TODO: upgrade jwt-decode when moving to node 18"
   ],
-  "version": "3.8.1-next.11"
+  "version": "3.8.1-next.13"
 }

package/src/media/index.ts

@@ -239,8 +239,8 @@ Media.createMediaConnection = (
         screenShareAudio: shareAudioStream?.outputStream?.getTracks()[0], // TODO: add type for screenShareAudio in internal-media-core SPARK-446923
       } as unknown,
       direction: {
-        audio: Media.getDirection(true, mediaDirection.receiveAudio, mediaDirection.sendAudio),
-        video: Media.getDirection(true, mediaDirection.receiveVideo, mediaDirection.sendVideo),
+        audio: Media.getDirection(false, mediaDirection.receiveAudio, mediaDirection.sendAudio),
+        video: Media.getDirection(false, mediaDirection.receiveVideo, mediaDirection.sendVideo),
         screenShareVideo: Media.getDirection(
           false,
           mediaDirection.receiveShare,

package/src/meeting/index.ts

@@ -231,6 +231,14 @@ export type AddMediaOptions = {
   remoteMediaManagerConfig?: RemoteMediaManagerConfiguration; // applies only to multistream meetings
   bundlePolicy?: BundlePolicy; // applies only to multistream meetings
   allowMediaInLobby?: boolean; // allows adding media when in the lobby
+  additionalMediaOptions?: AdditionalMediaOptions; // allows adding additional options like send/receive audio/video
+};
+
+export type AdditionalMediaOptions = {
+  sendVideo?: boolean; // if not specified, default value of videoEnabled is used
+  receiveVideo?: boolean; // if not specified, default value of videoEnabled is used
+  sendAudio?: boolean; // if not specified, default value of audioEnabled true is used
+  receiveAudio?: boolean; // if not specified, default value of audioEnabled true is used
 };
 
 export type CallStateForMetrics = {
@@ -2762,7 +2770,7 @@ export default class Meeting extends StatelessWebexPlugin {
             this.transcription.languageOptions.currentSpokenLanguage = spokenLanguage;
           }
           // @ts-ignore
-          this.webex.internal.voicea.onSpokenLanguageUpdate(spokenLanguage);
+          this.webex.internal.voicea.onSpokenLanguageUpdate(spokenLanguage, this.id);
 
           Trigger.trigger(
             this,
@@ -2771,7 +2779,7 @@ export default class Meeting extends StatelessWebexPlugin {
               function: 'setupLocusControlsListener',
             },
             EVENT_TRIGGERS.MEETING_TRANSCRIPTION_SPOKEN_LANGUAGE_UPDATED,
-            {spokenLanguage}
+            {spokenLanguage, meetingId: this.id}
           );
         }
       }
@@ -7757,8 +7765,21 @@ export default class Meeting extends StatelessWebexPlugin {
       shareVideoEnabled = true,
       remoteMediaManagerConfig,
       bundlePolicy = 'max-bundle',
+      additionalMediaOptions = {},
     } = options;
 
+    const {
+      sendVideo: rawSendVideo,
+      receiveVideo: rawReceiveVideo,
+      sendAudio: rawSendAudio,
+      receiveAudio: rawReceiveAudio,
+    } = additionalMediaOptions;
+
+    const sendVideo = videoEnabled && (rawSendVideo ?? true);
+    const receiveVideo = videoEnabled && (rawReceiveVideo ?? true);
+    const sendAudio = audioEnabled && (rawSendAudio ?? true);
+    const receiveAudio = audioEnabled && (rawReceiveAudio ?? true);
+
     this.allowMediaInLobby = options?.allowMediaInLobby;
 
     // If the user is unjoined or guest waiting in lobby dont allow the user to addMedia
@@ -7794,11 +7815,11 @@ export default class Meeting extends StatelessWebexPlugin {
     // when audioEnabled/videoEnabled is true, we set sendAudio/sendVideo to true even before any streams are published
     // to avoid doing an extra SDP exchange when they are published for the first time
     this.mediaProperties.setMediaDirection({
-      sendAudio: audioEnabled,
-      sendVideo: videoEnabled,
+      sendAudio,
+      sendVideo,
       sendShare: false,
-      receiveAudio: audioEnabled,
-      receiveVideo: videoEnabled,
+      receiveAudio,
+      receiveVideo,
       receiveShare: shareAudioEnabled || shareVideoEnabled,
     });
 

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

@@ -137,6 +137,113 @@ describe('createMediaConnection', () => {
     );
   });
 
+  it('should set direction to sendonly for both audio and video when only send flags are true', () => {
+    const roapMediaConnectionConstructorStub = sinon
+      .stub(InternalMediaCoreModule, 'RoapMediaConnection')
+      .returns(fakeRoapMediaConnection);
+  
+    StaticConfig.set({bandwidth: {audio: 123, video: 456, startBitrate: 999}});
+  
+    const ENABLE_EXTMAP = false;
+    const ENABLE_RTX = true;
+  
+    Media.createMediaConnection(false, 'sendonly-debug-id', 'meetingId', {
+      mediaProperties: {
+        mediaDirection: {
+          sendAudio: true,
+          receiveAudio: false,
+          sendVideo: true,
+          receiveVideo: false,
+          sendShare: false,
+          receiveShare: false,
+        },
+        audioStream: fakeAudioStream,
+        videoStream: fakeVideoStream,
+        shareVideoTrack: null,
+        shareAudioTrack: null,
+      },
+      remoteQualityLevel: 'HIGH',
+      enableRtx: ENABLE_RTX,
+      enableExtmap: ENABLE_EXTMAP,
+      turnServerInfo: undefined,
+      iceCandidatesTimeout: undefined,
+    });
+  
+    assert.calledWith(
+      roapMediaConnectionConstructorStub,
+      sinon.match.any,
+      {
+        localTracks: {
+          audio: fakeTrack,
+          video: fakeTrack,
+          screenShareVideo: undefined,
+          screenShareAudio: undefined,
+        },
+        direction: {
+          audio: 'sendonly',
+          video: 'sendonly',
+          screenShareVideo: 'inactive',
+        },
+        remoteQualityLevel: 'HIGH',
+      },
+      'sendonly-debug-id'
+    );
+  });
+
+  it('should set direction to recvonly for both audio and video when only receive flags are true', () => {
+    const roapMediaConnectionConstructorStub = sinon
+      .stub(InternalMediaCoreModule, 'RoapMediaConnection')
+      .returns(fakeRoapMediaConnection);
+  
+    StaticConfig.set({bandwidth: {audio: 123, video: 456, startBitrate: 999}});
+  
+    const ENABLE_EXTMAP = true;
+    const ENABLE_RTX = false;
+  
+    Media.createMediaConnection(false, 'recvonly-debug-id', 'meetingId', {
+      mediaProperties: {
+        mediaDirection: {
+          sendAudio: false,
+          receiveAudio: true,
+          sendVideo: false,
+          receiveVideo: true,
+          sendShare: false,
+          receiveShare: false,
+        },
+        audioStream: fakeAudioStream,
+        videoStream: fakeVideoStream,
+        shareVideoTrack: null,
+        shareAudioTrack: null,
+      },
+      remoteQualityLevel: 'HIGH',
+      enableRtx: ENABLE_RTX,
+      enableExtmap: ENABLE_EXTMAP,
+      turnServerInfo: undefined,
+      iceCandidatesTimeout: undefined,
+    });
+  
+    assert.calledWith(
+      roapMediaConnectionConstructorStub,
+      sinon.match.any,
+      {
+        localTracks: {
+          audio: fakeTrack,
+          video: fakeTrack,
+          screenShareVideo: undefined,
+          screenShareAudio: undefined,
+        },
+        direction: {
+          audio: 'recvonly',
+          video: 'recvonly',
+          screenShareVideo: 'inactive',
+        },
+        remoteQualityLevel: 'HIGH',
+      },
+      'recvonly-debug-id'
+    );
+  });
+  
+
   it('creates a MultistreamRoapMediaConnection when multistream is enabled', () => {
     const multistreamRoapMediaConnectionConstructorStub = sinon
       .stub(InternalMediaCoreModule, 'MultistreamRoapMediaConnection')

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

@@ -1208,8 +1208,76 @@ describe('plugin-meetings', () => {
             reason: 'joinWithMedia failure',
           });
         });
-      });
 
+        it('should ignore sendVideo/receiveVideo when videoEnabled is false', async () => {
+          await meeting.joinWithMedia({
+            joinOptions,
+            mediaOptions: {
+              videoEnabled: false,
+              sendVideo: true,
+              receiveVideo: true,
+              allowMediaInLobby: true,
+            },
+          });
+        
+          assert.calledWithMatch(
+            meeting.addMediaInternal,
+            sinon.match.any,
+            sinon.match.any,
+            sinon.match.any,
+            sinon.match.has('videoEnabled', false)
+                        .and(sinon.match.has('allowMediaInLobby', true))
+          );
+        });
+
+        it('should ignore sendAudio/receiveAudio when audioEnabled is false', async () => {
+          await meeting.joinWithMedia({
+            joinOptions,
+            mediaOptions: {
+              audioEnabled: false,
+              sendAudio: true, 
+              receiveAudio: false, 
+              allowMediaInLobby: true,
+            },
+          });
+        
+          assert.calledWithMatch(
+            meeting.addMediaInternal,
+            sinon.match.any,
+            sinon.match.any,
+            sinon.match.any,
+            sinon.match.has('audioEnabled', false)
+                        .and(sinon.match.has('allowMediaInLobby', true))
+          );
+        });        
+
+        
+        it('should use provided send/receive values when videoEnabled/audioEnabled are true or not set', async () => {
+          await meeting.joinWithMedia({
+            joinOptions,
+            mediaOptions: {
+              sendVideo: true,
+              receiveVideo: false,
+              sendAudio: false,
+              receiveAudio: true,
+              allowMediaInLobby: true,
+            },
+          });
+        
+          assert.calledWith(
+            meeting.addMediaInternal,
+            sinon.match.any,
+            sinon.match.any,
+            sinon.match.any,
+            sinon.match({
+              sendVideo: true,
+              receiveVideo: false,
+              sendAudio: false,
+              receiveAudio: true,
+            })
+          );
+        });
+      });
       describe('#isTranscriptionSupported', () => {
         it('should return false if the feature is not supported for the meeting', () => {
           meeting.locusInfo.controls = {transcribe: {caption: false}};
@@ -1240,7 +1308,7 @@ describe('plugin-meetings', () => {
             LOCUSINFO.EVENTS.CONTROLS_MEETING_TRANSCRIPTION_SPOKEN_LANGUAGE_UPDATED,
             {spokenLanguage: 'fr'},
           );
-          assert.calledWith(webex.internal.voicea.onSpokenLanguageUpdate, 'fr');
+          assert.calledWith(webex.internal.voicea.onSpokenLanguageUpdate, 'fr', meeting.id);
           assert.equal(meeting.transcription.languageOptions.currentSpokenLanguage, 'fr');
           assert.calledWith(
             TriggerProxy.trigger,
@@ -4286,11 +4354,11 @@ describe('plugin-meetings', () => {
 
             const error = new Error();
             meeting.meetingRequest.setBrb = sinon.stub().rejects(error);
-        
+
             await expect(
               meeting.beRightBack(true)
-            ).to.be.rejectedWith(error);  
-             
+            ).to.be.rejectedWith(error);
+
             assert.isFalse(meeting.brbState.state.syncToServerInProgress);
           });
         });