summaryrefslogtreecommitdiff
path: root/lib/Travelynx/Helper
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Travelynx/Helper')
-rw-r--r--lib/Travelynx/Helper/DBDB.pm127
-rw-r--r--lib/Travelynx/Helper/DBRIS.pm104
2 files changed, 74 insertions, 157 deletions
diff --git a/lib/Travelynx/Helper/DBDB.pm b/lib/Travelynx/Helper/DBDB.pm
index a310aa3..0db6950 100644
--- a/lib/Travelynx/Helper/DBDB.pm
+++ b/lib/Travelynx/Helper/DBDB.pm
@@ -10,6 +10,7 @@ use 5.020;
use Encode qw(decode);
use Mojo::Promise;
+use Mojo::UserAgent;
use JSON;
sub new {
@@ -26,132 +27,6 @@ sub new {
}
-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);
- }
- }
-
- $self->{user_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;
- }
-
- $self->{user_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 ) = @_;
diff --git a/lib/Travelynx/Helper/DBRIS.pm b/lib/Travelynx/Helper/DBRIS.pm
index 1b7f099..94746cc 100644
--- a/lib/Travelynx/Helper/DBRIS.pm
+++ b/lib/Travelynx/Helper/DBRIS.pm
@@ -29,18 +29,54 @@ sub new {
return bless( \%opt, $class );
}
+sub get_agent {
+ my ($self) = @_;
+
+ 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);
+ }
+
+ 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 => Mojo::UserAgent->new,
+ promise => 'Mojo::Promise',
+ user_agent => $self->get_agent,
+ developer_mode => $self->{log}->is_level('debug') ? 1 : 0,
)->then(
sub {
my ($dbris) = @_;
@@ -67,8 +103,6 @@ sub get_station_id_p {
sub get_departures_p {
my ( $self, %opt ) = @_;
- my $agent = $self->{user_agent};
-
if ( $opt{station} =~ m{ [@] L = (?<eva> \d+ ) }x ) {
$opt{station} = {
eva => $+{eva},
@@ -81,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,
);
}
@@ -95,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) = @_;
@@ -143,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;
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-28 04:49:31 +0000