From c8981d00963dac0dc03e6351255ba8823519162c Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Sun, 9 Feb 2025 11:10:54 +0100
Subject: Implement `sipper` support through `Task::sip` :tada:

---
 runtime/Cargo.toml  |  3 ++-
 runtime/src/task.rs | 23 ++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

(limited to 'runtime')

diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index 703c3ed9..fc212ef8 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -23,5 +23,6 @@ iced_core.workspace = true
 iced_futures.workspace = true
 iced_futures.features = ["thread-pool"]
 
-thiserror.workspace = true
 raw-window-handle.workspace = true
+sipper.workspace = true
+thiserror.workspace = true
diff --git a/runtime/src/task.rs b/runtime/src/task.rs
index 22cfb63e..fb46ca45 100644
--- a/runtime/src/task.rs
+++ b/runtime/src/task.rs
@@ -3,7 +3,6 @@ use crate::core::widget;
 use crate::futures::futures::channel::mpsc;
 use crate::futures::futures::channel::oneshot;
 use crate::futures::futures::future::{self, FutureExt};
-use crate::futures::futures::never::Never;
 use crate::futures::futures::stream::{self, Stream, StreamExt};
 use crate::futures::{boxed_stream, BoxStream, MaybeSend};
 use crate::Action;
@@ -11,6 +10,9 @@ use crate::Action;
 use std::future::Future;
 use std::sync::Arc;
 
+#[doc(no_inline)]
+pub use sipper::{sipper, stream, Never, Sender, Sipper, Straw};
+
 /// A set of concurrent actions to be performed by the iced runtime.
 ///
 /// A [`Task`] _may_ produce a bunch of values of type `T`.
@@ -57,6 +59,25 @@ impl<T> Task<T> {
         Self::stream(stream.map(f))
     }
 
+    /// Creates a [`Task`] that runs the given [`Sipper`] to completion, mapping
+    /// progress with the first closure and the output with the second one.
+    pub fn sip<S, Output, Progress>(
+        sipper: S,
+        on_progress: impl Fn(Progress) -> T + Send + 'static,
+        on_output: impl FnOnce(Output) -> T + Send + 'static,
+    ) -> Self
+    where
+        S: Sipper<Output, Progress> + Send + 'static,
+        S::Future: Send + 'static,
+        Output: Send,
+        Progress: Send,
+        T: Send + 'static,
+    {
+        Self::stream(stream(sipper::sipper(move |sender| async move {
+            on_output(sipper.map(on_progress).run(sender).await)
+        })))
+    }
+
     /// Combines the given tasks and produces a single [`Task`] that will run all of them
     /// in parallel.
     pub fn batch(tasks: impl IntoIterator<Item = Self>) -> Self
-- 
cgit