--- trunk/lib/Frey/Server.pm 2008/11/05 08:20:50 277
+++ trunk/lib/Frey/Server.pm 2008/11/27 22:29:01 571
@@ -1,8 +1,9 @@
package Frey::Server;
use Moose;
-
+extends 'Frey';
with 'Frey::Web';
+with 'Frey::Config';
use Continuity;
#use Continuity::REPL;
@@ -11,6 +12,7 @@
#use Carp::REPL; ## XXX it would be nice, but it breaks error reporting too much
use Frey::ClassLoader;
use Frey::Run;
+use Frey::Editor;
my @messages; # Global (shared) list of messages
my $got_message; # Flag to indicate that there is a new message to display
@@ -36,12 +38,14 @@
sub run {
my ( $self, $port ) = @_;
$server = Continuity->new(
- port => $port || 16001,
+ port => $port || $self->config->{port} || 16001,
path_session => 1,
cookie_session => 'sid',
callback => \&main,
debug_level => 2,
- staticp => sub { $_[0]->url =~ m/\.(jpg|jpeg|gif|png|css|ico|js|html?|xml|json|ya?ml)(\?.*)?$/ },
+ staticp => sub {
+ $_[0]->url =~ m{^/+(static|var).*\.(jpg|jpeg|gif|png|css|ico|js|html?|xml|json|ya?ml)(\?.*)?$}
+ },
);
$Module::Reload::Debug = 1; # auto if debug_level > 1
Frey::ClassLoader->new->load_all_classes();
@@ -58,55 +62,130 @@
sub main {
my ($req) = @_;
+# $req->send_headers("X-Frey-VERSION: $Frey::VERSION");
+
my $path = $req->request->url->path;
- #warn "REQUEST: $path ",dump( $req->params );
- Module::Reload->check if $path =~ m!reload! || $req->param('reload');
+ eval {
-# warn $req->request->header('User_Agent');
+ sub refresh {
+ my ( $url, $time ) = @_;
+ $url ||= '/';
+ $time ||= 1;
+ warn "# refresh $url";
+ qq|
+
+
+
+
+
+ Refresh $url in $time sec
+
+
+ \n\r\n\r
+ |; # XXX newlines at end are important to flush content to browser
+ }
- my %params = $req->params;
- my $html;
+ if ( $path =~ m{/reload(.*)} ) {
+
+ $ENV{FREY_NO_LOG} = 1;
+ my $cmd = "perl -c $0";
+ warn "# check config with $cmd";
+ if ( system($cmd) == 0 ) {
+ Frey::Server->new->load_config;
+ Module::Reload->check;
+ $req->print( refresh( $1, 1 ) );
+ warn "# reload done";
+ return;
+ } else {
+ warn "ERROR: $?";
+ }
+ $ENV{FREY_NO_LOG} = 0;
+
+ } elsif ( $path =~ m{/exit(.*)} ) {
+ # FIXME do we need some kind of check here for production? :-)
+ # ./bin/dev.sh will restart us during development
+ $req->print( refresh( $1, 2 ) );
+ exit;
+ }
+
+# warn $req->request->header('User_Agent');
+
+ my %params = $req->params;
+ my $html;
+
+ sub rest2class {
+ my $class = shift;
+ $class =~ s/-/::/; # sigh!
+ return $class;
+ }
- eval {
my $f;
- my $run_regexp = join('|', Frey::Run->execute );
+ my $editor = Frey::Editor->new;
- if ( $path =~ m!/Frey[:-]+ObjectBrowser! ) {
+ # shared run params
+ my $run = {
+ request_url => $req->request->url,
+ debug => 1,
+ };
+
+ if (
+ $path =~ m{/Frey[:-]+ObjectBrowser}
+ ) {
$f = Frey::ObjectBrowser->new( fey_class => $params{class} );
$f->request( $req );
- } elsif ( $path =~ m!/Frey[:-]+ObjectDesigner! ) {
+ } elsif (
+ $path =~ m{/Frey[:-]+ObjectDesigner}
+ ) {
$f = Frey::ObjectDesigner->new( fey_class => $params{class} );
$f->request( $req );
- } elsif ( $path =~ m!/Frey[:-]+Introspect! ) {
- $f = Frey::Introspect->new( class => $params{class} );
- $req->print( $f->markup );
- undef $f;
- } elsif ( $path =~ m!/([^/]+)/($run_regexp)! ) {
- warn "# run $1 $2\n";
- $f = Frey::Run->new( class => $1, params => \%params );
+ } elsif ( $path =~ $editor->url_regex ) {
+ $req->print( $editor->command( $path ) );
+ system( $editor->command( $path ) );
+ return;
+ } elsif (
+ $path =~ m{/([^/]+)/(as_\w+)/?([^/]+)?}
+ ) {
+ my $class = rest2class $1;
+ warn "# run $path -> $class $2";
+ $run->{format} = $3 if $3;
+ $params{request_url} = $req->request->url;
+ $req->print( "\r\n\r\n" ); # send something to browser so we don't time-out
+ $f = Frey::Run->new( class => $class, params => \%params, run => $2, %$run );
+ } elsif (
+ $path =~ m{/([^/]+)/?$}
+ ) {
+ my $class = rest2class $1;
+ warn "# introspect $class";
+ $f = Frey::Run->new( class => 'Frey::Introspect', params => { class => $class }, %$run );
} else {
- $f = Frey::Run->new( class => 'Frey::ClassBrowser' );
+ $f = Frey::Run->new( class => 'Frey::ClassBrowser', %$run );
}
if ( $f ) {
- $req->print( $f->html );
+ $f->clean_status;
+ $f->add_status( { request => $req } );
+ warn "## status ", dump( map { keys %$_ } $f->status );
+ my $html = $f->html;
+ die "no html output" unless $html;
+ warn "## html ",length($html)," bytes";
+ eval {
+ $req->print( $html );
+ };
+ die "can't send to wire: $@" if $@;
} else {
warn "# can't call request on nothing!";
}
};
- my $self = $req;
-
if ( $@ ) {
warn $@;
$req->conn->send_error( 404 ); # FIXME this should probably be 500, but we can't ship page with it
- $req->print( qq{$@} );
+ $req->print( qq{$@} );
# Carp::REPL::repl;
-
}
# If this is a request for the pushtream, then give them that
@@ -119,6 +198,10 @@
send_message($req);
}
+ if ( $req->conn ) {
+ $req->conn->close;
+ warn "## close connection: $@";
+ }
}
# Here we accept a connection to the browser, and keep it open. Meanwhile we