X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=loop.pl;h=02a463a7d3f1569eda6f6065b4a6cf4e1007e2ad;hb=9b87b2428a5050fb2fd2803d0d568ca916365738;hp=30bea05397d4b20a234a2db2a34e1cf8c748b2fa;hpb=79f2d3bd97c7a231531c3ebc562992bf3a647e16;p=dweather.git

diff --git a/loop.pl b/loop.pl
index 30bea05..02a463a 100755
--- a/loop.pl
+++ b/loop.pl
@@ -13,9 +13,13 @@ use JSON;
 use Debug;
 use SMGLog;
 use Math::Round qw(nearest);
+use File::Copy;
+use Data::Random qw(rand_chars);
+use IO::File;
 
 use constant pi => 3.14159265358979; 
 
+my $randomfn = '/dev/urandom';
 my $devname = "/dev/davis";
 my $datafn = ".loop_data";
 my $dataf;
@@ -29,11 +33,20 @@ my $nlcount;
 my $state = "ready";
 my $buf;
 my $dbg;
-my $ser;							# the serial port Mojo::IOLoop::Stream
+our $ser;							# the serial port Mojo::IOLoop::Stream
+our $ob;							# the Serial Port filehandle
+my $last_min_h;
+my $last_hour_h;
 
 our $json = JSON->new->canonical(1);
+our $WS = {};					# websocket connections
 
 our $ld = {};
+our @last10minsr = ();
+our @last5daysh = ();
+our $windmins = 2;				# no of minutes of wind data for the windrose
+our $histdays = 5;				# no of days of (half)hour data to search for main graph
+our $updatepermin = 60 / 2.5;	# no of updates per minute
 
 our $loop_count;				# how many LOOPs we have done, used as start indicator
 
@@ -84,46 +97,52 @@ $bar_trend{60} = "Rising Rapidly";
 
 our $ending = 0;
 
-$SIG{TERM} = $SIG{INT} = sub {++$ending; Mojo::IOLoop->stop;};
+$SIG{TERM} = $SIG{INT} = sub {$ending = 1; Mojo::IOLoop->stop;};
 $SIG{HUP} = 'IGNORE';
 
 
-get '/' => 'index';
-
 # WebSocket weather service
-websocket '/index' => sub {
+websocket '/weather' => sub {
   my $c = shift;
- 
+  my $msg = shift;
+  my $tx = $c->tx;
+
   # Opened
-  $c->app->log->debug('WebSocket opened.');
+  app->log->debug('WebSocket opened.');
   dbg 'WebSocket opened' if isdbg 'chan';
-   
-  # Increase inactivity timeout for connection a bit
-  $c->inactivity_timeout(300);
+  $WS->{$tx} = $tx; 
+
+  # send historical data
+  $c->send($ld->{lasthour_h}) if exists $ld->{lasthour_h};
+  $c->send($ld->{lastmin_h}) if exists $ld->{lastmin_h};
+
+  # disable timeout
+  $c->inactivity_timeout(3615);
  
   # Incoming message
   $c->on(
 		 message => sub {
 			 my ($c, $msg) = @_;
-			 dbg "websocket: $msg" if isdbg 'chan';
+			 dbg "websocket: text $msg" if isdbg 'chan';
 		 },
 		 json => sub {
 			 my ($c, $msg) = @_;
-			 dbg "websocket: $msg" if isdbg 'chan';
+			 dbg "websocket: json $msg" if isdbg 'chan';
 		 }
   );
  
   # Closed
   $c->on(finish => sub {
     my ($c, $code, $reason) = @_;
-    $c->app->log->debug("WebSocket closed with status $code.");
-	dbg 'WebSocket closed with status $code' if isdbg 'chan';
+    app->log->debug("WebSocket closed with status $code.");
+	dbg "websocket closed with status $code" if isdbg 'chan';
+	delete $WS->{$tx};
   });
-
-  $c->render;
-  
 };
 
+get '/' => {template => 'index'};
+
+
 dbginit();
 if (@ARGV) {
 	dbgadd(@ARGV);
@@ -134,18 +153,44 @@ dbg '***';
 dbg "*** starting $0";
 dbg '***';
 
+read_ld();
+
+my $tnow = time;
+my $dayno = int ($tnow/86400);
+for (my $i = 0-$histdays; $i < 0; ++$i ) {
+	push @last5daysh, grab_history(SMGLog->new("day"), "h", $tnow-(86400*$histdays), $dayno+$i+1); 
+}
+@last10minsr = map {my ($t, $js) = split(/\s/, $_, 2); $js} grab_history(SMGLog->new("debug"), "r", $tnow-(60*$windmins), $dayno);
+dbg sprintf("last5days = %d last10mins = %d", scalar @last5daysh, scalar @last10minsr);
+
+sysopen(R, $randomfn, 0) or die "cannot open $randomfn $!\n";
+my $rs;
+sysread(R, $rs, 8) or die "not enough randomness available\n";
+close R;
+
+app->secrets([qw(Here's something that's really seakrett), $rs]);
+
 our $dlog = SMGLog->new("day");
+$did = Mojo::IOLoop->recurring(1 => sub {$dlog->flushall});
+
 dbg "before next tick";
 Mojo::IOLoop->next_tick(sub { loop() });	
 dbg "before app start";
 app->start;
 dbg "after app start";
 
+doclose();
+
 write_ld();
-close $dataf if $dataf;
+$dataf->close if $dataf;
+undef $dataf;
+
+
+# move all the files along one 
+cycle_loop_data_files();
 
 dbg '***';
-dbg "*** ending $0";
+dbg "*** ending $0 (\$ending = $ending)";
 dbg '***';
 
 exit 0;
@@ -154,18 +199,11 @@ exit 0;
 	
 sub loop
 {
-
-	open $dataf, "+>>", $datafn or die "cannot open $datafn $!";
-	$dataf->autoflush(1);
-	
-	read_ld();
-	
 	dbg "last_min: " . scalar gmtime($ld->{last_min});
 	dbg "last_hour: " . scalar gmtime($ld->{last_hour});
 	
-	$did = Mojo::IOLoop->recurring(1 => sub {$dlog->flushall});
-	
-	do_reopen($devname);
+	$ser = doopen($devname);
+	start_loop() if $ser;
 }
 
 
@@ -209,8 +247,7 @@ sub start_loop
 	undef $tid;
 	$tid = Mojo::IOLoop->recurring(0.6 => sub {
 									   if (++$nlcount > 10) {
-										   dbg "\\n count > 10, closing connection" if isdbg 'chan';
-										   do_reopen($devname);
+										   doclose();
 										   return;
 									   }
 									   dbg "writing $nlcount \\n" if isdbg 'state'; 
@@ -225,47 +262,68 @@ sub chgstate
 	$state = $_[0];
 }
 
-sub do_reopen
-{
-	my $name = shift;
-	dbg "do reopen on '$name' ending $ending";
-	unless ($ending) {
-		$ser = do_open($name);
-		start_loop();
-		chgstate('');
-		$nlcount = 0;
-		Mojo::IOLoop->start unless Mojo::IOLoop->is_running;
-	}
-}
+my $closing;
 
-sub do_open
+sub doopen
 {
 	my $name = shift;
 
-	$ser->close if $ser;
-	undef $ser;
-
-	my $ob = Serial->new($name, 19200) || die "$name $!\n";
+    $ob = Serial->new($name, 19200) || die "$name $!\n";
 	dbg "streaming $name fileno(" . fileno($ob) . ")" if isdbg 'chan';
 	
 	my $ser = Mojo::IOLoop::Stream->new($ob);
-	$ser->on(error=>sub {dbg "serial $_[1]"; do_reopen($name) unless $ending});
-	$ser->on(close=>sub {dbg "serial closing"; do_reopen($name) unless $ending});
-	$ser->on(timeout=>sub {dbg "serial timeout";});
+	$ser->on(error=>sub {dbg "error serial $_[1]"; doclose();});
+	$ser->on(close=>sub {dbg "event close";  doclose();});
+	$ser->on(timeout=>sub {dbg "event serial timeout"; doclose();});
 	$ser->on(read=>sub {on_read(@_)});
 	$ser->start;
 
+    $rid = Mojo::IOLoop->recurring($poll_interval => sub {
+                                       start_loop() if !$state;
+                                   });
+
+	chgstate('');
+	$nlcount = 0;
+	
+	return $ser;
+}
+
+sub doclose
+{
+	return if $closing++;
+	
+	dbg "serial port closing" if $ser || $ob;
+	if ($ser) {
+		$ser->stop;
+		$ser->close;
+		undef $ser;
+	}
+	if ($ob) {
+		$ob->close();
+		undef $ob;
+	}
 	Mojo::IOLoop->remove($tid) if $tid;
 	undef $tid;
 	Mojo::IOLoop->remove($rid) if $rid;
 	undef $rid;
-	$rid = Mojo::IOLoop->recurring($poll_interval => sub {
-									   start_loop() if !$state;
-								   });
+
+    if (Mojo::IOLoop->is_running && $ending == 0) {
+		Mojo::IOLoop->delay(
+							sub {
+								my $delay = shift;
+								Mojo::IOLoop->timer(5 => $delay->begin);
+								dbg "Waiting 5 seconds before opening serial port";
+							 },
+
+							sub {
+								dbg "Opening Serial port";
+								$ser = doopen($devname);
+								$closing = 0;
+							}
+						   )->wait;
+	}
 	chgstate('');
 	$nlcount = 0;
-	
-	return $ser;
 }
 
 my @min;
@@ -290,7 +348,7 @@ sub process
 
 		# Common ones
 		$tmp = unpack("s", substr $blk,7,2) / 1000;
-		$h{Pressure} = nearest(1, in2mb($tmp));
+		$h{Pressure} = nearest(0.1, in2mb($tmp));
 
 		$tmp = unpack("s", substr $blk,9,2) / 10;
 		$h{Temp_In} = nearest(0.1, f2c($tmp));
@@ -363,12 +421,32 @@ sub process
 		my $ts = time;
 		my $s;
 		my $dayno = int($ts/86400);
+		my $writeld;
+		my $cycledata;
+		
 		if ($dayno > $ld->{last_day}) {
-			$ld->{Temp_Out_Max} = $ld->{Temp_Out_Min} = $temp;
+			$ld->{Temp_Out_Max} = $ld->{Temp_Out_Min} = $ld->{Wind_Max} = $temp;
+			$ld->{Temp_Out_Max_T} = $ld->{Temp_Out_Min_T} = $ld->{Wind_Max_T} = clocktime($ts, 0);
 			$ld->{last_day} = $dayno;
+			++$writeld;
+			++$cycledata;
+		}
+		if ($temp > $ld->{Temp_Out_Max}) {
+			$h{Temp_Out_Max} = $ld->{Temp_Out_Max} = $temp;
+			$h{Temp_Out_Max_T} = $ld->{Temp_Out_Max_T} = clocktime($ts, 0);
+			++$writeld;
+		}
+		if ($temp < $ld->{Temp_Out_Min}) {
+			$h{Temp_Out_Min} = $ld->{Temp_Out_Min} = $temp;
+			$h{Temp_Out_Min_T} = $ld->{Temp_Out_Min_T} = clocktime($ts, 0);
+			++$writeld;
+		}
+
+		if ($wind->{w} > $ld->{Wind_Max}) {
+			$h{Wind_Max} = $ld->{Wind_Max} = $wind->{w};
+			$h{Wind_Max_T} = $ld->{Wind_Max_T} = clocktime($ts, 0);
+			++$writeld;
 		}
-		$ld->{Temp_Out_Max} = $temp if $temp > $ld->{Temp_Out_Max};
-		$ld->{Temp_Out_Min} = $temp if $temp < $ld->{Temp_Out_Min};
 
 		if ($ts >= $ld->{last_hour} + 1800) {
 			$h{Pressure_Trend}    = unpack("C", substr $blk,3,1);
@@ -381,8 +459,6 @@ sub process
 			$h{Sunrise}  =~ s/(\d{2})(\d{2})/$1:$2/;
 			$h{Sunset}   = sprintf( "%04d", unpack("S", substr $blk,93,2) );
 			$h{Sunset}  =~ s/(\d{2})(\d{2})/$1:$2/;
-			$h{Temp_Out_Max} = $ld->{Temp_Out_Max};
-			$h{Temp_Out_Min} = $ld->{Temp_Out_Min};
 
 			if ($loop_count) {	# i.e not the first
 				my $a = wind_average(scalar @{$ld->{wind_hour}} ? @{$ld->{wind_hour}} : {w => $h{Wind}, d => $h{Dir}});
@@ -395,17 +471,31 @@ sub process
 				$h{Dir_1m} = nearest(1, $a->{d});
 
 				($h{Rain_1m}, $h{Rain_1h}, $h{Rain_24h}) = calc_rain($rain);
+				
 			}
 			$ld->{last_rain_min} = $ld->{last_rain_hour} = $rain;
+			$h{Temp_Out_Max} = $ld->{Temp_Out_Max};
+			$h{Temp_Out_Max_T} = $ld->{Temp_Out_Max_T};
+			$h{Temp_Out_Min} = $ld->{Temp_Out_Min};
+			$h{Temp_Out_Min_T} = $ld->{Temp_Out_Min_T};
+			$h{Wind_Max} = $ld->{Wind_Max};
+			$h{Wind_Max_T} = $ld->{Wind_Max_T};
 
+			$last_hour_h = {%h};
 			$s = genstr($ts, 'h', \%h);
+			$ld->{lasthour_h} = $s;
 			
 			$ld->{last_hour} = int($ts/1800)*1800;
 			$ld->{last_min} = int($ts/60)*60;
 			@{$ld->{wind_hour}} = ();
 			@{$ld->{wind_min}} = ();
 
-			write_ld();
+			if ($s) {
+				output_str($s, 1);
+				push @last5daysh, $s;
+				shift @last5daysh if @last5daysh > 5*24;
+			}
+			++$writeld;
 			
 		} elsif ($ts >= $ld->{last_min} + 60) {
 			my $a = wind_average(@{$ld->{wind_min}});
@@ -421,28 +511,42 @@ sub process
 				($h{Rain_1m}, $h{Rain_1h}, $h{Rain_24h}) = calc_rain($rain);
 			}
 			$ld->{last_rain_min} = $rain;
-
 			$h{Temp_Out_Max} = $ld->{Temp_Out_Max};
+			$h{Temp_Out_Max_T} = $ld->{Temp_Out_Max_T};
 			$h{Temp_Out_Min} = $ld->{Temp_Out_Min};
+			$h{Temp_Out_Min_T} = $ld->{Temp_Out_Min_T};
+			$h{Wind_Max} = $ld->{Wind_Max};
+			$h{Wind_Max_T} = $ld->{Wind_Max_T};
 
+			$last_min_h = {%h};
 			$s = genstr($ts, 'm', \%h);
+			$ld->{lastmin_h} = $s;
 			
 			$ld->{last_min} = int($ts/60)*60;
 			@{$ld->{wind_min}} = ();
 			
-			write_ld();
+			output_str($s, 1) if $s;
+			++$writeld;
 
 		} else {
 			my $o = gen_hash_diff($ld->{last_h}, \%h);
 			if ($o) {
+				$o->{Dir} ||= $h{Dir};
+				$o->{Wind} ||= $h{Wind};
+				$o->{Dir} += 0;
+				$o->{Wind} += 0;
 				$s = genstr($ts, 'r', $o);
+				push @last10minsr, $s;
+				shift @last10minsr while @last10minsr > ($windmins * $updatepermin);
 			}
 			else {
 				dbg "loop rec not changed" if isdbg 'chan';
 			}
+			output_str($s, 0) if $s;
 		}
-		output_str($s) if $s;
 		$ld->{last_h} = \%h;
+		write_ld() if $writeld;
+		cycle_loop_data_files() if $cycledata;
 		++$loop_count;
 	} else {
 		dbg "CRC check failed for LOOP data!";
@@ -457,18 +561,40 @@ sub genstr
 	my $h = shift;
 	
 	my $j =  $json->encode($h);
-	my ($sec,$min,$hr) = (gmtime $ts)[0,1,2];
-	my $tm = sprintf "%02d:%02d:%02d", $hr, $min, $sec;
-	
+	my $tm = clocktime($ts, 1);
 	return qq|{"tm":"$tm","t":$ts,"$let":$j}|;
 }
 
+sub clocktime
+{
+	my $ts = shift;
+	my $secsreq = shift;
+	my ($sec,$min,$hr) = (gmtime $ts)[0,1,2];
+	my $s;
+	if ($secsreq) {
+		$s = sprintf "%02d:%02d:%02d", $hr, $min, $sec;
+	} else {
+		$s = sprintf "%02d:%02d", $hr, $min;
+	}
+	return $s;
+}
+
 sub output_str
 {
 	my $s = shift;
+	my $logit = shift;
+	
 	dbg $s;
 #	say $s;
-	$dlog->writenow($s);
+	$dlog->writenow($s) if $logit;
+	foreach my $ws (keys $WS) {
+		my $tx = $WS->{$ws};
+		if ($tx) {
+			$tx->send($s);
+		} else {
+			delete $WS->{$tx};
+		}
+	}
 }
 
 sub gen_hash_diff
@@ -479,7 +605,7 @@ sub gen_hash_diff
 	my $count;
 
 	while (my ($k, $v) = each %$now) {
-		if ($last->{$k} ne $now->{$k}) {
+		if (!exists $last->{$k} || $last->{$k} ne $now->{$k}) {
 			$o{$k} = $v;
 			++$count;
 		}
@@ -597,7 +723,10 @@ sub calc_rain
 
 sub read_ld
 {
-	return unless $dataf;
+	unless ($dataf) {
+		$dataf = IO::File->new("+>> $datafn") or die "cannot open $datafn $!";
+		$dataf->autoflush(1);
+	}
 
 	seek $dataf, 0, 0;
 	my $s = <$dataf>;
@@ -607,12 +736,16 @@ sub read_ld
 	
 	# sort out rain stats
 	my $c;
-	if (($c = @{$ld->{rain24}}) < 24*60) {
+	if ($ld->{rain24} && ($c = @{$ld->{rain24}}) < 24*60) {
 		my $diff = 24*60 - $c;
 		unshift @{$ld->{rain24}}, 0 for 0 .. $diff;  
 	}
 	my $rain;
-	$rain += $_ for @{$ld->{rain24}};
+	
+	if ($ld->{rain24}) {
+		$rain += $_ for @{$ld->{rain24}};
+	}
+	
 	$ld->{rain_24} = nearest(0.1, $rain);
 	delete $ld->{hour};
 	delete $ld->{min};
@@ -620,8 +753,11 @@ sub read_ld
 
 sub write_ld
 {
-	return unless $dataf;
-	
+	unless ($dataf) {
+		$dataf = IO::File->new("+>> $datafn") or die "cannot open $datafn $!";
+		$dataf->autoflush(1);
+	}
+
 	seek $dataf, 0, 0;
 	truncate $dataf, 0;
 	$ld->{ts} = time;
@@ -630,41 +766,35 @@ sub write_ld
 	print $dataf "$s\n";
 }
 
+sub cycle_loop_data_files
+{
+	$dataf->close if $dataf;
+	undef $dataf;
+	
+	rename "$datafn.oooo", "$datafn.ooooo";
+	rename "$datafn.ooo", "$datafn.oooo";
+	rename "$datafn.oo", "$datafn.ooo";
+	rename "$datafn.o", "$datafn.oo";
+	copy $datafn, "$datafn.o";
+}
 
-__DATA__
- 
-@@ index.html.ep
-<!DOCTYPE html>
-<html>
-  <head><title>DWeather</title></head>
-  <body>
-    <script>
-      var ws;
-      if ("WebSocket" in window) {
-        ws = new WebSocket('<%= url_for('index')->to_abs %>');
-		//ws = new WebSocket();
-      }
-      if(typeof(ws) !== 'undefined') {
-        ws.onmessage = function (event) {
-          document.body.innerHTML += JSON.parse(event.data).test;
-        };
-        ws.onopen = function (event) {
-          ws.send(JSON.stringify({weather: 'WebSocket support works! ♥'}));
-        };
-      }
-      else {
-        document.body.innerHTML += 'Browser does not support WebSockets.';
-      }
-
-      var ws = new WebSocket('<%= url_for('weather')->to_abs %>');
- 
-      // Incoming messages
-      ws.onmessage = function(event) {
-        document.body.innerHTML += event.data + '<br/>';
-      };
- 
-    </script>
-	<h1>DWeather</h1>
-
-  </body>
-</html>
+sub grab_history
+{
+	my $lg = shift;
+	my $let = shift;
+	my $start = shift || time - 86400;
+	my $dayno = shift;
+	my @out;
+	
+	if ($lg->open($dayno, 'r+')) {
+		while (my $l = $lg->read) {
+			next unless $l =~ /,"$let":/;
+			my ($t) = $l =~ /"t":(\d+)/;
+			if ($t && $t >= $start) {
+				push @out, $l;
+			}
+		}
+		$lg->close;
+	}
+	return @out;
+}