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

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/meeting/index.js

@@ -2227,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,
             }
@@ -2276,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,
             })
           );
 
@@ -2344,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,
             }
           );
         });
@@ -2404,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,
             })
           );
 
@@ -2464,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,
             })
           );
 
@@ -2988,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,
             },
           ]);
 
@@ -3197,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;
@@ -3362,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',
             }
           );
 
@@ -3427,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,
             }
           );
@@ -3491,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,
             }
           );
@@ -3501,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,
@@ -3515,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();
@@ -3548,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({
@@ -3570,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();
@@ -3617,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));
   });
 });