Add Plugin::authors(&self),Plugin::homepage(&self),Plugin::license(&s…

…elf),Plugin::repository(&self)
rmqtt · Feb 18, 2024 · a0bd46d · a0bd46d
1 parent f0ba628
commit a0bd46d
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 11 deletions.
diff --git a/rmqtt-plugins/rmqtt-plugin-template/src/lib.rs b/rmqtt-plugins/rmqtt-plugin-template/src/lib.rs
@@ -13,6 +13,8 @@ pub async fn register(
     default_startup: bool,
     immutable: bool,
 ) -> Result<()> {
+    let name = if name.is_empty() { env!("CARGO_PKG_NAME") } else { name };
+    let descr = if descr.is_empty() { env!("CARGO_PKG_DESCRIPTION") } else { descr };
     runtime
         .plugins
         .register(name, default_startup, immutable, move || -> DynPluginResult {
@@ -55,11 +57,6 @@ impl Plugin for Template {
         Ok(())
     }
 
-    #[inline]
-    fn name(&self) -> &str {
-        &self.name
-    }
-
     #[inline]
     async fn start(&mut self) -> Result<()> {
         log::info!("{} start", self.name);
@@ -74,15 +71,40 @@ impl Plugin for Template {
         Ok(true)
     }
 
+    #[inline]
+    fn name(&self) -> &str {
+        &self.name
+    }
+
     #[inline]
     fn version(&self) -> &str {
-        "0.1.1"
+        env!("CARGO_PKG_VERSION")
     }
 
     #[inline]
     fn descr(&self) -> &str {
         &self.descr
     }
+
+    #[inline]
+    fn authors(&self) -> &str {
+        env!("CARGO_PKG_AUTHORS")
+    }
+
+    #[inline]
+    fn homepage(&self) -> &str {
+        env!("CARGO_PKG_HOMEPAGE")
+    }
+
+    #[inline]
+    fn license(&self) -> &str {
+        env!("CARGO_PKG_LICENSE")
+    }
+
+    #[inline]
+    fn repository(&self) -> &str {
+        env!("CARGO_PKG_REPOSITORY")
+    }
 }
 
 struct HookHandler {}

diff --git a/rmqtt/src/plugin.rs b/rmqtt/src/plugin.rs
@@ -18,11 +18,6 @@ pub trait Plugin: Send + Sync {
         Ok(())
     }
 
-    #[inline]
-    fn name(&self) -> &str {
-        ""
-    }
-
     #[inline]
     async fn get_config(&self) -> Result<serde_json::Value> {
         Ok(json!({}))
@@ -43,6 +38,11 @@ pub trait Plugin: Send + Sync {
         Ok(true)
     }
 
+    #[inline]
+    fn name(&self) -> &str {
+        ""
+    }
+
     #[inline]
     fn version(&self) -> &str {
         "0.0.0"
@@ -53,6 +53,26 @@ pub trait Plugin: Send + Sync {
         ""
     }
 
+    #[inline]
+    fn authors(&self) -> &str {
+        ""
+    }
+
+    #[inline]
+    fn homepage(&self) -> &str {
+        ""
+    }
+
+    #[inline]
+    fn license(&self) -> &str {
+        ""
+    }
+
+    #[inline]
+    fn repository(&self) -> &str {
+        ""
+    }
+
     #[inline]
     async fn attrs(&self) -> serde_json::Value {
         serde_json::Value::Null