robin/tasmota-mqtt-client
1
0
Fork 0
mirror of https://codeberg.org/icewind/tasmota-mqtt-client.git synced 2026-06-03 18:24:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

allow connecting with existing mqttoptions

Browse source
This commit is contained in:
Robin Appelman 2024-10-30 19:27:02 +01:00
commit 78f89a491f
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/lib.rs
View file

@ -67,7 +67,12 @@ impl TasmotaClient {
if let Some((username, password)) = credentials { if let Some((username, password)) = credentials {
mqtt_opts.set_credentials(username, password); mqtt_opts.set_credentials(username, password);
} }
let mqtt = MqttHelper::connect(mqtt_opts)?; Self::from_mqtt_options(mqtt_opts).await
}
/// Connect to an MQTT server using an existing [`MqttOptions`].
pub async fn from_mqtt_options(options: MqttOptions) -> Result<Self> {
let mqtt = MqttHelper::connect(options);
let mut lwt = mqtt.subscribe("tele/+/LWT".into()).await?; let mut lwt = mqtt.subscribe("tele/+/LWT".into()).await?;

4
src/mqtt.rs
View file

@ -17,7 +17,7 @@ pub struct MqttHelper {
} }
impl MqttHelper { impl MqttHelper {
pub fn connect(opts: MqttOptions) -> Result<Self> { pub fn connect(opts: MqttOptions) -> Self {
let (client, event_loop) = AsyncClient::new(opts, 10); let (client, event_loop) = AsyncClient::new(opts, 10);
let listeners = Arc::<Mutex<Vec<(String, Sender<_>)>>>::default(); let listeners = Arc::<Mutex<Vec<(String, Sender<_>)>>>::default();
@ -55,7 +55,7 @@ impl MqttHelper {
} }
}); });
Ok(Self { client, listeners }) Self { client, listeners }
} }
pub async fn send<B: Serialize>(&self, topic: &str, body: &B) -> Result<()> { pub async fn send<B: Serialize>(&self, topic: &str, body: &B) -> Result<()> {