homebridge-envoy-solar-sensor 0.1.3 → 0.1.4

package/config.schema.json

@@ -1,74 +1,80 @@
 {
-    "pluginAlias": "EnvoySolarSensor",
-    "pluginType": "platform",
-    "singular": true,
-    "schema": {
-      "type": "object",
-      "required": ["host"],
-      "properties": {
-        "name": {
-          "title": "Accessory Name",
-          "type": "string",
-          "default": "Solar Production",
-          "description": "Name shown in HomeKit"
-        },
-        "host": {
-          "title": "Envoy IP Address",
-          "type": "string",
-          "description": "IP address or hostname of the Enphase Envoy on your local network"
-        },
-        "protocol": {
-          "title": "Protocol",
-          "type": "string",
-          "default": "http",
-          "oneOf": [
-            { "title": "HTTP", "enum": ["http"] },
-            { "title": "HTTPS", "enum": ["https"] }
-          ],
-          "description": "Protocol used to connect to the Envoy"
-        },
-        "mode": {
-          "title": "Envoy API Mode",
-          "type": "string",
-          "default": "productionJson",
-          "oneOf": [
-            {
-              "title": "production.json (older Envoy)",
-              "enum": ["productionJson"]
-            },
-            {
-              "title": "api/v1/production (newer Envoy)",
-              "enum": ["v1Production"]
-            }
-          ],
-          "description": "Select which Envoy API endpoint is available on your device"
-        },
-        "pollIntervalSeconds": {
-          "title": "Poll Interval",
-          "type": "integer",
-          "default": 10,
-          "minimum": 5,
-          "description": "How often the Envoy is polled for production data in seconds"
-        },
-        "onThresholdW": {
-          "title": "On Threshold (Watts)",
-          "type": "integer",
-          "default": 80,
-          "description": "Production level above which the sensor becomes active"
-        },
-        "offThresholdW": {
-          "title": "Off Threshold (Watts)",
-          "type": "integer",
-          "default": 30,
-          "description": "Production level below which the sensor becomes inactive"
-        },
-        "token": {
-          "title": "Authentication Token",
-          "type": "string",
-          "default": "",
-          "description": "Optional bearer token for secured Envoy endpoints"
-        }
+  "pluginAlias": "EnvoySolarSensor",
+  "pluginType": "platform",
+  "singular": true,
+  "schema": {
+    "type": "object",
+    "required": ["host"],
+    "properties": {
+      "name": {
+        "title": "Accessory Name",
+        "type": "string",
+        "default": "Solar Production",
+        "description": "Name shown in HomeKit"
+      },
+      "host": {
+        "title": "Envoy Address",
+        "type": "string",
+        "default": "envoy.local",
+        "description": "IP address or hostname of the Enphase Envoy on your local network"
+      },
+      "protocol": {
+        "title": "Protocol",
+        "type": "string",
+        "default": "https",
+        "oneOf": [
+          { "title": "HTTPS", "enum": ["https"] },
+          { "title": "HTTP", "enum": ["http"] }
+        ],
+        "description": "Protocol used to connect to the Envoy"
+      },
+      "allowInsecureTLS": {
+        "title": "Allow Insecure TLS",
+        "type": "boolean",
+        "default": true,
+        "description": "Enable this if your Envoy uses a self-signed HTTPS certificate"
+      },
+      "mode": {
+        "title": "Envoy API Mode",
+        "type": "string",
+        "default": "productionJson",
+        "oneOf": [
+          {
+            "title": "production.json",
+            "enum": ["productionJson"]
+          },
+          {
+            "title": "api/v1/production",
+            "enum": ["v1Production"]
+          }
+        ],
+        "description": "Select the Envoy API endpoint to read production data"
+      },
+      "pollIntervalSeconds": {
+        "title": "Poll Interval (seconds)",
+        "type": "integer",
+        "default": 10,
+        "minimum": 5,
+        "description": "How often the Envoy is polled for production data"
+      },
+      "onThresholdW": {
+        "title": "On Threshold (W)",
+        "type": "integer",
+        "default": 80,
+        "description": "Production level above which the sensor becomes active"
+      },
+      "offThresholdW": {
+        "title": "Off Threshold (W)",
+        "type": "integer",
+        "default": 30,
+        "description": "Production level below which the sensor becomes inactive"
+      },
+      "token": {
+        "title": "Authentication Token",
+        "type": "string",
+        "default": "",
+        "description": "Bearer token from Enphase Entrez, paste token only without the word Bearer"
       }
     }
   }
-  
+}

package/index.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const { Agent } = require('undici');
+
 const PLUGIN_NAME = 'homebridge-envoy-solar-sensor';
 const PLATFORM_NAME = 'EnvoySolarSensor';
 
@@ -31,10 +33,11 @@ class EnvoySolarPlatform {
   }
 
   setupAccessory() {
-    const name = this.config.name || 'Zon Opwekking';
+    const name = this.config.name || 'Solar Production';
     const host = this.config.host;
+
     if (!host) {
-      this.log.error('Config mist host. Voorbeeld: "host": "192.168.1.50"');
+      this.log.error('Config mist host. Voorbeeld host: "envoy.local" of "192.168.1.50"');
       return;
     }
 
@@ -56,14 +59,18 @@ class EnvoySolarPlatform {
       .setCharacteristic(this.Characteristic.SerialNumber, String(host));
 
     const service = this.accessory.getService(this.Service.ContactSensor)
-      || this.accessory.addService(this.Service.ContactSensor, 'Opwekking Actief', 'production-active');
+      || this.accessory.addService(this.Service.ContactSensor, 'Production Active', 'production-active');
 
-    service.setCharacteristic(this.Characteristic.Name, 'Opwekking Actief');
+    service.setCharacteristic(this.Characteristic.Name, 'Production Active');
 
     if (service.testCharacteristic(this.Characteristic.StatusActive)) {
       service.updateCharacteristic(this.Characteristic.StatusActive, true);
     }
 
+    if (service.testCharacteristic(this.Characteristic.StatusFault)) {
+      service.updateCharacteristic(this.Characteristic.StatusFault, this.Characteristic.StatusFault.NO_FAULT);
+    }
+
     this.log.info(`Accessoire klaar: ${name} op host ${host}`);
   }
 
@@ -78,7 +85,8 @@ class EnvoySolarPlatform {
         const watts = await this.readProductionWatts();
         this.updateState(watts);
       } catch (err) {
-        this.log.warn(`Uitlezen mislukt: ${err && err.message ? err.message : String(err)}`);
+        const msg = err && err.message ? err.message : String(err);
+        this.log.warn(`Uitlezen mislukt: ${msg}`);
         this.markFault();
       }
     };
@@ -102,12 +110,18 @@ class EnvoySolarPlatform {
   }
 
   getToken() {
-    return this.config.token;
+    const t = this.config.token;
+    if (!t) return '';
+    return String(t).trim();
   }
 
   getBaseUrl() {
-    const proto = this.config.protocol || 'http';
-    return `${proto}://${this.getHost()}`;
+    const protocol = this.config.protocol || 'https';
+    return `${protocol}://${this.getHost()}`;
+  }
+
+  isInsecureTLSEnabled() {
+    return Boolean(this.config.allowInsecureTLS);
   }
 
   markFault() {
@@ -180,10 +194,19 @@ class EnvoySolarPlatform {
     const productionArray = data && data.production;
     if (!Array.isArray(productionArray)) throw new Error('production.json mist production array');
 
-    const eim = productionArray.find((x) => x && x.type === 'eim');
-    const wNow = eim && eim.wNow;
+    const byType = (t) => productionArray.find((x) => x && x.type === t);
+
+    const eim = byType('eim');
+    const inverters = byType('inverters');
+    const production = byType('production');
+
+    const candidate = eim || production || inverters || productionArray[0];
+    const wNow = candidate && candidate.wNow;
+
+    if (typeof wNow !== 'number') {
+      throw new Error('production.json mist wNow in production items');
+    }
 
-    if (typeof wNow !== 'number') throw new Error('production.json mist wNow (type eim)');
     return Math.max(0, wNow);
   }
 
@@ -199,13 +222,21 @@ class EnvoySolarPlatform {
 
   async fetchJson(url) {
     const headers = { Accept: 'application/json' };
+
     const token = this.getToken();
     if (token) headers.Authorization = `Bearer ${token}`;
 
-    const res = await fetch(url, { headers });
+    const allowInsecureTLS = this.isInsecureTLSEnabled();
+
+    const dispatcher = url.startsWith('https://')
+      ? new Agent({ connect: { rejectUnauthorized: !allowInsecureTLS } })
+      : undefined;
+
+    const res = await fetch(url, { headers, dispatcher });
 
     if (!res.ok) {
-      throw new Error(`HTTP ${res.status} op ${url}`);
+      const text = await res.text().catch(() => '');
+      throw new Error(`HTTP ${res.status} op ${url} ${text}`);
     }
 
     return await res.json();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-envoy-solar-sensor",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Expose Enphase Envoy solar production as a HomeKit sensor for daylight-based automations",
   "main": "index.js",
   "license": "MIT",