@flashphoner/websdk 2.0.248 → 2.0.250

package/flashphoner-webrtc-only.js

@@ -7896,6 +7896,7 @@ var disableConnectionQualityCalculation;
  * @param {String=} options.screenSharingExtensionId Chrome screen sharing extension id
  * @param {Object=} options.constraints Default local media constraints
  * @param {Object=} options.logger Core logger options
+ * @param {Boolean=} options.collectClientInfo Collect client OS and system data available for debugging purposes
  * @throws {Error} Error if none of MediaProviders available
  * @memberof Flashphoner
  */
@@ -7906,7 +7907,7 @@ var init = /*#__PURE__*/function () {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           if (initialized) {
-            _context.next = 34;
+            _context.next = 35;
             break;
           }
           if (!options) {
@@ -8045,12 +8046,16 @@ var init = /*#__PURE__*/function () {
           }
           coreLogger.info(LOG_PREFIX, "Initialized");
           initialized = true;
-          _context.next = 32;
+          if (!(options.collectClientInfo === undefined || options.collectClientInfo)) {
+            _context.next = 35;
+            break;
+          }
+          _context.next = 33;
           return clientInfo.getClientInfo(window.navigator);
-        case 32:
+        case 33:
           clientUAData = _context.sent;
           coreLogger.info(LOG_PREFIX, "Client system data: " + JSON.stringify(clientUAData));
-        case 34:
+        case 35:
         case "end":
           return _context.stop();
       }
@@ -8306,6 +8311,7 @@ var createLogger = function createLogger(loggerOptions) {
  * @param {Integer=} options.receiveProbes A maximum subsequental pings received missing count [0]
  * @param {Integer=} options.probesInterval Interval to check subsequental pings received [0]
  * @param {Object=} options.logger Session logger options
+ * @param {Boolean=} options.sendClientInfo Send client system info for debugging purposes
  * @returns {Session} Created session
  * @throws {Error} Error if API is not initialized
  * @throws {TypeError} Error if options.urlServer is not specified
@@ -8333,6 +8339,7 @@ var createSession = function createSession(options) {
   var mediaOptions = options.mediaOptions;
   var keepAlive = options.keepAlive;
   var timeout = options.timeout;
+  var sendClientInfo = options.sendClientInfo !== undefined ? options.sendClientInfo : true;
   var wsPingSender = new WSPingSender(options.pingInterval || 0);
   var wsPingReceiver = new WSPingReceiver(options.receiveProbes || 0, options.probesInterval || 0);
   var connectionTimeout;
@@ -8445,7 +8452,7 @@ var createSession = function createSession(options) {
         msePacketizationVersion: 2,
         custom: options.custom
       };
-      if (clientUAData) {
+      if (sendClientInfo && clientUAData) {
         cConfig.clientInfo = clientUAData;
       }
       if (sipConfig) {
@@ -8700,6 +8707,7 @@ var createSession = function createSession(options) {
    * @param {string=} options.videoContentHint Video content hint for browser ('motion' by default to maintain bitrate and fps), {@link Flashphoner.constants.CONTENT_HINT_TYPE}
    * @param {Boolean=} options.useControls Use a standard HTML5 video controls (play, pause, fullscreen). May be a workaround for fullscreen mode to work in Safari 16
    * @param {Object=} options.logger Call logger options
+   * @param {Boolean=} options.collectDeviceInfo Collect a media devices info when publishing a WebRTC stream
    * @param {sdpHook} sdpHook The callback that handles sdp from the server
    * @returns {Call} Call
    * @throws {TypeError} Error if no options provided
@@ -8758,6 +8766,7 @@ var createSession = function createSession(options) {
     var sipHeaders = options.sipHeaders;
     var videoContentHint = options.videoContentHint;
     var useControls = options.useControls;
+    var collectDeviceInfo = options.collectDeviceInfo !== undefined ? options.collectDeviceInfo : true;
     var minBitrate = getConstraintsProperty(constraints, CONSTRAINT_VIDEO_MIN_BITRATE, 0);
     var maxBitrate = getConstraintsProperty(constraints, CONSTRAINT_VIDEO_MAX_BITRATE, 0);
 
@@ -8868,9 +8877,7 @@ var createSession = function createSession(options) {
             stripCodecs: stripCodecs
           });
         }).then(function (offer) {
-          // Get local media info to send in publishStream message
-          var localMediaInfo = collectLocalMediaInfo(MediaProvider[mediaProvider], localDisplay);
-          send("call", {
+          var callData = {
             callId: id_,
             incoming: false,
             hasVideo: offer.hasVideo,
@@ -8882,9 +8889,13 @@ var createSession = function createSession(options) {
             caller: login,
             callee: callee_,
             custom: options.custom,
-            visibleName: visibleName_,
-            localMediaInfo: localMediaInfo
-          });
+            visibleName: visibleName_
+          };
+          // Get local media info to send in publishStream message
+          if (collectDeviceInfo) {
+            callData.localMediaInfo = collectLocalMediaInfo(MediaProvider[mediaProvider], localDisplay);
+          }
+          send("call", callData);
         });
       })["catch"](function (error) {
         logger.error(LOG_PREFIX, error);
@@ -9022,9 +9033,7 @@ var createSession = function createSession(options) {
           });
         }).then(function (sdp) {
           if (status_ != CALL_STATUS.FINISH && status_ != CALL_STATUS.FAILED) {
-            // Get local media info to send in publishStream message
-            var localMediaInfo = collectLocalMediaInfo(MediaProvider[mediaProvider], localDisplay);
-            send("answer", {
+            var callData = {
               callId: id_,
               incoming: true,
               hasVideo: true,
@@ -9035,9 +9044,13 @@ var createSession = function createSession(options) {
               sipSDP: sipSDP,
               caller: cConfig.login,
               callee: callee_,
-              custom: options.custom,
-              localMediaInfo: localMediaInfo
-            });
+              custom: options.custom
+            };
+            // Get local media info to send in publishStream message
+            if (collectDeviceInfo) {
+              callData.localMediaInfo = collectLocalMediaInfo(MediaProvider[mediaProvider], localDisplay);
+            }
+            send("answer", callData);
           } else {
             hangup();
           }
@@ -9504,6 +9517,7 @@ var createSession = function createSession(options) {
    * @param {Boolean=} options.unmutePlayOnStart Unmute playback on start. May be used after user gesture only, so set 'unmutePlayOnStart: false' for autoplay
    * @param {Boolean=} options.useControls Use a standard HTML5 video controls (play, pause, fullscreen). May be a workaround for fullscreen mode to work in Safari 16
    * @param {Object=} options.logger Stream logger options
+   * @param {Boolean=} options.collectDeviceInfo Collect a media devices info when publishing a WebRTC stream
    * @param {sdpHook} sdpHook The callback that handles sdp from the server
    * @returns {Stream} Stream
    * @throws {TypeError} Error if no options provided
@@ -9609,6 +9623,7 @@ var createSession = function createSession(options) {
     var videoContentHint = options.videoContentHint;
     var unmutePlayOnStart = options.unmutePlayOnStart;
     var useControls = options.useControls;
+    var collectDeviceInfo = options.collectDeviceInfo !== undefined ? options.collectDeviceInfo : true;
     var audioState_;
     var videoState_;
     var connectionQuality;
@@ -9882,10 +9897,7 @@ var createSession = function createSession(options) {
           });
         }).then(function (offer) {
           logger.debug(LOG_PREFIX, "Offer SDP:\n" + offer.sdp);
-          // Get local media info to send in publishStream message
-          var localMediaInfo = collectLocalMediaInfo(MediaProvider[mediaProvider], display);
-          //publish stream with offer sdp to server
-          send("publishStream", {
+          var publishStreamData = {
             mediaSessionId: id_,
             name: name_,
             published: published_,
@@ -9902,9 +9914,14 @@ var createSession = function createSession(options) {
             rtmpUrl: rtmpUrl,
             constraints: constraints,
             transport: transportType,
-            cvoExtension: cvoExtension,
-            localMediaInfo: localMediaInfo
-          });
+            cvoExtension: cvoExtension
+          };
+          // Get local media info to send in publishStream message
+          if (collectDeviceInfo) {
+            publishStreamData.localMediaInfo = collectLocalMediaInfo(MediaProvider[mediaProvider], display);
+          }
+          //publish stream with offer sdp to server
+          send("publishStream", publishStreamData);
         });
       })["catch"](function (error) {
         logger.warn(LOG_PREFIX, error);
@@ -10713,8 +10730,26 @@ var createSession = function createSession(options) {
   };
   var collectLocalMediaInfo = function collectLocalMediaInfo(mediaProvider, display) {
     // Get devices available
-    var videoCams = mediaProvider.videoCams || [];
-    var mics = mediaProvider.mics || [];
+    var videoCams = [];
+    var mics = [];
+    if (mediaProvider.videoCams) {
+      mediaProvider.videoCams.forEach(function (device) {
+        videoCams.push({
+          id: device.id,
+          label: encodeURI(device.label),
+          type: device.type
+        });
+      });
+    }
+    if (mediaProvider.mics) {
+      mediaProvider.mics.forEach(function (device) {
+        mics.push({
+          id: device.id,
+          label: encodeURI(device.label),
+          type: device.type
+        });
+      });
+    }
     if (videoCams.length) {
       logger.info(LOG_PREFIX, "Video inputs available: " + JSON.stringify(videoCams));
     }
@@ -10732,7 +10767,8 @@ var createSession = function createSession(options) {
     if (!localVideo && mediaProvider.getVideoElement) {
       localVideo = mediaProvider.getVideoElement(display);
     }
-    if (localVideo) {
+    // PR #19 from GitHub to prevent Sentry issue #WCS-4239
+    if (localVideo && localVideo.srcObject) {
       localVideo.srcObject.getAudioTracks().forEach(function (track) {
         var device = track.label;
         if (device === "MediaStreamAudioDestinationNode" && mediaProvider.getAudioSourceDevice) {
@@ -10740,13 +10776,13 @@ var createSession = function createSession(options) {
         }
         audioTracks.push({
           trackId: track.id,
-          device: device
+          device: encodeURI(device)
         });
       });
       localVideo.srcObject.getVideoTracks().forEach(function (track) {
         videoTracks.push({
           trackId: track.id,
-          device: track.label
+          device: encodeURI(track.label)
         });
       });
     }