feat(RTC): drop support for platforms without the MediaStream constructor

React Native also supports it now.

modules/RTC/RTCUtils.js

@@ -1052,17 +1052,7 @@ class RTCUtils extends Listenable {
                 new Error('Desktop sharing is not supported!'));
         }
 
-        let gumPromise;
-
-        if (browser.supportsMediaStreamConstructor()) {
-            gumPromise = this._getAudioAndVideoStreams(options);
-        } else {
-            // If the MediaStream constructor is not supported, then get tracks
-            // in separate GUM calls in order to keep different tracks separate.
-            gumPromise = this._getAudioAndVideoStreamsSeparately(options);
-        }
-
-        return gumPromise.then(streams =>
+        return this._getAudioAndVideoStreams(options).then(streams =>
             handleLocalStream(streams, options.resolution));
     }
 
@@ -1172,37 +1162,6 @@ class RTCUtils extends Listenable {
         return missingDevices;
     }
 
-    /**
-     * Performs separate getUserMedia calls for audio and video instead of in
-     * one call. Will also request desktop if specified.
-     *
-     * @param {Object} options - An object describing how the gUM request should
-     * be executed. See {@link obtainAudioAndVideoPermissions} for full options.
-     * @returns {*} Promise object that will receive the new JitsiTracks on
-     * success or a JitsiTrackError on failure.
-     */
-    _getAudioAndVideoStreamsSeparately(options) {
-        return new Promise((resolve, reject) => {
-            const deviceGUM = {
-                audio: (...args) =>
-                    this.getUserMediaWithConstraints([ 'audio' ], ...args),
-                video: (...args) =>
-                    this.getUserMediaWithConstraints([ 'video' ], ...args),
-                desktop: (...args) =>
-                    screenObtainer.obtainStream(
-                        this._parseDesktopSharingOptions(options), ...args)
-            };
-
-            obtainDevices({
-                options,
-                streams: {},
-                successCallback: resolve,
-                errorCallback: reject,
-                deviceGUM
-            });
-        });
-    }
-
     /**
      * Returns an object formatted for specifying desktop sharing parameters.
      *
@@ -1590,32 +1549,6 @@ class RTCUtils extends Listenable {
 
 const rtcUtils = new RTCUtils();
 
-/**
- *
- * @param context Execution context, containing options and callbacks
- */
-function obtainDevices(context) {
-    if (!context.options.devices || context.options.devices.length === 0) {
-        return context.successCallback(context.streams || {});
-    }
-
-    const device = context.options.devices.splice(0, 1);
-
-    context.deviceGUM[device](context.options)
-        .then(stream => {
-            context.streams = context.streams || {};
-            context.streams[device] = stream;
-            obtainDevices(context);
-        }, error => {
-            Object.keys(context.streams).forEach(
-                d => rtcUtils.stopMediaStream(context.streams[d]));
-            logger.error(
-                `failed to obtain ${device} stream - stop`, error);
-
-            context.errorCallback(error);
-        });
-}
-
 /**
  * Wraps original attachMediaStream function to set current audio output device
  * if this is supported.

modules/RTC/RTCUtils.spec.js

@@ -103,16 +103,12 @@ function unexpectedErrorHandler(error = {}, done) {
 describe('RTCUtils', () => {
     describe('obtainAudioAndVideoPermissions', () => {
         let getUserMediaSpy, isScreenSupportedSpy, oldMediaStream,
-            oldMediaStreamTrack, oldWebkitMediaStream,
-            supportsMediaConstructorSpy;
+            oldMediaStreamTrack, oldWebkitMediaStream;
 
         beforeEach(() => {
             // FIXME: To get some kind of initial testing working assume a
             // chrome environment so RTCUtils can actually initialize properly.
             spyOn(browser, 'isChrome').and.returnValue(true);
-            supportsMediaConstructorSpy
-                = spyOn(browser, 'supportsMediaStreamConstructor')
-                    .and.returnValue(true);
             spyOn(screenObtainer, '_createObtainStreamMethod')
                 .and.returnValue(() => { /** intentional no op */ });
             isScreenSupportedSpy = spyOn(screenObtainer, 'isSupported')
@@ -251,32 +247,5 @@ describe('RTCUtils', () => {
                     .catch(error => unexpectedErrorHandler(error, done));
             });
         });
-
-        describe('without MediaStream constructor support', () => {
-            it('makes separate getUserMedia calls', done => {
-                supportsMediaConstructorSpy.and.returnValue(false);
-                getUserMediaSpy.and.callFake(successfulGum);
-
-                RTCUtils.obtainAudioAndVideoPermissions({
-                    devices: [ 'audio', 'video' ] })
-                    .then(streams => {
-                        expect(getUserMediaSpy.calls.count()).toBe(2);
-                        expect(streams.length).toBe(2);
-
-                        const audioStream = streams.find(stream =>
-                            stream.mediaType === 'audio');
-
-                        expect(audioStream).toBeTruthy();
-
-                        const videoStream = streams.find(stream =>
-                            stream.mediaType === 'video');
-
-                        expect(videoStream).toBeTruthy();
-
-                        done();
-                    })
-                    .catch(error => unexpectedErrorHandler(error, done));
-            });
-        });
     });
 });

modules/browser/BrowserCapabilities.js

@@ -152,17 +152,6 @@ export default class BrowserCapabilities extends BrowserDetection {
             && typeof navigator.mediaDevices.addEventListener !== 'undefined';
     }
 
-    /**
-     * Checks if the current browser supports the MediaStream constructor as
-     * defined by https://www.w3.org/TR/mediacapture-streams/#constructors. In
-     * cases where there is no support, it maybe be necessary to get audio
-     * and video in two distinct GUM calls.
-     * @return {boolean}
-     */
-    supportsMediaStreamConstructor() {
-        return !this.isReactNative();
-    }
-
     /**
      * Checks if the current browser supports RTP statictics collecting.
      * Required by {@link RTPStatsCollector}.

package-lock.json

@@ -3673,7 +3673,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -3694,12 +3695,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -3714,17 +3717,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -3841,7 +3847,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -3853,6 +3860,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -3867,6 +3875,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -3874,12 +3883,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -3898,6 +3909,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -3978,7 +3990,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -3990,6 +4003,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4075,7 +4089,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -4111,6 +4126,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -4130,6 +4146,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -4173,12 +4190,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -5312,7 +5331,8 @@
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -5333,12 +5353,14 @@
             "balanced-match": {
               "version": "1.0.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -5353,17 +5375,20 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "concat-map": {
               "version": "0.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -5480,7 +5505,8 @@
             "inherits": {
               "version": "2.0.3",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "ini": {
               "version": "1.3.5",
@@ -5492,6 +5518,7 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -5506,6 +5533,7 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -5513,12 +5541,14 @@
             "minimist": {
               "version": "0.0.8",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "minipass": {
               "version": "2.2.4",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.1",
                 "yallist": "^3.0.0"
@@ -5537,6 +5567,7 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -5617,7 +5648,8 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -5629,6 +5661,7 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -5714,7 +5747,8 @@
             "safe-buffer": {
               "version": "5.1.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -5750,6 +5784,7 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -5769,6 +5804,7 @@
               "version": "3.0.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -5812,12 +5848,14 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "yallist": {
               "version": "3.0.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             }
           }
         },
@@ -5972,7 +6010,7 @@
     },
     "karma-webpack": {
       "version": "3.0.0",
-      "resolved": "http://registry.npmjs.org/karma-webpack/-/karma-webpack-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-3.0.0.tgz",
       "integrity": "sha512-Ja1o9LLoqWaJyUNhTKaXjWiEH9y7a9H3mzP8pYB30SBsgoF5KBS/65NeHFd+QPuT9ITrym8xFt8BZeGbcOfujA==",
       "dev": true,
       "requires": {