fix(mqtt): persist topics and support advanced options

This commit is contained in:
jinmo authored and GitHub committed 2026-08-06 23:15:17 +08:00
1 parent 670ddcfcb3
commit ab586d121a
19 files changed
+347 -51

No files matched your search

+25 -2
View File
@@ -1,3 +1,4 @@
use serde_json::json;
use std::sync::Arc;
use tauri::State;
@@ -19,6 +20,25 @@ async fn get_mqtt_client(
}
}
async fn persist_mqtt_topics(
state: &AppState,
connection_id: &str,
client: &dbx_core::mqtt::client::MqttClient,
) -> Result<(), String> {
let saved_topics = client.desired_topic_configs().await;
let Some(mut config) = state.configs.read().await.get(connection_id).cloned() else {
return Ok(());
};
let mut external_config = config.external_config.take().unwrap_or_else(|| json!({}));
let Some(external_object) = external_config.as_object_mut() else {
return Err("MQTT external_config 必须是 JSON 对象".to_string());
};
external_object.insert("savedTopics".to_string(), serde_json::to_value(saved_topics).map_err(|e| e.to_string())?);
config.external_config = Some(external_config);
state.storage.save_connections(std::slice::from_ref(&config)).await?;
state.configs.write().await.insert(connection_id.to_string(), config);
Ok(())
}
/// 获取 broker 基本信息
#[tauri::command]
pub async fn mqtt_get_broker_info(
@@ -36,9 +56,11 @@ pub async fn mqtt_subscribe(
connection_id: String,
topic: String,
qos: Option<MqttQoS>,
no_local: Option<bool>,
) -> Result<(), String> {
let client = get_mqtt_client(&state, &connection_id).await?;
service::subscribe(&client, &topic, qos.unwrap_or_default()).await
service::subscribe(&client, &topic, qos.unwrap_or_default(), no_local.unwrap_or(false)).await?;
persist_mqtt_topics(state.inner(), &connection_id, &client).await
}
/// 取消订阅 topic
@@ -49,7 +71,8 @@ pub async fn mqtt_unsubscribe(
topic: String,
) -> Result<(), String> {
let client = get_mqtt_client(&state, &connection_id).await?;
service::unsubscribe(&client, &topic).await
service::unsubscribe(&client, &topic).await?;
persist_mqtt_topics(state.inner(), &connection_id, &client).await
}
/// 发布消息