2 files changed, 16 insertions, 24 deletions
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;