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

package/dist/types/constants.d.ts

@@ -956,91 +956,6 @@ export declare const NETWORK_STATUS: {
     readonly CONNECTED: "CONNECTED";
 };
 export type NETWORK_STATUS = Enum<typeof NETWORK_STATUS>;
-export declare const NETWORK_TYPE: {
-    VPN: string;
-    UNKNOWN: string;
-    WIFI: string;
-    ETHERNET: string;
-};
-export declare const STATS: {
-    SEND_DIRECTION: string;
-    RECEIVE_DIRECTION: string;
-    REMOTE: string;
-    LOCAL: string;
-};
-export declare const MQA_STATS: {
-    MQA_SIZE: number;
-    CA_TYPE: string;
-    DEFAULT_IP: string;
-    DEFAULT_SHARE_SENDER_STATS: {
-        common: {
-            common: {
-                direction: string;
-                isMain: boolean;
-                mariFecEnabled: boolean;
-                mariRtxEnabled: boolean;
-                mariLiteEnabled: boolean;
-                mariQosEnabled: boolean;
-                multistreamEnabled: boolean;
-            };
-            availableBitrate: number;
-            dtlsBitrate: number;
-            dtlsPackets: number;
-            fecBitrate: number;
-            fecPackets: number;
-            maxBitrate: number;
-            queueDelay: number;
-            remoteJitter: number;
-            remoteLossRate: number;
-            roundTripTime: number;
-            rtcpBitrate: number;
-            rtcpPackets: number;
-            rtpBitrate: number;
-            rtpPackets: number;
-            stunBitrate: number;
-            stunPackets: number;
-            transportType: string;
-        };
-        streams: {
-            common: {
-                codec: string;
-                duplicateSsci: number;
-                requestedBitrate: number;
-                requestedFrames: number;
-                rtpPackets: number;
-                ssci: number;
-                transmittedBitrate: number;
-                transmittedFrameRate: number;
-            };
-            h264CodecProfile: string;
-            localConfigurationChanges: number;
-            remoteConfigurationChanges: number;
-            requestedFrameSize: number;
-            requestedKeyFrames: number;
-            transmittedFrameSize: number;
-            transmittedHeight: number;
-            transmittedKeyFrames: number;
-            transmittedWidth: number;
-        }[];
-    };
-    intervalMetadata: {
-        memoryUsage: {
-            cpuBitWidth: number;
-            mainProcessMaximumMemoryBytes: number;
-            osBitWidth: number;
-            processAverageMemoryUsage: number;
-            processMaximumMemoryBytes: number;
-            processMaximumMemoryUsage: number;
-            systemAverageMemoryUsage: number;
-            systemMaximumMemoryUsage: number;
-        };
-        peerReflexiveIP: string;
-        processAverageCPU: number;
-        processMaximumCPU: number;
-        systemAverageCPU: number;
-        systemMaximumCPU: number;
-    };
-};
 export declare const QUALITY_LEVELS: {
     LOW: string;
     MEDIUM: string;

package/dist/webinar/index.js

@@ -458,7 +458,7 @@ var Webinar = _webexCore.WebexPlugin.extend({
       }, _callee7);
     }))();
   },
-  version: "3.8.0-next.58"
+  version: "3.8.0-next.59"
 });
 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.0-next.58",
+    "@webex/plugin-meetings": "3.8.0-next.59",
     "@webex/plugin-rooms": "3.8.0-next.21",
     "@webex/test-helper-chai": "3.8.0-next.17",
     "@webex/test-helper-mocha": "3.8.0-next.17",
@@ -63,7 +63,7 @@
   "dependencies": {
     "@webex/common": "3.8.0-next.17",
     "@webex/event-dictionary-ts": "^1.0.1753",
-    "@webex/internal-media-core": "2.15.0",
+    "@webex/internal-media-core": "2.16.0",
     "@webex/internal-plugin-conversation": "3.8.0-next.21",
     "@webex/internal-plugin-device": "3.8.0-next.17",
     "@webex/internal-plugin-llm": "3.8.0-next.20",
@@ -71,8 +71,8 @@
     "@webex/internal-plugin-metrics": "3.8.0-next.17",
     "@webex/internal-plugin-support": "3.8.0-next.21",
     "@webex/internal-plugin-user": "3.8.0-next.17",
-    "@webex/internal-plugin-voicea": "3.8.0-next.58",
-    "@webex/media-helpers": "3.8.0-next.20",
+    "@webex/internal-plugin-voicea": "3.8.0-next.59",
+    "@webex/media-helpers": "3.8.0-next.21",
     "@webex/plugin-people": "3.8.0-next.19",
     "@webex/plugin-rooms": "3.8.0-next.21",
     "@webex/web-capabilities": "^1.4.0",
@@ -92,5 +92,5 @@
   "//": [
     "TODO: upgrade jwt-decode when moving to node 18"
   ],
-  "version": "3.8.0-next.58"
+  "version": "3.8.0-next.59"
 }

package/src/constants.ts

@@ -1166,96 +1166,6 @@ export const NETWORK_STATUS = {
 
 export type NETWORK_STATUS = Enum<typeof NETWORK_STATUS>;
 
-export const NETWORK_TYPE = {
-  VPN: 'vpn',
-  UNKNOWN: 'unknown',
-  WIFI: 'wifi',
-  ETHERNET: 'ethernet',
-};
-
-export const STATS = {
-  SEND_DIRECTION: 'send',
-  RECEIVE_DIRECTION: 'recv',
-  REMOTE: 'remote',
-  LOCAL: 'local',
-};
-
-export const MQA_STATS = {
-  MQA_SIZE: 120, // MQA is done on 60 second intervals by server def, add a buffer for missed events
-  CA_TYPE: 'MQA',
-  DEFAULT_IP: '0.0.0.0',
-  DEFAULT_SHARE_SENDER_STATS: {
-    common: {
-      common: {
-        direction: 'sendrecv', // TODO: parse from SDP and save globally
-        isMain: false, // always true for share sender
-        mariFecEnabled: false, // unavailable
-        mariRtxEnabled: false, // unavailable
-        mariLiteEnabled: false, // unavailable
-        mariQosEnabled: false, // unavailable
-        multistreamEnabled: false, // unavailable
-      },
-      availableBitrate: 0,
-      dtlsBitrate: 0, // unavailable
-      dtlsPackets: 0, // unavailable
-      fecBitrate: 0, // unavailable
-      fecPackets: 0, // unavailable
-      maxBitrate: 0, // unavailable
-      queueDelay: 0, // unavailable
-      remoteJitter: 0, // unavailable
-      remoteLossRate: 0,
-      roundTripTime: 0,
-      rtcpBitrate: 0, // unavailable
-      rtcpPackets: 0, // unavailable
-      rtpBitrate: 0, // unavailable
-      rtpPackets: 0,
-      stunBitrate: 0, // unavailable
-      stunPackets: 0, // unavailable
-      transportType: 'UDP', // TODO: parse the transport type from the SDP and save globally
-    },
-    streams: [
-      {
-        common: {
-          codec: 'H264', // TODO: parse the codec from the SDP and save globally
-          duplicateSsci: 0, // unavailable
-          requestedBitrate: 0, // unavailable
-          requestedFrames: 0, // unavailable
-          rtpPackets: 0,
-          ssci: 0, // unavailable
-          transmittedBitrate: 0,
-          transmittedFrameRate: 0,
-        },
-        h264CodecProfile: 'BP', // TODO: parse the profile level from h264 in the SDP and save globally
-        localConfigurationChanges: 0, // unavailable
-        remoteConfigurationChanges: 0, // unavailable
-        requestedFrameSize: 0, // unavailable
-        requestedKeyFrames: 0, // unavailable
-        transmittedFrameSize: 0, // unavailable
-        transmittedHeight: 0,
-        transmittedKeyFrames: 0,
-        transmittedWidth: 0,
-      },
-    ],
-  },
-  intervalMetadata: {
-    memoryUsage: {
-      cpuBitWidth: 0,
-      mainProcessMaximumMemoryBytes: 0,
-      osBitWidth: 0,
-      processAverageMemoryUsage: 0,
-      processMaximumMemoryBytes: 0,
-      processMaximumMemoryUsage: 0,
-      systemAverageMemoryUsage: 0,
-      systemMaximumMemoryUsage: 0,
-    },
-    peerReflexiveIP: 'NULL', // TODO: save after ice trickling completes and use as a global variable
-    processAverageCPU: 0,
-    processMaximumCPU: 0,
-    systemAverageCPU: 0,
-    systemMaximumCPU: 0,
-  },
-};
-
 // ****** MEDIA QUALITY CONSTANTS ****** //
 
 // these values must match allowed values of RemoteQualityLevel from the @webex/internal-media-core lib

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,
-                    }
+                    },
                   },
                 },
               ]);