]> scm.dxcluster.org Git - dweather.git/commitdiff
get to a nearly working basic webapp
authorDirk Koopman <djk@tobit.co.uk>
Sun, 28 Dec 2014 19:57:23 +0000 (19:57 +0000)
committerDirk Koopman <djk@tobit.co.uk>
Sun, 28 Dec 2014 19:57:23 +0000 (19:57 +0000)
loop.pl

diff --git a/loop.pl b/loop.pl
index 12e60a81d6a64fd7a1740ecf7ac43fb239aa6408..21c436da257cd8614a0c7c46d0e0a907b428828b 100755 (executable)
--- a/loop.pl
+++ b/loop.pl
@@ -3,9 +3,11 @@ use strict;
 
 use v5.10.1;
 
+use Mojolicious::Lite;
 use Serial;
 use Mojo::IOLoop;
 use Mojo::IOLoop::Stream;
+use Mojo::Transaction::WebSocket;
 #use Mojo::JSON  qw(decode_json encode_json);
 use JSON;
 use Debug;
@@ -15,6 +17,10 @@ use Math::Round qw(nearest);
 use constant pi => 3.14159265358979; 
 
 my $devname = "/dev/davis";
+my $datafn = ".loop_data";
+my $dataf;
+
+my $poll_interval = 2.5;
 my $rain_mult = 0.2;                           # 0.1 or 0.2 mm or 0.01 inches
 my $tid;
 my $rid;
@@ -23,19 +29,11 @@ my $nlcount;
 my $state = "ready";
 my $buf;
 my $dbg;
-my $last_reading;
 my $ser;                                                       # the serial port Mojo::IOLoop::Stream
-our $ending = 0;
 
 our $json = JSON->new->canonical(1);
 
-our $last_min = int(time/60)*60;
-our $last_hour = 0;
-our $last_rain_hour;
-our $last_rain_min;
-our $last_rain;
-our @rain24;
-our $rain24;
+our $ld = {};
 
 our $loop_count;                               # how many LOOPs we have done, used as start indicator
 
@@ -89,6 +87,43 @@ our $ending = 0;
 $SIG{TERM} = $SIG{INT} = sub {++$ending; Mojo::IOLoop->stop;};
 $SIG{HUP} = 'IGNORE';
 
+
+get '/' => 'index';
+
+# WebSocket weather service
+websocket '/index' => sub {
+  my $c = shift;
+  # Opened
+  $c->app->log->debug('WebSocket opened.');
+  dbg 'WebSocket opened' if isdbg 'chan';
+   
+  # Increase inactivity timeout for connection a bit
+  $c->inactivity_timeout(300);
+  # Incoming message
+  $c->on(
+                message => sub {
+                        my ($c, $msg) = @_;
+                        dbg "websocket: $msg" if isdbg 'chan';
+                },
+                json => sub {
+                        my ($c, $msg) = @_;
+                        dbg "websocket: $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';
+  });
+
+  $c->render;
+  
+};
+
 dbginit();
 if (@ARGV) {
        dbgadd(@ARGV);
@@ -99,13 +134,15 @@ dbg '***';
 dbg "*** starting $0";
 dbg '***';
 
-dbg scalar gmtime($last_min);
-dbg scalar gmtime($last_hour);
-
-my $dlog = SMGLog->new("day");
-$did = Mojo::IOLoop->recurring(1 => sub {$dlog->flushall});
+our $dlog = SMGLog->new("day");
+dbg "before next tick";
+Mojo::IOLoop->next_tick(sub { loop() });       
+dbg "before app start";
+app->start;
+dbg "after app start";
 
-do_reopen($devname);
+write_ld();
+close $dataf if $dataf;
 
 dbg '***';
 dbg "*** ending $0";
@@ -113,6 +150,26 @@ dbg '***';
 
 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);
+}
+
+
+
 sub on_read
 {
        my ($ser, $d) = @_;
@@ -202,7 +259,7 @@ sub do_open
        undef $tid;
        Mojo::IOLoop->remove($rid) if $rid;
        undef $rid;
-       $rid = Mojo::IOLoop->recurring(2.5 => sub {
+       $rid = Mojo::IOLoop->recurring($poll_interval => sub {
                                                                           start_loop() if !$state;
                                                                   });
        chgstate('');
@@ -245,7 +302,7 @@ sub process
                $h{Dir}     = unpack("s", substr $blk,16,2)+0;
 
                my $wind = {w => $h{Wind}, d => $h{Dir}};
-               push @min, $wind;
+               push @{$ld->{wind_min}}, $wind;
 
                $h{Humidity_Out} = unpack("C", substr $blk,33,1)+0;
                $h{Humidity_In}  = unpack("C", substr $blk,11,1)+0;
@@ -257,8 +314,8 @@ sub process
 
                #       $h{Rain_Rate}  = nearest(0.1,unpack("s", substr $blk,41,2) * $rain_mult);
                $rain = $h{Rain_Day}   = nearest(0.1, unpack("s", substr $blk,50,2) * $rain_mult);
-               my $delta_rain = $h{Rain} = nearest(0.1, ($rain >= $last_rain ? $rain - $last_rain : $rain)) if $loop_count;
-               $last_rain = $rain;
+               my $delta_rain = $h{Rain} = nearest(0.1, ($rain >= $ld->{last_rain} ? $rain - $ld->{last_rain} : $rain)) if $loop_count;
+               $ld->{last_rain} = $rain;
 
                # what sort of packet is it?
                my $sort =  unpack("C", substr $blk,4,1);
@@ -288,7 +345,7 @@ sub process
 
                my $ts = time;
                my $s;
-               if ($ts >= $last_hour + 3600) {
+               if ($ts >= $ld->{last_hour} + 3600) {
                        $h{Pressure_Trend}    = unpack("C", substr $blk,3,1);
                        $h{Pressure_Trend_txt} = $bar_trend{$h{Pressure_Trend}};
                        $h{Batt_TX_OK}  = (unpack("C", substr $blk,86,1)+0) ^ 1;
@@ -301,30 +358,33 @@ sub process
                        $h{Sunset}  =~ s/(\d{2})(\d{2})/$1:$2/;
 
                        if ($loop_count) {      # i.e not the first
-                               my $a = wind_average(scalar @hour ? @hour : {w => $h{Wind}, d => $h{Dir}});
+                               my $a = wind_average(scalar @{$ld->{wind_hour}} ? @{$ld->{wind_hour}} : {w => $h{Wind}, d => $h{Dir}});
 
                                $h{Wind_1h} = nearest(0.1, $a->{w});
                                $h{Dir_1h} = nearest(0.1, $a->{d});
 
-                               $a = wind_average(@min);
+                               $a = wind_average(@{$ld->{wind_min}});
                                $h{Wind_1m} = nearest(0.1, $a->{w});
                                $h{Dir_1m} = nearest(1, $a->{d});
 
                                ($h{Rain_1m}, $h{Rain_1h}, $h{Rain_24h}) = calc_rain($rain);
                        }
-                       $last_rain_min = $last_rain_hour = $rain;
+                       $ld->{last_rain_min} = $ld->{last_rain_hour} = $rain;
 
                        $s = genstr($ts, 'h', \%h);
                        
-                       $last_hour = int($ts/3600)*3600;
-                       $last_min = int($ts/60)*60;
-                       @hour = ();
-                       @min = ();
-               } elsif ($ts >= $last_min + 60) {
-                       my $a = wind_average(@min);
+                       $ld->{last_hour} = int($ts/3600)*3600;
+                       $ld->{last_min} = int($ts/60)*60;
+                       @{$ld->{wind_hour}} = ();
+                       @{$ld->{wind_min}} = ();
+
+                       write_ld();
+                       
+               } elsif ($ts >= $ld->{last_min} + 60) {
+                       my $a = wind_average(@{$ld->{wind_min}});
                        my %save;
 
-                       push @hour, $a;
+                       push @{$ld->{wind_hour}}, $a;
 
                        if ($loop_count) {      # i.e not the first
                                my $rm;
@@ -333,14 +393,17 @@ sub process
                                $h{Dir_1m} = nearest(1, $a->{d});
                                ($h{Rain_1m}, $h{Rain_1h}, $h{Rain_24h}) = calc_rain($rain);
                        }
-                       $last_rain_min = $rain;
+                       $ld->{last_rain_min} = $rain;
 
                        $s = genstr($ts, 'm', \%h);
                        
-                       $last_min = int($ts/60)*60;
-                       @min = ();
+                       $ld->{last_min} = int($ts/60)*60;
+                       @{$ld->{wind_min}} = ();
+                       
+                       write_ld();
+
                } else {
-                       my $o = gen_hash_diff($last_reading, \%h);
+                       my $o = gen_hash_diff($ld->{last_h}, \%h);
                        if ($o) {
                                $s = genstr($ts, 'r', $o);
                        }
@@ -349,7 +412,7 @@ sub process
                        }
                }
                output_str($s) if $s;
-               $last_reading = \%h;
+               $ld->{last_h} = \%h;
                ++$loop_count;
        } else {
                dbg "CRC check failed for LOOP data!";
@@ -467,7 +530,7 @@ sub wind_average
 
        my $avhdg = r2d(atan2($sindir, $cosdir));
        $avhdg += 360 if $avhdg < 0; 
-       return {w => $wind / $count, d => $avhdg};
+       return {w => nearest(0.1,$wind / $count), d => nearest(0.1,$avhdg)};
 }
 
 # radians to degrees
@@ -488,14 +551,90 @@ sub calc_rain
 {
        my $rain = shift;
        
-       my $Rain_1h = nearest(0.1, $rain >= $last_rain_hour ? $rain - $last_rain_hour : $rain); # this is the rate for this hour, so far
-       my $rm = $rain >= $last_rain_min ? $rain - $last_rain_min : $rain;
+       $ld->{rain24} ||= [];
+       
+       my $Rain_1h = nearest(0.1, $rain >= $ld->{last_rain_hour} ? $rain - $ld->{last_rain_hour} : $rain); # this is the rate for this hour, so far
+       my $rm = $rain >= $ld->{last_rain_min} ? $rain - $ld->{last_rain_min} : $rain;
        my $Rain_1m = nearest(0.1, $rm);
-       push @rain24, $rm;
-       $rain24 += $rm;
-       while (@rain24 > 24*60) {
-               $rain24 -= shift @rain24;
+       push @{$ld->{rain24}}, $Rain_1m;
+       $ld->{rain_24} += $rm;
+       while (@{$ld->{rain24}} > 24*60) {
+               $ld->{rain_24} -= shift @{$ld->{rain24}};
        }
-       my $Rain_24h = nearest(0.1, $rain24);
+       my $Rain_24h = nearest(0.1, $ld->{rain_24});
        return ($Rain_1m, $Rain_1h, $Rain_24h);
 }
+
+sub read_ld
+{
+       return unless $dataf;
+
+       seek $dataf, 0, 0;
+       my $s = <$dataf>;
+       chomp $s;
+       dbg "read loop data: $s" if isdbg 'json';
+       $ld = $json->decode($s) if length $s;
+       
+       # sort out rain stats
+       my $c;
+       if (($c = @{$ld->{rain24}}) < 24*60) {
+               my $diff = 24*60 - $c;
+               unshift @{$ld->{rain24}}, 0 for 0 .. $diff;  
+       }
+       my $rain;
+       $rain += $_ for @{$ld->{rain24}};
+       $ld->{rain_24} = nearest(0.1, $rain);
+       delete $ld->{hour};
+       delete $ld->{min};
+}
+
+sub write_ld
+{
+       return unless $dataf;
+       
+       seek $dataf, 0, 0;
+       truncate $dataf, 0;
+       $ld->{ts} = time;
+       my $s = $json->encode($ld);
+       dbg "write loop data: $s" if isdbg 'json';
+       print $dataf "$s\n";
+}
+
+
+__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>