Added detectrtc@1.3.4

muaz-khan · Mar 5, 2017 · 27285b8 · 27285b8
1 parent 028005f
commit 27285b8
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 28 deletions.
diff --git a/.npmignore b/.npmignore
@@ -1,3 +1,12 @@
-node_modules
-lib-cov
-npm-debug.log
+# ignore everything
+*
+
+# but not these files...
+!DetectRTC.js
+!DetectRTC.min.js
+!index.html
+!package.json
+!bower.json
+!npm-test.js
+!server.js
+!README.md
diff --git a/DetectRTC.js b/DetectRTC.js
@@ -1,4 +1,4 @@
-// Last time updated: 2017-03-04 2:09:01 PM UTC
+// Last time updated: 2017-03-05 5:56:31 AM UTC
 
 // Latest file can be found here: https://cdn.webrtc-experiment.com/DetectRTC.js
 
@@ -18,6 +18,12 @@
 
     var browserFakeUserAgent = 'Fake/5.0 (FakeOS) AppleWebKit/123 (KHTML, like Gecko) Fake/12.3.4567.89 Fake/123.45';
 
+    var isNodejs = typeof process === 'object' && typeof process.versions === 'object' && process.versions.node;
+    if (isNodejs) {
+        var version = process.versions.node.toString().replace('v', '');
+        browserFakeUserAgent = 'Nodejs/' + version + ' (NodeOS) AppleWebKit/' + version + ' (KHTML, like Gecko) Nodejs/' + version + ' Nodejs/' + version
+    }
+
     (function(that) {
         if (typeof window !== 'undefined') {
             return;
@@ -486,6 +492,13 @@
         }
     }
 
+    var isNodejs = typeof process === 'object' && typeof process.versions === 'object' && process.versions.node;
+
+    if (osName === 'Unknown OS' && isNodejs) {
+        osName = 'Nodejs';
+        osVersion = process.versions.node.toString().replace('v', '');
+    }
+
     var isCanvasSupportsStreamCapturing = false;
     var isVideoSupportsStreamCapturing = false;
     ['captureStream', 'mozCaptureStream', 'webkitCaptureStream'].forEach(function(item) {
@@ -811,7 +824,11 @@
     // DetectRTC.isChrome || DetectRTC.isFirefox || DetectRTC.isEdge
     DetectRTC.browser['is' + DetectRTC.browser.name] = true;
 
-    var isNodeWebkit = !!(window.process && (typeof window.process === 'object') && window.process.versions && window.process.versions['node-webkit']);
+    // -----------
+    DetectRTC.osName = osName;
+    DetectRTC.osVersion = osVersion;
+
+    var isNodeWebkit = typeof process === 'object' && typeof process.versions === 'object' && process.versions['node-webkit'];
 
     // --------- Detect if system supports WebRTC 1.0 or WebRTC 1.1.
     var isWebRTCSupported = false;
@@ -894,14 +911,13 @@
         isGetUserMediaSupported = true;
     }
     if (DetectRTC.browser.isChrome && DetectRTC.browser.version >= 46 && location.protocol !== 'https:') {
-        DetectRTC.isGetUserMediaSupported = 'Requires HTTPs';
+        isGetUserMediaSupported = 'Requires HTTPs';
+    }
+    if (DetectRTC.osName === 'Nodejs') {
+        isGetUserMediaSupported = false;
     }
     DetectRTC.isGetUserMediaSupported = isGetUserMediaSupported;
 
-    // -----------
-    DetectRTC.osName = osName;
-    DetectRTC.osVersion = osVersion;
-
     var displayResolution = '';
     if (screen.width) {
         var width = (screen.width) ? screen.width : '';
@@ -930,6 +946,11 @@
     DetectRTC.isWebSocketsSupported = 'WebSocket' in window && 2 === window.WebSocket.CLOSING;
     DetectRTC.isWebSocketsBlocked = !DetectRTC.isWebSocketsSupported;
 
+    if (DetectRTC.osName === 'Nodejs') {
+        DetectRTC.isWebSocketsSupported = true;
+        DetectRTC.isWebSocketsBlocked = false;
+    }
+
     DetectRTC.checkWebSocketsSupport = function(callback) {
         callback = callback || function() {};
         try {

diff --git a/DetectRTC.min.js b/DetectRTC.min.js
diff --git a/README.md b/README.md
@@ -88,7 +88,7 @@ node npm-test.js
 You can even link specific versions:
 
 ```html
-<script src="https://github.com/muaz-khan/DetectRTC/releases/download/1.3.2/DetectRTC.js"></script>
+<script src="https://github.com/muaz-khan/DetectRTC/releases/download/1.3.4/DetectRTC.js"></script>
 ```
 
 <img src="https://cdn.webrtc-experiment.com/images/DetectRTC.png" style="width:100%;" />

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "detectrtc",
-    "version": "1.3.3",
+    "version": "1.3.4",
     "authors": [
         {
             "name": "Muaz Khan",

diff --git a/dev/DetectRTC.js b/dev/DetectRTC.js
@@ -11,7 +11,11 @@ detectPrivateMode(function(isPrivateBrowsing) {
 // DetectRTC.isChrome || DetectRTC.isFirefox || DetectRTC.isEdge
 DetectRTC.browser['is' + DetectRTC.browser.name] = true;
 
-var isNodeWebkit = !!(window.process && (typeof window.process === 'object') && window.process.versions && window.process.versions['node-webkit']);
+// -----------
+DetectRTC.osName = osName;
+DetectRTC.osVersion = osVersion;
+
+var isNodeWebkit = typeof process === 'object' && typeof process.versions === 'object' && process.versions['node-webkit'];
 
 // --------- Detect if system supports WebRTC 1.0 or WebRTC 1.1.
 var isWebRTCSupported = false;
@@ -94,14 +98,13 @@ if (navigator.getUserMedia) {
     isGetUserMediaSupported = true;
 }
 if (DetectRTC.browser.isChrome && DetectRTC.browser.version >= 46 && location.protocol !== 'https:') {
-    DetectRTC.isGetUserMediaSupported = 'Requires HTTPs';
+    isGetUserMediaSupported = 'Requires HTTPs';
+}
+if (DetectRTC.osName === 'Nodejs') {
+    isGetUserMediaSupported = false;
 }
 DetectRTC.isGetUserMediaSupported = isGetUserMediaSupported;
 
-// -----------
-DetectRTC.osName = osName;
-DetectRTC.osVersion = osVersion;
-
 var displayResolution = '';
 if (screen.width) {
     var width = (screen.width) ? screen.width : '';
@@ -130,6 +133,11 @@ DetectRTC.DetectLocalIPAddress = DetectLocalIPAddress;
 DetectRTC.isWebSocketsSupported = 'WebSocket' in window && 2 === window.WebSocket.CLOSING;
 DetectRTC.isWebSocketsBlocked = !DetectRTC.isWebSocketsSupported;
 
+if (DetectRTC.osName === 'Nodejs') {
+    DetectRTC.isWebSocketsSupported = true;
+    DetectRTC.isWebSocketsBlocked = false;
+}
+
 DetectRTC.checkWebSocketsSupport = function(callback) {
     callback = callback || function() {};
     try {

diff --git a/dev/common.js b/dev/common.js
@@ -1,5 +1,11 @@
 var browserFakeUserAgent = 'Fake/5.0 (FakeOS) AppleWebKit/123 (KHTML, like Gecko) Fake/12.3.4567.89 Fake/123.45';
 
+var isNodejs = typeof process === 'object' && typeof process.versions === 'object' && process.versions.node;
+if (isNodejs) {
+    var version = process.versions.node.toString().replace('v', '');
+    browserFakeUserAgent = 'Nodejs/' + version + ' (NodeOS) AppleWebKit/' + version + ' (KHTML, like Gecko) Nodejs/' + version + ' Nodejs/' + version
+}
+
 (function(that) {
     if (typeof window !== 'undefined') {
         return;

diff --git a/dev/detectOSName.js b/dev/detectOSName.js
@@ -19,3 +19,10 @@ if (osInfo && osInfo.osName && osInfo.osName != '-') {
         osVersion = getAndroidVersion();
     }
 }
+
+var isNodejs = typeof process === 'object' && typeof process.versions === 'object' && process.versions.node;
+
+if (osName === 'Unknown OS' && isNodejs) {
+    osName = 'Nodejs';
+    osVersion = process.versions.node.toString().replace('v', '');
+}
diff --git a/npm-test.js b/npm-test.js
@@ -2,10 +2,7 @@
 
 var DetectRTC = require('detectrtc');
 
-console.log(DetectRTC.browser);
-
-console.log('\n\n-------\n\n');
-
-DetectRTC.load(function() {
-    console.log(DetectRTC);
-});
+console.log(DetectRTC.browser.name  + ' version ' + DetectRTC.browser.version);
+console.log(DetectRTC.osName + ' version ' + DetectRTC.osVersion);
+console.log(JSON.stringify(DetectRTC));
+console.log(DetectRTC);
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "detectrtc",
     "preferGlobal": false,
-    "version": "1.3.3",
+    "version": "1.3.4",
     "author": {
         "name": "Muaz Khan",
         "email": "muazkh@gmail.com",