X-Git-Url: https://jfr.im/git/z_archive/twitter.git/blobdiff_plain/14b7a6ee17681e68dc7903720d715588cfad5e3f..e28a1da9ea6df9761811e101e9e475268a87ac76:/twitter/stream.py?ds=sidebyside

diff --git a/twitter/stream.py b/twitter/stream.py
index 2f1e4f5..fa332cf 100644
--- a/twitter/stream.py
+++ b/twitter/stream.py
@@ -8,49 +8,94 @@ except ImportError:
 import json
 from ssl import SSLError
 import socket
+import sys, select, time
+
+from .api import TwitterCall, wrap_response, TwitterHTTPError
+
+def recv_chunk(sock):
+    buf = sock.recv(10)  # Scan for an up to a 4GiB chunk size (0xffffffff).
+    if buf:
+        crlf = buf.find(b'\r\n')  # Find the HTTP chunk size.
+        if crlf > 0:
+            remaining = int(buf[:crlf], 16)  # Decode the chunk size.
+            chunk = bytearray(remaining)  # Create the chunk buffer.
+
+            start = crlf + 2  # Add in the length of the header's CRLF pair.
+            end = len(buf) - start
+
+            chunk[:end] = buf[start:]
+            chunk[end:] = sock.recv(remaining - end)
+
+            sock.recv(2)  # Read the trailing CRLF pair. Throw it away.
+
+            return chunk
+    return b''
+
+##  recv_chunk()
 
-from .api import TwitterCall, wrap_response
 
 class TwitterJSONIter(object):
 
-    def __init__(self, handle, uri, arg_data, block=True):
+    def __init__(self, handle, uri, arg_data, block=True, timeout=None):
         self.decoder = json.JSONDecoder()
         self.handle = handle
-        self.buf = b""
+        self.uri = uri
+        self.arg_data = arg_data
         self.block = block
+        self.timeout = timeout
+
 
     def __iter__(self):
-        sock = self.handle.fp._sock.fp._sock
+        if sys.version_info >= (3, 0):
+            sock = self.handle.fp.raw._sock
+        else:
+            sock = self.handle.fp._sock.fp._sock
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
-        if not self.block:
+        if not self.block or self.timeout:
             sock.setblocking(False)
+        buf = b''
+        timer = time.time()
         while True:
             try:
-                utf8_buf = self.buf.decode('utf8').lstrip()
+                utf8_buf = buf.decode('utf-8').lstrip()
                 res, ptr = self.decoder.raw_decode(utf8_buf)
-                self.buf = utf8_buf[ptr:].encode('utf8')
+                buf = utf8_buf[ptr:].encode('utf-8')
                 yield wrap_response(res, self.handle.headers)
+                timer = time.time()
                 continue
             except ValueError as e:
                 if self.block:
                     pass
                 else:
                     yield None
-            except urllib_error.HTTPError as e:
-                raise TwitterHTTPError(e, uri, self.format, arg_data)
             # this is a non-blocking read (ie, it will return if any data is available)
             try:
-                self.buf += sock.recv(1024)
+                if self.timeout:
+                    ready_to_read = select.select([sock], [], [], self.timeout)
+                    if ready_to_read[0]:
+                        buf += recv_chunk(sock)
+                        if time.time() - timer > self.timeout:
+                            yield {"timeout":True}
+                    else:
+                        yield {"timeout":True}
+                else:
+                    buf += recv_chunk(sock)
             except SSLError as e:
-                if (not self.block) and (e.errno == 2):
+                if (not self.block or self.timeout) and (e.errno == 2):
                     # Apparently this means there was nothing in the socket buf
                     pass
                 else:
                     raise
+            except urllib_error.HTTPError as e:
+                raise TwitterHTTPError(e, self.uri, 'json', self.arg_data)
 
-def handle_stream_response(req, uri, arg_data, block):
+def handle_stream_response(req, uri, arg_data, block, timeout=None):
     handle = urllib_request.urlopen(req,)
-    return iter(TwitterJSONIter(handle, uri, arg_data, block))
+    return iter(TwitterJSONIter(handle, uri, arg_data, block, timeout=timeout))
+
+class TwitterStreamCallWithTimeout(TwitterCall):
+    def _handle_response(self, req, uri, arg_data, _timeout=None):
+        return handle_stream_response(req, uri, arg_data, block=True, timeout=self.timeout)
 
 class TwitterStreamCall(TwitterCall):
     def _handle_response(self, req, uri, arg_data, _timeout=None):
@@ -83,16 +128,19 @@ class TwitterStream(TwitterStreamCall):
     """
     def __init__(
         self, domain="stream.twitter.com", secure=True, auth=None,
-        api_version='1.1', block=True):
+        api_version='1.1', block=True, timeout=None):
         uriparts = ()
         uriparts += (str(api_version),)
 
         if block:
-            call_cls = TwitterStreamCall
+            if timeout:
+                call_cls = TwitterStreamCallWithTimeout
+            else:
+                call_cls = TwitterStreamCall
         else:
             call_cls = TwitterStreamCallNonBlocking
 
         TwitterStreamCall.__init__(
             self, auth=auth, format="json", domain=domain,
             callable_cls=call_cls,
-            secure=secure, uriparts=uriparts)
+            secure=secure, uriparts=uriparts, timeout=timeout, gzip=False)