soaos/lightstreamer-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ (connection_options.rs): Add get_send_sync method for ConnectionOptions

Browse Source 
♻️ (ls_client.rs): Refactor message processing to handle multiple submessages
🐛 (ls_client.rs): Fix default instantiation of ConnectionOptions using default method
This commit is contained in:
Daniel López Azaña 2024-04-04 15:39:55 +02:00
parent 2565f3be41
commit 023758b3b5
2 changed files with 159 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/connection_options.rs
View File

@ -239,6 +239,13 @@ impl ConnectionOptions {
self.reverse_heartbeat_interval self.reverse_heartbeat_interval
} }
/// Inquiry method that gets if LS_send_sync is to be sent to the server.
/// If set to false, instructs the Server not to send the SYNC notifications on this connection.
/// If omitted, the default is true.
pub fn get_send_sync(&self) -> bool {
self.send_sync
}
/// Inquiry method that gets the maximum time allowed for attempts to recover the current session /// Inquiry method that gets the maximum time allowed for attempts to recover the current session
/// upon an interruption, after which a new session will be created. A 0 value also means that /// upon an interruption, after which a new session will be created. A 0 value also means that
/// any attempt to recover the current session is prevented in the first place. /// any attempt to recover the current session is prevented in the first place.

27
src/ls_client.rs
View File

@ -383,9 +383,15 @@ impl LightstreamerClient {
message = read_stream.next() => { message = read_stream.next() => {
match message { match message {
Some(Ok(Message::Text(text))) => { Some(Ok(Message::Text(text))) => {
let clean_text = clean_message(&text); // Messages could include multiple submessages separated by /r/n.
let message_fields: Vec<&str> = clean_text.split(",").collect(); // Split the message into submessages and process each one separately.
match *message_fields.first().unwrap_or(&"") { let submessages: Vec<&str> = text.split("\r\n")
.filter(|&line| !line.trim().is_empty()) // Filter out empty lines.
.collect();
for submessage in submessages {
let clean_text = clean_message(&submessage);
let submessage_fields: Vec<&str> = clean_text.split(",").collect();
match *submessage_fields.first().unwrap_or(&"") {
// //
// Errors from server. // Errors from server.
// //
@ -397,7 +403,7 @@ impl LightstreamerClient {
// Session created successfully. // Session created successfully.
// //
"conok" => { "conok" => {
if let Some(session_id) = message_fields.get(1).as_deref() { if let Some(session_id) = submessage_fields.get(1).as_deref() {
println!("Session creation confirmed by server: '{}'", clean_text); println!("Session creation confirmed by server: '{}'", clean_text);
println!("Session created with ID: {:?}", session_id); println!("Session created with ID: {:?}", session_id);
// //
@ -416,7 +422,7 @@ impl LightstreamerClient {
Some(item_group) => item_group.to_string(), Some(item_group) => item_group.to_string(),
None => match subscription.get_items() { None => match subscription.get_items() {
Some(items) => { Some(items) => {
items.join(",") items.join(" ")
}, },
None => { None => {
return Err(Box::new(std::io::Error::new( return Err(Box::new(std::io::Error::new(
@ -430,7 +436,7 @@ impl LightstreamerClient {
Some(field_schema) => field_schema.to_string(), Some(field_schema) => field_schema.to_string(),
None => match subscription.get_fields() { None => match subscription.get_fields() {
Some(fields) => { Some(fields) => {
fields.join(",") fields.join(" ")
}, },
None => { None => {
return Err(Box::new(std::io::Error::new( return Err(Box::new(std::io::Error::new(
@ -478,7 +484,7 @@ impl LightstreamerClient {
// //
// Notifications from server. // Notifications from server.
// //
"cons" | "servname" | "clientip" => { "conf" | "cons" | "clientip" | "servname" | "prog" | "sync" => {
println!("Received notification from server: {}", clean_text); println!("Received notification from server: {}", clean_text);
// Don't do anything with these notifications for now. // Don't do anything with these notifications for now.
}, },
@ -513,15 +519,19 @@ impl LightstreamerClient {
))); )));
}, },
}; };
let ls_send_sync = self.connection_options.get_send_sync().to_string();
println!("self.connection_options.get_send_sync(): {:?}", self.connection_options.get_send_sync());
let params: Vec<(&str, &str)> = vec![ let params: Vec<(&str, &str)> = vec![
("LS_adapter_set", &ls_adapter_set), ("LS_adapter_set", &ls_adapter_set),
("LS_cid", "mgQkwtwdysogQz2BJ4Ji%20kOj2Bg"), ("LS_cid", "mgQkwtwdysogQz2BJ4Ji%20kOj2Bg"),
("LS_send_sync", &ls_send_sync),
("LS_protocol", "TLCP-2.5.0"), ("LS_protocol", "TLCP-2.5.0"),
]; ];
let encoded_params = serde_urlencoded::to_string(&params)?; let encoded_params = serde_urlencoded::to_string(&params)?;
write_stream write_stream
.send(Message::Text(format!("create_session\r\n{}\n", encoded_params))) .send(Message::Text(format!("create_session\r\n{}\n", encoded_params)))
.await?; .await?;
println!("Sent create session request: '{}'", encoded_params);
}, },
unexpected_message => { unexpected_message => {
return Err(Box::new(std::io::Error::new( return Err(Box::new(std::io::Error::new(
@ -533,6 +543,7 @@ impl LightstreamerClient {
))); )));
}, },
} }
}
}, },
Some(Ok(non_text_message)) => { Some(Ok(non_text_message)) => {
return Err(Box::new(std::io::Error::new( return Err(Box::new(std::io::Error::new(
@ -700,7 +711,7 @@ impl LightstreamerClient {
adapter_set: Option<&str>, adapter_set: Option<&str>,
) -> Result<LightstreamerClient, IllegalStateException> { ) -> Result<LightstreamerClient, IllegalStateException> {
let connection_details = ConnectionDetails::new(server_address, adapter_set); let connection_details = ConnectionDetails::new(server_address, adapter_set);
let connection_options = ConnectionOptions::new(); let connection_options = ConnectionOptions::default();
Ok(LightstreamerClient { Ok(LightstreamerClient {
server_address: server_address.map(|s| s.to_string()), server_address: server_address.map(|s| s.to_string()),