--- trunk/lib/Frey/Server.pm	2008/06/30 07:13:35	36
+++ trunk/lib/Frey/Server.pm	2008/11/29 15:05:55	617
@@ -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,60 +20,177 @@
 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
+
+our $editor = Frey::Editor->new;
+
+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{^/+(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();
+	$editor->switch_screen if $ENV{FREY_SWITCH_SCREEN};
 	$server->loop;
 }
 
-my @callbacks;
-my $callback_count;
+=head2 main
 
-sub gen_link {
-	my ($text, $code) = @_;
-	$callbacks[$callback_count++] = $code;
-	return qq{<a href="?cb=$callback_count">$text</a>};
-}
+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) = @_;
+
+#	$req->send_headers("X-Frey-VERSION: $Frey::VERSION");
+
+	my $path = $req->request->url->path;
+
+	eval {
+
+		if ( $path =~ m{/reload(.*)} ) {
+
+			$ENV{FREY_NO_LOG} = 1;
+			my $cmd = "perl -c $0";
+			warn "# check config with $cmd";
+			if ( system($cmd) == 0 ) {
+				$req->print( "\r\n" );
+				my $server = Frey::Server->new;
+				$server->load_config;
+				$req->print( "\r\n" );
+				Module::Reload->check;
+				$req->print( "\r\n" );
+				$req->print( refresh( $1, 1 ) );
+				$req->print( "\r\n" );
+				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 ) );
+			$req->print( "\r\n" );
+			exit;
+		}
+
+#		warn $req->request->header('User_Agent');
+
+		my %params = $req->params;
+		my $html;
+
+		sub rest2class {
+			my $class = shift;
+			$class =~ s/-/::/; # sigh!
+			return $class;
+		}
 
-  # Otherwise, lets give them page
-  send_page($req);
+
+		my $f;
+
+		# 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}
+		) {
+			$f = Frey::ObjectDesigner->new( fey_class => $params{class} );
+			$f->request( $req );
+		} elsif ( $path =~ $editor->url_regex ) {
+			$req->print( $editor->command( $path ) );
+			$editor->command( $path );
+			return;
+		} elsif (
+			$path =~ m{/([^/]+)/(\w*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', %$run );
+		}
+
+		if ( $f ) {
+			$f->clean_status;
+			$f->add_status( { request => $req } );
+			$f->status_parts;
+			if ( my $html = $f->html ) {
+				warn "## html ",length($html)," bytes";
+				$req->print( $html );
+			} else {
+				confess "no output from $f";
+			}
+		} else {
+			confess "# can't call request on nothing!";
+		}
+
+	};
+
+	if ( $@ ) {
+		warn "SERVER ERROR: $@";
+#		$req->conn->send_error( 404 );	# FIXME this should probably be 500, but we can't ship page with it
+		$req->print( qq{<pre class="frey-error">$@<pre>\r\n\r\n} );
+#		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 ( $req->conn ) {
+		$req->print( "\r\n" ); # flush
+		$req->conn->close;
+		warn "## close connection: $@";
+	}
 }
 
 # Here we accept a connection to the browser, and keep it open. Meanwhile we
@@ -109,40 +230,22 @@
   }
 }
 
-# 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;
-	}
+sub refresh {
+	my ( $url, $time ) = @_;
+	$url  ||= '/';
+	$time ||= 1;
+	warn "# refresh $url";
+	qq|
+		<html>
+		<head>
+			<META HTTP-EQUIV="Refresh" CONTENT="$time; URL=$url"></META>
+		</head>
+		<body>
+			Refresh <a href="$url"><tt>$url</tt></a> in $time sec
+		</body>
+		</html>
+		\n\r\n\r
+	|; # XXX newlines at end are important to flush content to browser
 }
 
 1;