make Plack optional for non-WWW and non-httpd users

[public-inbox.git] / script / public-inbox-httpd

diff --git a/script/public-inbox-httpd b/script/public-inbox-httpd
index e7ed3c9df4fa1e122dd1714cea5678e9d2e56ab6..09da505e5028952a60551f7bd2ffc25cf57c7780 100755 (executable)
--- a/script/public-inbox-httpd
+++ b/script/public-inbox-httpd
@@ -1,15 +1,18 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Standalone HTTP server for public-inbox.
 use strict;
-use warnings;
-use Plack::Util;
 use PublicInbox::Daemon;
-use PublicInbox::HTTP;
-use Plack::Request;
-use Plack::Builder;
+BEGIN {
+       for (qw(Plack::Builder Plack::Util)) {
+               eval("require $_") or die "E: Plack is required for $0\n";
+       }
+       Plack::Builder->import;
+       require PublicInbox::HTTP;
+       require PublicInbox::HTTPD;
+}
 my %httpds;
 my $app;
 my $refresh = sub {
@@ -21,10 +24,9 @@ my $refresh = sub {
                }
        } else {
                require PublicInbox::WWW;
-               PublicInbox::WWW->preload;
                my $www = PublicInbox::WWW->new;
+               $www->preload;
                $app = builder {
-                       enable 'Chunked';
                        eval {
                                enable 'Deflater',
                                        content_type => [ qw(
@@ -33,8 +35,6 @@ my $refresh = sub {
                                                application/atom+xml
                                                )]
                        };
-                       $@ and warn
-"Plack::Middleware::Deflater missing, bandwidth will be wasted\n";
 
                        eval { enable 'ReverseProxy' };
                        $@ and warn
@@ -54,74 +54,3 @@ PublicInbox::Daemon::run('0.0.0.0:8080', $refresh,
                my $h = $httpds{$fd} ||= PublicInbox::HTTPD->new($srv, $app);
                PublicInbox::HTTP->new($client, $addr, $h),
        });
-
-1;
-
-# XXX This is a totally unstable API for public-inbox internal use only
-# This is exposed via the 'pi-httpd.async' key in the PSGI env hash.
-# The name of this key is not even stable!
-# Currently is is intended for use with read-only pipes.
-package PublicInbox::HTTPD::Async;
-use strict;
-use warnings;
-use base qw(Danga::Socket);
-use fields qw(cb);
-
-sub new {
-       my ($class, $io, $cb) = @_;
-       my $self = fields::new($class);
-       IO::Handle::blocking($io, 0);
-       $self->SUPER::new($io);
-       $self->{cb} = $cb;
-       $self->watch_read(1);
-       $self;
-}
-
-sub event_read { $_[0]->{cb}->() }
-sub event_hup { $_[0]->{cb}->() }
-sub event_err { $_[0]->{cb}->() }
-sub sysread { shift->{sock}->sysread(@_) }
-
-1;
-
-package PublicInbox::HTTPD;
-use strict;
-use warnings;
-use Plack::Util;
-
-sub pi_httpd_async {
-       my ($io, $cb) = @_;
-       PublicInbox::HTTPD::Async->new($io, $cb);
-}
-
-sub new {
-       my ($class, $sock, $app) = @_;
-       my $n = getsockname($sock) or die "not a socket: $sock $!\n";
-       my ($host, $port) = PublicInbox::Daemon::host_with_port($n);
-
-       my %env = (
-               SERVER_NAME => $host,
-               SERVER_PORT => $port,
-               SCRIPT_NAME => '',
-               'psgi.version' => [ 1, 1 ],
-               'psgi.errors' => \*STDERR,
-               'psgi.url_scheme' => 'http',
-               'psgi.nonblocking' => Plack::Util::TRUE,
-               'psgi.streaming' => Plack::Util::TRUE,
-               'psgi.run_once'  => Plack::Util::FALSE,
-               'psgi.multithread' => Plack::Util::FALSE,
-               'psgi.multiprocess' => Plack::Util::TRUE,
-               'psgix.harakiri'=> Plack::Util::FALSE,
-               'psgix.input.buffered' => Plack::Util::TRUE,
-               'pi-httpd.async' => do {
-                       no warnings 'once';
-                       *pi_httpd_async
-               },
-       );
-       bless {
-               app => $app,
-               env => \%env,
-       }, $class;
-}
-
-1;