remoting works

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

diff --git a/lib/Object/Remote/Connection.pm b/lib/Object/Remote/Connection.pm
index 7ab6b1f..4e3348a 100644 (file)
--- a/lib/Object/Remote/Connection.pm
+++ b/lib/Object/Remote/Connection.pm
@@ -31,6 +31,8 @@ has receive_from_fh => (
 
 has on_close => (is => 'rw', default => sub {});
 
+has child_pid => (is => 'ro');
+
 has _receive_data_buffer => (is => 'ro', default => sub { my $x = ''; \$x });
 
 has local_objects_by_id => (is => 'ro', default => sub { {} });
@@ -60,6 +62,20 @@ sub _build__json {
   );
 }
 
+BEGIN {
+  unshift our @Guess, sub { blessed($_[0]) ? $_[0] : undef };
+  eval { require Object::Remote::Connector::Local };
+  eval { require Object::Remote::Connector::SSH };
+}
+
+sub new_from_spec {
+  my ($class, $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 register_remote {
   my ($self, $remote) = @_;
   weaken($self->remote_objects_by_id->{$remote->id} = $remote);
@@ -163,24 +179,37 @@ sub receive_free {
 
 sub receive_call {
   my ($self, $future, $id, @rest) = @_;
-  $future->{method} = 'call_discard';
+  $future->{method} = 'call_discard_free';
   my $local = $self->local_objects_by_id->{$id}
     or do { $future->fail("No such object $id"); return };
   $self->_invoke($future, $local, @rest);
 }
 
+sub receive_call_free {
+  my ($self, $future, $id, @rest) = @_;
+  $self->receive_call($future, $id, undef, @rest);
+  $self->receive_free($id);
+}
+
 sub receive_class_call {
   my ($self, $future, $class, @rest) = @_;
-  $future->{method} = 'call_discard';
+  $future->{method} = 'call_discard_free';
   eval { use_module($class) }
     or do { $future->fail("Error loading ${class}: $@"); return };
   $self->_invoke($future, $class, @rest);
 }
 
 sub _invoke {
-  my ($self, $future, $local, $method, @args) = @_;
-  eval { $future->done(scalar $local->$method(@args)); 1 }
-    or do { $future->fail($@); return; };
+  my ($self, $future, $local, $ctx, $method, @args) = @_;
+  my $do = sub { $local->$method(@args) };
+  eval {
+    $future->done(
+      defined($ctx)
+        ? ($ctx ? $do->() : scalar($do->()))
+        : do { $do->(); () }
+    );
+    1;
+  } or do { $future->fail($@); return; };
   return;
 }