Merge pull request #1 from jasper-seinhorst/1.4.0

1.4.0

config.schema.json

@@ -6,7 +6,7 @@
     "type": "object",
     "properties": {
       "ip": {
-        "title": "P1 IP address",
+        "title": "Wi-Fi P1 Meter IP address",
         "type": "string",
         "required": true,
         "default": ""
@@ -16,7 +16,7 @@
         "type": "number",
         "required": true,
         "default": 60,
-        "minimum": 5,
+        "minimum": 1,
         "maximum": 3600
       },
       "hidePowerConsumptionDevice": {

package.json

@@ -1,8 +1,8 @@
 {
-  "displayName": "Homebridge Homewizard Power Consumption",
   "name": "homebridge-homewizard-power-consumption",
-  "version": "1.3.0",
-  "description": "See current power consumption or power return in Homekit",
+  "displayName": "Homebridge Homewizard Power Consumption",
+  "version": "1.4.0",
+  "description": "See current power consumption and power return in Homekit",
   "license": "Apache-2.0",
   "author": "Jasper Seinhorst",
   "repository": {
@@ -21,21 +21,22 @@
     "lint": "eslint src/**.ts --max-warnings=0",
     "watch": "npm run build && npm link && nodemon",
     "build": "rimraf ./dist && tsc",
-    "prepublishOnly": "npm run lint && npm run build"
+    "prepublishOnly": "npm run lint && npåm run build"
   },
   "keywords": [
     "homebridge-plugin",
     "homebridge",
-    "Homewizard",
-    "Eco",
-    "Power consumtion",
-    "Solar"
+    "homewizard",
+    "eco",
+    "power-consumption",
+    "solar",
+    "solar-panels"
   ],
   "devDependencies": {
-    "@types/node": "^20.2.5",
+    "@types/node": "^20.11.25",
     "@typescript-eslint/eslint-plugin": "^5.59.8",
     "@typescript-eslint/parser": "^5.59.8",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "homebridge": "^1.7.0",
     "nodemon": "^2.0.22",
     "rimraf": "^5.0.5",

src/Platform.ts

@@ -27,12 +27,29 @@ export class HomewizardPowerConsumption implements DynamicPlatformPlugin {
     return !!this.config.ip;
   }
 
+  private async validateIp(): Promise<boolean> {
+    try {
+      const { data } = await axios.get(`http://${this.config.ip}/api/`, { timeout: 2000 });
+      if (data && data.product_type === 'HWE-P1') {
+        return true;
+      }
+      return false;
+    } catch(error) {
+      return false;
+    }
+  }
+
   private async initialise() {
     if (!this.validateConfig()) {
       this.log.error('Configuration error. Please provide your Wi-Fi P1 meter\'s IP address');
       return;
     }
 
+    if (!await this.validateIp()) {
+      this.log.error('Your Wi-Fi P1 meter\'s IP address seems to be incorrect. No connection possible');
+      return;
+    }
+
     this.setupAccessoires();
 
     await this.heartBeat();