send ping message on hearbeat for raw websockets

igm · Aug 22, 2017 · a971f54 · a971f54
1 parent 99cddf1
commit a971f54
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/sockjs/rawwebsocket.go b/sockjs/rawwebsocket.go
@@ -73,7 +73,13 @@ func (w *rawWsReceiver) sendBulk(messages ...string) {
 }
 
 func (w *rawWsReceiver) sendFrame(frame string) {
-	if err := w.conn.WriteMessage(websocket.TextMessage, []byte(frame)); err != nil {
+	var err error
+	if frame == "h" {
+		err = w.conn.WriteMessage(websocket.PingMessage, []byte{})
+	} else {
+		err = w.conn.WriteMessage(websocket.TextMessage, []byte(frame))
+	}
+	if err != nil {
 		w.close()
 	}
 }

diff --git a/sockjs/session.go b/sockjs/session.go
@@ -158,9 +158,7 @@ func (s *session) heartbeat() {
 	s.Lock()
 	defer s.Unlock()
 	if s.recv != nil { // timer could have fired between Lock and timer.Stop in detachReceiver
-		if !s.raw {
-			s.recv.sendFrame("h")
-		}
+		s.recv.sendFrame("h")
 		s.timer = time.AfterFunc(s.heartbeatInterval, s.heartbeat)
 	}
 }