Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(client): add Error::Closed for ws close #1497

Merged
merged 4 commits into from
Dec 4, 2024
Merged

fix(client): add Error::Closed for ws close #1497

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dfdf835
fix(client): add Error::Closed for ws close
niklasad1 Nov 29, 2024
d23d92f
remove needless loop
niklasad1 Nov 30, 2024
1919c1a
Merge branch 'master' into na-ws-client-close-reason-err
niklasad1 Dec 4, 2024
be4b210
Merge branch 'master' into na-ws-client-close-reason-err
niklasad1 Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions client/transport/src/ws/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ use futures_util::io::{BufReader, BufWriter};
use jsonrpsee_core::client::{MaybeSend, ReceivedMessage, TransportReceiverT, TransportSenderT};
use jsonrpsee_core::TEN_MB_SIZE_BYTES;
use jsonrpsee_core::{async_trait, Cow};
use soketto::connection::CloseReason;
use soketto::connection::Error::Utf8;
use soketto::data::ByteSlice125;
use soketto::handshake::client::{Client as WsHandshakeClient, ServerResponse};
Expand Down Expand Up @@ -230,6 +231,9 @@ pub enum WsError {
/// Message was too large.
#[error("The message was too large")]
MessageTooLarge,
/// Connection was closed.
#[error("Connection was closed: {0:?}")]
Closed(CloseReason),
}

#[async_trait]
Expand Down Expand Up @@ -280,19 +284,16 @@ where

/// Returns a `Future` resolving when the server sent us something back.
async fn receive(&mut self) -> Result<ReceivedMessage, Self::Error> {
loop {
let mut message = Vec::new();
let recv = self.inner.receive(&mut message).await?;

match recv {
Incoming::Data(Data::Text(_)) => {
let s = String::from_utf8(message).map_err(|err| WsError::Connection(Utf8(err.utf8_error())))?;
break Ok(ReceivedMessage::Text(s));
}
Incoming::Data(Data::Binary(_)) => break Ok(ReceivedMessage::Bytes(message)),
Incoming::Pong(_) => break Ok(ReceivedMessage::Pong),
_ => continue,
let mut message = Vec::new();

match self.inner.receive(&mut message).await? {
Incoming::Data(Data::Text(_)) => {
let s = String::from_utf8(message).map_err(|err| WsError::Connection(Utf8(err.utf8_error())))?;
Ok(ReceivedMessage::Text(s))
}
Incoming::Data(Data::Binary(_)) => Ok(ReceivedMessage::Bytes(message)),
Incoming::Pong(_) => Ok(ReceivedMessage::Pong),
Incoming::Closed(c) => Err(WsError::Closed(c)),
}
}
}
Expand Down
Loading