homebridge-easy-mqtt 1.1.0-beta.0 → 1.2.0-beta.0

package/CHANGELOG.md

@@ -2,12 +2,20 @@
 
 All notable changes to homebridge-dummy will be documented in this file.
 
-## 1.1.0-beta.0 (2025-08-19)
+## 1.2.0-beta.0 (2025-08-26)
 
 ### HELP NEEDED! (no coding experience required)
 
 Would you like to see Homebridge Easy MQTT in your language? Please consider [getting involved](https://github.com/mpatfield/homebridge-easy-mqtt/issues/4).
 
+### Added
+- Security System accessory type
+
+### Changed
+- Updated dev dependencies
+
+## 1.1.0 (2025-08-20)
+
 ### Added
 - Temperature Sensor accessory type
 

package/README.md

@@ -23,7 +23,7 @@ Any issues or damage resulting from use of this plugin are not the fault of the
 
 This plugin is designed to be a simple replacement for the fantastic [homebridge-mqttthing](https://github.com/arachnetech/homebridge-mqttthing) plugin which appears as though it's [no longer](https://github.com/arachnetech/homebridge-mqttthing/commits/master/) being actively developed.
 
-**HomebridgeEasyMQTT** currently supports `Lightbulb`, `LockMechanism`, `Outlet`, `Switch`, and `TemperatureSensor`, but will be expanded over time as more use cases are discovered. If there is an accessory type you'd like to see supported, please feel free to [create an issue in GitHub](https://github.com/mpatfield/homebridge-easy-mqtt/issues/new/choose).
+**HomebridgeEasyMQTT** currently supports `Lightbulb`, `LockMechanism`, `Outlet`, `SecuitySystem`,`Switch`, and `TemperatureSensor`, but will be expanded over time as more use cases are discovered. If there is an accessory type you'd like to see supported, please feel free to [create an issue in GitHub](https://github.com/mpatfield/homebridge-easy-mqtt/issues/new/choose).
 
 ## Configuration
 
@@ -75,7 +75,7 @@ All fields are required unless noted as "(Optional)"
 Info:
 - `id` - A unique ID to identify this accessory. Changing this value will result in a new accessory.
 - `name` - The display name for the accessory in HomeKit
-- `type` - The type of accessory, currently Lightbulb, LockMechanism, Outlet, Switch, and Temperature Sensor are supported
+- `type` - The type of accessory, currently Lightbulb, LockMechanism, Outlet, SecuitySystem, Switch, and Temperature Sensor are supported
 - `manufacturer` - (Optional) The accessory manufacturer which will display in HomeKit device details
 - `model` - (Optional) The accessory model which will display in HomeKit device details
 - `serialNumber` - (Optional) The accessory serial number which will display in HomeKit device details
@@ -117,13 +117,20 @@ You may define topics using a JSONPath dot notation to assist the parser in find
   - `topicGetOutletInUse` - (Optional) Whether or not the outlet is currently being used
   - `topicSetOutletInUse` - (Optional) For setting whether the outlet is currently being used
 
+- SecuitySystem
+  - `topicGetCurrentSecurityState` — The current state of the system
+  - `topicGetTargetSecurityState` — The target state of the system
+  - `topicSetTargetSecurityState` — For setting the target state of the system
+  - `topicGetStatusTampered` — For getting whether the system has been tampered with
+  - `topicGetStatusFault` — For getting whether there is a system error
+
 - Switch
   - `topicGetOn` - The current state of the switch, i.e. on/off
   - `topicSetOn` - For setting the state of the switch
 
 - TemperatureSensor
   - `topicGetCurrentTemperature` - The current temperature of the sensor
-  - `temperatureUnits` - (Optional) `C` for Celcius (default), `F` for Fahrenheit
+  - `temperatureUnits` - (Optional) The temperature units of the incoming value supplied by the sensor, `C` for Celsius  (default) `F` for Fahrenheit
 
 Values:
 
@@ -133,8 +140,8 @@ As with Topics, you will need to populate the appropriate values based on the ty
   - `valueStatusActive` - Accessory is connected/reachable, e.g. "true", "1", or "Alive"
 
 - Lightbulb
-  - `valueOn` - Turned on, e.g. "true", or "1", or "On" 
-  - `valueOff` - Turned off, e.g. "false", or "0", or "Off" 
+  - `valueOn` - Turned on, e.g. "true", or "1", or "On"
+  - `valueOff` - Turned off, e.g. "false", or "0", or "Off"
 
 - LockMechanism
   - `valueLockStateSecured` - Locked state, e.g. "true", "255", or "Locked"
@@ -142,14 +149,23 @@ As with Topics, you will need to populate the appropriate values based on the ty
   - `valueLockStateJammed` - (Optional) Lock is jammed, e.g. "254" or "Jammed"
 
 - Outlet
-  - `valueOn` - Turned on, e.g. "true", or "1", or "On" 
-  - `valueOff` - Turned off, e.g. "false", or "0", or "Off" 
-  - `valueOutletInUse` - Currently being used, e.g. "true", or "1", or "On" 
-  - `valueOutletNotInUse` - Currently not being used, e.g. "false", or "0", or "Off" 
+  - `valueOn` - Turned on, e.g. "true", or "1", or "On"
+  - `valueOff` - Turned off, e.g. "false", or "0", or "Off"
+  - `valueOutletInUse` - Currently being used, e.g. "true", or "1", or "On"
+  - `valueOutletNotInUse` - Currently not being used, e.g. "false", or "0", or "Off"
+
+- SecuritySystem
+  - `valueArmStay` — (Optional) system armed in stay mode, e.g. "SA" or "stay"
+  - `valueArmAway` — (Optional) system armed in away mode, e.g. "AA" or "away"
+  - `valueArmNight` — (Optional) system armed in night mode, e.g. "NA" or "night"
+  - `valueDisarm` — (Optional) system armed in away mode, e.g. "D" or "disarmed"
+  - `valueAlarmTriggered` — (Optional) when the alarm has been triggered, e.g. "true" or "1" or "triggered"
+  - `valueTampered` — (Optional) when the system has been tampered with, e.g. "true" or "1" or "tampered"
+  - `valueFault` — (Optional) when the system has a general fault, e.g. "true" or "1" or "fault"
 
 - Switch
-  - `valueOn` - Turned on, e.g. "true", or "1", or "On" 
-  - `valueOff` - Turned off, e.g. "false", or "0", or "Off" 
+  - `valueOn` - Turned on, e.g. "true", or "1", or "On"
+  - `valueOff` - Turned off, e.g. "false", or "0", or "Off"
 
 Logging/Debugging:
 

package/config.schema.json

@@ -15,14 +15,14 @@
           },
           "name": {
             "type": "string",
-            "title": "${config.title.name}" ,         
+            "title": "${config.title.name}" ,
             "required": true
           },
           "type": {
             "type": "string",
             "title": "${config.title.type}",
-            "enum": [ "Lightbulb", "LockMechanism", "Outlet", "Switch", "TemperatureSensor"],
-            "enumNames": ["${config.enumNames.lightbulb}", "${config.enumNames.lockMechanism}", "${config.enumNames.outlet}", "${config.enumNames.switch}",  "${config.enumNames.temperatureSensor}"],
+            "enum": [ "Lightbulb", "LockMechanism", "Outlet", "SecuritySystem", "Switch", "TemperatureSensor"],
+            "enumNames": ["${config.enumNames.lightbulb}", "${config.enumNames.lockMechanism}", "${config.enumNames.outlet}", "${config.enumNames.securitySystem}", "${config.enumNames.switch}",  "${config.enumNames.temperatureSensor}"],
             "required": true
           },
           "manufacturer": {
@@ -68,7 +68,7 @@
           }
         }
       }
-    },    
+    },
     "properties": {
       "name": {
         "type": "string",
@@ -83,7 +83,6 @@
             "mqtt": { "$ref": "#/definitions/mqtt" },
             "temperatureUnits": {
               "type": "string",
-              "title": "${config.title.temperatureUnits}",
               "enum": ["C", "F"],
               "enumNames": ["${config.enumNames.celsius}", "${config.enumNames.fahrenheit}"]
             },
@@ -155,6 +154,26 @@
               "type": "string",
               "title": "${config.title.topicGetCurrentTemperature}"
             },
+            "topicGetCurrentSecurityState": {
+              "type": "string",
+              "title": "${config.title.topicGetCurrentSecurityState}"
+            },
+            "topicGetTargetSecurityState": {
+              "type": "string",
+              "title": "${config.title.topicGetTargetSecurityState}"
+            },
+            "topicSetTargetSecurityState": {
+              "type": "string",
+              "title": "${config.title.topicSetTargetSecurityState}"
+            },
+            "topicGetStatusTampered": {
+              "type": "string",
+              "title": "${config.title.topicGetStatusTampered}"
+            },
+            "topicGetStatusFault": {
+              "type": "string",
+              "title": "${config.title.topicGetStatusFault}"
+            },
             "valueStatusActive": {
               "type": "string",
               "title": "${config.title.valueStatusActive}",
@@ -188,6 +207,34 @@
               "type": "string",
               "title": "${config.title.valueOutletNotInUse}"
             },
+            "valueArmStay": {
+              "type": "string",
+              "title": "${config.title.valueArmStay}"
+            },
+            "valueArmAway": {
+              "type": "string",
+              "title": "${config.title.valueArmAway}"
+            },
+            "valueArmNight": {
+              "type": "string",
+              "title": "${config.title.valueArmNight}"
+            },
+            "valueDisarm": {
+              "type": "string",
+              "title": "${config.title.valueDisarm}"
+            },
+            "valueAlarmTriggered": {
+              "type": "string",
+              "title": "${config.title.valueAlarmTriggered}"
+            },
+            "valueTampered": {
+              "type": "string",
+              "title": "${config.title.valueTampered}"
+            },
+            "valueFault": {
+              "type": "string",
+              "title": "${config.title.valueFault}"
+            },
             "disableLogging": {
               "type": "boolean",
               "title": "${config.title.disableLogging}",
@@ -217,18 +264,11 @@
               "items": [
                 {
                   "key": "accessories[].info.name",
-                  "flex": "1 1 33%"
+                  "flex": "1 1 0"
                 },
                 {
                   "key": "accessories[].info.type",
-                  "flex": "1 1 33%"
-                },
-                {
-                  "key": "accessories[].temperatureUnits",
-                  "flex": "1 1 33%",                  
-                  "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'TemperatureSensor';"
-                  }
+                  "flex": "1 1 0"
                 }
               ]
             },
@@ -296,102 +336,93 @@
             {
               "type": "fieldset",
               "title": "${config.title.topics}",
+              "condition": {
+                "functionBody": "return model.accessories?.[arguments[1]]?.info?.type !== undefined;"
+              },
               "items": [
                 {
-                  "key": "accessories[].topicGetLockCurrentState",
-                  "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'LockMechanism';"
-                  }
-                },
-                {
-                  "key": "accessories[].topicGetLockTargetState",
-                  "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'LockMechanism';"
-                  }
-                },
-                {
-                  "key": "accessories[].topicSetTargetState",
+                  "type": "fieldset",
+                  "notitle": "true",
+                  "items": [
+                    "accessories[].topicGetLockCurrentState",
+                    "accessories[].topicGetLockTargetState",
+                    "accessories[].topicSetTargetState"
+                  ],
                   "condition": {
                     "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'LockMechanism';"
                   }
                 },
                 {
-                  "key": "accessories[].topicGetOn",
-                  "condition": {
-                    "functionBody": "return ['Lightbulb', 'Outlet', 'Switch'].includes(model.accessories?.[arguments[1]]?.info?.type);"
-                  }
-                },
-                {
-                  "key": "accessories[].topicSetOn",
+                  "type": "fieldset",
+                  "notitle": "true",
+                  "items": [
+                    "accessories[].topicGetOn",
+                    "accessories[].topicSetOn"
+                  ],
                   "condition": {
                     "functionBody": "return ['Lightbulb', 'Outlet', 'Switch'].includes(model.accessories?.[arguments[1]]?.info?.type);"
                   }
                 },
                 {
-                  "key": "accessories[].topicGetBrightness",
-                  "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Lightbulb';"
-                  }
-                },
-                {
-                  "key": "accessories[].topicSetBrightness",
-                  "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Lightbulb';"
-                  }
-                },
-                {
-                  "key": "accessories[].topicGetHue",
-                  "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Lightbulb';"
-                  }
-                },
-                {
-                  "key": "accessories[].topicSetHue",
-                  "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Lightbulb';"
-                  }
-                },
-                {
-                  "key": "accessories[].topicGetColorTemperature",
-                  "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Lightbulb';"
-                  }
-                },
-                {
-                  "key": "accessories[].topicSetColorTemperature",
-                  "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Lightbulb';"
-                  }
-                },
-                {
-                  "key": "accessories[].topicGetSaturation",
-                  "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Lightbulb';"
-                  }
-                },
-                {
-                  "key": "accessories[].topicSetSaturation",
+                  "type": "fieldset",
+                  "notitle": "true",
+                  "items": [
+                    "accessories[].topicGetBrightness",
+                    "accessories[].topicSetBrightness",
+                    "accessories[].topicGetHue",
+                    "accessories[].topicSetHue",
+                    "accessories[].topicGetColorTemperature",
+                    "accessories[].topicSetColorTemperature",
+                    "accessories[].topicGetSaturation",
+                    "accessories[].topicSetSaturation"
+                  ],
                   "condition": {
                     "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Lightbulb';"
                   }
                 },
                 {
-                  "key": "accessories[].topicGetOutletInUse",
+                  "type": "fieldset",
+                  "notitle": "true",
+                  "items": [
+                    "accessories[].topicGetOutletInUse",
+                    "accessories[].topicSetOutletInUse"
+                  ],
                   "condition": {
                     "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Outlet';"
                   }
                 },
                 {
-                  "key": "accessories[].topicSetOutletInUse",
+                  "type": "fieldset",
+                  "notitle": "true",
+                  "items": [
+                    "accessories[].topicGetCurrentSecurityState",
+                    "accessories[].topicGetTargetSecurityState",
+                    "accessories[].topicSetTargetSecurityState",
+                    "accessories[].topicGetStatusTampered",
+                    "accessories[].topicGetStatusFault"
+                  ],
                   "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Outlet';"
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'SecuritySystem';"
                   }
                 },
                 {
-                  "key": "accessories[].topicGetCurrentTemperature",
+                  "type": "div",
+                  "displayFlex": true,
+                  "flex-direction": "row",
                   "condition": {
                     "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'TemperatureSensor';"
-                  }
+                  },
+                  "items": [
+                    {
+                      "key": "accessories[].topicGetCurrentTemperature",
+                      "flex": "1 1 67%"
+                    },
+                    {
+                      "key": "accessories[].temperatureUnits",
+                      "title": "${config.title.sourceUnits}",
+                      "flex": "1 1 33%"
+                    }
+                  ]
                 },
                 "accessories[].topicGetStatusActive"
               ]
@@ -399,6 +430,9 @@
             {
               "type": "fieldset",
               "title": "${config.title.values}",
+              "condition": {
+                "functionBody": "return model.accessories?.[arguments[1]]?.info?.type !== undefined;"
+              },
               "items": [
                 {
                   "type": "div",
@@ -410,16 +444,16 @@
                   "items": [
                     {
                       "key": "accessories[].valueLockStateSecured",
-                      "flex": "1 1 0"
+                      "flex": "0 0 25%"
                     },
                     {
                       "key": "accessories[].valueLockStateUnsecured",
-                      "flex": "1 1 0"
+                      "flex": "0 0 25%"
                     },
                     {
                       "key": "accessories[].valueLockStateJammed",
-                      "flex": "1 1 0"
-                    }                    
+                      "flex": "0 0 25%"
+                    }
                   ]
                 },
                 {
@@ -432,11 +466,11 @@
                   "items": [
                     {
                       "key": "accessories[].valueOn",
-                      "flex": "1 1 0"
+                      "flex": "0 0 25%"
                     },
                     {
                       "key": "accessories[].valueOff",
-                      "flex": "1 1 0"
+                      "flex": "0 0 25%"
                     }
                   ]
                 },
@@ -450,17 +484,78 @@
                   "items": [
                     {
                       "key": "accessories[].valueOutletInUse",
-                      "flex": "1 1 0"
+                      "flex": "0 0 25%"
                     },
                     {
                       "key": "accessories[].valueOutletNotInUse",
-                      "flex": "1 1 0"
+                      "flex": "0 0 25%"
                     }
                   ]
                 },
-                "accessories[].valueStatusActive"
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'SecuritySystem';"
+                  },
+                  "items": [
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].valueArmStay",
+                          "flex": "0 0 25%"
+                        },
+                        {
+                          "key": "accessories[].valueArmAway",
+                          "flex": "0 0 25%"
+                        },
+                        {
+                          "key": "accessories[].valueArmNight",
+                          "flex": "0 0 25%"
+                        },
+                        {
+                          "key": "accessories[].valueDisarm",
+                          "flex": "0 0 25%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].valueAlarmTriggered",
+                          "flex": "0 0 25%"
+                        },
+                        {
+                          "key": "accessories[].valueTampered",
+                          "flex": "0 0 25%"
+                        },
+                        {
+                          "key": "accessories[].valueFault",
+                          "flex": "0 0 25%"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "type": "div",
+                  "displayFlex": true,
+                  "flex-direction": "row",
+                  "items": [
+                    {
+                      "key": "accessories[].valueStatusActive",
+                      "flex": "0 0 50%"
+                    }
+                  ]
+                }
               ]
-            }          
+            }
           ]
         }
       ]

package/dist/accessory/{base.d.ts → abstract/base.d.ts}

@@ -1,20 +1,20 @@
 import { PlatformAccessory } from 'homebridge';
-import { AccessoryConfig, CharacteristicType, ServiceType } from '../model/types.js';
-import { Log } from '../tools/log.js';
-import { Primitive } from '../tools/primitive.js';
+import { AccessoryConfig, CharacteristicType, ServiceType } from '../../model/types.js';
+import { Log } from '../../tools/log.js';
+import { Primitive } from '../../tools/primitive.js';
 export type TopicHandler = {
     topic: string;
     handler: ((topic: string, value: Primitive) => Promise<void>);
 };
 export declare function makeHandler(topic: string, handler: (topic: string, value: Primitive) => Promise<void>): TopicHandler;
-export declare abstract class MQTTAccessory {
+export declare abstract class MQTTAccessory<C extends AccessoryConfig> {
     protected readonly Service: ServiceType;
     protected readonly Characteristic: CharacteristicType;
     protected readonly accessory: PlatformAccessory;
-    protected readonly config: AccessoryConfig;
+    protected readonly config: C;
     protected readonly log: Log;
     private readonly mqttClient;
-    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: AccessoryConfig, log: Log, caller: string);
+    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: C, log: Log, caller: string);
     private onMQTTConnect;
     protected abstract get topicHandlers(): TopicHandler[];
     protected get name(): string;

package/dist/accessory/{base.js → abstract/base.js}

@@ -1,7 +1,7 @@
-import { PLATFORM_NAME } from '../homebridge/settings.js';
-import { MQTT } from '../model/mqtt.js';
-import getVersion from '../tools/version.js';
-import { assert } from '../tools/validation.js';
+import { PLATFORM_NAME } from '../../homebridge/settings.js';
+import { MQTT } from '../../model/mqtt.js';
+import getVersion from '../../tools/version.js';
+import { assert } from '../../tools/validation.js';
 export function makeHandler(topic, handler) {
     return { topic, handler };
 }
@@ -53,7 +53,7 @@ export class MQTTAccessory {
         if (this.config.disableLogging) {
             return;
         }
-        this.log.always(message, ...parameters);
+        this.log.always(message, this.name, ...parameters);
     }
 }
 //# sourceMappingURL=base.js.map

package/dist/accessory/abstract/base.js.map

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

package/dist/accessory/{statusActive.d.ts → abstract/statusActive.d.ts}

@@ -1,12 +1,11 @@
 import { PlatformAccessory, Service } from 'homebridge';
 import { MQTTAccessory, TopicHandler } from './base.js';
-import { CharacteristicType, StatusActiveConfig, ServiceType } from '../model/types.js';
-import { Log } from '../tools/log.js';
-export declare abstract class StatusActiveAccessory extends MQTTAccessory {
-    private readonly statusActiveConfig;
+import { CharacteristicType, StatusActiveConfig, ServiceType } from '../../model/types.js';
+import { Log } from '../../tools/log.js';
+export declare abstract class StatusActiveAccessory<C extends StatusActiveConfig = StatusActiveConfig> extends MQTTAccessory<C> {
     protected readonly accessoryService: Service;
     private statusActive;
-    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, statusActiveConfig: StatusActiveConfig, log: Log, className: string);
+    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: C, log: Log, className: string);
     protected abstract getAccessoryService(): Service;
     protected get topicHandlers(): TopicHandler[];
     private onStatusActiveUpdate;

package/dist/accessory/{statusActive.js → abstract/statusActive.js}

@@ -1,34 +1,32 @@
 import { makeHandler, MQTTAccessory } from './base.js';
-import { strings } from '../i18n/i18n.js';
-import { toPrimitive } from '../tools/primitive.js';
+import { strings } from '../../i18n/i18n.js';
+import { toPrimitive } from '../../tools/primitive.js';
 export class StatusActiveAccessory extends MQTTAccessory {
-    statusActiveConfig;
     accessoryService;
     statusActive = true;
-    constructor(Service, Characteristic, accessory, statusActiveConfig, log, className) {
-        super(Service, Characteristic, accessory, statusActiveConfig, log, className);
-        this.statusActiveConfig = statusActiveConfig;
+    constructor(Service, Characteristic, accessory, config, log, className) {
+        super(Service, Characteristic, accessory, config, log, className);
         this.accessoryService = this.getAccessoryService();
         this.accessoryService.getCharacteristic(Characteristic.StatusActive)
             .onGet(this.getStatusActive.bind(this));
     }
     get topicHandlers() {
         return [
-            ...(this.statusActiveConfig.topicGetStatusActive ? [makeHandler(this.statusActiveConfig.topicGetStatusActive, this.onStatusActiveUpdate.bind(this))] : []),
+            ...(this.config.topicGetStatusActive ? [makeHandler(this.config.topicGetStatusActive, this.onStatusActiveUpdate.bind(this))] : []),
         ];
     }
     async onStatusActiveUpdate(topic, value) {
         if (!this.assert('valueStatusActive')) {
             return;
         }
-        const statusActive = value === toPrimitive(this.statusActiveConfig.valueStatusActive);
+        const statusActive = value === toPrimitive(this.config.valueStatusActive);
         if (statusActive === this.statusActive) {
             return;
         }
         this.statusActive = statusActive;
         this.accessoryService.updateCharacteristic(this.Characteristic.StatusActive, this.statusActive);
         if (this.statusActive) {
-            this.logIfDesired(strings.accessory.statusActive, this.name);
+            this.logIfDesired(strings.accessory.statusActive);
         }
         else {
             this.log.warning(strings.accessory.statusInactive, this.name);

package/dist/accessory/abstract/statusActive.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"statusActive.js","sourceRoot":"","sources":["../../../src/accessory/abstract/statusActive.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAgB,MAAM,WAAW,CAAC;AAErE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAK7C,OAAO,EAAa,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAElE,MAAM,OAAgB,qBAAyE,SAAQ,aAAgB;IAClG,gBAAgB,CAAU;IAErC,YAAY,GAAwB,IAAI,CAAC;IAEjD,YACE,OAAoB,EACpB,cAAkC,EAClC,SAA4B,EAC5B,MAAS,EACT,GAAQ,EACR,SAAiB;QAEjB,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;QAElE,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAEnD,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,cAAc,CAAC,YAAY,CAAC;aACjE,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5C,CAAC;IAID,IAAc,aAAa;QACzB,OAAO;YACL,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA,CAAC,CAAC,EAAE,CAAC;SAClI,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,KAAa,EAAE,KAAgB;QAEhE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACtC,OAAO;QACT,CAAC;QAED,MAAM,YAAY,GAAG,KAAK,KAAK,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAC1E,IAAI,YAAY,KAAK,IAAI,CAAC,YAAY,EAAE,CAAC;YACvC,OAAO;QACT,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAEhG,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;CACF"}