Added [email protected] Fixed #121

muaz-khan · Apr 10, 2016 · b906e2f · b906e2f
1 parent f1a01d0
commit b906e2f
Show file tree

Hide file tree

Showing 12 changed files with 95 additions and 96 deletions.
diff --git a/README.md b/README.md
@@ -136,7 +136,7 @@ All files from `/dist` directory are available on CDN: `https://cdn.webrtc-exper
 <script src="https://cdn.webrtc-experiment.com:443/rmc3.min.js"></script>
 
 <!-- or specific version -->
-<script src="https://github.com/muaz-khan/RTCMultiConnection/releases/download/3.2.98/rmc3.min.js"></script>
+<script src="https://github.com/muaz-khan/RTCMultiConnection/releases/download/3.2.99/rmc3.min.js"></script>
 ```
 
 If you're sharing files, you also need to link:
@@ -148,7 +148,7 @@ If you're sharing files, you also need to link:
 <script src="https://cdn.webrtc-experiment.com:443/rmc3.fbr.min.js"></script>
 
 <!-- or specific version -->
-<script src="https://github.com/muaz-khan/RTCMultiConnection/releases/download/3.2.98/rmc3.fbr.min.js"></script>
+<script src="https://github.com/muaz-khan/RTCMultiConnection/releases/download/3.2.99/rmc3.fbr.min.js"></script>
 ```
 
 > You can link multiple files from `dev` directory. Order doesn't matters.

diff --git a/RTCMultiConnection.js b/RTCMultiConnection.js
@@ -1,4 +1,4 @@
-// Last time updated: 2016-03-31 1:23:45 PM UTC
+// Last time updated: 2016-04-10 12:38:30 PM UTC
 
 // _____________________
 // RTCMultiConnection-v3
@@ -350,6 +350,13 @@
             }
 
             options = options || {};
+
+            var cb = function() {};
+            if (typeof options === 'function') {
+                cb = options;
+                options = {};
+            }
+
             if (typeof options.localPeerSdpConstraints !== 'undefined') {
                 localPeerSdpConstraints = options.localPeerSdpConstraints;
             }
@@ -386,6 +393,7 @@
                 }
 
                 mPeer.onNegotiationNeeded(connectionDescription);
+                cb();
             });
 
             return connectionDescription;

diff --git a/RTCMultiConnection.min.js b/RTCMultiConnection.min.js
diff --git a/demos/Firebase-Demo.html b/demos/Firebase-Demo.html
@@ -59,7 +59,6 @@ <h1>Firebase Video Conferencing Demo using RTCMultiConnection-v3.0</h1>
                 <input type="text" id="room-id" value="abcdef">
                 <button id="open-room">Open Room</button>
                 <button id="join-room">Join Room</button>
-                <button id="open-or-join-room">Auto Open Or Join Room</button>
 
                 <br><br>
                 <input type="text" id="input-text-chat" placeholder="Enter Text Chat" disabled>
@@ -80,10 +79,6 @@ <h1>Firebase Video Conferencing Demo using RTCMultiConnection-v3.0</h1>
         <!-- <script src="/dev/FileBufferReader.js"></script> -->
         <script src="https://cdn.webrtc-experiment.com:443/rmc3.fbr.min.js"></script>
 
-        <!-- socket.io for signaling
-        <script src="/socket.io/socket.io.js"></script>
-        -->
-
         <script src="https://cdn.webrtc-experiment.com/firebase.js"></script>
         <script src="../dev/globals.js"></script>
         <script src="../dev/FirebaseConnection.js"></script>
@@ -103,11 +98,6 @@ <h1>Firebase Video Conferencing Demo using RTCMultiConnection-v3.0</h1>
                 connection.join(document.getElementById('room-id').value);
             };
 
-            document.getElementById('open-or-join-room').onclick = function() {
-                this.disabled = true;
-                connection.openOrJoin(document.getElementById('room-id').value);
-            };
-
             // ......................................................
             // ................FileSharing/TextChat Code.............
             // ......................................................
@@ -163,6 +153,7 @@ <h1>Firebase Video Conferencing Demo using RTCMultiConnection-v3.0</h1>
             connection.socketMessageEvent = 'firebase-demo';
 
             connection.setCustomSocketHandler(FirebaseConnection);
+            connection.firebase = 'webrtc-experiment';
 
             connection.enableFileSharing = true; // by default, it is "false".
 

diff --git a/demos/PubNub-Demo.html b/demos/PubNub-Demo.html
@@ -57,7 +57,6 @@ <h1>PubNub Video Conferencing Demo using RTCMultiConnection-v3.0</h1>
                 <input type="text" id="room-id" value="abcdef">
                 <button id="open-room">Open Room</button>
                 <button id="join-room">Join Room</button>
-                <button id="open-or-join-room">Auto Open Or Join Room</button>
 
                 <br><br>
                 <input type="text" id="input-text-chat" placeholder="Enter Text Chat" disabled>
@@ -78,10 +77,6 @@ <h1>PubNub Video Conferencing Demo using RTCMultiConnection-v3.0</h1>
         <!-- <script src="/dev/FileBufferReader.js"></script> -->
         <script src="https://cdn.webrtc-experiment.com:443/rmc3.fbr.min.js"></script>
 
-        <!-- socket.io for signaling
-<script src="/socket.io/socket.io.js"></script>
--->
-
         <script src="https://cdn.webrtc-experiment.com/view/websocket.js"></script>
         <script src="../dev/globals.js"></script>
         <script src="../dev/PubNubConnection.js"></script>
@@ -101,11 +96,6 @@ <h1>PubNub Video Conferencing Demo using RTCMultiConnection-v3.0</h1>
                 connection.join(document.getElementById('room-id').value);
             };
 
-            document.getElementById('open-or-join-room').onclick = function() {
-                this.disabled = true;
-                connection.openOrJoin(document.getElementById('room-id').value);
-            };
-
             // ......................................................
             // ................FileSharing/TextChat Code.............
             // ......................................................

diff --git a/dev/FirebaseConnection.js b/dev/FirebaseConnection.js
@@ -1,9 +1,10 @@
 function FirebaseConnection(connection, connectCallback) {
     connection.firebase = connection.firebase || 'webrtc-experiment';
     var channelId = connection.channel;
-    var socket = new Firebase('https://' + connection.firebase + '.firebaseio.com/' + channelId);
 
-    socket.on('child_added', function(snap) {
+    connection.socket = new Firebase('https://' + connection.firebase + '.firebaseio.com/' + channelId);
+
+    connection.socket.on('child_added', function(snap) {
         var data = JSON.parse(snap.val());
 
         if (data.eventName === connection.socketMessageEvent) {
@@ -13,24 +14,27 @@ function FirebaseConnection(connection, connectCallback) {
         snap.ref().remove(); // for socket.io live behavior
     });
 
-    socket.onDisconnect().remove();
+    connection.socket.onDisconnect().remove();
+
+    connection.socket.emit = function(eventName, data, callback) {
+        if (eventName === 'changed-uuid') return;
+        if (data.message && data.message.shiftedModerationControl) return;
 
-    socket.emit = function(eventName, data, callback) {
-        socket.push(JSON.stringify({
+        connection.socket.push(JSON.stringify({
             eventName: eventName,
             data: data
         }));
+
+        if (callback) {
+            callback();
+        }
     };
 
     var mPeer = connection.multiPeersHandler;
 
     function onMessagesCallback(message) {
         if (message.remoteUserId != connection.userid) return;
 
-        if (connection.enableLogs) {
-            console.debug(message.sender, message.message);
-        }
-
         if (connection.peers[message.sender] && connection.peers[message.sender].extra != message.extra) {
             connection.peers[message.sender].extra = message.extra;
             connection.onExtraDataUpdated({
@@ -47,7 +51,7 @@ function FirebaseConnection(connection, connectCallback) {
 
             var action = message.message.action;
 
-            if (action === 'ended') {
+            if (action === 'ended' || action === 'stream-removed') {
                 connection.onstreamended(stream);
                 return;
             }
@@ -63,7 +67,7 @@ function FirebaseConnection(connection, connectCallback) {
             }
 
             mPeer.onNegotiationNeeded({
-                allParticipants: connection.peers.getAllParticipants(message.sender)
+                allParticipants: connection.getAllParticipants(message.sender)
             }, message.sender);
             return;
         }
@@ -77,11 +81,7 @@ function FirebaseConnection(connection, connectCallback) {
         }
 
         if (message.message === 'dropPeerConnection') {
-            if (connection.peers[message.sender]) {
-                connection.peers[message.sender].peer.close();
-                connection.peers[message.sender].peer = null;
-                delete connection.peers[message.sender];
-            }
+            connection.deletePeer(message.sender);
             return;
         }
 
@@ -126,17 +126,13 @@ function FirebaseConnection(connection, connectCallback) {
             return;
         }
 
-        if (message.message.readyForOffer) {
+        if (message.message.readyForOffer || message.message.addMeAsBroadcaster) {
             connection.addNewBroadcaster(message.sender);
         }
 
-        if (message.message.newParticipationRequest) {
+        if (message.message.newParticipationRequest && message.sender !== connection.userid) {
             if (connection.peers[message.sender]) {
-                if (connection.peers[message.sender].peer) {
-                    connection.peers[message.sender].peer.close();
-                    connection.peers[message.sender].peer = null;
-                }
-                delete connection.peers[message.sender];
+                connection.deletePeer(message.sender);
             }
 
             var userPreferences = {
@@ -197,11 +193,11 @@ function FirebaseConnection(connection, connectCallback) {
 
     new Firebase('https://' + connection.firebase + '.firebaseio.com/.info/connected').on('value', function(snap) {
         if (snap.val()) {
-            // if connection.enableLogs
-            console.info('socket.io connection is opened.');
-            if (connectCallback) connectCallback(socket);
+            if (connection.enableLogs) {
+                console.info('Firebase connection is opened.');
+            }
+
+            if (connectCallback) connectCallback(connection.socket);
         }
     });
-
-    return socket;
 }
diff --git a/dev/PubNubConnection.js b/dev/PubNubConnection.js
@@ -5,9 +5,10 @@ function PubNubConnection(connection, connectCallback) {
     var sub = 'sub-c-d0c386c6-7263-11e2-8b02-12313f022c90';
 
     WebSocket = PUBNUB.ws;
-    var socket = new WebSocket('wss://pubsub.pubnub.com/' + pub + '/' + sub + '/' + channelId);
 
-    socket.onmessage = function(e) {
+    connection.socket = new WebSocket('wss://pubsub.pubnub.com/' + pub + '/' + sub + '/' + channelId);
+
+    connection.socket.onmessage = function(e) {
         var data = JSON.parse(e.data);
 
         if (data.eventName === connection.socketMessageEvent) {
@@ -25,41 +26,48 @@ function PubNubConnection(connection, connectCallback) {
         }
     };
 
-    socket.onerror = function() {
+    connection.socket.onerror = function() {
+        if (!connection.enableLogs) return;
         console.error('Socket connection is failed.');
     };
 
-    socket.onclose = function() {
+    connection.socket.onclose = function() {
+        if (!connection.enableLogs) return;
         console.warn('Socket connection is closed.');
     };
 
-    socket.onopen = function() {
-        // if connection.enableLogs
-        console.info('socket.io connection is opened.');
-        if (connectCallback) connectCallback(socket);
+    connection.socket.onopen = function() {
+        if (connection.enableLogs) {
+            console.info('PubNub connection is opened.');
+        }
 
-        socket.emit('presence', {
+        connection.socket.emit('presence', {
             userid: connection.userid,
             isOnline: true
         });
+
+        if (connectCallback) connectCallback(connection.socket);
     };
 
-    socket.emit = function(eventName, data, callback) {
-        socket.send(JSON.stringify({
+    connection.socket.emit = function(eventName, data, callback) {
+        if (eventName === 'changed-uuid') return;
+        if (data.message && data.message.shiftedModerationControl) return;
+
+        connection.socket.send(JSON.stringify({
             eventName: eventName,
             data: data
         }));
+
+        if (callback) {
+            callback();
+        }
     };
 
     var mPeer = connection.multiPeersHandler;
 
     function onMessagesCallback(message) {
         if (message.remoteUserId != connection.userid) return;
 
-        if (connection.enableLogs) {
-            console.debug(message.sender, message.message);
-        }
-
         if (connection.peers[message.sender] && connection.peers[message.sender].extra != message.extra) {
             connection.peers[message.sender].extra = message.extra;
             connection.onExtraDataUpdated({
@@ -76,7 +84,7 @@ function PubNubConnection(connection, connectCallback) {
 
             var action = message.message.action;
 
-            if (action === 'ended') {
+            if (action === 'ended' || action === 'stream-removed') {
                 connection.onstreamended(stream);
                 return;
             }
@@ -92,7 +100,7 @@ function PubNubConnection(connection, connectCallback) {
             }
 
             mPeer.onNegotiationNeeded({
-                allParticipants: connection.peers.getAllParticipants(message.sender)
+                allParticipants: connection.getAllParticipants(message.sender)
             }, message.sender);
             return;
         }
@@ -106,11 +114,7 @@ function PubNubConnection(connection, connectCallback) {
         }
 
         if (message.message === 'dropPeerConnection') {
-            if (connection.peers[message.sender]) {
-                connection.peers[message.sender].peer.close();
-                connection.peers[message.sender].peer = null;
-                delete connection.peers[message.sender];
-            }
+            connection.deletePeer(message.sender);
             return;
         }
 
@@ -155,17 +159,13 @@ function PubNubConnection(connection, connectCallback) {
             return;
         }
 
-        if (message.message.readyForOffer) {
+        if (message.message.readyForOffer || message.message.addMeAsBroadcaster) {
             connection.addNewBroadcaster(message.sender);
         }
 
-        if (message.message.newParticipationRequest) {
+        if (message.message.newParticipationRequest && message.sender !== connection.userid) {
             if (connection.peers[message.sender]) {
-                if (connection.peers[message.sender].peer) {
-                    connection.peers[message.sender].peer.close();
-                    connection.peers[message.sender].peer = null;
-                }
-                delete connection.peers[message.sender];
+                connection.deletePeer(message.sender);
             }
 
             var userPreferences = {
@@ -225,11 +225,9 @@ function PubNubConnection(connection, connectCallback) {
     }
 
     window.addEventListener('beforeunload', function() {
-        socket.emit('presence', {
+        connection.socket.emit('presence', {
             userid: connection.userid,
             isOnline: false
         });
     }, false);
-
-    return socket;
 }
diff --git a/dev/RTCMultiConnection.js b/dev/RTCMultiConnection.js
@@ -334,6 +334,13 @@ function RTCMultiConnection(roomid, forceOptions) {
         }
 
         options = options || {};
+
+        var cb = function() {};
+        if (typeof options === 'function') {
+            cb = options;
+            options = {};
+        }
+
         if (typeof options.localPeerSdpConstraints !== 'undefined') {
             localPeerSdpConstraints = options.localPeerSdpConstraints;
         }
@@ -370,6 +377,7 @@ function RTCMultiConnection(roomid, forceOptions) {
             }
 
             mPeer.onNegotiationNeeded(connectionDescription);
+            cb();
         });
 
         return connectionDescription;