homebridge-edomoticz 2.1.49 → 3.0.4

package/README.md

@@ -3,7 +3,9 @@
 [![verified-by-homebridge](https://badgen.net/badge/homebridge/verified/purple)](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
 
 # Homebridge-eDomoticz
-This is a plugin for [Homebridge](https://github.com/nfarina/homebridge) and [Homebridge Config UI X Support](https://github.com/oznu/homebridge-config-ui-x) and [Domoticz](https://github.com/domoticz/domoticz).
+This is a plugin for [Homebridge](https://github.com/nfarina/homebridge) v1.x and [Homebridge Config UI X Support](https://github.com/oznu/homebridge-config-ui-x) and [Domoticz](https://github.com/domoticz/domoticz).
+
+It doesn't work with Homebridge v2.x
 
 ## Supports:
 <details>

package/index.js

@@ -14,7 +14,9 @@ var Mqtt = require('./lib/mqtt.js').Mqtt;
 var eDomoticzAccessory = require('./lib/domoticz_accessory.js');
 var Constants = require('./lib/constants.js');
 var Helper = require('./lib/helper.js').Helper;
-var eDomoticzServices = require('./lib/services.js').eDomoticzServices;
+var Services = require('./lib/services.js');
+var eDomoticzServices = Services.eDomoticzServices;
+var initServices = Services.initServices;
 const util = require('util');
 
 module.exports = function(homebridge) {
@@ -24,40 +26,11 @@ module.exports = function(homebridge) {
     Types = homebridge.hapLegacyTypes;
     UUID = homebridge.hap.uuid;
 
-    util.inherits(eDomoticzServices.TotalConsumption, Characteristic);
-    util.inherits(eDomoticzServices.CurrentConsumption, Characteristic);
-    util.inherits(eDomoticzServices.GasConsumption, Characteristic);
-    util.inherits(eDomoticzServices.TempOverride, Characteristic);
-    util.inherits(eDomoticzServices.MeterDeviceService, Service);
-    util.inherits(eDomoticzServices.GasDeviceService, Service);
-    util.inherits(eDomoticzServices.Ampere, Characteristic);
-    util.inherits(eDomoticzServices.AMPDeviceService, Service);
-    util.inherits(eDomoticzServices.Volt, Characteristic);
-    util.inherits(eDomoticzServices.VOLTDeviceService, Service);
-    util.inherits(eDomoticzServices.CurrentUsage, Characteristic);
-    util.inherits(eDomoticzServices.UsageDeviceService, Service);
-    util.inherits(eDomoticzServices.TodayConsumption, Characteristic);
-    util.inherits(eDomoticzServices.Barometer, Characteristic);
-    util.inherits(eDomoticzServices.WaterFlow, Characteristic);
-    util.inherits(eDomoticzServices.TotalWaterFlow, Characteristic);
-    util.inherits(eDomoticzServices.WaterDeviceService, Service);
-    util.inherits(eDomoticzServices.WeatherService, Service);
-    util.inherits(eDomoticzServices.WindSpeed, Characteristic);
-    util.inherits(eDomoticzServices.WindChill, Characteristic);
-    util.inherits(eDomoticzServices.WindDirection, Characteristic);
-    util.inherits(eDomoticzServices.WindDeviceService, Service);
-    util.inherits(eDomoticzServices.Rainfall, Characteristic);
-    util.inherits(eDomoticzServices.RainDeviceService, Service);
-    util.inherits(eDomoticzServices.Visibility, Characteristic);
-    util.inherits(eDomoticzServices.VisibilityDeviceService, Service);
-    util.inherits(eDomoticzServices.SolRad, Characteristic);
-    util.inherits(eDomoticzServices.SolRadDeviceService, Service);
-    util.inherits(eDomoticzServices.LocationService, Service);
-    util.inherits(eDomoticzServices.Location, Characteristic);
-    util.inherits(eDomoticzServices.InfotextDeviceService, Service);
-    util.inherits(eDomoticzServices.Infotext, Characteristic);
-    util.inherits(eDomoticzServices.UVDeviceService, Service);
-    util.inherits(eDomoticzServices.UVIndex, Characteristic);
+    // Populate eDomoticzServices with ES6 class definitions now that HAP refs
+    // (Service / Characteristic) are available. Replaces the previous pattern
+    // of pre-ES6 constructors + util.inherits, which crashes under HAP-NodeJS
+    // v2 ("Class constructor Service cannot be invoked without 'new'").
+    initServices(Service, Characteristic, UUID, homebridge.hap);
 
     //homebridge.registerAccessory("homebridge-edomoticz", "eDomoticz", eDomoticzAccessory);
     homebridge.registerPlatform("homebridge-edomoticz", "eDomoticz", eDomoticzPlatform, true);
@@ -243,6 +216,18 @@ eDomoticzPlatform.prototype = {
         var uuid = platformAccessory.context.uuid;
         var eve = platformAccessory.context.eve;
 
+        // Cached characteristics come back with the perms that were persisted
+        // when the cache was written. A cache produced by 3.0.0-3.0.2 under
+        // HAP v2 carries perms [null, "ev"] on every custom characteristic,
+        // which makes iOS refuse to pair. Re-apply the canonical perms.
+        var pairedRead = (this.api.hap.Perms && this.api.hap.Perms.PAIRED_READ)
+            || (Characteristic.Perms && Characteristic.Perms.PAIRED_READ)
+            || 'pr';
+        var healed = Helper.healCustomCharacteristicPerms(platformAccessory, eDomoticzServices, Characteristic, pairedRead);
+        if (healed > 0) {
+            this.log("Repaired " + healed + " cached custom characteristic perms on " + device.Name);
+        }
+
         // Generate the already cached accessory again
         var accessory = new eDomoticzAccessory(this, platformAccessory, false, device.Used, device.idx, device.Name, uuid, device.HaveDimmer, device.MaxDimLevel, device.SubType, device.Type, device.BatteryLevel, device.SwitchType, device.SwitchTypeVal, device.HardwareID, device.HardwareTypeVal, device.Image, eve, device.HaveTimeout, device.Description);
         this.accessories.push(accessory);

package/lib/domoticz.js

@@ -1,6 +1,6 @@
 var request = require("request");
 var Helper = require('./helper.js').Helper;
-var extend = require('util')._extend;
+var extend = Object.assign;
 
 module.exports = {
     Domoticz: Domoticz
@@ -48,7 +48,6 @@ Domoticz.settings = function(accessory, completion, error) {
       Helper.LogConnectionError(this.platform, response, err);
       if (typeof error !== 'undefined' && error !== false) {
         error();
-        callback();
       }
     }
   }.bind(accessory));
@@ -208,7 +207,6 @@ Domoticz.updateWithURL = function(accessory, url, completion) {
     }
     else {
       Helper.LogConnectionError(this.platform, response, err);
-      callback();
     }
 
     if (typeof completion !== 'undefined' && completion !== false) {

package/lib/domoticz_accessory.js

@@ -86,7 +86,7 @@ function eDomoticzAccessory(platform, platformAccessory, IsScene, status, idx, n
     }
     this.platformAccessory.reachable = true;
     if (this.swTypeVal == Constants.DeviceTypeMedia) {
-        this.platformAccessory.category = Categories.TELEVISION;
+        this.platformAccessory.category = platform.api.hap.Categories.TELEVISION;
     }
     this.publishServices();
 }

package/lib/helper.js

@@ -157,4 +157,63 @@ Helper.LogConnectionError = function(platform, response, err)
   }
 
   platform.forceLog(errorMessage);
-}
+}
+/*
+ * Re-apply canonical perms to custom eDomoticz Characteristics restored from
+ * Homebridge's accessory cache.
+ *
+ * Homebridge persists every Characteristic's `props` (perms, format, unit...)
+ * in cachedAccessories and HAP-NodeJS restores them verbatim on startup.
+ * Custom characteristics are not known HAP classes, so they come back as
+ * generic Characteristic instances carrying whatever props were cached.
+ * A cache written by a plugin build that published perms [null, "ev"]
+ * (see CHANGELOG 3.0.3) keeps poisoning the bridge after upgrading, and
+ * iOS keeps refusing to pair, until the cache is cleared by hand.
+ *
+ * This walks a restored PlatformAccessory and, for every characteristic
+ * whose UUID matches a custom eDomoticz Characteristic class, replaces the
+ * perms with the ones the class defines today when the cached ones are
+ * missing, contain null/undefined, or lack PAIRED_READ. Only `perms` is
+ * touched: format/unit/min/max are left alone on purpose because two
+ * custom characteristics share a UUID with different units
+ * (CurrentConsumption 'W' vs GasConsumption 'm3').
+ *
+ * Returns the number of characteristics healed.
+ */
+Helper.healCustomCharacteristicPerms = function (platformAccessory, eDomoticzServices, Characteristic, pairedReadPerm) {
+    if (!platformAccessory || !Array.isArray(platformAccessory.services)) {
+        return 0;
+    }
+
+    var canonicalPerms = {};
+    Object.keys(eDomoticzServices).forEach(function (key) {
+        var Ctor = eDomoticzServices[key];
+        if (typeof Ctor !== 'function' || !(Ctor.prototype instanceof Characteristic)) {
+            return;
+        }
+        var probe = new Ctor();
+        if (!canonicalPerms[probe.UUID] && probe.props && Array.isArray(probe.props.perms)) {
+            canonicalPerms[probe.UUID] = probe.props.perms.slice();
+        }
+    });
+
+    var healed = 0;
+    platformAccessory.services.forEach(function (service) {
+        (service.characteristics || []).forEach(function (characteristic) {
+            var perms = canonicalPerms[characteristic.UUID];
+            if (!perms) {
+                return;
+            }
+            var current = (characteristic.props && characteristic.props.perms) || [];
+            var broken = current.length === 0
+                || current.some(function (p) { return p === null || p === undefined; })
+                || current.indexOf(pairedReadPerm) === -1;
+            if (broken) {
+                characteristic.setProps({ perms: perms });
+                healed++;
+            }
+        });
+    });
+
+    return healed;
+};

package/lib/services.js

@@ -1,367 +1,498 @@
 var Constants = require('./constants.js');
 
+var eDomoticzServices = {};
+
 module.exports = {
-    eDomoticzServices: eDomoticzServices
-}
+    eDomoticzServices: eDomoticzServices,
+    initServices: initServices
+};
 
+/*
+ * initServices is called from index.js once homebridge has provided its HAP
+ * references. It populates the (already exported) eDomoticzServices object
+ * with ES6 class definitions. The exported object reference does not change,
+ * so consumers that captured it via `require('./services.js').eDomoticzServices`
+ * (e.g. lib/domoticz_accessory.js) keep working transparently.
+ *
+ * Order matters per the migration plan: define the 20 custom Characteristics
+ * first, then the 14 custom Services that compose them.
+ */
+function initServices(Service, Characteristic, UUID, hap) {
 
-function eDomoticzServices() {
+    // HAP-NodeJS v1 exposed Formats / Perms / Units as static enums on the
+    // Characteristic class. HAP-NodeJS v2 moved them to the module root (and
+    // Characteristic.Formats / .Perms / .Units became undefined). Resolve
+    // them via fallback so this plugin works on both Homebridge 1.x and 2.x.
+    var Formats = (Characteristic && Characteristic.Formats) || (hap && hap.Formats);
+    var Perms   = (Characteristic && Characteristic.Perms)   || (hap && hap.Perms);
+    var Units   = (Characteristic && Characteristic.Units)   || (hap && hap.Units);
 
-}
+    if (!Formats || !Perms || !Units) {
+        throw new Error(
+            'homebridge-edomoticz: cannot resolve HAP Formats/Perms/Units. ' +
+            'Neither Characteristic.* (HAP v1) nor hap.* (HAP v2) provided ' +
+            'them. This indicates an unsupported HAP-NodeJS version.'
+        );
+    }
 
-/* Define Custom Services & Characteristics */
-// PowerMeter Characteristics
-eDomoticzServices.TotalConsumption = function() {
-    var charUUID = 'E863F10C-079E-48FF-8F27-9C2605A29F52'; //UUID.generate('eDomoticz:customchar:TotalConsumption');
-    Characteristic.call(this, 'Total Consumption', charUUID);
-    this.setProps({
-        format: Characteristic.Formats.FLOAT,
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY],
-        unit: 'kWh'
-    });
-    this.value = this.getDefaultValue();
-    this.UUID = charUUID;
-};
-eDomoticzServices.TodayConsumption = function() {
-    var charUUID = UUID.generate('eDomoticz:customchar:TodayConsumption');
-    Characteristic.call(this, 'Today', charUUID);
-    this.setProps({
-        format: Characteristic.Formats.FLOAT,
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY],
-        unit: 'kWh'
-    });
-    this.value = this.getDefaultValue();
-    this.UUID = charUUID;
-};
-eDomoticzServices.CurrentConsumption = function() {
-    var charUUID = 'E863F10D-079E-48FF-8F27-9C2605A29F52'; //UUID.generate('eDomoticz:customchar:CurrentConsumption');
-    Characteristic.call(this, 'Consumption', charUUID);
-    this.setProps({
-        format: Characteristic.Formats.FLOAT,
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY],
-        unit: 'W'
-    });
-    this.value = this.getDefaultValue();
-    this.UUID = charUUID;
-};
-eDomoticzServices.Ampere = function() {
-    var charUUID = 'E863F126-079E-48FF-8F27-9C2605A29F52'; //AMPERE
-    Characteristic.call(this, 'Amps', charUUID);
-    this.setProps({
-        format: Characteristic.Formats.FLOAT,
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY],
-        unit: 'A'
-    });
-    this.value = this.getDefaultValue();
-    this.UUID = charUUID;
-};
-eDomoticzServices.Volt = function() {
-    var charUUID = 'E863F10A-079E-48FF-8F27-9C2605A29F52'; //VOLT
-    Characteristic.call(this, 'Volts', charUUID);
-    this.setProps({
-        format: Characteristic.Formats.FLOAT,
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY],
-        unit: 'V'
-    });
-    this.value = this.getDefaultValue();
-    this.UUID = charUUID;
-};
-eDomoticzServices.GasConsumption = function() {
-    var charUUID = UUID.generate('eDomoticz:customchar:CurrentConsumption');
-    Characteristic.call(this, 'Meter Total', charUUID);
-    this.setProps({
-        format: Characteristic.Formats.FLOAT,
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY]
-    });
-    this.value = this.getDefaultValue();
-    this.UUID = charUUID;
-};
-eDomoticzServices.WaterFlow = function() {
-    var charUUID = UUID.generate('eDomoticz:customchar:WaterFlow');
-    Characteristic.call(this, 'Flow Rate', charUUID);
-    this.setProps({
-        format: Characteristic.Formats.FLOAT,
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY],
-        unit: 'm3'
-    });
-    this.value = this.getDefaultValue();
-    this.UUID = charUUID;
-};
-eDomoticzServices.TotalWaterFlow = function() {
-    var charUUID = UUID.generate('eDomoticz:customchar:TotalWaterFlow');
-    Characteristic.call(this, 'Flow Total', charUUID);
-    this.setProps({
-        format: Characteristic.Formats.FLOAT,
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY],
-        unit: 'l'
-    });
-    this.value = this.getDefaultValue();
-    this.UUID = charUUID;
-};
-// Custom SetPoint Minutes characteristic for TempOverride modes
-eDomoticzServices.TempOverride = function() {
-    var charUUID = UUID.generate('eDomoticz:customchar:OverrideTime');
-    Characteristic.call(this, 'Override (Mins, 0 = Auto, 481 = Permanent)', charUUID);
-    this.setProps({
-        format: Characteristic.Formats.FLOAT,
-        maxValue: 481,
-        minValue: 0,
-        minStep: 1,
-        unit: 'mins',
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.WRITE, Characteristic.Perms.NOTIFY]
-    });
-    this.value = this.getDefaultValue();
-    this.UUID = charUUID;
-};
-// Ampere Meter
-eDomoticzServices.AMPDeviceService = function(displayName, subtype) {
-    var serviceUUID = UUID.generate('eDomoticz:powermeter:customservice');
-    Service.call(this, displayName, serviceUUID, subtype);
-    this.addCharacteristic(new eDomoticzServices.Ampere());
-};
-// Voltage Meter
-eDomoticzServices.VOLTDeviceService = function(displayName, subtype) {
-    var serviceUUID = UUID.generate('eDomoticz:powermeter:customservice');
-    Service.call(this, displayName, serviceUUID, subtype);
-    this.addCharacteristic(new eDomoticzServices.Volt());
-};
+    /* ===== Custom Characteristics (20) ===== */
 
-// The PowerMeter itself
-eDomoticzServices.MeterDeviceService = function(displayName, subtype) {
+    // PowerMeter Characteristics
+    eDomoticzServices.TotalConsumption = class extends Characteristic {
+        constructor() {
+            var charUUID = 'E863F10C-079E-48FF-8F27-9C2605A29F52'; //UUID.generate('eDomoticz:customchar:TotalConsumption');
+            super('Total Consumption', charUUID);
+            this.setProps({
+                format: Formats.FLOAT,
+                perms: [Perms.PAIRED_READ, Perms.NOTIFY],
+                unit: 'kWh'
+            });
+            this.value = this.getDefaultValue();
+            this.UUID = charUUID;
+        }
+    };
 
-    var serviceUUID = UUID.generate('eDomoticz:powermeter:customservice');
-    Service.call(this, displayName, serviceUUID, subtype);
-    this.addCharacteristic(new eDomoticzServices.CurrentConsumption());
-    this.addOptionalCharacteristic(new eDomoticzServices.TotalConsumption());
-    this.addOptionalCharacteristic(new eDomoticzServices.TodayConsumption());
-};
-// Waterflow Meter
-eDomoticzServices.WaterDeviceService = function(displayName, subtype) {
-    var serviceUUID = UUID.generate('eDomoticz:watermeter:customservice');
-    Service.call(this, displayName, serviceUUID, subtype);
-    this.addCharacteristic(new eDomoticzServices.WaterFlow());
-    this.addOptionalCharacteristic(new eDomoticzServices.TotalWaterFlow());
-};
-// P1 Smart Meter -> Gas
-eDomoticzServices.GasDeviceService = function(displayName, subtype) {
-    var serviceUUID = UUID.generate('eDomoticz:gasmeter:customservice');
-    Service.call(this, displayName, serviceUUID, subtype);
-    this.addCharacteristic(new eDomoticzServices.GasConsumption());
-};
-// Usage Meter Characteristics
-eDomoticzServices.CurrentUsage = function() {
-    var charUUID = UUID.generate('eDomoticz:customchar:CurrentUsage');
-    Characteristic.call(this, 'Current Usage', charUUID);
-    this.setProps({
-        format: Characteristic.Formats.FLOAT,
-        unit: Characteristic.Units.PERCENTAGE,
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY],
-        minValue:0,
-        maxValue:100,
-        minStep:0.1
-    });
-    this.value = this.getDefaultValue();
-    this.UUID = charUUID;
-};
-// The Usage Meter itself
-eDomoticzServices.UsageDeviceService = function(displayName, subtype) {
-    var serviceUUID = UUID.generate('eDomoticz:usagedevice:customservice');
-    Service.call(this, displayName, serviceUUID, subtype);
-    this.addCharacteristic(new eDomoticzServices.CurrentUsage());
-};
-// Location Meter (sensor should have 'Location' in title)
-eDomoticzServices.Location = function() {
-    var charUUID = UUID.generate('eDomoticz:customchar:Location');
-    Characteristic.call(this, 'Location', charUUID);
-    this.setProps({
-        format: Characteristic.Formats.STRING,
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY]
-    });
-    this.value = this.getDefaultValue();
-    this.UUID = charUUID;
-};
-eDomoticzServices.LocationService = function(displayName, subtype) {
-    var serviceUUID = UUID.generate('eDomoticz:location:customservice');
-    Service.call(this, displayName, serviceUUID, subtype);
-    this.addCharacteristic(new eDomoticzServices.Location());
-};
-// DarkSkies WindSpeed Characteristic
-eDomoticzServices.WindSpeed = function() {
-    var charUUID = '49C8AE5A-A3A5-41AB-BF1F-12D5654F9F41';//'9331096F-E49E-4D98-B57B-57803498FA36'; //UUID.generate('eDomoticz:customchar:WindSpeed');
-    Characteristic.call(this, 'Wind Speed', charUUID);
-    this.setProps({
-        format: Characteristic.Formats.FLOAT,
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY],
-        unit:'m/s',
-        minValue:0,
-        maxValue:360,
-        minStep:0.1
-    });
-    this.value = this.getDefaultValue();
-    this.UUID = charUUID;
-};
-// DarkSkies WindChill Characteristic
-eDomoticzServices.WindChill = function() {
-    var charUUID = UUID.generate('eDomoticz:customchar:WindChill');
-    Characteristic.call(this, 'Wind Chill', charUUID);
-    this.setProps({
-        format: Characteristic.Formats.FLOAT,
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY],
-        unit: Characteristic.Units.CELSIUS,
-        minValue:-50,
-        maxValue:100,
-        minStep:0.1
-    });
-    this.value = this.getDefaultValue();
-    this.UUID = charUUID;
-};
-// DarkSkies WindDirection Characteristic
-eDomoticzServices.WindDirection = function() {
-    var charUUID = '46f1284c-1912-421b-82f5-eb75008b167e';//'6C3F6DFA-7340-4ED4-AFFD-0E0310ECCD9E'; //UUID.generate('eDomoticz:customchar:WindDirection');
-    Characteristic.call(this, 'Wind Direction', charUUID);
-    this.setProps({
-        format: Characteristic.Formats.INT,
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY],
-        unit: Characteristic.Units.ARC_DEGREE,
-        minValue:0,
-        maxValue:360,
-        minStep:1
-    });
-    this.value = this.getDefaultValue();
-    this.UUID = charUUID;
-};
-// DarkSkies Virtual Wind Sensor
-eDomoticzServices.WindDeviceService = function(displayName, subtype) {
-    var serviceUUID = '2AFB775E-79E5-4399-B3CD-398474CAE86C'; //UUID.generate('eDomoticz:winddevice:customservice');
-    Service.call(this, displayName, serviceUUID, subtype);
-    this.addCharacteristic(new eDomoticzServices.WindSpeed());
-    this.addOptionalCharacteristic(new eDomoticzServices.WindChill());
-    this.addOptionalCharacteristic(new eDomoticzServices.WindDirection());
-    this.addOptionalCharacteristic(new Characteristic.CurrentTemperature());
-};
-// DarkSkies Rain Characteristics
-eDomoticzServices.Rainfall = function() {
-    var charUUID = 'ccc04890-565b-4376-b39a-3113341d9e0f';//'C53F35CE-C615-4AA4-9112-EBF679C5EB14'; //UUID.generate('eDomoticz:customchar:Rainfall');
-    Characteristic.call(this, 'Amount today', charUUID);
-    this.setProps({
-        format: Characteristic.Formats.FLOAT,
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY],
-        unit: 'mm',
-        minValue:0,
-        maxValue:360,
-        minStep:0.1
-    });
-    this.value = this.getDefaultValue();
-    this.UUID = charUUID;
-};
-// DarkSkies Rain Meter itself
-eDomoticzServices.RainDeviceService = function(displayName, subtype) {
-    var serviceUUID = 'D92D5391-92AF-4824-AF4A-356F25F25EA1'; //UUID.generate('eDomoticz:raindevice:customservice');
-    Service.call(this, displayName, serviceUUID, subtype);
-    this.addCharacteristic(new eDomoticzServices.Rainfall());
-};
-// DarkSkies Visibility Characteristics
-eDomoticzServices.Visibility = function() {
-    var charUUID = 'd24ecc1e-6fad-4fb5-8137-5af88bd5e857';//UUID.generate('eDomoticz:customchar:Visibility');
-    Characteristic.call(this, 'Distance', charUUID);
-    this.setProps({
-        format: Characteristic.Formats.FLOAT,
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY],
-        unit: 'miles',
-        minValue:0,
-        maxValue:20,
-        minStep:0.1
-    });
-    this.value = this.getDefaultValue();
-    this.UUID = charUUID;
-};
-// DarkSkies Visibility Meter itself
-eDomoticzServices.VisibilityDeviceService = function(displayName, subtype) {
-    var serviceUUID = UUID.generate('eDomoticz:visibilitydevice:customservice');
-    Service.call(this, displayName, serviceUUID, subtype);
-    this.addCharacteristic(new eDomoticzServices.Visibility());
-};
-// DarkSkies UVIndex Characteristics
-eDomoticzServices.UVIndex = function() {
-    var charUUID = '05ba0fe0-b848-4226-906d-5b64272e05ce';//UUID.generate('eDomoticz:customchar:Visibility');
-    Characteristic.call(this, 'UVIndex', charUUID);
-    this.setProps({
-        format: Characteristic.Formats.FLOAT,
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY],
-        unit: 'UVI',
-        minValue:0,
-        maxValue:20,
-        minStep:0.1
-    });
-    this.value = this.getDefaultValue();
-    this.UUID = charUUID;
-};
+    eDomoticzServices.TodayConsumption = class extends Characteristic {
+        constructor() {
+            var charUUID = UUID.generate('eDomoticz:customchar:TodayConsumption');
+            super('Today', charUUID);
+            this.setProps({
+                format: Formats.FLOAT,
+                perms: [Perms.PAIRED_READ, Perms.NOTIFY],
+                unit: 'kWh'
+            });
+            this.value = this.getDefaultValue();
+            this.UUID = charUUID;
+        }
+    };
 
-// DarkSkies UV Index Meter itself
-eDomoticzServices.UVDeviceService = function(displayName, subtype) {
-    var serviceUUID = UUID.generate('eDomoticz:uvdevice:customservice');
-    Service.call(this, displayName, serviceUUID, subtype);
-    this.addCharacteristic(new eDomoticzServices.UVIndex());
-};
-// DarkSkies Solar Radiation Characteristics
-eDomoticzServices.SolRad = function() {
-    var charUUID = UUID.generate('eDomoticz:customchar:SolRad');
-    Characteristic.call(this, 'Radiation', charUUID);
-    this.setProps({
-        format: Characteristic.Formats.FLOAT,
-        unit: 'W/m2',
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY],
-        minValue:0,
-        maxValue:10000,
-        minStep:0.1
-    });
-    this.value = this.getDefaultValue();
-    this.UUID = charUUID;
-};
-// DarkSkies Solar Radiation Meter itself
-eDomoticzServices.SolRadDeviceService = function(displayName, subtype) {
-    var serviceUUID = UUID.generate('eDomoticz:solraddevice:customservice');
-    Service.call(this, displayName, serviceUUID, subtype);
-    this.addCharacteristic(new eDomoticzServices.SolRad());
-};
-// Barometer Characteristic
-eDomoticzServices.Barometer = function() {
-    var charUUID = 'E863F10F-079E-48FF-8F27-9C2605A29F52';
-    Characteristic.call(this, 'Pressure', charUUID);
-    this.setProps({
-        format: Characteristic.Formats.FLOAT,
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY],
-        unit: 'hPA',
-        minValue: 500,
-		maxValue: 2000,
-		minStep: 0.1
-    });
-    this.value = this.getDefaultValue();
-    this.UUID = charUUID;
-};
-// Weather Service
-eDomoticzServices.WeatherService = function(displayName, subtype) {
-    var serviceUUID = 'debf1b79-312e-47f7-bf82-993d9950f3a2';//'E863F001-079E-48FF-8F27-9C2605A29F52';
-    Service.call(this, displayName, serviceUUID, subtype);
-    this.addCharacteristic(new Characteristic.CurrentTemperature());
-    this.addOptionalCharacteristic(new Characteristic.CurrentRelativeHumidity());
-    this.addOptionalCharacteristic(new eDomoticzServices.Barometer());
-};
-// DarkSkies Visibility Characteristics
-eDomoticzServices.Infotext = function() {
-    var charUUID = UUID.generate('eDomoticz:customchar:Infotext');
-    Characteristic.call(this, 'Infotext', charUUID);
-    this.setProps({
-        format: 'string',
-        perms: [Characteristic.Perms.READ, Characteristic.Perms.NOTIFY]
-    });
-    this.value = this.getDefaultValue();
-    this.UUID = charUUID;
-};
-// DarkSkies Visibility Meter itself
-eDomoticzServices.InfotextDeviceService = function(displayName, subtype) {
-    var serviceUUID = UUID.generate('eDomoticz:infotextdevice:customservice');
-    Service.call(this, displayName, serviceUUID, subtype);
-    this.addCharacteristic(new eDomoticzServices.Infotext());
-};
-/* End of Custom Services & Characteristics */
+    eDomoticzServices.CurrentConsumption = class extends Characteristic {
+        constructor() {
+            var charUUID = 'E863F10D-079E-48FF-8F27-9C2605A29F52'; //UUID.generate('eDomoticz:customchar:CurrentConsumption');
+            super('Consumption', charUUID);
+            this.setProps({
+                format: Formats.FLOAT,
+                perms: [Perms.PAIRED_READ, Perms.NOTIFY],
+                unit: 'W'
+            });
+            this.value = this.getDefaultValue();
+            this.UUID = charUUID;
+        }
+    };
+
+    eDomoticzServices.Ampere = class extends Characteristic {
+        constructor() {
+            var charUUID = 'E863F126-079E-48FF-8F27-9C2605A29F52'; //AMPERE
+            super('Amps', charUUID);
+            this.setProps({
+                format: Formats.FLOAT,
+                perms: [Perms.PAIRED_READ, Perms.NOTIFY],
+                unit: 'A'
+            });
+            this.value = this.getDefaultValue();
+            this.UUID = charUUID;
+        }
+    };
+
+    eDomoticzServices.Volt = class extends Characteristic {
+        constructor() {
+            var charUUID = 'E863F10A-079E-48FF-8F27-9C2605A29F52'; //VOLT
+            super('Volts', charUUID);
+            this.setProps({
+                format: Formats.FLOAT,
+                perms: [Perms.PAIRED_READ, Perms.NOTIFY],
+                unit: 'V'
+            });
+            this.value = this.getDefaultValue();
+            this.UUID = charUUID;
+        }
+    };
+
+    // NOTE: UUID key intentionally reuses 'CurrentConsumption' string — preserved
+    // verbatim from upstream (historical collision, do not "fix").
+    eDomoticzServices.GasConsumption = class extends Characteristic {
+        constructor() {
+            var charUUID = UUID.generate('eDomoticz:customchar:CurrentConsumption');
+            super('Meter Total', charUUID);
+            this.setProps({
+                format: Formats.FLOAT,
+                perms: [Perms.PAIRED_READ, Perms.NOTIFY]
+            });
+            this.value = this.getDefaultValue();
+            this.UUID = charUUID;
+        }
+    };
+
+    eDomoticzServices.WaterFlow = class extends Characteristic {
+        constructor() {
+            var charUUID = UUID.generate('eDomoticz:customchar:WaterFlow');
+            super('Flow Rate', charUUID);
+            this.setProps({
+                format: Formats.FLOAT,
+                perms: [Perms.PAIRED_READ, Perms.NOTIFY],
+                unit: 'm3'
+            });
+            this.value = this.getDefaultValue();
+            this.UUID = charUUID;
+        }
+    };
+
+    eDomoticzServices.TotalWaterFlow = class extends Characteristic {
+        constructor() {
+            var charUUID = UUID.generate('eDomoticz:customchar:TotalWaterFlow');
+            super('Flow Total', charUUID);
+            this.setProps({
+                format: Formats.FLOAT,
+                perms: [Perms.PAIRED_READ, Perms.NOTIFY],
+                unit: 'l'
+            });
+            this.value = this.getDefaultValue();
+            this.UUID = charUUID;
+        }
+    };
+
+    // Custom SetPoint Minutes characteristic for TempOverride modes
+    eDomoticzServices.TempOverride = class extends Characteristic {
+        constructor() {
+            var charUUID = UUID.generate('eDomoticz:customchar:OverrideTime');
+            super('Override (Mins, 0 = Auto, 481 = Permanent)', charUUID);
+            this.setProps({
+                format: Formats.FLOAT,
+                maxValue: 481,
+                minValue: 0,
+                minStep: 1,
+                unit: 'mins',
+                perms: [Perms.PAIRED_READ, Perms.PAIRED_WRITE, Perms.NOTIFY]
+            });
+            this.value = this.getDefaultValue();
+            this.UUID = charUUID;
+        }
+    };
+
+    // Usage Meter Characteristics
+    eDomoticzServices.CurrentUsage = class extends Characteristic {
+        constructor() {
+            var charUUID = UUID.generate('eDomoticz:customchar:CurrentUsage');
+            super('Current Usage', charUUID);
+            this.setProps({
+                format: Formats.FLOAT,
+                unit: Units.PERCENTAGE,
+                perms: [Perms.PAIRED_READ, Perms.NOTIFY],
+                minValue: 0,
+                maxValue: 100,
+                minStep: 0.1
+            });
+            this.value = this.getDefaultValue();
+            this.UUID = charUUID;
+        }
+    };
+
+    // Location Characteristic (sensor should have 'Location' in title)
+    eDomoticzServices.Location = class extends Characteristic {
+        constructor() {
+            var charUUID = UUID.generate('eDomoticz:customchar:Location');
+            super('Location', charUUID);
+            this.setProps({
+                format: Formats.STRING,
+                perms: [Perms.PAIRED_READ, Perms.NOTIFY]
+            });
+            this.value = this.getDefaultValue();
+            this.UUID = charUUID;
+        }
+    };
+
+    // DarkSkies WindSpeed Characteristic
+    eDomoticzServices.WindSpeed = class extends Characteristic {
+        constructor() {
+            var charUUID = '49C8AE5A-A3A5-41AB-BF1F-12D5654F9F41';//'9331096F-E49E-4D98-B57B-57803498FA36'; //UUID.generate('eDomoticz:customchar:WindSpeed');
+            super('Wind Speed', charUUID);
+            this.setProps({
+                format: Formats.FLOAT,
+                perms: [Perms.PAIRED_READ, Perms.NOTIFY],
+                unit: 'm/s',
+                minValue: 0,
+                maxValue: 360,
+                minStep: 0.1
+            });
+            this.value = this.getDefaultValue();
+            this.UUID = charUUID;
+        }
+    };
+
+    // DarkSkies WindChill Characteristic
+    eDomoticzServices.WindChill = class extends Characteristic {
+        constructor() {
+            var charUUID = UUID.generate('eDomoticz:customchar:WindChill');
+            super('Wind Chill', charUUID);
+            this.setProps({
+                format: Formats.FLOAT,
+                perms: [Perms.PAIRED_READ, Perms.NOTIFY],
+                unit: Units.CELSIUS,
+                minValue: -50,
+                maxValue: 100,
+                minStep: 0.1
+            });
+            this.value = this.getDefaultValue();
+            this.UUID = charUUID;
+        }
+    };
+
+    // DarkSkies WindDirection Characteristic
+    eDomoticzServices.WindDirection = class extends Characteristic {
+        constructor() {
+            var charUUID = '46f1284c-1912-421b-82f5-eb75008b167e';//'6C3F6DFA-7340-4ED4-AFFD-0E0310ECCD9E'; //UUID.generate('eDomoticz:customchar:WindDirection');
+            super('Wind Direction', charUUID);
+            this.setProps({
+                format: Formats.INT,
+                perms: [Perms.PAIRED_READ, Perms.NOTIFY],
+                unit: Units.ARC_DEGREE,
+                minValue: 0,
+                maxValue: 360,
+                minStep: 1
+            });
+            this.value = this.getDefaultValue();
+            this.UUID = charUUID;
+        }
+    };
+
+    // DarkSkies Rain Characteristic
+    eDomoticzServices.Rainfall = class extends Characteristic {
+        constructor() {
+            var charUUID = 'ccc04890-565b-4376-b39a-3113341d9e0f';//'C53F35CE-C615-4AA4-9112-EBF679C5EB14'; //UUID.generate('eDomoticz:customchar:Rainfall');
+            super('Amount today', charUUID);
+            this.setProps({
+                format: Formats.FLOAT,
+                perms: [Perms.PAIRED_READ, Perms.NOTIFY],
+                unit: 'mm',
+                minValue: 0,
+                maxValue: 360,
+                minStep: 0.1
+            });
+            this.value = this.getDefaultValue();
+            this.UUID = charUUID;
+        }
+    };
+
+    // DarkSkies Visibility Characteristic
+    eDomoticzServices.Visibility = class extends Characteristic {
+        constructor() {
+            var charUUID = 'd24ecc1e-6fad-4fb5-8137-5af88bd5e857';//UUID.generate('eDomoticz:customchar:Visibility');
+            super('Distance', charUUID);
+            this.setProps({
+                format: Formats.FLOAT,
+                perms: [Perms.PAIRED_READ, Perms.NOTIFY],
+                unit: 'miles',
+                minValue: 0,
+                maxValue: 20,
+                minStep: 0.1
+            });
+            this.value = this.getDefaultValue();
+            this.UUID = charUUID;
+        }
+    };
+
+    // DarkSkies UVIndex Characteristic
+    eDomoticzServices.UVIndex = class extends Characteristic {
+        constructor() {
+            var charUUID = '05ba0fe0-b848-4226-906d-5b64272e05ce';//UUID.generate('eDomoticz:customchar:Visibility');
+            super('UVIndex', charUUID);
+            this.setProps({
+                format: Formats.FLOAT,
+                perms: [Perms.PAIRED_READ, Perms.NOTIFY],
+                unit: 'UVI',
+                minValue: 0,
+                maxValue: 20,
+                minStep: 0.1
+            });
+            this.value = this.getDefaultValue();
+            this.UUID = charUUID;
+        }
+    };
+
+    // DarkSkies Solar Radiation Characteristic
+    eDomoticzServices.SolRad = class extends Characteristic {
+        constructor() {
+            var charUUID = UUID.generate('eDomoticz:customchar:SolRad');
+            super('Radiation', charUUID);
+            this.setProps({
+                format: Formats.FLOAT,
+                unit: 'W/m2',
+                perms: [Perms.PAIRED_READ, Perms.NOTIFY],
+                minValue: 0,
+                maxValue: 10000,
+                minStep: 0.1
+            });
+            this.value = this.getDefaultValue();
+            this.UUID = charUUID;
+        }
+    };
+
+    // Barometer Characteristic
+    eDomoticzServices.Barometer = class extends Characteristic {
+        constructor() {
+            var charUUID = 'E863F10F-079E-48FF-8F27-9C2605A29F52';
+            super('Pressure', charUUID);
+            this.setProps({
+                format: Formats.FLOAT,
+                perms: [Perms.PAIRED_READ, Perms.NOTIFY],
+                unit: 'hPA',
+                minValue: 500,
+                maxValue: 2000,
+                minStep: 0.1
+            });
+            this.value = this.getDefaultValue();
+            this.UUID = charUUID;
+        }
+    };
+
+    // Infotext Characteristic (free-form string)
+    eDomoticzServices.Infotext = class extends Characteristic {
+        constructor() {
+            var charUUID = UUID.generate('eDomoticz:customchar:Infotext');
+            super('Infotext', charUUID);
+            this.setProps({
+                format: 'string',
+                perms: [Perms.PAIRED_READ, Perms.NOTIFY]
+            });
+            this.value = this.getDefaultValue();
+            this.UUID = charUUID;
+        }
+    };
+
+    /* ===== Custom Services (14) ===== */
+
+    // Ampere Meter
+    // NOTE: serviceUUID key intentionally shared with VOLT and Meter device
+    // services (historical upstream behaviour, differentiated by subtype).
+    eDomoticzServices.AMPDeviceService = class extends Service {
+        constructor(displayName, subtype) {
+            var serviceUUID = UUID.generate('eDomoticz:powermeter:customservice');
+            super(displayName, serviceUUID, subtype);
+            this.addCharacteristic(new eDomoticzServices.Ampere());
+        }
+    };
+
+    // Voltage Meter
+    eDomoticzServices.VOLTDeviceService = class extends Service {
+        constructor(displayName, subtype) {
+            var serviceUUID = UUID.generate('eDomoticz:powermeter:customservice');
+            super(displayName, serviceUUID, subtype);
+            this.addCharacteristic(new eDomoticzServices.Volt());
+        }
+    };
+
+    // The PowerMeter itself
+    eDomoticzServices.MeterDeviceService = class extends Service {
+        constructor(displayName, subtype) {
+            var serviceUUID = UUID.generate('eDomoticz:powermeter:customservice');
+            super(displayName, serviceUUID, subtype);
+            this.addCharacteristic(new eDomoticzServices.CurrentConsumption());
+            this.addOptionalCharacteristic(new eDomoticzServices.TotalConsumption());
+            this.addOptionalCharacteristic(new eDomoticzServices.TodayConsumption());
+        }
+    };
+
+    // Waterflow Meter
+    eDomoticzServices.WaterDeviceService = class extends Service {
+        constructor(displayName, subtype) {
+            var serviceUUID = UUID.generate('eDomoticz:watermeter:customservice');
+            super(displayName, serviceUUID, subtype);
+            this.addCharacteristic(new eDomoticzServices.WaterFlow());
+            this.addOptionalCharacteristic(new eDomoticzServices.TotalWaterFlow());
+        }
+    };
+
+    // P1 Smart Meter -> Gas
+    eDomoticzServices.GasDeviceService = class extends Service {
+        constructor(displayName, subtype) {
+            var serviceUUID = UUID.generate('eDomoticz:gasmeter:customservice');
+            super(displayName, serviceUUID, subtype);
+            this.addCharacteristic(new eDomoticzServices.GasConsumption());
+        }
+    };
+
+    // The Usage Meter itself
+    eDomoticzServices.UsageDeviceService = class extends Service {
+        constructor(displayName, subtype) {
+            var serviceUUID = UUID.generate('eDomoticz:usagedevice:customservice');
+            super(displayName, serviceUUID, subtype);
+            this.addCharacteristic(new eDomoticzServices.CurrentUsage());
+        }
+    };
+
+    eDomoticzServices.LocationService = class extends Service {
+        constructor(displayName, subtype) {
+            var serviceUUID = UUID.generate('eDomoticz:location:customservice');
+            super(displayName, serviceUUID, subtype);
+            this.addCharacteristic(new eDomoticzServices.Location());
+        }
+    };
+
+    // DarkSkies Virtual Wind Sensor
+    eDomoticzServices.WindDeviceService = class extends Service {
+        constructor(displayName, subtype) {
+            var serviceUUID = '2AFB775E-79E5-4399-B3CD-398474CAE86C'; //UUID.generate('eDomoticz:winddevice:customservice');
+            super(displayName, serviceUUID, subtype);
+            this.addCharacteristic(new eDomoticzServices.WindSpeed());
+            this.addOptionalCharacteristic(new eDomoticzServices.WindChill());
+            this.addOptionalCharacteristic(new eDomoticzServices.WindDirection());
+            this.addOptionalCharacteristic(new Characteristic.CurrentTemperature());
+        }
+    };
+
+    // DarkSkies Rain Meter itself
+    eDomoticzServices.RainDeviceService = class extends Service {
+        constructor(displayName, subtype) {
+            var serviceUUID = 'D92D5391-92AF-4824-AF4A-356F25F25EA1'; //UUID.generate('eDomoticz:raindevice:customservice');
+            super(displayName, serviceUUID, subtype);
+            this.addCharacteristic(new eDomoticzServices.Rainfall());
+        }
+    };
+
+    // DarkSkies Visibility Meter itself
+    eDomoticzServices.VisibilityDeviceService = class extends Service {
+        constructor(displayName, subtype) {
+            var serviceUUID = UUID.generate('eDomoticz:visibilitydevice:customservice');
+            super(displayName, serviceUUID, subtype);
+            this.addCharacteristic(new eDomoticzServices.Visibility());
+        }
+    };
+
+    // DarkSkies UV Index Meter itself
+    eDomoticzServices.UVDeviceService = class extends Service {
+        constructor(displayName, subtype) {
+            var serviceUUID = UUID.generate('eDomoticz:uvdevice:customservice');
+            super(displayName, serviceUUID, subtype);
+            this.addCharacteristic(new eDomoticzServices.UVIndex());
+        }
+    };
+
+    // DarkSkies Solar Radiation Meter itself
+    eDomoticzServices.SolRadDeviceService = class extends Service {
+        constructor(displayName, subtype) {
+            var serviceUUID = UUID.generate('eDomoticz:solraddevice:customservice');
+            super(displayName, serviceUUID, subtype);
+            this.addCharacteristic(new eDomoticzServices.SolRad());
+        }
+    };
+
+    // Weather Service (Temp + Humidity + Baro composite, surfaced as Eve Weather)
+    eDomoticzServices.WeatherService = class extends Service {
+        constructor(displayName, subtype) {
+            var serviceUUID = 'debf1b79-312e-47f7-bf82-993d9950f3a2';//'E863F001-079E-48FF-8F27-9C2605A29F52';
+            super(displayName, serviceUUID, subtype);
+            this.addCharacteristic(new Characteristic.CurrentTemperature());
+            this.addOptionalCharacteristic(new Characteristic.CurrentRelativeHumidity());
+            this.addOptionalCharacteristic(new eDomoticzServices.Barometer());
+        }
+    };
+
+    // Infotext Device Service
+    eDomoticzServices.InfotextDeviceService = class extends Service {
+        constructor(displayName, subtype) {
+            var serviceUUID = UUID.generate('eDomoticz:infotextdevice:customservice');
+            super(displayName, serviceUUID, subtype);
+            this.addCharacteristic(new eDomoticzServices.Infotext());
+        }
+    };
+}

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "homebridge-edomoticz",
-  "version": "2.1.49",
+  "version": "3.0.4",
   "description": "homebridge-plugin for Domoticz https://github.com/nfarina/homebridge",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "node test/load-plugin.js"
   },
   "repository": {
     "type": "git",
@@ -17,14 +17,18 @@
     "Domoticz"
   ],
   "engines": {
-    "node": ">=0.12.0",
-    "homebridge": ">=0.2.5"
+    "node": ">=18.15.0",
+    "homebridge": ">=1.8.0 || >=2.0.0"
   },
   "dependencies": {
     "inherits": "^2.0.1",
     "mqtt": "^2.15.0",
     "request": "^2.81.0"
   },
+  "devDependencies": {
+    "@homebridge/hap-nodejs": "^2.1.0",
+    "homebridge": "^2.0.0"
+  },
   "author": {
     "name": "PatchworkBoy",
     "url": "aka Marci"
@@ -36,7 +40,6 @@
   "homepage": "https://github.com/patchworkboy/homebridge-eDomoticz#readme",
   "readme": "# homebridge-eDomoticz\nA fully-fledged up-to-date Homebridge-Plugin\nfor use with [Homebridge](https://github.com/nfarina/homebridge) v0.2.1+\nand [Domoticz](https://github.com/domoticz/domoticz)\n\n##Supports:\n###Standard HomeKit Types:\n- Sockets (on/off) - Domoticz SwitchTypeVal: 0\n- Lamps (on/off) - Domoticz SwitchTypeVal: 0\n- Contact Sensors - Domoticz SwitchTypeVal: 2\n- Blinds - Domoticz SwitchTypeVal: 3\n- Smoke Detectors - Domoticz SwitchTypeVal: 5\n- Blinds (inverted) - Domoticz SwitchTypeVal: 6\n- Lamps (dimmer) - Domoticz SwitchTypeVal: 7\n- Motion Sensors - Domoticz SwitchTypeVal: 8\n- Push Switches -  Domoticz SwitchTypeVal: 9\n- Lock Mechanisms - Domoticz SwitchTypeVal: 11\n- Blinds (%) - Domoticz SwitchTypeVal: 13\n- Blinds (& inverted) - Domoticz SwitchTypeVal: 16\n\n##Provides:\n###Custom HomeKit Types:\n- General kWh power meters - Types: General, Current; SubType: kWh, mapped to Eve chars where possible\n- CurrentCost USB power meter - Type: Usage, SubType: Electric, mapped to Eve chars where possible\n- P1 Smart Meter (Electric & Gas), mapped to Eve chars where possible\n- EvoHome** / OpenTherm Thermostat support - Types: Heating, Thermostat; SubTypes: Zone, SetPoint\n- YouLess Meter (Current, Total and Today Total Consumption) - Type: YouLess Meter; SubType: YouLess counter, mapped to Eve chars where possible\n- General Usage % meters (eg: Motherboard Sensors Hardware Device - CPU %, Mem %, HDD % etc) - Type: General; SubType: Percentage\n- Temperature, Temp + Humidity, Temp + Humidity + Baro (Current Temperature, Current Humidity, Current Pressure in hPA) - Type: Temp, Temp + Humidty, Temp + Humidity + Baro [id'd as Eve Weather]\n- DarkSkies Virtual Weather Station Sensors (Wind, Solar Radiation, Rainfall, Visibility, Barometer [id'd as Eve Weather])\n\n** assumes the EvoHome has been setup according to [this script method](https://www.domoticz.com/wiki/Evohome#Scripting_for_RFG100).\n\n###Todo:\n- [ ] homebridge [plugin 2.0](https://github.com/nfarina/homebridge/pull/497) support\n- [x] MQTT-based realtime updates\n- [x] Hue/RGB\n- [x] Blinds\n- [x] m3 (gas usage)\n- [x] Motion sensors\n- [x] Smoke Detectors\n- [x] Brightness/Dimming\n- [x] kWh (electricity usage)\n- [x] General % usage\n- [x] Humidity\n- [x] Pressure\n- [x] YouLess Meter\n- [x] Open/Closed contact sensors\n- [ ] ...more sensors (ongoing)!\n\n## Installation\n```\nsudo npm install -g homebridge-edomoticz\n```\n\n## Update\n```\nsudo npm update -g homebridge-edomoticz\n```\n\n## Configuration\n\n~/.homebridge/config.json example:\n```\n{\n    \"bridge\": {\n        \"name\": \"Homebridge\",\n        \"username\": \"CC:21:3E:E4:DE:33\",\n        \"port\": 51826,\n        \"pin\": \"031-45-154\"\n    },\n    \"description\": \"Configuration file for (e)xtended Domoticz platform.\",\n    \"platforms\": [\n        {\n            \"platform\": \"eDomoticz\",\n            \"name\": \"eDomoticz\",\n            \"server\": \"127.0.0.1\",\n            \"port\": \"8080\",\n            \"ssl\": 0,\n            \"roomid\": 0,\n            \"mqttenable\": 1,\n            \"mqttserver\": \"127.0.0.1\",\n            \"mqttport\": \"1883\",\n            \"mqttauth\": 0,\n            \"mqttuser\": \"\",\n            \"mqttpass\": \"\"\n        }\n    ],\n    \"accessories\": []\n}\n```\n\n## Tips\n\n### Authentication\nIf Domoticz is set up to use basic or form login authentication, set \"server\":\"user:pass@ip\" within config.json. The plugin will internally extract the username and password, base64 encode it and send it as a http authorization header whenever it talks to your Domoticz server.\n\n### SSL\nSet \"ssl\":1 in config.json to turn on SSL (ie: server connects with https:// rather than http://). You will need to specify your SSL port - usually \"port\":\"443\" by default.\n\n### Issues pairing to Homebridge when you have a lot of Domoticz sensors...\nIf you have more than 100 devices in Domoticz, you need to limit the number of devices exposed to HomeKit (HomeKit only supports 100 Accessories on a single bridge - whilst we could combine multiple sensors into a single homekit accessory within the plugin, the possible combinations out there are endless, so we won't).\n\nTherefore, to reduce the number of devices exposed from Domoticz, create a roomplan within Domoticz via Setup > More Options > Plans > roomplan. Add only the devices you wish to be exposed to HomeKit to this new roomplan within Domoticz, and then get it's roomidx number. Set \"roomid\" in your config.json file to this room number.\n\n### Is my <<some accessory>> supported??\nSee [Domoticz API Reference](https://www.domoticz.com/wiki/Domoticz_API/JSON_URL's#Retrieve_status_of_specific_device) - query your device as per the instructions there, and if your device’s SwitchTypeVal isn't in the 'Supports:' list or Type/SubType aren’t in the ’Provides:' list above then it'll just appear as an On/Off switch. [Open a new issue](https://github.com/PatchworkBoy/homebridge-eDomoticz/issues/new) including the output from the json api and I’ll get look into supporting that particular device more fully!\n\n### What does the Override slider represent on the EvoHome Thermostat?\nOverride-Until time in minutes from the current time. Allows setting an override-until time upto 8 hours in the future. Setting this slider to 0 will set the heating mode to Auto. Setting it to 481 will set the override as a PermanentOverride.\n\n### Logging\nComplies with Homebridge's native logging & debugging methodology - see https://github.com/nfarina/homebridge/wiki/Basic-Trouble-Shooting\n",
   "readmeFilename": "README.md",
-  "_id": "homebridge-edomoticz@2.1.8",
   "_from": "homebridge-edomoticz",
   "_resolved": "file:homebridge-edomoticz"
 }

package/test/load-plugin.js

@@ -0,0 +1,227 @@
+'use strict';
+/*
+ * test/load-plugin.js
+ *
+ * Smoke test for the Homebridge 2.x / HAP-NodeJS v2 compatibility migration.
+ *
+ * It does NOT load the full plugin (index.js) on purpose: index.js pulls
+ * domoticz_accessory.js + request + mqtt etc., and we want a focused check
+ * on the migration itself. Instead it replicates what index.js does on
+ * startup -- read Service/Characteristic/uuid from HAP, call initServices --
+ * and then instantiates a representative battery of subclasses.
+ *
+ * The original v2.1.50 plugin crashed under HAP-NodeJS v2 with:
+ *     TypeError: Class constructor Service cannot be invoked without 'new'
+ *         at new eDomoticzServices.MeterDeviceService (lib/services.js:133:13)
+ * This test will catch any regression of that bug.
+ *
+ * Coverage:
+ *   - Characteristic with fixed Eve UUID            -> CurrentConsumption
+ *   - Characteristic with UUID.generate              -> TodayConsumption
+ *   - Characteristic with historical UUID collision  -> GasConsumption
+ *   - The 3 Services that share 'eDomoticz:powermeter:customservice'
+ *     (differentiated only by subtype) -> AMP / VOLT / Meter
+ *   - Service with fixed UUID                        -> WindDeviceService
+ *   - Service that composes a HAP stock Characteristic
+ *     (Characteristic.CurrentTemperature)            -> WeatherService
+ *
+ * Exit codes:
+ *   0  -> all instantiations succeeded
+ *   2  -> @homebridge/hap-nodejs not installed (run `npm install` first)
+ *   3  -> initServices threw
+ *   1  -> at least one instantiation threw
+ */
+
+let hap;
+try {
+    hap = require('@homebridge/hap-nodejs');
+} catch (e) {
+    console.error('FAIL: @homebridge/hap-nodejs is not installed. Run `npm install` first.');
+    console.error(e && e.stack ? e.stack : e);
+    process.exit(2);
+}
+
+// 1. Load the migrated services module
+const Services = require('../lib/services.js');
+
+// 2. Replicate what index.js does on startup: hand HAP refs to the factory.
+//    The 4th argument (the hap module itself) lets initServices resolve the
+//    Formats/Perms/Units enums under HAP v2, where they live on the module
+//    root rather than on the Characteristic class.
+try {
+    Services.initServices(hap.Service, hap.Characteristic, hap.uuid, hap);
+} catch (e) {
+    console.error('FAIL: Services.initServices threw.');
+    console.error(e && e.stack ? e.stack : e);
+    process.exit(3);
+}
+
+const eDomoticzServices = Services.eDomoticzServices;
+
+// 3. Instantiate representatives
+const cases = [
+    // --- Characteristics ---
+    {
+        label: 'Characteristic, fixed Eve UUID (CurrentConsumption)',
+        run: function () { return new eDomoticzServices.CurrentConsumption(); },
+    },
+    {
+        label: 'Characteristic, UUID.generate (TodayConsumption)',
+        run: function () { return new eDomoticzServices.TodayConsumption(); },
+    },
+    {
+        label: 'Characteristic, historical UUID collision (GasConsumption)',
+        run: function () { return new eDomoticzServices.GasConsumption(); },
+    },
+
+    // --- The 3 Services sharing UUID 'eDomoticz:powermeter:customservice' ---
+    {
+        label: "Service, shared UUID key, subtype='sub-amp' (AMPDeviceService)",
+        run: function () { return new eDomoticzServices.AMPDeviceService('AMP', 'sub-amp'); },
+    },
+    {
+        label: "Service, shared UUID key, subtype='sub-volt' (VOLTDeviceService)",
+        run: function () { return new eDomoticzServices.VOLTDeviceService('VOLT', 'sub-volt'); },
+    },
+    {
+        label: "Service, shared UUID key, subtype='sub-meter' (MeterDeviceService) -- original crash site",
+        run: function () { return new eDomoticzServices.MeterDeviceService('Meter', 'sub-meter'); },
+    },
+
+    // --- Other shapes ---
+    {
+        label: 'Service, fixed UUID (WindDeviceService)',
+        run: function () { return new eDomoticzServices.WindDeviceService('Wind', 'sub-wind'); },
+    },
+    {
+        label: 'Service composing HAP stock + custom Characteristic (WeatherService)',
+        run: function () { return new eDomoticzServices.WeatherService('Weather', 'sub-weather'); },
+    },
+];
+
+let ok = 0;
+let failed = 0;
+const collisionUUIDs = [];
+
+for (const c of cases) {
+    try {
+        const inst = c.run();
+        if (!inst) throw new Error('instance is falsy');
+        ok++;
+        // Capture the UUID of the three colliding services so we can assert
+        // afterwards that they really do share the same UUID and differ only
+        // in subtype (the historical upstream invariant).
+        if (/AMPDeviceService|VOLTDeviceService|MeterDeviceService/.test(c.label)) {
+            collisionUUIDs.push({ label: c.label.split(' (')[1].replace(')', ''), uuid: inst.UUID, subtype: inst.subtype });
+        }
+        console.log('  OK   ' + c.label + '  ->  UUID=' + inst.UUID + (inst.subtype ? ', subtype=' + inst.subtype : ''));
+    } catch (e) {
+        failed++;
+        const stack = e && e.stack ? e.stack.split('\n').slice(0, 4).join('\n         ') : String(e);
+        console.error('  FAIL ' + c.label);
+        console.error('         ' + stack);
+    }
+}
+
+// Assert every custom Characteristic is readable on the wire.
+// HAP-NodeJS v2 removed the deprecated Perms.READ / Perms.WRITE aliases
+// (only PAIRED_READ / PAIRED_WRITE remain), so a stale alias silently
+// resolves to undefined and the characteristic is published with
+// perms [null, "ev"]. iOS rejects the whole bridge at pairing with
+// "Accessory out of compliance" (upstream PR #297 report), and HAP-NodeJS
+// itself answers reads with WRITE_ONLY_CHARACTERISTIC. Regression guard.
+{
+    const hapPerms = hap.Perms || (hap.Characteristic && hap.Characteristic.Perms);
+    const PR = hapPerms.PAIRED_READ;
+    let checked = 0;
+    let bad = [];
+    for (const name of Object.keys(eDomoticzServices)) {
+        const Ctor = eDomoticzServices[name];
+        if (typeof Ctor !== 'function' || !(Ctor.prototype instanceof hap.Characteristic)) continue;
+        const inst = new Ctor();
+        checked++;
+        const perms = (inst.props && inst.props.perms) || [];
+        if (perms.some(function (x) { return x == null; }) || perms.indexOf(PR) === -1) {
+            bad.push(name + ' perms=' + JSON.stringify(perms));
+        }
+    }
+    if (bad.length) {
+        failed++;
+        console.error('  FAIL perms invariant: ' + bad.length + ' custom Characteristic(s) not readable / have null perms:');
+        bad.forEach(function (b) { console.error('         ' + b); });
+    } else {
+        console.log('  OK   perms invariant: ' + checked + ' custom Characteristics all carry PAIRED_READ and no null perms');
+    }
+}
+
+// Assert cached characteristics with poisoned perms get healed on restore.
+// Simulates what Homebridge hands to configureAccessory: a PlatformAccessory
+// whose services were deserialized from cachedAccessories, where custom
+// characteristics are generic hap.Characteristic instances carrying the
+// persisted props. A cache written by 3.0.0-3.0.2 under HAP v2 has
+// perms [null, "ev"]; Helper.healCustomCharacteristicPerms must fix exactly
+// those and leave healthy ones (and non-perms props) alone.
+{
+    const Helper = require('../lib/helper.js').Helper;
+    const hapPerms = hap.Perms || (hap.Characteristic && hap.Characteristic.Perms);
+    const PR = hapPerms.PAIRED_READ;
+    const good = new eDomoticzServices.Barometer();
+    const poisoned = hap.Characteristic.deserialize({
+        displayName: good.displayName,
+        UUID: good.UUID,
+        props: { format: good.props.format, unit: good.props.unit, perms: [null, 'ev'] },
+        value: 1013,
+    });
+    const healthy = hap.Characteristic.deserialize({
+        displayName: 'Consumption',
+        UUID: new eDomoticzServices.CurrentConsumption().UUID,
+        props: { format: 'float', unit: 'W', perms: [PR, 'ev'] },
+        value: 12,
+    });
+    const svc = new hap.Service('Cached Weather', new eDomoticzServices.WeatherService('x').UUID, 'sub');
+    svc.addCharacteristic(poisoned);
+    svc.addCharacteristic(healthy);
+    const fakePlatformAccessory = { services: [svc] };
+
+    const healed = Helper.healCustomCharacteristicPerms(fakePlatformAccessory, eDomoticzServices, hap.Characteristic, PR);
+    const after = poisoned.props.perms;
+    const problems = [];
+    if (healed !== 1) problems.push('expected exactly 1 healed characteristic, got ' + healed);
+    if (after.indexOf(PR) === -1 || after.some(function (x) { return x == null; })) problems.push('poisoned perms not repaired: ' + JSON.stringify(after));
+    if (poisoned.props.unit !== good.props.unit) problems.push('unit was altered: ' + poisoned.props.unit);
+    if (JSON.stringify(healthy.props.perms) !== JSON.stringify([PR, 'ev'])) problems.push('healthy perms were altered: ' + JSON.stringify(healthy.props.perms));
+    const second = Helper.healCustomCharacteristicPerms(fakePlatformAccessory, eDomoticzServices, hap.Characteristic, PR);
+    if (second !== 0) problems.push('heal is not idempotent, second pass healed ' + second);
+    if (problems.length) {
+        failed++;
+        console.error('  FAIL cache heal:');
+        problems.forEach(function (m) { console.error('         ' + m); });
+    } else {
+        console.log('  OK   cache heal: poisoned [null,"ev"] -> ' + JSON.stringify(after) + ', healthy untouched, idempotent');
+    }
+}
+
+// Assert the historical collision is preserved: same UUID across the 3
+// services, distinct subtypes.
+if (failed === 0 && collisionUUIDs.length === 3) {
+    const uniqueUUIDs = new Set(collisionUUIDs.map(function (x) { return x.uuid; }));
+    const uniqueSubtypes = new Set(collisionUUIDs.map(function (x) { return x.subtype; }));
+    if (uniqueUUIDs.size !== 1) {
+        failed++;
+        console.error('  FAIL collision invariant: the 3 powermeter services should share one UUID, got ' + uniqueUUIDs.size + ' distinct UUIDs.');
+    } else if (uniqueSubtypes.size !== 3) {
+        failed++;
+        console.error('  FAIL collision invariant: subtypes should be distinct, got ' + uniqueSubtypes.size + '.');
+    } else {
+        console.log('  OK   collision invariant: 3 services share UUID ' + Array.from(uniqueUUIDs)[0] + ' with 3 distinct subtypes');
+    }
+}
+
+if (failed) {
+    console.error('\n' + failed + ' check(s) failed.');
+    process.exit(1);
+}
+
+console.log('\nOK: ' + ok + ' instanciaciones completadas');
+console.log('Carga + instanciacion OK');
+process.exit(0);

package/.npmignore

@@ -1,3 +0,0 @@
-
-*.log
-node_modules