Remove isEdge checks

JitsiConference.js

@@ -1931,11 +1931,6 @@ JitsiConference.prototype._setBridgeChannel = function(offerIq, pc) {
         break;
     }
 
-    if (bridgeChannelType === 'datachannel'
-        && !browser.supportsDataChannels()) {
-        bridgeChannelType = 'websocket';
-    }
-
     if (bridgeChannelType === 'datachannel') {
         this.rtc.initializeBridgeChannel(pc, null);
     } else if (bridgeChannelType === 'websocket' && wsUrl) {

modules/RTC/RTCUtils.js

@@ -179,7 +179,6 @@ function getConstraints(um, options = {}) {
     const isNewStyleConstraintsSupported
         = browser.isFirefox()
             || browser.isSafariWithVP8()
-            || browser.isEdge()
             || browser.isReactNative();
 
     if (um.indexOf('video') >= 0) {
@@ -1397,8 +1396,7 @@ class RTCUtils extends Listenable {
     isDeviceChangeAvailable(deviceType) {
         return deviceType === 'output' || deviceType === 'audiooutput'
             ? isAudioOutputDeviceChangeAvailable
-            : browser.isChromiumBased()
-                || browser.isFirefox() || browser.isEdge();
+            : !browser.isSafariWithVP8();
     }
 
     /**

modules/RTC/ScreenObtainer.js

@@ -142,8 +142,6 @@ const ScreenObtainer = {
 
             // Legacy Firefox
             return this.obtainScreenOnFirefox;
-        } else if (browser.isEdge() && browser.supportsGetDisplayMedia()) {
-            return this.obtainScreenFromGetDisplayMedia;
         }
 
         logger.log(

modules/RTC/TraceablePeerConnection.js

@@ -614,7 +614,7 @@ TraceablePeerConnection.prototype._remoteStreamAdded = function(stream) {
     }
 
     // Bind 'addtrack'/'removetrack' event handlers
-    if (browser.isChromiumBased() || browser.isEdge()) {
+    if (browser.isChromiumBased()) {
         stream.onaddtrack = event => {
             this._remoteTrackAdded(stream, event.track);
         };

modules/browser/BrowserCapabilities.js

@@ -30,12 +30,7 @@ export default class BrowserCapabilities extends BrowserDetection {
      * strategy or <tt>false</tt> otherwise.
      */
     doesVideoMuteByStreamRemove() {
-        return !(
-            this.isFirefox()
-            || this.isEdge()
-            || this.isReactNative()
-            || this.isSafariWithWebrtc()
-        );
+        return this.isChromiumBased();
     }
 
     /**
@@ -44,7 +39,7 @@ export default class BrowserCapabilities extends BrowserDetection {
      * otherwise.
      */
     supportsP2P() {
-        return !this.isEdge() && !this.isFirefox();
+        return !this.isFirefox();
     }
 
     /**
@@ -61,21 +56,11 @@ export default class BrowserCapabilities extends BrowserDetection {
      */
     isChromiumBased() {
         return this.isChrome()
-            || this.isChromiumBasedEdge()
             || this.isElectron()
             || this.isNWJS()
             || this.isOpera();
     }
 
-    /**
-     * Checks if the current browser is Edge that is Chromium based.
-     */
-    isChromiumBasedEdge() {
-        const REQUIRED_EDGE_VERSION = 72;
-
-        return this.isEdge() && this.isVersionGreaterThan(REQUIRED_EDGE_VERSION);
-    }
-
     /**
      * Checks if current browser is a Safari and a version of Safari that
      * supports native webrtc.
@@ -139,17 +124,7 @@ export default class BrowserCapabilities extends BrowserDetection {
     supportsBandwidthStatistics() {
         // FIXME bandwidth stats are currently not implemented for FF on our
         // side, but not sure if not possible ?
-        return !this.isFirefox() && !this.isEdge()
-            && !this.isSafariWithWebrtc();
-    }
-
-    /**
-     * Checks if the current browser supports WebRTC datachannels.
-     * @return {boolean}
-     */
-    supportsDataChannels() {
-        // NOTE: Edge does not yet implement DataChannel.
-        return !this.isEdge();
+        return !this.isFirefox() && !this.isSafariWithWebrtc();
     }
 
     /**
@@ -162,20 +137,6 @@ export default class BrowserCapabilities extends BrowserDetection {
             && typeof navigator.mediaDevices.addEventListener !== 'undefined';
     }
 
-    /**
-     * Checks if the current browser supports RTP statictics collecting.
-     * Required by {@link RTPStatsCollector}.
-     *
-     * @returns {boolean} true if they are supported, false otherwise.
-     */
-    supportsRtpStatistics() {
-        return this.isChromiumBased()
-            || this.isEdge()
-            || this.isFirefox()
-            || this.isReactNative()
-            || this.isSafariWithWebrtc();
-    }
-
     /**
      * Checks if the current browser supports RTT statistics for srflx local
      * candidates through the legacy getStats() API.
@@ -199,7 +160,7 @@ export default class BrowserCapabilities extends BrowserDetection {
         // (is reported as 1):
         // https://bugzilla.mozilla.org/show_bug.cgi?id=1241066
         // For Chrome and others we rely on 'googRtt'.
-        return !this.isFirefox() && !this.isEdge();
+        return !this.isFirefox();
     }
 
     /**
@@ -309,7 +270,7 @@ export default class BrowserCapabilities extends BrowserDetection {
      * @returns {boolean}
      */
     usesAdapter() {
-        return this.usesNewGumFlow() || this.isEdge();
+        return this.usesNewGumFlow();
     }
 
     /**

modules/statistics/RTPStatsCollector.js

@@ -53,28 +53,6 @@ KEYS_BY_BROWSER_TYPE[browsers.CHROME] = {
     'port': 'port',
     'protocol': 'protocol'
 };
-KEYS_BY_BROWSER_TYPE[browsers.EDGE] = {
-    'sendBandwidth': 'googAvailableSendBandwidth',
-    'remoteAddress': 'remoteAddress',
-    'transportType': 'protocol',
-    'localAddress': 'localAddress',
-    'activeConnection': 'activeConnection',
-    'ssrc': 'ssrc',
-    'packetsReceived': 'packetsReceived',
-    'packetsSent': 'packetsSent',
-    'packetsLost': 'packetsLost',
-    'bytesReceived': 'bytesReceived',
-    'bytesSent': 'bytesSent',
-    'googFrameHeightReceived': 'frameHeight',
-    'googFrameWidthReceived': 'frameWidth',
-    'googFrameHeightSent': 'frameHeight',
-    'googFrameWidthSent': 'frameWidth',
-    'googFrameRateReceived': 'framesPerSecond',
-    'googFrameRateSent': 'framesPerSecond',
-    'audioInputLevel': 'audioLevel',
-    'audioOutputLevel': 'audioLevel',
-    'currentRoundTripTime': 'roundTripTime'
-};
 KEYS_BY_BROWSER_TYPE[browsers.OPERA]
     = KEYS_BY_BROWSER_TYPE[browsers.CHROME];
 KEYS_BY_BROWSER_TYPE[browsers.NWJS]
@@ -339,43 +317,41 @@ StatsCollector.prototype.start = function(startAudioLevelStats) {
         );
     }
 
-    if (browser.supportsRtpStatistics()) {
-        this.statsIntervalId = setInterval(
-            () => {
-                // Interval updates
-                self.peerconnection.getStats(
-                    report => {
-                        let results = null;
+    this.statsIntervalId = setInterval(
+        () => {
+            // Interval updates
+            self.peerconnection.getStats(
+                report => {
+                    let results = null;
+
+                    if (!report || !report.result
+                        || typeof report.result !== 'function') {
+                        // firefox
+                        results = report;
+                    } else {
+                        // chrome
+                        results = report.result();
+                    }
 
-                        if (!report || !report.result
-                            || typeof report.result !== 'function') {
-                            // firefox
-                            results = report;
+                    self.currentStatsReport = results;
+                    try {
+                        if (this._usesPromiseGetStats) {
+                            self.processNewStatsReport();
                         } else {
-                            // chrome
-                            results = report.result();
-                        }
-
-                        self.currentStatsReport = results;
-                        try {
-                            if (this._usesPromiseGetStats) {
-                                self.processNewStatsReport();
-                            } else {
-                                self.processStatsReport();
-                            }
-                        } catch (e) {
-                            GlobalOnErrorHandler.callErrorHandler(e);
-                            logger.error(`Unsupported key:${e}`, e);
+                            self.processStatsReport();
                         }
+                    } catch (e) {
+                        GlobalOnErrorHandler.callErrorHandler(e);
+                        logger.error(`Unsupported key:${e}`, e);
+                    }
 
-                        self.previousStatsReport = self.currentStatsReport;
-                    },
-                    error => self.errorCallback(error)
-                );
-            },
-            self.statsIntervalMilis
-        );
-    }
+                    self.previousStatsReport = self.currentStatsReport;
+                },
+                error => self.errorCallback(error)
+            );
+        },
+        self.statsIntervalMilis
+    );
 };
 
 /**
@@ -441,9 +417,6 @@ StatsCollector.prototype._defineGetStatValueMethod = function(keys) {
             return value;
         };
         break;
-    case browsers.EDGE:
-        itemStatByKey = (item, key) => item[key];
-        break;
     default:
         itemStatByKey = (item, key) => item[key];
     }
@@ -573,28 +546,11 @@ StatsCollector.prototype.processStatsReport = function() {
             });
         }
 
-        // NOTE: Edge's proprietary stats via RTCIceTransport.msGetStats().
-        if (now.msType === 'transportdiagnostics') {
-            this.conferenceStats.transport.push({
-                ip: now.remoteAddress,
-                type: now.protocol,
-                localip: now.localAddress,
-                p2p: this.peerconnection.isP2P
-            });
-        }
-
         if (now.type !== 'ssrc' && now.type !== 'outboundrtp'
             && now.type !== 'inboundrtp' && now.type !== 'track') {
             continue;
         }
 
-        // NOTE: In Edge, stats with type "inboundrtp" and "outboundrtp" are
-        // completely useless, so ignore them.
-        if (browser.isEdge()
-            && (now.type === 'inboundrtp' || now.type === 'outboundrtp')) {
-            continue;
-        }
-
         const before = this.previousStatsReport[idx];
         let ssrc = this.getNonNegativeStat(now, 'ssrc');
 
@@ -616,9 +572,7 @@ StatsCollector.prototype.processStatsReport = function() {
         // the sent bytes to the local download bitrate.
         // In new W3 stats spec, type="track" has a remoteSource boolean
         // property.
-        // Edge uses the new format, so skip this check.
-        if (!browser.isEdge()
-                && (now.isRemote === true || now.remoteSource === true)) {
+        if (now.isRemote === true || now.remoteSource === true) {
             continue;
         }
 
@@ -955,18 +909,9 @@ StatsCollector.prototype.processAudioLevelReport = function() {
             // According to the W3C WebRTC Stats spec, audioLevel should be in
             // 0..1 range (0 == silence). However browsers don't behave that
             // way so we must convert it to 0..1.
-            //
-            // In Edge the range is -100..0 (-100 == silence) measured in dB,
-            // so convert to linear. The levels are set to 0 for remote tracks,
-            // so don't convert those, since 0 means "the maximum" in Edge.
-            if (browser.isEdge()) {
-                audioLevel = audioLevel < 0 ? Math.pow(10, audioLevel / 20) : 0;
-
             // TODO: Can't find specs about what this value really is, but it
             // seems to vary between 0 and around 32k.
-            } else {
-                audioLevel = audioLevel / 32767;
-            }
+            audioLevel = audioLevel / 32767;
 
             if (!(ssrc in this.audioLevelReportHistory)) {
                 this.audioLevelReportHistory[ssrc] = {

modules/xmpp/moderator.js

@@ -9,7 +9,6 @@ const AuthenticationEvents
     = require('../../service/authentication/AuthenticationEvents');
 const GlobalOnErrorHandler = require('../util/GlobalOnErrorHandler');
 
-import browser from '../browser';
 import Settings from '../settings/Settings';
 
 /**
@@ -262,10 +261,6 @@ Moderator.prototype.createConferenceIq = function() {
         break;
     }
 
-    if (openSctp && !browser.supportsDataChannels()) {
-        openSctp = false;
-    }
-
     elem.c(
         'property', {
             name: 'openSctp',

package-lock.json

@@ -5497,8 +5497,8 @@
       "dev": true
     },
     "js-utils": {
-      "version": "github:jitsi/js-utils#400ce825d3565019946ee75d86ed773c6f21e117",
-      "from": "github:jitsi/js-utils#400ce825d3565019946ee75d86ed773c6f21e117",
+      "version": "github:jitsi/js-utils#abc73a98a61124aa12c87c72dd0d86985a1a4d41",
+      "from": "github:jitsi/js-utils#abc73a98a61124aa12c87c72dd0d86985a1a4d41",
       "requires": {
         "bowser": "2.7.0",
         "js-md5": "0.7.3",

package.json

@@ -21,7 +21,7 @@
     "async": "0.9.0",
     "current-executing-script": "0.1.3",
     "jitsi-meet-logger": "github:jitsi/jitsi-meet-logger#5ec92357570dc8f0b7ffc1528820721c84c6af8b",
-    "js-utils": "github:jitsi/js-utils#400ce825d3565019946ee75d86ed773c6f21e117",
+    "js-utils": "github:jitsi/js-utils#abc73a98a61124aa12c87c72dd0d86985a1a4d41",
     "lodash.isequal": "4.5.0",
     "sdp-transform": "2.3.0",
     "strophe.js": "1.2.16",