get Compression working (again) in a fashion closer to the existing code

miyagawa · Nov 5, 2012 · b6d130c · b6d130c
1 parent 1ec7d64
commit b6d130c
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 8 deletions.
diff --git a/eg/track.pl b/eg/track.pl
@@ -17,6 +17,7 @@
     password => $password,
     method   => $method || "sample",
     %args,
+    use_compression => 1,
     on_tweet => sub {
         my $tweet = shift;
         print "$tweet->{user}{screen_name}: $tweet->{text}\n";

diff --git a/lib/AnyEvent/Twitter/Stream.pm b/lib/AnyEvent/Twitter/Stream.pm
@@ -11,6 +11,7 @@ use MIME::Base64;
 use URI;
 use URI::Escape;
 use Carp;
+use Compress::Raw::Zlib;
 
 our $STREAMING_SERVER  = 'stream.twitter.com';
 our $USERSTREAM_SERVER = 'userstream.twitter.com';
@@ -54,6 +55,16 @@ sub new {
         $decode_json = 1;
     }
 
+    my ($zlib, my $_zstatus);
+    if (delete $args{use_compression}){
+        ($zlib, $_zstatus)  = Compress::Raw::Zlib::Inflate->new(
+            -LimitOutput => 1,
+            -AppendOutput => 1,
+            -WindowBits => WANT_GZIP_OR_ZLIB,
+        );
+        die "Can't make inflator: $_zstatus" unless $zlib;
+    }
+
     unless ($methods{$method}) {
         $on_error->("Method $method not available.");
         return;
@@ -145,6 +156,7 @@ sub new {
         $self->{connection_guard} = http_request($request_method, $uri,
             headers => {
                 Accept => '*/*',
+                ( defined $zlib ? ('Accept-Encoding' => 'deflate') : ()),
                 Authorization => $auth,
                 ($request_method eq 'POST'
                     ? ('Content-Type' => 'application/x-www-form-urlencoded')
@@ -165,7 +177,7 @@ sub new {
                 my ($handle, $headers) = @_;
 
                 return unless $handle;
-
+                my $input;
                 my $chunk_reader = sub {
                     my ($handle, $line) = @_;
 
@@ -174,13 +186,22 @@ sub new {
 
                     $handle->push_read(chunk => $len, sub {
                         my ($handle, $chunk) = @_;
-
-                        $handle->push_read(line => sub {
-                            length $_[1] and die 'bad chunk (missing last empty line)';
-                        });
-
-                        $on_json_message->($chunk);
-                    });
+                        $handle->push_read(line => sub { length $_[1] and die 'bad chunk (missing last empty line)'; });
+
+                        unless ($headers->{'content-encoding'}) { 
+                                $on_json_message->($chunk); 
+                        } elsif ($headers->{'content-encoding'} eq 'deflate') { 
+                               $input .= $chunk;
+                               my ($message);
+                               do { 
+                                   $_zstatus = $zlib->inflate(\$input, \$message);
+                                   return unless $_zstatus == Z_OK || $_zstatus == Z_BUF_ERROR;
+                               } while ( $_zstatus == Z_OK && length $input );
+                               $on_json_message->($message);
+                        } else {
+                                die "Don't know how to decode $headers->{'content-encoding'}"
+                        }
+                     });
                 };
                 my $line_reader = sub {
                     my ($handle, $line) = @_;