summaryrefslogtreecommitdiff
path: root/lib/Travelynx
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Travelynx')
-rw-r--r--lib/Travelynx/Command/database.pm89
-rw-r--r--lib/Travelynx/Command/maintenance.pm2
-rw-r--r--lib/Travelynx/Controller/Account.pm4
-rwxr-xr-xlib/Travelynx/Controller/Traveling.pm42
-rw-r--r--lib/Travelynx/Helper/DBDB.pm227
-rw-r--r--lib/Travelynx/Helper/DBRIS.pm105
-rw-r--r--lib/Travelynx/Model/Stations.pm15
7 files changed, 190 insertions, 294 deletions
diff --git a/lib/Travelynx/Command/database.pm b/lib/Travelynx/Command/database.pm
index 8222fdf..5792e5f 100644
--- a/lib/Travelynx/Command/database.pm
+++ b/lib/Travelynx/Command/database.pm
@@ -7,7 +7,7 @@ package Travelynx::Command::database;
use Mojo::Base 'Mojolicious::Command';
use DateTime;
-use File::Slurp qw(read_file);
+use File::Slurp qw(read_dir read_file);
use List::Util qw();
use JSON;
use Travel::Status::DE::EFA;
@@ -3535,8 +3535,95 @@ qq{select distinct checkout_station_id from in_transit where backend_id = 0;}
}
);
},
+
+ # v68 -> v69
+ # Incorporate dbdb (entry/exit direction) data into travelynx
+ # This avoids having to make web requests to lib.finalrewind.org/dbdb,
+ # and allows for also showing the exit direction for intermediate stops.
+ sub {
+ my ($db) = @_;
+ $db->query(
+ qq{
+ alter table schema_version
+ add column dbdb varchar(12);
+ create table bahn_platform_directions (
+ eva integer primary key,
+ data jsonb not null
+ );
+ }
+ );
+ sync_dbdb($db);
+ $db->query(
+ qq{
+ update schema_version set version = 69;
+ update schema_version set dbdb = '2025-10-27';
+ }
+ );
+ },
);
+sub sync_dbdb {
+ my ($db) = @_;
+
+ my $json = JSON->new;
+
+ for my $file ( read_dir( 'ext/dbdb/s', prefix => 1 ) ) {
+ if ( $file !~ m{\.txt$} ) {
+ next;
+ }
+
+ my %station;
+ for my $line ( read_file( $file, { binmode => ':encoding(utf-8)' } ) ) {
+ if ( $line
+ =~ m{ ^ \s* (?<platform> \d+ ) \s+ (?<type> \S+ ) \s+ (?<direction> \S+ ) }x
+ )
+ {
+ $station{ $+{platform} } = {
+ kopfgleis => $+{type} eq 'K' ? \1 : \0,
+ direction => $+{direction},
+ };
+ }
+ elsif ( $line
+ =~ m{ ^ @ \s* (?<stations> [^:]+ ) : \s* (?<platforms> .+ ) $ }x
+ )
+ {
+ my $stations_raw = $+{stations};
+ my $platforms_raw = $+{platforms};
+ my @stations = split( qr{, }, $stations_raw );
+ my @platforms = split( qr{, }, $platforms_raw );
+ for my $platform (@platforms) {
+ my ( $number, $direction ) = split( qr{ }, $platform );
+ for my $from_station (@stations) {
+ $station{$number}{direction_from}{$from_station}
+ = $direction;
+ }
+ }
+ }
+ }
+ my ($station_name) = ( $file =~ m{ s / ([^.]*) . txt $ }x );
+ my ($station)
+ = Travel::Status::DE::IRIS::Stations::get_station($station_name);
+ if ( $station and $station->[0] eq $station_name ) {
+ $db->insert(
+ 'bahn_platform_directions',
+ {
+ eva => $station->[2],
+ data => $json->encode( \%station )
+ },
+ { on_conflict => \'(eva) do update set data = EXCLUDED.data' }
+ );
+ }
+ elsif ( not $station ) {
+ say STDERR "DBDB import: unknown station: $station_name";
+ }
+ else {
+ say STDERR
+"DBDB import: station mismatch: wanted to import $station_name, but got "
+ . $station->[0];
+ }
+ }
+}
+
sub sync_stations {
my ( $db, $iris_version ) = @_;
diff --git a/lib/Travelynx/Command/maintenance.pm b/lib/Travelynx/Command/maintenance.pm
index 7baf762..7a8ae16 100644
--- a/lib/Travelynx/Command/maintenance.pm
+++ b/lib/Travelynx/Command/maintenance.pm
@@ -121,7 +121,7 @@ sub run {
push( @uids_to_delete,
$to_delete->arrays->map( sub { shift->[0] } )->each );
- if ( @uids_to_delete > 10 ) {
+ if ( @uids_to_delete > 60 ) {
printf STDERR (
"About to delete %d accounts, which is quite a lot.\n",
scalar @uids_to_delete
diff --git a/lib/Travelynx/Controller/Account.pm b/lib/Travelynx/Controller/Account.pm
index 533e6eb..b0722f7 100644
--- a/lib/Travelynx/Controller/Account.pm
+++ b/lib/Travelynx/Controller/Account.pm
@@ -345,9 +345,9 @@ sub register {
}
if ( not $dt
- or DateTime->now( time_zone => 'Europe/Berlin' )->epoch - $dt < 6 )
+ or DateTime->now( time_zone => 'Europe/Berlin' )->epoch - $dt < 10 )
{
- # a human user should take at least five seconds to fill out the form.
+ # a human user should take at least ten seconds to fill out the form.
# Throw a CSRF error at presumed spammers.
$self->render(
'bad_request',
diff --git a/lib/Travelynx/Controller/Traveling.pm b/lib/Travelynx/Controller/Traveling.pm
index 0f31056..38a2fdf 100755
--- a/lib/Travelynx/Controller/Traveling.pm
+++ b/lib/Travelynx/Controller/Traveling.pm
@@ -594,13 +594,9 @@ sub geolocation {
if ($dbris_service) {
$self->render_later;
- Travel::Status::DE::DBRIS->new_p(
- promise => 'Mojo::Promise',
- user_agent => Mojo::UserAgent->new,
- geoSearch => {
- latitude => $lat,
- longitude => $lon
- }
+ $self->dbris->geosearch_p(
+ latitude => $lat,
+ longitude => $lon
)->then(
sub {
my ($dbris) = @_;
@@ -627,8 +623,13 @@ sub geolocation {
$self->render(
json => {
candidates => [],
- warning => $err,
- }
+ error => $err,
+ },
+
+ # The frontend JavaScript does not have an XHR error handler yet
+ # (and if it did, I do not know whether it would have access to our JSON body).
+ # So, for now, we do the bad thing™ and return HTTP 200 even though the request to the backend was not successful.
+ # status => 502,
);
}
)->wait;
@@ -671,8 +672,11 @@ sub geolocation {
$self->render(
json => {
candidates => [],
- warning => $err,
- }
+ error => $err,
+ },
+
+ # See above
+ # status => 502
);
}
)->wait;
@@ -722,8 +726,11 @@ sub geolocation {
$self->render(
json => {
candidates => [],
- warning => $err,
- }
+ error => $err,
+ },
+
+ # See above
+ #status => 502
);
}
)->wait;
@@ -771,8 +778,11 @@ sub geolocation {
$self->render(
json => {
candidates => [],
- warning => $err,
- }
+ error => $err,
+ },
+
+ # See above
+ #status => 502
);
}
)->wait;
@@ -2472,7 +2482,7 @@ sub edit_journey {
uid => $uid,
db => $db,
id => $journey->{id},
- $key => $self->param($key)
+ $key => $self->param($key),
);
if ($error) {
last;
diff --git a/lib/Travelynx/Helper/DBDB.pm b/lib/Travelynx/Helper/DBDB.pm
deleted file mode 100644
index 09d612e..0000000
--- a/lib/Travelynx/Helper/DBDB.pm
+++ /dev/null
@@ -1,227 +0,0 @@
-package Travelynx::Helper::DBDB;
-
-# Copyright (C) 2020-2023 Birte Kristina Friesel
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-use strict;
-use warnings;
-use 5.020;
-
-use Encode qw(decode);
-use Mojo::Promise;
-use JSON;
-
-sub new {
- my ( $class, %opt ) = @_;
-
- my $version = $opt{version};
-
- $opt{header}
- = { 'User-Agent' =>
-"travelynx/${version} on $opt{root_url} +https://finalrewind.org/projects/travelynx"
- };
-
- return bless( \%opt, $class );
-
-}
-
-sub has_wagonorder_p {
- my ( $self, %opt ) = @_;
-
- $opt{train_type} //= q{};
- my $datetime = $opt{datetime}->clone->set_time_zone('UTC');
- my %param = (
- administrationId => 80,
- category => $opt{train_type},
- date => $datetime->strftime('%Y-%m-%d'),
- evaNumber => $opt{eva},
- number => $opt{train_no},
- time => $datetime->rfc3339 =~ s{(?=Z)}{.000}r
- );
-
- my $url = sprintf( '%s?%s',
-'https://www.bahn.de/web/api/reisebegleitung/wagenreihung/vehicle-sequence',
- join( '&', map { $_ . '=' . $param{$_} } sort keys %param ) );
-
- my $promise = Mojo::Promise->new;
- my $debug_prefix
- = "has_wagonorder_p($opt{train_type} $opt{train_no} @ $opt{eva})";
-
- if ( my $content = $self->{main_cache}->get("HEAD $url")
- // $self->{realtime_cache}->get("HEAD $url") )
- {
- if ( $content eq 'n' ) {
- $self->{log}->debug("${debug_prefix}: n (cached)");
- return $promise->reject;
- }
- else {
- $self->{log}->debug("${debug_prefix}: ${content} (cached)");
- return $promise->resolve($content);
- }
- }
-
- my $agent = $self->{user_agent};
- my $proxy;
- if ( my @proxies = @{ $self->{dbris_config}{'bahn.de'}{proxies} // [] } ) {
- $proxy = $proxies[ int( rand( scalar @proxies ) ) ];
- }
- elsif ( my $p = $self->{dbris_config}{'bahn.de'}{proxy} ) {
- $proxy = $p;
- }
-
- if ($proxy) {
- $agent = Mojo::UserAgent->new;
- $agent->proxy->http($proxy);
- $agent->proxy->https($proxy);
- }
-
- $agent->request_timeout(5)->get_p( $url => $self->{header} )->then(
- sub {
- my ($tx) = @_;
- if ( $tx->result->is_success ) {
- $self->{log}->debug("${debug_prefix}: a");
- $self->{main_cache}->set( "HEAD $url", 'a' );
- my $body = decode( 'utf-8', $tx->res->body );
- my $json = JSON->new->decode($body);
- $self->{main_cache}->freeze( $url, $json );
- $promise->resolve('a');
- }
- else {
- my $code = $tx->res->code;
- $self->{log}->debug("${debug_prefix}: n (HTTP $code)");
- $self->{realtime_cache}->set( "HEAD $url", 'n' );
- $promise->reject;
- }
- return;
- }
- )->catch(
- sub {
- my ($err) = @_;
- $self->{log}->debug("${debug_prefix}: n ($err)");
- $self->{realtime_cache}->set( "HEAD $url", 'n' );
- $promise->reject;
- return;
- }
- )->wait;
- return $promise;
-}
-
-sub get_wagonorder_p {
- my ( $self, %opt ) = @_;
-
- my $datetime = $opt{datetime}->clone->set_time_zone('UTC');
- my %param = (
- administrationId => 80,
- category => $opt{train_type},
- date => $datetime->strftime('%Y-%m-%d'),
- evaNumber => $opt{eva},
- number => $opt{train_no},
- time => $datetime->rfc3339 =~ s{(?=Z)}{.000}r
- );
-
- my $url = sprintf( '%s?%s',
-'https://www.bahn.de/web/api/reisebegleitung/wagenreihung/vehicle-sequence',
- join( '&', map { $_ . '=' . $param{$_} } sort keys %param ) );
- my $debug_prefix
- = "get_wagonorder_p($opt{train_type} $opt{train_no} @ $opt{eva})";
-
- my $promise = Mojo::Promise->new;
-
- if ( my $content = $self->{main_cache}->thaw($url) ) {
- $self->{log}->debug("${debug_prefix}: (cached)");
- $promise->resolve($content);
- return $promise;
- }
-
- my $agent = $self->{user_agent};
- my $proxy;
- if ( my @proxies = @{ $self->{dbris_config}{'bahn.de'}{proxies} // [] } ) {
- $proxy = $proxies[ int( rand( scalar @proxies ) ) ];
- }
- elsif ( my $p = $self->{dbris_config}{'bahn.de'}{proxy} ) {
- $proxy = $p;
- }
-
- if ($proxy) {
- $agent = Mojo::UserAgent->new;
- $agent->proxy->http($proxy);
- $agent->proxy->https($proxy);
- }
-
- $agent->request_timeout(5)->get_p( $url => $self->{header} )->then(
- sub {
- my ($tx) = @_;
-
- if ( $tx->result->is_success ) {
- my $body = decode( 'utf-8', $tx->res->body );
- my $json = JSON->new->decode($body);
- $self->{log}->debug("${debug_prefix}: success");
- $self->{main_cache}->freeze( $url, $json );
- $promise->resolve($json);
- }
- else {
- my $code = $tx->res->code;
- $self->{log}->debug("${debug_prefix}: HTTP ${code}");
- $promise->reject("HTTP ${code}");
- }
- return;
- }
- )->catch(
- sub {
- my ($err) = @_;
- $self->{log}->debug("${debug_prefix}: error ${err}");
- $promise->reject($err);
- return;
- }
- )->wait;
- return $promise;
-}
-
-sub get_stationinfo_p {
- my ( $self, $eva ) = @_;
-
- my $url = "https://lib.finalrewind.org/dbdb/s/${eva}.json";
-
- my $cache = $self->{main_cache};
- my $promise = Mojo::Promise->new;
-
- if ( my $content = $cache->thaw($url) ) {
- $self->{log}->debug("get_stationinfo_p(${eva}): (cached)");
- return $promise->resolve($content);
- }
-
- $self->{user_agent}->request_timeout(5)
- ->get_p( $url => $self->{header} )
- ->then(
- sub {
- my ($tx) = @_;
-
- if ( my $err = $tx->error ) {
- $self->{log}->debug(
-"get_stationinfo_p(${eva}): HTTP $err->{code} $err->{message}"
- );
- $cache->freeze( $url, {} );
- $promise->reject("HTTP $err->{code} $err->{message}");
- return;
- }
-
- my $json = $tx->result->json;
- $self->{log}->debug("get_stationinfo_p(${eva}): success");
- $cache->freeze( $url, $json );
- $promise->resolve($json);
- return;
- }
- )->catch(
- sub {
- my ($err) = @_;
- $self->{log}->debug("get_stationinfo_p(${eva}): Error ${err}");
- $cache->freeze( $url, {} );
- $promise->reject($err);
- return;
- }
- )->wait;
- return $promise;
-}
-
-1;
diff --git a/lib/Travelynx/Helper/DBRIS.pm b/lib/Travelynx/Helper/DBRIS.pm
index e8ef45b..94746cc 100644
--- a/lib/Travelynx/Helper/DBRIS.pm
+++ b/lib/Travelynx/Helper/DBRIS.pm
@@ -29,8 +29,8 @@ sub new {
return bless( \%opt, $class );
}
-sub get_station_id_p {
- my ( $self, $station_name ) = @_;
+sub get_agent {
+ my ($self) = @_;
my $agent = $self->{user_agent};
my $proxy;
@@ -48,16 +48,35 @@ sub get_station_id_p {
$agent->proxy->https($proxy);
}
+ return $agent;
+}
+
+sub geosearch_p {
+ my ( $self, %opt ) = @_;
+
+ return Travel::Status::DE::DBRIS->new_p(
+ promise => 'Mojo::Promise',
+ user_agent => $self->get_agent,
+ geoSearch => \%opt,
+ developer_mode => $self->{log}->is_level('debug') ? 1 : 0,
+ );
+}
+
+sub get_station_id_p {
+ my ( $self, $station_name ) = @_;
+
my $promise = Mojo::Promise->new;
+
Travel::Status::DE::DBRIS->new_p(
locationSearch => $station_name,
- cache => $self->{cache},
+ cache => $self->{realtime_cache},
lwp_options => {
timeout => 10,
agent => $self->{header}{'User-Agent'},
},
- promise => 'Mojo::Promise',
- user_agent => $agent,
+ promise => 'Mojo::Promise',
+ user_agent => $self->get_agent,
+ developer_mode => $self->{log}->is_level('debug') ? 1 : 0,
)->then(
sub {
my ($dbris) = @_;
@@ -84,22 +103,6 @@ sub get_station_id_p {
sub get_departures_p {
my ( $self, %opt ) = @_;
- my $agent = $self->{user_agent};
- my $proxy;
- if ( my @proxies = @{ $self->{service_config}{'bahn.de'}{proxies} // [] } )
- {
- $proxy = $proxies[ int( rand( scalar @proxies ) ) ];
- }
- elsif ( my $p = $self->{service_config}{'bahn.de'}{proxy} ) {
- $proxy = $p;
- }
-
- if ($proxy) {
- $agent = Mojo::UserAgent->new;
- $agent->proxy->http($proxy);
- $agent->proxy->https($proxy);
- }
-
if ( $opt{station} =~ m{ [@] L = (?<eva> \d+ ) }x ) {
$opt{station} = {
eva => $+{eva},
@@ -112,12 +115,14 @@ sub get_departures_p {
? $opt{timestamp}->clone
: DateTime->now( time_zone => 'Europe/Berlin' )
)->subtract( minutes => $opt{lookbehind} );
+
return Travel::Status::DE::DBRIS->new_p(
- station => $opt{station},
- datetime => $when,
- cache => $self->{cache},
- promise => 'Mojo::Promise',
- user_agent => $agent->request_timeout(10),
+ station => $opt{station},
+ datetime => $when,
+ cache => $self->{realtime_cache},
+ promise => 'Mojo::Promise',
+ user_agent => $self->get_agent->request_timeout(10),
+ developer_mode => $self->{log}->is_level('debug') ? 1 : 0,
);
}
@@ -126,28 +131,13 @@ sub get_journey_p {
my $promise = Mojo::Promise->new;
- my $agent = $self->{user_agent};
- my $proxy;
- if ( my @proxies = @{ $self->{service_config}{'bahn.de'}{proxies} // [] } )
- {
- $proxy = $proxies[ int( rand( scalar @proxies ) ) ];
- }
- elsif ( my $p = $self->{service_config}{'bahn.de'}{proxy} ) {
- $proxy = $p;
- }
-
- if ($proxy) {
- $agent = Mojo::UserAgent->new;
- $agent->proxy->http($proxy);
- $agent->proxy->https($proxy);
- }
-
Travel::Status::DE::DBRIS->new_p(
- journey => $opt{trip_id},
- with_polyline => $opt{with_polyline},
- cache => $self->{realtime_cache},
- promise => 'Mojo::Promise',
- user_agent => $agent->request_timeout(10),
+ journey => $opt{trip_id},
+ with_polyline => $opt{with_polyline},
+ cache => $self->{realtime_cache},
+ promise => 'Mojo::Promise',
+ user_agent => $self->get_agent->request_timeout(10),
+ developer_mode => $self->{log}->is_level('debug') ? 1 : 0,
)->then(
sub {
my ($dbris) = @_;
@@ -174,4 +164,25 @@ sub get_journey_p {
return $promise;
}
+sub get_wagonorder_p {
+ my ( $self, %opt ) = @_;
+
+ $self->{log}
+ ->debug("get_wagonorder_p($opt{train_type} $opt{train_no} @ $opt{eva})");
+
+ return Travel::Status::DE::DBRIS->new_p(
+ cache => $self->{main_cache},
+ failure_cache => $self->{realtime_cache},
+ promise => 'Mojo::Promise',
+ user_agent => $self->get_agent->request_timeout(10),
+ formation => {
+ departure => $opt{datetime},
+ eva => $opt{eva},
+ train_type => $opt{train_type},
+ train_number => $opt{train_no}
+ },
+ developer_mode => $self->{log}->is_level('debug') ? 1 : 0,
+ );
+}
+
1;
diff --git a/lib/Travelynx/Model/Stations.pm b/lib/Travelynx/Model/Stations.pm
index 5316118..6c647ec 100644
--- a/lib/Travelynx/Model/Stations.pm
+++ b/lib/Travelynx/Model/Stations.pm
@@ -519,4 +519,19 @@ sub grep_unknown {
return @unknown_stations;
}
+sub get_bahn_stationinfo {
+ my ( $self, %opt ) = @_;
+ $opt{db} //= $self->{pg}->db;
+
+ my $res
+ = $opt{db}
+ ->select( 'bahn_platform_directions', ['data'], { eva => $opt{eva} } )
+ ->expand->hash;
+
+ if ($res) {
+ return $res->{data};
+ }
+ return;
+}
+
1;
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-29 21:09:56 +0000