tornadocontrib/web3-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

less json errors

Browse Source
This commit is contained in:
Bryan Stitt 2022-06-03 21:45:44 +00:00
parent d2033b0a4e
commit 24b76a33bc
2 changed files with 56 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
web3-proxy/src/connections.rs
View File

@ -469,17 +469,32 @@ impl Web3Connections {
.request(&request.method, &request.params)
.await;
let response =
JsonRpcForwardedResponse::from_response_result(response_result, request.id);
match JsonRpcForwardedResponse::from_response_result(
response_result,
request.id.clone(),
) {
Ok(response) => {
if response.error.is_some() {
trace!(?response, "Sending error reply",);
// errors already sent false to the in_flight_tx
} else {
trace!(?response, "Sending reply");
}
if response.error.is_some() {
trace!(?response, "Sending error reply",);
// errors already sent false to the in_flight_tx
} else {
trace!(?response, "Sending reply");
return Ok(response);
}
Err(e) => {
warn!(?self, ?e, "Backend server error!");
// TODO: sleep how long? until synced_connections changes or rate limits are available
sleep(Duration::from_millis(100)).await;
// TODO: when we retry, depending on the error, skip using this same server
// for example, if rpc isn't available on this server, retrying is bad
// but if an http error, retrying on same is probably fine
continue;
}
}
return Ok(response);
}
Err(None) => {
warn!(?self, "No servers in sync!");

65
web3-proxy/src/jsonrpc.rs
View File

@ -184,9 +184,9 @@ impl JsonRpcForwardedResponse {
pub fn from_response_result(
result: Result<Box<RawValue>, ProviderError>,
id: Box<RawValue>,
) -> Self {
) -> anyhow::Result<Self> {
match result {
Ok(response) => Self::from_response(response, id),
Ok(response) => Ok(Self::from_response(response, id)),
Err(e) => Self::from_ethers_error(e, id),
}
}
@ -208,7 +208,7 @@ impl JsonRpcForwardedResponse {
}
}
pub fn from_ethers_error(e: ProviderError, id: Box<RawValue>) -> Self {
pub fn from_ethers_error(e: ProviderError, id: Box<RawValue>) -> anyhow::Result<Self> {
// TODO: move turning ClientError into json to a helper function?
let code;
let message: String;
@ -216,47 +216,46 @@ impl JsonRpcForwardedResponse {
match e {
ProviderError::JsonRpcClientError(e) => {
// TODO: we should check what type the provider is rather than trying to downcast both types of errors
if let Some(e) = e.downcast_ref::<HttpClientError>() {
match &*e {
// TODO: check what type the provider is rather than trying to downcast both types of errors
let e = e.downcast::<HttpClientError>();
if let Ok(e) = e {
match *e {
HttpClientError::JsonRpcError(e) => {
code = e.code;
message = e.message.clone();
data = e.data.clone();
data = e.data;
}
e => {
// TODO: improve this
code = -32603;
message = format!("{}", e);
data = None;
}
}
} else if let Some(e) = e.downcast_ref::<WsClientError>() {
match &*e {
WsClientError::JsonRpcError(e) => {
code = e.code;
message = e.message.clone();
data = e.data.clone();
}
e => {
// TODO: improve this
code = -32603;
message = format!("{}", e);
data = None;
// this is not an rpc error. keep it as an error
return Err(e.into());
}
}
} else {
unimplemented!();
// it wasn't an HttpClientError. try WsClientError
let e = e.unwrap_err().downcast::<WsClientError>();
if let Ok(e) = e {
match *e {
WsClientError::JsonRpcError(e) => {
code = e.code;
message = e.message.clone();
data = e.data;
}
e => {
// this is not an rpc error. keep it as an error
return Err(e.into());
}
}
} else {
unimplemented!();
}
}
}
_ => {
code = -32603;
message = format!("{}", e);
data = None;
}
e => return Err(e.into()),
}
Self {
Ok(Self {
jsonrpc: "2.0".to_string(),
id,
result: None,
@ -265,7 +264,7 @@ impl JsonRpcForwardedResponse {
message,
data,
}),
}
})
}
}