Make it possible to access WSGI environ.

zeekay · zeekay · commit c4eb4c118f64 · 2014-02-13T13:45:47.000-08:00
Fixes zeekay#2.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 *.pyc
 *.pyo
 dist/
+build/
diff --git a/README.rst b/README.rst
@@ -142,3 +142,18 @@ WebSocket client abstraction with fully non-blocking methods.
 ``close()``
 
 ``connected``
+
+
+Advanced Usage
+--------------
+Normally websocket routes happen outside of the normal request context. You can
+get a request context in your websocket handler by using
+`app.request_context`::
+
+    app = Flask(__name__)
+    ws = GeventWebSocket(app)
+
+    @ws.route('/websocket')
+    def websocket(ws):
+        with app.request_context(ws.environ):
+            print request.args
diff --git a/flask_uwsgi_websocket/_gevent.py b/flask_uwsgi_websocket/_gevent.py
@@ -10,15 +10,17 @@
 
 
 class GeventWebSocketClient(object):
-    def __init__(self, fd, send_event, send_queue, recv_event, recv_queue, timeout=60):
-        self.id = str(uuid.uuid1())
-        self.fd = fd
+    def __init__(self, environ, fd, send_event, send_queue, recv_event, recv_queue, timeout=60):
+        self.environ    = environ
+        self.fd         = fd
         self.send_event = send_event
         self.send_queue = send_queue
         self.recv_event = recv_event
         self.recv_queue = recv_queue
-        self.timeout = timeout
-        self.connected = True
+        self.timeout    = timeout
+
+        self.id         = str(uuid.uuid1())
+        self.connected  = True
 
     def send(self, message):
         self.send_queue.put(message)
@@ -51,7 +53,7 @@ def __call__(self, environ, start_response):
         recv_queue = Queue(maxsize=1)
 
         # create websocket client
-        client = self.client(uwsgi.connection_fd(), send_event, send_queue, recv_event, recv_queue)
+        client = self.client(environ, uwsgi.connection_fd(), send_event, send_queue, recv_event, recv_queue)
 
         # spawn handler
         handler = spawn(handler, client)
diff --git a/flask_uwsgi_websocket/websocket.py b/flask_uwsgi_websocket/websocket.py
@@ -9,10 +9,11 @@ class WebSocketClient(object):
     Default WebSocket client has a blocking recieve method, but still exports
     rest of uWSGI API.
     '''
-    def __init__(self, fd, timeout=60):
-        self.fd = fd
+    def __init__(self, environ, fd, timeout=60):
+        self.environ = environ
+        self.fd      = fd
         self.timeout = timeout
-        self.id = str(uuid.uuid1())
+        self.id      = str(uuid.uuid1())
 
     def receive(self):
         return uwsgi.websocket_recv()
@@ -51,7 +52,7 @@ def __call__(self, environ, start_response):
 
         if handler:
             uwsgi.websocket_handshake(environ['HTTP_SEC_WEBSOCKET_KEY'], environ.get('HTTP_ORIGIN', ''))
-            handler(self.client(uwsgi.connection_fd(), self.websocket.timeout))
+            handler(self.client(environ, uwsgi.connection_fd(), self.websocket.timeout))
         else:
             return self.wsgi_app(environ, start_response)
 

-Original file line number
+Diff line change
 *.pyc
 *.pyo
 dist/
 +build/