Threaded Version

amitu/socketio_client.py

@@ -128,7 +128,6 @@ def __init__(self, server, port, protocol="ws", *args, **kw):
         self.protocol = protocol
         self.handlers = {}
 
-    def run(self):
         conn  = httplib.HTTPConnection(self.server + ":" + str(self.port))
         conn.request('POST','/socket.io/1/')
         hskey  = conn.getresponse().read().split(":")[0]
@@ -138,8 +137,9 @@ def run(self):
                 self.protocol, self.server, self.port, hskey
             ), *self.args, **self.kw
         )
-        while True:
-            super(SocketIOClient, self).run()
+
+    def run(self):
+        super(SocketIOClient, self).run()
 
     def on(self, name, callback):
         self.handlers.setdefault(name, []).append(callback)

amitu/websocket_client.py

@@ -1,6 +1,7 @@
 import ssl, socket, urlparse
 from mimetools import Message
 from StringIO import StringIO
+from threading import Thread
 
 FRAME_START = "\x00"
 FRAME_END = "\xff"
@@ -12,11 +13,13 @@ def __init__(self, value):
     def __str__(self): return str(self.value)
 
 
-class WebSocket(object):
+class WebSocket(Thread):
     def __init__(
         self, url, ca_certs=None, cert_reqs=ssl.CERT_NONE, headers=None,
         protocol=None, timeout=None
     ):
+        Thread.__init__(self)
+        self.is_ready = False
         self.url = url
         self.ca_certs = ca_certs
         self.cert_reqs = cert_reqs
@@ -97,12 +100,16 @@ def _consume_frames(self, buf):
         return buf
 
     def run(self):
+        self.is_stopped = False
         self._connect_and_send_handshake()
         buf = self._receive_handshake()
 
         self.onopen()
 
+        self.is_ready = True
         while True:
+            if self.stopped():
+                return
             buf = self._consume_frames(buf)
 
             try:
@@ -116,6 +123,14 @@ def run(self):
     def send(self, data):
         self.sock.send('\x00' + unicode(data).encode("utf-8") + '\xff')
 
+    def ready(self):
+        return self.is_ready
+    def stop(self):
+        self.is_stopped = True
+
+    def stopped(self):
+        return self.is_stopped
+
     def onopen(self): pass
     def onmessage(self, message): pass
     def onclose(self): pass