@webex/plugin-meetings 2.60.1-next.1 → 2.60.1-next.10

package/src/statsAnalyzer/mqaUtil.ts

@@ -29,13 +29,14 @@ export const getAudioReceiverMqa = ({audioReceiver, statsResults, lastMqaDataSen
   // add rtpPacket info inside common as also for call analyzer
   audioReceiver.common.rtpPackets =
     statsResults[mediaType][sendrecvType].totalPacketsReceived - lastPacketsReceived || 0;
+  audioReceiver.streams[0].common.rtpPackets = audioReceiver.common.rtpPackets;
+
   // Hop by hop are numbers and not percentage so we compare on what we sent the last min
   // collect the packets received for the last min
-  audioReceiver.streams[0].common.rtpPackets = audioReceiver.common.rtpPackets;
-  audioReceiver.common.mediaHopByHopLost =
-    statsResults[mediaType][sendrecvType].totalPacketsLost - lastPacketsLost || 0;
-  audioReceiver.common.rtpHopByHopLost =
+  const totalPacketsLost =
     statsResults[mediaType][sendrecvType].totalPacketsLost - lastPacketsLost || 0;
+  audioReceiver.common.mediaHopByHopLost = totalPacketsLost;
+  audioReceiver.common.rtpHopByHopLost = totalPacketsLost;
 
   audioReceiver.streams[0].common.maxRtpJitter =
     // @ts-ignore
@@ -49,6 +50,7 @@ export const getAudioReceiverMqa = ({audioReceiver, statsResults, lastMqaDataSen
     statsResults[mediaType][sendrecvType].fecPacketsReceived -
     lastFecPacketsReceived -
     (statsResults[mediaType][sendrecvType].fecPacketsDiscarded - lastFecPacketsDiscarded);
+  audioReceiver.common.fecPackets = fecRecovered || 0;
 
   audioReceiver.streams[0].common.rtpEndToEndLost =
     statsResults[mediaType][sendrecvType].totalPacketsLost - lastPacketsLost - fecRecovered || 0;
@@ -105,7 +107,7 @@ export const getAudioSenderMqa = ({audioSender, statsResults, lastMqaDataSent, m
     statsResults[mediaType][sendrecvType].totalPacketsLostOnReceiver - lastPacketsLost;
 
   audioSender.common.remoteLossRate =
-    totalpacketsLostForaMin > 0
+    audioSender.common.rtpPackets > 0
       ? (totalpacketsLostForaMin * 100) / audioSender.common.rtpPackets
       : 0; // This is the packets sent with in last min || 0;
 
@@ -156,16 +158,15 @@ export const getVideoReceiverMqa = ({videoReceiver, statsResults, lastMqaDataSen
     statsResults[mediaType][sendrecvType].totalPacketsReceived - lastPacketsReceived || 0;
   videoReceiver.streams[0].common.rtpPackets = videoReceiver.common.rtpPackets;
 
-  const totalPacketLoss =
-    statsResults[mediaType][sendrecvType].totalPacketsLost - lastPacketsLost || 0;
-
-  // Hope by hop are numbers and not percentage so we compare on what we sent the last min
+  // Hop by hop are numbers and not percentage so we compare on what we sent the last min
   // this is including packet lost
-  videoReceiver.common.mediaHopByHopLost = totalPacketLoss;
-  videoReceiver.common.rtpHopByHopLost = totalPacketLoss;
+  const totalPacketsLost =
+    statsResults[mediaType][sendrecvType].totalPacketsLost - lastPacketsLost || 0;
+  videoReceiver.common.mediaHopByHopLost = totalPacketsLost;
+  videoReceiver.common.rtpHopByHopLost = totalPacketsLost;
 
   // End to end packetloss is after recovery
-  videoReceiver.streams[0].common.rtpEndToEndLost = totalPacketLoss;
+  videoReceiver.streams[0].common.rtpEndToEndLost = totalPacketsLost;
 
   // calculate this values
 
@@ -249,8 +250,8 @@ export const getVideoSenderMqa = ({videoSender, statsResults, lastMqaDataSent, m
     statsResults[mediaType][sendrecvType].totalPacketsLostOnReceiver - lastPacketsLost;
 
   videoSender.common.remoteLossRate =
-    totalpacketsLostForaMin > 0
-      ? (totalpacketsLostForaMin * 100) / (videoSender.common.rtpPackets + totalpacketsLostForaMin)
+    videoSender.common.rtpPackets > 0
+      ? (totalpacketsLostForaMin * 100) / videoSender.common.rtpPackets
       : 0; // This is the packets sent with in last min || 0;
 
   videoSender.common.maxRoundTripTime =

package/test/unit/spec/locus-info/index.js

@@ -2058,7 +2058,7 @@ describe('plugin-meetings', () => {
     });
 
     describe('#getTheLocusToUpdate', () => {
-      it('return the cache locus if return to main session', () => {
+      it('return the cache locus if return to main session and do not clear main session cache', () => {
         locusInfo.mainSessionLocusCache = {url: 'url'};
         locusInfo.controls = {
           breakout: {
@@ -2074,9 +2074,13 @@ describe('plugin-meetings', () => {
         };
 
         assert.deepEqual(locusInfo.getTheLocusToUpdate(newLocus), {url: 'url'});
+
+        locusInfo.clearMainSessionLocusCache = sinon.stub();
+        locusInfo.getTheLocusToUpdate(newLocus);
+        assert.notCalled(locusInfo.clearMainSessionLocusCache)
       });
 
-      it('return the new locus if return to main session but no cache', () => {
+      it('return the new locus if return to main session but no cache and do not clear main session cache', () => {
         locusInfo.mainSessionLocusCache = null;
         locusInfo.controls = {
           breakout: {
@@ -2092,10 +2096,22 @@ describe('plugin-meetings', () => {
         };
 
         assert.deepEqual(locusInfo.getTheLocusToUpdate(newLocus), newLocus);
+
+        locusInfo.clearMainSessionLocusCache = sinon.stub();
+        locusInfo.getTheLocusToUpdate(newLocus);
+        assert.notCalled(locusInfo.clearMainSessionLocusCache)
       });
 
-      it('return the new locus if not return to main session', () => {
-        locusInfo.mainSessionLocusCache = {url: 'url'};
+      it('return the new locus if not return to main session and clear main session cache', () => {
+        locusInfo.mainSessionLocusCache = {
+          controls: {
+            breakout: {
+              sessionType: 'MAIN',
+            },
+          },
+          self: {removed: true}
+        };
+        locusInfo.fullState = {state: 'ACTIVE'}
         locusInfo.controls = {
           breakout: {
             sessionType: 'MAIN',
@@ -2109,7 +2125,39 @@ describe('plugin-meetings', () => {
           },
         };
 
-        assert.deepEqual(locusInfo.getTheLocusToUpdate(newLocus), newLocus);
+        locusInfo.clearMainSessionLocusCache = sinon.stub();
+        const result = locusInfo.getTheLocusToUpdate(newLocus);
+        assert.calledOnce(locusInfo.clearMainSessionLocusCache)
+
+        assert.deepEqual(result, newLocus);
+      });
+
+      it('do not clear main session cache when "mainSessionLocusCache?.self?.removed" is not true', () => {
+        locusInfo.mainSessionLocusCache = {
+          controls: {
+            breakout: {
+              sessionType: 'MAIN',
+            },
+          },
+          self: {removed: undefined}
+        };
+        locusInfo.fullState = {state: 'ACTIVE'}
+        locusInfo.controls = {
+          breakout: {
+            sessionType: 'MAIN',
+          },
+        };
+        const newLocus = {
+          controls: {
+            breakout: {
+              sessionType: 'BREAKOUT',
+            },
+          },
+        };
+
+        locusInfo.clearMainSessionLocusCache = sinon.stub();
+        locusInfo.getTheLocusToUpdate(newLocus);
+        assert.notCalled(locusInfo.clearMainSessionLocusCache)
       });
     });