X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FObject%2FRemote%2FConnection.pm;h=3e35d53a605d3b1ab11d299d1646530b7551a7ce;hb=c6fe6fbd88a05e860ecdc8942cb86940915172ed;hp=ea1614dfa020a4c936746e189c03b0ba396e1d06;hpb=fe6c9a7f0f8b12f9424ed3aa7ea6c4a783581ce9;p=scpubgit%2FObject-Remote.git

diff --git a/lib/Object/Remote/Connection.pm b/lib/Object/Remote/Connection.pm
index ea1614d..3e35d53 100644
--- a/lib/Object/Remote/Connection.pm
+++ b/lib/Object/Remote/Connection.pm
@@ -31,7 +31,7 @@ has receive_from_fh => (
   },
 );
 
-has on_close => (is => 'rw', default => sub {});
+has on_close => (is => 'rw', default => sub { CPS::Future->new });
 
 has child_pid => (is => 'ro');
 
@@ -50,6 +50,8 @@ has local_objects_by_id => (is => 'ro', default => sub { {} });
 
 has remote_objects_by_id => (is => 'ro', default => sub { {} });
 
+has outstanding_futures => (is => 'ro', default => sub { {} });
+
 has _json => (
   is => 'lazy',
   handles => {
@@ -90,12 +92,26 @@ BEGIN {
 
 sub new_from_spec {
   my ($class, $spec) = @_;
+  return $spec if blessed $spec;
   foreach my $poss (do { our @Guess }) {
     if (my $obj = $poss->($spec)) { return $obj }
   }
   die "Couldn't figure out what to do with ${spec}";
 }
 
+sub new_remote {
+  my ($self, @args) = @_;
+  Object::Remote::Handle->new(
+    connection => $self, @args
+  )->proxy;
+}
+
+sub get_remote_sub {
+  my ($self, $sub) = @_;
+  my ($pkg, $name) = $sub =~ m/^(.*)::([^:]+)$/;
+  return await_future($self->send(class_call => $pkg, 0, can => $name));
+}
+
 sub register_remote {
   my ($self, $remote) = @_;
   weaken($self->remote_objects_by_id->{$remote->id} = $remote);
@@ -119,6 +135,10 @@ sub send {
 
   unshift @call, $type => my $future = CPS::Future->new;
 
+  my $outstanding = $self->outstanding_futures;
+  $outstanding->{$future} = $future;
+  $future->on_ready(sub { delete $outstanding->{$future} });
+
   $self->_send(\@call);
 
   return $future;
@@ -202,6 +222,14 @@ sub _receive_data_from {
       }
     }
   } else {
+    Object::Remote->current_loop
+                  ->unwatch_io(
+                      handle => $self->receive_from_fh,
+                      on_read_ready => 1
+                    );
+    my $outstanding = $self->outstanding_futures;
+    $_->fail("Connection lost") for values %$outstanding;
+    %$outstanding = ();
     $self->on_close->done();
   }
 }