State conflict resolution. Sadly not the Israeli-Palestinian one.

If both peers call each other at the same time, one peer should automatically accept the other's offer without further renegotiation.
Gargron · Dec 30, 2013 · e36c842 · e36c842
1 parent eb8ddd4
commit e36c842
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/public/js/application.js b/public/js/application.js
@@ -203,6 +203,15 @@ var ContactsController = Ember.ArrayController.extend({
     contact.set('signalingChannel', this.get('controllers.application.connection'));
 
     contact.on('connection.incoming', function (accept) {
+      if (contact.get('waiting')) {
+        // While we receive this offer, we have actually sent an offer before
+        // We should reset our own offer, and just answer this one
+        contact.get('peer').close();
+        contact.init();
+        accept();
+        return;
+      }
+
       var request = Ember.Object.create({ contact: contact, accept: accept });
       self.get('controllers.calls.content').pushObject(request);
       App.getAttention();

diff --git a/public/js/controllers/contacts_controller.js b/public/js/controllers/contacts_controller.js
@@ -10,6 +10,15 @@ var ContactsController = Ember.ArrayController.extend({
     contact.set('signalingChannel', this.get('controllers.application.connection'));
 
     contact.on('connection.incoming', function (accept) {
+      if (contact.get('waiting')) {
+        // While we receive this offer, we have actually sent an offer before
+        // We should reset our own offer, and just answer this one
+        contact.get('peer').close();
+        contact.init();
+        accept();
+        return;
+      }
+
       var request = Ember.Object.create({ contact: contact, accept: accept });
       self.get('controllers.calls.content').pushObject(request);
       App.getAttention();