wwwstream: oneshot: perform gzip without middleware

[public-inbox.git] / lib / PublicInbox / WwwStream.pm

diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index 2dd8b157ddc7334d49a95fdd97fc7ea47563f59c..79ed6871e6f3e9224dfc422b3896d3d718881b14 100644 (file)
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -9,7 +9,12 @@
 package PublicInbox::WwwStream;
 use strict;
 use warnings;
+use base qw(Exporter);
+our @EXPORT_OK = qw(html_oneshot);
+use bytes (); # length
 use PublicInbox::Hval qw(ascii_html prurl);
+use Compress::Raw::Zlib qw(Z_FINISH Z_OK);
+use PublicInbox::GzipFilter qw(gzip_maybe);
 our $TOR_URL = 'https://www.torproject.org/';
 our $CODE_URL = 'https://public-inbox.org/public-inbox.git';
 
@@ -28,7 +33,7 @@ sub new {
 
        bless {
                nr => 0,
-               cb => $cb || \&close,
+               cb => $cb,
                ctx => $ctx,
                base_url => base_url($ctx),
        }, $class;
@@ -169,14 +174,34 @@ sub getline {
        delete $self->{cb} ? _html_end($self) : undef;
 }
 
-sub oneshot {
-       my ($ctx, $code, $strref) = @_;
+sub html_oneshot ($$;$) {
+       my ($ctx, $code, $sref) = @_;
        my $self = bless {
                ctx => $ctx,
                base_url => base_url($ctx),
        }, __PACKAGE__;
-       [ $code, [ 'Content-Type', 'text/html; charset=UTF-8' ],
-               [ _html_top($self), $$strref, _html_end($self) ] ]
+       my @x;
+       my @h = ('Content-Type' => 'text/html; charset=UTF-8');
+       if (my $gz = gzip_maybe($ctx->{env})) {
+               my $err = $gz->deflate(_html_top($self), $x[0]);
+               die "gzip->deflate: $err" if $err != Z_OK;
+               if ($sref) {
+                       $err = $gz->deflate($sref, $x[0]);
+                       die "gzip->deflate: $err" if $err != Z_OK;
+               }
+               $err = $gz->deflate(_html_end($self), $x[0]);
+               die "gzip->deflate: $err" if $err != Z_OK;
+               $err = $gz->flush($x[0], Z_FINISH);
+               die "gzip->flush: $err" if $err != Z_OK;
+               push @h, qw(Vary Accept-Encoding Content-Encoding gzip);
+       } else {
+               @x = (_html_top($self), $sref ? $$sref : (), _html_end($self));
+       }
+
+       my $len = 0;
+       $len += bytes::length($_) for @x;
+       push @h, 'Content-Length', $len;
+       [ $code, \@h, \@x ]
 }
 
 1;