From 35156b113c0c154ec80c14fcaf8e247d0e4b43bb Mon Sep 17 00:00:00 2001
From: manthrax <manthrax@gmail.com>
Date: Fri, 16 Oct 2020 23:25:29 -0700
Subject: [PATCH] Force this to work on chrome with/without https

Force this to work on chrome without HTTPS
---
 js/adapter.js           | 12 +++++++-----
 js/serverless-webrtc.js | 26 ++++++++++++++++++--------
 serverless-webrtc.html  |  2 +-
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/js/adapter.js b/js/adapter.js
index 538dedd..098ba93 100644
--- a/js/adapter.js
+++ b/js/adapter.js
@@ -43,7 +43,7 @@ if (navigator.mozGetUserMedia) {
   MediaStream.prototype.getAudioTracks = function () {
     return []
   }
-} else if (navigator.webkitGetUserMedia) {
+} else {//} if (navigator.webkitGetUserMedia || navigator.webkitGetUserMedia) {
   console.log('This appears to be Chrome')
 
   webrtcDetectedBrowser = 'chrome'
@@ -53,7 +53,9 @@ if (navigator.mozGetUserMedia) {
 
   // Get UserMedia (only difference is the prefix).
   // Code from Adam Barth.
-  getUserMedia = navigator.webkitGetUserMedia.bind(navigator)
+  //getUserMedia = navigator.webkitGetUserMedia.bind(navigator)
+  if(navigator.mediaDevices)//Non HTTPS booo...
+      getUserMedia = navigator.mediaDevices.getUserMedia.bind(navigator.mediaDevices)
 
   // Attach a media stream to an element.
   attachMediaStream = function (element, stream) {
@@ -84,6 +86,6 @@ if (navigator.mozGetUserMedia) {
       return this.remoteStreams
     }
   }
-} else {
-  console.log('Browser does not appear to be WebRTC-capable')
-}
+} //else {
+  //console.log('Browser does not appear to be WebRTC-capable')
+//}
diff --git a/js/serverless-webrtc.js b/js/serverless-webrtc.js
index ebbda3b..d755cec 100644
--- a/js/serverless-webrtc.js
+++ b/js/serverless-webrtc.js
@@ -33,6 +33,7 @@ $('#waitForConnection').modal('hide')
 $('#createOrJoin').modal('show')
 
 $('#createBtn').click(function () {
+  $('#createOrJoin').modal('hide')
   $('#showLocalOffer').modal('show')
   createLocalOffer()
 })
@@ -42,7 +43,7 @@ $('#joinBtn').click(function () {
                            navigator.webkitGetUserMedia ||
                            navigator.mozGetUserMedia ||
                            navigator.msGetUserMedia
-  navigator.getUserMedia({video: true, audio: true}, function (stream) {
+  navigator.getUserMedia && navigator.getUserMedia({video: true, audio: true}, function (stream) {
     var video = document.getElementById('localVideo')
     video.src = window.URL.createObjectURL(stream)
     video.play()
@@ -50,6 +51,7 @@ $('#joinBtn').click(function () {
   }, function (error) {
     console.log('Error adding stream to pc2: ' + error)
   })
+  $('#createOrJoin').modal('hide')
   $('#getRemoteOffer').modal('show')
 })
 
@@ -156,25 +158,33 @@ function createLocalOffer () {
   console.log('video1')
   navigator.getUserMedia = navigator.getUserMedia ||
                            navigator.webkitGetUserMedia ||
-                           navigator.mediaDevices.getUserMedia ||
+                           (navigator.mediaDevices&&navigator.mediaDevices.getUserMedia) ||
                            navigator.msGetUserMedia
-  navigator.getUserMedia({video: true, audio: true}, function (stream) {
+  navigator.getUserMedia && navigator.getUserMedia({video: true, audio: true}, function (stream) {
     var video = document.getElementById('localVideo')
     video.src = window.URL.createObjectURL(stream)
     video.play()
     pc1.addStream(stream)
     console.log(stream)
     console.log('adding stream to pc1')
-    setupDC1()
-    pc1.createOffer(function (desc) {
+//     pc1.createOffer(function (desc) {
+//       pc1.setLocalDescription(desc, function () {}, function () {})
+//       console.log('created local offer', desc)
+//     },
+//     function () { console.warn("Couldn't create offer") },
+//     sdpConstraints)
+  }, function (error) {
+    console.log('Error adding stream to pc1: ' + error)
+  })
+  
+
+  setupDC1()
+  pc1.createOffer(function (desc) {
       pc1.setLocalDescription(desc, function () {}, function () {})
       console.log('created local offer', desc)
     },
     function () { console.warn("Couldn't create offer") },
     sdpConstraints)
-  }, function (error) {
-    console.log('Error adding stream to pc1: ' + error)
-  })
 }
 
 pc1.onicecandidate = function (e) {
diff --git a/serverless-webrtc.html b/serverless-webrtc.html
index d5be7f0..2489215 100644
--- a/serverless-webrtc.html
+++ b/serverless-webrtc.html
@@ -33,7 +33,7 @@
   <input type="file" id="fileBtn">
 </div>
 
-<div class="modal" id="showLocalOffer" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" hidden>
+<div class="modal" id="showLocalOffer" data-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" hidden no-enforce-focus="true">
   <div class="modal-header">
     <h3 id="myModalLabel">Send your local offer to someone else</h3>
   </div>