@webex/plugin-meetings 3.8.1-next.12 → 3.8.1-next.3

package/src/meeting/index.ts

@@ -231,14 +231,6 @@ 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 = {
@@ -271,9 +263,8 @@ type FetchMeetingInfoParams = {
 };
 
 type MediaReachabilityMetrics = ReachabilityMetrics & {
-  subnet_reachable: boolean;
-  selected_cluster: string | null;
-  selected_subnet: string | null;
+  isSubnetReachable: boolean;
+  selectedCluster: string | null;
 };
 
 /**
@@ -2766,9 +2757,7 @@ export default class Meeting extends StatelessWebexPlugin {
       LOCUSINFO.EVENTS.CONTROLS_MEETING_TRANSCRIPTION_SPOKEN_LANGUAGE_UPDATED,
       ({spokenLanguage}) => {
         if (spokenLanguage) {
-          if (this.transcription?.languageOptions) {
-            this.transcription.languageOptions.currentSpokenLanguage = spokenLanguage;
-          }
+          this.transcription.languageOptions.currentSpokenLanguage = spokenLanguage;
           // @ts-ignore
           this.webex.internal.voicea.onSpokenLanguageUpdate(spokenLanguage);
 
@@ -7765,21 +7754,8 @@ 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
@@ -7815,11 +7791,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,
-      sendVideo,
+      sendAudio: audioEnabled,
+      sendVideo: videoEnabled,
       sendShare: false,
-      receiveAudio,
-      receiveVideo,
+      receiveAudio: audioEnabled,
+      receiveVideo: videoEnabled,
       receiveShare: shareAudioEnabled || shareVideoEnabled,
     });
 
@@ -9745,22 +9721,21 @@ export default class Meeting extends StatelessWebexPlugin {
       return total;
     }, 0);
 
-    const selectedSubnetFirstOctet = this.mediaServerIp?.split('.')[0];
-
     let isSubnetReachable = null;
-    if (totalSuccessCases > 0 && selectedSubnetFirstOctet) {
-      isSubnetReachable =
-        // @ts-ignore
-        this.webex.meetings.reachability.isSubnetReachable(selectedSubnetFirstOctet);
+    if (totalSuccessCases > 0) {
+      // @ts-ignore
+      isSubnetReachable = this.webex.meetings.reachability.isSubnetReachable(this.mediaServerIp);
     }
 
-    const selectedCluster = this.mediaConnections?.[0]?.mediaAgentCluster ?? null;
+    let selectedCluster = null;
+    if (this.mediaConnections && this.mediaConnections.length > 0) {
+      selectedCluster = this.mediaConnections[0].mediaAgentCluster;
+    }
 
     return {
       ...reachabilityMetrics,
-      subnet_reachable: isSubnetReachable,
-      selected_cluster: selectedCluster,
-      selected_subnet: selectedSubnetFirstOctet ? `${selectedSubnetFirstOctet}.X.X.X` : null,
+      isSubnetReachable,
+      selectedCluster,
     };
   }
 }

package/src/reachability/index.ts

@@ -140,14 +140,22 @@ export default class Reachability extends EventsScope {
 
   /**
    * Checks if the given subnet is reachable
-   * @param {string} selectedSubnetFirstOctet - selected subnet first octet, e.g. "10" for "10.X.X.X"
+   * @param {string} mediaServerIp - media server ip
    * @returns {boolean | null} true if reachable, false if not reachable, null if mediaServerIp is not provided
    * @public
    * @memberof Reachability
    */
-  public isSubnetReachable(selectedSubnetFirstOctet: string): boolean | null {
+  public isSubnetReachable(mediaServerIp?: string): boolean | null {
+    if (!mediaServerIp) {
+      LoggerProxy.logger.error(`Reachability:index#isSubnetReachable --> mediaServerIp is null`);
+
+      return null;
+    }
+
+    const subnetFirstOctet = mediaServerIp.split('.')[0];
+
     LoggerProxy.logger.info(
-      `Reachability:index#isSubnetReachable --> Looking for subnet: ${selectedSubnetFirstOctet}.X.X.X`
+      `Reachability:index#isSubnetReachable --> Looking for subnet: ${subnetFirstOctet}.X.X.X`
     );
 
     const matchingReachedClusters = Object.values(this.clusterReachability).reduce(
@@ -159,7 +167,7 @@ export default class Reachability extends EventsScope {
           const subnet = reachedSubnetsArray[i];
           const reachedSubnetFirstOctet = subnet.split('.')[0];
 
-          if (selectedSubnetFirstOctet === reachedSubnetFirstOctet) {
+          if (subnetFirstOctet === reachedSubnetFirstOctet) {
             acc.add(cluster.name);
           }
 
@@ -178,7 +186,7 @@ export default class Reachability extends EventsScope {
     );
 
     LoggerProxy.logger.info(
-      `Reachability:index#isSubnetReachable --> Found ${matchingReachedClusters.size} clusters that use the subnet ${selectedSubnetFirstOctet}.X.X.X`
+      `Reachability:index#isSubnetReachable --> Found ${matchingReachedClusters.size} clusters that use the subnet ${subnetFirstOctet}.X.X.X`
     );
 
     return matchingReachedClusters.size > 0;

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

@@ -137,113 +137,6 @@ 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,76 +1208,8 @@ 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}};
@@ -2295,9 +2227,8 @@ describe('plugin-meetings', () => {
               someReachabilityMetric1: 'some value1',
               someReachabilityMetric2: 'some value2',
               selectedCandidatePairChanges: 2,
-              subnet_reachable: null,
-              selected_cluster: null,
-              selected_subnet: null,
+              isSubnetReachable: null,
+              selectedCluster: null,
               numTransports: 1,
               iceCandidatesCount: 0,
             }
@@ -2344,9 +2275,8 @@ describe('plugin-meetings', () => {
               signalingState: 'unknown',
               connectionState: 'unknown',
               iceConnectionState: 'unknown',
-              subnet_reachable: null,
-              selected_cluster: null,
-              selected_subnet: null,
+              isSubnetReachable: null,
+              selectedCluster: null,
             })
           );
 
@@ -2412,9 +2342,8 @@ describe('plugin-meetings', () => {
               selectedCandidatePairChanges: 2,
               numTransports: 1,
               iceCandidatesCount: 0,
-              subnet_reachable: null,
-              selected_cluster: null,
-              selected_subnet: null,
+              isSubnetReachable: null,
+              selectedCluster: null,
             }
           );
         });
@@ -2472,9 +2401,8 @@ describe('plugin-meetings', () => {
               signalingState: 'have-local-offer',
               connectionState: 'connecting',
               iceConnectionState: 'checking',
-              subnet_reachable: null,
-              selected_cluster: null,
-              selected_subnet: null,
+              isSubnetReachable: null,
+              selectedCluster: null,
             })
           );
 
@@ -2532,9 +2460,8 @@ describe('plugin-meetings', () => {
               signalingState: 'have-local-offer',
               connectionState: 'connecting',
               iceConnectionState: 'checking',
-              subnet_reachable: null,
-              selected_cluster: null,
-              selected_subnet: null,
+              isSubnetReachable: null,
+              selectedCluster: null,
             })
           );
 
@@ -3056,9 +2983,8 @@ describe('plugin-meetings', () => {
               selectedCandidatePairChanges: 2,
               numTransports: 1,
               iceCandidatesCount: 0,
-              subnet_reachable: null,
-              selected_cluster: null,
-              selected_subnet: null,
+              isSubnetReachable: null,
+              selectedCluster: null,
             },
           ]);
 
@@ -3265,9 +3191,8 @@ describe('plugin-meetings', () => {
               retriedWithTurnServer: true,
               isJoinWithMediaRetry: false,
               iceCandidatesCount: 0,
-              subnet_reachable: null,
-              selected_cluster: null,
-              selected_subnet: null,
+              isSubnetReachable: null,
+              selectedCluster: null,
             },
           ]);
           meeting.roap.doTurnDiscovery;
@@ -3430,9 +3355,8 @@ describe('plugin-meetings', () => {
               iceCandidatesCount: 3,
               '701_error': 3,
               '701_turn_host_lookup_received_error': 1,
-              subnet_reachable: null,
-              selected_cluster: 'some.cluster',
-              selected_subnet: null,
+              isSubnetReachable: null,
+              selectedCluster: 'some.cluster',
             }
           );
 
@@ -3495,9 +3419,8 @@ describe('plugin-meetings', () => {
               iceConnectionState: 'unknown',
               selectedCandidatePairChanges: 2,
               numTransports: 1,
-              subnet_reachable: null,
-              selected_cluster: null,
-              selected_subnet: null,
+              isSubnetReachable: null,
+              selectedCluster: null,
               iceCandidatesCount: 0,
             }
           );
@@ -3559,9 +3482,8 @@ describe('plugin-meetings', () => {
               numTransports: 1,
               '701_error': 2,
               '701_turn_host_lookup_received_error': 1,
-              subnet_reachable: null,
-              selected_cluster: null,
-              selected_subnet: null,
+              isSubnetReachable: null,
+              selectedCluster: null,
               iceCandidatesCount: 0,
             }
           );
@@ -3569,7 +3491,7 @@ describe('plugin-meetings', () => {
           assert.isOk(errorThrown);
         });
 
-        it('should send subnet reachablity metrics if media connection success', async () => {
+        it('should send valid isSubnetReachability if media connection success', async () => {
           meeting.roap.doTurnDiscovery = sinon.stub().returns({
             turnServerInfo: undefined,
             turnDiscoverySkippedReason: undefined,
@@ -3583,12 +3505,6 @@ describe('plugin-meetings', () => {
             stopReachability: sinon.stub(),
             isSubnetReachable: sinon.stub().returns(false),
           };
-          meeting.mediaServerIp =  '1.2.3.4';
-          meeting.mediaConnections = [
-            {
-              mediaAgentCluster: 'some.cluster',
-            }
-          ]
 
           const forceRtcMetricsSend = sinon.stub().resolves();
           const closeMediaConnectionStub = sinon.stub();
@@ -3616,13 +3532,12 @@ describe('plugin-meetings', () => {
             isJoinWithMediaRetry: false,
             iceCandidatesCount: 0,
             reachability_public_udp_success: 5,
-            subnet_reachable: false,
-            selected_cluster: 'some.cluster',
-            selected_subnet: '1.X.X.X',
+            isSubnetReachable: false,
+            selectedCluster: null,
           });
         });
 
-        it('should send subnet reachablity metrics if media connection fails', async () => {
+        it('should send valid isSubnetReachability if media connection fails', async () => {
           let errorThrown = undefined;
 
           meeting.roap.doTurnDiscovery = sinon.stub().returns({
@@ -3638,12 +3553,6 @@ describe('plugin-meetings', () => {
             stopReachability: sinon.stub(),
             isSubnetReachable: sinon.stub().returns(true),
           };
-          meeting.mediaServerIp =  '1.2.3.4';
-          meeting.mediaConnections = [
-            {
-              mediaAgentCluster: 'some.cluster',
-            }
-          ]
 
           const forceRtcMetricsSend = sinon.stub().resolves();
           const closeMediaConnectionStub = sinon.stub();
@@ -3685,9 +3594,8 @@ describe('plugin-meetings', () => {
               selectedCandidatePairChanges: 2,
               numTransports: 1,
               reachability_public_udp_success: 5,
-              subnet_reachable: true,
-              selected_cluster: 'some.cluster',
-              selected_subnet: '1.X.X.X',
+              isSubnetReachable: true,
+              selectedCluster: null,
               iceCandidatesCount: 0,
             }
           );

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

@@ -2764,10 +2764,14 @@ describe('isSubnetReachable', () => {
   });
 
   it('returns true if the subnet is reachable', () => {
-    assert(reachability.isSubnetReachable('1'));
+    assert(reachability.isSubnetReachable('1.2.3.4'));
   });
 
   it(`returns false if the subnet is unreachable`, () => {
-    assert(!reachability.isSubnetReachable('11'));
+    assert(!reachability.isSubnetReachable('11.2.3.4'));
+  });
+
+  it('returns null if the subnet is not provided', () => {
+    assert.isNull(reachability.isSubnetReachable(undefined));
   });
 });