feat(mqtt): Added sw_version to mqtt autodiscovery to fix #568

Hypfer · Jul 30, 2020 · a23d5af · a23d5af
1 parent 4f7ec2c
commit a23d5af
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 14 deletions.
diff --git a/lib/MqttClient.js b/lib/MqttClient.js
@@ -245,7 +245,8 @@ class MqttClient {
                     manufacturer: this.model.getManufacturerName(),
                     model: this.model.getModelName(),
                     name: this.identifier,
-                    identifiers: [this.identifier]
+                    identifiers: [this.identifier],
+                    sw_version: this.model.getValetudoVersion()
                 },
                 schema: "state",
                 supported_features: [

diff --git a/lib/miio/Model.js b/lib/miio/Model.js
@@ -1,3 +1,4 @@
+const path = require("path");
 const fs = require("fs");
 const Logger = require("../Logger");
 
@@ -162,6 +163,29 @@ class Model {
     getIP() {
         return this.config.ip;
     }
+
+    /**
+     * TODO Maybe model isn't the right place, but it's better than copy-paste for now
+     *
+     * @public
+     * @returns {string}
+     */
+    getValetudoVersion() {
+        let valetudoVersion = "?"; //Could not read ../package.json
+
+        try {
+            const rootDirectory = path.resolve(__dirname, "../..");
+            const packageContent = fs.readFileSync(rootDirectory + "/package.json", {"encoding": "utf-8"});
+
+            if (packageContent) {
+                valetudoVersion = JSON.parse(packageContent.toString()).version;
+            }
+        } catch (e) {
+            //intentional
+        }
+
+        return valetudoVersion;
+    }
 }
 
 

diff --git a/lib/webserver/ApiRouter.js b/lib/webserver/ApiRouter.js
@@ -66,21 +66,9 @@ const ApiRouter = function (webserver) {
     });
 
     router.get("/fw_version", async (req, res) => {
-        let valetudoVersion = "?"; //Could not read ../package.json
+        let valetudoVersion = model.getValetudoVersion();
         let firmwareVersion = "?";
 
-        try {
-            const rootDirectory = path.resolve(__dirname, "../..");
-            const packageContent = fs.readFileSync(rootDirectory + "/package.json", {"encoding": "utf-8"});
-
-            if (packageContent) {
-                valetudoVersion = JSON.parse(packageContent.toString()).version;
-            }
-        } catch (e) {
-            //intentional
-        }
-
-
         if (model.isEmbedded()) {
             try {
                 let data = await fs.promises.readFile("/etc/os-release");