wwwstream: eliminate ::response, use html_oneshot

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

diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index 8623440b8a767697218b32c611e6ba301ef96699..7d257a191b0dda96558f969cc1b45d693f726942 100644 (file)
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -8,18 +8,13 @@
 # more common "push" model)
 package PublicInbox::WwwStream;
 use strict;
-use warnings;
-use base qw(Exporter);
+use parent qw(Exporter PublicInbox::GzipFilter);
 our @EXPORT_OK = qw(html_oneshot);
 use bytes (); # length
 use PublicInbox::Hval qw(ascii_html prurl);
-use PublicInbox::GzipFilter qw(gzf_maybe);
 our $TOR_URL = 'https://www.torproject.org/';
 our $CODE_URL = 'https://public-inbox.org/public-inbox.git';
 
-# noop for HTTP.pm (and any other PSGI servers)
-sub close {}
-
 sub base_url ($) {
        my $ctx = shift;
        my $base_url = $ctx->{-inbox}->base_url($ctx->{env});
@@ -27,28 +22,20 @@ sub base_url ($) {
        $base_url;
 }
 
-sub new {
-       my ($class, $ctx, $cb) = @_;
-
-       bless {
-               nr => 0,
-               cb => $cb,
-               ctx => $ctx,
-               base_url => base_url($ctx),
-       }, $class;
+sub init {
+       my ($ctx, $cb) = @_;
+       $ctx->{cb} = $cb;
+       $ctx->{base_url} = base_url($ctx);
+       bless $ctx, __PACKAGE__;
 }
 
-sub response {
-       my ($class, $ctx, $code, $cb) = @_;
-       my $h = [ 'Content-Type', 'text/html; charset=UTF-8' ];
-       my $self = $class->new($ctx, $cb);
-       $self->{gzf} = gzf_maybe($h, $ctx->{env});
-       [ $code, $h, $self ]
+sub async_eml { # ->{async_eml} for async_blob_cb
+       my ($ctx, $eml) = @_;
+       $ctx->{http_out}->write($ctx->translate($ctx->{cb}->($ctx, $eml)));
 }
 
-sub _html_top ($) {
-       my ($self) = @_;
-       my $ctx = $self->{ctx};
+sub html_top ($) {
+       my ($ctx) = @_;
        my $ibx = $ctx->{-inbox};
        my $desc = ascii_html($ibx->description);
        my $title = delete($ctx->{-title_html}) // $desc;
@@ -89,14 +76,13 @@ sub code_footer ($) {
 }
 
 sub _html_end {
-       my ($self) = @_;
+       my ($ctx) = @_;
        my $urls = 'Archives are clonable:';
-       my $ctx = $self->{ctx};
        my $ibx = $ctx->{-inbox};
        my $desc = ascii_html($ibx->description);
 
        my @urls;
-       my $http = $self->{base_url};
+       my $http = $ctx->{base_url};
        my $max = $ibx->max_git_epoch;
        my $dir = (split(m!/!, $http))[-1];
        my %seen = ($http => 1);
@@ -163,44 +149,57 @@ EOF
 
 # callback for HTTP.pm (and any other PSGI servers)
 sub getline {
-       my ($self) = @_;
-       my $nr = $self->{nr}++;
-
-       my $buf = do {
-               if ($nr == 0) {
-                       _html_top($self);
-               } elsif (my $middle = $self->{cb}) {
-                       $middle->($nr, $self->{ctx});
+       my ($ctx) = @_;
+       my $cb = $ctx->{cb} or return;
+       while (defined(my $x = $cb->($ctx))) { # x = smsg or scalar non-ref
+               if (ref($x)) { # smsg
+                       my $eml = $ctx->{-inbox}->smsg_eml($x) or next;
+                       $ctx->{smsg} = $x;
+                       return $ctx->translate($cb->($ctx, $eml));
+               } else { # scalar
+                       return $ctx->translate($x);
                }
-       } // (delete($self->{cb}) ? _html_end($self) : undef);
-
-       # gzf may be GzipFilter, `undef' or `0'
-       my $gzf = $self->{gzf} or return $buf;
-
-       return $gzf->translate($buf) if defined $buf;
-       $self->{gzf} = 0; # next call to ->getline returns $buf (== undef)
-       $gzf->translate(undef);
+       }
+       delete $ctx->{cb};
+       $ctx->zflush(_html_end($ctx));
 }
 
 sub html_oneshot ($$;$) {
        my ($ctx, $code, $sref) = @_;
-       my $self = bless {
-               ctx => $ctx,
-               base_url => base_url($ctx),
-       }, __PACKAGE__;
-       my @x;
-       my $h = [ 'Content-Type' => 'text/html; charset=UTF-8',
+       my $res_hdr = [ 'Content-Type' => 'text/html; charset=UTF-8',
                'Content-Length' => undef ];
-       if (my $gzf = gzf_maybe($h, $ctx->{env})) {
-               $gzf->zmore(_html_top($self));
-               $gzf->zmore($$sref) if $sref;
-               $x[0] = $gzf->zflush(_html_end($self));
-               $h->[3] = length($x[0]);
-       } else {
-               @x = (_html_top($self), $sref ? $$sref : (), _html_end($self));
-               $h->[3] += bytes::length($_) for @x;
-       }
-       [ $code, $h, \@x ]
+       bless $ctx, __PACKAGE__;
+       $ctx->{gz} = PublicInbox::GzipFilter::gz_or_noop($res_hdr, $ctx->{env});
+       $ctx->{base_url} //= do {
+               $ctx->zmore(html_top($ctx));
+               base_url($ctx);
+       };
+       $ctx->zmore($$sref) if $sref;
+       my $bdy = $ctx->zflush(_html_end($ctx));
+       $res_hdr->[3] = bytes::length($bdy);
+       [ $code, $res_hdr, [ $bdy ] ]
+}
+
+sub async_next ($) {
+       my ($http) = @_; # PublicInbox::HTTP
+       my $ctx = $http->{forward} or return;
+       eval {
+               if (my $smsg = $ctx->{smsg} = $ctx->{cb}->($ctx)) {
+                       $ctx->smsg_blob($smsg);
+               } else {
+                       $ctx->{http_out}->write(
+                                       $ctx->translate(_html_end($ctx)));
+                       $ctx->close; # GzipFilter->close
+               }
+       };
+       warn "E: $@" if $@;
+}
+
+sub aresponse {
+       my ($ctx, $code, $cb) = @_;
+       my $res_hdr = [ 'Content-Type' => 'text/html; charset=UTF-8' ];
+       init($ctx, $cb);
+       $ctx->psgi_response($code, $res_hdr, \&async_next, \&async_eml);
 }
 
 1;