speed up load by embedding initial graphs values
[dweather.git] / loop.pl
diff --git a/loop.pl b/loop.pl
index bb9582e92da6a48d2a7a5882d851eebe8703e294..1a677d52360866d28f8e247bffbf1ca7dd406e21 100755 (executable)
--- a/loop.pl
+++ b/loop.pl
@@ -15,6 +15,7 @@ use SMGLog;
 use Math::Round qw(nearest);
 use File::Copy;
 use Data::Random qw(rand_chars);
+use IO::File;
 
 use constant pi => 3.14159265358979; 
 
@@ -39,6 +40,8 @@ our $json = JSON->new->canonical(1);
 our $WS = {};                                  # websocket connections
 
 our $ld = {};
+our @last10minsr = ();
+our @last5daysh = ();
 
 our $loop_count;                               # how many LOOPs we have done, used as start indicator
 
@@ -107,7 +110,7 @@ websocket '/weather' => sub {
   # 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);
  
@@ -127,7 +130,7 @@ websocket '/weather' => sub {
   $c->on(finish => sub {
     my ($c, $code, $reason) = @_;
     app->log->debug("WebSocket closed with status $code.");
-       dbg 'webwocket closed with status $code' if isdbg 'chan';
+       dbg "websocket closed with status $code" if isdbg 'chan';
        delete $WS->{$tx};
   });
 };
@@ -145,6 +148,13 @@ dbg '***';
 dbg "*** starting $0";
 dbg '***';
 
+read_ld();
+
+my $tnow = time;
+my $dayno = int ($tnow/86400);
+@last5daysh = grab_history(SMGLog->new("day"), "h", $tnow-(86400*5), $_) for ($dayno-4, $dayno-3, $dayno-2, $dayno-1, $dayno);  
+@last10minsr = map {my ($t, $js) = split(/\s/, $_, 2); $js} grab_history(SMGLog->new("debug"), "r", $tnow-(60*3), $dayno);
+
 our $dlog = SMGLog->new("day");
 dbg "before next tick";
 Mojo::IOLoop->next_tick(sub { loop() });       
@@ -153,7 +163,9 @@ 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();
@@ -168,8 +180,6 @@ exit 0;
        
 sub loop
 {
-       read_ld();
-       
        dbg "last_min: " . scalar gmtime($ld->{last_min});
        dbg "last_hour: " . scalar gmtime($ld->{last_hour});
        
@@ -375,12 +385,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();
                }
-               $ld->{Temp_Out_Max} = $temp if $temp > $ld->{Temp_Out_Max};
-               $ld->{Temp_Out_Min} = $temp if $temp < $ld->{Temp_Out_Min};
+               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();
+               }
 
                if ($ts >= $ld->{last_hour} + 1800) {
                        $h{Pressure_Trend}    = unpack("C", substr $blk,3,1);
@@ -395,6 +414,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}});
@@ -419,6 +441,11 @@ sub process
                        @{$ld->{wind_hour}} = ();
                        @{$ld->{wind_min}} = ();
 
+                       if ($s) {
+                               output_str($s, 1);
+                               push @last5daysh, $s;
+                               shift @last5daysh if @last5daysh > 5*24;
+                       }
                        write_ld();
                        
                } elsif ($ts >= $ld->{last_min} + 60) {
@@ -438,6 +465,8 @@ 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);
@@ -446,18 +475,21 @@ sub process
                        $ld->{last_min} = int($ts/60)*60;
                        @{$ld->{wind_min}} = ();
                        
+                       output_str($s, 1) if $s;
                        write_ld();
 
                } else {
                        my $o = gen_hash_diff($ld->{last_h}, \%h);
                        if ($o) {
                                $s = genstr($ts, 'r', $o);
+                               push @last10minsr, $s;
+                               shift @last10minsr if @last10minsr > 240;
                        }
                        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 {
@@ -473,18 +505,32 @@ 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) {
@@ -503,7 +549,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;
                }
@@ -622,7 +668,7 @@ sub calc_rain
 sub read_ld
 {
        unless ($dataf) {
-               open $dataf, "+>>", $datafn or die "cannot open $datafn $!";
+               $dataf = IO::File->new("+>> $datafn") or die "cannot open $datafn $!";
                $dataf->autoflush(1);
        }
 
@@ -652,7 +698,7 @@ sub read_ld
 sub write_ld
 {
        unless ($dataf) {
-               open $dataf, "+>>", $datafn or die "cannot open $datafn $!";
+               $dataf = IO::File->new("+>> $datafn") or die "cannot open $datafn $!";
                $dataf->autoflush(1);
        }
 
@@ -666,7 +712,8 @@ sub write_ld
 
 sub cycle_loop_data_files
 {
-       close $dataf if $dataf;
+       $dataf->close if $dataf;
+       undef $dataf;
        
        rename "$datafn.oooo", "$datafn.ooooo";
        rename "$datafn.ooo", "$datafn.oooo";
@@ -675,112 +722,23 @@ sub cycle_loop_data_files
        copy $datafn, "$datafn.o";
 }
 
-__DATA__
-@@ index.html.ep
-% my $url = url_for 'weather';
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>DWeather</title>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <!-- Latest compiled and minified CSS -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
-
-    <!-- Optional theme -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css">
-
-  </head>
-  <body>
-    <center><h1>High View Weather</h1></center>
-
-
-    <script>
-       var ws;
-
-       function process(key,value) {
-               var d = document.getElementById(key);
-               if (d !== null) {
-                       d.innerHTML = value;
-               }
-       }
-
-    function traverse(o) {
-               console.log(o);
-               for (var i in o) {
-                       process(i, o[i]);  
-                       if (o[i] !== null && typeof(o[i])=="object") {
-                               traverse(o[i]);
+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;
        }
-
-
-    ws = new WebSocket('<%= $url->to_abs %>');
-    document.body.innerHTML += '<center>ws connecting to: <%= $url->to_abs %> type_of: ' + typeof(ws) + '</center><br>';
-    if (typeof(ws) === 'object') {
-               ws.onmessage = function (event) {
-                       var js = JSON.parse(event.data);
-                       if (js !== null && typeof(js) === 'object') {
-                               traverse(js);
-                       }
-               };
-               ws.onopen = function (event) {
-                       ws.send('WebSocket support works! ♥');
-               };
-       } else {
-               document.body.innerHTML += 'Webserver only works with Websocket aware browsers';
-       }
-    </script>
-
-<div id="container">
-<div id="start-template">
-<br><br>
-<table border=1 width=80% align="center">
-<tr>
-<th>Time:<td><span id="tm"> </span>
-<th>Sunrise:<td><span id="Sunrise"> </span>
-<th>Sunset:<td><span id="Sunset"> </span>
-<th>Console Volts:<td><span id="Batt_Console"> </span>
-<th>TX Battery OK:<td><span id="Batt_TX_OK"> </span>
-
-<tr>
-<th>Pressure:<td><span id="Pressure"> </span>
-<th>Trend:<td><span id="Pressure_Trend_txt"> </span>
-
-<tr>
-<th>Temperature in:<td> <span id="Temp_In"> </span> 
-<th>Humidity:<td> <span id="Humidity_In"> </span>
-
-<tr>
-<th>Temperature out:<td> <span id="Temp_Out"> </span> 
-<th>Min:<td> <span id="Temp_Out_Min"> </span> 
-<th>Max:<td> <span id="Temp_Out_Max"> </span> 
-<th>Humidity:<td> <span id="Humidity_Out"> </span> 
-<th>Dew Point:<td> <span id="Dew_Point"> </span> 
-
-<tr>
-<th>Wind Direction:<td> <span id="Dir"> </span> 
-<th>Minute Avg:<td> <span id="Dir_1m">  </span> 
-<th>Speed:<td> <span id="Wind"> </span> 
-<th>Minute Avg:<td> <span id="Wind_1m">  </span>
-
-<tr>
-<th>Rain 30mins:<td> <span id="Rain_1h"> </span>
-<th>Day:<td> <span id="Rain_Day"> </span>
-<th>24hrs:<td> <span id="Rain_24h"> </span>
-<th>Month:<td> <span id="Rain_Month"> </span>
-<th>Year:<td> <span id="Rain_Year"> </span>
-</table>
-</div>
-</div>
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-    <!-- Latest compiled and minified JavaScript -->
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
-</body>
-</html>
+       return @out;
+}