Added: [email protected] Fixed #83

muaz-khan · Jan 14, 2016 · 0eac1fb · 0eac1fb
1 parent 64a0f99
commit 0eac1fb
Show file tree

Hide file tree

Showing 12 changed files with 282 additions and 1,140 deletions.
diff --git a/README.md b/README.md
@@ -64,7 +64,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.82/rmc3.min.js"></script>
+<script src="https://github.com/muaz-khan/RTCMultiConnection/releases/download/3.2.83/rmc3.min.js"></script>
 ```
 
 If you're sharing files, you also need to link:
@@ -76,7 +76,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.82/rmc3.fbr.min.js"></script>
+<script src="https://github.com/muaz-khan/RTCMultiConnection/releases/download/3.2.83/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 at Wednesday, January 13th, 2016, 7:18:18 PM 
+// Last time updated at Thursday, January 14th, 2016, 5:11:33 PM 
 
 // ______________________________
 // RTCMultiConnection-v3.0 (Beta)
@@ -48,6 +48,8 @@
 
                 connection.onstream(connection.streamEvents[stream.streamid]);
             });
+
+            connection.observers.all();
         };
 
         mPeer.onGettingRemoteMedia = function(stream, remoteUserId) {
@@ -379,6 +381,8 @@
         };
 
         connection.getUserMedia = connection.captureUserMedia = function(callback, session) {
+            connection.observers.all();
+
             session = session || connection.session;
 
             if (connection.dontCaptureUserMedia || isData(session)) {
@@ -497,12 +501,44 @@
             socket.emit('changed-uuid', connection.userid);
         };
 
+        connection.observers = {
+            extra: function() {
+                observeObject(connection.extra, function(changes) {
+                    socket.emit('extra-data-updated', connection.extra);
+                });
+            },
+            attachStreams: function() {
+                observeObject(connection.attachStreams, function(changes) {
+                    changes.forEach(function(change) {
+                        if (change.type === 'add') {
+                            setStreamEndHandler(change.object[change.name]);
+                        }
+
+                        if (change.type === 'remove' || change.type === 'delete') {
+                            if (connection.removeStreams.indexOf(change.object[change.name]) === -1) {
+                                connection.removeStreams.push(change.object[change.name]);
+                            }
+                        }
+
+                        connection.attachStreams = removeNullEntries(connection.attachStreams);
+                        connection.removeStreams = removeNullEntries(connection.removeStreams);
+                        connection.observers.all();
+                    });
+                });
+            },
+            all: function() {
+                this.extra();
+                this.attachStreams();
+
+                if (socket) {
+                    socket.emit('extra-data-updated', connection.extra);
+                }
+            }
+        };
         connection.extra = {};
-        if (Object.observe) {
-            Object.observe(connection.extra, function(changes) {
-                socket.emit('extra-data-updated', connection.extra);
-            });
-        }
+        connection.attachStreams = [];
+        connection.removeStreams = [];
+        connection.observers.all();
 
         connection.session = {
             audio: true,
@@ -643,8 +679,6 @@
         };
 
         connection.direction = 'many-to-many';
-        connection.attachStreams = [];
-        connection.removeStreams = [];
 
         Array.prototype.getStreamById = function(streamid) {
             var stream;
@@ -885,6 +919,7 @@
 
                 connection.attachStreams = removeNullEntries(connection.attachStreams);
                 connection.removeStreams = removeNullEntries(connection.removeStreams);
+                connection.observers.all();
 
                 // connection.renegotiate();
 
@@ -905,25 +940,6 @@
             }, false);
         }
 
-        if (Object.observe) {
-            Object.observe(connection.attachStreams, function(changes) {
-                changes.forEach(function(change) {
-                    if (change.type === 'add') {
-                        setStreamEndHandler(change.object[change.name]);
-                    }
-
-                    if (change.type === 'remove' || change.type === 'delete') {
-                        if (connection.removeStreams.indexOf(change.object[change.name]) === -1) {
-                            connection.removeStreams.push(change.object[change.name]);
-                        }
-                    }
-
-                    connection.attachStreams = removeNullEntries(connection.attachStreams);
-                    connection.removeStreams = removeNullEntries(connection.removeStreams);
-                });
-            });
-        }
-
         connection.onMediaError = function(error) {
             if (!!connection.enableLogs) {
                 console.error(error);
@@ -1233,7 +1249,30 @@
             connection.checkIfChromeExtensionAvailable = isFirefoxExtensionAvailable;
         }
 
-        connection.getScreenConstraints = getScreenConstraints;
+        if (typeof getChromeExtensionStatus !== 'undefined') {
+            connection.getChromeExtensionStatus = getChromeExtensionStatus;
+        }
+
+        connection.getScreenConstraints = function(callback) {
+            getScreenConstraints(function(error, screen_constraints) {
+                if (!error) {
+                    screen_constraints = connection.modifyScreenConstraints(screen_constraints);
+                    callback(error, screen_constraints);
+                }
+            });
+        };
+
+        connection.modifyScreenConstraints = function(screen_constraints) {
+            return screen_constraints;
+        };
+
+        connection.onPeerStateChanged = function(state) {
+            if (connection.enableLogs) {
+                if (state.iceConnectionState.search(/disconnected|closed|failed/gi) !== -1) {
+                    console.error('Peer connection is closed between you & ', state.userid, state.extra, 'state:', state.iceConnectionState);
+                }
+            }
+        };
     }
 
     function SocketConnection(connection, connectCallback) {
@@ -1953,14 +1992,11 @@
                 extra: connection.peers[remoteUserId] ? connection.peers[remoteUserId].extra : {},
                 channel: channel
             });
+            connection.observers.all();
         };
 
         this.onPeerStateChanged = function(state) {
-            if (connection.enableLogs) {
-                if (state.iceConnectionState.search(/disconnected|closed|failed/gi) !== -1) {
-                    console.error('Peer connection is closed between you & ', state.userid, state.extra, 'state:', state.iceConnectionState);
-                }
-            }
+            connection.onPeerStateChanged(state);
         };
 
         this.onNegotiationStarted = function(remoteUserId, states) {};
@@ -2189,6 +2225,20 @@
         };
     }
 
+    var lastChanges = '';
+
+    function observeObject(obj, callback) {
+        if (!Object.observe) return;
+
+        Object.observe(obj, function(changes) {
+            var jsonStringified = JSON.stringify(changes);
+            if (lastChanges == jsonStringified) return;
+            lastChanges = jsonStringified;
+
+            callback(changes);
+        });
+    }
+
     // Last time updated at Feb 08, 2015, 08:32:23
 
     // Latest file can be found here: https://cdn.webrtc-experiment.com/Plugin.EveryWhere.js
@@ -2557,11 +2607,16 @@
         });
 
         peer.oniceconnectionstatechange = peer.onsignalingstatechange = function() {
+            var extra = that.extra;
+            if (config.rtcMultiConnection.peers[that.remoteUserId]) {
+                extra = config.rtcMultiConnection.peers[that.remoteUserId].extra || extra;
+            }
+
             config.onPeerStateChanged({
                 iceConnectionState: peer.iceConnectionState,
                 iceGatheringState: peer.iceGatheringState,
                 signalingState: peer.signalingState,
-                extra: that.extra,
+                extra: extra,
                 userid: that.remoteUserId
             });
 

diff --git a/RTCMultiConnection.min.js b/RTCMultiConnection.min.js
diff --git a/dev/MultiPeersHandler.js b/dev/MultiPeersHandler.js
@@ -441,14 +441,11 @@ function MultiPeers(connection) {
             extra: connection.peers[remoteUserId] ? connection.peers[remoteUserId].extra : {},
             channel: channel
         });
+        connection.observers.all();
     };
 
     this.onPeerStateChanged = function(state) {
-        if (connection.enableLogs) {
-            if (state.iceConnectionState.search(/disconnected|closed|failed/gi) !== -1) {
-                console.error('Peer connection is closed between you & ', state.userid, state.extra, 'state:', state.iceConnectionState);
-            }
-        }
+        connection.onPeerStateChanged(state);
     };
 
     this.onNegotiationStarted = function(remoteUserId, states) {};

diff --git a/dev/RTCMultiConnection.js b/dev/RTCMultiConnection.js
@@ -39,6 +39,8 @@ function RTCMultiConnection(roomid) {
 
             connection.onstream(connection.streamEvents[stream.streamid]);
         });
+
+        connection.observers.all();
     };
 
     mPeer.onGettingRemoteMedia = function(stream, remoteUserId) {
@@ -370,6 +372,8 @@ function RTCMultiConnection(roomid) {
     };
 
     connection.getUserMedia = connection.captureUserMedia = function(callback, session) {
+        connection.observers.all();
+
         session = session || connection.session;
 
         if (connection.dontCaptureUserMedia || isData(session)) {
@@ -488,12 +492,44 @@ function RTCMultiConnection(roomid) {
         socket.emit('changed-uuid', connection.userid);
     };
 
+    connection.observers = {
+        extra: function() {
+            observeObject(connection.extra, function(changes) {
+                socket.emit('extra-data-updated', connection.extra);
+            });
+        },
+        attachStreams: function() {
+            observeObject(connection.attachStreams, function(changes) {
+                changes.forEach(function(change) {
+                    if (change.type === 'add') {
+                        setStreamEndHandler(change.object[change.name]);
+                    }
+
+                    if (change.type === 'remove' || change.type === 'delete') {
+                        if (connection.removeStreams.indexOf(change.object[change.name]) === -1) {
+                            connection.removeStreams.push(change.object[change.name]);
+                        }
+                    }
+
+                    connection.attachStreams = removeNullEntries(connection.attachStreams);
+                    connection.removeStreams = removeNullEntries(connection.removeStreams);
+                    connection.observers.all();
+                });
+            });
+        },
+        all: function() {
+            this.extra();
+            this.attachStreams();
+
+            if (socket) {
+                socket.emit('extra-data-updated', connection.extra);
+            }
+        }
+    };
     connection.extra = {};
-    if (Object.observe) {
-        Object.observe(connection.extra, function(changes) {
-            socket.emit('extra-data-updated', connection.extra);
-        });
-    }
+    connection.attachStreams = [];
+    connection.removeStreams = [];
+    connection.observers.all();
 
     connection.session = {
         audio: true,
@@ -634,8 +670,6 @@ function RTCMultiConnection(roomid) {
     };
 
     connection.direction = 'many-to-many';
-    connection.attachStreams = [];
-    connection.removeStreams = [];
 
     Array.prototype.getStreamById = function(streamid) {
         var stream;
@@ -876,6 +910,7 @@ function RTCMultiConnection(roomid) {
 
             connection.attachStreams = removeNullEntries(connection.attachStreams);
             connection.removeStreams = removeNullEntries(connection.removeStreams);
+            connection.observers.all();
 
             // connection.renegotiate();
 
@@ -896,25 +931,6 @@ function RTCMultiConnection(roomid) {
         }, false);
     }
 
-    if (Object.observe) {
-        Object.observe(connection.attachStreams, function(changes) {
-            changes.forEach(function(change) {
-                if (change.type === 'add') {
-                    setStreamEndHandler(change.object[change.name]);
-                }
-
-                if (change.type === 'remove' || change.type === 'delete') {
-                    if (connection.removeStreams.indexOf(change.object[change.name]) === -1) {
-                        connection.removeStreams.push(change.object[change.name]);
-                    }
-                }
-
-                connection.attachStreams = removeNullEntries(connection.attachStreams);
-                connection.removeStreams = removeNullEntries(connection.removeStreams);
-            });
-        });
-    }
-
     connection.onMediaError = function(error) {
         if (!!connection.enableLogs) {
             console.error(error);
@@ -1224,5 +1240,28 @@ function RTCMultiConnection(roomid) {
         connection.checkIfChromeExtensionAvailable = isFirefoxExtensionAvailable;
     }
 
-    connection.getScreenConstraints = getScreenConstraints;
+    if (typeof getChromeExtensionStatus !== 'undefined') {
+        connection.getChromeExtensionStatus = getChromeExtensionStatus;
+    }
+
+    connection.getScreenConstraints = function(callback) {
+        getScreenConstraints(function(error, screen_constraints) {
+            if (!error) {
+                screen_constraints = connection.modifyScreenConstraints(screen_constraints);
+                callback(error, screen_constraints);
+            }
+        });
+    };
+
+    connection.modifyScreenConstraints = function(screen_constraints) {
+        return screen_constraints;
+    };
+
+    connection.onPeerStateChanged = function(state) {
+        if (connection.enableLogs) {
+            if (state.iceConnectionState.search(/disconnected|closed|failed/gi) !== -1) {
+                console.error('Peer connection is closed between you & ', state.userid, state.extra, 'state:', state.iceConnectionState);
+            }
+        }
+    };
 }
diff --git a/dev/RTCPeerConnection.js b/dev/RTCPeerConnection.js
@@ -173,11 +173,16 @@ function PeerInitiator(config) {
     });
 
     peer.oniceconnectionstatechange = peer.onsignalingstatechange = function() {
+        var extra = that.extra;
+        if (config.rtcMultiConnection.peers[that.remoteUserId]) {
+            extra = config.rtcMultiConnection.peers[that.remoteUserId].extra || extra;
+        }
+
         config.onPeerStateChanged({
             iceConnectionState: peer.iceConnectionState,
             iceGatheringState: peer.iceGatheringState,
             signalingState: peer.signalingState,
-            extra: that.extra,
+            extra: extra,
             userid: that.remoteUserId
         });