Changeset 14290 for lang/perl/POE-Component-Server-JSONRPC/trunk/lib/POE/Component/Server/JSONRPC.pm

Timestamp:

06/20/08 16:31:08 (5 years ago)

Author:

nothingmuch

Message:

improve error handling

Files:

• lang/perl/POE-Component-Server-JSONRPC/trunk/lib/POE/Component/Server/JSONRPC.pm (modified) (4 diffs)

lang/perl/POE-Component-Server-JSONRPC/trunk/lib/POE/Component/Server/JSONRPC.pm

@@ -5 +5 @@
 use JSON::RPC::Common::Procedure::Call;
 use JSON::RPC::Common::Procedure::Return;
-
-use JSON::RPC::Common::Procedure::Return::Version_1_0;
-use JSON::RPC::Common::Procedure::Return::Version_1_0::Error;
 
 our $VERSION = '0.02';
@@ -106 +103 @@
 );
 
+has default_version => (
+    isa => "Str",
+    is  => "rw",
+    default => sub { "1.0" }
+);
+
+has return_class => (
+    isa => "ClassName",
+    is  => "rw",
+    lazy_build => 1,
+    handles => { "create_return" => "new_from_data" },
+);
+
+sub _build_return_class {
+    my $self = shift;
+
+    my $class = JSON::RPC::Common::Procedure::Return->_version_class( $self->default_version );
+
+    Class::MOP::load_class($class);
+
+    return $class;
+}
+
 =head1 HANDLER PARAMETERS
 
@@ -218 +238 @@
             }
         } else {
-            # result, track req IDs, map back
+            # FIXME result, track req IDs, map back
         }
     } else {
+        $msg = (split /\n/, $msg)[0];
+        $msg =~ s/ at .+? line \d+//;
         $kernel->yield(error => $client, $msg);
     }
@@ -230 +252 @@
 
 event error => sub {
-    my ($kernel, $client, $error, $call) = @_[KERNEL, ARG0 .. ARG2];
-
-    if ( $call ) {
-        $client->put( $call->return_error($error) );
-    } else {
-        $client->put(
-            JSON::RPC::Common::Procedure::Return::Version_1_0->new(
-                id    => undef,
-                error => JSON::RPC::Common::Procedure::Return::Version_1_0::Error->new(
-                    message => $error,
-                ),
-            ),
-        );
-    }
+    my ($self, $kernel, $client, $error, $call) = @_[OBJECT, KERNEL, ARG0 .. ARG2];
+
+    $client->put( $call ? $call->return_error($error) : $self->new_error($error) );
+};
+
+sub new_error {
+    my ( $self, @args ) = @_;
+
+    $self->create_return(
+        id    => undef,
+        error => ( @args % 2 == 0 ? {@args} : $args[0] || "Invalid request" ),
+    );
 };