Chatty chat example.

zeekay · zeekay · commit a7cd95932951 · 2014-01-22T02:04:33.000-08:00
diff --git a/examples/chatty-gevent/chatty.py b/examples/chatty-gevent/chatty.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+from flask import Flask, render_template
+from flask.ext.uwsgi_websocket import GeventWebSocket
+from gevent import sleep
+
+app = Flask(__name__)
+ws = GeventWebSocket(app)
+
+@app.route('/')
+def index():
+    return render_template('index.html')
+
+users = {}
+
+@ws.route('/websocket')
+def sender(ws):
+    users[ws.id] = ws
+
+    while True:
+        for id in users:
+            if id != ws.id:
+                users[id].send('hi from ' + ws.id)
+        sleep(3)
+
+if __name__ == '__main__':
+    app.run(debug=True, gevent=100)
diff --git a/examples/chatty-gevent/templates/index.html b/examples/chatty-gevent/templates/index.html
@@ -0,0 +1,44 @@
+<!doctype html>
+<head>
+    <meta charset="utf-8" />
+    <title>WebSocket Chat</title>
+
+    <style>
+        li { list-style: none; }
+    </style>
+
+    <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;
+            });
+        });
+    </script>
+</head>
+<body>
+    <h2>WebSocket Chat Example</h2>
+    <form id="send-message">
+        <input id="name" type="text" value="name">
+        <input id="message" type="text" value="message" />
+        <input type="submit" value="Send" />
+    </form>
+    <div id="messages"></div>
+</body>
+</html>
diff --git a/flask_uwsgi_websocket/_gevent.py b/flask_uwsgi_websocket/_gevent.py
@@ -1,20 +1,58 @@
+from gevent import sleep, spawn
+from gevent.select import select
+from gevent.queue import Queue
+import uuid
+
 from . import WebSocket, WebSocketClient, WebSocketMiddleware
 from ._uwsgi import uwsgi
-import gevent.select
 
 
-class GeventWebSocketClient(WebSocketClient):
+class GeventWebSocketClient(object):
+    def __init__(self, queue):
+        self.id = str(uuid.uuid1())
+        self.queue = queue
+
+    def send(self, message):
+        self.queue.put(message)
+
     def receive(self):
-        ready = gevent.select.select([self.fd], [], [], self.timeout)
-        try:
-            return uwsgi.websocket_recv_nb()
-        except IOError:  # client disconnected
-            pass
+        pass
 
 
 class GeventWebSocketMiddleware(WebSocketMiddleware):
     client = GeventWebSocketClient
 
+    def __call__(self, environ, start_response):
+        handler = self.websocket.routes.get(environ['PATH_INFO'])
+
+        if not handler:
+            return self.wsgi_app(environ, start_response)
+
+        # do handshake
+        uwsgi.websocket_handshake(environ['HTTP_SEC_WEBSOCKET_KEY'], environ.get('HTTP_ORIGIN', ''))
+
+
+        queue = Queue()
+
+        # spawn greenlet for handler
+        spawn(handler, self.client(queue))
+
+        # loop waiting for messages to send
+        while True:
+            message = queue.get()
+            if message:
+                uwsgi.websocket_send(message)
+            sleep(0)
+
+        # loop here and handle send/recieves to client in other greenlet?
+        # fd = uwsgi.connection_fd()
+        # while True:
+        #     ready = gevent.select.select([fd], [], [], self.websocket.timeout)
+        #     try:
+        #         return uwsgi.websocket_recv_nb()
+        #     except IOError:  # client disconnected
+        #         pass
+
 
 class GeventWebSocket(WebSocket):
     middleware = GeventWebSocketMiddleware
