From 5c80b291fc776a7114572cebff898a7b3bf0671b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B3pez=20Aza=C3=B1a?= Date: Thu, 28 Mar 2024 20:21:52 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20(lib.rs):=20introduce=20`ls=5Fclien?= =?UTF-8?q?t`=20module=20as=20a=20cleaner=20naming=20convention=20?= =?UTF-8?q?=E2=9C=A8=20(ls=5Fclient.rs):=20add=20`LightstreamerClient`=20s?= =?UTF-8?q?truct=20and=20associated=20methods=20for=20managing=20communica?= =?UTF-8?q?tion=20with=20Lightstreamer=20Server=20=E2=9C=A8=20(main.rs):?= =?UTF-8?q?=20update=20imports=20to=20use=20new=20`ls=5Fclient`=20module?= =?UTF-8?q?=20and=20add=20data=20adapter=20and=20snapshot=20configuration?= =?UTF-8?q?=20to=20subscription=20=E2=99=BB=EF=B8=8F=20(lib.rs):=20refacto?= =?UTF-8?q?r=20`lightstreamer=5Fclient`=20to=20`ls=5Fclient`=20for=20consi?= =?UTF-8?q?stency=20with=20new=20module=20name=20=F0=9F=93=9D=20(ls=5Fclie?= =?UTF-8?q?nt.rs):=20add=20comprehensive=20documentation=20for=20`Lightstr?= =?UTF-8?q?eamerClient`=20and=20its=20methods?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ✨ (subscription.rs): add Snapshot enum to define snapshot delivery preferences ♻️ (subscription.rs): refactor requested_snapshot to use Snapshot enum for clarity 💡 (subscription.rs): update comments to reflect changes in snapshot handling --- src/lib.rs | 2 +- src/{lightstreamer_client.rs => ls_client.rs} | 0 src/main.rs | 14 ++++---- src/subscription.rs | 34 ++++++++++++++----- 4 files changed, 32 insertions(+), 18 deletions(-) rename src/{lightstreamer_client.rs => ls_client.rs} (100%) diff --git a/src/lib.rs b/src/lib.rs index 3ae6463..cf5cc4c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -7,7 +7,7 @@ pub mod item_update; pub mod subscription_listener; pub mod connection_details; pub mod connection_options; -pub mod lightstreamer_client; +pub mod ls_client; pub mod proxy; pub mod subscription; diff --git a/src/lightstreamer_client.rs b/src/ls_client.rs similarity index 100% rename from src/lightstreamer_client.rs rename to src/ls_client.rs diff --git a/src/main.rs b/src/main.rs index 2dddb0d..5c2acc5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,10 +1,10 @@ -use crate::item_update::ItemUpdate; -use crate::subscription::{Subscription, SubscriptionMode}; -use crate::subscription_listener::SubscriptionListener; +use lightstreamer_client::item_update::ItemUpdate; +use lightstreamer_client::ls_client::LightstreamerClient; +use lightstreamer_client::subscription::{Snapshot, Subscription, SubscriptionMode}; +use lightstreamer_client::subscription_listener::SubscriptionListener; use futures::stream::StreamExt; use futures::SinkExt; -use lightstreamer_client::lightstreamer_client::LightstreamerClient; use reqwest::Client; use serde_urlencoded; use std::error::Error; @@ -12,10 +12,6 @@ use std::sync::Arc; use tokio::sync::Mutex; use tokio_tungstenite::{connect_async, tungstenite::protocol::Message}; -mod item_update; -mod subscription; -mod subscription_listener; - async fn establish_persistent_http_connection( session_id_shared: Arc>, ) -> Result<(), reqwest::Error> { @@ -225,6 +221,8 @@ async fn main() -> Result<(), Box> { )?; subscription.add_listener(Box::new(MySubscriptionListener {})); + subscription.set_data_adapter(Some(String::from("QUOTE_ADAPTER")))?; + subscription.set_requested_snapshot(Some(Snapshot::Yes))?; let client = LightstreamerClient::new( Some("http://push.lightstreamer.com/lightstreamer"), diff --git a/src/subscription.rs b/src/subscription.rs index f7e0d88..be10380 100644 --- a/src/subscription.rs +++ b/src/subscription.rs @@ -2,7 +2,16 @@ use crate::subscription_listener::SubscriptionListener; use std::collections::HashMap; use std::fmt::{self, Debug, Formatter}; -/// Enum representing the subscription mode +/// Enum representing the snapshot delivery preferences to be requested to Lightstreamer Server for the items in the Subscription. +#[derive(Debug)] +pub enum Snapshot { + Yes, + No, + Number(usize), + None, +} + +/// Enum representing the subscription mode. #[derive(Debug, PartialEq, Eq)] pub enum SubscriptionMode { Merge, @@ -49,7 +58,7 @@ pub struct Subscription { /// The maximum update frequency to be requested to Lightstreamer Server for all the items in the Subscription. requested_max_frequency: Option, /// The snapshot delivery preferences to be requested to Lightstreamer Server for the items in the Subscription. - requested_snapshot: Option, + requested_snapshot: Option, /// The selector name for all the items in the Subscription, used as a filter on the updates received. selector: Option, /// A list of SubscriptionListener instances that will receive events from this Subscription. @@ -618,15 +627,22 @@ impl Subscription { /// /// # See also /// `ItemUpdate.isSnapshot()` - pub fn set_requested_snapshot(&mut self, snapshot: Option) -> Result<(), String> { + pub fn set_requested_snapshot(&mut self, snapshot: Option) -> Result<(), String> { if self.is_active { return Err("Subscription is active".to_string()); } - if self.mode == SubscriptionMode::Raw && snapshot.is_some() { - return Err("Cannot request snapshot for Raw mode".to_string()); - } - if self.mode != SubscriptionMode::Distinct && snapshot.is_some() && snapshot.as_ref().unwrap().parse::().is_ok() { - return Err("Cannot specify snapshot length for non-Distinct mode".to_string()); + match snapshot { + Some(Snapshot::None) => { + if self.mode == SubscriptionMode::Raw { + return Err("Cannot request snapshot for Raw mode".to_string()); + } + } + Some(Snapshot::Number(_)) => { + if self.mode != SubscriptionMode::Distinct { + return Err("Cannot specify snapshot length for non-Distinct mode".to_string()); + } + } + _ => {} } self.requested_snapshot = snapshot; Ok(()) @@ -639,7 +655,7 @@ impl Subscription { /// /// # Returns /// "yes", "no", `None`, or an integer number. - pub fn get_requested_snapshot(&self) -> Option<&String> { + pub fn get_requested_snapshot(&self) -> Option<&Snapshot> { self.requested_snapshot.as_ref() }