@flashphoner/websdk 2.0.265 → 2.0.266

package/flashphoner-webrtc-only.js

@@ -11024,6 +11024,10 @@ module.exports = {
 'use strict';
 
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -11033,14 +11037,25 @@ function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 var util = require('./util');
 var LOG_PREFIX = "stats-collector";
+var CONNECTION_TYPE = {
+  WEBSOCKET: "ws",
+  HTTP: "http"
+};
+var MAX_SEND_ERRORS = 3;
+var CONNECTION_STATUS = {
+  INIT: 0,
+  OK: 200,
+  BAD_REQUEST: 400,
+  INTERNAL_SERVER_ERROR: 500
+};
 
 // Collect and send WebRTC statistics periodically
-var StreamStatsCollector = function StreamStatsCollector(description, id, mediaConnection, wsConnection, logger) {
+var StreamStatsCollector = function StreamStatsCollector(description, id, mediaConnection, wsConnection, logger, maxErrors) {
   var statCollector = {
     description: description,
     id: id,
     mediaConnection: mediaConnection,
-    wsConnection: wsConnection,
+    connection: Connection(wsConnection, maxErrors),
     logger: getLogger(logger),
     headers: "",
     compression: "none",
@@ -11050,7 +11065,7 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
     timerBusy: false,
     start: function () {
       var _start = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-        var error;
+        var error, authHeader;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
@@ -11079,19 +11094,25 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
               }
               throw new Error(error + "no media connection available");
             case 4:
-              if (statCollector.wsConnection) {
-                _context.n = 5;
-                break;
+              statCollector.logger.debug(LOG_PREFIX, "RTCMetricsServerDescription: " + JSON.stringify(statCollector.description));
+              if (statCollector.description.ingestPoint) {
+                authHeader = null;
+                if (statCollector.description.authorization) {
+                  authHeader = {
+                    Authorization: statCollector.description.authorization
+                  };
+                }
+                statCollector.connection.setUp(statCollector.description.ingestPoint, authHeader);
               }
-              throw new Error(error + "no websocket connection available");
+              _context.n = 5;
+              return statCollector.updateHeaders();
             case 5:
               _context.n = 6;
-              return statCollector.updateHeaders();
+              return statCollector.updateCompression();
             case 6:
               _context.n = 7;
-              return statCollector.updateCompression();
+              return statCollector.sendHeaders();
             case 7:
-              statCollector.sendHeaders();
               if (statCollector.description.collect === "on") {
                 statCollector.collect(true);
               }
@@ -11106,7 +11127,7 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
       return start;
     }(),
     collect: function collect(enable) {
-      if (enable) {
+      if (enable && statCollector.connection.status === CONNECTION_STATUS.OK) {
         statCollector.startTimer();
       } else {
         statCollector.stopTimer();
@@ -11126,15 +11147,12 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
                 _context2.n = 1;
                 break;
               }
-              if (!statCollector.logger) {
-                _context2.n = 1;
-                break;
-              }
               statCollector.logger.error(LOG_PREFIX + "-" + statCollector.id, "Can't update WebRTC metrics sending: no parameters passed");
               return _context2.a(2);
             case 1:
+              statCollector.logger.debug(LOG_PREFIX, "New RTCMetricsServerDescription: " + JSON.stringify(description));
               if (!(description.types || description.compression)) {
-                _context2.n = 4;
+                _context2.n = 6;
                 break;
               }
               statCollector.stop();
@@ -11154,12 +11172,20 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
               _context2.n = 3;
               return statCollector.updateCompression();
             case 3:
-              statCollector.sendHeaders();
-              _context2.n = 5;
-              break;
+              _context2.n = 4;
+              return statCollector.sendHeaders();
             case 4:
-              statCollector.collect(false);
+              if (!(statCollector.connection.status !== CONNECTION_STATUS.OK)) {
+                _context2.n = 5;
+                break;
+              }
+              return _context2.a(2);
             case 5:
+              _context2.n = 7;
+              break;
+            case 6:
+              statCollector.collect(false);
+            case 7:
               if (description.batchSize) {
                 statCollector.description.batchSize = description.batchSize;
               }
@@ -11170,15 +11196,15 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
                 statCollector.description.collect = description.collect;
               }
               _t = statCollector.description.collect;
-              _context2.n = _t === "on" ? 6 : _t === "off" ? 7 : 8;
+              _context2.n = _t === "on" ? 8 : _t === "off" ? 9 : 10;
               break;
-            case 6:
+            case 8:
               statCollector.collect(true);
-              return _context2.a(3, 8);
-            case 7:
+              return _context2.a(3, 10);
+            case 9:
               statCollector.collect(false);
-              return _context2.a(3, 8);
-            case 8:
+              return _context2.a(3, 10);
+            case 10:
               return _context2.a(2);
           }
         }, _callee2);
@@ -11362,23 +11388,56 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
       }
       return checkForCompression;
     }(),
-    sendHeaders: function sendHeaders() {
-      var data = {
-        mediaSessionId: statCollector.id,
-        compression: statCollector.compression,
-        headers: statCollector.headers
-      };
-      statCollector.send("webRTCMetricsClientDescription", data);
-    },
-    send: function send(message, data) {
-      statCollector.logger.debug(LOG_PREFIX + "-" + statCollector.id, data);
-      if (statCollector.wsConnection.readyState === WebSocket.OPEN) {
-        statCollector.wsConnection.send(JSON.stringify({
-          message: message,
-          data: [data]
-        }));
+    sendHeaders: function () {
+      var _sendHeaders = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6() {
+        var data;
+        return _regenerator().w(function (_context6) {
+          while (1) switch (_context6.n) {
+            case 0:
+              data = {
+                mediaSessionId: statCollector.id,
+                compression: statCollector.compression,
+                headers: statCollector.headers
+              };
+              _context6.n = 1;
+              return statCollector.send("webRTCMetricsClientDescription", data);
+            case 1:
+              return _context6.a(2);
+          }
+        }, _callee6);
+      }));
+      function sendHeaders() {
+        return _sendHeaders.apply(this, arguments);
       }
-    },
+      return sendHeaders;
+    }(),
+    send: function () {
+      var _send = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(message, data) {
+        return _regenerator().w(function (_context7) {
+          while (1) switch (_context7.n) {
+            case 0:
+              if (!(statCollector.connection.status === CONNECTION_STATUS.INIT || statCollector.connection.status === CONNECTION_STATUS.OK)) {
+                _context7.n = 2;
+                break;
+              }
+              statCollector.logger.debug(LOG_PREFIX + "-" + statCollector.id, data);
+              _context7.n = 1;
+              return statCollector.connection.send(message, data);
+            case 1:
+              if (statCollector.connection.status !== CONNECTION_STATUS.OK) {
+                statCollector.logger.error(LOG_PREFIX + "-" + statCollector.id, "Error " + statCollector.connection.status + " sending RTC metrics to the server, stop sending");
+                statCollector.stop();
+              }
+            case 2:
+              return _context7.a(2);
+          }
+        }, _callee7);
+      }));
+      function send(_x3, _x4) {
+        return _send.apply(this, arguments);
+      }
+      return send;
+    }(),
     startTimer: function startTimer() {
       if (!statCollector.timer && statCollector.headers) {
         statCollector.batchCount = statCollector.description.batchSize;
@@ -11393,22 +11452,22 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
       }
     },
     collectMetrics: function () {
-      var _collectMetrics = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6() {
+      var _collectMetrics = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8() {
         var stats, metrics, lostMetrics, headersUpdated;
-        return _regenerator().w(function (_context6) {
-          while (1) switch (_context6.n) {
+        return _regenerator().w(function (_context8) {
+          while (1) switch (_context8.n) {
             case 0:
               if (!(statCollector.timer && !statCollector.timerBusy)) {
-                _context6.n = 6;
+                _context8.n = 7;
                 break;
               }
               // Unfortunately there are no real atomics in JS unless SharedArrayBuffer is used
               // So we guard the timer callback with a dumb boolean
               statCollector.timerBusy = true;
-              _context6.n = 1;
+              _context8.n = 1;
               return statCollector.mediaConnection.getWebRTCStats();
             case 1:
-              stats = _context6.v;
+              stats = _context8.v;
               statCollector.startNewBatch();
               metrics = [];
               lostMetrics = [];
@@ -11444,42 +11503,45 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
                 }
               });
               // Metrics list may change if some metrics are added or some metrics are lost #WCS-4627
-              _context6.n = 2;
+              _context8.n = 2;
               return statCollector.updateHeaders(stats);
             case 2:
-              headersUpdated = _context6.v;
+              headersUpdated = _context8.v;
               if (!lostMetrics.length) {
-                _context6.n = 4;
+                _context8.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;
+              _context8.n = 3;
               return statCollector.sendMetrics();
             case 3:
               statCollector.startNewBatch(metrics);
-              _context6.n = 5;
+              _context8.n = 5;
               break;
             case 4:
               statCollector.metricsBatch.push(metrics);
               statCollector.batchCount--;
               if (!(statCollector.batchCount === 0 || headersUpdated)) {
-                _context6.n = 5;
+                _context8.n = 5;
                 break;
               }
-              _context6.n = 5;
+              _context8.n = 5;
               return statCollector.sendMetrics();
             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();
+              if (!headersUpdated) {
+                _context8.n = 6;
+                break;
               }
-              statCollector.timerBusy = false;
+              statCollector.logger.info(LOG_PREFIX + "-" + statCollector.id, "RTC metrics list has changed, sending a new metrics description");
+              _context8.n = 6;
+              return statCollector.sendHeaders();
             case 6:
-              return _context6.a(2);
+              statCollector.timerBusy = false;
+            case 7:
+              return _context8.a(2);
           }
-        }, _callee6);
+        }, _callee8);
       }));
       function collectMetrics() {
         return _collectMetrics.apply(this, arguments);
@@ -11487,10 +11549,10 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
       return collectMetrics;
     }(),
     sendMetrics: function () {
-      var _sendMetrics = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7() {
+      var _sendMetrics = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9() {
         var previous, metricsToSend, metricsData, i, metricsString, j, valueString, previousString, delimiter, data, _t3;
-        return _regenerator().w(function (_context7) {
-          while (1) switch (_context7.p = _context7.n) {
+        return _regenerator().w(function (_context9) {
+          while (1) switch (_context9.p = _context9.n) {
             case 0:
               metricsToSend = [];
               for (i = 0; statCollector.metricsBatch && i < statCollector.metricsBatch.length; i++) {
@@ -11514,39 +11576,43 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
                 metricsToSend.push(metricsString);
               }
               if (!(statCollector.compression !== "none")) {
-                _context7.n = 5;
+                _context9.n = 5;
                 break;
               }
-              _context7.p = 1;
-              _context7.n = 2;
+              _context9.p = 1;
+              _context9.n = 2;
               return util.compress(statCollector.compression, JSON.stringify(metricsToSend), true);
             case 2:
-              metricsData = _context7.v;
-              _context7.n = 4;
+              metricsData = _context9.v;
+              _context9.n = 4;
               break;
             case 3:
-              _context7.p = 3;
-              _t3 = _context7.v;
+              _context9.p = 3;
+              _t3 = _context9.v;
               statCollector.logger.warn(LOG_PREFIX + "-" + statCollector.id, "Can't send metrics data using" + statCollector.compression + ": " + _t3);
               metricsData = null;
             case 4:
-              _context7.n = 6;
+              _context9.n = 6;
               break;
             case 5:
               metricsData = metricsToSend;
             case 6:
-              if (metricsData) {
-                data = {
-                  mediaSessionId: statCollector.id,
-                  metrics: metricsData
-                };
-                statCollector.send("webRTCMetricsBatch", data);
+              if (!metricsData) {
+                _context9.n = 7;
+                break;
               }
-              statCollector.cleanBatch();
+              data = {
+                mediaSessionId: statCollector.id,
+                metrics: metricsData
+              };
+              _context9.n = 7;
+              return statCollector.send("webRTCMetricsBatch", data);
             case 7:
-              return _context7.a(2);
+              statCollector.cleanBatch();
+            case 8:
+              return _context9.a(2);
           }
-        }, _callee7, null, [[1, 3]]);
+        }, _callee9, null, [[1, 3]]);
       }));
       function sendMetrics() {
         return _sendMetrics.apply(this, arguments);
@@ -11571,6 +11637,163 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
   return statCollector;
 };
 
+// Wrapper to send metrics via Websocket or HTTP POST
+var Connection = function Connection() {
+  var existingConnection = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+  var maxErrors = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : MAX_SEND_ERRORS;
+  var connection = {
+    type: "",
+    websocket: null,
+    http: null,
+    maxErrors: maxErrors,
+    errorsCount: 0,
+    status: CONNECTION_STATUS.INIT,
+    setUp: function setUp(url) {
+      var headers = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+      var existingConnection = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+      if (url.startsWith(CONNECTION_TYPE.WEBSOCKET)) {
+        connection.type = CONNECTION_TYPE.WEBSOCKET;
+        // ToDo: create a new Websocket connection
+      } else if (url.startsWith(CONNECTION_TYPE.HTTP)) {
+        connection.type = CONNECTION_TYPE.HTTP;
+        connection.http = HttpConnection(url, headers);
+      } else if (existingConnection) {
+        connection.type = CONNECTION_TYPE.WEBSOCKET;
+        connection.websocket = WebsocketConnection(existingConnection);
+      }
+      connection.errorsCount = 0;
+      connection.status = CONNECTION_STATUS.INIT;
+    },
+    send: function () {
+      var _send2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(message, data) {
+        var code, _t4;
+        return _regenerator().w(function (_context0) {
+          while (1) switch (_context0.n) {
+            case 0:
+              code = CONNECTION_STATUS.BAD_REQUEST;
+              _t4 = connection.type;
+              _context0.n = _t4 === CONNECTION_TYPE.WEBSOCKET ? 1 : _t4 === CONNECTION_TYPE.HTTP ? 2 : 5;
+              break;
+            case 1:
+              if (connection.websocket) {
+                code = connection.websocket.send(message, data);
+              }
+              return _context0.a(3, 5);
+            case 2:
+              if (!connection.http) {
+                _context0.n = 4;
+                break;
+              }
+              _context0.n = 3;
+              return connection.http.send(message, data);
+            case 3:
+              code = _context0.v;
+            case 4:
+              return _context0.a(3, 5);
+            case 5:
+              connection.status = code;
+              if (connection.status === CONNECTION_STATUS.OK) {
+                connection.errorsCount = 0;
+              } else {
+                if (message === "webRTCMetricsBatch") {
+                  connection.errorsCount++;
+                  if (connection.errorsCount < connection.maxErrors) {
+                    connection.status = CONNECTION_STATUS.OK;
+                  }
+                }
+              }
+            case 6:
+              return _context0.a(2);
+          }
+        }, _callee0);
+      }));
+      function send(_x5, _x6) {
+        return _send2.apply(this, arguments);
+      }
+      return send;
+    }()
+  };
+  connection.setUp("", null, existingConnection);
+  return connection;
+};
+
+// Websocket connection (using existing one)
+var WebsocketConnection = function WebsocketConnection(wsConnection) {
+  var connection = {
+    websocket: wsConnection,
+    send: function send(message, data) {
+      var code = CONNECTION_STATUS.BAD_REQUEST;
+      if (connection.websocket) {
+        console.log(connection.websocket);
+        if (connection.websocket.readyState === WebSocket.OPEN) {
+          connection.websocket.send(JSON.stringify({
+            message: message,
+            data: [data]
+          }));
+        }
+        code = CONNECTION_STATUS.OK;
+      }
+      return code;
+    }
+  };
+  return connection;
+};
+
+// HTTP connection using Fetch API
+var HttpConnection = function HttpConnection(url, headers) {
+  var connection = {
+    url: addSlash(url),
+    headers: headers,
+    send: function () {
+      var _send3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1(message, data) {
+        var code, httpHeaders, _i2, _Object$entries, _Object$entries$_i, header, value, response, _t5;
+        return _regenerator().w(function (_context1) {
+          while (1) switch (_context1.p = _context1.n) {
+            case 0:
+              code = CONNECTION_STATUS.BAD_REQUEST;
+              if (!connection.url) {
+                _context1.n = 4;
+                break;
+              }
+              _context1.p = 1;
+              httpHeaders = new Headers();
+              httpHeaders.append("Content-Type", "application/json");
+              if (connection.headers) {
+                for (_i2 = 0, _Object$entries = Object.entries(connection.headers); _i2 < _Object$entries.length; _i2++) {
+                  _Object$entries$_i = _slicedToArray(_Object$entries[_i2], 2), header = _Object$entries$_i[0], value = _Object$entries$_i[1];
+                  httpHeaders.append(header, value);
+                }
+              }
+              _context1.n = 2;
+              return fetch(connection.url + message, {
+                method: "POST",
+                headers: httpHeaders,
+                mode: "cors",
+                body: JSON.stringify(data)
+              });
+            case 2:
+              response = _context1.v;
+              code = response.status;
+              _context1.n = 4;
+              break;
+            case 3:
+              _context1.p = 3;
+              _t5 = _context1.v;
+              code = CONNECTION_STATUS.INTERNAL_SERVER_ERROR;
+            case 4:
+              return _context1.a(2, code);
+          }
+        }, _callee1, null, [[1, 3]]);
+      }));
+      function send(_x7, _x8) {
+        return _send3.apply(this, arguments);
+      }
+      return send;
+    }()
+  };
+  return connection;
+};
+
 // Helper function to stringify a value
 var valueToString = function valueToString(value) {
   var valueString = "undefined";
@@ -11596,6 +11819,15 @@ var getLogger = function getLogger(logger) {
     debug: function debug() {}
   };
 };
+
+// Helper function to add slash to endpoint
+var addSlash = function addSlash(value) {
+  var endpoint = value;
+  if (endpoint && !endpoint.endsWith("/")) {
+    endpoint = endpoint + "/";
+  }
+  return endpoint;
+};
 module.exports = {
   StreamStatsCollector: StreamStatsCollector
 };