www: rework async_* to use method table

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

diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index 42fb183f482152d211dd9fe32a038fc2740097c3..d79770ed1d82b8dbd484ca84dbf445962116bef8 100644 (file)
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -1,11 +1,10 @@
 # Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
-# HTML body stream for which yields getline+close methods
+# HTML body stream for which yields getline+close methods for
+# generic PSGI servers and callbacks for public-inbox-httpd.
 #
-# public-inbox-httpd favors "getline" response bodies to take a
-# "pull"-based approach to feeding slow clients (as opposed to a
-# more common "push" model)
+# See PublicInbox::GzipFilter parent class for more info.
 package PublicInbox::WwwStream;
 use strict;
 use parent qw(Exporter PublicInbox::GzipFilter);
@@ -15,9 +14,6 @@ use PublicInbox::Hval qw(ascii_html prurl);
 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});
@@ -32,12 +28,9 @@ sub init {
        bless $ctx, __PACKAGE__;
 }
 
-sub response {
-       my ($ctx, $code, $cb) = @_;
-       my $res_hdr = [ 'Content-Type' => 'text/html; charset=UTF-8' ];
-       init($ctx, $cb);
-       $ctx->{gz} = PublicInbox::GzipFilter::gz_or_noop($res_hdr, $ctx->{env});
-       [ $code, $res_hdr, $ctx ]
+sub async_eml { # for async_blob_cb
+       my ($ctx, $eml) = @_;
+       $ctx->{http_out}->write($ctx->translate($ctx->{cb}->($ctx, $eml)));
 }
 
 sub html_top ($) {
@@ -157,8 +150,14 @@ EOF
 sub getline {
        my ($ctx) = @_;
        my $cb = $ctx->{cb} or return;
-       if (defined(my $buf = $cb->($ctx))) {
-               return $ctx->translate($buf);
+       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 $ctx->{cb};
        $ctx->zflush(_html_end($ctx));
@@ -166,17 +165,40 @@ sub getline {
 
 sub html_oneshot ($$;$) {
        my ($ctx, $code, $sref) = @_;
-       $ctx->{base_url} = base_url($ctx);
-       bless $ctx, __PACKAGE__;
-       my @bdy;
        my $res_hdr = [ 'Content-Type' => 'text/html; charset=UTF-8',
                'Content-Length' => undef ];
+       bless $ctx, __PACKAGE__;
        $ctx->{gz} = PublicInbox::GzipFilter::gz_or_noop($res_hdr, $ctx->{env});
-       $ctx->zmore(html_top($ctx));
+       $ctx->{base_url} //= do {
+               $ctx->zmore(html_top($ctx));
+               base_url($ctx);
+       };
        $ctx->zmore($$sref) if $sref;
-       $bdy[0] = $ctx->zflush(_html_end($ctx));
-       $res_hdr->[3] = bytes::length($bdy[0]);
-       [ $code, $res_hdr, \@bdy ]
+       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);
 }
 
 1;