--- trunk/lib/Frey/Server.pm	2008/10/31 23:07:46	220
+++ trunk/lib/Frey/Server.pm	2008/11/29 17:48:54	625
@@ -1,8 +1,8 @@
 package Frey::Server;
 
 use Moose;
-
-with 'Frey::Web';
+extends 'Frey';
+with 'Frey::Config';
 
 use Continuity;
 #use Continuity::REPL;
@@ -10,6 +10,8 @@
 
 #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
@@ -32,18 +34,27 @@
 
 =cut
 
+our $editor = Frey::Editor->new;
+our $port;
+
 sub run {
-	my ( $self, $port ) = @_;
+	my ( $self ) = @_;
+
+	$port = $ENV{FREY_PORT} || $self->config->{port} || 16001;
+
 	$server = Continuity->new(
-		port => $port || 16001,
+		port => $port,
 		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();
+	$editor->switch_screen if $ENV{FREY_SWITCH_SCREEN};
 	$server->loop;
 }
 
@@ -57,41 +68,117 @@
 sub main {
 	my ($req) = @_;
 
-	my $path = $req->request->url->path;
-	#warn "REQUEST: $path ",dump( $req->params );
-
-	Module::Reload->check if $path =~ m!reload! || $req->param('reload');
+#	$req->send_headers("X-Frey-VERSION: $Frey::VERSION");
 
-#	warn $req->request->header('User_Agent');
+	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;
+		}
+
+
 		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|request)/([^/]+)(.*)! ) {
-			$f = Frey::Run->new( class => $2 );
+		# 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 ) );
+			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
+			$run->{$_} = $params{$_} foreach keys %params;
+			$f = Frey::Run->new( class => $class, params => $run, run => $2, request_url => $req->request->url );
+		} elsif (
+			$path =~ m{/([^/]+)/?$}
+		) {
+			my $class = rest2class $1;
+			warn "# introspect $class";
+			$run->{class} ||= $class;
+			$f = Frey::Run->new( class => 'Frey::Introspect', params => $run, request_url => $req->request->url );
 		} else {
-			$f = Frey::Run->new( class => 'Frey::ClassBrowser' );
+			$f = Frey::Run->new( class => 'Frey::ClassBrowser', params => $run, request_url => $req->request->url );
 		}
-		$f->request( $req ) if $f;
 
-	};
+		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!";
+		}
 
-	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{<pre class="error">$@<pre>} );
+		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
@@ -104,6 +191,11 @@
 		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
@@ -143,4 +235,22 @@
   }
 }
 
+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;