Fix messages are one-behind when using secure sockets (wss)

This fix tries to query the sockets directly for pending data if poller.poll() returns no file descriptors.

In case of pending data, a special flag is set on the websocket, to ensure the whole buffer is processed in one go.

Author: Michael Faust

ws4py/manager.py

@@ -284,6 +284,22 @@ def stop(self):
             self.websockets.clear()
             self.poller.release()
 
+    def get_fds_with_pending_data( self ):
+        """
+        Returns a list of file descriptors that have pending data.
+
+        This is a workaround for a bug where polling returns no file descriptor,
+        even though we have sockets with pending data.
+        """
+        fds = []
+        with self.lock:
+            for ws in ( ws for ws in self.websockets.values() if ws._is_secure ):
+                if hasattr( ws.sock, 'pending' ) and ws.sock.pending():
+                    fds.append( ws.sock.fileno() )
+                    # set special handling flag
+                    ws._force_process_buffer = True
+        return fds
+
     def run(self):
         """
         Manager's mainloop executed from within a thread.
@@ -309,6 +325,10 @@ def run(self):
             if not self.running:
                 break
 
+            if not polled:
+                # workaround WSS bug
+                polled.extend( self.get_fds_with_pending_data() )
+
             for fd in polled:
                 if not self.running:
                     break

ws4py/websocket.py

@@ -113,6 +113,11 @@ def __init__(self, sock, protocols=None, extensions=None, environ=None, heartbea
         Tell us if the socket is secure or not.
         """
 
+        self._force_process_buffer = False
+        """
+        Indicates special handling of the buffer, only relevant for secure sockets.
+        """
+
         self.client_terminated = False
         """
         Indicates if the client has been marked as terminated.
@@ -241,7 +246,7 @@ def close_connection(self):
             except:
                 pass
             self.sock = None
-            
+
 
     def ping(self, message):
         """
@@ -424,6 +429,15 @@ def once(self):
             if not self.process(self.buf[:requested]):
                 return False
             self.buf = self.buf[requested:]
+            if self.buf and self._force_process_buffer:
+                self._force_process_buffer = False
+                # if we are in special handling mode, we need to process
+                # the buffer until it is empty
+                while self.buf:
+                    requested = self.reading_buffer_size
+                    if not self.process(self.buf[:requested]):
+                        return False
+                    self.buf = self.buf[requested:]
 
         return True