homebridge-easy-mqtt 1.3.0-beta.2 → 1.3.0-beta.3

package/dist/accessory/sensor/motion.js

@@ -0,0 +1,13 @@
+import { SensorAccessory } from './sensor.js';
+import { strings } from '../../i18n/i18n.js';
+import { CharacteristicKey } from '../../model/enums.js';
+export class MotionSensorAccessory extends SensorAccessory {
+    constructor(Service, Characteristic, accessory, config, log) {
+        super(Service, Characteristic, accessory, config, log);
+        this.setupCharacteristic(CharacteristicKey.MotionDetected, 0, 'topicGetMotionDetected', this.bindOnUpdateNumericBoolean(CharacteristicKey.MotionDetected, 'valueMotionDetected', strings.sensor.motion.active, strings.sensor.motion.inactive), true);
+    }
+    getAccessoryService() {
+        return this.accessory.getService(this.Service.MotionSensor) || this.accessory.addService(this.Service.MotionSensor);
+    }
+}
+//# sourceMappingURL=motion.js.map

package/dist/accessory/sensor/motion.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"motion.js","sourceRoot":"","sources":["../../../src/accessory/sensor/motion.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAKzD,MAAM,OAAO,qBAAsB,SAAQ,eAAmC;IAE5E,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAA0B,EAAE,GAAQ;QACtI,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAEvD,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,cAAc,EAAE,CAAC,EAAE,wBAAwB,EACpF,IAAI,CAAC,0BAA0B,CAC7B,iBAAiB,CAAC,cAAc,EAChC,qBAAqB,EACrB,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAC/D,IAAI,CAAC,CAAC;IACV,CAAC;IAES,mBAAmB;QAC3B,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACtH,CAAC;CACF"}

package/dist/accessory/sensor/occupancy.d.ts

@@ -0,0 +1,8 @@
+import { PlatformAccessory, Service } from 'homebridge';
+import { SensorAccessory } from './sensor.js';
+import { CharacteristicType, OccupancySensorConfig, ServiceType } from '../../model/types.js';
+import { Log } from '../../tools/log.js';
+export declare class OccupancySensorAccessory extends SensorAccessory<OccupancySensorConfig> {
+    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: OccupancySensorConfig, log: Log);
+    protected getAccessoryService(): Service;
+}

package/dist/accessory/sensor/occupancy.js

@@ -0,0 +1,13 @@
+import { SensorAccessory } from './sensor.js';
+import { strings } from '../../i18n/i18n.js';
+import { CharacteristicKey } from '../../model/enums.js';
+export class OccupancySensorAccessory extends SensorAccessory {
+    constructor(Service, Characteristic, accessory, config, log) {
+        super(Service, Characteristic, accessory, config, log);
+        this.setupCharacteristic(CharacteristicKey.OccupancyDetected, 0, 'topicGetOccupancyDetected', this.bindOnUpdateNumericBoolean(CharacteristicKey.OccupancyDetected, 'valueOccupancyDetected', strings.sensor.occupancy.active, strings.sensor.occupancy.inactive), true);
+    }
+    getAccessoryService() {
+        return this.accessory.getService(this.Service.OccupancySensor) || this.accessory.addService(this.Service.OccupancySensor);
+    }
+}
+//# sourceMappingURL=occupancy.js.map

package/dist/accessory/sensor/occupancy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"occupancy.js","sourceRoot":"","sources":["../../../src/accessory/sensor/occupancy.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAKzD,MAAM,OAAO,wBAAyB,SAAQ,eAAsC;IAElF,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAA6B,EAAE,GAAQ;QACzI,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAEvD,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,CAAC,EAAE,2BAA2B,EAC1F,IAAI,CAAC,0BAA0B,CAC7B,iBAAiB,CAAC,iBAAiB,EACnC,wBAAwB,EACxB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,EACrE,IAAI,CAAC,CAAC;IACV,CAAC;IAES,mBAAmB;QAC3B,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IAC5H,CAAC;CACF"}

package/dist/accessory/sensor/sensor.d.ts

@@ -0,0 +1,9 @@
+import { PlatformAccessory } from 'homebridge';
+import { BaseAccessory } from '../abstract/base.js';
+import { CharacteristicType, SensorConfig, ServiceType } from '../../model/types.js';
+import { Log } from '../../tools/log.js';
+export declare abstract class SensorAccessory<C extends SensorConfig = SensorConfig> extends BaseAccessory<C> {
+    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: C, log: Log);
+    private onTamperedUpdate;
+    private onFaultUpdate;
+}

package/dist/accessory/sensor/sensor.js

@@ -0,0 +1,36 @@
+import { BaseAccessory } from '../abstract/base.js';
+import { strings } from '../../i18n/i18n.js';
+import { CharacteristicKey } from '../../model/enums.js';
+import { LogType } from '../../tools/log.js';
+export class SensorAccessory extends BaseAccessory {
+    constructor(Service, Characteristic, accessory, config, log) {
+        super(Service, Characteristic, accessory, config, log);
+        this.setupCharacteristic(CharacteristicKey.StatusTampered, 0, 'topicGetStatusTampered', this.onTamperedUpdate.bind(this), false);
+        this.setupCharacteristic(CharacteristicKey.StatusFault, 0, 'topicGetStatusFault', this.onFaultUpdate.bind(this), false);
+    }
+    async onTamperedUpdate(topic, value) {
+        const tampered = value === this.getPrimitiveValue('valueTampered');
+        if (!this.onUpdate(CharacteristicKey.StatusTampered, tampered)) {
+            return;
+        }
+        if (tampered) {
+            this.logIfDesired(LogType.WARNING, strings.error.isTampered);
+        }
+        else {
+            this.logIfDesired(strings.error.notTampered);
+        }
+    }
+    async onFaultUpdate(topic, value) {
+        const fault = value === this.getPrimitiveValue('valueFault');
+        if (!this.onUpdate(CharacteristicKey.StatusFault, fault)) {
+            return;
+        }
+        if (fault) {
+            this.logIfDesired(LogType.WARNING, strings.error.hasFault);
+        }
+        else {
+            this.logIfDesired(strings.error.noFault);
+        }
+    }
+}
+//# sourceMappingURL=sensor.js.map

package/dist/accessory/sensor/sensor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sensor.js","sourceRoot":"","sources":["../../../src/accessory/sensor/sensor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGzD,OAAO,EAAO,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,OAAgB,eAAuD,SAAQ,aAAgB;IAEnG,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAAS,EAAE,GAAQ;QACrH,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAEvD,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,cAAc,EAAE,CAAC,EAAE,wBAAwB,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;QAEjI,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,WAAW,EAAE,CAAC,EAAE,qBAAqB,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;IAC1H,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,KAAa,EAAE,KAAqB;QAEjE,MAAM,QAAQ,GAAG,KAAK,KAAK,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QACnE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC/D,OAAO;QACT,CAAC;QAED,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC/D,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,KAAa,EAAE,KAAqB;QAE9D,MAAM,KAAK,GAAG,KAAK,KAAK,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QAC7D,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC;YACzD,OAAO;QACT,CAAC;QAED,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC7D,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;CACF"}

package/dist/accessory/sensor/smoke.d.ts

@@ -0,0 +1,8 @@
+import { PlatformAccessory, Service } from 'homebridge';
+import { SensorAccessory } from './sensor.js';
+import { CharacteristicType, SmokeSensorConfig, ServiceType } from '../../model/types.js';
+import { Log } from '../../tools/log.js';
+export declare class SmokeSensorAccessory extends SensorAccessory<SmokeSensorConfig> {
+    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: SmokeSensorConfig, log: Log);
+    protected getAccessoryService(): Service;
+}

package/dist/accessory/sensor/smoke.js

@@ -0,0 +1,13 @@
+import { SensorAccessory } from './sensor.js';
+import { strings } from '../../i18n/i18n.js';
+import { CharacteristicKey } from '../../model/enums.js';
+export class SmokeSensorAccessory extends SensorAccessory {
+    constructor(Service, Characteristic, accessory, config, log) {
+        super(Service, Characteristic, accessory, config, log);
+        this.setupCharacteristic(CharacteristicKey.SmokeDetected, 0, 'topicGetSmokeDetected', this.bindOnUpdateNumericBoolean(CharacteristicKey.SmokeDetected, 'valueSmokeDetected', strings.sensor.smoke.active, strings.sensor.smoke.inactive), true);
+    }
+    getAccessoryService() {
+        return this.accessory.getService(this.Service.SmokeSensor) || this.accessory.addService(this.Service.SmokeSensor);
+    }
+}
+//# sourceMappingURL=smoke.js.map

package/dist/accessory/sensor/smoke.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"smoke.js","sourceRoot":"","sources":["../../../src/accessory/sensor/smoke.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAKzD,MAAM,OAAO,oBAAqB,SAAQ,eAAkC;IAE1E,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAAyB,EAAE,GAAQ;QACrI,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAEvD,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC,EAAE,uBAAuB,EAClF,IAAI,CAAC,0BAA0B,CAC7B,iBAAiB,CAAC,aAAa,EAC/B,oBAAoB,EACpB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,EAC7D,IAAI,CAAC,CAAC;IACV,CAAC;IAES,mBAAmB;QAC3B,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACpH,CAAC;CACF"}

package/dist/accessory/{temperatureSensor.d.ts → sensor/temperature.d.ts}

@@ -1,8 +1,8 @@
 import { PlatformAccessory, Service } from 'homebridge';
-import { BaseAccessory } from './abstract/base.js';
-import { CharacteristicType, ServiceType, TemperatureSensorConfig } from '../model/types.js';
-import { Log } from '../tools/log.js';
-export declare class TemperatureSensorAccessory extends BaseAccessory<TemperatureSensorConfig> {
+import { SensorAccessory } from './sensor.js';
+import { CharacteristicType, ServiceType, TemperatureSensorConfig } from '../../model/types.js';
+import { Log } from '../../tools/log.js';
+export declare class TemperatureSensorAccessory extends SensorAccessory<TemperatureSensorConfig> {
     constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: TemperatureSensorConfig, log: Log);
     protected getAccessoryService(): Service;
     private onCurrentTemperatureUpdate;

package/dist/accessory/{temperatureSensor.js → sensor/temperature.js}

@@ -1,9 +1,9 @@
-import { BaseAccessory } from './abstract/base.js';
-import { strings } from '../i18n/i18n.js';
-import { toNumber } from '../tools/primitive.js';
-import { toCelsius } from '../tools/temperature.js';
-import { CharacteristicKey, TemperatureUnits } from '../model/enums.js';
-export class TemperatureSensorAccessory extends BaseAccessory {
+import { SensorAccessory } from './sensor.js';
+import { strings } from '../../i18n/i18n.js';
+import { toNumber } from '../../tools/primitive.js';
+import { toCelsius } from '../../tools/temperature.js';
+import { CharacteristicKey, TemperatureUnits } from '../../model/enums.js';
+export class TemperatureSensorAccessory extends SensorAccessory {
     constructor(Service, Characteristic, accessory, config, log) {
         super(Service, Characteristic, accessory, config, log);
         this.setupCharacteristic(CharacteristicKey.CurrentTemperature, 0, 'topicGetCurrentTemperature', this.onCurrentTemperatureUpdate.bind(this), true);
@@ -13,13 +13,13 @@ export class TemperatureSensorAccessory extends BaseAccessory {
     }
     async onCurrentTemperatureUpdate(topic, value) {
         if (typeof value !== 'number') {
-            this.log.error(strings.temperatureSensor.badValue, this.name, `'${value}'`);
+            this.log.error(strings.sensor.temperature.badValue, this.name, `'${value}'`);
             return;
         }
         const units = this.config.temperatureUnits ?? TemperatureUnits.CELSIUS;
         const temperature = toCelsius(toNumber(value), units);
         this.onUpdate(CharacteristicKey.CurrentTemperature, temperature);
-        this.logIfDesired(strings.temperatureSensor.temperature, value.toString(), units);
+        this.logIfDesired(strings.sensor.temperature.update, value.toString(), units);
     }
 }
-//# sourceMappingURL=temperatureSensor.js.map
+//# sourceMappingURL=temperature.js.map

package/dist/accessory/sensor/temperature.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"temperature.js","sourceRoot":"","sources":["../../../src/accessory/sensor/temperature.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAK7C,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE3E,MAAM,OAAO,0BAA2B,SAAQ,eAAwC;IAEtF,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAA+B,EAAE,GAAQ;QAC3I,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAEvD,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,CAAC,EAAE,4BAA4B,EAAE,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;IACpJ,CAAC;IAES,mBAAmB;QAC3B,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAChI,CAAC;IAEO,KAAK,CAAC,0BAA0B,CAAC,KAAa,EAAE,KAAqB;QAE3E,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,KAAK,GAAG,CAAC,CAAC;YAC7E,OAAO;QACT,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,OAAO,CAAC;QACvE,MAAM,WAAW,GAAG,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;QAEtD,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,WAAW,CAAC,CAAC;QAEjE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,CAAC;IAChF,CAAC;CACF"}

package/dist/homebridge/platform.js

@@ -1,10 +1,18 @@
 import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js';
+import { ContactSensorAccessory } from '../accessory/sensor/contact.js';
+import { CO2SensorAccessory } from '../accessory/sensor/carbonDioxide.js';
+import { COSensorAccessory } from '../accessory/sensor/carbonMonoxide.js';
+import { HumiditySensorAccessory } from '../accessory/sensor/humidity.js';
+import { LeakSensorAccessory } from '../accessory/sensor/leak.js';
 import { LightbulbAccessory } from '../accessory/onoff/lightbulb.js';
 import { LockMechanismAccessory } from '../accessory/lock.js';
+import { MotionSensorAccessory } from '../accessory/sensor/motion.js';
+import { OccupancySensorAccessory } from '../accessory/sensor/occupancy.js';
 import { OutletAccessory } from '../accessory/onoff/outlet.js';
 import { SecuritySystemAccessory } from '../accessory/security.js';
+import { SmokeSensorAccessory } from '../accessory/sensor/smoke.js';
 import { SwitchAccessory } from '../accessory/onoff/switch.js';
-import { TemperatureSensorAccessory } from '../accessory/temperatureSensor.js';
+import { TemperatureSensorAccessory } from '../accessory/sensor/temperature.js';
 import { setLanguage, strings } from '../i18n/i18n.js';
 import { AccessoryType } from '../model/enums.js';
 import { Log } from '../tools/log.js';
@@ -63,18 +71,42 @@ export class HomebridgeEasyMQTT {
             const Characteristic = this.api.hap.Characteristic;
             let accessory;
             switch (accessoryConfig.info.type) {
+                case AccessoryType.CarbonDioxideSensor:
+                    accessory = new CO2SensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
+                    break;
+                case AccessoryType.CarbonMonoxideSensor:
+                    accessory = new COSensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
+                    break;
+                case AccessoryType.ContactSensor:
+                    accessory = new ContactSensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
+                    break;
+                case AccessoryType.HumiditySensor:
+                    accessory = new HumiditySensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
+                    break;
+                case AccessoryType.LeakSensor:
+                    accessory = new LeakSensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
+                    break;
                 case AccessoryType.Lightbulb:
                     accessory = new LightbulbAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
                     break;
                 case AccessoryType.LockMechanism:
                     accessory = new LockMechanismAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
                     break;
+                case AccessoryType.MotionSensor:
+                    accessory = new MotionSensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
+                    break;
+                case AccessoryType.OccupancySensor:
+                    accessory = new OccupancySensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
+                    break;
                 case AccessoryType.Outlet:
                     accessory = new OutletAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
                     break;
                 case AccessoryType.SecuritySystem:
                     accessory = new SecuritySystemAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
                     break;
+                case AccessoryType.SmokeSensor:
+                    accessory = new SmokeSensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
+                    break;
                 case AccessoryType.Switch:
                     accessory = new SwitchAccessory(Service, Characteristic, platformAccessory, accessoryConfig, this.log);
                     break;

package/dist/homebridge/platform.js.map

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

package/dist/homebridge-ui/public/index.html

@@ -24,4 +24,4 @@
 
 <footer id="footer" class="text-center" style="display: none; font-style: italic; font-size: 0.9em;" i18n="required"></footer>
 
-<script src="ui.js?v=1.3.0-beta.2"></script>
+<script src="ui.js?v=1.3.0-beta.3"></script>

package/dist/homebridge-ui/public/ui.js

@@ -1 +1 @@
-"use strict";(()=>{var u={arrow:"&rarr;",easy_mqtt:"Easy MQTT",github:'<a target="_blank" href="https://github.com/mpatfield/homebridge-easy-mqtt/">GitHub</a>'};function g(n){document.querySelectorAll("[i18n]").forEach(t=>{let o=t.getAttribute("i18n"),r=n.config[o],e=t.getAttribute("i18n_replace");e&&(r=r.replace("%s",u[e])),t.innerHTML=r})}function f(n){let t=["span","label","legend","option","p"];Array.from(window.parent.document.querySelectorAll(t.join(","))).sort((r,e)=>t.indexOf(r.tagName.toLowerCase())-t.indexOf(e.tagName.toLowerCase())).forEach(r=>{let e=r.innerHTML;e=e.replaceAll(/\$\{config\.(title|description|enumNames)\.([^}]+)\}/g,(l,i,a)=>n.config[i]&&typeof n.config[i]=="object"&&a in n.config[i]?n.config[i][a]:l),r.innerHTML!==e&&(r.innerHTML=e)})}function s(n){let t=Array.from(window.parent.document.querySelectorAll("fieldset legend"));for(let o of t){let e=o.closest("fieldset")?.querySelector('input[type="text"][name="name"]');e&&o.textContent!==(e.value||n.config.title.accessory)&&(o.textContent=e.value!==""?e.value:n.config.title.accessory),e&&!e.dataset.accessoryNameListener&&(e.addEventListener("input",()=>s(n)),e.dataset.accessoryNameListener="true")}}function d(){if(typeof crypto<"u"){if(crypto.randomUUID)return crypto.randomUUID();if(crypto.getRandomValues)return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,n=>{let t=crypto.getRandomValues(new Uint8Array(1))[0]&15;return(n==="x"?t:t&3|8).toString(16)})}return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,n=>{let t=Math.random()*16|0;return(n==="x"?t:t&3|8).toString(16)})}function m(n){let t=!1;n.accessories?.forEach(o=>{if(o.info.id===void 0){let r=d();o.info.id=r,t=!0}}),t&&homebridge.updatePluginConfig([n])}async function x(n){let t=!1;for(let o of n)for(let r of o.accessories??[]){if(r.info.type!=="LockMechanism")continue;let e=r;e.topicGetLockCurrentState!==void 0&&(e.topicGetCurrentLockState=e.topicGetLockCurrentState,e.topicGetLockCurrentState=void 0,t=!0),e.topicGetLockTargetState!==void 0&&(e.topicGetTargetLockState=e.topicGetLockTargetState,e.topicGetLockTargetState=void 0,t=!0),e.topicSetTargetState!==void 0&&(e.topicSetTargetLockState=e.topicSetTargetState,e.topicSetTargetState=void 0,t=!0)}t&&await homebridge.updatePluginConfig(n)}function c(n){document.getElementById("pageIntro").style.display="none",document.getElementById("support").style.display="block",document.getElementById("footer").style.display="block",new MutationObserver(()=>{f(n),s(n)}).observe(window.parent.document.body,{childList:!0,subtree:!0}),homebridge.showSchemaForm(),homebridge.addEventListener("configChanged",o=>{let r=o.data;r.length&&m(r[0])}),homebridge.hideSpinner()}function p(n){document.getElementById("introContinue").addEventListener("click",async()=>{c(n)}),document.getElementById("pageIntro").style.display="block",homebridge.hideSpinner()}homebridge.showSpinner();(async()=>{let n=await homebridge.i18nCurrentLang(),t=await homebridge.request("i18n",n);g(t);let o=await homebridge.getPluginConfig();o.length?(await x(o),c(t)):(await homebridge.updatePluginConfig([{name:u.easy_mqtt}]),p(t))})();})();
+"use strict";(()=>{var u={arrow:"&rarr;",easy_mqtt:"Easy MQTT",github:'<a target="_blank" href="https://github.com/mpatfield/homebridge-easy-mqtt/">GitHub</a>'};function g(n){document.querySelectorAll("[i18n]").forEach(t=>{let o=t.getAttribute("i18n"),r=n.config[o],e=t.getAttribute("i18n_replace");e&&(r=r.replace("%s",u[e])),t.innerHTML=r})}function f(n){let t=["span","label","legend","option","p"];Array.from(window.parent.document.querySelectorAll(t.join(","))).sort((r,e)=>t.indexOf(r.tagName.toLowerCase())-t.indexOf(e.tagName.toLowerCase())).forEach(r=>{let e=r.innerHTML;e=e.replaceAll(/\$\{config\.(title|description|enumNames)\.([^}]+)\}/g,(s,i,a)=>n.config[i]&&typeof n.config[i]=="object"&&a in n.config[i]?n.config[i][a]:s),r.innerHTML!==e&&(r.innerHTML=e)})}function d(n){let t=Array.from(window.parent.document.querySelectorAll("fieldset legend"));for(let o of t){let e=o.closest("fieldset")?.querySelector('input[type="text"][name="name"]');e&&o.textContent!==(e.value||n.config.title.accessory)&&(o.textContent=e.value!==""?e.value:n.config.title.accessory),e&&!e.dataset.accessoryNameListener&&(e.addEventListener("input",()=>d(n)),e.dataset.accessoryNameListener="true")}}function c(){if(typeof crypto<"u"){if(crypto.randomUUID)return crypto.randomUUID();if(crypto.getRandomValues)return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,n=>{let t=crypto.getRandomValues(new Uint8Array(1))[0]&15;return(n==="x"?t:t&3|8).toString(16)})}return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,n=>{let t=Math.random()*16|0;return(n==="x"?t:t&3|8).toString(16)})}function m(n){let t=!1;n.accessories?.forEach(o=>{if(o.info.id===void 0){let r=c();o.info.id=r,t=!0}}),t&&homebridge.updatePluginConfig([n])}async function x(n){let t=!1;for(let o of n)for(let r of o.accessories??[]){if(r.info.type!=="LockMechanism")continue;let e=r;e.topicGetLockCurrentState!==void 0&&(e.topicGetCurrentLockState=e.topicGetLockCurrentState,e.topicGetLockCurrentState=void 0,t=!0),e.topicGetLockTargetState!==void 0&&(e.topicGetTargetLockState=e.topicGetLockTargetState,e.topicGetLockTargetState=void 0,t=!0),e.topicSetTargetState!==void 0&&(e.topicSetTargetLockState=e.topicSetTargetState,e.topicSetTargetState=void 0,t=!0)}t&&await homebridge.updatePluginConfig(n)}function l(n){document.getElementById("pageIntro").style.display="none",document.getElementById("support").style.display="block",document.getElementById("footer").style.display="block",new MutationObserver(()=>{f(n),d(n)}).observe(window.parent.document.body,{childList:!0,subtree:!0}),homebridge.showSchemaForm(),homebridge.addEventListener("configChanged",o=>{let r=o.data;r.length&&m(r[0])}),homebridge.hideSpinner()}function S(n){document.getElementById("introContinue").addEventListener("click",async()=>{l(n)}),document.getElementById("pageIntro").style.display="block",homebridge.hideSpinner()}homebridge.showSpinner();(async()=>{let n=await homebridge.i18nCurrentLang(),t=await homebridge.request("i18n",n);g(t);let o=await homebridge.getPluginConfig();o.length?(await x(o),l(t)):(await homebridge.updatePluginConfig([{name:u.easy_mqtt}]),S(t))})();})();

package/dist/i18n/en.d.ts

@@ -21,11 +21,19 @@ declare const en: {
         enumNames: {
             celsius: string;
             fahrenheit: string;
+            carbonDioxideSensor: string;
+            carbonMonoxideSensor: string;
+            contactSensor: string;
+            humiditySensor: string;
+            leakSensor: string;
             lightbulb: string;
             lockMechanism: string;
+            motionSensor: string;
+            occupancySensor: string;
             outlet: string;
             switch: string;
             securitySystem: string;
+            smokeSensor: string;
             temperatureSensor: string;
         };
         title: {
@@ -59,6 +67,18 @@ declare const en: {
             topicSetTargetSecurityState: string;
             topicGetStatusTampered: string;
             topicGetStatusFault: string;
+            topicGetCarbonMonoxideDetected: string;
+            topicGetCarbonMonoxideLevel: string;
+            topicGetCarbonMonoxidePeakLevel: string;
+            topicGetCarbonDioxideDetected: string;
+            topicGetCarbonDioxideLevel: string;
+            topicGetCarbonDioxidePeakLevel: string;
+            topicGetContactSensorState: string;
+            topicGetLeakDetected: string;
+            topicGetMotionDetected: string;
+            topicGetOccupancyDetected: string;
+            topicGetSmokeDetected: string;
+            topicGetCurrentRelativeHumidity: string;
             topics: string;
             type: string;
             username: string;
@@ -78,6 +98,13 @@ declare const en: {
             valueAlarmTriggered: string;
             valueTampered: string;
             valueFault: string;
+            valueCarbonMonoxideDetected: string;
+            valueCarbonDioxideDetected: string;
+            valueContactDetected: string;
+            valueLeakDetected: string;
+            valueMotionDetected: string;
+            valueOccupancyDetected: string;
+            valueSmokeDetected: string;
             values: string;
             verbose: string;
         };
@@ -86,6 +113,12 @@ declare const en: {
         badValue: string;
         updated: string;
     };
+    error: {
+        isTampered: string;
+        hasFault: string;
+        noFault: string;
+        notTampered: string;
+    };
     lightbulb: {
         brightness: string;
         futureBrightness: string;
@@ -133,11 +166,7 @@ declare const en: {
     };
     security: {
         badValue: string;
-        isTampered: string;
-        hasFault: string;
         noStateValues: string;
-        noFault: string;
-        notTampered: string;
         stateCurrentArmAway: string;
         stateCurrentArmNight: string;
         stateCurrentArmStay: string;
@@ -150,6 +179,47 @@ declare const en: {
         stateUnknown: string;
         unknownValue: string;
     };
+    sensor: {
+        carbonDioxide: {
+            active: string;
+            inactive: string;
+            level: string;
+            peakLevel: string;
+        };
+        carbonMonoxide: {
+            active: string;
+            inactive: string;
+            level: string;
+            peakLevel: string;
+        };
+        contact: {
+            active: string;
+            inactive: string;
+        };
+        humidity: {
+            update: string;
+        };
+        leak: {
+            active: string;
+            inactive: string;
+        };
+        motion: {
+            active: string;
+            inactive: string;
+        };
+        occupancy: {
+            active: string;
+            inactive: string;
+        };
+        smoke: {
+            active: string;
+            inactive: string;
+        };
+        temperature: {
+            badValue: string;
+            update: string;
+        };
+    };
     startup: {
         complete: string;
         newAccessory: string;
@@ -158,9 +228,5 @@ declare const en: {
         unsupportedType: string;
         welcome: string[];
     };
-    temperatureSensor: {
-        badValue: string;
-        temperature: string;
-    };
 };
 export default en;