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

Hide Subscription internals

Browse source 
.. and introduce `stream::channel` helper
This commit is contained in:
Héctor Ramón Jiménez 2024-07-05 02:15:13 +02:00
parent e50aa03edc
commit 8bc49cd886
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
11 changed files with 268 additions and 246 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,87 +1,79 @@
pub mod server;
use iced::futures;
use iced::subscription::{self, Subscription};
use iced::stream;
use iced::widget::text;
use futures::channel::mpsc;
use futures::sink::SinkExt;
use futures::stream::StreamExt;
use futures::stream::{Stream, StreamExt};
use async_tungstenite::tungstenite;
use std::fmt;
pub fn connect() -> Subscription<Event> {
struct Connect;
pub fn connect() -> impl Stream<Item = Event> {
stream::channel(100, |mut output| async move {
let mut state = State::Disconnected;
subscription::channel(
std::any::TypeId::of::<Connect>(),
100,
|mut output| async move {
let mut state = State::Disconnected;
loop {
match &mut state {
State::Disconnected => {
const ECHO_SERVER: &str = "ws://127.0.0.1:3030";
loop {
match &mut state {
State::Disconnected => {
const ECHO_SERVER: &str = "ws://127.0.0.1:3030";
match async_tungstenite::tokio::connect_async(
ECHO_SERVER,
)
match async_tungstenite::tokio::connect_async(ECHO_SERVER)
.await
{
Ok((websocket, _)) => {
let (sender, receiver) = mpsc::channel(100);
{
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;
}
state = State::Connected(websocket, receiver);
}
Err(_) => {
tokio::time::sleep(
tokio::time::Duration::from_secs(1),
)
.await;
let _ = output.send(Event::Disconnected).await;
}
}
State::Connected(websocket, input) => {
let mut fused_websocket = websocket.by_ref().fuse();
}
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;
state = State::Disconnected;
}
Ok(_) => continue,
futures::select! {
received = fused_websocket.select_next_some() => {
match received {
Ok(tungstenite::Message::Text(message)) => {
let _ = output.send(Event::MessageReceived(Message::User(message))).await;
}
}
message = input.select_next_some() => {
let result = websocket.send(tungstenite::Message::Text(message.to_string())).await;
if result.is_err() {
Err(_) => {
let _ = output.send(Event::Disconnected).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;
}
}
}
}
}
},
)
}
})
}
#[derive(Debug)]

2
examples/websocket/src/main.rs
View file

@ -83,7 +83,7 @@ impl WebSocket {
}
fn subscription(&self) -> Subscription<Message> {
echo::connect().map(Message::Echo)
Subscription::run(echo::connect).map(Message::Echo)
}
fn view(&self) -> Element<Message> {