Fix ringingTimeout.

mozilla-services · Aug 21, 2014 · 7d8269f · almet · Aug 21, 2014 · 7d8269f
1 parent d2cb744
commit 7d8269f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/loop/websockets.js b/loop/websockets.js
@@ -173,20 +173,20 @@ MessageHandler.prototype = {
 
           // After the hello phase and as soon the callee is connected,
           // the call changes to the "alerting" state.
-          if (currentState === "init") {
+          if (currentState === "init" || currentState === "half-initiated") {
             self.broadcastState(session.callId, "init." + session.type,
               timeoutTTL);
-          } else if (currentState === "half-initiated") {
-            self.broadcastState(session.callId, "init." + session.type);
-            // We are now in "alerting" mode.
-            setTimeout(function() {
-              self.storage.getCallState(session.callId, function(err, state) {
-                if (serverError(err, callback)) return;
-                if (state === "alerting" || state === "terminated") {
-                  self.broadcastState(session.callId, "terminated:timeout");
-                }
-              });
-            }, self.conf.ringingDuration * 1000);
+            if (session.type === "callee") {
+              // We are now in "alerting" mode.
+              setTimeout(function() {
+                self.storage.getCallState(session.callId, function(err, state) {
+                  if (serverError(err, callback)) return;
+                  if (state === "alerting" || state === "terminated") {
+                    self.broadcastState(session.callId, "terminated:timeout");
+                  }
+                });
+              }, self.conf.ringingDuration * 1000);
+            }
           }
         });
       });
@@ -322,7 +322,6 @@ MessageHandler.prototype = {
     var self = this;
     var parts = stateData.split(":");
     var state = parts[0];
-
     self.storage.setCallState(callId, state, ttl, function(err) {
       if (serverError(err)) return;
 

diff --git a/test/websockets_test.js b/test/websockets_test.js
@@ -706,6 +706,7 @@ describe('websockets', function() {
 
         caller.on('message', function(data) {
           var message = JSON.parse(data);
+          console.log(message);
           if (callerMsgCount === 0) {
             expect(message.messageType).eql("hello");
             expect(message.state).eql("init");