+2 -2

crates/jetstream/src/client_builder.rs

reviewed

··· 1 1 use super::JetstreamClient; 2 2 - use crate::{Receiver, metrics::Metrics, subscriber_options::Options}; 2 2 + use crate::{Receiver, metrics::Metrics, subscriber_options::SubscriberOptions}; 3 3 use atproto::{Did, Nsid}; 4 4 use tokio_util::sync::CancellationToken; 5 5 use url::Url; ··· 7 7 #[derive(Default)] 8 8 pub struct JetstreamClientBuilder { 9 9 cursor: Option<u128>, 10 10 - options: Options, 10 10 + options: SubscriberOptions, 11 11 } 12 12 13 13 impl JetstreamClientBuilder {

+5 -5

crates/jetstream/src/subscriber_options.rs

reviewed

··· 19 19 #[derive(Debug, Serialize)] 20 20 #[serde(tag = "type", content = "payload", rename_all = "snake_case")] 21 21 pub enum SubscriberSourcedMessage<'a> { 22 22 - OptionsUpdate(&'a Options), 22 22 + OptionsUpdate(&'a SubscriberOptions), 23 23 } 24 24 25 25 impl<'a> SubscriberSourcedMessage<'a> { ··· 38 38 /// 39 39 #[derive(Debug, Default, Serialize)] 40 40 #[serde(rename_all = "camelCase")] 41 41 - pub struct Options { 41 41 + pub struct SubscriberOptions { 42 42 /// Collection NSIDs to filter which records are received. 43 43 /// 44 44 /// Maximum: 100 ··· 68 68 serializer.serialize_i64(normalize_max_message_size(*value)) 69 69 } 70 70 71 71 - impl Options { 71 71 + impl SubscriberOptions { 72 72 /// Add a collection NSID to the subscription options. 73 73 /// 74 74 /// Returns an error if the maximum number of subscribed collections has been reached; `Ok(true)` ··· 189 189 mod tests { 190 190 use atproto::Nsid; 191 191 192 192 - use super::Options; 192 192 + use super::SubscriberOptions; 193 193 194 194 #[test] 195 195 fn query_len() { 196 196 - let mut options = Options::default(); 196 196 + let mut options = SubscriberOptions::default(); 197 197 options 198 198 .add_collection(Nsid::from_static("sh.tangled.*").into()) 199 199 .unwrap();

+4 -4

crates/jetstream/src/task.rs

reviewed

··· 1 1 use crate::{ 2 2 client::ClientCommand, 3 3 metrics::Metrics, 4 4 - subscriber_options::{Options, SubscribeMethod}, 4 4 + subscriber_options::{SubscribeMethod, SubscriberOptions}, 5 5 }; 6 6 use bytes::Bytes; 7 7 use futures_util::{SinkExt, StreamExt as _}; ··· 28 28 client_rx: flume::Receiver<ClientCommand>, 29 29 metrics: Metrics, 30 30 instance: url::Url, 31 31 - mut options: Options, 31 31 + mut options: SubscriberOptions, 32 32 initial_cursor: Option<u128>, 33 33 shutdown: CancellationToken, 34 34 ) { ··· 239 239 tracing::warn!("jetstream subscriber task ended"); 240 240 } 241 241 242 242 - async fn send_options_update<S, E>(sink: &mut S, options: &Options) -> Result<(), E> 242 242 + async fn send_options_update<S, E>(sink: &mut S, options: &SubscriberOptions) -> Result<(), E> 243 243 where 244 244 S: SinkExt<Message> + Unpin, 245 245 E: From<S::Error>, ··· 259 259 260 260 fn process_command( 261 261 command: ClientCommand, 262 262 - options: &mut Options, 262 262 + options: &mut SubscriberOptions, 263 263 ) -> ControlFlow<(), (Outcome, Arc<Notify>)> { 264 264 match command { 265 265 ClientCommand::AddDid { complete, did } => match options.add_did(did) {