From 66c45d102cd184ee7d78da4394a4fcfc4dab1f86 Mon Sep 17 00:00:00 2001 From: dakkar Date: Sun, 3 Dec 2023 16:28:36 +0000 Subject: we can use the new weather api --- lib/WebService/ForecastIo.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/WebService/ForecastIo.pm') diff --git a/lib/WebService/ForecastIo.pm b/lib/WebService/ForecastIo.pm index c329ad0..84f9867 100644 --- a/lib/WebService/ForecastIo.pm +++ b/lib/WebService/ForecastIo.pm @@ -13,7 +13,7 @@ use namespace::autoclean; has base_uri => ( is => 'ro', isa => Uri, - default => 'https://api.forecast.io/forecast', + default => 'https://api.pirateweather.net/forecast', coerce => Uri->coercion, ); -- cgit v1.2.3 From 8bd30555a18dcab02dc95ea8b3701cdc7adbabb6 Mon Sep 17 00:00:00 2001 From: dakkar Date: Sat, 9 Dec 2023 13:10:17 +0000 Subject: new bus api --- cpanfile | 4 +- driver-async.pl | 2 + forecast.html.tt | 8 +-- lib/HomePanel/Driver.pm | 14 +--- lib/Types/DateTime.pm | 20 ------ lib/Types/URI.pm | 15 ----- lib/WebService/ForecastIo.pm | 4 +- lib/WebService/ForecastIo/DataPoint.pm | 6 +- lib/WebService/ForecastIo/DataSpan.pm | 10 +-- lib/WebService/TFL/Bus.pm | 23 ++++--- lib/WebService/TFL/Bus/Fields.pm | 77 ---------------------- lib/WebService/TFL/Bus/Prediction.pm | 26 ++++++++ lib/WebService/TFL/Bus/Request.pm | 38 ----------- lib/WebService/TFL/Bus/Response.pm | 59 ++++------------- lib/WebService/TFL/Bus/Response/BaseVersion.pm | 15 ----- lib/WebService/TFL/Bus/Response/FlexibleMessage.pm | 7 -- lib/WebService/TFL/Bus/Response/Prediction.pm | 7 -- lib/WebService/TFL/Bus/Response/Stop.pm | 7 -- lib/WebService/TFL/Bus/Response/URAVersion.pm | 17 ----- lib/WebService/TFL/Bus/ResponseTypeRole.pm | 38 ----------- lib/WebService/TFL/Bus/Types.pm | 14 ---- 21 files changed, 74 insertions(+), 337 deletions(-) delete mode 100644 lib/Types/DateTime.pm delete mode 100644 lib/Types/URI.pm delete mode 100644 lib/WebService/TFL/Bus/Fields.pm create mode 100644 lib/WebService/TFL/Bus/Prediction.pm delete mode 100644 lib/WebService/TFL/Bus/Request.pm delete mode 100644 lib/WebService/TFL/Bus/Response/BaseVersion.pm delete mode 100644 lib/WebService/TFL/Bus/Response/FlexibleMessage.pm delete mode 100644 lib/WebService/TFL/Bus/Response/Prediction.pm delete mode 100644 lib/WebService/TFL/Bus/Response/Stop.pm delete mode 100644 lib/WebService/TFL/Bus/Response/URAVersion.pm delete mode 100644 lib/WebService/TFL/Bus/ResponseTypeRole.pm delete mode 100644 lib/WebService/TFL/Bus/Types.pm (limited to 'lib/WebService/ForecastIo.pm') diff --git a/cpanfile b/cpanfile index f5e5350..8f5e3b5 100644 --- a/cpanfile +++ b/cpanfile @@ -1,4 +1,4 @@ -requires perl => "5.014"; +requires perl => "5.036"; requires "Class::Load"; requires "Config::Any"; requires "Config::General"; @@ -33,5 +33,3 @@ requires "Types::Standard"; requires "Types::URI"; requires "Type::Utils"; requires "URI"; -requires "XML::LibXML"; -requires "XML::LibXML::XPathContext"; diff --git a/driver-async.pl b/driver-async.pl index 0d8e86a..c074201 100755 --- a/driver-async.pl +++ b/driver-async.pl @@ -2,6 +2,7 @@ use strict; use warnings; use 5.014; +use lib 'local/lib/perl5'; use lib 'lib'; use HomePanel::Driver; use Path::Tiny; @@ -18,6 +19,7 @@ my $hp = HomePanel::Driver->new({ template_file => ($config{template} || path(__FILE__)->parent->child('forecast.html.tt')), output_file => ($config{output_file} || path(__FILE__)->parent->child('forecast.html')), forecast_key => $config{forecast_key}, + bus_stop_id => $config{bus_stop_id}, }); $hp->start; diff --git a/forecast.html.tt b/forecast.html.tt index 0decb3b..5397000 100644 --- a/forecast.html.tt +++ b/forecast.html.tt @@ -150,11 +150,11 @@ LineDestinationWhen - [% FOREACH p IN b.Prediction %] + [% FOREACH p IN b.predictions %] - [% p.LineName %] - [% p.DestinationText %] - [% minsec_until(p.EstimatedTime) %] + [% p.lineName %] + [% p.towards %] + [% minsec_until(p.expectedArrival) %] [% END %] diff --git a/lib/HomePanel/Driver.pm b/lib/HomePanel/Driver.pm index f5a253d..8b6c755 100644 --- a/lib/HomePanel/Driver.pm +++ b/lib/HomePanel/Driver.pm @@ -6,7 +6,6 @@ use IO::Async::Timer::Periodic; use HomePanel::AsyncUA; use WebService::ForecastIo; use WebService::TFL::Bus; -use WebService::TFL::Bus::Request; use WebService::TFL::TubeStatus; use HomePanel::Render; use Types::Path::Tiny qw(AbsFile AbsPath); @@ -63,16 +62,7 @@ sub forecast_timer_cb { ); } -has bus_request => ( - is => 'ro', - default => sub { - WebService::TFL::Bus::Request->new({ - StopPointName => 'Hotspur Road', - #Towards => 'Islip Manor', - ReturnList => [qw(StopID StopCode1 VisitNumber TripID VehicleID LineID LineName DirectionID DestinationText DestinationName EstimatedTime)], -}); - }, -); +has bus_stop_id => ( is => 'ro', required => 1 ); has bus_response => ( is => 'rw' ); has bus => ( is => 'lazy', @@ -94,7 +84,7 @@ sub bus_timer_cb { my ($self) = @_; $self->bus_response( $self->bus->request( - $self->bus_request + $self->bus_stop_id ) ); }; diff --git a/lib/Types/DateTime.pm b/lib/Types/DateTime.pm deleted file mode 100644 index d13f0d5..0000000 --- a/lib/Types/DateTime.pm +++ /dev/null @@ -1,20 +0,0 @@ -package Types::DateTime; -use strict; -use warnings; -use namespace::autoclean; -use Type::Library -base, -declare => 'DateTimeT'; -use Type::Utils -all; -use Types::Standard -types; - -class_type DateTimeT, { class => 'DateTime' }; -coerce DateTimeT, from Num, via { - require DateTime; - DateTime->from_epoch(epoch => $_ ); -}; -coerce DateTimeT, from Str, via { - require DateTime::Format::ISO8601; - s{([+-])(\d\d)(\d\d)\z}{$1$2:$3}; - DateTime::Format::ISO8601->new->parse_datetime($_) -}; - -1; diff --git a/lib/Types/URI.pm b/lib/Types/URI.pm deleted file mode 100644 index 0bb4ae5..0000000 --- a/lib/Types/URI.pm +++ /dev/null @@ -1,15 +0,0 @@ -package Types::URI; -use strict; -use warnings; -use namespace::autoclean; -use Type::Library -base, -declare => 'Uri'; -use Type::Utils -all; -use Types::Standard -types; - -class_type Uri, { class => 'URI' }; -coerce Uri, from Str, via { - require URI; - URI->new($_); -}; - -1; diff --git a/lib/WebService/ForecastIo.pm b/lib/WebService/ForecastIo.pm index 84f9867..6d37519 100644 --- a/lib/WebService/ForecastIo.pm +++ b/lib/WebService/ForecastIo.pm @@ -4,7 +4,7 @@ use 5.10.0; use Types::Standard -types,'slurpy'; use Type::Utils qw(duck_type enum); use Types::URI 'Uri'; -use Types::DateTime 'DateTimeT'; +use Types::DateTime -all; use Type::Params; use WebService::ForecastIo::Response; use DateTime::TimeZone; @@ -82,7 +82,7 @@ sub request { Object, Dict[ latitude => Num, longitude => Num, - time => Optional[DateTimeT], + time => Optional[DateTimeUTC], units => Optional[$units_type], exclude => Optional[ArrayRef[$block_type]], raw => Optional[Bool], diff --git a/lib/WebService/ForecastIo/DataPoint.pm b/lib/WebService/ForecastIo/DataPoint.pm index 47ef659..db9fb77 100644 --- a/lib/WebService/ForecastIo/DataPoint.pm +++ b/lib/WebService/ForecastIo/DataPoint.pm @@ -1,7 +1,7 @@ package WebService::ForecastIo::DataPoint; use Moo; use namespace::autoclean; -use Types::DateTime 'DateTimeT'; +use Types::DateTime -all; use Types::Standard -all; has [qw( time @@ -9,8 +9,8 @@ has [qw( time precipIntensityMaxTime temperatureMinTime temperatureMaxTime )] => ( is => 'ro', - isa => DateTimeT, - coerce => DateTimeT->coercion, + isa => DateTimeUTC, + coerce => 1, ); has [qw(summary icon precipType)] => ( diff --git a/lib/WebService/ForecastIo/DataSpan.pm b/lib/WebService/ForecastIo/DataSpan.pm index 4911442..930f3e5 100644 --- a/lib/WebService/ForecastIo/DataSpan.pm +++ b/lib/WebService/ForecastIo/DataSpan.pm @@ -1,20 +1,20 @@ package WebService::ForecastIo::DataSpan; use Moo; use namespace::autoclean; -use Types::DateTime 'DateTimeT'; +use Types::DateTime -all; has start_time => ( is => 'ro', - isa => DateTimeT, - coerce => DateTimeT->coercion, + isa => DateTimeUTC, + coerce => 1, required => 1, ); has stop_time => ( is => 'ro', writer => '_set_stop_time', - isa => DateTimeT, - coerce => DateTimeT->coercion, + isa => DateTimeUTC, + coerce => 1, required => 1, ); diff --git a/lib/WebService/TFL/Bus.pm b/lib/WebService/TFL/Bus.pm index 3559755..31bd9c3 100644 --- a/lib/WebService/TFL/Bus.pm +++ b/lib/WebService/TFL/Bus.pm @@ -1,9 +1,9 @@ package WebService::TFL::Bus; use Moo; -use namespace::autoclean; use Types::URI 'Uri'; use Type::Utils 'duck_type'; use WebService::TFL::Bus::Response; +use namespace::clean; has user_agent => ( isa => duck_type(['get']), @@ -21,21 +21,28 @@ has uri => ( isa => Uri, is => 'ro', coerce => Uri->coercion, - default => 'http://countdown.api.tfl.gov.uk/interfaces/ura/instant_V1', + default => 'https://api.tfl.gov.uk/StopPoint/__/Arrivals', +); + +has parser => ( + is => 'lazy', + builder => sub { JSON->new->utf8 }, ); sub request { - my ($self,$request) = @_; + my ($self,$stop_id) = @_; - my $http_response = $self->user_agent->get( - $request->request_uri($self->uri) + my $uri = $self->uri->clone; + $uri->path_segments( + map { $_ eq '__' ? $stop_id : $_ } $uri->path_segments ); + + my $http_response = $self->user_agent->get($uri); if ($http_response->is_success) { my $json = $http_response->content; - return WebService::TFL::Bus::Response->new_from_json( - $request->ReturnList, - $json + return WebService::TFL::Bus::Response->new_from_response( + $self->parser->decode($json) ); } else { diff --git a/lib/WebService/TFL/Bus/Fields.pm b/lib/WebService/TFL/Bus/Fields.pm deleted file mode 100644 index b3d555f..0000000 --- a/lib/WebService/TFL/Bus/Fields.pm +++ /dev/null @@ -1,77 +0,0 @@ -package WebService::TFL::Bus::Fields; -use strict; -use warnings; - -sub stop_return_fields { - qw( - StopPointName - StopID - StopCode1 - StopCode2 - StopPointType - Towards - Bearing - StopPointIndicator - StopPointState - Latitude - Longitude - ); -} - -sub prediction_return_fields { - stop_return_fields(), - qw( - VisitNumber - LineID - LineName - DirectionID - DestinationText - DestinationName - VehicleID - TripID - RegistrationNumber - EstimatedTime - ExpireTime - ), -} - -sub flexible_return_fields { - stop_return_fields, - qw( - MessageUUID - MessageType - MessagePriority - MessageText - StartTime - ExpireTime - ), -} - -sub query_fields { - qw( - StopAlso - Circle - StopPointName - StopID - StopCode1 - StopCode2 - StopPointType - Towards - Bearing - StopPointIndicator - StopPointState - VisitNumber - LineID - LineName - DirectionID - DestinationText - DestinationName - VehicleID - TripID - RegistrationNumber - MessageType - MessagePriority - ); -} - -1; diff --git a/lib/WebService/TFL/Bus/Prediction.pm b/lib/WebService/TFL/Bus/Prediction.pm new file mode 100644 index 0000000..670baf7 --- /dev/null +++ b/lib/WebService/TFL/Bus/Prediction.pm @@ -0,0 +1,26 @@ +package WebService::TFL::Bus::Prediction; +use Moo; +use Types::Standard -all; +use Types::DateTime -all; +use namespace::clean; + +has [qw(stationName lineName towards)] => ( + is => 'ro', + isa => Str, + required => 1, +); + +has 'expectedArrival' => ( + is => 'ro', + isa => DateTimeUTC->plus_coercions( Format['ISO8601'] ), + required => 1, + coerce => 1, +); + +sub new_from_response { + my ($class,$response_data) = @_; + + return $class->new($response_data); +} + +1; diff --git a/lib/WebService/TFL/Bus/Request.pm b/lib/WebService/TFL/Bus/Request.pm deleted file mode 100644 index dda6586..0000000 --- a/lib/WebService/TFL/Bus/Request.pm +++ /dev/null @@ -1,38 +0,0 @@ -package WebService::TFL::Bus::Request; -use Moo; -use Types::Standard -all; -use WebService::TFL::Bus::Fields; -use namespace::autoclean; - -for my $field (WebService::TFL::Bus::Fields->query_fields) { - has $field => ( - is => 'rw', - predicate => "has_$field", - ); -} - -has ReturnList => ( - is => 'rw', - isa => ArrayRef, - predicate => 'has_ReturnList', -); - -sub request_uri { - my ($self,$base_uri) = @_; - - my $uri = $base_uri->clone; - my %form; - for my $field (WebService::TFL::Bus::Fields->query_fields) { - my $pred = "has_$field"; - if ($self->$pred) { - $form{$field} = $self->$field; - } - } - if ($self->has_ReturnList) { - $form{ReturnList}=join ',',@{$self->ReturnList} - } - $uri->query_form(\%form); - return $uri; -} - -1; diff --git a/lib/WebService/TFL/Bus/Response.pm b/lib/WebService/TFL/Bus/Response.pm index e05d49d..6cba172 100644 --- a/lib/WebService/TFL/Bus/Response.pm +++ b/lib/WebService/TFL/Bus/Response.pm @@ -1,55 +1,24 @@ package WebService::TFL::Bus::Response; use Moo; -use Class::Load 'load_class'; -use Type::Utils 'class_type'; use Types::Standard -all; -use JSON; -use namespace::autoclean; +use WebService::TFL::Bus::Prediction; +use namespace::clean; -sub line_class { - "WebService::TFL::Bus::Response::$_[0]"; -} - -my %line_map = ( - 0 => 'Stop', - 1 => 'Prediction', - 2 => 'FlexibleMessage', - 3 => 'BaseVersion', - 4 => 'URAVersion', +has predictions => ( + is => 'ro', + isa => ArrayRef[InstanceOf['WebService::TFL::Bus::Prediction']], ); -for my $field (values %line_map) { - my $class = line_class($field); - load_class($class); - has $field => ( - is => 'ro', - isa => ArrayRef[class_type { class => $class }], - ); -} - -sub new_from_json { - my ($class,$return_list,$json) = @_; - - my $parser = JSON->new->utf8; - - my %return_set;@return_set{@$return_list}=(); - unless (%return_set) { - @return_set{qw(StopPointName LineName EstimatedTime)}=(); - } - my %args; - - while ($json) { - my ($array,$consumed) = $parser->decode_prefix($json); - - my $array_type = $line_map{$array->[0]}; - my $line_class = line_class($array_type); - push @{$args{$array_type}}, - $line_class->new_from_array(\%return_set,$array); - - substr($json,0,$consumed)=''; - } +sub new_from_response { + my ($class,$response_data) = @_; - return $class->new(\%args); + return $class->new({ + predictions => [ + map { WebService::TFL::Bus::Prediction->new_from_response($_) } + grep { $_->{'$type'} =~ /\bPrediction\b/ } + $response_data->@* + ], + }); } 1; diff --git a/lib/WebService/TFL/Bus/Response/BaseVersion.pm b/lib/WebService/TFL/Bus/Response/BaseVersion.pm deleted file mode 100644 index 07edbcb..0000000 --- a/lib/WebService/TFL/Bus/Response/BaseVersion.pm +++ /dev/null @@ -1,15 +0,0 @@ -package WebService::TFL::Bus::Response::BaseVersion; -use Moo; -use namespace::autoclean; - -has Version => ( - is => 'ro', -); - -sub new_from_array { - my ($class,$return_set,$array) = @_; - - return $class->new({Version => $array->[1]}); -} - -1; diff --git a/lib/WebService/TFL/Bus/Response/FlexibleMessage.pm b/lib/WebService/TFL/Bus/Response/FlexibleMessage.pm deleted file mode 100644 index 603ef6b..0000000 --- a/lib/WebService/TFL/Bus/Response/FlexibleMessage.pm +++ /dev/null @@ -1,7 +0,0 @@ -package WebService::TFL::Bus::Response::FlexibleMessage; -use Moo; -use namespace::autoclean; -use WebService::TFL::Bus::ResponseTypeRole; -with ResponseTypeRole('flexible'); - -1; diff --git a/lib/WebService/TFL/Bus/Response/Prediction.pm b/lib/WebService/TFL/Bus/Response/Prediction.pm deleted file mode 100644 index 49a4b76..0000000 --- a/lib/WebService/TFL/Bus/Response/Prediction.pm +++ /dev/null @@ -1,7 +0,0 @@ -package WebService::TFL::Bus::Response::Prediction; -use Moo; -use namespace::autoclean; -use WebService::TFL::Bus::ResponseTypeRole; -with ResponseTypeRole('prediction'); - -1; diff --git a/lib/WebService/TFL/Bus/Response/Stop.pm b/lib/WebService/TFL/Bus/Response/Stop.pm deleted file mode 100644 index 30f2f91..0000000 --- a/lib/WebService/TFL/Bus/Response/Stop.pm +++ /dev/null @@ -1,7 +0,0 @@ -package WebService::TFL::Bus::Response::Stop; -use Moo; -use namespace::autoclean; -use WebService::TFL::Bus::ResponseTypeRole; -with ResponseTypeRole('stop'); - -1; diff --git a/lib/WebService/TFL/Bus/Response/URAVersion.pm b/lib/WebService/TFL/Bus/Response/URAVersion.pm deleted file mode 100644 index fc0b41f..0000000 --- a/lib/WebService/TFL/Bus/Response/URAVersion.pm +++ /dev/null @@ -1,17 +0,0 @@ -package WebService::TFL::Bus::Response::URAVersion; -use Moo; -use namespace::autoclean; - -for my $field (qw(Version TimeStamp)) { - has $field => ( - is => 'ro', - ); -} - -sub new_from_array { - my ($class,$return_set,$array) = @_; - - return $class->new({Version => $array->[1],TimeStamp => $array->[2]}); -} - -1; diff --git a/lib/WebService/TFL/Bus/ResponseTypeRole.pm b/lib/WebService/TFL/Bus/ResponseTypeRole.pm deleted file mode 100644 index 7f48419..0000000 --- a/lib/WebService/TFL/Bus/ResponseTypeRole.pm +++ /dev/null @@ -1,38 +0,0 @@ -package WebService::TFL::Bus::ResponseTypeRole; -use Package::Variant - importing => [ 'Moo::Role'], - subs => [ 'has' ]; -use WebService::TFL::Bus::Fields; -use WebService::TFL::Bus::Types 'DateTimeMillis'; - -sub make_variant { - my ($class,$target_package,$type) = @_; - - my $method = $type . '_return_fields'; - my @fields = WebService::TFL::Bus::Fields->$method; - - for my $field (@fields) { - has $field => ( - is => 'ro', - ( $field =~ /Time$/ ? ( - isa => DateTimeMillis, - coerce => DateTimeMillis->coercion, - ) : () ), - ); - } - - install new_from_array => sub { - my ($class,$return_set,$array) = @_; - - my %args; - my $i=1; - for my $field (@fields) { - next unless exists $return_set->{$field}; - $args{$field}=$array->[$i]; - ++$i; - } - return $class->new(\%args); - } -} - -1; diff --git a/lib/WebService/TFL/Bus/Types.pm b/lib/WebService/TFL/Bus/Types.pm deleted file mode 100644 index e67fe32..0000000 --- a/lib/WebService/TFL/Bus/Types.pm +++ /dev/null @@ -1,14 +0,0 @@ -package WebService::TFL::Bus::Types; -use Type::Library -base, -declare => 'DateTimeMillis'; -use Types::Standard -all; -use Type::Utils -all; -use Types::DateTime 'DateTimeT'; -use namespace::autoclean; - -declare DateTimeMillis, as DateTimeT; -coerce DateTimeMillis, from Num, via { - require DateTime; - DateTime->from_epoch( epoch => $_ / 1000 ) -}; - -1; -- cgit v1.2.3 From 4a46c1031aa69e7ba0e309ba9692250f14dba6b8 Mon Sep 17 00:00:00 2001 From: dakkar Date: Sat, 9 Dec 2023 14:02:41 +0000 Subject: actually async --- cpanfile | 5 ++-- driver-async.pl | 2 ++ homepanel-control | 49 ------------------------------- lib/HomePanel/Driver.pm | 62 +++++++++++++++++++++------------------- lib/HomePanel/Render.pm | 1 + lib/WebService/ForecastIo.pm | 36 ++++++++--------------- lib/WebService/TFL/Bus.pm | 20 ++++++------- lib/WebService/TFL/TubeStatus.pm | 20 ++++++------- 8 files changed, 66 insertions(+), 129 deletions(-) delete mode 100755 homepanel-control (limited to 'lib/WebService/ForecastIo.pm') diff --git a/cpanfile b/cpanfile index 8f5e3b5..97ed0e9 100644 --- a/cpanfile +++ b/cpanfile @@ -3,19 +3,20 @@ requires "Class::Load"; requires "Config::Any"; requires "Config::General"; requires "curry::weak"; -requires "Daemon::Control"; requires "Data::Printer"; requires "DateTime"; requires "DateTime::Format::Duration"; requires "DateTime::Format::ISO8601"; requires "DateTime::TimeZone"; +requires "Future::AsyncAwait"; requires "IO::Async::Loop"; +requires "IO::Async::SSL"; requires "IO::Async::Timer::Periodic"; requires "JSON"; requires "LWP::UserAgent"; requires "LWP::Protocol::https"; requires "Moo"; -requires "namespace::autoclean"; +requires "namespace::clean"; requires "Net::Async::HTTP"; requires "Package::Variant"; requires "Path::Class"; diff --git a/driver-async.pl b/driver-async.pl index c074201..701a8cd 100755 --- a/driver-async.pl +++ b/driver-async.pl @@ -19,6 +19,8 @@ my $hp = HomePanel::Driver->new({ template_file => ($config{template} || path(__FILE__)->parent->child('forecast.html.tt')), output_file => ($config{output_file} || path(__FILE__)->parent->child('forecast.html')), forecast_key => $config{forecast_key}, + forecast_latitude => $config{forecast_latitude}, + forecast_longitude => $config{forecast_longitude}, bus_stop_id => $config{bus_stop_id}, }); diff --git a/homepanel-control b/homepanel-control deleted file mode 100755 index f8a20ad..0000000 --- a/homepanel-control +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env perl -use strict; -use warnings; -use Daemon::Control; -use Path::Tiny; -use Config::Any; - -my $basedir = path(__FILE__)->parent->realpath; - -my $config_file = $basedir->child('homepanel.conf'); -my $cfg_set = Config::Any->load_files({ - files => [$config_file], - use_ext => 1, -}); -my %config = map { %{(values %$_)[0]} } @$cfg_set; -my $dest_dir = path($config{output_file})->parent->realpath; -my $icons = $basedir->child('icons'); - -exit Daemon::Control->new( - init_code => <<"INIT", -if [ ! -d $dest_dir/icons ]; then - mkdir -p $dest_dir - mount -t tmpfs none $dest_dir - cp -a $icons $dest_dir/ -fi - -export PERL5LIB="/home/dakkar/.perlbrew/libs/perl-5.30.2\@HomePanel/lib/perl5" -export PATH="/home/dakkar/.perlbrew/libs/perl-5.30.2\@HomePanel/bin:/home/dakkar/perl5/perlbrew/bin:/home/dakkar/perl5/perlbrew/perls/perl-5.30.2/bin:\$PATH" -INIT - - name => "HomePanel", - lsb_sdesc => 'Home info panel', - lsb_desc => 'Show forecast, tube, bus status.', - path => path(__FILE__)->realpath, - - program => $basedir->child('driver-async.pl'), - program_args => [ $config_file ], - - user => 'dakkar', - group => 'users', - directory => $basedir, - - pid_file => $basedir->child('homepanel.pid'), - stderr_file => $basedir->child('homepanel.err'), - stdout_file => $basedir->child('homepanel.out'), - - fork => 2, - -)->run; diff --git a/lib/HomePanel/Driver.pm b/lib/HomePanel/Driver.pm index 8b6c755..ce3026a 100644 --- a/lib/HomePanel/Driver.pm +++ b/lib/HomePanel/Driver.pm @@ -1,38 +1,39 @@ package HomePanel::Driver; use Moo; -use 5.10.0; +use v5.36; use IO::Async::Loop; use IO::Async::Timer::Periodic; -use HomePanel::AsyncUA; +use Net::Async::HTTP; +use Future::AsyncAwait; use WebService::ForecastIo; use WebService::TFL::Bus; use WebService::TFL::TubeStatus; use HomePanel::Render; use Types::Path::Tiny qw(AbsFile AbsPath); use Try::Tiny; -#use Devel::Cycle; use curry::weak; -use namespace::autoclean; +use namespace::clean; +use Data::Dumper; has loop => ( is => 'lazy' ); sub _build_loop { IO::Async::Loop->new() } has user_agent => ( is => 'lazy' ); sub _build_user_agent { - #HomePanel::AsyncUA->new({loop=>$_[0]->loop}); - require LWP::UserAgent; - return LWP::UserAgent->new(timeout=>20); + my ($self) = @_; + my $ua = Net::Async::HTTP->new( + max_connections_per_host => 1, + stall_timeout => 10, + decode_content => 1, + ); + $self->loop->add($ua); + return $ua; } -has forecast_request => ( +has [qw(forecast_latitude forecast_longitude)] => ( is => 'ro', - default => sub { +{ - latitude => 51.54, - longitude => -0.37, - exclude => ['flags','sources'], - }; }, + required => 1, ); -has forecast_response => ( is => 'rw' ); has forecast_key => ( is => 'ro', required => 1, @@ -45,6 +46,7 @@ sub _build_forecast { user_agent => $self->user_agent, }); } +has forecast_response => ( is => 'rw' ); has forecast_timer => ( is => 'lazy' ); sub _build_forecast_timer { my ($self) = @_; @@ -55,15 +57,15 @@ sub _build_forecast_timer { } sub forecast_timer_cb { my ($self) = @_; - $self->forecast_response( - $self->forecast->request( - $self->forecast_request - ) - ); + + $self->forecast->request({ + latitude => $self->forecast_latitude, + longitude => $self->forecast_longitude, + exclude => ['flags','sources'], + })->then(sub { $self->forecast_response(shift) })->retain; } has bus_stop_id => ( is => 'ro', required => 1 ); -has bus_response => ( is => 'rw' ); has bus => ( is => 'lazy', ); @@ -72,6 +74,7 @@ sub _build_bus { user_agent => $_[0]->user_agent, }); } +has bus_response => ( is => 'rw' ); has bus_timer => ( is => 'lazy' ); sub _build_bus_timer { my ($self) = @_; @@ -82,11 +85,10 @@ sub _build_bus_timer { } sub bus_timer_cb { my ($self) = @_; - $self->bus_response( - $self->bus->request( - $self->bus_stop_id - ) - ); + + $self->bus->request( + $self->bus_stop_id + )->then(sub { $self->bus_response(shift) })->retain; }; has tube => ( @@ -108,9 +110,9 @@ sub _build_tube_timer { } sub tube_timer_cb { my ($self) = @_; - $self->tube_response( - $self->tube->request() - ); + + $self->tube->request( + )->then(sub { $self->tube_response(shift) })->retain; } has writer_timer => ( is => 'lazy' ); @@ -160,6 +162,8 @@ sub _build_render { sub write_page { my ($self) = @_; + return unless $self->forecast_response; + my $output = $self->render->render({ forecast => $self->forecast_response, bus => $self->bus_response, @@ -167,8 +171,6 @@ sub write_page { }); $self->output_file->spew_utf8($output); - - #find_cycle($self); } sub start { diff --git a/lib/HomePanel/Render.pm b/lib/HomePanel/Render.pm index fe165e3..34a220b 100644 --- a/lib/HomePanel/Render.pm +++ b/lib/HomePanel/Render.pm @@ -6,6 +6,7 @@ use Template::Stash::ForceUTF8; use Template; use DateTime; use DateTime::Format::Duration; +use namespace::clean; has [qw(provider stash template)] => ( is => 'lazy', diff --git a/lib/WebService/ForecastIo.pm b/lib/WebService/ForecastIo.pm index 6d37519..f3bf109 100644 --- a/lib/WebService/ForecastIo.pm +++ b/lib/WebService/ForecastIo.pm @@ -2,13 +2,13 @@ package WebService::ForecastIo; use Moo; use 5.10.0; use Types::Standard -types,'slurpy'; -use Type::Utils qw(duck_type enum); use Types::URI 'Uri'; use Types::DateTime -all; use Type::Params; +use Future::AsyncAwait; use WebService::ForecastIo::Response; use DateTime::TimeZone; -use namespace::autoclean; +use namespace::clean; has base_uri => ( is => 'ro', @@ -24,19 +24,10 @@ has api_key => ( ); has user_agent => ( - is => 'lazy', - isa => duck_type(['get']), + is => 'ro', + isa => HasMethods['do_request'], + required => 1, ); -sub _build_user_agent { - require LWP::UserAgent; - my $agent = LWP::UserAgent->new( - agent => __PACKAGE__ . ' version ' . ($WebService::ForecastIo::VERSION // 'devel' ), - env_proxy => 1, - keep_alive => 1, - ); - $agent->default_header( 'Accept-Encoding' => 'gzip' ); - return $agent; -} sub _make_request_uri { my ($self,$opts) = @_; @@ -74,10 +65,10 @@ sub _make_request_uri { return $req_uri; } -my $units_type = enum [qw(us si ca uk auto)]; -my $block_type = enum [qw(currently minutely hourly daily alerts flags sources)]; +my $units_type = Enum [qw(us si ca uk auto)]; +my $block_type = Enum [qw(currently minutely hourly daily alerts flags sources)]; -sub request { +async sub request { state $argcheck = compile( Object, Dict[ latitude => Num, @@ -85,25 +76,22 @@ sub request { time => Optional[DateTimeUTC], units => Optional[$units_type], exclude => Optional[ArrayRef[$block_type]], - raw => Optional[Bool], ], ); my ($self,$opts) = $argcheck->(@_); $opts->{units} //= 'si'; $opts->{exclude} //= []; - $opts->{raw} //= 0; my $uri = $self->_make_request_uri({%$opts}); - my $response = $self->user_agent->get($uri); + my $response = await $self->user_agent->do_request(uri => $uri); + if ($response->is_success) { my $json = $response->decoded_content; - return $json if $opts->{raw}; - my $res = WebService::ForecastIo::Response->new($json); - return wantarray ? ($res,$json) : $res + return WebService::ForecastIo::Response->new($json); } else { - die $response->status_line + die $response->status_line; } } diff --git a/lib/WebService/TFL/Bus.pm b/lib/WebService/TFL/Bus.pm index 31bd9c3..8f43c0f 100644 --- a/lib/WebService/TFL/Bus.pm +++ b/lib/WebService/TFL/Bus.pm @@ -1,21 +1,16 @@ package WebService::TFL::Bus; use Moo; use Types::URI 'Uri'; -use Type::Utils 'duck_type'; +use Types::Standard -types; +use Future::AsyncAwait; use WebService::TFL::Bus::Response; use namespace::clean; has user_agent => ( - isa => duck_type(['get']), - is => 'lazy', - + isa => HasMethods['do_request'], + is => 'ro', + required => 1, ); -sub _build_user_agent { - require LWP::UserAgent; - my $ua = LWP::UserAgent->new(); - $ua->env_proxy; - return $ua; -} has uri => ( isa => Uri, @@ -29,7 +24,7 @@ has parser => ( builder => sub { JSON->new->utf8 }, ); -sub request { +async sub request { my ($self,$stop_id) = @_; my $uri = $self->uri->clone; @@ -37,7 +32,8 @@ sub request { map { $_ eq '__' ? $stop_id : $_ } $uri->path_segments ); - my $http_response = $self->user_agent->get($uri); + my $http_response = await $self->user_agent->do_request(uri => $uri); + if ($http_response->is_success) { my $json = $http_response->content; diff --git a/lib/WebService/TFL/TubeStatus.pm b/lib/WebService/TFL/TubeStatus.pm index 4166a79..52d573d 100644 --- a/lib/WebService/TFL/TubeStatus.pm +++ b/lib/WebService/TFL/TubeStatus.pm @@ -1,20 +1,16 @@ package WebService::TFL::TubeStatus; use Moo; -use Type::Utils 'duck_type'; use Types::URI 'Uri'; +use Types::Standard -types; +use Future::AsyncAwait; use WebService::TFL::TubeStatus::Response; -use namespace::autoclean; +use namespace::clean; has user_agent => ( - isa => duck_type(['get']), - is => 'lazy', + isa => HasMethods['do_request'], + is => 'ro', + required => 1, ); -sub _build_user_agent { - require LWP::UserAgent; - my $ua = LWP::UserAgent->new(); - $ua->env_proxy; - return $ua; -} has uri => ( isa => Uri, @@ -28,11 +24,11 @@ has parser => ( builder => sub { JSON->new->utf8 }, ); -sub request { +async sub request { my ($self) = @_; + my $http_response = await $self->user_agent->do_request(uri => $self->uri); - my $http_response = $self->user_agent->get($self->uri); if ($http_response->is_success) { my $json = $http_response->content; -- cgit v1.2.3