add Object::Remote->connect

[scpubgit/Object-Remote.git] / lib / Object / Remote / Connection.pm

diff --git a/lib/Object/Remote/Connection.pm b/lib/Object/Remote/Connection.pm
index d0679c4..f466452 100644 (file)
--- a/lib/Object/Remote/Connection.pm
+++ b/lib/Object/Remote/Connection.pm
@@ -3,6 +3,7 @@ package Object::Remote::Connection;
 use Object::Remote::Future;
 use Object::Remote::Null;
 use Object::Remote::Handle;
+use Object::Remote::CodeContainer;
 use Object::Remote;
 use IO::Handle;
 use Module::Runtime qw(use_module);
@@ -30,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');
 
@@ -49,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 => {
@@ -57,17 +60,25 @@ has _json => (
   },
 );
 
+sub _id_to_remote_object {
+  my ($self, $id) = @_;
+  return bless({}, 'Object::Remote::Null') if $id eq 'NULL';
+  (
+    $self->remote_objects_by_id->{$id}
+    or Object::Remote::Handle->new(connection => $self, id => $id)
+  )->proxy;
+}
+
 sub _build__json {
   weaken(my $self = shift);
-  my $remotes = $self->remote_objects_by_id;
   JSON::PP->new->filter_json_single_key_object(
     __remote_object__ => sub {
-      my $id = shift;
-      return bless({}, 'Object::Remote::Null') if $id eq 'NULL';
-      (
-        $remotes->{$id}
-        or Object::Remote::Handle->new(connection => $self, id => $id)
-      )->proxy;
+      $self->_id_to_remote_object(@_);
+    }
+  )->filter_json_single_key_object(
+    __remote_code__ => sub {
+      my $code_container = $self->_id_to_remote_object(@_);
+      sub { $code_container->call(@_) };
     }
   );
 }
@@ -81,12 +92,33 @@ 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 connect {
+  my ($self, $to) = @_;
+  return await_future($self->send(
+    class_call => 'Object::Remote', 0, connect => $to
+  ));
+}
+
+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);
@@ -110,6 +142,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;
@@ -165,6 +201,11 @@ sub _deobjectify {
       return +{ map +($_ => $self->_deobjectify($data->{$_})), keys %$data };
     } elsif ($ref eq 'ARRAY') {
       return [ map $self->_deobjectify($_), @$data ];
+    } elsif ($ref eq 'CODE') {
+      my $id = $self->_local_object_to_id(
+                 Object::Remote::CodeContainer->new(code => $data)
+               );
+      return +{ __remote_code__ => $id };
     } else {
       die "Can't collapse reftype $ref";
     }
@@ -188,6 +229,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();
   }
 }