send original error in ProxyGetRequest

server/src/middleware/http/proxy_get_request.rs

@@ -36,7 +36,7 @@ use hyper::header::{ACCEPT, CONTENT_TYPE};
 use hyper::http::HeaderValue;
 use hyper::{Method, Uri};
 use jsonrpsee_core::BoxError;
-use jsonrpsee_types::{Id, RequestSer};
+use jsonrpsee_types::{ErrorObject, Id, RequestSer};
 use std::collections::HashMap;
 use std::future::Future;
 use std::pin::Pin;
@@ -179,16 +179,27 @@ where
 						bytes.extend(data);
 					}
 
-					#[derive(serde::Deserialize)]
-					struct RpcPayload<'a> {
+					#[derive(serde::Deserialize, serde::Serialize, Debug)]
+					struct SuccessResponse<'a> {
 						#[serde(borrow)]
 						result: &'a serde_json::value::RawValue,
 					}
 
-					let response = if let Ok(payload) = serde_json::from_slice::<RpcPayload>(&bytes) {
+					#[derive(serde::Deserialize, serde::Serialize, Debug)]
+					struct ErrorResponse<'a> {
+						#[serde(borrow)]
+						error: &'a serde_json::value::RawValue,
+					}
+
+					let response = if let Ok(payload) = serde_json::from_slice::<SuccessResponse>(&bytes) {
 						http::response::ok_response(payload.result.to_string())
 					} else {
-						http::response::internal_error()
+						serde_json::from_slice::<ErrorResponse>(&bytes)
+							.and_then(|payload| serde_json::from_str::<ErrorObject>(&payload.error.to_string()))
+							.map_or_else(
+								|_| http::response::internal_error(),
+								|error| http::response::error_response(error.to_owned()),
+							)
 					};
 
 					Ok(response)

server/src/transport/http.rs

@@ -18,7 +18,7 @@
 
 /// Returns true if the `content_type` header indicates a valid JSON message.
 pub fn is_json(content_type: Option<&hyper::header::HeaderValue>) -> bool {
 	content_type.and_then(|val| val.to_str().ok()).map_or(false, |content| {
 		content.eq_ignore_ascii_case("application/json")
 			|| content.eq_ignore_ascii_case("application/json; charset=utf-8")
 			|| content.eq_ignore_ascii_case("application/json;charset=utf-8")
@@ -127,6 +127,15 @@
 		from_template(hyper::StatusCode::INTERNAL_SERVER_ERROR, error, JSON)
 	}
 
+	/// Create a json response for general errors returned by the called method.
+	pub fn error_response(error: ErrorObjectOwned) -> HttpResponse {
+		let err = ResponsePayload::<()>::error(error);
+		let rp = Response::new(err, Id::Null);
+		let error = serde_json::to_string(&rp).expect("JSON serialization infallible; qed");
+
+		from_template(hyper::StatusCode::INTERNAL_SERVER_ERROR, error, JSON)
+	}
+
 	/// Create a text/plain response for not allowed hosts.
 	pub fn host_not_allowed() -> HttpResponse {
 		from_template(hyper::StatusCode::FORBIDDEN, "Provided Host header is not whitelisted.\n", TEXT)