--- trunk/lib/Frey/Server.pm 2008/06/30 07:06:11 34 +++ trunk/lib/Frey/Server.pm 2008/09/14 00:45:47 190 @@ -1,14 +1,15 @@ package Frey::Server; -use strict; -use warnings; +use Moose; + +with 'Frey::Web'; use Continuity; -use Continuity::REPL; +#use Continuity::REPL; use Data::Dump qw/dump/; -use base 'Frey'; -use Frey::HTML; +#use Carp::REPL; ## XXX it would be nice, but it breaks error reporting too much +use Frey::ClassLoader; my @messages; # Global (shared) list of messages my $got_message; # Flag to indicate that there is a new message to display @@ -16,60 +17,93 @@ use vars qw( $repl $server ); #$repl = Continuity::REPL->new; -$server = Continuity->new( - port => 16001, - path_session => 1, - cookie_session => 'sid', - callback => \&main, -); -$server->debug_level( 2 ); -sub run { +=head1 NAME + +Frey::Server - Continuity based server for Frey + +=head2 DESCRIPTION + +This is one of pissible server implementations for Frey. In it's current stage, it's also most complete one. + +=head2 run + + $o->run( $optional_port ); + +=cut + +sub run { + my ( $self, $port ) = @_; + $server = Continuity->new( + port => $port || 16001, + path_session => 1, + cookie_session => 'sid', + callback => \&main, + debug_level => 1, + staticp => sub { $_[0]->url =~ m/\.(jpg|jpeg|gif|png|css|ico|js|html?|xml|json|ya?ml)(\?.*)?$/ }, + ); + $Module::Reload::Debug = 1; + Frey::ClassLoader->new->load_all_classes(); $server->loop; } -my @callbacks; -my $callback_count; +=head2 main -sub gen_link { - my ($text, $code) = @_; - $callbacks[$callback_count++] = $code; - return qq{$text}; -} +This is simple dispatcher for our server. Currently it's in flux and +documented only in source code. -sub process_links { - my $request = shift; - my $cb = $request->param('cb'); - if (exists $callbacks[$cb]) { - $callbacks[$cb]->($request); - delete $callbacks[$cb]; - } -} +=cut -# This is the main entrypoint. We are looking for one of three things -- a -# pushstream, a sent message, or a request for the main HTML. We delegate each -# of these cases, none of which will return (they all loop forever). sub main { - my ($req) = @_; - - my $path = $req->request->url->path; - warn "REQUEST: $path\n"; - - warn $req->request->header('User_Agent'); -#warn dump( $req ); - - # If this is a request for the pushtream, then give them that - if($path =~ /pushstream/) { - pushstream($req); - } - - # If they are sending us a message, we give them a thread for that too - if($path =~ /sendmessage/) { - send_message($req); - } + my ($req) = @_; + + my $path = $req->request->url->path; + warn "REQUEST: $path ",dump( $req->params ),"\n"; + + Module::Reload->check if $path =~ m!reload! || $req->param('reload'); + +# warn $req->request->header('User_Agent'); + +# eval { + { + + my $f; + + if ( $path =~ m!/~/([^/]+)(.*)! ) { + $f = Frey::Introspect->new( package => $1 ); + } elsif ( $path =~ m!/ob/([^/]+)(.*)! ) { + $f = Frey::ObjectBrowser->new( fey_class => $1 ); + } elsif ( $path =~ m!/od/([^/]+)(.*)! ) { + $f = Frey::ObjectDesigner->new( fey_class => $1 ); + } elsif ( $path =~ m!/(markup|html)/([^/]+)(.*)! ) { + $f = Frey::Run->new( class => $2 ); + } else { + $f = Frey::ClassBrowser->new; + } + $f->html( $req ) if $f; + + }; + + 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{
$@} ); +# Carp::REPL::repl; + + } + + # If this is a request for the pushtream, then give them that + if($path =~ /pushstream/) { + pushstream($req); + } + + # If they are sending us a message, we give them a thread for that too + if($path =~ /sendmessage/) { + send_message($req); + } - # Otherwise, lets give them page - send_page($req); } # Here we accept a connection to the browser, and keep it open. Meanwhile we @@ -109,40 +143,4 @@ } } -# This isn't a pushstream, nor a new message. It is just the main page. We loop -# in case they ask for it multiple times :) -sub send_page { - my ($req) = @_; - my $templates = Template::Declare->templates; - while(1) { - warn "param = ",dump($req->param); - my $path = $req->request->url->path; - - my $html; - - if ( $path =~ m/::/ ) { - my ( undef, $module, $method ) = split(m!/!, $path, 3); - - if ( ! defined( $templates->{$module} ) ) { - $req->conn->send_status_line( 404, "$module" ); - $html = "Package $module not found"; - } elsif ( ! $method ) { - $html = Frey::HTML->page( 'package-methods', $req, $module ); - } elsif ( grep(/^\Q$method\E$/, @{ $templates->{$module} }) ) { - $html = Frey::HTML->page( $method, $req ); - } else { - $req->conn->send_status_line( 404, "$module $method" ); - $html = "Package $module doesn't have $method"; - } - } else { - warn "fallback to status page\n"; - $html = Frey::HTML->page( 'status' ); - } - - $req->print( $html ); - warn ">> ",length( $html ), " bytes\n"; - $req->next; - } -} - 1;