X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2FPublicInbox%2FWwwStream.pm;h=e06e3456ae19cbf163fcae457cce533f58bf33c0;hb=6c853f5256f3a324c018a37a9e8a6b9fc8fdc063;hp=2dd8b157ddc7334d49a95fdd97fc7ea47563f59c;hpb=433f6127f648e83b8f12d7b232ff726a34a85beb;p=public-inbox.git
diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index 2dd8b157..e06e3456 100644
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -1,21 +1,19 @@
# Copyright (C) 2016-2020 all contributors
# License: AGPL-3.0+
#
-# 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 warnings;
-use PublicInbox::Hval qw(ascii_html prurl);
+use parent qw(Exporter PublicInbox::GzipFilter);
+our @EXPORT_OK = qw(html_oneshot);
+use bytes (); # length
+use PublicInbox::Hval qw(ascii_html prurl ts2str);
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});
@@ -23,26 +21,20 @@ sub base_url ($) {
$base_url;
}
-sub new {
- my ($class, $ctx, $cb) = @_;
-
- bless {
- nr => 0,
- cb => $cb || \&close,
- 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) = @_;
- [ $code, [ 'Content-Type', 'text/html; charset=UTF-8' ],
- $class->new($ctx, $cb) ]
+sub 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;
@@ -51,6 +43,13 @@ sub _html_top ($) {
my $color = $upfx.'_/text/color';
my $atom = $ctx->{-atom} || $upfx.'new.atom';
my $top = "$desc";
+ if (my $t_max = $ctx->{-t_max}) {
+ $t_max = ts2str($t_max);
+ $top = qq($top);
+ # we had some kind of query, link to /$INBOX/?t=YYYYMMDDhhmmss
+ } elsif ($ctx->{qp}->{t}) {
+ $top = qq($top);
+ }
my $links = "help / ".
"color / ".
"Atom feed";
@@ -83,14 +82,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);
@@ -157,26 +155,57 @@ EOF
# callback for HTTP.pm (and any other PSGI servers)
sub getline {
- my ($self) = @_;
- my $nr = $self->{nr}++;
-
- return _html_top($self) if $nr == 0;
-
- if (my $middle = $self->{cb}) {
- $middle = $middle->($nr, $self->{ctx}) and return $middle;
+ 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 $ctx->{cb};
+ $ctx->zflush(_html_end($ctx));
+}
- delete $self->{cb} ? _html_end($self) : undef;
+sub html_oneshot ($$;$) {
+ my ($ctx, $code, $sref) = @_;
+ 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->{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 oneshot {
- my ($ctx, $code, $strref) = @_;
- 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) ] ]
+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;