--- googlecode.com/svn/trunk/Meteor/Subscriber.pm	2008/02/04 22:30:35	49
+++ googlecode.com/svn/trunk/Meteor/Subscriber.pm	2008/11/27 00:33:21	62
@@ -55,14 +55,12 @@
 	my $self=$class->SUPER::newFromServer(shift);
 	
 	$self->{'headerBuffer'}='';
-	$self->{'MessageCount'}=0;
-	$self->{'MaxMessageCount'}=0;
+	$self->{'messageCount'}=0;
 	
-	$self->{'ConnectionStart'}=time;
 	my $maxTime=$::CONF{'MaxTime'};
 	if($maxTime>0)
 	{
-		$self->{'ConnectionTimeLimit'}=$self->{'ConnectionStart'}+$maxTime;
+		$self->{'connectionTimeLimit'}=$self->{'connectionStart'}+$maxTime;
 	}
 	
 	$::Statistics->{'current_subscribers'}++;
@@ -80,10 +78,17 @@
 	
 	if(exists($PersistentConnections{$id}))
 	{
-		$PersistentConnections{$id}->close();
+		$PersistentConnections{$id}->close(0,'newSubscriberWithSameID');
 	}
 }
 
+sub subscriberExists {
+	my $class=shift;
+	my $id=shift;
+
+	return exists($PersistentConnections{$id});
+}
+
 sub pingPersistentConnections {
 	my $class=shift;
 	
@@ -106,6 +111,17 @@
 	return scalar(keys %PersistentConnections);
 }
 
+sub listSubscribers {
+	my $class=shift;
+	my $list='';
+	foreach my $subscriber (keys %PersistentConnections)
+	{
+		my $sub = $PersistentConnections{$subscriber};
+		$list .= $subscriber.' '.$sub->{'ip'}.' '.$sub->{'connectionStart'}.' '.$sub->{'connectionTimeLimit'}.' '.($sub->{'connectionTimeLimit'}-time).' '.$sub->{'messageCount'}.' "'.$sub->{'useragent'}."\"$::CRLF";
+	}
+	$list;
+}
+
 ###############################################################################
 # Instance methods
 ###############################################################################
@@ -113,7 +129,7 @@
 	my $self=shift;
 	my $line=shift;
 	
-	# Once the header was processed we ignore any input
+	# Once the header was processed we ignore any input - Meteor does not accept or process request bodies
 	return unless(exists($self->{'headerBuffer'}));
 	
 	if($line ne '')
@@ -134,24 +150,20 @@
 		#
 		# Find the 'GET' line
 		#
-		if($self->{'headerBuffer'}=~/GET\s+$::CONF{'SubscriberDynamicPageAddress'}\/([0-9a-z]+)\/([0-9a-z]+)\/(\S+)/i)
+		if($self->{'headerBuffer'}=~/GET\s+$::CONF{'SubscriberDynamicPageAddress'}\/([0-9a-z]+)\/([0-9a-z]+)\/([a-z0-9_\-\%\.\/]+).*?/i)
 		{
-			my $subscriberID=$1;
+			$self->{'subscriberID'}=$1;
 			$self->{'mode'}=$2;
 			my $persist=$self->getConf('Persist');
-			
 			my $maxTime=$self->getConf('MaxTime');
-			if($maxTime>0)
-			{
-				$self->{'ConnectionTimeLimit'}=$self->{'ConnectionStart'}+$maxTime;
-			}
+			$self->{'connectionTimeLimit'} = ($self->{'connectionStart'}+$maxTime) if ($maxTime>0);
 			
 			my @channelData=split('/',$3);
 			my $channels={};
 			my $channelName;
 			my $offset;
 			foreach my $chandef (@channelData) {
-				if($chandef=~/^([a-z0-9]+)(.(r|b|h)([0-9]*))?$/i) {
+				if($chandef=~/^([a-z0-9_\-\%]+)(.(r|b|h)([0-9]*))?$/i) {
 					$channelName = $1;
 					$channels->{$channelName}->{'startIndex'} = undef;
 					if ($3) {
@@ -162,21 +174,37 @@
 					}
 				}
 			}
+			$self->{'useragent'} = ($self->{'headerBuffer'}=~/User-Agent: (.+)/i) ? $1 : "-";
 			
-			delete($self->{'headerBuffer'});
-			
-			if($persist)
-			{
-				$self->{'subscriberID'}=$subscriberID;
-				$self->deleteSubscriberWithID($subscriberID);
-				$PersistentConnections{$subscriberID}=$self;
+			if ($persist) {
+				# New persistent connection: kill any existing connection with same ID
+				$self->deleteSubscriberWithID($self->{'subscriberID'});
+				# Add new persistent connection to collection
+				$PersistentConnections{$self->{'subscriberID'}}=$self;
+			} else {
+				$::Pollers->{$self->{'subscriberID'}} = time;
 			}
 			
-			if(scalar(keys %{$channels}))
-			{
+			if(scalar(keys %{$channels})) {
+
+				$self->{'channelinfo'} = '';
+				my $citemplate = $self->getConf('ChannelInfoTemplate');
+				foreach $channelName (keys %{$channels}) {
+					my $channel=Meteor::Channel->channelWithName($channelName);
+					$self->{'channels'}->{$channelName}=$channel;
+					if (defined($self->{'channels'}->{$channelName}->{'startIndex'}) && $self->{'channels'}->{$channelName}->{'startIndex'} > 0) {
+						$self->{'channelinfo'} .= $channel->descriptionWithTemplate($citemplate);
+					}
+				}
 				$self->emitOKHeader();
-				$self->setChannels($channels,$persist,$self->{'mode'},'');
-				$self->close(1) unless($persist);
+				foreach $channelName (keys %{$channels}) {
+					my $startIndex=$channels->{$channelName}->{'startIndex'};
+					$self->{'channels'}->{$channelName}->addSubscriber($self,$startIndex,$persist,$self->{'mode'},$self->{'useragent'});
+				}
+				delete ($self->{'channels'}) unless($persist);
+				$self->close(1, 'responseComplete') unless($persist);
+				$self->close(1, 'closedOnEvent') unless($self->{'messageCount'} == 0);
+				delete($self->{'headerBuffer'});
 				return;
 			}
 		}
@@ -184,13 +212,13 @@
 		{
 			$self->deleteSubscriberWithID($1);
 			$self->emitOKHeader();
-			$self->close(1);
+			$self->close(1, 'disconnectRequested');
 			return;
 		}
 		elsif($self->{'headerBuffer'}=~/GET\s+([^\s\?]+)/)
 		{
 			Meteor::Document->serveFileToClient($1,$self);
-			$self->close(1);
+			$self->close(1, 'responseComplete');
 			return;
 		}
 		
@@ -201,25 +229,6 @@
 	}
 }
 
-sub setChannels {
-	my $self=shift;
-	my $channels=shift;
-	my $persist=shift;
-	my $mode=shift || '';
-	my $userAgent=shift || '';
-	
-	foreach my $channelName (keys %{$channels})
-	{
-		my $startIndex=$channels->{$channelName}->{'startIndex'};
-		
-		my $channel=Meteor::Channel->channelWithName($channelName);
-		
-		$self->{'channels'}->{$channelName}=$channel if($persist);
-		
-		$channel->addSubscriber($self,$startIndex,$persist,$mode,$userAgent);
-	}
-}
-
 sub emitOKHeader {
 	my $self=shift;
 	
@@ -233,7 +242,7 @@
 	$::Statistics->{'errors_served'}++;
 	
 	# close up shop here!
-	$self->close();
+	$self->close(0, 'error');
 }
 
 sub emitHeader {
@@ -243,28 +252,17 @@
 	my $header=$self->getConf('HeaderTemplate');
 	
 	$header=~s/~([^~]*)~/
-		if(!defined($1) || $1 eq '')
-		{
+		if(!defined($1) || $1 eq '') {
 			'~';
-		}
-		elsif($1 eq 'server')
-		{
+		} elsif($1 eq 'server') {
 			$::PGM;
-		}
-		elsif($1 eq 'status')
-		{
+		} elsif($1 eq 'status') {
 			$status;
-		}
-		elsif($1 eq 'servertime')
-		{
+		} elsif($1 eq 'servertime') {
 			time;
-		}
-		elsif($1 eq 'channelinfo')
-		{
-			Meteor::Channel->listChannelsUsingTemplate($self->getConf('ChannelInfoTemplate'));
-		}
-		else
-		{
+		} elsif($1 eq 'channelinfo') {
+			$self->{'channelinfo'};
+		} else {
 			'';
 		}
 	/gex;
@@ -276,7 +274,7 @@
 	my $self=shift;
 	
 	my $numMessages=0;
-	my $msgTemplate=$self->getConf('Messagetemplate');
+	my $msgTemplate=$self->getConf('MessageTemplate');
 	my $msgData='';
 	
 	foreach my $message (@_)
@@ -291,21 +289,15 @@
 	
 	$::Statistics->{'messages_served'}+=$numMessages;
 	
-	my $msgCount=$self->{'MessageCount'};
+	my $msgCount=$self->{'messageCount'};
 	$msgCount+=$numMessages;
-	$self->{'MessageCount'}=$msgCount;
+	$self->{'messageCount'}=$msgCount;
 	
-	my $maxMsg=$self->getConf('MaxMessages');
-	if(defined($maxMsg) && $maxMsg>0 && $msgCount>=$maxMsg)
-	{
-		$self->close(1);
-	}
-	
-	if($self->{'MaxMessageCount'}>0 && $msgCount>=$self->{'MaxMessageCount'})
-	{
-		$self->close(1);
+	# If long polling, close connection, as a message has now been sent.
+	# Don't close if still processing the header (we may be sending a backlog from multiple channels)
+	if($self->getConf('CloseOnEvent') && !exists($self->{'headerBuffer'})) {
+		$self->close(1, 'closedOnEvent');
 	}
-	
 }
 
 sub ping {
@@ -326,29 +318,31 @@
 	
 	delete($self->{'channels'}->{$channelName});
 	
-	$self->close(0,'channelsClosed') if(scalar(keys %{$self->{'channels'}})==0);
+	$self->close(0,'channelClose') if(scalar(keys %{$self->{'channels'}})==0);
 }
 
 sub close {
 	my $self=shift;
 	my $noShutdownMsg=shift;
+	my $reason=shift;
 	
 	foreach my $channelName (keys %{$self->{'channels'}})
 	{
 		my $channel=$self->{'channels'}->{$channelName};
-		$channel->removeSubscriber($self,'subscriberClose');
+		$channel->removeSubscriber($self,$reason);
 	}
 	delete($self->{'channels'});
 	
-	if(exists($self->{'subscriberID'}))
-	{
+	# If this connection is in the PersistentConnections array, delete it, then anonymise 
+	# it so that if we have to wait for the write buffer to empty before close, it's only
+	# removed once.
+	if(exists($self->{'subscriberID'})) {
 		delete($PersistentConnections{$self->{'subscriberID'}});
+		delete($self->{'subscriberID'});
 	}
 	
-	#
 	# Send shutdown message unless remote closed or
 	# connection not yet established
-	#
 	unless($noShutdownMsg || $self->{'remoteClosed'} || exists($self->{'headerBuffer'}))
 	{
 		my $msg=$self->getConf('SubscriberShutdownMsg');
@@ -357,7 +351,13 @@
 			$self->write($msg);
 		}
 	}
-	
+
+	my $fmsg=$self->getConf('FooterTemplate');
+	if(defined($fmsg) && $fmsg ne '')
+	{
+		$self->write($fmsg);
+	}
+
 	$self->SUPER::close();
 }
 
@@ -370,7 +370,7 @@
 	my $self=shift;
 	my $time=shift;
 	
-	$self->close(1) if(exists($self->{'ConnectionTimeLimit'}) && $self->{'ConnectionTimeLimit'}<$time);
+	$self->close(1,'maxTime') if(exists($self->{'connectionTimeLimit'}) && $self->{'connectionTimeLimit'}<$time);
 }
 
 sub getConf {
@@ -379,9 +379,11 @@
 	
 	if(exists($self->{'mode'}) && $self->{'mode'} ne '')
 	{
-		my $k=$key.'.'.$self->{'mode'};
+		my $k=$key.$self->{'mode'};
 		
-		return $::CONF{$k} if(exists($::CONF{$k}));
+		if(exists($::CONF{$k})) {
+			return $::CONF{$k};
+		}
 	}
 	
 	$::CONF{$key};