@flashphoner/websdk 2.0.271 → 2.0.274

package/flashphoner.js

@@ -8999,6 +8999,34 @@ var getMediaDevices = function getMediaDevices(mediaProvider, labels, kind, devi
   return MediaProvider[mediaProvider].listDevices(labels, kind, deviceConstraints);
 };
 
+/**
+ * Get mobile local media devices
+ *
+ * @param {String=} mediaProvider Media provider that will be asked for device list
+ * @param {Flashphoner.constants.MEDIA_DEVICE_KIND} kind Media devices kind to access:
+ * MEDIA_DEVICE_KIND.INPUT (default) get access to input devices only (camera, mic).
+ * MEDIA_DEVICE_KIND.OUTPUT get access to output devices only (speaker, headphone).
+ * MEDIA_DEVICE_KIND.ALL get access to all devices (cam, mic, speaker, headphone).
+ * @param {Object=} deviceConstraints
+ * If {audio: true, video: false}, then access to the camera will not be requested.
+ * If {audio: false, video: true}, then access to the microphone will not be requested.
+ * @returns {Promise.<Flashphoner.MediaDeviceList>} Promise with media device list on fulfill
+ * @throws {Error} Error if API is not initialized
+ * @memberof Flashphoner
+ */
+var getMobileDevices = function getMobileDevices(mediaProvider, kind, deviceConstraints) {
+  if (!initialized) {
+    throw new Error("Flashphoner API is not initialized");
+  }
+  if (!mediaProvider) {
+    mediaProvider = getMediaProviders()[0];
+  }
+  if (MediaProvider[mediaProvider].getMobileDevices) {
+    return MediaProvider[mediaProvider].getMobileDevices(kind, deviceConstraints);
+  }
+  return [];
+};
+
 /**
  * Get access to local media
  *
@@ -9436,36 +9464,19 @@ var createSession = function createSession(options) {
             streamRefreshHandlers[obj.mediaSessionId](obj);
           }
           break;
-        case "webRTCMetricsDescriptionUpdate":
-          if (obj.ids) {
-            obj.ids.forEach(function (id) {
-              if (streamRefreshHandlers[id]) {
-                streamRefreshHandlers[id](obj);
-              }
-            });
-          } else {
-            if (obj.compression) {
-              webRTCMetricsServerDescription.compression = obj.compression;
-            }
-            if (obj.batchSize) {
-              webRTCMetricsServerDescription.batchSize = obj.batchSize;
-            }
-            if (obj.sampling) {
-              webRTCMetricsServerDescription.sampling = obj.sampling;
-            }
-            if (obj.types) {
-              webRTCMetricsServerDescription.types = obj.types;
-            }
-            if (obj.collect) {
-              webRTCMetricsServerDescription.collect = obj.collect;
-            }
-            for (var _i = 0, _Object$entries = Object.entries(streamRefreshHandlers); _i < _Object$entries.length; _i++) {
-              var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
-                _id = _Object$entries$_i[0],
-                handler = _Object$entries$_i[1];
-              handler(obj);
-            }
-          }
+        case 'webRTCMetricsDescriptionUpdate':
+          handleWebRTCMetricsUpdate(obj, {
+            compression: "compression",
+            batchSize: "batchSize",
+            sampling: "sampling",
+            types: "types",
+            collect: "collect"
+          });
+          break;
+        case 'webRTCMetricsTokenRefresh':
+          handleWebRTCMetricsUpdate(obj, {
+            authorization: "authorization"
+          });
           break;
         default:
           logger.info(LOG_PREFIX, "Unknown server message " + data.message);
@@ -9475,6 +9486,31 @@ var createSession = function createSession(options) {
       wsPingReceiver.success();
     };
   }
+  function handleWebRTCMetricsUpdate(obj) {
+    var updateFields = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    if (obj.ids) {
+      obj.ids.forEach(function (id) {
+        if (streamRefreshHandlers[id]) {
+          streamRefreshHandlers[id](obj);
+        }
+      });
+    } else {
+      Object.entries(updateFields).forEach(function (_ref2) {
+        var _ref3 = _slicedToArray(_ref2, 2),
+          key = _ref3[0],
+          value = _ref3[1];
+        if (obj[value] !== undefined) {
+          webRTCMetricsServerDescription[key] = obj[value];
+        }
+      });
+      for (var _i = 0, _Object$entries = Object.entries(streamRefreshHandlers); _i < _Object$entries.length; _i++) {
+        var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
+          _id = _Object$entries$_i[0],
+          handler = _Object$entries$_i[1];
+        handler(obj);
+      }
+    }
+  }
 
   //WebSocket send helper
   function send(message, data) {
@@ -10609,6 +10645,10 @@ var createSession = function createSession(options) {
           statsCollector.start();
         }
       }
+      if (streamInfo.authorization && statsCollector && statsCollector.description.ingestPoint) {
+        statsCollector.description.authorization = streamInfo.authorization;
+        statsCollector.updateHttpConnection(statsCollector.description.ingestPoint, statsCollector.description.authorization);
+      }
 
       // Pause or resume metrics collection
       if (!streamInfo.status && streamInfo.collect !== undefined && statsCollector) {
@@ -11463,7 +11503,7 @@ var createSession = function createSession(options) {
      * @memberof Stream
      */
     var setZoom = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(value) {
+      var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(value) {
         return _regenerator().w(function (_context2) {
           while (1) switch (_context2.n) {
             case 0:
@@ -11483,7 +11523,7 @@ var createSession = function createSession(options) {
         }, _callee2);
       }));
       return function setZoom(_x2) {
-        return _ref2.apply(this, arguments);
+        return _ref4.apply(this, arguments);
       };
     }();
     stream.play = play;
@@ -11835,6 +11875,7 @@ module.exports = {
   isUsingTemasys: isUsingTemasys,
   getMediaProviders: getMediaProviders,
   getMediaDevices: getMediaDevices,
+  getMobileDevices: getMobileDevices,
   getMediaAccess: getMediaAccess,
   releaseLocalMedia: releaseLocalMedia,
   getSessions: getSessions,
@@ -12202,6 +12243,11 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
       }
       return updateCompression;
     }(),
+    updateHttpConnection: function updateHttpConnection(url, authorization) {
+      if (url.startsWith(CONNECTION_TYPE.HTTP) && authorization) {
+        statCollector.connection.http.setAuthorization(authorization);
+      }
+    },
     checkForCompression: function () {
       var _checkForCompression = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(compression) {
         var _t2;
@@ -12293,6 +12339,9 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
         statCollector.metricsBatch = null;
       }
     },
+    isMetricValid: function isMetricValid(value) {
+      return value != null && value !== "" && value !== "undefined" && value !== "null";
+    },
     collectMetrics: function () {
       var _collectMetrics = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8() {
         var stats, metrics, lostMetrics, headersUpdated;
@@ -12339,7 +12388,7 @@ var StreamStatsCollector = function StreamStatsCollector(description, id, mediaC
                       _iterator2.f();
                     }
                   }
-                  if (value) {
+                  if (statCollector.isMetricValid(value)) {
                     metrics.push(value);
                   } else {
                     lostMetrics.push(descriptor);
@@ -12593,6 +12642,9 @@ var HttpConnection = function HttpConnection(url, headers) {
   var connection = {
     url: addSlash(url),
     headers: headers,
+    setAuthorization: function setAuthorization(token) {
+      this.headers.Authorization = token;
+    },
     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;
@@ -14834,6 +14886,66 @@ var available = function available() {
   //return (adapter.browserDetails.browser != "edge") ? navigator.getUserMedia && RTCPeerConnection : false;
   return 'getUserMedia' in navigator && 'RTCPeerConnection' in window;
 };
+
+/**
+ * Helper function to get media devices list in id, label, type form
+ *
+ * @param devices
+ * @param kind
+ * @param videoFilter
+ * @returns {{audio: *[], video: *[]}}
+ */
+var getList = function getList(devices, kind) {
+  var videoFilter = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+  var list = {
+    audio: [],
+    video: []
+  };
+  var micCount = 0;
+  var outputCount = 0;
+  var camCount = 0;
+  for (var i = 0; i < devices.length; i++) {
+    var device = devices[i];
+    var ret = {
+      id: device.deviceId,
+      label: device.label
+    };
+    if (device.kind.indexOf("audio" + kind) === 0 && device.deviceId !== "communications") {
+      ret.type = device.kind === "audioinput" ? "mic" : "speaker";
+      if (ret.type === "mic" && ret.label === "") {
+        ret.label = 'microphone' + ++micCount;
+      }
+      if (ret.type === "speaker" && ret.label === "") {
+        ret.label = 'speaker' + ++outputCount;
+      }
+      list.audio.push(ret);
+    } else if (device.kind.indexOf("video" + kind) === 0) {
+      if (!videoFilter || videoFilter.find(function (id) {
+        return id === device.deviceId;
+      })) {
+        if (ret.label === "") {
+          ret.label = 'camera' + ++camCount;
+        }
+        ret.type = "camera";
+        list.video.push(ret);
+      } else {
+        logger.debug(LOG_PREFIX, "Video device " + device.deviceId + "does not conform the filter " + JSON.stringify(videoFilter));
+      }
+    } else {
+      logger.debug(LOG_PREFIX, "unknown device " + device.kind + " id " + device.deviceId);
+    }
+  }
+  return list;
+};
+
+/**
+ * Get media devices list
+ *
+ * @param labels
+ * @param kind
+ * @param deviceConstraints
+ * @returns {Promise<{audio: [], video: []}>}
+ */
 var listDevices = function listDevices(labels, kind, deviceConstraints) {
   //WCS-1963. added deviceConstraints.
   if (!deviceConstraints) {
@@ -14844,7 +14956,7 @@ var listDevices = function listDevices(labels, kind, deviceConstraints) {
   }
   if (!kind) {
     kind = constants.MEDIA_DEVICE_KIND.INPUT;
-  } else if (kind == "all") {
+  } else if (kind === constants.MEDIA_DEVICE_KIND.ALL) {
     kind = "";
   }
   var getConstraints = function getConstraints(devices) {
@@ -14852,50 +14964,15 @@ var listDevices = function listDevices(labels, kind, deviceConstraints) {
     for (var i = 0; i < devices.length; i++) {
       var device = devices[i];
       if (device.kind.indexOf("audio" + kind) === 0 && deviceConstraints.audio) {
-        constraints.audio = true;
+        constraints.audio = deviceConstraints.audio;
       } else if (device.kind.indexOf("video" + kind) === 0 && deviceConstraints.video) {
-        constraints.video = true;
+        constraints.video = deviceConstraints.video;
       } else {
         logger.debug(LOG_PREFIX, "unknown device " + device.kind + " id " + device.deviceId);
       }
     }
     return constraints;
   };
-  var getList = function getList(devices) {
-    var list = {
-      audio: [],
-      video: []
-    };
-    var micCount = 0;
-    var outputCount = 0;
-    var camCount = 0;
-    for (var i = 0; i < devices.length; i++) {
-      var device = devices[i];
-      var ret = {
-        id: device.deviceId,
-        label: device.label
-      };
-      if (device.kind.indexOf("audio" + kind) === 0 && device.deviceId != "communications") {
-        ret.type = device.kind == "audioinput" ? "mic" : "speaker";
-        if (ret.type == "mic" && ret.label == "") {
-          ret.label = 'microphone' + ++micCount;
-        }
-        if (ret.type == "speaker" && ret.label == "") {
-          ret.label = 'speaker' + ++outputCount;
-        }
-        list.audio.push(ret);
-      } else if (device.kind.indexOf("video" + kind) === 0) {
-        if (ret.label == "") {
-          ret.label = 'camera' + ++camCount;
-        }
-        ret.type = "camera";
-        list.video.push(ret);
-      } else {
-        logger.debug(LOG_PREFIX, "unknown device " + device.kind + " id " + device.deviceId);
-      }
-    }
-    return list;
-  };
   return new Promise(function (resolve, reject) {
     navigator.mediaDevices.enumerateDevices().then(function (devices) {
       if (labels) {
@@ -14907,18 +14984,153 @@ var listDevices = function listDevices(labels, kind, deviceConstraints) {
         }
         navigator.getUserMedia(constraints, function (stream) {
           navigator.mediaDevices.enumerateDevices().then(function (devicesWithLabels) {
-            resolve(getList(devicesWithLabels));
+            resolve(getList(devicesWithLabels, kind));
             stream.getTracks().forEach(function (track) {
               track.stop();
             });
           }, reject);
         }, reject);
       } else {
-        resolve(getList(devices));
+        resolve(getList(devices, kind));
       }
     }, reject);
   });
 };
+var getMobileDevices = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(kind) {
+    var deviceConstraints,
+      constraints,
+      videoFilter,
+      list,
+      getCamera,
+      front,
+      back,
+      _stream,
+      mediaDevices,
+      _args4 = arguments,
+      _t2;
+    return _regenerator().w(function (_context4) {
+      while (1) switch (_context4.p = _context4.n) {
+        case 0:
+          deviceConstraints = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : null;
+          constraints = {};
+          videoFilter = [];
+          list = null;
+          if (!kind) {
+            kind = constants.MEDIA_DEVICE_KIND.INPUT;
+          } else if (kind === constants.MEDIA_DEVICE_KIND.ALL) {
+            kind = "";
+          }
+          if (deviceConstraints && deviceConstraints.audio) {
+            constraints.audio = deviceConstraints.audio;
+          } else {
+            constraints.audio = true;
+          }
+          if (deviceConstraints && deviceConstraints.video) {
+            if (_typeof(deviceConstraints.video) === 'object') {
+              constraints.video = deviceConstraints.video;
+            } else {
+              constraints.video = {};
+            }
+          } else {
+            constraints.video = {};
+          }
+          getCamera = /*#__PURE__*/function () {
+            var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(constraints, facingMode) {
+              var deviceId, mediaConstraints, _t;
+              return _regenerator().w(function (_context3) {
+                while (1) switch (_context3.p = _context3.n) {
+                  case 0:
+                    deviceId = null;
+                    mediaConstraints = {
+                      audio: false,
+                      video: constraints.video
+                    };
+                    mediaConstraints.video.facingMode = facingMode;
+                    _context3.p = 1;
+                    _context3.n = 2;
+                    return navigator.mediaDevices.getUserMedia(mediaConstraints);
+                  case 2:
+                    stream = _context3.v;
+                    if (stream) {
+                      if (stream.getVideoTracks().length > 0) {
+                        deviceId = stream.getVideoTracks()[0].getSettings().deviceId;
+                      }
+                      stream.getTracks().forEach(function (track) {
+                        track.stop();
+                      });
+                    }
+                    _context3.n = 4;
+                    break;
+                  case 3:
+                    _context3.p = 3;
+                    _t = _context3.v;
+                    logger.error(LOG_PREFIX, "Can't get device access with video constraints " + JSON.stringify(constraints.video) + ", error " + _t);
+                  case 4:
+                    return _context3.a(2, deviceId);
+                }
+              }, _callee3, null, [[1, 3]]);
+            }));
+            return function getCamera(_x5, _x6) {
+              return _ref4.apply(this, arguments);
+            };
+          }();
+          _context4.n = 1;
+          return getCamera(constraints, {
+            ideal: 'user'
+          });
+        case 1:
+          front = _context4.v;
+          if (front && front !== "") {
+            logger.debug(LOG_PREFIX, "Front camera id: " + front);
+            videoFilter.push(front);
+          }
+          _context4.n = 2;
+          return getCamera(constraints, {
+            ideal: 'environment'
+          });
+        case 2:
+          back = _context4.v;
+          if (back && back !== "") {
+            logger.debug(LOG_PREFIX, "Back camera id: " + back);
+            videoFilter.push(back);
+          }
+          _context4.p = 3;
+          _context4.n = 4;
+          return navigator.mediaDevices.getUserMedia(constraints);
+        case 4:
+          _stream = _context4.v;
+          if (!_stream) {
+            _context4.n = 6;
+            break;
+          }
+          _context4.n = 5;
+          return navigator.mediaDevices.enumerateDevices();
+        case 5:
+          mediaDevices = _context4.v;
+          if (mediaDevices) {
+            logger.debug(LOG_PREFIX, "mediaDevices: " + JSON.stringify(mediaDevices));
+            list = getList(mediaDevices, kind, videoFilter);
+          }
+          _stream.getTracks().forEach(function (track) {
+            track.stop();
+          });
+        case 6:
+          _context4.n = 8;
+          break;
+        case 7:
+          _context4.p = 7;
+          _t2 = _context4.v;
+          logger.error(LOG_PREFIX, "Can't get device access with constraints " + JSON.stringify(constraints) + ", error " + _t2);
+        case 8:
+          return _context4.a(2, list);
+      }
+    }, _callee4, null, [[3, 7]]);
+  }));
+  return function getMobileDevices(_x4) {
+    return _ref3.apply(this, arguments);
+  };
+}();
 function normalizeConstraints(constraints) {
   //WCS-2010. fixed TypeError after publish->stop->publish
   //WCS-2373. fixed customStream
@@ -15047,6 +15259,7 @@ module.exports = {
   getMediaAccess: getMediaAccess,
   releaseMedia: releaseMedia,
   listDevices: listDevices,
+  getMobileDevices: getMobileDevices,
   playFirstSound: playFirstSound,
   playFirstVideo: playFirstVideo,
   available: available,