@webex/plugin-meetings 3.8.0-next.57 → 3.8.0-next.59

package/src/meeting/index.ts

@@ -100,7 +100,6 @@ import {
   MEETING_STATE_MACHINE,
   MEETING_STATE,
   MEETINGS,
-  MQA_STATS,
   NETWORK_STATUS,
   ONLINE,
   OFFLINE,
@@ -6822,20 +6821,20 @@ export default class Meeting extends StatelessWebexPlugin {
    * @memberof Meetings
    */
   setupStatsAnalyzerEventHandlers = () => {
-    this.statsAnalyzer.on(StatsAnalyzerEventNames.MEDIA_QUALITY, (options) => {
-      // TODO:  might have to send the same event to the developer
-      // Add ip address info if geo hint is present
-      // @ts-ignore fix type
-      options.data.intervalMetadata.peerReflexiveIP =
-        // @ts-ignore
-        this.webex.meetings.geoHintInfo?.clientAddress ||
-        options.data.intervalMetadata.peerReflexiveIP ||
-        MQA_STATS.DEFAULT_IP;
+    this.statsAnalyzer.on(StatsAnalyzerEventNames.MEDIA_QUALITY, (event) => {
+      // Add IP address from geoHintInfo if missing.
+      if (event.data.intervalMetadata.maskedPeerReflexiveIP === '0.0.0.0') {
+        // @ts-ignore fix type
+        const clientAddressFromGeoHint = this.webex.meetings.geoHintInfo?.clientAddress;
+        if (clientAddressFromGeoHint) {
+          event.data.intervalMetadata.maskedPeerReflexiveIP =
+            CallDiagnosticUtils.anonymizeIPAddress(clientAddressFromGeoHint);
+        }
+      }
 
+      // Count members that are in the meeting.
       const {members} = this.getMembers().membersCollection;
-
-      // Count members that are in the meeting
-      options.data.intervalMetadata.meetingUserCount = Object.values(members).filter(
+      event.data.intervalMetadata.meetingUserCount = Object.values(members).filter(
         (member: Member) => member.isInMeeting
       ).length;
 
@@ -6844,10 +6843,10 @@ export default class Meeting extends StatelessWebexPlugin {
         name: 'client.mediaquality.event',
         options: {
           meetingId: this.id,
-          networkType: options.data.networkType,
+          networkType: this.statsAnalyzer.getNetworkType(),
         },
         payload: {
-          intervals: [options.data],
+          intervals: [event.data],
         },
       });
     });

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

@@ -2762,7 +2762,7 @@ describe('plugin-meetings', () => {
               turnDiscoverySkippedReason: undefined,
             });
           meeting.meetingState = 'ACTIVE';
-          const error = {iceConnected: false}
+          const error = {iceConnected: false};
           meeting.mediaProperties.waitForMediaConnectionConnected.rejects(error);
 
           const forceRtcMetricsSend = sinon.stub().resolves();
@@ -3435,28 +3435,23 @@ describe('plugin-meetings', () => {
             on: sinon.stub(),
           });
 
-          await meeting
-            .addMedia({
-              mediaSettings: {},
-            });
+          await meeting.addMedia({
+            mediaSettings: {},
+          });
 
-          assert.calledWith(
-            Metrics.sendBehavioralMetric,
-            BEHAVIORAL_METRICS.ADD_MEDIA_SUCCESS,
-            {
-              correlation_id: meeting.correlationId,
-              locus_id: meeting.locusUrl.split('/').pop(),
-              connectionType: 'udp',
-              selectedCandidatePairChanges: 2,
-              numTransports: 1,
-              isMultistream: false,
-              retriedWithTurnServer: false,
-              isJoinWithMediaRetry: false,
-              iceCandidatesCount: 0,
-              reachability_public_udp_success: 5,
-              isSubnetReachable: false,
-            }
-          );
+          assert.calledWith(Metrics.sendBehavioralMetric, BEHAVIORAL_METRICS.ADD_MEDIA_SUCCESS, {
+            correlation_id: meeting.correlationId,
+            locus_id: meeting.locusUrl.split('/').pop(),
+            connectionType: 'udp',
+            selectedCandidatePairChanges: 2,
+            numTransports: 1,
+            isMultistream: false,
+            retriedWithTurnServer: false,
+            isJoinWithMediaRetry: false,
+            iceCandidatesCount: 0,
+            reachability_public_udp_success: 5,
+            isSubnetReachable: false,
+          });
         });
 
         it('should send valid isSubnetReachability if media connection fails', async () => {
@@ -3536,6 +3531,8 @@ describe('plugin-meetings', () => {
             meeting.config.stats.enableStatsAnalyzer = true;
 
             statsAnalyzerStub = new EventsScope();
+            statsAnalyzerStub.getNetworkType = sinon.stub().returns('wifi');
+
             // mock the StatsAnalyzer constructor
             sinon.stub(InternalMediaCoreModule, 'StatsAnalyzer').returns(statsAnalyzerStub);
 
@@ -3830,7 +3827,7 @@ describe('plugin-meetings', () => {
               },
             };
             sinon.stub(meeting, 'getMembers').returns({membersCollection: fakeMembersCollection});
-            const fakeData = {intervalMetadata: {}, networkType: 'wifi'};
+            const fakeData = {intervalMetadata: {}};
 
             statsAnalyzerStub.emit(
               {file: 'test', function: 'test'},
@@ -3871,7 +3868,7 @@ describe('plugin-meetings', () => {
           });
 
           it('calls submitMQE correctly', async () => {
-            const fakeData = {intervalMetadata: {bla: 'bla'}, networkType: 'wifi'};
+            const fakeData = {intervalMetadata: {bla: 'bla'}};
 
             statsAnalyzerStub.emit(
               {file: 'test', function: 'test'},
@@ -4081,7 +4078,7 @@ describe('plugin-meetings', () => {
                     meetingId: meeting.id,
                     rawError: {
                       iceConnected: false,
-                    }
+                    },
                   },
                 },
               ]);