Explorar el Código

Add ping/pong to keep connection alive

Thomas Dy hace 11 años
padre
commit
b312cd666b
Se han modificado 2 ficheros con 15 adiciones y 2 borrados
  1. 6 0
      app/models/ChatRoom.scala
  2. 9 2
      public/javascripts/chatServices.js

+ 6 - 0
app/models/ChatRoom.scala

@@ -74,6 +74,12 @@ class ChatRoom extends Actor {
       }
     }
 
+    case Talk(username, "/ping") => {
+      self ! Tell(username, Json.obj(
+        "kind" -> "pong"
+      ))
+    }
+
     case Talk(username, text) => {
       if(!text.startsWith("/")) {
         self ! Announce(Json.obj(

+ 9 - 2
public/javascripts/chatServices.js

@@ -1,7 +1,8 @@
 angular.module('chatServices', [])
-.factory('Connection', function($rootScope, $timeout) {
+.factory('Connection', function($rootScope, $timeout, $interval) {
   var WS = window['MozWebSocket'] ? MozWebSocket : WebSocket;
   var chatSocket = null;
+  var ping = null;
 
   var service = {
     username: '',
@@ -28,15 +29,21 @@ angular.module('chatServices', [])
     chatSocket = new WS(jsRoutes.controllers.Application.chat(username).webSocketURL());
     chatSocket.onmessage = wrap(function(event) {
       var message = JSON.parse(event.data);
-      $rootScope.$broadcast('ws:message', message);
+      if(message.kind != "pong") {
+        $rootScope.$broadcast('ws:message', message);
+      }
     });
     chatSocket.onopen = wrap(function() {
       $rootScope.$broadcast('ws:connected', username);
       service.username = username;
+      ping = $interval(function() {
+        service.send('/ping');
+      }, 60000, 0, false);
     });
     chatSocket.onclose = wrap(function() {
       $rootScope.$broadcast('ws:disconnected');
       service.username = '';
+      $interval.cancel(ping);
     });
   }