--- trunk/lib/Frey/Server.pm 2008/06/30 20:02:06 37
+++ trunk/lib/Frey/Server.pm 2008/11/18 12:02:57 407
@@ -1,14 +1,18 @@
package Frey::Server;
-use strict;
-use warnings;
+use Moose;
+extends 'Frey';
+with 'Frey::Web';
+with 'Frey::Config';
use Continuity;
#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;
+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
@@ -16,81 +20,128 @@
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 );
+
+=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 || $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)(\?.*)?$/ },
+ );
+ $Module::Reload::Debug = 1; # auto if debug_level > 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;
- my $out = qq{$text};
- $callback_count++;
- return $out;
-}
+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 "REQUEST: $path ",dump( $req->params );
- warn $req->request->header('User_Agent');
-#warn dump( $req );
+ Module::Reload->check if $path =~ m!reload! || $req->param('reload');
+
+# 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->runnable );
+ my $editor = Frey::Editor->new;
+
+ if (
+ $path =~ m{/Frey[:-]+ObjectBrowser}
+ ) {
+ $f = Frey::ObjectBrowser->new( fey_class => $params{class} );
+ $f->request( $req );
+ } elsif (
+ $path =~ m{/Frey[:-]+ObjectDesigner}
+ ) {
+ $f = Frey::ObjectDesigner->new( fey_class => $params{class} );
+ $f->request( $req );
+ } elsif ( $path =~ $editor->url_regex ) {
+ $req->print( $editor->command( $path ) );
+ system( $editor->command( $path ) );
+ return;
+ } elsif (
+ $path =~ m{/([^/]+)/($run_regexp)}
+ ) {
+ my $class = rest2class $1;
+ warn "# run $class $2\n";
+ $f = Frey::Run->new( class => $class, params => \%params, run => $2, request_url => $req->request->url );
+ } elsif (
+ $path =~ m{/([^/]+)/?$}
+ ) {
+ my $class = rest2class $1;
+ warn "# introspect $class";
+ $f = Frey::Run->new( class => 'Frey::Introspect', params => { class => $class }, request_url => $req->request->url );
+ } else {
+ $f = Frey::Run->new( class => 'Frey::ClassBrowser' );
+ }
+
+ if ( $f ) {
+ $req->print( $f->html );
+ } 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{$@} );
+# 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);
}
- if ( $path =~ m/test/ ) {
- use Data::Dumper;
- $Data::Dumper::Deparse = 1;
-
- my $x = 0;
- my $continue = 1;
- my $link1 = gen_link('+' => sub { $x++ });
- my $link2 = gen_link('-' => sub { $x-- });
- my $out = gen_link('X' => sub { $continue = 0 });
- while ( $continue ) {
- warn "## x = $x ",dump( $req->params );
- $req->print("\$x is now: $x");
- $req->print($link1, ' ', $link2, ' ', $out);
- $req->print(''.Dumper( @callbacks ).'
');
- $req->next;
- process_links($req);
- }
- }
-
- # Otherwise, lets give them page
- send_page($req);
}
# Here we accept a connection to the browser, and keep it open. Meanwhile we
@@ -130,40 +181,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;