add ability to do discard sends and make things basically work

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

diff --git a/lib/Object/Remote/Connection.pm b/lib/Object/Remote/Connection.pm
index 7a078b5..6ff0b03 100644 (file)
--- a/lib/Object/Remote/Connection.pm
+++ b/lib/Object/Remote/Connection.pm
@@ -1,6 +1,7 @@
 package Object::Remote::Connection;
 
 use CPS::Future;
+use Object::Remote::Null;
 use Object::Remote;
 use IO::Handle;
 use Module::Runtime qw(use_module);
@@ -46,6 +47,7 @@ sub _build__json {
   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->new(connection => $self, id => $id)
@@ -76,20 +78,31 @@ sub send {
   return $future;
 }
 
+sub send_discard {
+  my ($self, $type, @call) = @_;
+
+  unshift @call, $type => { __remote_object__ => 'NULL' };
+
+  $self->_send(\@call);
+}
+
 sub _send {
   my ($self, $to_send) = @_;
 
-  print { $self->send_to_fh } $self->_serialize($to_send);
+  print { $self->send_to_fh } $self->_serialize($to_send)."\n";
 }
 
 sub _serialize {
   my ($self, $data) = @_;
   local our @New_Ids;
-  eval { return $self->_encode($self->_deobjectify($data)) };
-  my $err = $@; # won't get here if the eval doesn't die
-  # don't keep refs to new things
-  delete @{$self->local_objects_by_id}{@New_Ids};
-  die "Error serializing: $err";
+  return eval {
+    $self->_encode($self->_deobjectify($data))
+  } or do {
+    my $err = $@; # won't get here if the eval doesn't die
+    # don't keep refs to new things
+    delete @{$self->local_objects_by_id}{@New_Ids};
+    die "Error serializing: $err";
+  };
 }
 
 sub _deobjectify {
@@ -116,7 +129,7 @@ sub _deobjectify {
 sub _receive_data_from {
   my ($self, $fh) = @_;
   my $rb = $self->_receive_data_buffer;
-  if (sysread($self->read_fh, $$rb, 1024, length($$rb)) > 0) {
+  if (sysread($fh, $$rb, 1024, length($$rb)) > 0) {
     while ($$rb =~ s/^(.*)\n//) {
       $self->_receive($1);
     }
@@ -134,12 +147,14 @@ sub _receive {
 
 sub receive_free {
   my ($self, $id) = @_;
-  delete $self->local_objects_by_id->{$id};
+  delete $self->local_objects_by_id->{$id}
+    or warn "Free: no such object $id";
   return;
 }
 
 sub receive_call {
   my ($self, $future, $id, @rest) = @_;
+  $future->{method} = 'call_discard';
   my $local = $self->local_objects_by_id->{$id}
     or do { $future->fail("No such object $id"); return };
   $self->_invoke($future, $local, @rest);
@@ -147,6 +162,7 @@ sub receive_call {
 
 sub receive_class_call {
   my ($self, $future, $class, @rest) = @_;
+  $future->{method} = 'call_discard';
   eval { use_module($class) }
     or do { $future->fail("Error loading ${class}: $@"); return };
   $self->_invoke($future, $class, @rest);