feat(net4mqtt): conf use alias replace template mqtt_url

binbat · Nov 26, 2024 · cfdfa88 · cfdfa88
1 parent 07e3f88
commit cfdfa88
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 4 deletions.
diff --git a/conf/live777.toml b/conf/live777.toml
@@ -59,5 +59,8 @@ urls = [
 
 # Default enabled `--features=net4mqtt`
 # [net4mqtt]
-# mqtt_url = "mqtt://localhost:1883/net4mqtt"
+# Global unique alias
 # alias = "liveion-0"
+# `client_id={alias}` use alias as MQTT `client_id`
+# mqtt_url = "mqtt://localhost:1883/net4mqtt?client_id={alias}"
+
diff --git a/conf/liveman.toml b/conf/liveman.toml
@@ -41,8 +41,10 @@
 # close_other_sub = false
 
 # [net4mqtt]
-# mqtt_url = "mqtt://localhost:1883/net4mqtt"
+# Global unique alias
 # alias = "liveman-0"
+# `client_id={alias}` use alias as MQTT `client_id`
+# mqtt_url = "mqtt://localhost:1883/net4mqtt?client_id={alias}"
 # listen = "127.0.0.1:1077"
 # domain = "net4mqtt.local"
 

diff --git a/liveion/src/config.rs b/liveion/src/config.rs
@@ -37,6 +37,13 @@ pub struct Net4mqtt {
     pub alias: String,
 }
 
+#[cfg(feature = "net4mqtt")]
+impl Net4mqtt {
+    pub fn validate(&mut self) {
+        self.mqtt_url = self.mqtt_url.replace("{alias}", &self.alias)
+    }
+}
+
 #[derive(Debug, Default, Clone, Deserialize, Serialize)]
 pub struct Webhook {
     #[serde(default)]

diff --git a/liveion/src/lib.rs b/liveion/src/lib.rs
@@ -84,7 +84,8 @@ where
 
     #[cfg(feature = "net4mqtt")]
     {
-        if let Some(c) = cfg.net4mqtt {
+        if let Some(mut c) = cfg.net4mqtt {
+            c.validate();
             std::thread::spawn(move || {
                 tokio::runtime::Runtime::new()
                     .unwrap()

diff --git a/liveman/src/config.rs b/liveman/src/config.rs
@@ -46,6 +46,13 @@ pub struct Net4mqtt {
     pub domain: String,
 }
 
+#[cfg(feature = "net4mqtt")]
+impl Net4mqtt {
+    pub fn validate(&mut self) {
+        self.mqtt_url = self.mqtt_url.replace("{alias}", &self.alias)
+    }
+}
+
 #[cfg(feature = "net4mqtt")]
 impl Default for Net4mqtt {
     fn default() -> Self {

diff --git a/liveman/src/lib.rs b/liveman/src/lib.rs
@@ -71,7 +71,8 @@ where
 
     #[cfg(feature = "net4mqtt")]
     {
-        if let Some(c) = cfg.net4mqtt.clone() {
+        if let Some(mut c) = cfg.net4mqtt.clone() {
+            c.validate();
             let (sender, mut receiver) =
                 tokio::sync::mpsc::channel::<(String, String, Vec<u8>)>(10);