DetectRTC.js updates in "development" branch.

ModalityZ · Sep 21, 2015 · e57aff7 · e57aff7
1 parent cb69c0b
commit e57aff7
Show file tree

Hide file tree

Showing 11 changed files with 756 additions and 65 deletions.
diff --git a/DetectRTC.js b/DetectRTC.js
diff --git a/DetectRTC.min.js b/DetectRTC.min.js
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -14,11 +14,19 @@ module.exports = function(grunt) {
         concat: {
             options: {
                 stripBanners: true,
-                separator: ''
+                separator: '\n'
             },
             dist: {
                 src: [
-                    'DetectRTC.js'
+                    'dev/head.js',
+                    'dev/common.js',
+                    'dev/getBrowserInfo.js',
+                    'dev/isMobile.js',
+                    'dev/detectOSName.js',
+                    'dev/detectCaptureStream.js',
+                    'dev/DetectLocalIPAddress.js',
+                    'dev/CheckDeviceSupport.js',
+                    'dev/DetectRTC.js'
                 ],
                 dest: 'DetectRTC.js',
             },

diff --git a/README.md b/README.md
@@ -5,10 +5,11 @@
 # Proposed NEW API
 
 ```javascript
-DetectRTC.isSetSinkIdSupported
+DetectRTC.isSetSinkIdSupported // (implemented)
+DetectRTC.isRTPSenderReplaceTracksSupported // (implemented)
+DetectRTC.isORTCSupported // (implemented)
+
 DetectRTC.isRemoteStreamProcessingSupported
-DetectRTC.isRTPSenderReplaceTracksSupported
-DetectRTC.isOutputDevicesEnumerationSupported
 DetectRTC.isMediaDevicesNewSyntaxSupported
 DetectRTC.browser.googSupportedFlags.googDAEEchoCancellation
 DetecRTC.browser.googSupportedFlags.echoCancellation

diff --git a/dev/CheckDeviceSupport.js b/dev/CheckDeviceSupport.js
@@ -1,4 +1,18 @@
-DetectRTC.MediaDevices = [];
+var MediaDevices = [];
+
+// ---------- Media Devices detection
+var canEnumerate = false;
+if(typeof MediaStreamTrack !== 'undefined') {
+    canEnumerate = true;
+}
+
+else if(navigator.mediaDevices && !!navigator.mediaDevices.enumerateDevices) {
+    canEnumerate = true;
+}
+
+var hasMicrophone = canEnumerate;
+var hasSpeakers = canEnumerate;
+var hasWebcam = canEnumerate;
 
 // http://dev.w3.org/2011/webrtc/editor/getusermedia.html#mediadevices
 // todo: switch to enumerateDevices when landed in canary.
@@ -14,21 +28,13 @@ function CheckDeviceSupport(callback) {
     }
 
     if (!navigator.enumerateDevices) {
-        warn('navigator.enumerateDevices is undefined.');
-        // assuming that it is older chrome or chromium implementation
-        if (isChrome) {
-            DetectRTC.hasMicrophone = true;
-            DetectRTC.hasSpeakers = true;
-            DetectRTC.hasWebcam = true;
-        }
-
         if (callback) {
             callback();
         }
         return;
     }
 
-    DetectRTC.MediaDevices = [];
+    MediaDevices = [];
     navigator.enumerateDevices(function(devices) {
         devices.forEach(function(_device) {
             var device = {};
@@ -37,7 +43,7 @@ function CheckDeviceSupport(callback) {
             }
 
             var skip;
-            DetectRTC.MediaDevices.forEach(function(d) {
+            MediaDevices.forEach(function(d) {
                 if (d.id === device.id) {
                     skip = true;
                 }
@@ -69,22 +75,29 @@ function CheckDeviceSupport(callback) {
             }
 
             if (device.kind === 'audioinput' || device.kind === 'audio') {
-                DetectRTC.hasMicrophone = true;
+                hasMicrophone = true;
             }
 
             if (device.kind === 'audiooutput') {
-                DetectRTC.hasSpeakers = true;
+                hasSpeakers = true;
             }
 
             if (device.kind === 'videoinput' || device.kind === 'video') {
-                DetectRTC.hasWebcam = true;
+                hasWebcam = true;
             }
 
             // there is no 'videoouput' in the spec.
 
-            DetectRTC.MediaDevices.push(device);
+            MediaDevices.push(device);
         });
 
+        if(typeof DetectRTC !== 'undefined') {
+            DetectRTC.MediaDevices = MediaDevices;
+            DetectRTC.hasMicrophone = MediaDevices;
+            DetectRTC.hasSpeakers = MediaDevices;
+            DetectRTC.hasWebcam = MediaDevices;
+        }
+
         if (callback) {
             callback();
         }
@@ -93,4 +106,3 @@ function CheckDeviceSupport(callback) {
 
 // check for microphone/camera support!
 new CheckDeviceSupport();
-DetectRTC.load = CheckDeviceSupport;
diff --git a/dev/DetectLocalIPAddress.js b/dev/DetectLocalIPAddress.js
@@ -1,5 +1,5 @@
 // via: https://github.com/diafygi/webrtc-ips
-DetectRTC.DetectLocalIPAddress = function(callback) {
+function DetectLocalIPAddress(callback) {
     getIPs(function(ip) {
         //local IPs
         if (ip.match(/^(192\.168\.|169\.254\.|10\.|172\.(1[6-9]|2\d|3[01]))/)) {
@@ -11,7 +11,7 @@ DetectRTC.DetectLocalIPAddress = function(callback) {
             callback('Public: ' + ip);
         }
     });
-};
+}
 
 //get the IP addresses associated with an account
 function getIPs(callback) {
@@ -52,6 +52,12 @@ function getIPs(callback) {
                 urls: 'stun:stun.services.mozilla.com'
             }]
         };
+
+        if(typeof DetectRTC !== 'undefined' && DetectRTC.browser.isFirefox && DetectRTC.browser.version <= 38) {
+            servers[0] = {
+                url: servers[0].urls
+            };
+        }
     }
 
     //construct a new RTCPeerConnection