gzipfilter: replace Compress::Raw::Deflate usages

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

diff --git a/lib/PublicInbox/GzipFilter.pm b/lib/PublicInbox/GzipFilter.pm
index 95fced053579cebfc34359138d3077a2afa19847..d2eb4e6643e500f7a77cdf27aecb75380be8377c 100644 (file)
--- a/lib/PublicInbox/GzipFilter.pm
+++ b/lib/PublicInbox/GzipFilter.pm
@@ -6,7 +6,7 @@ package PublicInbox::GzipFilter;
 use strict;
 use parent qw(Exporter);
 use Compress::Raw::Zlib qw(Z_FINISH Z_OK);
-our @EXPORT_OK = qw(gzip_maybe gzf_maybe);
+our @EXPORT_OK = qw(gzf_maybe);
 my %OPT = (-WindowBits => 15 + 16, -AppendOutput => 1);
 my @GZIP_HDRS = qw(Vary Accept-Encoding Content-Encoding gzip);
 
@@ -19,39 +19,34 @@ sub attach {
        $self
 }
 
-sub gzip_maybe ($$) {
+# returns `0' and not `undef' on failure (see Www*Stream)
+sub gzf_maybe ($$) {
        my ($res_hdr, $env) = @_;
-       return if (($env->{HTTP_ACCEPT_ENCODING}) // '') !~ /\bgzip\b/;
-
+       return 0 if (($env->{HTTP_ACCEPT_ENCODING}) // '') !~ /\bgzip\b/;
        my ($gz, $err) = Compress::Raw::Zlib::Deflate->new(%OPT);
-       return if $err != Z_OK;
+       return 0 if $err != Z_OK;
 
        # in case Plack::Middleware::Deflater is loaded:
        $env->{'plack.skip-deflater'} = 1;
-
        push @$res_hdr, @GZIP_HDRS;
-       $gz;
+       bless { gz => $gz }, __PACKAGE__;
 }
 
-sub gzf_maybe ($$) {
-       my ($res_hdr, $env) = @_;
-       my $gz = gzip_maybe($res_hdr, $env) or return 0;
-       bless { gz => $gz }, __PACKAGE__;
+sub gzip_or_die () {
+       my ($gz, $err) = Compress::Raw::Zlib::Deflate->new(%OPT);
+       $err == Z_OK or die "Deflate->new failed: $err";
+       $gz;
 }
 
 # for GetlineBody (via Qspawn) when NOT using $env->{'pi-httpd.async'}
 # Also used for ->getline callbacks
 sub translate ($$) {
-       my $self = $_[0];
+       my $self = $_[0]; # $_[1] => input
 
        # allocate the zlib context lazily here, instead of in ->new.
        # Deflate contexts are memory-intensive and this object may
        # be sitting in the Qspawn limiter queue for a while.
-       my $gz = $self->{gz} //= do {
-               my ($g, $err) = Compress::Raw::Zlib::Deflate->new(%OPT);
-               $err == Z_OK or die "Deflate->new failed: $err";
-               $g;
-       };
+       my $gz = $self->{gz} //= gzip_or_die();
        my $zbuf = delete($self->{zbuf});
        if (defined $_[1]) { # my $buf = $_[1];
                my $err = $gz->deflate($_[1], $zbuf);
@@ -72,10 +67,34 @@ sub write {
        $_[0]->{fh}->write(translate($_[0], $_[1]));
 }
 
+# similar to ->translate; use this when we're sure we know we have
+# more data to buffer after this
+sub zmore {
+       my $self = $_[0]; # $_[1] => input
+       my $err = $self->{gz}->deflate($_[1], $self->{zbuf});
+       die "gzip->deflate: $err" if $err != Z_OK;
+       '';
+}
+
+# flushes and returns the final bit of gzipped data
+sub zflush ($;$) {
+       my $self = $_[0]; # $_[1] => final input (optional)
+       my $zbuf = delete $self->{zbuf};
+       my $gz = delete $self->{gz};
+       my $err;
+       if (defined $_[1]) {
+               $err = $gz->deflate($_[1], $zbuf);
+               die "gzip->deflate: $err" if $err != Z_OK;
+       }
+       $err = $gz->flush($zbuf, Z_FINISH);
+       die "gzip->flush: $err" if $err != Z_OK;
+       $zbuf;
+}
+
 sub close {
        my ($self) = @_;
        my $fh = delete $self->{fh};
-       $fh->write(translate($self, undef));
+       $fh->write(zflush($self));
        $fh->close;
 }