@webex/plugin-meetings 3.0.0-beta.335 → 3.0.0-beta.337

package/dist/statsAnalyzer/index.js

@@ -143,7 +143,10 @@ var StatsAnalyzer = /*#__PURE__*/function (_EventsScope) {
       }
       var sendRecvType = isSender ? _constants.STATS.SEND_DIRECTION : _constants.STATS.RECEIVE_DIRECTION;
       var ipType = isRemote ? _constants.STATS.REMOTE : _constants.STATS.LOCAL;
-      _this.statsResults.internal.candidates[result.id] = {
+      if (!_this.statsResults.candidates) {
+        _this.statsResults.candidates = {};
+      }
+      _this.statsResults.candidates[result.id] = {
         candidateType: result.candidateType,
         ipAddress: result.ip,
         // TODO: add ports
@@ -168,9 +171,7 @@ var StatsAnalyzer = /*#__PURE__*/function (_EventsScope) {
     _this.networkQualityMonitor = networkQualityMonitor;
     _this.correlationId = config.correlationId;
     _this.mqaSentCount = -1;
-    _this.lastMqaDataSent = {
-      resolutions: {}
-    };
+    _this.lastMqaDataSent = {};
     _this.lastEmittedStartStopEvent = {};
     _this.receiveSlotCallback = receiveSlotCallback;
     _this.successfulCandidatePair = {};
@@ -228,15 +229,12 @@ var StatsAnalyzer = /*#__PURE__*/function (_EventsScope) {
       (0, _keys.default)(this.statsResults).forEach(function (mediaType) {
         if (!_this3.lastMqaDataSent[mediaType]) {
           _this3.lastMqaDataSent[mediaType] = {};
-          _this3.lastMqaDataSent.resolutions[mediaType] = {};
         }
         if (!_this3.lastMqaDataSent[mediaType].send && mediaType.includes('-send')) {
           _this3.lastMqaDataSent[mediaType].send = {};
-          _this3.lastMqaDataSent.resolutions[mediaType].send = {};
         }
         if (!_this3.lastMqaDataSent[mediaType].recv && mediaType.includes('-recv')) {
           _this3.lastMqaDataSent[mediaType].recv = {};
-          _this3.lastMqaDataSent.resolutions[mediaType].recv = {};
         }
         if (mediaType.includes('audio-send') || mediaType.includes('audio-share-send')) {
           var audioSender = (0, _cloneDeep2.default)(_config.emptyAudioTransmit);
@@ -268,7 +266,6 @@ var StatsAnalyzer = /*#__PURE__*/function (_EventsScope) {
           });
           newMqa.videoTransmit.push(videoSender);
           _this3.lastMqaDataSent[mediaType].send = (0, _cloneDeep2.default)(_this3.statsResults[mediaType].send);
-          _this3.lastMqaDataSent.resolutions[mediaType].send = (0, _cloneDeep2.default)(_this3.statsResults.resolutions[mediaType].send);
         } else if (mediaType.includes('video-recv') || mediaType.includes('video-share-recv')) {
           var videoReceiver = (0, _cloneDeep2.default)(_config.emptyVideoReceive);
           (0, _mqaUtil.getVideoReceiverMqa)({
@@ -279,7 +276,6 @@ var StatsAnalyzer = /*#__PURE__*/function (_EventsScope) {
           });
           newMqa.videoReceive.push(videoReceiver);
           _this3.lastMqaDataSent[mediaType].recv = (0, _cloneDeep2.default)(_this3.statsResults[mediaType].recv);
-          _this3.lastMqaDataSent.resolutions[mediaType].recv = (0, _cloneDeep2.default)(_this3.statsResults.resolutions[mediaType].recv);
         }
       });
       newMqa.intervalMetadata.peerReflexiveIP = this.statsResults.connectionType.local.ipAddress;
@@ -413,22 +409,6 @@ var StatsAnalyzer = /*#__PURE__*/function (_EventsScope) {
       } else if (!isSender && !this.statsResults[type].recv) {
         this.statsResults[type].recv = (0, _cloneDeep2.default)(emptyReceiver);
       }
-      if (!this.statsResults.resolutions[type]) {
-        this.statsResults.resolutions[type] = {};
-      }
-      if (isSender && !this.statsResults.resolutions[type].send) {
-        this.statsResults.resolutions[type].send = (0, _cloneDeep2.default)(emptySender);
-      } else if (!isSender && !this.statsResults.resolutions[type].recv) {
-        this.statsResults.resolutions[type].recv = (0, _cloneDeep2.default)(emptyReceiver);
-      }
-      if (!this.statsResults.internal[type]) {
-        this.statsResults.internal[type] = {};
-      }
-      if (isSender && !this.statsResults.internal[type].send) {
-        this.statsResults.internal[type].send = (0, _cloneDeep2.default)(emptySender);
-      } else if (!isSender && !this.statsResults.internal[type].recv) {
-        this.statsResults.internal[type].recv = (0, _cloneDeep2.default)(emptyReceiver);
-      }
       switch (getStatsResult.type) {
         case 'outbound-rtp':
           this.processOutboundRTPResult(getStatsResult, type);
@@ -436,13 +416,9 @@ var StatsAnalyzer = /*#__PURE__*/function (_EventsScope) {
         case 'inbound-rtp':
           this.processInboundRTPResult(getStatsResult, type);
           break;
-        case 'track':
-          this.processTrackResult(getStatsResult, type);
-          break;
         case 'remote-inbound-rtp':
         case 'remote-outbound-rtp':
-          // @ts-ignore
-          this.compareSentAndReceived(getStatsResult, type, isSender);
+          this.compareSentAndReceived(getStatsResult, type);
           break;
         case 'remotecandidate':
         case 'remote-candidate':
@@ -555,22 +531,6 @@ var StatsAnalyzer = /*#__PURE__*/function (_EventsScope) {
             return prev + (((_this7$lastStatsResul = _this7.lastStatsResults[cur]) === null || _this7$lastStatsResul === void 0 ? void 0 : _this7$lastStatsResul.recv[value]) || 0);
           }, 0);
         };
-        var getCurrentResolutionsStatsTotals = function getCurrentResolutionsStatsTotals(keyPrefix, value) {
-          return (0, _keys.default)(_this7.statsResults).filter(function (key) {
-            return key.startsWith(keyPrefix);
-          }).reduce(function (prev, cur) {
-            var _this7$statsResults$r;
-            return prev + (((_this7$statsResults$r = _this7.statsResults.resolutions[cur]) === null || _this7$statsResults$r === void 0 ? void 0 : _this7$statsResults$r.recv[value]) || 0);
-          }, 0);
-        };
-        var getPreviousResolutionsStatsTotals = function getPreviousResolutionsStatsTotals(keyPrefix, value) {
-          return (0, _keys.default)(_this7.statsResults).filter(function (key) {
-            return key.startsWith(keyPrefix);
-          }).reduce(function (prev, cur) {
-            var _this7$lastStatsResul2;
-            return prev + (((_this7$lastStatsResul2 = _this7.lastStatsResults.resolutions[cur]) === null || _this7$lastStatsResul2 === void 0 ? void 0 : _this7$lastStatsResul2.recv[value]) || 0);
-          }, 0);
-        };
         if (this.meetingMediaStatus.expected.sendAudio && this.lastStatsResults['audio-send']) {
           // compare audio stats sent
           // NOTE: relies on there being only one sender.
@@ -611,8 +571,8 @@ var StatsAnalyzer = /*#__PURE__*/function (_EventsScope) {
             if (_currentStats.framesEncoded === _previousStats.framesEncoded || _currentStats.framesEncoded === 0) {
               _loggerProxy.default.logger.info("StatsAnalyzer:index#compareLastStatsResult --> No video Frames Encoded", _currentStats.framesEncoded);
             }
-            if (this.statsResults.resolutions['video-send'].send.framesSent === this.lastStatsResults.resolutions['video-send'].send.framesSent || this.statsResults.resolutions['video-send'].send.framesSent === 0) {
-              _loggerProxy.default.logger.info("StatsAnalyzer:index#compareLastStatsResult --> No video Frames sent", this.statsResults.resolutions['video-send'].send.framesSent);
+            if (this.statsResults['video-send'].send.framesSent === this.lastStatsResults['video-send'].send.framesSent || this.statsResults['video-send'].send.framesSent === 0) {
+              _loggerProxy.default.logger.info("StatsAnalyzer:index#compareLastStatsResult --> No video Frames sent", this.statsResults['video-send'].send.framesSent);
             }
           }
           this.emitStartStopEvents('video', _previousStats.framesSent, _currentStats.framesSent, true);
@@ -621,12 +581,12 @@ var StatsAnalyzer = /*#__PURE__*/function (_EventsScope) {
           // compare video stats received
           var _currentPacketsReceived = getCurrentStatsTotals('video-recv', 'totalPacketsReceived');
           var _previousPacketsReceived = getPreviousStatsTotals('video-recv', 'totalPacketsReceived');
-          var currentFramesReceived = getCurrentResolutionsStatsTotals('video-recv', 'framesReceived');
-          var previousFramesReceived = getPreviousResolutionsStatsTotals('video-recv', 'framesReceived');
+          var currentFramesReceived = getCurrentStatsTotals('video-recv', 'framesReceived');
+          var previousFramesReceived = getPreviousStatsTotals('video-recv', 'framesReceived');
           var currentFramesDecoded = getCurrentStatsTotals('video-recv', 'framesDecoded');
           var previousFramesDecoded = getPreviousStatsTotals('video-recv', 'framesDecoded');
-          var currentFramesDropped = getCurrentResolutionsStatsTotals('video-recv', 'framesDropped');
-          var previousFramesDropped = getPreviousResolutionsStatsTotals('video-recv', 'framesDropped');
+          var currentFramesDropped = getCurrentStatsTotals('video-recv', 'framesDropped');
+          var previousFramesDropped = getPreviousStatsTotals('video-recv', 'framesDropped');
           if (_currentPacketsReceived === _previousPacketsReceived || _currentPacketsReceived === 0) {
             _loggerProxy.default.logger.info("StatsAnalyzer:index#compareLastStatsResult --> No video RTP packets received", _currentPacketsReceived);
           } else {
@@ -653,8 +613,8 @@ var StatsAnalyzer = /*#__PURE__*/function (_EventsScope) {
             if (_currentStats2.framesEncoded === _previousStats2.framesEncoded || _currentStats2.framesEncoded === 0) {
               _loggerProxy.default.logger.info("StatsAnalyzer:index#compareLastStatsResult --> No share frames getting encoded", _currentStats2.framesEncoded);
             }
-            if (this.statsResults.resolutions['video-share-send'].send.framesSent === this.lastStatsResults.resolutions['video-share-send'].send.framesSent || this.statsResults.resolutions['video-share-send'].send.framesSent === 0) {
-              _loggerProxy.default.logger.info("StatsAnalyzer:index#compareLastStatsResult --> No share frames sent", this.statsResults.resolutions['video-share-send'].send.framesSent);
+            if (this.statsResults['video-share-send'].send.framesSent === this.lastStatsResults['video-share-send'].send.framesSent || this.statsResults['video-share-send'].send.framesSent === 0) {
+              _loggerProxy.default.logger.info("StatsAnalyzer:index#compareLastStatsResult --> No share frames sent", this.statsResults['video-share-send'].send.framesSent);
             }
           }
         }
@@ -663,12 +623,12 @@ var StatsAnalyzer = /*#__PURE__*/function (_EventsScope) {
           // compare share stats received
           var _currentPacketsReceived2 = getCurrentStatsTotals('video-share-recv', 'totalPacketsReceived');
           var _previousPacketsReceived2 = getPreviousStatsTotals('video-share-recv', 'totalPacketsReceived');
-          var _currentFramesReceived = getCurrentResolutionsStatsTotals('video-share-recv', 'framesReceived');
-          var _previousFramesReceived = getPreviousResolutionsStatsTotals('video-share-recv', 'framesReceived');
+          var _currentFramesReceived = getCurrentStatsTotals('video-share-recv', 'framesReceived');
+          var _previousFramesReceived = getPreviousStatsTotals('video-share-recv', 'framesReceived');
           var _currentFramesDecoded = getCurrentStatsTotals('video-share-recv', 'framesDecoded');
           var _previousFramesDecoded = getPreviousStatsTotals('video-share-recv', 'framesDecoded');
-          var _currentFramesDropped = getCurrentResolutionsStatsTotals('video-share-recv', 'framesDropped');
-          var _previousFramesDropped = getPreviousResolutionsStatsTotals('video-share-recv', 'framesDropped');
+          var _currentFramesDropped = getCurrentStatsTotals('video-share-recv', 'framesDropped');
+          var _previousFramesDropped = getPreviousStatsTotals('video-share-recv', 'framesDropped');
           if (_currentPacketsReceived2 === _previousPacketsReceived2 || _currentPacketsReceived2 === 0) {
             _loggerProxy.default.logger.info("StatsAnalyzer:index#compareLastStatsResult --> No share RTP packets received", _currentPacketsReceived2);
           } else {
@@ -769,33 +729,15 @@ var StatsAnalyzer = /*#__PURE__*/function (_EventsScope) {
       if (result.bytesSent) {
         var kilobytes = 0;
         if (result.frameWidth && result.frameHeight) {
-          this.statsResults.resolutions[mediaType][sendrecvType].width = result.frameWidth;
-          this.statsResults.resolutions[mediaType][sendrecvType].height = result.frameHeight;
-          this.statsResults.resolutions[mediaType][sendrecvType].framesSent = result.framesSent;
-          this.statsResults.resolutions[mediaType][sendrecvType].hugeFramesSent = result.hugeFramesSent;
+          this.statsResults[mediaType][sendrecvType].width = result.frameWidth;
+          this.statsResults[mediaType][sendrecvType].height = result.frameHeight;
+          this.statsResults[mediaType][sendrecvType].framesSent = result.framesSent;
+          this.statsResults[mediaType][sendrecvType].hugeFramesSent = result.hugeFramesSent;
         }
-        if (!this.statsResults.internal[mediaType][sendrecvType].prevBytesSent) {
-          this.statsResults.internal[mediaType][sendrecvType].prevBytesSent = result.bytesSent;
-        }
-        if (!this.statsResults.internal[mediaType][sendrecvType].framesEncoded) {
-          this.statsResults.internal[mediaType][sendrecvType].framesEncoded = result.framesEncoded;
-        }
-        if (!this.statsResults.internal[mediaType][sendrecvType].keyFramesEncoded) {
-          this.statsResults.internal[mediaType][sendrecvType].keyFramesEncoded = result.keyFramesEncoded;
-        }
-        var bytes = result.bytesSent - this.statsResults.internal[mediaType][sendrecvType].prevBytesSent;
-        this.statsResults.internal[mediaType][sendrecvType].prevBytesSent = result.bytesSent;
-        kilobytes = bytes / 1024;
         this.statsResults[mediaType][sendrecvType].availableBandwidth = kilobytes.toFixed(1);
-        this.statsResults[mediaType].bytesSent = kilobytes;
-        this.statsResults[mediaType][sendrecvType].framesEncoded = result.framesEncoded - this.statsResults.internal[mediaType][sendrecvType].framesEncoded;
-        this.statsResults[mediaType][sendrecvType].keyFramesEncoded = result.keyFramesEncoded - this.statsResults.internal[mediaType][sendrecvType].keyFramesEncoded;
-        this.statsResults.internal[mediaType].outboundRtpId = result.id;
-        if (!this.statsResults.internal[mediaType][sendrecvType].packetsSent) {
-          this.statsResults.internal[mediaType][sendrecvType].packetsSent = result.packetsSent;
-        }
-        this.statsResults[mediaType][sendrecvType].packetsSent = result.packetsSent - this.statsResults.internal[mediaType][sendrecvType].packetsSent;
-        this.statsResults.internal[mediaType][sendrecvType].packetsSent = result.packetsSent;
+        this.statsResults[mediaType][sendrecvType].framesEncoded = result.framesEncoded;
+        this.statsResults[mediaType][sendrecvType].keyFramesEncoded = result.keyFramesEncoded;
+        this.statsResults[mediaType][sendrecvType].packetsSent = result.packetsSent;
 
         // Data saved to send MQA metrics
 
@@ -832,45 +774,27 @@ var StatsAnalyzer = /*#__PURE__*/function (_EventsScope) {
         var receiveSlot = this.receiveSlotCallback(result.ssrc);
         var idAndCsi = receiveSlot ? "id: \"".concat(receiveSlot.id || '', "\"").concat(receiveSlot.csi ? " and csi: ".concat(receiveSlot.csi) : '') : '';
         if (result.frameWidth && result.frameHeight) {
-          this.statsResults.resolutions[mediaType][sendrecvType].width = result.frameWidth;
-          this.statsResults.resolutions[mediaType][sendrecvType].height = result.frameHeight;
-          this.statsResults.resolutions[mediaType][sendrecvType].framesReceived = result.framesReceived;
+          this.statsResults[mediaType][sendrecvType].width = result.frameWidth;
+          this.statsResults[mediaType][sendrecvType].height = result.frameHeight;
+          this.statsResults[mediaType][sendrecvType].framesReceived = result.framesReceived;
         }
-        if (!this.statsResults.internal[mediaType][sendrecvType].prevBytesReceived) {
-          this.statsResults.internal[mediaType][sendrecvType].prevBytesReceived = result.bytesReceived;
-        }
-        if (!this.statsResults.internal[mediaType][sendrecvType].pliCount) {
-          this.statsResults.internal[mediaType][sendrecvType].pliCount = result.pliCount;
-        }
-        if (!this.statsResults.internal[mediaType][sendrecvType].packetsLost) {
-          this.statsResults.internal[mediaType][sendrecvType].packetsLost = result.packetsLost;
-        }
-        if (!this.statsResults.internal[mediaType][sendrecvType].totalPacketsReceived) {
-          this.statsResults.internal[mediaType][sendrecvType].totalPacketsReceived = result.packetsReceived;
-        }
-        if (!this.statsResults.internal[mediaType][sendrecvType].lastPacketReceivedTimestamp) {
-          this.statsResults.internal[mediaType][sendrecvType].lastPacketReceivedTimestamp = result.lastPacketReceivedTimestamp;
-        }
-        var bytes = result.bytesReceived - this.statsResults.internal[mediaType][sendrecvType].prevBytesReceived;
-        this.statsResults.internal[mediaType][sendrecvType].prevBytesReceived = result.bytesReceived;
+        var bytes = result.bytesReceived - this.statsResults[mediaType][sendrecvType].totalBytesReceived;
         kilobytes = bytes / 1024;
         this.statsResults[mediaType][sendrecvType].availableBandwidth = kilobytes.toFixed(1);
-        this.statsResults[mediaType].bytesReceived = kilobytes.toFixed(1);
-        this.statsResults[mediaType][sendrecvType].pliCount = result.pliCount - this.statsResults.internal[mediaType][sendrecvType].pliCount;
-        this.statsResults[mediaType][sendrecvType].currentPacketsLost = result.packetsLost - this.statsResults.internal[mediaType][sendrecvType].packetsLost;
-        if (this.statsResults[mediaType][sendrecvType].currentPacketsLost < 0) {
-          this.statsResults[mediaType][sendrecvType].currentPacketsLost = 0;
+        var currentPacketsLost = result.packetsLost - this.statsResults[mediaType][sendrecvType].totalPacketsLost;
+        if (currentPacketsLost < 0) {
+          currentPacketsLost = 0;
         }
-        this.statsResults[mediaType][sendrecvType].packetsReceived = result.packetsReceived - this.statsResults.internal[mediaType][sendrecvType].totalPacketsReceived;
-        this.statsResults.internal[mediaType][sendrecvType].totalPacketsReceived = result.packetsReceived;
-        if (this.statsResults[mediaType][sendrecvType].packetsReceived === 0) {
+        var currentPacketsReceived = result.packetsReceived - this.statsResults[mediaType][sendrecvType].totalPacketsReceived;
+        this.statsResults[mediaType][sendrecvType].totalPacketsReceived = result.packetsReceived;
+        if (currentPacketsReceived === 0) {
           if (receiveSlot) {
-            _loggerProxy.default.logger.info("StatsAnalyzer:index#processInboundRTPResult --> No packets received for receive slot ".concat(idAndCsi), this.statsResults[mediaType][sendrecvType].packetsReceived);
+            _loggerProxy.default.logger.info("StatsAnalyzer:index#processInboundRTPResult --> No packets received for receive slot ".concat(idAndCsi), currentPacketsReceived);
           }
         }
 
         //  Check the over all packet Lost ratio
-        this.statsResults[mediaType][sendrecvType].currentPacketLossRatio = this.statsResults[mediaType][sendrecvType].currentPacketsLost > 0 ? this.statsResults[mediaType][sendrecvType].currentPacketsLost / (this.statsResults[mediaType][sendrecvType].packetsReceived + this.statsResults[mediaType][sendrecvType].currentPacketsLost) : 0;
+        this.statsResults[mediaType][sendrecvType].currentPacketLossRatio = currentPacketsLost > 0 ? currentPacketsLost / (currentPacketsReceived + currentPacketsLost) : 0;
         if (this.statsResults[mediaType][sendrecvType].currentPacketLossRatio > 3) {
           _loggerProxy.default.logger.info("StatsAnalyzer:index#processInboundRTPResult --> Packets getting lost from the receiver with slot ".concat(idAndCsi), this.statsResults[mediaType][sendrecvType].currentPacketLossRatio);
         }
@@ -918,39 +842,8 @@ var StatsAnalyzer = /*#__PURE__*/function (_EventsScope) {
      * @returns {void}
      */
   }, {
-    key: "processTrackResult",
+    key: "compareSentAndReceived",
     value:
-    /**
-     * Process Track results
-     *
-     * @private
-     * @param {*} result
-     * @param {*} mediaType
-     * @returns {void}
-     * @memberof StatsAnalyzer
-     */
-    function processTrackResult(result, mediaType) {
-      if (!result || result.type !== 'track') {
-        return;
-      }
-      var sendrecvType = result.remoteSource === true ? _constants.STATS.RECEIVE_DIRECTION : _constants.STATS.SEND_DIRECTION;
-      if (sendrecvType === _constants.STATS.RECEIVE_DIRECTION) {
-        this.statsResults.resolutions[mediaType][sendrecvType].framesReceived = result.framesReceived;
-        this.statsResults.resolutions[mediaType][sendrecvType].framesDecoded = result.framesDecoded;
-        this.statsResults.resolutions[mediaType][sendrecvType].framesDropped = result.framesDropped;
-      }
-      if (result.trackIdentifier && !mediaType.includes('audio')) {
-        this.statsResults.resolutions[mediaType][sendrecvType].trackIdentifier = result.trackIdentifier;
-        var jitterBufferDelay = result && result.jitterBufferDelay;
-        var jitterBufferEmittedCount = result && result.jitterBufferEmittedCount;
-        this.statsResults.resolutions[mediaType][sendrecvType].avgJitterDelay = jitterBufferEmittedCount && +jitterBufferDelay / +jitterBufferEmittedCount;
-
-        // Used to calculate the jitter
-        this.statsResults.resolutions[mediaType][sendrecvType].jitterBufferDelay = result.jitterBufferDelay;
-        this.statsResults.resolutions[mediaType][sendrecvType].jitterBufferEmittedCount = result.jitterBufferEmittedCount;
-      }
-    }
-
     /**
      *
      * @private
@@ -959,19 +852,13 @@ var StatsAnalyzer = /*#__PURE__*/function (_EventsScope) {
      * @returns {void}
      * @memberof StatsAnalyzer
      */
-  }, {
-    key: "compareSentAndReceived",
-    value: function compareSentAndReceived(result, type) {
+    function compareSentAndReceived(result, type) {
       // Don't compare on transceivers without a sender.
-      if (!type || !this.statsResults.internal[type].send) {
+      if (!type || !this.statsResults[type].send) {
         return;
       }
       var mediaType = type;
-      if (!this.statsResults.internal[mediaType].send.totalPacketsLostOnReceiver) {
-        this.statsResults.internal[mediaType].send.totalPacketsLostOnReceiver = result.packetsLost;
-      }
-      var currentPacketLoss = result.packetsLost - this.statsResults.internal[mediaType].send.totalPacketsLostOnReceiver;
-      this.statsResults.internal[mediaType].send.totalPacketsLostOnReceiver = result.packetsLost;
+      var currentPacketLoss = result.packetsLost - this.statsResults[mediaType].send.totalPacketsLostOnReceiver;
       this.statsResults[mediaType].send.packetsLostOnReceiver = currentPacketLoss;
       this.statsResults[mediaType].send.totalPacketsLostOnReceiver = result.packetsLost;
       this.statsResults[mediaType].send.meanRemoteJitter.push(result.jitter);