me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rewrite websocket example using sipper

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2025-02-11 01:27:51 +01:00
parent 05618ea9b3
commit f37d068af5
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
4 changed files with 45 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

102
examples/websocket/src/echo.rs
View file

@ -1,73 +1,63 @@
pub mod server;
use iced::futures;
use iced::stream;
use iced::task::{sipper, Never, Sipper};
use iced::widget::text;
use futures::channel::mpsc;
use futures::sink::SinkExt;
use futures::stream::{Stream, StreamExt};
use futures::stream::StreamExt;
use async_tungstenite::tungstenite;
use std::fmt;
pub fn connect() -> impl Stream<Item = Event> {
stream::channel(100, |mut output| async move {
let mut state = State::Disconnected;
pub fn connect() -> impl Sipper<Never, Event> {
sipper(|mut output| async move {
loop {
match &mut state {
State::Disconnected => {
const ECHO_SERVER: &str = "ws://127.0.0.1:3030";
const ECHO_SERVER: &str = "ws://127.0.0.1:3030";
match async_tungstenite::tokio::connect_async(ECHO_SERVER)
.await
{
Ok((websocket, _)) => {
let (sender, receiver) = mpsc::channel(100);
let (mut websocket, mut input) =
match async_tungstenite::tokio::connect_async(ECHO_SERVER).await
{
Ok((websocket, _)) => {
let (sender, receiver) = mpsc::channel(100);
let _ = output
.send(Event::Connected(Connection(sender)))
.await;
state = State::Connected(websocket, receiver);
}
Err(_) => {
tokio::time::sleep(
tokio::time::Duration::from_secs(1),
)
let _ = output
.send(Event::Connected(Connection(sender)))
.await;
let _ = output.send(Event::Disconnected).await;
(websocket.fuse(), receiver)
}
Err(_) => {
tokio::time::sleep(tokio::time::Duration::from_secs(1))
.await;
let _ = output.send(Event::Disconnected).await;
continue;
}
};
loop {
futures::select! {
received = websocket.select_next_some() => {
match received {
Ok(tungstenite::Message::Text(message)) => {
let _ = output.send(Event::MessageReceived(Message::User(message))).await;
}
Err(_) => {
let _ = output.send(Event::Disconnected).await;
break;
}
Ok(_) => continue,
}
}
}
State::Connected(websocket, input) => {
let mut fused_websocket = websocket.by_ref().fuse();
futures::select! {
received = fused_websocket.select_next_some() => {
match received {
Ok(tungstenite::Message::Text(message)) => {
let _ = output.send(Event::MessageReceived(Message::User(message))).await;
}
Err(_) => {
let _ = output.send(Event::Disconnected).await;
message = input.select_next_some() => {
let result = websocket.send(tungstenite::Message::Text(message.to_string())).await;
state = State::Disconnected;
}
Ok(_) => continue,
}
}
message = input.select_next_some() => {
let result = websocket.send(tungstenite::Message::Text(message.to_string())).await;
if result.is_err() {
let _ = output.send(Event::Disconnected).await;
state = State::Disconnected;
}
if result.is_err() {
let _ = output.send(Event::Disconnected).await;
}
}
}
@ -76,18 +66,6 @@ pub fn connect() -> impl Stream<Item = Event> {
})
}
#[derive(Debug)]
#[allow(clippy::large_enum_variant)]
enum State {
Disconnected,
Connected(
async_tungstenite::WebSocketStream<
async_tungstenite::tokio::ConnectStream,
>,
mpsc::Receiver<Message>,
),
}
#[derive(Debug, Clone)]
pub enum Event {
Connected(Connection),