return parameter deserialisation errors (close #69)

andogq · Jun 24, 2024 · 1fb61ac · 1fb61ac
1 parent e72078a
commit 1fb61ac
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/.changes/return-param-errors.md b/.changes/return-param-errors.md
@@ -0,0 +1,6 @@
+---
+"qubit": patch:feat
+"qubit-macros": patch:feat
+---
+
+return parameter deserialising errors if they are encountered (close #69)
diff --git a/crates/qubit-macros/src/handler/mod.rs b/crates/qubit-macros/src/handler/mod.rs
@@ -237,7 +237,10 @@ impl From<Handler> for TokenStream {
             // Generate the parameter parsing implementation
             let parse_params = (!inputs.is_empty()).then(|| {
                 quote! {
-                    let (#(#param_names,)*) = #params_ident.parse::<(#(#param_tys,)*)>().unwrap();
+                    let (#(#param_names,)*) = match #params_ident.parse::<(#(#param_tys,)*)>() {
+                        ::std::result::Result::Ok(params) => params,
+                        ::std::result::Result::Err(e) => return ::std::result::Result::Err(e),
+                    };
                 }
             });
 
@@ -251,7 +254,8 @@ impl From<Handler> for TokenStream {
             let register_inner = quote! {
                 #parse_params
 
-                #handler_call
+                let result = #handler_call;
+                ::std::result::Result::Ok::<_, ::qubit::ErrorObject>(result)
             };
 
             let register_method = match kind {

diff --git a/src/builder/mod.rs b/src/builder/mod.rs
@@ -9,3 +9,6 @@ pub use handler::Handler;
 pub(crate) use handler::HandlerCallbacks;
 pub use rpc_builder::RpcBuilder;
 pub use ty::*;
+
+pub use jsonrpsee::types::ErrorObject;
+pub use jsonrpsee::IntoResponse;
diff --git a/src/builder/rpc_builder.rs b/src/builder/rpc_builder.rs
@@ -2,10 +2,10 @@ use std::ops::Deref;
 
 use futures::{Future, Stream, StreamExt};
 use jsonrpsee::{
-    types::{ErrorCode, Params, ResponsePayload},
-    RpcModule, SubscriptionCloseResponse, SubscriptionMessage,
+    types::{ErrorCode, ErrorObject, Params, ResponsePayload},
+    IntoResponse, RpcModule, SubscriptionCloseResponse, SubscriptionMessage,
 };
-use serde::Serialize;
+use serde::{de::Error, Serialize};
 use serde_json::json;
 
 use crate::{FromRequestExtensions, RequestKind, RpcError};
@@ -50,7 +50,7 @@ where
         T: Serialize + Clone + 'static,
         C: FromRequestExtensions<Ctx>,
         F: Fn(C, Params<'static>) -> Fut + Send + Sync + Clone + 'static,
-        Fut: Future<Output = T> + Send + 'static,
+        Fut: Future<Output = Result<T, ErrorObject<'static>>> + Send + 'static,
     {
         self.register_handler(name, handler, RequestKind::Query)
     }
@@ -61,7 +61,7 @@ where
         T: Serialize + Clone + 'static,
         C: FromRequestExtensions<Ctx>,
         F: Fn(C, Params<'static>) -> Fut + Send + Sync + Clone + 'static,
-        Fut: Future<Output = T> + Send + 'static,
+        Fut: Future<Output = Result<T, ErrorObject<'static>>> + Send + 'static,
     {
         self.register_handler(name, handler, RequestKind::Mutation)
     }
@@ -78,7 +78,7 @@ where
         T: Serialize + Clone + 'static,
         C: FromRequestExtensions<Ctx>,
         F: Fn(C, Params<'static>) -> Fut + Send + Sync + Clone + 'static,
-        Fut: Future<Output = T> + Send + 'static,
+        Fut: Future<Output = Result<T, jsonrpsee::types::ErrorObject<'static>>> + Send + 'static,
     {
         self.module
             .register_async_method(self.namespace_str(name), move |params, ctx, extensions| {
@@ -114,7 +114,10 @@ where
                         };
 
                     // Run the actual handler
-                    ResponsePayload::success(handler(ctx, params).await)
+                    match handler(ctx, params).await {
+                        Ok(result) => ResponsePayload::success(result),
+                        Err(e) => ResponsePayload::error(e),
+                    }
                 }
             })
             .unwrap();