homebridge-pvs6 1.4.0 → 1.5.0

package/README.md

@@ -136,6 +136,11 @@ Uncheck **Auto Discover** and supply the host and serial number directly. This s
       "serialNumber": "ZT231385000549A1234",
       "pollInterval": 10,
       "matter": true,
+      "evePowerUpdates": "throttled",
+      "minChangeWatts": 25,
+      "minChangePercent": 2,
+      "minChangeKwh": 0.1,
+      "switchHoldSeconds": 60,
       "accessories": {
         "grid": true,
         "homeConsumption": true
@@ -159,6 +164,11 @@ Uncheck **Auto Discover** and supply the host and serial number directly. This s
 | `serialNumber` | string | no* | — | Full PVS6 serial number. The last 5 characters are used as the API password. Used only when `autoDiscover` is `false` |
 | `pollInterval` | integer | no | `10` | Seconds between polls. Minimum enforced: `5` |
 | `matter` | boolean | no | `false` | Also publish each enabled meter over Matter with live electrical measurements, so it shows watts on its tile in the Apple Home Energy view (see [Apple Home Energy & Matter](#apple-home-energy--matter)) |
+| `evePowerUpdates` | string | no | `"throttled"` | How Eve Watts and Eve kWh are sent to HomeKit: `"throttled"`, `"pollOnly"` or `"live"`. See [HomeKit Updates & Automations](#homekit-updates--automations) |
+| `minChangeWatts` | number | no | `25` | Throttled mode: push Eve Watts once it has changed by this many watts, or by `minChangePercent` if that is larger |
+| `minChangePercent` | number | no | `2` | Throttled mode: push Eve Watts once it has changed by this percentage of the last value pushed |
+| `minChangeKwh` | number | no | `0.1` | Throttled mode: push Eve kWh once it has changed by this much |
+| `switchHoldSeconds` | integer | no | `60` | A power-derived On switch only changes once the new state has held this long. `0` disables the hold |
 | `accessories.grid` | boolean | no | `true` | Enable the Grid Import + Grid Export accessory pair. Set `false` to disable both |
 | `accessories.homeConsumption` | boolean | no | `false` | Enable the Home Consumption accessory. Opt-in; off by default |
 | `solarName` | string | no | `"Solar Production"` | HomeKit display name for the Solar Production accessory |
@@ -168,6 +178,35 @@ Uncheck **Auto Discover** and supply the host and serial number directly. This s
 
 \* Required when `autoDiscover` is `false`.
 
+### HomeKit Updates & Automations
+
+The PVS6 is polled every ~10 seconds, and each reading differs from the last by a few watts. If every reading were pushed to HomeKit, each accessory's Eve Watts and Eve kWh values would send an event on every poll, adding up to about 1,000 events per hour. The settings below reduce that without breaking your automations.
+
+#### Eve power and energy values (`evePowerUpdates`)
+
+Eve Watts and Eve kWh are Eve custom characteristics. The Home app doesn't show them, but **Eve and Home+ automations can trigger on them** ("when power rises above 3 kW") **or check them as conditions**. Choose a mode with that in mind:
+
+| Mode | What is pushed | Effect on automations |
+|---|---|---|
+| `throttled` (default) | Eve Watts when it changes by at least `max(minChangeWatts, minChangePercent%)` (defaults 25 W / 2%, so 25 W below 1,250 W and 2% above). Eve kWh when it changes by at least `minChangeKwh` (default 0.1 kWh). Either value is also pushed every 5 minutes, even if it hasn't changed much | Triggers and conditions keep working. Values are accurate to within the configured thresholds |
+| `pollOnly` | Nothing. Event notifications are removed from these characteristics, and apps get the newest reading when they read the accessory | Lowest traffic, but **triggers on these values stop firing**. Use it only if no automation uses them |
+| `live` | Every reading, on every poll | Original behaviour; highest traffic |
+
+In every mode, reading an accessory returns the latest value, and the current values are reported as soon as the plugin starts.
+
+#### On switches
+
+Each accessory's **On** switch is a standard HomeKit characteristic. It always sends events, so Home app automations that use it keep working. To keep the switches from flickering at sunrise, at sunset, or when a cloud passes, each one is derived from power with:
+
+- **a deadband:** it turns on above 50 W and off below 20 W
+- **a hold:** a new state must last `switchHoldSeconds` (default 60) before it's reported. If power goes back first, the change is dropped. Set it to `0` to report changes on the next poll
+
+Because of the hold, **automations triggered by these switches can fire up to `switchHoldSeconds` later** than the underlying change in power.
+
+#### Logging
+
+At debug level, each suppressed Eve update and each held or cancelled switch change is logged. Once an hour a single debug line reports how many updates were sent and how many were suppressed.
+
 ### Finding Your Serial Number
 
 The serial number is printed on the label on the PVS6 unit (format: `ZT...`). It is also visible in the SunStrong Connect app and is broadcast by the PVS6 itself via mDNS (which is how Auto Discover retrieves it). The last 5 characters are used as the local API login password — no separate password configuration is required.
@@ -180,7 +219,7 @@ The serial number is printed on the label on the PVS6 unit (format: `ZT...`). It
 
 | Characteristic | Source | Notes |
 |---|---|---|
-| On | `pv_p > 0` | True when panels are actively generating |
+| On | `pv_p` | True when panels are generating: on above 50 W, off below 20 W, after the state has held for `switchHoldSeconds` |
 | OutletInUse | Always `true` | Required by Eve Energy |
 | Eve Watts | `pv_p × 1000` | Real-time solar output in Watts |
 | Eve kWh | `pv_en` | Lifetime generation in kWh |
@@ -189,7 +228,7 @@ The serial number is printed on the label on the PVS6 unit (format: `ZT...`). It
 
 | Characteristic | Source | Notes |
 |---|---|---|
-| On | `net_p > 0` | True when importing from grid |
+| On | `max(0, net_p)` | True when importing from the grid: on above 50 W, off below 20 W, after the state has held for `switchHoldSeconds` |
 | OutletInUse | Always `true` | Required by Eve Energy |
 | Eve Watts | `max(0, net_p) × 1000` | Import watts; zero when net-exporting |
 | Eve kWh | `posLtea3phsumKwh` | Lifetime imported energy from consumption CT meter |
@@ -198,7 +237,7 @@ The serial number is printed on the label on the PVS6 unit (format: `ZT...`). It
 
 | Characteristic | Source | Notes |
 |---|---|---|
-| On | `net_p < 0` | True when net-exporting solar to the grid |
+| On | `max(0, −net_p)` | True when net-exporting to the grid: on above 50 W, off below 20 W, after the state has held for `switchHoldSeconds` |
 | OutletInUse | Always `true` | Required by Eve Energy |
 | Eve Watts | `max(0, −net_p) × 1000` | Export watts; zero when importing |
 | Eve kWh | `negLtea3phsumKwh` | Lifetime exported energy from consumption CT meter |
@@ -209,7 +248,7 @@ Shows the total real-time load of the home and a derived lifetime consumption fi
 
 | Characteristic | Source | Notes |
 |---|---|---|
-| On | `site_load_p > 0` | True when the house is drawing power (always true in practice) |
+| On | `site_load_p` | True when the house is drawing power (on above 50 W, off below 20 W, after the state has held for `switchHoldSeconds`; always on in practice) |
 | OutletInUse | Always `true` | Required by Eve Energy |
 | Eve Watts | `site_load_p × 1000` | Real-time site load in Watts |
 | Eve kWh | `pv_en + posLtea3phsumKwh − negLtea3phsumKwh` | Derived lifetime consumption — all solar generated, plus grid imported, minus grid exported |
@@ -220,6 +259,13 @@ The derived kWh formula is exact without a battery: solar energy either goes to
 
 ## Apple Home Energy & Matter
 
+<table>
+  <td>
+<img width="600" alt="MatterEnergy" src="https://github.com/user-attachments/assets/fcff5f12-54cb-4431-a944-8ac04c6e044f" />
+        <br><sub>Apple Energy view with other Energy accessories</sub>
+    </td>
+</table>
+
 Apple Home's native **Energy** view is driven by **Matter** electrical-measurement clusters, **not** by classic HomeKit/HAP characteristics. HAP has no power or energy characteristic at all, so the Eve characteristics above (which only Eve-class apps read) can never populate it — no matter how the HomeKit accessory is shaped.
 
 With `"matter": true`, this plugin publishes an **`ElectricalSensor`** Matter accessory for Solar Production and Grid, carrying live power and cumulative/periodic energy — no on/off, no controllable state, purely metering:
@@ -276,6 +322,12 @@ npm install
 npm run build
 ```
 
+To run the unit tests:
+
+```bash
+npm test
+```
+
 To develop with live rebuilds:
 
 ```bash

package/config.schema.json

@@ -41,6 +41,69 @@
         "default": false,
         "description": "Also publish Solar and Grid (import/export combined) over Matter as electrical sensors with live power and cumulative/periodic energy, feeding your Apple Home Energy view. Home Consumption is not published over Matter, since its energy is derived from Solar + Grid rather than an independent measurement. Requires Homebridge 2.3.0+ with Matter enabled on this plugin's child bridge; skipped safely otherwise."
       },
+      "evePowerUpdates": {
+        "title": "Eve power/energy updates",
+        "type": "string",
+        "default": "throttled",
+        "oneOf": [
+          {
+            "title": "Throttled \u2014 push on meaningful change or every 5 minutes (recommended)",
+            "enum": [
+              "throttled"
+            ]
+          },
+          {
+            "title": "Poll only \u2014 never push; lowest traffic, breaks Eve/Home+ triggers on these values",
+            "enum": [
+              "pollOnly"
+            ]
+          },
+          {
+            "title": "Live \u2014 push every poll (original behaviour)",
+            "enum": [
+              "live"
+            ]
+          }
+        ],
+        "description": "How Eve Watts and Eve kWh values are sent to HomeKit. Eve and Home+ automations can trigger on or check these values. Throttled keeps those automations working with values accurate to within the thresholds below. Poll only gives the lowest traffic, but automations triggered by these values stop firing; use it only if no automation uses them."
+      },
+      "minChangeWatts": {
+        "title": "Minimum power change (W)",
+        "type": "number",
+        "default": 25,
+        "minimum": 0,
+        "description": "Throttled: push Eve Watts when it has changed by at least this many watts, or by the percentage below if that is larger.",
+        "condition": {
+          "functionBody": "return !model.evePowerUpdates || model.evePowerUpdates === 'throttled';"
+        }
+      },
+      "minChangePercent": {
+        "title": "Minimum power change (%)",
+        "type": "number",
+        "default": 2,
+        "minimum": 0,
+        "description": "Throttled: push Eve Watts when it has changed by at least this percentage of the last value pushed, or by the watts above if that is larger.",
+        "condition": {
+          "functionBody": "return !model.evePowerUpdates || model.evePowerUpdates === 'throttled';"
+        }
+      },
+      "minChangeKwh": {
+        "title": "Minimum energy change (kWh)",
+        "type": "number",
+        "default": 0.1,
+        "minimum": 0,
+        "description": "Throttled: push Eve kWh when it has changed by at least this much.",
+        "condition": {
+          "functionBody": "return !model.evePowerUpdates || model.evePowerUpdates === 'throttled';"
+        }
+      },
+      "switchHoldSeconds": {
+        "title": "Switch hold (seconds)",
+        "type": "integer",
+        "default": 60,
+        "minimum": 0,
+        "description": "The On switches derived from power (on above 50 W, off below 20 W) only change once the new state has held for this long. Automations triggered by these switches can fire up to this much later than the underlying change. 0 disables the hold."
+      },
       "accessories": {
         "title": "Accessories",
         "type": "object",
@@ -84,5 +147,32 @@
       }
     },
     "required": []
-  }
+  },
+  "layout": [
+    "name",
+    "autoDiscover",
+    "host",
+    "serialNumber",
+    "pollInterval",
+    "matter",
+    {
+      "type": "fieldset",
+      "title": "HomeKit Updates",
+      "expandable": true,
+      "expanded": false,
+      "description": "Control how often power readings are sent to HomeKit.",
+      "items": [
+        "evePowerUpdates",
+        "minChangeWatts",
+        "minChangePercent",
+        "minChangeKwh",
+        "switchHoldSeconds"
+      ]
+    },
+    "accessories",
+    "solarName",
+    "gridName",
+    "gridExportName",
+    "homeConsumptionName"
+  ]
 }

package/dist/gridExportAccessory.d.ts

@@ -7,6 +7,7 @@ export declare class GridExportAccessory {
     private readonly historyService;
     private lastPowerW;
     private lastEnergyKWh;
+    private readonly meter;
     constructor(platform: PVS6Platform, accessory: PlatformAccessory, FakeGatoHistoryService: any, displayName: string, serialNumber: string);
     updateValues(reading: PVS6Reading): void;
 }

package/dist/gridExportAccessory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gridExportAccessory.d.ts","sourceRoot":"","sources":["../src/gridExportAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAW,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAG3C,qBAAa,mBAAmB;IAS5B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAR3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAElC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAM;IAErC,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,aAAa,CAAK;gBAGP,QAAQ,EAAE,YAAY,EACvC,SAAS,EAAE,iBAAiB,EAE5B,sBAAsB,EAAE,GAAG,EAC3B,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM;IA2CtB,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI;CAoBzC"}
+{"version":3,"file":"gridExportAccessory.d.ts","sourceRoot":"","sources":["../src/gridExportAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAW,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAI3C,qBAAa,mBAAmB;IAU5B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAT3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAElC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAM;IAErC,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAuB;gBAG1B,QAAQ,EAAE,YAAY,EACvC,SAAS,EAAE,iBAAiB,EAE5B,sBAAsB,EAAE,GAAG,EAC3B,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM;IAyBtB,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI;CAczC"}

package/dist/gridExportAccessory.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GridExportAccessory = void 0;
 const eveCharacteristics_1 = require("./eveCharacteristics");
+const meterCharacteristics_1 = require("./meterCharacteristics");
 class GridExportAccessory {
     constructor(platform, accessory, 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -10,7 +11,6 @@ class GridExportAccessory {
         this.lastPowerW = 0;
         this.lastEnergyKWh = 0;
         const { Characteristic } = platform;
-        const { EveWatts, EveKWh } = platform.eveChars;
         const infoService = accessory.getService(platform.Service.AccessoryInformation) ??
             accessory.addService(platform.Service.AccessoryInformation);
         infoService
@@ -21,34 +21,15 @@ class GridExportAccessory {
         this.service = existingService ??
             accessory.addService(new platform.api.hap.Service(displayName, eveCharacteristics_1.EVE_ENERGY_SERVICE_UUID));
         this.service.setCharacteristic(Characteristic.Name, displayName);
-        // On = true when exporting (lastPowerW > 0); always non-negative so the comparison is natural.
-        this.service
-            .getCharacteristic(Characteristic.On)
-            .onGet(() => this.lastPowerW > 0)
-            .onSet(async () => {
-            this.service.updateCharacteristic(Characteristic.On, this.lastPowerW > 0);
-        });
-        this.service
-            .getCharacteristic(Characteristic.OutletInUse)
-            .onGet(() => true);
-        this.service
-            .getCharacteristic(EveWatts)
-            .onGet(() => this.lastPowerW);
-        this.service
-            .getCharacteristic(EveKWh)
-            .onGet(() => this.lastEnergyKWh);
+        // On (power-derived, with deadband + hold), OutletInUse, Eve Watts, Eve kWh.
+        this.meter = new meterCharacteristics_1.MeterCharacteristics(platform, accessory, this.service, 'grid-export', displayName);
         this.historyService = new FakeGatoHistoryService('energy', accessory, { storage: 'fs' });
     }
     updateValues(reading) {
-        const { Characteristic } = this.platform;
-        const { EveWatts, EveKWh } = this.platform.eveChars;
         // Non-negative: positive when net-exporting, zero when importing.
         this.lastPowerW = Math.max(0, -reading.netPowerW);
         this.lastEnergyKWh = reading.gridExportKWh;
-        this.service.updateCharacteristic(Characteristic.On, this.lastPowerW > 0);
-        this.service.updateCharacteristic(Characteristic.OutletInUse, true);
-        this.service.updateCharacteristic(EveWatts, this.lastPowerW);
-        this.service.updateCharacteristic(EveKWh, this.lastEnergyKWh);
+        this.meter.update(this.lastPowerW, this.lastEnergyKWh);
         this.historyService.addEntry({
             time: Math.round(Date.now() / 1000),
             power: this.lastPowerW,

package/dist/gridExportAccessory.js.map

@@ -1 +1 @@
-{"version":3,"file":"gridExportAccessory.js","sourceRoot":"","sources":["../src/gridExportAccessory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gridExportAccessory.js","sourceRoot":"","sources":["../src/gridExportAccessory.ts"],"names":[],"mappings":";;;AAGA,6DAA+D;AAC/D,iEAA8D;AAE9D,MAAa,mBAAmB;IAS9B,YACmB,QAAsB,EACvC,SAA4B;IAC5B,8DAA8D;IAC9D,sBAA2B,EAC3B,WAAmB,EACnB,YAAoB;QALH,aAAQ,GAAR,QAAQ,CAAc;QALjC,eAAU,GAAG,CAAC,CAAC;QACf,kBAAa,GAAG,CAAC,CAAC;QAWxB,MAAM,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAC;QAEpC,MAAM,WAAW,GACf,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC;YAC3D,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAE9D,WAAW;aACR,iBAAiB,CAAC,cAAc,CAAC,YAAY,EAAE,WAAW,CAAC;aAC3D,iBAAiB,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC;aAC/C,iBAAiB,CAAC,cAAc,CAAC,YAAY,EAAE,GAAG,YAAY,cAAc,CAAC,CAAC;QAEjF,MAAM,eAAe,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,4CAAuB,CAAC,CAAC;QACzF,IAAI,CAAC,OAAO,GAAG,eAAe;YAC5B,SAAS,CAAC,UAAU,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,4CAAuB,CAAC,CAAC,CAAC;QAE3F,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAEjE,6EAA6E;QAC7E,IAAI,CAAC,KAAK,GAAG,IAAI,2CAAoB,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;QAErG,IAAI,CAAC,cAAc,GAAG,IAAI,sBAAsB,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3F,CAAC;IAED,YAAY,CAAC,OAAoB;QAC/B,kEAAkE;QAClE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAClD,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;QAE3C,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QAEvD,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;YAC3B,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;YACnC,KAAK,EAAE,IAAI,CAAC,UAAU;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,IAAI,CAAC,UAAU,MAAM,IAAI,CAAC,aAAa,KAAK,CAAC,CAAC;IACxF,CAAC;CACF;AAtDD,kDAsDC"}

package/dist/gridImportAccessory.d.ts

@@ -7,6 +7,7 @@ export declare class GridImportAccessory {
     private readonly historyService;
     private lastPowerW;
     private lastEnergyKWh;
+    private readonly meter;
     constructor(platform: PVS6Platform, accessory: PlatformAccessory, FakeGatoHistoryService: any, displayName: string, serialNumber: string);
     updateValues(reading: PVS6Reading): void;
 }

package/dist/gridImportAccessory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gridImportAccessory.d.ts","sourceRoot":"","sources":["../src/gridImportAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAW,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAG3C,qBAAa,mBAAmB;IAS5B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAR3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAElC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAM;IAErC,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,aAAa,CAAK;gBAGP,QAAQ,EAAE,YAAY,EACvC,SAAS,EAAE,iBAAiB,EAE5B,sBAAsB,EAAE,GAAG,EAC3B,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM;IA2CtB,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI;CAoBzC"}
+{"version":3,"file":"gridImportAccessory.d.ts","sourceRoot":"","sources":["../src/gridImportAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAW,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAI3C,qBAAa,mBAAmB;IAU5B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAT3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAElC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAM;IAErC,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAuB;gBAG1B,QAAQ,EAAE,YAAY,EACvC,SAAS,EAAE,iBAAiB,EAE5B,sBAAsB,EAAE,GAAG,EAC3B,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM;IAyBtB,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI;CAczC"}

package/dist/gridImportAccessory.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GridImportAccessory = void 0;
 const eveCharacteristics_1 = require("./eveCharacteristics");
+const meterCharacteristics_1 = require("./meterCharacteristics");
 class GridImportAccessory {
     constructor(platform, accessory, 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -10,7 +11,6 @@ class GridImportAccessory {
         this.lastPowerW = 0;
         this.lastEnergyKWh = 0;
         const { Characteristic } = platform;
-        const { EveWatts, EveKWh } = platform.eveChars;
         const infoService = accessory.getService(platform.Service.AccessoryInformation) ??
             accessory.addService(platform.Service.AccessoryInformation);
         infoService
@@ -21,34 +21,15 @@ class GridImportAccessory {
         this.service = existingService ??
             accessory.addService(new platform.api.hap.Service(displayName, eveCharacteristics_1.EVE_ENERGY_SERVICE_UUID));
         this.service.setCharacteristic(Characteristic.Name, displayName);
-        // On = true when importing (lastPowerW > 0); always non-negative so the comparison is natural.
-        this.service
-            .getCharacteristic(Characteristic.On)
-            .onGet(() => this.lastPowerW > 0)
-            .onSet(async () => {
-            this.service.updateCharacteristic(Characteristic.On, this.lastPowerW > 0);
-        });
-        this.service
-            .getCharacteristic(Characteristic.OutletInUse)
-            .onGet(() => true);
-        this.service
-            .getCharacteristic(EveWatts)
-            .onGet(() => this.lastPowerW);
-        this.service
-            .getCharacteristic(EveKWh)
-            .onGet(() => this.lastEnergyKWh);
+        // On (power-derived, with deadband + hold), OutletInUse, Eve Watts, Eve kWh.
+        this.meter = new meterCharacteristics_1.MeterCharacteristics(platform, accessory, this.service, 'grid-import', displayName);
         this.historyService = new FakeGatoHistoryService('energy', accessory, { storage: 'fs' });
     }
     updateValues(reading) {
-        const { Characteristic } = this.platform;
-        const { EveWatts, EveKWh } = this.platform.eveChars;
         // Non-negative: zero when net-exporting, positive when importing.
         this.lastPowerW = Math.max(0, reading.netPowerW);
         this.lastEnergyKWh = reading.gridImportKWh;
-        this.service.updateCharacteristic(Characteristic.On, this.lastPowerW > 0);
-        this.service.updateCharacteristic(Characteristic.OutletInUse, true);
-        this.service.updateCharacteristic(EveWatts, this.lastPowerW);
-        this.service.updateCharacteristic(EveKWh, this.lastEnergyKWh);
+        this.meter.update(this.lastPowerW, this.lastEnergyKWh);
         this.historyService.addEntry({
             time: Math.round(Date.now() / 1000),
             power: this.lastPowerW,

package/dist/gridImportAccessory.js.map

@@ -1 +1 @@
-{"version":3,"file":"gridImportAccessory.js","sourceRoot":"","sources":["../src/gridImportAccessory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gridImportAccessory.js","sourceRoot":"","sources":["../src/gridImportAccessory.ts"],"names":[],"mappings":";;;AAGA,6DAA+D;AAC/D,iEAA8D;AAE9D,MAAa,mBAAmB;IAS9B,YACmB,QAAsB,EACvC,SAA4B;IAC5B,8DAA8D;IAC9D,sBAA2B,EAC3B,WAAmB,EACnB,YAAoB;QALH,aAAQ,GAAR,QAAQ,CAAc;QALjC,eAAU,GAAG,CAAC,CAAC;QACf,kBAAa,GAAG,CAAC,CAAC;QAWxB,MAAM,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAC;QAEpC,MAAM,WAAW,GACf,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC;YAC3D,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAE9D,WAAW;aACR,iBAAiB,CAAC,cAAc,CAAC,YAAY,EAAE,WAAW,CAAC;aAC3D,iBAAiB,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC;aAC/C,iBAAiB,CAAC,cAAc,CAAC,YAAY,EAAE,GAAG,YAAY,OAAO,CAAC,CAAC;QAE1E,MAAM,eAAe,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,4CAAuB,CAAC,CAAC;QACzF,IAAI,CAAC,OAAO,GAAG,eAAe;YAC5B,SAAS,CAAC,UAAU,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,4CAAuB,CAAC,CAAC,CAAC;QAE3F,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAEjE,6EAA6E;QAC7E,IAAI,CAAC,KAAK,GAAG,IAAI,2CAAoB,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;QAErG,IAAI,CAAC,cAAc,GAAG,IAAI,sBAAsB,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3F,CAAC;IAED,YAAY,CAAC,OAAoB;QAC/B,kEAAkE;QAClE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;QAE3C,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QAEvD,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;YAC3B,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;YACnC,KAAK,EAAE,IAAI,CAAC,UAAU;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,IAAI,CAAC,UAAU,MAAM,IAAI,CAAC,aAAa,KAAK,CAAC,CAAC;IACxF,CAAC;CACF;AAtDD,kDAsDC"}

package/dist/homeConsumptionAccessory.d.ts

@@ -7,6 +7,7 @@ export declare class HomeConsumptionAccessory {
     private readonly historyService;
     private lastPowerW;
     private lastEnergyKWh;
+    private readonly meter;
     constructor(platform: PVS6Platform, accessory: PlatformAccessory, FakeGatoHistoryService: any, displayName: string, serialNumber: string);
     updateValues(reading: PVS6Reading): void;
 }

package/dist/homeConsumptionAccessory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"homeConsumptionAccessory.d.ts","sourceRoot":"","sources":["../src/homeConsumptionAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAW,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAG3C,qBAAa,wBAAwB;IASjC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAR3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAElC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAM;IAErC,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,aAAa,CAAK;gBAGP,QAAQ,EAAE,YAAY,EACvC,SAAS,EAAE,iBAAiB,EAE5B,sBAAsB,EAAE,GAAG,EAC3B,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM;IA2CtB,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI;CAmBzC"}
+{"version":3,"file":"homeConsumptionAccessory.d.ts","sourceRoot":"","sources":["../src/homeConsumptionAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAW,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAI3C,qBAAa,wBAAwB;IAUjC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAT3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAElC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAM;IAErC,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAuB;gBAG1B,QAAQ,EAAE,YAAY,EACvC,SAAS,EAAE,iBAAiB,EAE5B,sBAAsB,EAAE,GAAG,EAC3B,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM;IAyBtB,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI;CAazC"}

package/dist/homeConsumptionAccessory.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HomeConsumptionAccessory = void 0;
 const eveCharacteristics_1 = require("./eveCharacteristics");
+const meterCharacteristics_1 = require("./meterCharacteristics");
 class HomeConsumptionAccessory {
     constructor(platform, accessory, 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -10,7 +11,6 @@ class HomeConsumptionAccessory {
         this.lastPowerW = 0;
         this.lastEnergyKWh = 0;
         const { Characteristic } = platform;
-        const { EveWatts, EveKWh } = platform.eveChars;
         const infoService = accessory.getService(platform.Service.AccessoryInformation) ??
             accessory.addService(platform.Service.AccessoryInformation);
         infoService
@@ -21,33 +21,14 @@ class HomeConsumptionAccessory {
         this.service = existingService ??
             accessory.addService(new platform.api.hap.Service(displayName, eveCharacteristics_1.EVE_ENERGY_SERVICE_UUID));
         this.service.setCharacteristic(Characteristic.Name, displayName);
-        // On = true when site is drawing power (always true in practice).
-        this.service
-            .getCharacteristic(Characteristic.On)
-            .onGet(() => this.lastPowerW > 0)
-            .onSet(async () => {
-            this.service.updateCharacteristic(Characteristic.On, this.lastPowerW > 0);
-        });
-        this.service
-            .getCharacteristic(Characteristic.OutletInUse)
-            .onGet(() => true);
-        this.service
-            .getCharacteristic(EveWatts)
-            .onGet(() => this.lastPowerW);
-        this.service
-            .getCharacteristic(EveKWh)
-            .onGet(() => this.lastEnergyKWh);
+        // On (power-derived, with deadband + hold), OutletInUse, Eve Watts, Eve kWh.
+        this.meter = new meterCharacteristics_1.MeterCharacteristics(platform, accessory, this.service, 'home', displayName);
         this.historyService = new FakeGatoHistoryService('energy', accessory, { storage: 'fs' });
     }
     updateValues(reading) {
-        const { Characteristic } = this.platform;
-        const { EveWatts, EveKWh } = this.platform.eveChars;
         this.lastPowerW = reading.siteLoadPowerW;
         this.lastEnergyKWh = reading.homeConsumptionKWh;
-        this.service.updateCharacteristic(Characteristic.On, this.lastPowerW > 0);
-        this.service.updateCharacteristic(Characteristic.OutletInUse, true);
-        this.service.updateCharacteristic(EveWatts, this.lastPowerW);
-        this.service.updateCharacteristic(EveKWh, this.lastEnergyKWh);
+        this.meter.update(this.lastPowerW, this.lastEnergyKWh);
         this.historyService.addEntry({
             time: Math.round(Date.now() / 1000),
             power: this.lastPowerW,

package/dist/homeConsumptionAccessory.js.map

@@ -1 +1 @@
-{"version":3,"file":"homeConsumptionAccessory.js","sourceRoot":"","sources":["../src/homeConsumptionAccessory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"homeConsumptionAccessory.js","sourceRoot":"","sources":["../src/homeConsumptionAccessory.ts"],"names":[],"mappings":";;;AAGA,6DAA+D;AAC/D,iEAA8D;AAE9D,MAAa,wBAAwB;IASnC,YACmB,QAAsB,EACvC,SAA4B;IAC5B,8DAA8D;IAC9D,sBAA2B,EAC3B,WAAmB,EACnB,YAAoB;QALH,aAAQ,GAAR,QAAQ,CAAc;QALjC,eAAU,GAAG,CAAC,CAAC;QACf,kBAAa,GAAG,CAAC,CAAC;QAWxB,MAAM,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAC;QAEpC,MAAM,WAAW,GACf,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC;YAC3D,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAE9D,WAAW;aACR,iBAAiB,CAAC,cAAc,CAAC,YAAY,EAAE,WAAW,CAAC;aAC3D,iBAAiB,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC;aAC/C,iBAAiB,CAAC,cAAc,CAAC,YAAY,EAAE,GAAG,YAAY,OAAO,CAAC,CAAC;QAE1E,MAAM,eAAe,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,4CAAuB,CAAC,CAAC;QACzF,IAAI,CAAC,OAAO,GAAG,eAAe;YAC5B,SAAS,CAAC,UAAU,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,4CAAuB,CAAC,CAAC,CAAC;QAE3F,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAEjE,6EAA6E;QAC7E,IAAI,CAAC,KAAK,GAAG,IAAI,2CAAoB,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;QAE9F,IAAI,CAAC,cAAc,GAAG,IAAI,sBAAsB,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3F,CAAC;IAED,YAAY,CAAC,OAAoB;QAC/B,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC;QACzC,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,kBAAkB,CAAC;QAEhD,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QAEvD,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;YAC3B,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;YACnC,KAAK,EAAE,IAAI,CAAC,UAAU;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,IAAI,CAAC,UAAU,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACxG,CAAC;CACF;AArDD,4DAqDC"}

package/dist/meterCharacteristics.d.ts

@@ -0,0 +1,15 @@
+import { PlatformAccessory, Service } from 'homebridge';
+import type { PVS6Platform } from './platform';
+export declare function applyEvePerms(accessory: PlatformAccessory, notify: boolean): void;
+export declare class MeterCharacteristics {
+    private readonly platform;
+    private readonly service;
+    private readonly key;
+    private powerW;
+    private energyKWh;
+    private readonly onSwitch;
+    constructor(platform: PVS6Platform, accessory: PlatformAccessory, service: Service, key: string, label: string);
+    get isOn(): boolean;
+    update(powerW: number, energyKWh: number): void;
+}
+//# sourceMappingURL=meterCharacteristics.d.ts.map

package/dist/meterCharacteristics.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"meterCharacteristics.d.ts","sourceRoot":"","sources":["../src/meterCharacteristics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,iBAAiB,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAQ/C,wBAAgB,aAAa,CAAC,SAAS,EAAE,iBAAiB,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAQjF;AAMD,qBAAa,oBAAoB;IAM7B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAEzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG;IARtB,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAc;gBAGpB,QAAQ,EAAE,YAAY,EACvC,SAAS,EAAE,iBAAiB,EACX,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,MAAM,EAC5B,KAAK,EAAE,MAAM;IA2Bf,IAAI,IAAI,IAAI,OAAO,CAElB;IAED,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;CAmBhD"}

package/dist/meterCharacteristics.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MeterCharacteristics = void 0;
+exports.applyEvePerms = applyEvePerms;
+const eveCharacteristics_1 = require("./eveCharacteristics");
+// Sets NOTIFY on the Eve power/energy characteristics according to the
+// evePowerUpdates mode (removed for pollOnly, present otherwise). Called from
+// configureAccessory() for cached accessories, so the perms are right before
+// the bridge is published, and again when an accessory is set up.
+function applyEvePerms(accessory, notify) {
+    const perms = notify ? ["pr" /* Perms.PAIRED_READ */, "ev" /* Perms.NOTIFY */] : ["pr" /* Perms.PAIRED_READ */];
+    const service = accessory.services.find(s => s.UUID === eveCharacteristics_1.EVE_ENERGY_SERVICE_UUID);
+    for (const c of service?.characteristics ?? []) {
+        if (c.UUID === eveCharacteristics_1.EVE_WATT_UUID || c.UUID === eveCharacteristics_1.EVE_KWH_UUID) {
+            c.setProps({ perms });
+        }
+    }
+}
+// The On / OutletInUse / Eve Watts / Eve kWh characteristics shared by every
+// meter accessory. Holds the newest reading (served by onGet in every mode)
+// and decides what to push via the platform's EveUpdatePolicy and a
+// per-accessory PowerSwitch.
+class MeterCharacteristics {
+    constructor(platform, accessory, service, key, label) {
+        this.platform = platform;
+        this.service = service;
+        this.key = key;
+        this.powerW = 0;
+        this.energyKWh = 0;
+        const { Characteristic: C } = platform;
+        const { EveWatts, EveKWh } = platform.eveChars;
+        this.onSwitch = platform.createPowerSwitch(label);
+        // On is read/write in HAP; the setter reverts to the reported state immediately.
+        service
+            .getCharacteristic(C.On)
+            .onGet(() => this.onSwitch.isOn)
+            .onSet(async () => {
+            service.updateCharacteristic(C.On, this.onSwitch.isOn);
+        });
+        // OutletInUse is required for Eve Energy to render correctly
+        service
+            .getCharacteristic(C.OutletInUse)
+            .onGet(() => true);
+        // Eve custom characteristics — getCharacteristic() is idempotent across restarts.
+        // Reads always return the newest reading, whatever was last pushed.
+        service.getCharacteristic(EveWatts).onGet(() => this.powerW);
+        service.getCharacteristic(EveKWh).onGet(() => this.energyKWh);
+        applyEvePerms(accessory, platform.evePolicy.notify);
+    }
+    get isOn() {
+        return this.onSwitch.isOn;
+    }
+    update(powerW, energyKWh) {
+        const { Characteristic: C } = this.platform;
+        const { EveWatts, EveKWh } = this.platform.eveChars;
+        const policy = this.platform.evePolicy;
+        this.powerW = powerW;
+        this.energyKWh = energyKWh;
+        // Standard characteristics stay evented (HAP only sends an event when the value changes).
+        this.service.updateCharacteristic(C.On, this.onSwitch.update(powerW));
+        this.service.updateCharacteristic(C.OutletInUse, true);
+        if (policy.shouldPush(`${this.key}.watts`, 'watts', powerW)) {
+            this.service.updateCharacteristic(EveWatts, powerW);
+        }
+        if (policy.shouldPush(`${this.key}.kwh`, 'kwh', energyKWh)) {
+            this.service.updateCharacteristic(EveKWh, energyKWh);
+        }
+    }
+}
+exports.MeterCharacteristics = MeterCharacteristics;
+//# sourceMappingURL=meterCharacteristics.js.map

package/dist/meterCharacteristics.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"meterCharacteristics.js","sourceRoot":"","sources":["../src/meterCharacteristics.ts"],"names":[],"mappings":"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"}

package/dist/platform.d.ts

@@ -1,11 +1,15 @@
 import { API, Characteristic, DynamicPlatformPlugin, Logger, PlatformAccessory, PlatformConfig, Service } from 'homebridge';
 import { EveChars } from './eveCharacteristics';
+import { EveUpdatePolicy, PowerSwitch } from './throttle';
 export declare class PVS6Platform implements DynamicPlatformPlugin {
     readonly Service: typeof Service;
     readonly Characteristic: typeof Characteristic;
     readonly api: API;
     readonly eveChars: EveChars;
     readonly log: Logger;
+    readonly evePolicy: EveUpdatePolicy;
+    private readonly updateConfig;
+    private readonly updateStats;
     readonly accessories: PlatformAccessory[];
     private client;
     private readonly config;
@@ -16,6 +20,7 @@ export declare class PVS6Platform implements DynamicPlatformPlugin {
     private homeConsumptionAccessory?;
     private gridMatterBridge;
     private pollTimer?;
+    private updateStatsTimer?;
     private pollInFlight;
     private backedOff;
     private consecutiveNetworkErrors;
@@ -28,6 +33,7 @@ export declare class PVS6Platform implements DynamicPlatformPlugin {
     private resolveConfig;
     private discoverWithCache;
     private setupAccessories;
+    createPowerSwitch(name: string): PowerSwitch;
     private getOrCreateAccessory;
     private get discoveryEnabled();
     private checkRediscovery;
@@ -35,6 +41,7 @@ export declare class PVS6Platform implements DynamicPlatformPlugin {
     private stopPolling;
     private startAuthAndPolling;
     private startPolling;
+    private pollOnce;
     private triggerReauth;
     private enterBackoff;
 }

package/dist/platform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EACH,cAAc,EACd,qBAAqB,EACrB,MAAM,EACN,iBAAiB,EACjB,cAAc,EACd,OAAO,EACR,MAAM,YAAY,CAAC;AAQpB,OAAO,EAA4B,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAY1E,qBAAa,YAAa,YAAW,qBAAqB;IACxD,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAC;IACxC,SAAgB,cAAc,EAAE,OAAO,cAAc,CAAC;IACtD,SAAgB,GAAG,EAAE,GAAG,CAAC;IACzB,SAAgB,QAAQ,EAAE,QAAQ,CAAC;IACnC,SAAgB,GAAG,EAAE,MAAM,CAAC;IAE5B,SAAgB,WAAW,EAAE,iBAAiB,EAAE,CAAM;IAGtD,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAa;IACpC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IAExC,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,mBAAmB,CAAC,CAAsB;IAClD,OAAO,CAAC,mBAAmB,CAAC,CAAsB;IAClD,OAAO,CAAC,wBAAwB,CAAC,CAA2B;IAO5D,OAAO,CAAC,gBAAgB,CAAmC;IAE3D,OAAO,CAAC,SAAS,CAAC,CAAiC;IACnD,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,wBAAwB,CAAK;IACrC,OAAO,CAAC,uBAAuB,CAAK;IAGpC,OAAO,CAAC,cAAc,CAAK;IAG3B,OAAO,CAAC,sBAAsB,CAAc;IAC5C,OAAO,CAAC,aAAa,CAAS;gBAG5B,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,GAAG;IA2CV,kBAAkB,CAAC,SAAS,EAAE,iBAAiB,GAAG,IAAI;YAexC,aAAa;YA0Bb,iBAAiB;IAW/B,OAAO,CAAC,gBAAgB;IAsExB,OAAO,CAAC,oBAAoB;IAiB5B,OAAO,KAAK,gBAAgB,GAE3B;IAID,OAAO,CAAC,gBAAgB;YAQV,kBAAkB;IA0BhC,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,mBAAmB;IAsB3B,OAAO,CAAC,YAAY;IAiEpB,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,YAAY;CASrB"}
+{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EACH,cAAc,EACd,qBAAqB,EACrB,MAAM,EACN,iBAAiB,EACjB,cAAc,EACd,OAAO,EACR,MAAM,YAAY,CAAC;AAQpB,OAAO,EAA4B,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAI1E,OAAO,EAAE,eAAe,EAAE,WAAW,EAAkD,MAAM,YAAY,CAAC;AAW1G,qBAAa,YAAa,YAAW,qBAAqB;IACxD,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAC;IACxC,SAAgB,cAAc,EAAE,OAAO,cAAc,CAAC;IACtD,SAAgB,GAAG,EAAE,GAAG,CAAC;IACzB,SAAgB,QAAQ,EAAE,QAAQ,CAAC;IACnC,SAAgB,GAAG,EAAE,MAAM,CAAC;IAE5B,SAAgB,SAAS,EAAE,eAAe,CAAC;IAC3C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IAEjD,SAAgB,WAAW,EAAE,iBAAiB,EAAE,CAAM;IAGtD,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAa;IACpC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IAExC,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,mBAAmB,CAAC,CAAsB;IAClD,OAAO,CAAC,mBAAmB,CAAC,CAAsB;IAClD,OAAO,CAAC,wBAAwB,CAAC,CAA2B;IAO5D,OAAO,CAAC,gBAAgB,CAAmC;IAE3D,OAAO,CAAC,SAAS,CAAC,CAAiC;IACnD,OAAO,CAAC,gBAAgB,CAAC,CAAiC;IAC1D,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,wBAAwB,CAAK;IACrC,OAAO,CAAC,uBAAuB,CAAK;IAGpC,OAAO,CAAC,cAAc,CAAK;IAG3B,OAAO,CAAC,sBAAsB,CAAc;IAC5C,OAAO,CAAC,aAAa,CAAS;gBAG5B,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,GAAG;IA6DV,kBAAkB,CAAC,SAAS,EAAE,iBAAiB,GAAG,IAAI;YAkBxC,aAAa;YA0Bb,iBAAiB;IAW/B,OAAO,CAAC,gBAAgB;IAuExB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW;IAI5C,OAAO,CAAC,oBAAoB;IAiB5B,OAAO,KAAK,gBAAgB,GAE3B;IAID,OAAO,CAAC,gBAAgB;YAQV,kBAAkB;IA0BhC,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,mBAAmB;IAsB3B,OAAO,CAAC,YAAY;YAMN,QAAQ;IA+DtB,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,YAAY;CASrB"}