websocket keep-alive for draft 17

README.rst

@@ -468,3 +468,7 @@ Thanks to (in no particular order):
 - `Twitter Bootstrap <https://github.com/twitter/bootstrap>`_
 
   - For making our demo applications look good
+
+- `Dan Griffin <https://github.com/dgriff1>`_
+
+  - WebSocket Keep-Alive for OpDemand

cyclone/websocket.py

@@ -58,7 +58,7 @@ def _rawDataReceived(self, data):
     def _execute(self, transforms, *args, **kwargs):
         try:
             assert self.request.headers["Upgrade"].lower() == "websocket"
-            assert self.request.headers["Connection"].lower() == "upgrade"
+            #assert self.request.headers["Connection"].lower() == "upgrade"
         except:
             return self.forbidConnection("Expected WebSocket Headers")
 
@@ -162,7 +162,10 @@ def rawDataReceived(self, data):
 
         self._message_buffer += self._extractMessageFromFrame(data)
         if self._frame_fin:
-            self.handler.messageReceived(self._message_buffer)
+            if self._frame_ops == 9:
+                self.sendMessage(self._message_buffer, code=0x8A) 
+            else:
+                self.handler.messageReceived(self._message_buffer)
             self._message_buffer = ""
 
         # if there is still data after this frame, process again
@@ -222,11 +225,11 @@ def _extractMessageFromFrame(self, data):
 
             return str(payload)
 
-    def sendMessage(self, message):
+    def sendMessage(self, message, code=0x81):
         message = unicode(message, "utf-8")
         length = len(message)
         newFrame = []
-        newFrame.append(0x81)
+        newFrame.append(code)
         newFrame = bytearray(newFrame)
         if length <= 125:
             newFrame.append(length)