More elaborate chat example with backlog.

zeekay · zeekay · commit 25d4aa5fb740 · 2014-01-22T12:28:54.000-08:00
diff --git a/examples/chat-gevent/chat.py b/examples/chat-gevent/chat.py
@@ -1,11 +1,13 @@
 #!/usr/bin/env python
+from collections import deque
 from flask import Flask, render_template
 from flask.ext.uwsgi_websocket import GeventWebSocket
 
 app = Flask(__name__)
 ws = GeventWebSocket(app)
 
 users = {}
+backlog = deque(maxlen=10)
 
 @app.route('/')
 def index():
@@ -15,9 +17,13 @@ def index():
 def chat(ws):
     users[ws.id] = ws
 
+    for msg in backlog:
+        ws.send(msg)
+
     while True:
         msg = ws.receive()
         if msg is not None:
+            backlog.append(msg)
             for id in users:
                 if id != ws.id:
                     users[id].send(msg)
diff --git a/examples/chat-gevent/templates/index.html b/examples/chat-gevent/templates/index.html
@@ -10,25 +10,34 @@
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script>
     <script>
         $(document).ready(function() {
-            if (!window.WebSocket) {
-                if (window.MozWebSocket) {
-                    window.WebSocket = window.MozWebSocket;
-                } else {
-                    $('#messages').append("<li>Your browser doesn't support WebSockets.</li>");
-                }
-            }
-            ws = new WebSocket('ws://127.0.0.1:5000/websocket');
-            ws.onopen = function(evt) {
-                $('#messages').append('<li>Connected to chat.</li>');
-            }
-            ws.onmessage = function(evt) {
-                $('#messages').append('<li>' + evt.data + '</li>');
-            }
-            $('#send-message').submit(function() {
-                ws.send($('#name').val() + ": " + $('#message').val());
-                $('#message').val('').focus();
-                return false;
-            });
+          function showMessage(message) {
+            $('#messages').append('<li>' + message)
+          }
+
+          if (!window.WebSocket) {
+              if (window.MozWebSocket) {
+                  window.WebSocket = window.MozWebSocket;
+              } else {
+                showMessage("Your browser doesn't support WebSockets")
+              }
+          }
+
+          var ws = new WebSocket('ws://127.0.0.1:5000/websocket');
+          ws.onopen = function(evt) {
+            showMessage('Connected to chat.')
+          }
+
+          ws.onmessage = function(evt) {
+            showMessage(evt.data)
+          }
+
+          $('#send-message').submit(function() {
+            var message = $('#name').val() + ": " + $('#message').val();
+            showMessage(message)
+            ws.send(message);
+            // $('#message').val('').focus();
+            return false;
+          });
         });
     </script>
 </head>
diff --git a/flask_uwsgi_websocket/_gevent.py b/flask_uwsgi_websocket/_gevent.py
@@ -45,10 +45,10 @@ def __call__(self, environ, start_response):
 
         # setup events
         send_event = Event()
-        send_queue = Queue()
+        send_queue = Queue(maxsize=1)
 
         recv_event = Event()
-        recv_queue = Queue()
+        recv_queue = Queue(maxsize=1)
 
         # create websocket client
         client = self.client(uwsgi.connection_fd(), send_event, send_queue, recv_event, recv_queue)
@@ -74,9 +74,9 @@ def listener(client):
 
             # handle send events
             if send_event.is_set():
-                send_event.clear()
                 try:
                     uwsgi.websocket_send(send_queue.get())
+                    send_event.clear()
                 except IOError:
                     client.connected = False
 
