@flashphoner/websdk 2.0.263 → 2.0.264

package/flashphoner-temasys-flash-websocket-without-adapterjs.js

@@ -13293,7 +13293,7 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
     },
     collectMetrics: function () {
       var _collectMetrics = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6() {
-        var stats, metrics, lostMetrics;
+        var stats, metrics, lostMetrics, headersUpdated;
         return _regenerator().w(function (_context6) {
           while (1) switch (_context6.n) {
             case 0:
@@ -13308,9 +13308,7 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
               return statCollector.mediaConnection.getWebRTCStats();
             case 1:
               stats = _context6.v;
-              if (!statCollector.metricsBatch) {
-                statCollector.metricsBatch = [];
-              }
+              statCollector.startNewBatch();
               metrics = [];
               lostMetrics = [];
               statCollector.headers.split(",").forEach(function (header) {
@@ -13320,7 +13318,7 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
                   id: components[1],
                   name: components[2]
                 };
-                var value = "NO";
+                var value = null;
                 if (stats[descriptor.type]) {
                   var _iterator2 = _createForOfIteratorHelper(stats[descriptor.type]),
                     _step2;
@@ -13338,36 +13336,44 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
                     _iterator2.f();
                   }
                 }
-                metrics.push(value);
-                if (value == "NO") {
+                if (value === null) {
                   lostMetrics.push(descriptor);
+                } else {
+                  metrics.push(value);
                 }
               });
-              if (lostMetrics.length) {
-                statCollector.logger.info(LOG_PREFIX + "-" + statCollector.id, "Missing metrics: " + JSON.stringify(lostMetrics));
-              }
-              statCollector.metricsBatch.push(metrics);
-              statCollector.batchCount--;
-              if (!(statCollector.batchCount === 0)) {
-                _context6.n = 2;
-                break;
-              }
+              // Metrics list may change if some metrics are added or some metrics are lost #WCS-4627
               _context6.n = 2;
-              return statCollector.sendMetrics();
+              return statCollector.updateHeaders(stats);
             case 2:
+              headersUpdated = _context6.v;
+              if (!lostMetrics.length) {
+                _context6.n = 4;
+                break;
+              }
+              statCollector.logger.info(LOG_PREFIX + "-" + statCollector.id, "Missing metrics: " + JSON.stringify(lostMetrics));
+              // Send metrics already collected and start a new batch with current metrics array to send them later #WCS-4627
               _context6.n = 3;
-              return statCollector.updateHeaders(stats);
+              return statCollector.sendMetrics();
             case 3:
-              if (!_context6.v) {
+              statCollector.startNewBatch(metrics);
+              _context6.n = 5;
+              break;
+            case 4:
+              statCollector.metricsBatch.push(metrics);
+              statCollector.batchCount--;
+              if (!(statCollector.batchCount === 0 || headersUpdated)) {
                 _context6.n = 5;
                 break;
               }
-              statCollector.logger.info(LOG_PREFIX + "-" + statCollector.id, "RTC metrics list has changed, sending a new metrics description");
-              _context6.n = 4;
+              _context6.n = 5;
               return statCollector.sendMetrics();
-            case 4:
-              statCollector.sendHeaders();
             case 5:
+              // Check if metrics list changed and send a new headers if needed #WCS-4619
+              if (headersUpdated) {
+                statCollector.logger.info(LOG_PREFIX + "-" + statCollector.id, "RTC metrics list has changed, sending a new metrics description");
+                statCollector.sendHeaders();
+              }
               statCollector.timerBusy = false;
             case 6:
               return _context6.a(2);
@@ -13386,7 +13392,7 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
           while (1) switch (_context7.p = _context7.n) {
             case 0:
               metricsToSend = [];
-              for (i = 0; i < statCollector.metricsBatch.length; i++) {
+              for (i = 0; statCollector.metricsBatch && i < statCollector.metricsBatch.length; i++) {
                 metricsString = "";
                 for (j = 0; j < statCollector.metricsBatch[i].length; j++) {
                   valueString = valueToString(statCollector.metricsBatch[i][j]);
@@ -13435,8 +13441,7 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
                 };
                 statCollector.send("webRTCMetricsBatch", data);
               }
-              statCollector.metricsBatch = null;
-              statCollector.batchCount = statCollector.description.batchSize;
+              statCollector.cleanBatch();
             case 7:
               return _context7.a(2);
           }
@@ -13446,7 +13451,21 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
         return _sendMetrics.apply(this, arguments);
       }
       return sendMetrics;
-    }()
+    }(),
+    startNewBatch: function startNewBatch(metrics) {
+      if (!statCollector.metricsBatch) {
+        statCollector.metricsBatch = [];
+        if (metrics) {
+          statCollector.metricsBatch.push(metrics);
+        }
+      }
+    },
+    cleanBatch: function cleanBatch() {
+      if (statCollector.metricsBatch) {
+        statCollector.metricsBatch = null;
+        statCollector.batchCount = statCollector.description.batchSize;
+      }
+    }
   };
   return statCollector;
 };

package/flashphoner-temasys-flash-websocket.js

@@ -20048,7 +20048,7 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
     },
     collectMetrics: function () {
       var _collectMetrics = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6() {
-        var stats, metrics, lostMetrics;
+        var stats, metrics, lostMetrics, headersUpdated;
         return _regenerator().w(function (_context6) {
           while (1) switch (_context6.n) {
             case 0:
@@ -20063,9 +20063,7 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
               return statCollector.mediaConnection.getWebRTCStats();
             case 1:
               stats = _context6.v;
-              if (!statCollector.metricsBatch) {
-                statCollector.metricsBatch = [];
-              }
+              statCollector.startNewBatch();
               metrics = [];
               lostMetrics = [];
               statCollector.headers.split(",").forEach(function (header) {
@@ -20075,7 +20073,7 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
                   id: components[1],
                   name: components[2]
                 };
-                var value = "NO";
+                var value = null;
                 if (stats[descriptor.type]) {
                   var _iterator2 = _createForOfIteratorHelper(stats[descriptor.type]),
                     _step2;
@@ -20093,36 +20091,44 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
                     _iterator2.f();
                   }
                 }
-                metrics.push(value);
-                if (value == "NO") {
+                if (value === null) {
                   lostMetrics.push(descriptor);
+                } else {
+                  metrics.push(value);
                 }
               });
-              if (lostMetrics.length) {
-                statCollector.logger.info(LOG_PREFIX + "-" + statCollector.id, "Missing metrics: " + JSON.stringify(lostMetrics));
-              }
-              statCollector.metricsBatch.push(metrics);
-              statCollector.batchCount--;
-              if (!(statCollector.batchCount === 0)) {
-                _context6.n = 2;
-                break;
-              }
+              // Metrics list may change if some metrics are added or some metrics are lost #WCS-4627
               _context6.n = 2;
-              return statCollector.sendMetrics();
+              return statCollector.updateHeaders(stats);
             case 2:
+              headersUpdated = _context6.v;
+              if (!lostMetrics.length) {
+                _context6.n = 4;
+                break;
+              }
+              statCollector.logger.info(LOG_PREFIX + "-" + statCollector.id, "Missing metrics: " + JSON.stringify(lostMetrics));
+              // Send metrics already collected and start a new batch with current metrics array to send them later #WCS-4627
               _context6.n = 3;
-              return statCollector.updateHeaders(stats);
+              return statCollector.sendMetrics();
             case 3:
-              if (!_context6.v) {
+              statCollector.startNewBatch(metrics);
+              _context6.n = 5;
+              break;
+            case 4:
+              statCollector.metricsBatch.push(metrics);
+              statCollector.batchCount--;
+              if (!(statCollector.batchCount === 0 || headersUpdated)) {
                 _context6.n = 5;
                 break;
               }
-              statCollector.logger.info(LOG_PREFIX + "-" + statCollector.id, "RTC metrics list has changed, sending a new metrics description");
-              _context6.n = 4;
+              _context6.n = 5;
               return statCollector.sendMetrics();
-            case 4:
-              statCollector.sendHeaders();
             case 5:
+              // Check if metrics list changed and send a new headers if needed #WCS-4619
+              if (headersUpdated) {
+                statCollector.logger.info(LOG_PREFIX + "-" + statCollector.id, "RTC metrics list has changed, sending a new metrics description");
+                statCollector.sendHeaders();
+              }
               statCollector.timerBusy = false;
             case 6:
               return _context6.a(2);
@@ -20141,7 +20147,7 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
           while (1) switch (_context7.p = _context7.n) {
             case 0:
               metricsToSend = [];
-              for (i = 0; i < statCollector.metricsBatch.length; i++) {
+              for (i = 0; statCollector.metricsBatch && i < statCollector.metricsBatch.length; i++) {
                 metricsString = "";
                 for (j = 0; j < statCollector.metricsBatch[i].length; j++) {
                   valueString = valueToString(statCollector.metricsBatch[i][j]);
@@ -20190,8 +20196,7 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
                 };
                 statCollector.send("webRTCMetricsBatch", data);
               }
-              statCollector.metricsBatch = null;
-              statCollector.batchCount = statCollector.description.batchSize;
+              statCollector.cleanBatch();
             case 7:
               return _context7.a(2);
           }
@@ -20201,7 +20206,21 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
         return _sendMetrics.apply(this, arguments);
       }
       return sendMetrics;
-    }()
+    }(),
+    startNewBatch: function startNewBatch(metrics) {
+      if (!statCollector.metricsBatch) {
+        statCollector.metricsBatch = [];
+        if (metrics) {
+          statCollector.metricsBatch.push(metrics);
+        }
+      }
+    },
+    cleanBatch: function cleanBatch() {
+      if (statCollector.metricsBatch) {
+        statCollector.metricsBatch = null;
+        statCollector.batchCount = statCollector.description.batchSize;
+      }
+    }
   };
   return statCollector;
 };