X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=loop.pl;h=b0e430055b5cebe676ea338e091255938619502a;hb=ff9c8c8ded1b0ef402d75d968c07c15d6c4cbe1a;hp=30bea05397d4b20a234a2db2a34e1cf8c748b2fa;hpb=79f2d3bd97c7a231531c3ebc562992bf3a647e16;p=dweather.git diff --git a/loop.pl b/loop.pl index 30bea05..b0e4300 100755 --- a/loop.pl +++ b/loop.pl @@ -13,6 +13,9 @@ 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; @@ -30,8 +33,11 @@ my $state = "ready"; my $buf; my $dbg; my $ser; # the serial port Mojo::IOLoop::Stream +my $last_min_h; +my $last_hour_h; our $json = JSON->new->canonical(1); +our $WS = {}; # websocket connections our $ld = {}; @@ -88,42 +94,54 @@ $SIG{TERM} = $SIG{INT} = sub {++$ending; 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}; + + # send the last 24 hour's worth of data to the graph + my $lg = SMGLog->new('day'); + my $tnow = time; + my $dayno = int($tnow/86400); + send_history($c, $lg, $tnow, $_) for ($dayno-1, $dayno); + + # 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,6 +152,8 @@ dbg '***'; dbg "*** starting $0"; dbg '***'; +read_ld(); + our $dlog = SMGLog->new("day"); dbg "before next tick"; Mojo::IOLoop->next_tick(sub { loop() }); @@ -142,7 +162,12 @@ app->start; dbg "after app start"; 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"; @@ -154,12 +179,6 @@ 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}); @@ -365,10 +384,21 @@ sub process my $dayno = int($ts/86400); if ($dayno > $ld->{last_day}) { $ld->{Temp_Out_Max} = $ld->{Temp_Out_Min} = $temp; + $ld->{Temp_Out_Max_T} = $ld->{Temp_Out_Min_T} = clocktime($ts, 0); $ld->{last_day} = $dayno; + write_ld(); + cycle_loop_data_files(); + } + if ($temp > $ld->{Temp_Out_Max}) { + $ld->{Temp_Out_Max} = $temp; + $ld->{Temp_Out_Max_T} = clocktime($ts, 0); + write_ld(); + } + if ($temp < $ld->{Temp_Out_Min}) { + $ld->{Temp_Out_Min} = $temp; + $ld->{Temp_Out_Min_T} = clocktime($ts, 0); + write_ld(); } - $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); @@ -383,6 +413,9 @@ sub process $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}; + $h{Temp_Out_Max_T} = $ld->{Temp_Out_Max_T}; + $h{Temp_Out_Min_T} = $ld->{Temp_Out_Min_T}; + 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}}); @@ -398,13 +431,16 @@ sub process } $ld->{last_rain_min} = $ld->{last_rain_hour} = $rain; + $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}} = (); + output_str($s, 1) if $s; write_ld(); } elsif ($ts >= $ld->{last_min} + 60) { @@ -424,12 +460,17 @@ sub process $h{Temp_Out_Max} = $ld->{Temp_Out_Max}; $h{Temp_Out_Min} = $ld->{Temp_Out_Min}; + $h{Temp_Out_Max_T} = $ld->{Temp_Out_Max_T}; + $h{Temp_Out_Min_T} = $ld->{Temp_Out_Min_T}; + $last_min_h = {%h}; $s = genstr($ts, 'm', \%h); + $ld->{lastmin_h} = $s; $ld->{last_min} = int($ts/60)*60; @{$ld->{wind_min}} = (); + output_str($s, 1) if $s; write_ld(); } else { @@ -440,8 +481,8 @@ sub process else { dbg "loop rec not changed" if isdbg 'chan'; } + output_str($s, 0) if $s; } - output_str($s) if $s; $ld->{last_h} = \%h; ++$loop_count; } else { @@ -457,18 +498,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, $let eq 'r' ? 1 : 0); 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 +542,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 +660,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 +673,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 +690,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 +703,33 @@ 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 - - - DWeather - - -

DWeather

- - - +sub send_history +{ + my $c = shift; + my $lg = shift; + my $tnow = shift; + my $dayno = shift; + if ($lg->open($dayno, 'r+')) { + while (my $l = $lg->read) { + next unless $l =~ /,"h":/; + my ($t) = $l =~ /"t":(\d+)/; + if ($t && $t >= $tnow-86400) { + $c->send($l); +# dbg "sending: $l"; + } + } + $lg->close; + } +}