X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FConnection.pm;h=4e3348a33c8cee6e93773f91c3e09d126ef59c83;hp=6ff0b039d822021177f900fb2a30c8fe39877f46;hb=84b04178bd25e342d7f522e8f60c6d695b09576a;hpb=2065b08ba567dbf8c8370b69e3f5b2aa145efe23

diff --git a/lib/Object/Remote/Connection.pm b/lib/Object/Remote/Connection.pm
index 6ff0b03..4e3348a 100644
--- a/lib/Object/Remote/Connection.pm
+++ b/lib/Object/Remote/Connection.pm
@@ -9,6 +9,8 @@ use Scalar::Util qw(weaken blessed refaddr);
 use JSON::PP qw(encode_json);
 use Moo;
 
+our $DEBUG;
+
 has send_to_fh => (
   is => 'ro', required => 1,
   trigger => sub { $_[1]->autoflush(1) },
@@ -27,6 +29,10 @@ 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 { {} });
@@ -56,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);
@@ -96,7 +116,9 @@ sub _serialize {
   my ($self, $data) = @_;
   local our @New_Ids;
   return eval {
-    $self->_encode($self->_deobjectify($data))
+    my $flat = $self->_encode($self->_deobjectify($data));
+    warn "$$ >>> ${flat}\n" if $DEBUG;
+    $flat;
   } or do {
     my $err = $@; # won't get here if the eval doesn't die
     # don't keep refs to new things
@@ -133,15 +155,18 @@ sub _receive_data_from {
     while ($$rb =~ s/^(.*)\n//) {
       $self->_receive($1);
     }
+  } else {
+    $self->on_close->();
   }
 }
 
 sub _receive {
-  my ($self, $data) = @_;
-  my ($type, @rest) = eval { @{$self->_deserialize($data)} }
-    or do { warn "Deserialize failed for ${data}: $@"; return };
+  my ($self, $flat) = @_;
+  warn "$$ <<< $flat\n" if $DEBUG;
+  my ($type, @rest) = eval { @{$self->_deserialize($flat)} }
+    or do { warn "Deserialize failed for ${flat}: $@"; return };
   eval { $self->${\"receive_${type}"}(@rest); 1 }
-    or do { warn "Receive failed for ${data}: $@"; return };
+    or do { warn "Receive failed for ${flat}: $@"; return };
   return;
 }
 
@@ -154,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($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;
 }