v0.2.7-pre.010

crates/ksp-onchain-transport-lib/src/ws_subscription.rs

@@ -1,5 +1,5 @@
 // file: crates/ksp-onchain-transport-lib/src/ws_subscription.rs
-// version: 3
+// version: 4
 
 /// Typed handle for one logical Solana WebSocket subscription.
 ///
@@ -124,6 +124,7 @@ impl<T> std::fmt::Debug for WsSubscription<T> {
 /// Internal result of dispatching one decoded wire notification into a bounded typed channel.
 pub(crate) enum WsNotificationDispatchOutcome {
     Delivered,
+    DeliveredTerminal,
     ReceiverClosed,
     QueueFull,
     DecodeFailed { code: ksp_core_lib::ErrorCode },
@@ -137,6 +138,20 @@ pub(crate) fn typed_notification_channel<T, F>(capacity: usize, decoder: F) -> (
 where
     T: std::marker::Send + 'static,
     F: Fn(serde_json::Value) -> ksp_core_lib::Result<T> + std::marker::Send + std::marker::Sync + 'static,
+{
+    return typed_notification_channel_with_completion(capacity, decoder, |_| return false);
+}
+
+/// Creates one bounded typed notification receiver whose dispatcher can mark a successfully delivered value as terminal.
+pub(crate) fn typed_notification_channel_with_completion<T, F, C>(
+    capacity: usize,
+    decoder: F,
+    is_terminal: C,
+) -> (WsNotificationDispatcher, tokio::sync::mpsc::Receiver<ksp_core_lib::Result<T>>)
+where
+    T: std::marker::Send + 'static,
+    F: Fn(serde_json::Value) -> ksp_core_lib::Result<T> + std::marker::Send + std::marker::Sync + 'static,
+    C: Fn(&T) -> bool + std::marker::Send + std::marker::Sync + 'static,
 {
     let (notification_tx, notification_rx) = tokio::sync::mpsc::channel(capacity);
     let dispatcher = move |value: serde_json::Value| -> WsNotificationDispatchOutcome {
@@ -151,7 +166,11 @@ where
         };
         return match decoder(value) {
             std::result::Result::Ok(notification) => {
+                let terminal = is_terminal(&notification);
                 permit.send(std::result::Result::Ok(notification));
+                if terminal {
+                    return WsNotificationDispatchOutcome::DeliveredTerminal;
+                }
                 WsNotificationDispatchOutcome::Delivered
             },
             std::result::Result::Err(error) => {