PrivateCoffee/travelynx
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use Travel::Status::DE::HAFAS instead of traininfo.exe for journey details

Browse source
This commit is contained in:
Daniel Friesel 2022-11-05 19:19:52 +01:00
parent bde6346401
commit 087d3871e1
No known key found for this signature in database
GPG key ID: 100D5BFB5166E005
4 changed files with 89 additions and 193 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cpanfile
View file

@ -13,6 +13,7 @@ requires 'Mojolicious::Plugin::Authentication';
requires 'Mojo::Pg'; requires 'Mojo::Pg';
requires 'Text::CSV'; requires 'Text::CSV';
requires 'Travel::Status::DE::DBWagenreihung'; requires 'Travel::Status::DE::DBWagenreihung';
requires 'Travel::Status::DE::HAFAS';
requires 'Travel::Status::DE::IRIS'; requires 'Travel::Status::DE::IRIS';
requires 'UUID::Tiny'; requires 'UUID::Tiny';
requires 'JSON'; requires 'JSON';

114
lib/Travelynx.pm
View file

@ -719,11 +719,15 @@ sub startup {
if ( $station_data->{sched_arr} ) { if ( $station_data->{sched_arr} ) {
my $sched_arr my $sched_arr
= epoch_to_dt( $station_data->{sched_arr} ); = epoch_to_dt( $station_data->{sched_arr} );
my $rt_arr = $sched_arr->clone; my $rt_arr = epoch_to_dt( $station_data->{rt_arr} );
if ( $station_data->{adelay} if ( $rt_arr->epoch == 0 ) {
and $station_data->{adelay} =~ m{^\d+$} ) $rt_arr = $sched_arr->clone;
{ if ( $station_data->{arr_delay}
$rt_arr->add( minutes => $station_data->{adelay} ); and $station_data->{arr_delay} =~ m{^\d+$} )
{
$rt_arr->add(
minutes => $station_data->{arr_delay} );
}
} }
$self->in_transit->set_arrival_times( $self->in_transit->set_arrival_times(
uid => $uid, uid => $uid,
@ -1076,8 +1080,6 @@ sub startup {
my $date_yyyy = $train->start->strftime('%d.%m.%Y'); my $date_yyyy = $train->start->strftime('%d.%m.%Y');
my $train_no = $train->type . ' ' . $train->train_no; my $train_no = $train->type . ' ' . $train->train_no;
my ( $trainlink, $route_data );
$self->hafas->get_json_p( $self->hafas->get_json_p(
"${base}&date=${date_yy}&trainname=${train_no}")->then( "${base}&date=${date_yy}&trainname=${train_no}")->then(
sub { sub {
@ -1085,7 +1087,6 @@ sub startup {
# Fallback: Take first result # Fallback: Take first result
my $result = $trainsearch->{suggestions}[0]; my $result = $trainsearch->{suggestions}[0];
$trainlink = $result->{trainLink};
# Try finding a result for the current date # Try finding a result for the current date
for for
@ -1106,14 +1107,13 @@ sub startup {
# station seems to be the more generic solution, so we do that # station seems to be the more generic solution, so we do that
# instead. # instead.
if ( $suggestion->{dep} eq $train->origin ) { if ( $suggestion->{dep} eq $train->origin ) {
$result = $suggestion; $result = $suggestion;
$trainlink = $suggestion->{trainLink};
last; last;
} }
} }
} }
if ( not $trainlink ) { if ( not $result ) {
$self->app->log->debug("trainlink not found"); $self->app->log->debug("trainlink not found");
return Mojo::Promise->reject("trainlink not found"); return Mojo::Promise->reject("trainlink not found");
} }
@ -1135,67 +1135,29 @@ sub startup {
data => { trip_id => $trip_id } data => { trip_id => $trip_id }
); );
my $base2 return $self->hafas->get_route_timestamps_p(
= 'https://reiseauskunft.bahn.de/bin/traininfo.exe/dn'; trip_id => $trip_id );
return $self->hafas->get_json_p(
"${base2}/${trainlink}?rt=1&date=${date_yy}&L=vs_json.vs_hap"
);
} }
)->then( )->then(
sub { sub {
my ($traininfo) = @_; my ( $route_data, $journey ) = @_;
if ( not $traininfo or $traininfo->{error} ) {
$self->app->log->debug("traininfo error");
return Mojo::Promise->reject("traininfo error");
}
my $routeinfo
= $traininfo->{suggestions}[0]{locations};
my $strp = DateTime::Format::Strptime->new(
pattern => '%d.%m.%y %H:%M',
time_zone => 'Europe/Berlin',
);
$route_data = {};
for my $station ( @{$routeinfo} ) {
my $arr
= $strp->parse_datetime(
$station->{arrDate} . ' ' . $station->{arrTime} );
my $dep
= $strp->parse_datetime(
$station->{depDate} . ' ' . $station->{depTime} );
$route_data->{ $station->{name} } = {
sched_arr => $arr ? $arr->epoch : 0,
sched_dep => $dep ? $dep->epoch : 0,
eva => $station->{evaId},
};
}
my $base2
= 'https://reiseauskunft.bahn.de/bin/traininfo.exe/dn';
return $self->hafas->get_xml_p(
"${base2}/${trainlink}?rt=1&date=${date_yy}&L=vs_java3"
);
}
)->then(
sub {
my ($traininfo2) = @_;
for my $station ( keys %{$route_data} ) {
for my $key (
keys %{ $traininfo2->{station}{$station} // {} } )
{
$route_data->{$station}{$key}
= $traininfo2->{station}{$station}{$key};
}
}
for my $station ( @{$route} ) { for my $station ( @{$route} ) {
$station->[1] $station->[1]
= $route_data->{ $station->[0] }; = $route_data->{ $station->[0] };
} }
my @messages;
for my $m ( $journey->messages ) {
push(
@messages,
{
header => $m->short,
lead => $m->text,
}
);
}
$self->in_transit->set_route_data( $self->in_transit->set_route_data(
uid => $uid, uid => $uid,
db => $db, db => $db,
@ -1208,7 +1170,7 @@ sub startup {
map { [ $_->[0]->epoch, $_->[1] ] } map { [ $_->[0]->epoch, $_->[1] ] }
$train->qos_messages $train->qos_messages
], ],
him_messages => $traininfo2->{messages}, him_messages => \@messages,
); );
return; return;
} }
@ -1585,13 +1547,7 @@ sub startup {
if ( $dep_info and $dep_info->{sched_arr} ) { if ( $dep_info and $dep_info->{sched_arr} ) {
$dep_info->{sched_arr} $dep_info->{sched_arr}
= epoch_to_dt( $dep_info->{sched_arr} ); = epoch_to_dt( $dep_info->{sched_arr} );
$dep_info->{rt_arr} = $dep_info->{sched_arr}->clone; $dep_info->{rt_arr} = epoch_to_dt( $dep_info->{rt_arr} );
if ( $dep_info->{adelay}
and $dep_info->{adelay} =~ m{^\d+$} )
{
$dep_info->{rt_arr}
->add( minutes => $dep_info->{adelay} );
}
$dep_info->{rt_arr_countdown} = $ret->{boarding_countdown} $dep_info->{rt_arr_countdown} = $ret->{boarding_countdown}
= $dep_info->{rt_arr}->epoch - $epoch; = $dep_info->{rt_arr}->epoch - $epoch;
} }
@ -1610,13 +1566,7 @@ sub startup {
{ {
$times->{sched_arr} $times->{sched_arr}
= epoch_to_dt( $times->{sched_arr} ); = epoch_to_dt( $times->{sched_arr} );
$times->{rt_arr} = $times->{sched_arr}->clone; $times->{rt_arr} = epoch_to_dt( $times->{rt_arr} );
if ( $times->{adelay}
and $times->{adelay} =~ m{^\d+$} )
{
$times->{rt_arr}
->add( minutes => $times->{adelay} );
}
$times->{rt_arr_countdown} $times->{rt_arr_countdown}
= $times->{rt_arr}->epoch - $epoch; = $times->{rt_arr}->epoch - $epoch;
} }
@ -1625,13 +1575,7 @@ sub startup {
{ {
$times->{sched_dep} $times->{sched_dep}
= epoch_to_dt( $times->{sched_dep} ); = epoch_to_dt( $times->{sched_dep} );
$times->{rt_dep} = $times->{sched_dep}->clone; $times->{rt_dep} = epoch_to_dt( $times->{rt_dep} );
if ( $times->{ddelay}
and $times->{ddelay} =~ m{^\d+$} )
{
$times->{rt_dep}
->add( minutes => $times->{ddelay} );
}
$times->{rt_dep_countdown} $times->{rt_dep_countdown}
= $times->{rt_dep}->epoch - $epoch; = $times->{rt_dep}->epoch - $epoch;
} }

161
lib/Travelynx/Helper/HAFAS.pm
View file

@ -12,8 +12,15 @@ use DateTime;
use Encode qw(decode); use Encode qw(decode);
use JSON; use JSON;
use Mojo::Promise; use Mojo::Promise;
use Travel::Status::DE::HAFAS;
use XML::LibXML; use XML::LibXML;
sub _epoch {
my ($dt) = @_;
return $dt ? $dt->epoch : 0;
}
sub new { sub new {
my ( $class, %opt ) = @_; my ( $class, %opt ) = @_;
@ -167,129 +174,71 @@ sub get_json_p {
return $promise; return $promise;
} }
sub get_xml_p { sub get_route_timestamps_p {
my ( $self, $url ) = @_; my ( $self, %opt ) = @_;
my $cache = $self->{realtime_cache};
my $promise = Mojo::Promise->new; my $promise = Mojo::Promise->new;
my $now = DateTime->now( time_zone => 'Europe/Berlin' );
if ( my $content = $cache->thaw($url) ) { Travel::Status::DE::HAFAS->new_p(
return $promise->resolve($content); journey => {
} id => $opt{trip_id},
$self->{user_agent}->request_timeout(5)->get_p( $url => $self->{header} ) # name => $opt{train_no},
->then( },
cache => $self->{realtime_cache},
promise => 'Mojo::Promise',
user_agent => $self->{user_agent}->request_timeout(10)
)->then(
sub { sub {
my ($tx) = @_; my ($hafas) = @_;
my $journey = $hafas->result;
my $ret = {};
if ( my $err = $tx->error ) { my $station_is_past = 1;
$promise->reject( for my $stop ( $journey->route ) {
"hafas->get_xml_p($url) returned HTTP $err->{code} $err->{message}" my $name = $stop->{name};
); $ret->{$name} = {
return; sched_arr => _epoch( $stop->{sched_arr} ),
} sched_dep => _epoch( $stop->{sched_dep} ),
rt_arr => _epoch( $stop->{rt_arr} ),
my $body = decode( 'ISO-8859-15', $tx->res->body ); rt_dep => _epoch( $stop->{rt_dep} ),
my $tree; arr_delay => $stop->{arr_delay},
dep_delay => $stop->{dep_delay},
my $traininfo = { eva => $stop->{eva},
station => {}, load => $stop->{load},
messages => [], isCancelled => (
}; ( $stop->{arr_cancelled} or not $stop->{sched_arr} )
and
# <SDay text="... &gt; ..."> is invalid XML, but present in ( $stop->{dep_cancelled} or not $stop->{sched_dep} )
# regardless. As it is the last tag, we just throw it away. ),
$body =~ s{<SDay [^>]*/>}{}s;
# More fixes for invalid XML
$body =~ s{P&R}{P&amp;R};
$body =~ s{& }{&amp; }g;
# <Attribute [...] text="[...]"[...]"" /> is invalid XML.
# Work around it.
$body
=~ s{<Attribute([^>]+)text="([^"]*)"([^"=>]*)""}{<Attribute$1text="$2&#042;$3&#042;"}s;
# Same for <HIMMessage lead="[...]"[...]"[...]" />
$body
=~ s{<HIMMessage([^>]+)lead="([^"]*)"([^"=>]*)"([^"]*)"}{<Attribute$1text="$2&#042;$3&#042;$4"}s;
# ... and <HIMMessage [...] lead="[...]<>[...]">
# (replace <> with t$t)
while ( $body
=~ s{<HIMMessage([^>]+)lead="([^"]*)<>([^"=]*)"}{<HIMMessage$1lead="$2&#11020;$3"}gis
)
{
}
# Dito for <HIMMessage [...] lead="[...]<br>[...]">.
while ( $body
=~ s{<HIMMessage([^>]+)lead="([^"]*)<br/?>([^"=]*)"}{<HIMMessage$1lead="$2 $3"}is
)
{
}
# ... and any other HTML tag inside an XML attribute
while ( $body
=~ s{<HIMMessage([^>]+)lead="([^"]*)<[^>]+>([^"=]*)"}{<HIMMessage$1lead="$2$3"}is
)
{
}
eval { $tree = XML::LibXML->load_xml( string => $body ) };
if ( my $err = $@ ) {
if ( $err =~ m{extra content at the end}i ) {
# We requested XML, but received an HTML error page
# (which was returned with HTTP 200 OK).
$self->{log}->debug("load_xml($url): $err");
}
else {
# There is invalid XML which we might be able to fix via
# regular expressions, so dump it into the production log.
$self->{log}->info("load_xml($url): $err");
}
$cache->freeze( $url, $traininfo );
$promise->reject("hafas->get_xml_p($url): $err");
return;
}
for my $station ( $tree->findnodes('/Journey/St') ) {
my $name = $station->getAttribute('name');
my $adelay = $station->getAttribute('adelay');
my $ddelay = $station->getAttribute('ddelay');
$traininfo->{station}{$name} = {
adelay => $adelay,
ddelay => $ddelay,
}; };
if (
$station_is_past
and not $ret->{$name}{isCancelled}
and $now->epoch < (
$ret->{$name}{rt_arr} // $ret->{$name}{rt_dep}
// $ret->{$name}{sched_arr}
// $ret->{$name}{sched_dep} // $now->epoch
)
)
{
$station_is_past = 0;
}
$ret->{$name}{isPast} = $station_is_past;
} }
for my $message ( $tree->findnodes('/Journey/HIMMessage') ) { $promise->resolve( $ret, $journey );
my $header = $message->getAttribute('header');
my $lead = $message->getAttribute('lead');
my $display = $message->getAttribute('display');
push(
@{ $traininfo->{messages} },
{
header => $header,
lead => $lead,
display => $display
}
);
}
$cache->freeze( $url, $traininfo );
$promise->resolve($traininfo);
return; return;
} }
)->catch( )->catch(
sub { sub {
my ($err) = @_; my ($err) = @_;
$self->{log}->info("hafas->get_xml_p($url): $err"); $promise->reject($err);
$promise->reject("hafas->get_xml_p($url): $err");
return; return;
} }
)->wait; )->wait;
return $promise; return $promise;
} }

6
templates/about.html.ep
View file

@ -3,9 +3,11 @@
<a href="https://finalrewind.org/projects/travelynx">travelynx</a> v<%= stash('version') // '???' %><br/> <a href="https://finalrewind.org/projects/travelynx">travelynx</a> v<%= stash('version') // '???' %><br/>
Entwickelt von <a href="https://twitter.com/derfnull">@derfnull</a><br/> Entwickelt von <a href="https://twitter.com/derfnull">@derfnull</a><br/>
<a href="<%= app->config->{ref}{source} // 'https://github.com/derf/travelynx' %>">Quelltext</a> lizensiert unter AGPL v3<br/><br/> <a href="<%= app->config->{ref}{source} // 'https://github.com/derf/travelynx' %>">Quelltext</a> lizensiert unter AGPL v3<br/><br/>
Backend: Backends:
<a href="https://finalrewind.org/projects/Travel-Status-DE-IRIS/">Travel::Status::DE::IRIS</a> <a href="https://finalrewind.org/projects/Travel-Status-DE-IRIS/">Travel::Status::DE::IRIS</a>
v<%= $Travel::Status::DE::IRIS::VERSION %><br/> v<%= $Travel::Status::DE::IRIS::VERSION %> und
<a href="https://finalrewind.org/projects/Travel-Status-DE-DeutscheBahn/">Travel::Status::DE::HAFAS</a>
v<%= $Travel::Status::DE::HAFAS::VERSION %><br/>
<a href="http://data.deutschebahn.com/dataset/data-haltestellen">Haltestellendaten</a> <a href="http://data.deutschebahn.com/dataset/data-haltestellen">Haltestellendaten</a>
© DB Station&amp;Service AG, © DB Station&amp;Service AG,
Europaplatz 1, Europaplatz 1,