homebridge-lib 6.0.2 → 6.1.0

package/lib/EveHomeKitTypes.js

@@ -1,7 +1,7 @@
 // homebridge-lib/lib/EveHomeKitTypes.js
 //
 // Library for Homebridge plugins.
-// Copyright © 2017-2022 Erik Baauw. All rights reserved.
+// Copyright © 2017-2023 Erik Baauw. All rights reserved.
 
 const homebridgeLib = require('../index')
 
@@ -162,7 +162,7 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       minValue: 0,
       maxValue: 380,
       minStep: 0.1,
-      perms: [this.Perms.READ, this.Perms.NOTIFY]
+      perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
     })
 
     this.createCharacteristicClass('AirParticulateDensity', uuid('10B'), {
@@ -171,7 +171,7 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       minValue: 0,
       maxValue: 5000,
       minStep: 1,
-      perms: [this.Perms.READ, this.Perms.NOTIFY]
+      perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
     }, 'VOC Level')
 
     this.createCharacteristicClass('VOCLevel', uuid('10B'), {
@@ -180,7 +180,7 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       minValue: 5,
       maxValue: 5000,
       minStep: 5,
-      perms: [this.Perms.READ, this.Perms.NOTIFY]
+      perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
     }, 'VOC Level')
 
     this.createCharacteristicClass('TotalConsumption', uuid('10C'), {
@@ -189,7 +189,7 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       minValue: 0,
       maxValue: 1000000,
       minStep: 0.01,
-      perms: [this.Perms.READ, this.Perms.NOTIFY]
+      perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
     }, 'Total Consumption')
 
     this.createCharacteristicClass('CurrentConsumption', uuid('10D'), {
@@ -198,7 +198,7 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       minValue: 0,
       maxValue: 12000,
       minStep: 0.1,
-      perms: [this.Perms.READ, this.Perms.NOTIFY]
+      perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
     }, 'Current Consumption')
 
     this.createCharacteristicClass('AirPressure', uuid('10F'), {
@@ -207,58 +207,58 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       minValue: 700,
       maxValue: 1100,
       minStep: 0.1,
-      perms: [this.Perms.READ, this.Perms.NOTIFY]
+      perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
     }, 'Air Pressure')
 
     this.createCharacteristicClass('ResetTotal', uuid('112'), {
       format: this.Formats.UINT32,
       unit: this.Units.seconds, // since 2001/01/01
-      perms: [this.Perms.READ, this.Perms.NOTIFY, this.Perms.WRITE],
+      perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY, this.Perms.PAIRED_WRITE],
       adminOnlyAccess: [this.Access.WRITE]
     }, 'Reset Total')
 
     this.createCharacteristicClass('HistoryStatus', uuid('116'), {
       format: this.Formats.DATA,
-      perms: [this.Perms.READ, this.Perms.NOTIFY, this.Perms.HIDDEN]
+      perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY, this.Perms.HIDDEN]
     }, 'History Status')
 
     this.createCharacteristicClass('HistoryEntries', uuid('117'), {
       format: this.Formats.DATA,
-      perms: [this.Perms.READ, this.Perms.NOTIFY, this.Perms.HIDDEN]
+      perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY, this.Perms.HIDDEN]
     }, 'History Entries')
 
     this.createCharacteristicClass('OpenDuration', uuid('118'), {
       format: this.Formats.UINT32,
       unit: this.Units.SECONDS, // since last reset
-      perms: [this.Perms.READ, this.Perms.NOTIFY, this.Perms.WRITE]
+      perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY, this.Perms.PAIRED_WRITE]
     }, 'Open Duration')
 
     this.createCharacteristicClass('ClosedDuration', uuid('119'), {
       format: this.Formats.UINT32,
       unit: this.Units.SECONDS, // since last reset
-      perms: [this.Perms.READ, this.Perms.NOTIFY, this.Perms.WRITE]
+      perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY, this.Perms.PAIRED_WRITE]
     }, 'Closed Duration')
 
     this.createCharacteristicClass('LastActivation', uuid('11A'), {
       format: this.Formats.UINT32,
       unit: this.Units.SECONDS, // since last reset
-      perms: [this.Perms.READ, this.Perms.NOTIFY]
+      perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
     }, 'Last Activation')
 
     this.createCharacteristicClass('HistoryRequest', uuid('11C'), {
       format: this.Formats.DATA,
-      perms: [this.Perms.WRITE, this.Perms.HIDDEN]
+      perms: [this.Perms.PAIRED_WRITE, this.Perms.HIDDEN]
     }, 'History Request')
 
     this.createCharacteristicClass('ConfigCommand', uuid('11D'), {
       format: this.Formats.DATA,
-      perms: [this.Perms.WRITE, this.Perms.HIDDEN]
+      perms: [this.Perms.PAIRED_WRITE, this.Perms.HIDDEN]
     }, 'Config Command')
 
     // On various Eve devices - presumably for firmware upgrade.
     this.createCharacteristicClass('Char11E', uuid('11E'), {
       format: this.Formats.DATA,
-      perms: [this.Perms.READ, this.Perms.WRITE, this.Perms.HIDDEN]
+      perms: [this.Perms.PAIRED_READ, this.Perms.PAIRED_WRITE, this.Perms.HIDDEN]
     }, 'Eve 11E')
 
     this.createCharacteristicClass('Sensitivity', uuid('120'), {
@@ -266,7 +266,7 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       minValue: 0,
       maxValue: 7,
       validValues: [0, 4, 7],
-      perms: [this.Perms.READ, this.Perms.NOTIFY, this.Perms.WRITE],
+      perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY, this.Perms.PAIRED_WRITE],
       adminOnlyAccess: [this.Access.WRITE]
     })
     this.Characteristics.Sensitivity.HIGH = 0
@@ -275,7 +275,7 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
 
     this.createCharacteristicClass('SetTime', uuid('121'), {
       format: this.Formats.DATA,
-      perms: [this.Perms.WRITE, this.Perms.HIDDEN]
+      perms: [this.Perms.PAIRED_WRITE, this.Perms.HIDDEN]
     })
 
     this.createCharacteristicClass('ElectricCurrent', uuid('126'), {
@@ -284,17 +284,17 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       minValue: 0,
       maxValue: 48,
       minStep: 0.01,
-      perms: [this.Perms.READ, this.Perms.NOTIFY]
+      perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
     }, 'Electric Current')
 
     this.createCharacteristicClass('TimesOpened', uuid('129'), {
       format: this.Formats.UINT32,
-      perms: [this.Perms.READ, this.Perms.NOTIFY]
+      perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
     }, 'Times Opened')
 
     this.createCharacteristicClass('ProgramCommand', uuid('12C'), {
       format: this.Formats.DATA,
-      perms: [this.Perms.WRITE]
+      perms: [this.Perms.PAIRED_WRITE]
     }, 'Program Command')
 
     this.createCharacteristicClass('Duration', uuid('12D'), {
@@ -307,7 +307,7 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
         1 * 60, 2 * 60, 3 * 60, 5 * 60, 10 * 60, 20 * 60, 30 * 60,
         1 * 3600, 2 * 3600, 3 * 3600, 5 * 3600, 10 * 3600, 12 * 3600, 15 * 3600
       ],
-      perms: [this.Perms.READ, this.Perms.NOTIFY, this.Perms.WRITE],
+      perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY, this.Perms.PAIRED_WRITE],
       adminOnlyAccess: [this.Access.WRITE]
     })
     this.Characteristics.Duration.VALID_VALUES = [
@@ -321,12 +321,12 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       unit: this.Units.PERCENTAGE,
       minValue: 0,
       maxValue: 100,
-      perms: [this.Perms.READ, this.Perms.NOTIFY]
+      perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
     }, 'Valve Position')
 
     this.createCharacteristicClass('ProgramData', uuid('12F'), {
       format: this.Formats.DATA,
-      perms: [this.Perms.READ, this.Perms.NOTIFY]
+      perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
     }, 'Program Data')
 
     this.createCharacteristicClass('Elevation', uuid('130'), {
@@ -335,13 +335,13 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       minValue: -450,
       maxValue: 9000,
       minStep: 1,
-      perms: [this.Perms.READ, this.Perms.NOTIFY, this.Perms.WRITE],
+      perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY, this.Perms.PAIRED_WRITE],
       adminOnlyAccess: [this.Access.WRITE]
     })
 
     this.createCharacteristicClass('ConfigData', uuid('131'), {
       format: this.Formats.DATA,
-      perms: [this.Perms.READ, this.Perms.NOTIFY, this.Perms.HIDDEN]
+      perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY, this.Perms.HIDDEN]
     }, 'Config Data')
 
     this.createCharacteristicClass('WeatherTrend', uuid('136'), {
@@ -349,7 +349,7 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       minValue: 0,
       maxValue: 15,
       minStep: 1,
-      perms: [this.Perms.READ, this.Perms.NOTIFY]
+      perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
     }, 'Weather Trend')
     this.Characteristics.WeatherTrend.BLANK = 0 // also: 2, 8, 10
     this.Characteristics.WeatherTrend.SUN = 1 // also: 9
@@ -360,7 +360,7 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
     // On various Eve devices - presumably for firmware upgrade.
     this.createCharacteristicClass('Char158', uuid('158'), {
       format: this.Formats.DATA,
-      perms: [this.Perms.READ, this.Perms.WRITE, this.Perms.HIDDEN]
+      perms: [this.Perms.PAIRED_READ, this.Perms.PAIRED_WRITE, this.Perms.HIDDEN]
     }, 'Eve 158')
 
     // =========================================================================
@@ -374,7 +374,7 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
         unit: this.Units.PERCENTAGE,
         minValue: 0,
         maxValue: 100,
-        perms: [this.Perms.READ, this.Perms.NOTIFY]
+        perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
       }
     )
 
@@ -384,7 +384,7 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
         unit: 'mired',
         minValue: 153,
         maxValue: 500,
-        perms: [this.Perms.READ, this.Perms.NOTIFY, this.Perms.WRITE]
+        perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY, this.Perms.PAIRED_WRITE]
       }, 'Color Temperature'
     )
 
@@ -394,14 +394,14 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
         unit: 'K',
         minValue: 2000, // ct: 500
         maxValue: 6536, // ct: 153
-        perms: [this.Perms.READ, this.Perms.NOTIFY, this.Perms.WRITE]
+        perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY, this.Perms.PAIRED_WRITE]
       }, 'Color Temperature'
     )
 
     this.createCharacteristicClass(
       'Condition', 'CD65A9AB-85AD-494A-B2BD-2F380084134D', {
         format: this.Formats.STRING,
-        perms: [this.Perms.READ, this.Perms.NOTIFY]
+        perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
       }
     )
 
@@ -409,7 +409,7 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       'ConditionCategory', 'CD65A9AB-85AD-494A-B2BD-2F380084134C', {
         format: this.Formats.UINT16,
         mavValue: 999,
-        perms: [this.Perms.READ, this.Perms.NOTIFY]
+        perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
       }, 'Condition Category'
     )
 
@@ -420,14 +420,14 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
         minValue: -40,
         maxValue: 100,
         minStep: 0.1,
-        perms: [this.Perms.READ, this.Perms.NOTIFY]
+        perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
       }, 'Current Temperature'
     )
 
     this.createCharacteristicClass(
       'Day', '57F1D4B2-0E7E-4307-95B5-808750E2C1C7', {
         format: this.Formats.STRING,
-        perms: [this.Perms.READ, this.Perms.NOTIFY]
+        perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
       }
     )
 
@@ -438,7 +438,7 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
         minValue: -40,
         maxValue: 100,
         minStep: 0.1,
-        perms: [this.Perms.READ, this.Perms.NOTIFY]
+        perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
       }, 'Dew Point'
     )
 
@@ -449,7 +449,7 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
         minValue: 0,
         maxValue: 150,
         minStep: 0.1,
-        perms: [this.Perms.READ, this.Perms.NOTIFY]
+        perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
       }, 'Maximum Wind Speed'
     )
 
@@ -460,14 +460,14 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
         minValue: -40,
         maxValue: 100,
         minStep: 0.1,
-        perms: [this.Perms.READ, this.Perms.NOTIFY]
+        perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
       }, 'Minimum Temperature'
     )
 
     this.createCharacteristicClass(
       'ObservationTime', '234FD9F1-1D33-4128-B622-D052F0C402AF', {
         format: this.Formats.STRING,
-        perms: [this.Perms.READ, this.Perms.NOTIFY]
+        perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
       }, 'Observation Time'
     )
 
@@ -477,14 +477,14 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
         unit: 'DU',
         minValue: 0,
         maxValue: 500,
-        perms: [this.Perms.READ, this.Perms.NOTIFY]
+        perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
       }
     )
 
     this.createCharacteristicClass(
       'Rain', 'F14EB1AD-E000-4EF4-A54F-0CF07B2E7BE7', {
         format: this.Formats.BOOL,
-        perms: [this.Perms.READ, this.Perms.NOTIFY]
+        perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
       }
     )
 
@@ -494,7 +494,7 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
         unit: 'mm',
         minValue: 0,
         maxValue: 200,
-        perms: [this.Perms.READ, this.Perms.NOTIFY]
+        perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
       }, 'Rain Last Hour'
     )
 
@@ -504,7 +504,7 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
         unit: 'mm',
         minValue: 0,
         maxValue: 2000,
-        perms: [this.Perms.READ, this.Perms.NOTIFY]
+        perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
       }, 'Total Rain'
     )
 
@@ -514,14 +514,14 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
         unit: this.Units.PERCENTAGE,
         minValue: 0,
         maxValue: 100,
-        perms: [this.Perms.READ, this.Perms.NOTIFY]
+        perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
       }, 'Rain Probabiliy'
     )
 
     this.createCharacteristicClass(
       'Snow', 'F14EB1AD-E000-4CE6-BD0E-384F9EC4D5DD', {
         format: this.Formats.BOOL,
-        perms: [this.Perms.READ, this.Perms.NOTIFY]
+        perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
       }
     )
 
@@ -530,7 +530,7 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
         format: this.Formats.UINT8,
         minValue: 0,
         maxValue: 10,
-        perms: [this.Perms.READ, this.Perms.NOTIFY]
+        perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
       }, 'UV Index'
     )
 
@@ -540,14 +540,14 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
         minValue: 0,
         maxValue: 100,
         unit: 'km',
-        perms: [this.Perms.READ, this.Perms.NOTIFY]
+        perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
       }
     )
 
     this.createCharacteristicClass(
       'WindDirection', '46F1284C-1912-421B-82F5-EB75008B167E', {
         format: this.Formats.STRING,
-        perms: [this.Perms.READ, this.Perms.NOTIFY]
+        perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
       }, 'Wind Direction'
     )
 
@@ -558,7 +558,7 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
         minValue: 0,
         maxValue: 150,
         minStep: 0.1,
-        perms: [this.Perms.READ, this.Perms.NOTIFY]
+        perms: [this.Perms.PAIRED_READ, this.Perms.NOTIFY]
       }, 'Wind Speed'
     )
 
@@ -577,6 +577,7 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       * @property {Service} Thermostat - Used by: Eve Thermo.
       * @property {Service} Weather - Used by: Eve Weather.
       */
+
     this.createServiceClass('Weather', uuid('001'), [
       this.Characteristics.CurrentTemperature
     ], [
@@ -585,10 +586,10 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
     ])
 
     this.createServiceClass('History', uuid('007'), [
-      this.Characteristics.HistoryRequest, // 11C
-      this.Characteristics.SetTime, // 121
       this.Characteristics.HistoryStatus, // 116
-      this.Characteristics.HistoryEntries // 117
+      this.Characteristics.HistoryEntries, // 117
+      this.Characteristics.HistoryRequest, // 11C
+      this.Characteristics.SetTime // 121
     ], [
       this.Characteristics.ResetTotal // 112
       // this.Characteristics.ConfigCommand, // 11D
@@ -597,6 +598,15 @@ class EveHomeKitTypes extends homebridgeLib.CustomHomeKitTypes {
       // this.Characteristics.Char158, // presumably for firmware upgrade
     ])
 
+    this.createServiceClass('Consumption', uuid('008'), [
+      this.Characteristics.Voltage, // 10A
+      this.Characteristics.TotalConsumption, // 10C
+      this.Characteristics.CurrentConsumption, // 10D
+      this.Characteristics.ElectricCurrent, // 126
+      this.hapCharacteristics.StatusFault,
+      this.hapCharacteristics.LockPhysicalControls
+    ])
+
     this.createServiceClass('AirPressureSensor', uuid('00A'), [
       this.Characteristics.AirPressure,
       this.Characteristics.Elevation

package/lib/HttpClient.js

@@ -1,7 +1,7 @@
 // homebridge-lib/lib/HttpClient.js
 //
 // Library for Homebridge plugins.
-// Copyright © 2018-2022 Erik Baauw. All rights reserved.
+// Copyright © 2018-2023 Erik Baauw. All rights reserved.
 
 'use strict'
 

package/lib/JsonFormatter.js

@@ -1,7 +1,7 @@
 // homebridge-lib/lib/JsonFormatter.js
 //
 // Library for Homebridge plugins.
-// Copyright © 2018-2022 Erik Baauw. All rights reserved.
+// Copyright © 2018-2023 Erik Baauw. All rights reserved.
 
 'use strict'