X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwAtomStream.pm;h=82895db6373e85da077048cf2257332fb7e3b025;hb=ead71b8c387f0748338a4add37eeb437a14b02d8;hp=bb574a7cd0c0270687fc1350c3e51f70a776e3df;hpb=35ac61764499c272d2760de2b2a432be412ecede;p=public-inbox.git diff --git a/lib/PublicInbox/WwwAtomStream.pm b/lib/PublicInbox/WwwAtomStream.pm index bb574a7c..82895db6 100644 --- a/lib/PublicInbox/WwwAtomStream.pm +++ b/lib/PublicInbox/WwwAtomStream.pm @@ -1,42 +1,63 @@ -# Copyright (C) 2016-2018 all contributors +# Copyright (C) 2016-2021 all contributors # License: AGPL-3.0+ # -# Atom body stream for which yields getline+close methods +# Atom body stream for HTTP responses +# See PublicInbox::GzipFilter for details. package PublicInbox::WwwAtomStream; use strict; -use warnings; +use parent 'PublicInbox::GzipFilter'; use POSIX qw(strftime); use Digest::SHA qw(sha1_hex); use PublicInbox::Address; -use PublicInbox::Hval qw(ascii_html); -use PublicInbox::MID qw/mid_clean mid_escape/; +use PublicInbox::Hval qw(ascii_html mid_href); use PublicInbox::MsgTime qw(msg_timestamp); -# called by PSGI server after getline: -sub close {} - sub new { my ($class, $ctx, $cb) = @_; + $ctx->{feed_base_url} = $ctx->{ibx}->base_url($ctx->{env}); + $ctx->{cb} = $cb || \&PublicInbox::GzipFilter::close; $ctx->{emit_header} = 1; - $ctx->{feed_base_url} = $ctx->{-inbox}->base_url($ctx->{env}); - bless { cb => $cb || *close, ctx => $ctx }, $class; + bless $ctx, $class; +} + +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->write(''); + $ctx->close; + } + }; + warn "E: $@" if $@; +} + +sub async_eml { # for async_blob_cb + my ($ctx, $eml) = @_; + my $smsg = delete $ctx->{smsg}; + $ctx->write(feed_entry($ctx, $smsg, $eml)); } sub response { my ($class, $ctx, $code, $cb) = @_; - [ $code, [ 'Content-Type', 'application/atom+xml' ], - $class->new($ctx, $cb) ] + my $res_hdr = [ 'Content-Type' => 'application/atom+xml' ]; + $class->new($ctx, $cb); + $ctx->psgi_response($code, $res_hdr); } # called once for each message by PSGI server sub getline { my ($self) = @_; - if (my $middle = $self->{cb}) { - my $mime = $middle->(); - return feed_entry($self, $mime) if $mime; + my $cb = $self->{cb} or return; + while (my $smsg = $cb->($self)) { + my $eml = $self->{ibx}->smsg_eml($smsg) or next; + return $self->translate(feed_entry($self, $smsg, $eml)); } - delete $self->{cb} ? '' : undef; + delete $self->{cb}; + $self->zflush(''); } # private @@ -50,26 +71,41 @@ sub title_tag { "$title"; } +sub to_uuid ($) { + my ($any) = @_; + utf8::encode($any); # really screwed up In-Reply-To fields exist + $any = sha1_hex($any); + my $h = '[a-f0-9]'; + my (@uuid5) = ($any =~ m!\A($h{8})($h{4})($h{4})($h{4})($h{12})!o); + 'urn:uuid:' . join('-', @uuid5); +} + sub atom_header { my ($ctx, $title) = @_; - my $ibx = $ctx->{-inbox}; + my $ibx = $ctx->{ibx}; my $base_url = $ctx->{feed_base_url}; my $search_q = $ctx->{search_query}; my $self_url = $base_url; my $mid = $ctx->{mid}; + my $page_id; if (defined $mid) { # per-thread - $self_url .= mid_escape($mid).'/t.atom'; + $self_url .= mid_href($mid).'/t.atom'; + $page_id = to_uuid("t\n".$mid) } elsif (defined $search_q) { my $query = $search_q->{'q'}; $title = title_tag("$query - search results"); $base_url .= '?' . $search_q->qs_html(x => undef); $self_url .= '?' . $search_q->qs_html; + $page_id = to_uuid("q\n".$query); } else { $title = title_tag($ibx->description); $self_url .= 'new.atom'; + if (defined(my $addr = $ibx->{-primary_address})) { + $page_id = "mailto:$addr"; + } else { + $page_id = to_uuid($self_url); + } } - my $mtime = (stat($ibx->{mainrepo}))[9] || time; - qq(\n) . qq() . @@ -77,68 +113,56 @@ sub atom_header { qq() . qq() . - qq(mailto:$ibx->{-primary_address}) . - feed_updated(gmtime($mtime)); -} - -sub mid2uuid ($) { - my ($mid) = @_; - utf8::encode($mid); # really screwed up In-Reply-To fields exist - $mid = sha1_hex($mid); - my $h = '[a-f0-9]'; - my (@uuid5) = ($mid =~ m!\A($h{8})($h{4})($h{4})($h{4})($h{12})!o); - 'urn:uuid:' . join('-', @uuid5); + qq($page_id) . + feed_updated($ibx->modified); } # returns undef or string sub feed_entry { - my ($self, $mime) = @_; - my $ctx = $self->{ctx}; - my $hdr = $mime->header_obj; - my $mid = mid_clean($hdr->header_raw('Message-ID')); - my $irt = PublicInbox::View::in_reply_to($hdr); - my $uuid = mid2uuid($mid); + my ($ctx, $smsg, $eml) = @_; + my $mid = $smsg->{mid}; + my $irt = PublicInbox::View::in_reply_to($eml); + my $uuid = to_uuid($mid); my $base = $ctx->{feed_base_url}; if (defined $irt) { - my $irt_uuid = mid2uuid($irt); - $irt = mid_escape($irt); + my $irt_uuid = to_uuid($irt); + $irt = mid_href($irt); $irt = qq(); } else { $irt = ''; } - my $href = $base . mid_escape($mid) . '/'; - my $t = msg_timestamp($hdr); - my @t = gmtime(defined $t ? $t : time); - my $updated = feed_updated(@t); + my $href = $base . mid_href($mid) . '/'; + my $updated = feed_updated(msg_timestamp($eml)); - my $title = $hdr->header('Subject'); + my $title = $eml->header('Subject'); $title = '(no subject)' unless defined $title && $title ne ''; $title = title_tag($title); - my $from = $hdr->header('From') or return; + my $from = $eml->header('From') // $eml->header('Sender') // + $ctx->{ibx}->{-primary_address}; my ($email) = PublicInbox::Address::emails($from); - my $name = join(', ',PublicInbox::Address::names($from)); - $name = ascii_html($name); - $email = ascii_html($email); + my $name = ascii_html(join(', ', PublicInbox::Address::names($from))); + $email = ascii_html($email // $ctx->{ibx}->{-primary_address}); - my $s = ''; - if (delete $ctx->{emit_header}) { - $s .= atom_header($ctx, $title); - } + my $s = delete($ctx->{emit_header}) ? atom_header($ctx, $title) : ''; $s .= "$name$email" . "$title$updated" . qq(). "$uuid$irt" . qq{} . qq{} . - qq() . - PublicInbox::View::multipart_text_as_html($mime, $href) . - ''; + qq(); + $ctx->{obuf} = \$s; + $ctx->{mhref} = $href; + PublicInbox::View::multipart_text_as_html($eml, $ctx); + delete $ctx->{obuf}; + $s .= ''; } sub feed_updated { - '' . strftime('%Y-%m-%dT%H:%M:%SZ', @_) . ''; + my ($t) = @_; + '' . strftime('%Y-%m-%dT%H:%M:%SZ', gmtime($t)) . ''; } 1;