fix a bunch of problems

yocontra · Dec 15, 2015 · c8849c3 · c8849c3
1 parent 96b803e
commit c8849c3
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 30 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -18,6 +18,7 @@
   "browser": true,
   "mocha": true,
   "globals": {
-    "cordova": true
+    "cordova": true,
+    "ActiveXObject": true
   }
 }
diff --git a/lib/temasys/MockRTC.js b/lib/temasys/MockRTC.js
@@ -36,6 +36,7 @@ var RTCPeerConnectionMock = mock({
   ]
 });
 
+/*
 var RTCSessionDescriptionMock = mock({
   properties: [
     'type',
@@ -50,6 +51,7 @@ var RTCIceCandidateMock = mock({
     'sdpMLineIndex'
   ]
 });
+*/
 
 if (!isInstalled()) {
   module.exports = {};
@@ -68,7 +70,7 @@ if (!isInstalled()) {
         ctor = rtc.RTCSessionDescription;
       });
       if (!ctor) {
-        throw new Error('Tried to use RTCSessionDescription before plugin loaded!');
+        throw new Error('Tried RTCSessionDescription before RTCPeerConnection');
       }
       return nu.apply(ctor, arguments);
     },
@@ -78,7 +80,7 @@ if (!isInstalled()) {
         ctor = rtc.RTCIceCandidate;
       });
       if (!ctor) {
-        throw new Error('Tried to use RTCIceCandidate before plugin loaded!');
+        throw new Error('Tried RTCIceCandidate before RTCPeerConnection');
       }
       return nu.apply(ctor, arguments);
     }

diff --git a/platforms/chrome/gum.js b/platforms/chrome/gum.js
@@ -1,10 +1,8 @@
 'use strict';
 
 module.exports = function() {
-  if (typeof navigator === 'undefined') return;
   var getUserMedia = navigator.getUserMedia ||
     navigator.webkitGetUserMedia;
-  if (typeof getUserMedia === 'undefined') return;
 
   return function(constraints, cb) {
     // make constraints optional

diff --git a/platforms/chrome/match.js b/platforms/chrome/match.js
@@ -1,6 +1,6 @@
 'use strict';
 
 module.exports = function(){
-  return typeof window!== 'undefined' &&
+  return typeof window !== 'undefined' &&
     typeof window.chrome !== 'undefined';
 };
diff --git a/platforms/chrome/rtc.js b/platforms/chrome/rtc.js
@@ -1,7 +1,6 @@
 'use strict';
 
 module.exports = function() {
-  if (typeof window === 'undefined') return;
   return {
     RTCPeerConnection: window.RTCPeerConnection ||
       window.webkitRTCPeerConnection,

diff --git a/platforms/cordova-ios/attachStream.js b/platforms/cordova-ios/attachStream.js
@@ -1,12 +1,16 @@
 'use strict';
 
+function needPlatform(){
+  throw new Error('Missing iosrtc plugin for attachStream');
+}
+
 module.exports = function(){
   var URL = window.URL || window.webkitURL;
 
   return function(el, stream) {
-    if (typeof cordova === 'undefined') return;
-    if (typeof cordova.plugins === 'undefined') return;
-    if (typeof cordova.plugins.iosrtc === 'undefined') return;
+    if (typeof cordova === 'undefined') return needPlatform();
+    if (typeof cordova.plugins === 'undefined') return needPlatform();
+    if (typeof cordova.plugins.iosrtc === 'undefined') return needPlatform();
 
     el.src = URL.createObjectURL(stream);
     el.setAttribute('webkit-playsinline', 'true');

diff --git a/platforms/cordova-ios/gum.js b/platforms/cordova-ios/gum.js
@@ -1,10 +1,14 @@
 'use strict';
 
+function needPlatform(){
+  throw new Error('Missing iosrtc plugin for getUserMedia');
+}
+
 module.exports = function() {
   return function(constraints, cb) {
-    if (typeof cordova === 'undefined') return;
-    if (typeof cordova.plugins === 'undefined') return;
-    if (typeof cordova.plugins.iosrtc === 'undefined') return;
+    if (typeof cordova === 'undefined') return needPlatform();
+    if (typeof cordova.plugins === 'undefined') return needPlatform();
+    if (typeof cordova.plugins.iosrtc === 'undefined') return needPlatform();
 
     // make constraints optional
     if (arguments.length !== 2) {

diff --git a/platforms/cordova-ios/rtc.js b/platforms/cordova-ios/rtc.js
@@ -1,9 +1,13 @@
 'use strict';
 
+function needPlatform(){
+  throw new Error('Missing iosrtc plugin for RTCPeerConnection');
+}
+
 module.exports = function() {
-  if (typeof cordova === 'undefined') return;
-  if (typeof cordova.plugins === 'undefined') return;
-  if (typeof cordova.plugins.iosrtc === 'undefined') return;
+  if (typeof cordova === 'undefined') return needPlatform();
+  if (typeof cordova.plugins === 'undefined') return needPlatform();
+  if (typeof cordova.plugins.iosrtc === 'undefined') return needPlatform();
 
   return {
     RTCPeerConnection: cordova.plugins.iosrtc.RTCPeerConnection,

diff --git a/platforms/edge/gum.js b/platforms/edge/gum.js
@@ -1,10 +1,8 @@
 'use strict';
 
 module.exports = function() {
-  if (typeof navigator === 'undefined') return;
   var getUserMedia = navigator.getUserMedia ||
     navigator.msGetUserMedia;
-  if (typeof getUserMedia === 'undefined') return;
 
   return function(constraints, cb) {
     // make constraints optional

diff --git a/platforms/edge/match.js b/platforms/edge/match.js
@@ -1,7 +1,6 @@
 'use strict';
 
-var browser = require('detect-browser');
-
 module.exports = function(){
+  var browser = require('detect-browser');
   return browser.name === 'edge';
 };
diff --git a/platforms/firefox/gum.js b/platforms/firefox/gum.js
@@ -1,10 +1,8 @@
 'use strict';
 
 module.exports = function() {
-  if (typeof navigator === 'undefined') return;
   var getUserMedia = navigator.getUserMedia ||
     navigator.mozGetUserMedia;
-  if (typeof getUserMedia === 'undefined') return;
 
   return function(constraints, cb) {
     // make constraints optional

diff --git a/platforms/firefox/rtc.js b/platforms/firefox/rtc.js
@@ -1,7 +1,6 @@
 'use strict';
 
 module.exports = function() {
-  if (typeof window === 'undefined') return;
   return {
     RTCPeerConnection: window.RTCPeerConnection ||
       window.mozRTCPeerConnection,

diff --git a/platforms/ie/attachStream.js b/platforms/ie/attachStream.js
@@ -1,6 +1,6 @@
 'use strict';
 
-module.exports = module.exports = function(){
+module.exports = function(){
   return function(el, stream) {
     // TODO
   };

diff --git a/platforms/ie/match.js b/platforms/ie/match.js
@@ -1,7 +1,6 @@
 'use strict';
 
-var browser = require('detect-browser');
-
 module.exports = function(){
+  var browser = require('detect-browser');
   return browser.name === 'ie';
 };
diff --git a/platforms/react-native/gum.js b/platforms/react-native/gum.js
@@ -2,7 +2,6 @@
 
 module.exports = function() {
   var rtc;
-  if (typeof navigator === 'undefined') return;
   try {
     rtc = require('react-native-webrtc');
   } catch (err) {

diff --git a/platforms/react-native/rtc.js b/platforms/react-native/rtc.js
@@ -1,7 +1,12 @@
 'use strict';
 
 module.exports = function() {
-  var rtc = require('react-native-webrtc');
+  var rtc;
+  try {
+    rtc = require('react-native-webrtc');
+  } catch (err) {
+    return;
+  }
   return {
     RTCPeerConnection: rtc.RTCPeerConnection,
     RTCSessionDescription: rtc.RTCSessionDescription,

diff --git a/platforms/safari/attachStream.js b/platforms/safari/attachStream.js
@@ -2,6 +2,6 @@
 
 module.exports = function(){
   return function(el, stream) {
-  // TODO
+    // TODO
   };
 };
diff --git a/test/index.js b/test/index.js
@@ -24,7 +24,8 @@ describe('rtc()', function(){
       'getUserMedia',
       'RTCPeerConnection',
       'RTCSessionDescription',
-      'RTCIceCandidate'
+      'RTCIceCandidate',
+      'attachStream'
     ]);
     done();
   });