From: Eric Wong <e@yhbt.net> To: meta@public-inbox.org Subject: [PATCH 28/43] view: make /$INBOX/$MSGID/ permalink async Date: Sun, 5 Jul 2020 23:27:44 +0000 [thread overview] Message-ID: <20200705232759.3161-29-e@yhbt.net> (raw) In-Reply-To: <20200705232759.3161-1-e@yhbt.net> This will allow -httpd to handle other requusts if waiting on an HDD seek or git to decode a blob. --- lib/PublicInbox/View.pm | 38 ++++++++++++++++------------------ lib/PublicInbox/WwwStream.pm | 40 +++++++++++++++++++++++++++++++----- 2 files changed, 53 insertions(+), 25 deletions(-) diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 243528263..98445f0e0 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -27,24 +27,22 @@ use constant TCHILD => '` '; sub th_pfx ($) { $_[0] == 0 ? '' : TCHILD }; sub msg_page_i { - my ($ctx) = @_; - my $cur = delete $ctx->{smsg} or return; # undef: done - my $nxt; - if (my $over = $ctx->{-inbox}->over) { - $nxt = $ctx->{smsg} = $over->next_by_mid(@{$ctx->{next_arg}}); + my ($ctx, $eml) = @_; + if ($eml) { # called by WwwStream::async_eml or getline + my $smsg = $ctx->{smsg}; + $ctx->{smsg} = $ctx->{over}->next_by_mid(@{$ctx->{next_arg}}); + $ctx->{mhref} = ($ctx->{nr} || $ctx->{smsg}) ? + "../${\mid_href($smsg->{mid})}/" : ''; + my $hdr = $eml->header_obj; + my $obuf = $ctx->{obuf} = _msg_page_prepare_obuf($hdr, $ctx); + multipart_text_as_html($eml, $ctx); + delete $ctx->{obuf}; + $$obuf .= '</pre><hr>'; + $$obuf .= html_footer($ctx, $ctx->{first_hdr}) if !$ctx->{smsg}; + $$obuf; + } else { # called by WwwStream::async_next or getline + $ctx->{smsg}; # may be undef } - $ctx->{mhref} = ($ctx->{nr} || $nxt) ? - "../${\mid_href($cur->{mid})}/" : ''; - my $eml = $ctx->{-inbox}->smsg_eml($cur) or return; - my $hdr = $eml->header_obj; - my $obuf = $ctx->{obuf} = _msg_page_prepare_obuf($hdr, $ctx); - multipart_text_as_html($eml, $ctx); - delete $ctx->{obuf}; - $$obuf .= '</pre><hr>'; - # we want to at least show the message if something - # here crashes: - eval { $$obuf .= html_footer($ctx, $ctx->{first_hdr}) } if !$nxt; - $$obuf; } # /$INBOX/$MESSAGE_ID/ for unindexed v1 inboxes @@ -74,11 +72,11 @@ sub msg_page { my ($ctx) = @_; my $ibx = $ctx->{-inbox}; $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef; - my $over = $ibx->over or return no_over_html($ctx); + my $over = $ctx->{over} = $ibx->over or return no_over_html($ctx); my ($id, $prev); my $next_arg = $ctx->{next_arg} = [ $ctx->{mid}, \$id, \$prev ]; - $ctx->{smsg} = $over->next_by_mid(@$next_arg) or return; - PublicInbox::WwwStream::response($ctx, 200, \&msg_page_i); + $ctx->{smsg} = $over->next_by_mid(@$next_arg) or return; # undef == 404 + PublicInbox::WwwStream::aresponse($ctx, 200, \&msg_page_i); } # /$INBOX/$MESSAGE_ID/#R diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index 42fb183f4..eecc27019 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -15,9 +15,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}); @@ -40,6 +37,11 @@ sub response { [ $code, $res_hdr, $ctx ] } +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 ($ctx) = @_; my $ibx = $ctx->{-inbox}; @@ -157,8 +159,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)); @@ -179,4 +187,26 @@ sub html_oneshot ($$;$) { [ $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;
next prev parent reply other threads:[~2020-07-05 23:28 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-05 23:27 [PATCH 00/43] www: async git cat-file w/ -httpd Eric Wong 2020-07-05 23:27 ` [PATCH 01/43] gzipfilter: minor cleanups Eric Wong 2020-07-05 23:27 ` [PATCH 02/43] wwwstream: oneshot: perform gzip without middleware Eric Wong 2020-07-05 23:27 ` [PATCH 03/43] www*stream: gzip ->getline responses Eric Wong 2020-07-05 23:27 ` [PATCH 04/43] wwwtext: gzip text/plain responses, as well Eric Wong 2020-07-05 23:27 ` [PATCH 05/43] wwwtext: switch to html_oneshot Eric Wong 2020-07-05 23:27 ` [PATCH 06/43] www: need: use WwwStream::html_oneshot Eric Wong 2020-07-05 23:27 ` [PATCH 07/43] wwwlisting: use GzipFilter for HTML Eric Wong 2020-07-05 23:27 ` [PATCH 08/43] gzipfilter: replace Compress::Raw::Deflate usages Eric Wong 2020-07-05 23:27 ` [PATCH 09/43] {gzip,noop}filter: ->zmore returns undef, always Eric Wong 2020-07-05 23:27 ` [PATCH 10/43] mbox: remove html_oneshot import Eric Wong 2020-07-05 23:27 ` [PATCH 11/43] wwwstatic: support gzipped directory listings Eric Wong 2020-07-05 23:27 ` [PATCH 12/43] qspawn: learn to gzip streaming responses Eric Wong 2020-07-05 23:27 ` [PATCH 13/43] stop auto-loading Plack::Middleware::Deflater Eric Wong 2020-07-05 23:27 ` [PATCH 14/43] mboxgz: do asynchronous git blob retrievals Eric Wong 2020-07-05 23:27 ` [PATCH 15/43] mboxgz: reduce hash depth Eric Wong 2020-07-05 23:27 ` [PATCH 16/43] mbox: async blob fetch for "single message" raw mboxrd Eric Wong 2020-07-05 23:27 ` [PATCH 17/43] wwwatomstream: simplify feed_update callers Eric Wong 2020-07-05 23:27 ` [PATCH 18/43] wwwatomstream: use PublicInbox::Inbox->modified for feed_updated Eric Wong 2020-07-05 23:27 ` [PATCH 19/43] wwwatomstream: reuse $ctx as $self Eric Wong 2020-07-05 23:27 ` [PATCH 20/43] xt/httpd-async-stream: allow more options Eric Wong 2020-07-05 23:27 ` [PATCH 21/43] wwwatomstream: support async blob fetch Eric Wong 2020-07-05 23:27 ` [PATCH 22/43] wwwstream: reduce object graph depth Eric Wong 2020-07-05 23:27 ` [PATCH 23/43] wwwstream: reduce blob fetch paths for ->getline Eric Wong 2020-07-05 23:27 ` [PATCH 24/43] www: start making gzipfilter the parent response class Eric Wong 2020-07-05 23:27 ` [PATCH 25/43] remove unused/redundant zlib-related imports Eric Wong 2020-07-05 23:27 ` [PATCH 26/43] wwwstream: use parent.pm and no warnings Eric Wong 2020-07-05 23:27 ` [PATCH 27/43] wwwstream: subclass off GzipFilter Eric Wong 2020-07-05 23:27 ` Eric Wong [this message] 2020-07-05 23:27 ` [PATCH 29/43] view: /$INBOX/$MSGID/t/ reads blobs asynchronously Eric Wong 2020-07-05 23:27 ` [PATCH 30/43] view: update /$INBOX/$MSGID/T/ to be async Eric Wong 2020-07-05 23:27 ` [PATCH 31/43] feed: generate_i: eliminate pointless loop Eric Wong 2020-07-05 23:27 ` [PATCH 32/43] feed: /$INBOX/new.html fetches blobs asynchronously Eric Wong 2020-07-05 23:27 ` [PATCH 33/43] ssearchview: /$INBOX/?q=$QUERY&x=t uses async blobs Eric Wong 2020-07-05 23:27 ` [PATCH 34/43] view: eml_entry: reduce parameters Eric Wong 2020-07-05 23:27 ` [PATCH 35/43] view: /$INBOX/$MSGID/t/: avoid extra hash lookup in eml case Eric Wong 2020-07-05 23:27 ` [PATCH 36/43] wwwstream: eliminate ::response, use html_oneshot Eric Wong 2020-07-05 23:27 ` [PATCH 37/43] www: update internal docs Eric Wong 2020-07-05 23:27 ` [PATCH 38/43] view: simplify eml_entry callers further Eric Wong 2020-07-05 23:27 ` [PATCH 39/43] wwwtext: simplify gzf_maybe use Eric Wong 2020-07-05 23:27 ` [PATCH 40/43] wwwattach: support async blob retrievals Eric Wong 2020-07-05 23:27 ` [PATCH 41/43] gzipfilter: drop HTTP connection on bugs or data corruption Eric Wong 2020-07-05 23:27 ` [PATCH 42/43] daemon: warn on missing blobs Eric Wong 2020-07-05 23:27 ` [PATCH 43/43] gzipfilter: check http->{forward} for client disconnects Eric Wong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: https://public-inbox.org/README * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200705232759.3161-29-e@yhbt.net \ --to=e@yhbt.net \ --cc=meta@public-inbox.org \ --subject='Re: [PATCH 28/43] view: make /$INBOX/$MSGID/ permalink async' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: https://80x24.org/public-inbox.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).