homebridge-easy-mqtt 1.2.0-beta.2 → 1.2.0-beta.4

package/dist/i18n/template.d.ts

@@ -1,5 +1,9 @@
 declare const REPLACE_THIS_WITH_ISO_CODE: {
     accessory: {
+        badBatteryLevel: string;
+        batteryLevel: string;
+        batteryLow: string;
+        batteryNotLow: string;
         missingRequired: string;
         statusActive: string;
         statusInactive: string;
@@ -10,7 +14,6 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
         support: string;
         thankYou: string;
         description: {
-            disableLogging: string;
             options: string;
             topics: string;
             verbose: string;
@@ -29,15 +32,12 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
             accessory: string;
             broker: string;
             disableLogging: string;
-            info: string;
             name: string;
-            manufacturer: string;
-            model: string;
-            mqtt: string;
             options: string;
             password: string;
             sourceUnits: string;
-            serialNumber: string;
+            topicGetBatteryLevel: string;
+            topicGetBatteryLow: string;
             topicGetStatusActive: string;
             topicGetCurrentLockState: string;
             topicGetOutletInUse: string;
@@ -62,6 +62,7 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
             topics: string;
             type: string;
             username: string;
+            valueBatteryLow: string;
             valueStatusActive: string;
             valueLockStateJammed: string;
             valueOutletInUse: string;
@@ -79,7 +80,6 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
             valueFault: string;
             values: string;
             verbose: string;
-            version: string;
         };
     };
     lightbulb: {
@@ -97,7 +97,7 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
         futureSaturation: string;
     };
     lock: {
-        badTarget: string;
+        badValue: string;
         stateCurrentSecured: string;
         stateCurrentUnsecured: string;
         stateFutureSecured: string;
@@ -120,11 +120,11 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
         reconnectInSeconds: string;
     };
     onOff: {
-        badValue: string;
         stateFutureOff: string;
         stateFutureOn: string;
         stateOn: string;
         stateOff: string;
+        unknownValue: string;
     };
     outlet: {
         badValue: string;
@@ -132,7 +132,7 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
         notInUse: string;
     };
     security: {
-        badTarget: string;
+        badValue: string;
         isTampered: string;
         hasFault: string;
         noStateValues: string;

package/dist/model/enums.d.ts

@@ -7,6 +7,7 @@ export declare enum AccessoryType {
     TemperatureSensor = "TemperatureSensor"
 }
 export declare enum CharacteristicKey {
+    BatteryLevel = "BatteryLevel",
     Brightness = "Brightness",
     ColorTemperature = "ColorTemperature",
     Hue = "Hue",
@@ -19,6 +20,7 @@ export declare enum CharacteristicKey {
     SecuritySystemTargetState = "SecuritySystemTargetState",
     StatusActive = "StatusActive",
     StatusFault = "StatusFault",
+    StatusLowBattery = "StatusLowBattery",
     StatusTampered = "StatusTampered"
 }
 export declare enum TemperatureUnits {

package/dist/model/enums.js

@@ -9,6 +9,7 @@ export var AccessoryType;
 })(AccessoryType || (AccessoryType = {}));
 export var CharacteristicKey;
 (function (CharacteristicKey) {
+    CharacteristicKey["BatteryLevel"] = "BatteryLevel";
     CharacteristicKey["Brightness"] = "Brightness";
     CharacteristicKey["ColorTemperature"] = "ColorTemperature";
     CharacteristicKey["Hue"] = "Hue";
@@ -21,6 +22,7 @@ export var CharacteristicKey;
     CharacteristicKey["SecuritySystemTargetState"] = "SecuritySystemTargetState";
     CharacteristicKey["StatusActive"] = "StatusActive";
     CharacteristicKey["StatusFault"] = "StatusFault";
+    CharacteristicKey["StatusLowBattery"] = "StatusLowBattery";
     CharacteristicKey["StatusTampered"] = "StatusTampered";
 })(CharacteristicKey || (CharacteristicKey = {}));
 export var TemperatureUnits;

package/dist/model/enums.js.map

@@ -1 +1 @@
-{"version":3,"file":"enums.js","sourceRoot":"","sources":["../../src/model/enums.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,aAOX;AAPD,WAAY,aAAa;IACvB,wCAAuB,CAAA;IACvB,gDAA+B,CAAA;IAC/B,kCAAiB,CAAA;IACjB,kDAAiC,CAAA;IACjC,kCAAiB,CAAA;IACjB,wDAAuC,CAAA;AACzC,CAAC,EAPW,aAAa,KAAb,aAAa,QAOxB;AAED,MAAM,CAAN,IAAY,iBAcX;AAdD,WAAY,iBAAiB;IAC3B,8CAAyB,CAAA;IACzB,0DAAqC,CAAA;IACrC,gCAAW,CAAA;IACX,0DAAqC,CAAA;IACrC,wDAAmC,CAAA;IACnC,8BAAS,CAAA;IACT,gDAA2B,CAAA;IAC3B,8CAAyB,CAAA;IACzB,8EAAyD,CAAA;IACzD,4EAAuD,CAAA;IACvD,kDAA6B,CAAA;IAC7B,gDAA2B,CAAA;IAC3B,sDAAiC,CAAA;AACnC,CAAC,EAdW,iBAAiB,KAAjB,iBAAiB,QAc5B;AAED,MAAM,CAAN,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,iCAAa,CAAA;IACb,oCAAgB,CAAA;AAClB,CAAC,EAHW,gBAAgB,KAAhB,gBAAgB,QAG3B"}
+{"version":3,"file":"enums.js","sourceRoot":"","sources":["../../src/model/enums.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,aAOX;AAPD,WAAY,aAAa;IACvB,wCAAuB,CAAA;IACvB,gDAA+B,CAAA;IAC/B,kCAAiB,CAAA;IACjB,kDAAiC,CAAA;IACjC,kCAAiB,CAAA;IACjB,wDAAuC,CAAA;AACzC,CAAC,EAPW,aAAa,KAAb,aAAa,QAOxB;AAED,MAAM,CAAN,IAAY,iBAgBX;AAhBD,WAAY,iBAAiB;IAC3B,kDAA6B,CAAA;IAC7B,8CAAyB,CAAA;IACzB,0DAAqC,CAAA;IACrC,gCAAW,CAAA;IACX,0DAAqC,CAAA;IACrC,wDAAmC,CAAA;IACnC,8BAAS,CAAA;IACT,gDAA2B,CAAA;IAC3B,8CAAyB,CAAA;IACzB,8EAAyD,CAAA;IACzD,4EAAuD,CAAA;IACvD,kDAA6B,CAAA;IAC7B,gDAA2B,CAAA;IAC3B,0DAAqC,CAAA;IACrC,sDAAiC,CAAA;AACnC,CAAC,EAhBW,iBAAiB,KAAjB,iBAAiB,QAgB5B;AAED,MAAM,CAAN,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,iCAAa,CAAA;IACb,oCAAgB,CAAA;AAClB,CAAC,EAHW,gBAAgB,KAAhB,gBAAgB,QAG3B"}

package/dist/model/types.d.ts

@@ -2,21 +2,17 @@ import { PlatformConfig as HBPlatformConfig } from 'homebridge';
 export type ServiceType = typeof import('homebridge').Service;
 export type CharacteristicType = typeof import('homebridge').Characteristic;
 import { AccessoryType, TemperatureUnits } from './enums.js';
+import { Assertable } from '../tools/validation.js';
 export type PlatformConfig = HBPlatformConfig & {
-    accessories?: AccessoryConfig[];
+    accessories?: BaseAccessoryConfig[];
 };
 export type TemperatureConfig = {
     temperatureUnits?: TemperatureUnits;
 };
-export type Assertable = {};
 export type InfoConfig = Assertable & {
     id: string;
     name: string;
     type: AccessoryType;
-    manufacturer?: string;
-    model?: string;
-    serialNumber?: string;
-    version?: string;
 };
 export type MQTTConfig = Assertable & {
     broker: string;
@@ -24,16 +20,19 @@ export type MQTTConfig = Assertable & {
     password?: string;
     options?: string;
 };
-export type AccessoryConfig = Assertable & {
+export type MQTTAccessoryConfig = Assertable & {
     mqtt: MQTTConfig;
     info: InfoConfig;
     disableLogging: boolean;
 };
-export type StatusActiveConfig = AccessoryConfig & {
+export type BaseAccessoryConfig = MQTTAccessoryConfig & {
+    topicGetBatteryLevel?: string;
+    topicGetBatteryLow?: string;
     topicGetStatusActive?: string;
+    valueBatteryLow?: string;
     valueStatusActive?: string;
 };
-export type LockMechanismConfig = StatusActiveConfig & {
+export type LockMechanismConfig = BaseAccessoryConfig & {
     topicGetCurrentLockState: string;
     topicGetTargetLockState: string;
     topicSetTargetLockState: string;
@@ -44,7 +43,7 @@ export type LockMechanismConfig = StatusActiveConfig & {
     valueLockStateUnsecured: string;
     valueLockStateJammed?: string;
 };
-export type OnOffConfig = StatusActiveConfig & {
+export type OnOffConfig = BaseAccessoryConfig & {
     topicGetOn: string;
     topicSetOn: string;
     valueOn: string;
@@ -64,7 +63,7 @@ export type OutletConfig = OnOffConfig & {
     topicGetOutletInUse?: string;
     valueOutletInUse?: string;
 };
-export type SecuritySystemConfig = StatusActiveConfig & {
+export type SecuritySystemConfig = BaseAccessoryConfig & {
     topicGetCurrentSecurityState: string;
     topicGetTargetSecurityState: string;
     topicSetTargetSecurityState: string;
@@ -79,6 +78,6 @@ export type SecuritySystemConfig = StatusActiveConfig & {
     valueFault?: string;
 };
 export type SwitchConfig = OnOffConfig & {};
-export type TemperatureSensorConfig = StatusActiveConfig & TemperatureConfig & {
+export type TemperatureSensorConfig = BaseAccessoryConfig & TemperatureConfig & {
     topicGetCurrentTemperature: string;
 };

package/dist/tools/validation.d.ts

@@ -1,3 +1,3 @@
 import { Log } from './log.js';
-import { Assertable } from '../model/types.js';
-export declare function assert(log: Log, caller: string, assertable: Assertable, ...keys: (keyof any)[]): boolean;
+export type Assertable = {};
+export declare function assert<A extends Assertable>(log: Log, caller: string, assertable: A, ...keys: (keyof A)[]): boolean;

package/dist/tools/validation.js

@@ -1,10 +1,9 @@
 import { strings } from '../i18n/i18n.js';
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function assert(log, caller, assertable, ...keys) {
     let valid = true;
     for (const key of keys) {
         if (assertable[key] === undefined) {
-            log.error(strings.accessory.missingRequired, caller, key);
+            log.error(strings.accessory.missingRequired, caller, `'${String(key)}'`);
             valid = false;
         }
     }

package/dist/tools/validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/tools/validation.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAI1C,8DAA8D;AAC9D,MAAM,UAAU,MAAM,CAAC,GAAQ,EAAE,MAAc,EAAE,UAAsB,EAAE,GAAG,IAAmB;IAC7F,IAAI,KAAK,GAAG,IAAI,CAAC;IACjB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAK,UAAsC,CAAC,GAAa,CAAC,KAAK,SAAS,EAAE,CAAC;YACzE,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;YAC1D,KAAK,GAAG,KAAK,CAAC;QAChB,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/tools/validation.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAM1C,MAAM,UAAU,MAAM,CAAuB,GAAQ,EAAE,MAAc,EAAE,UAAa,EAAE,GAAG,IAAiB;IACxG,IAAI,KAAK,GAAG,IAAI,CAAC;IACjB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,UAAU,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;YAClC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACzE,KAAK,GAAG,KAAK,CAAC;QAChB,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}

package/package.json

@@ -4,7 +4,7 @@
   "displayName": "Homebridge Easy MQTT",
   "description": "Homebridge plugin for easy control of MQTT devices",
   "type": "module",
-  "version": "1.2.0-beta.2",
+  "version": "1.2.0-beta.4",
   "homepage": "https://github.com/mpatfield/homebridge-easy-mqtt#readme",
   "repository": {
     "type": "git",

package/dist/accessory/abstract/statusActive.d.ts

@@ -1,10 +0,0 @@
-import { PlatformAccessory } from 'homebridge';
-import { MQTTAccessory } from './base.js';
-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> {
-    constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: C, log: Log, className: string);
-    protected addTopicHandlers(): void;
-    private getStatusActive;
-    private onStatusActiveUpdate;
-}

package/dist/accessory/abstract/statusActive.js

@@ -1,29 +0,0 @@
-import { MQTTAccessory } from './base.js';
-import { strings } from '../../i18n/i18n.js';
-import { CharacteristicKey } from '../../model/enums.js';
-export class StatusActiveAccessory extends MQTTAccessory {
-    constructor(Service, Characteristic, accessory, config, log, className) {
-        super(Service, Characteristic, accessory, config, log, className);
-        this.set(CharacteristicKey.StatusActive, true);
-        this.bind(Characteristic.StatusActive, 'topicGetStatusActive', this.getStatusActive.bind(this));
-    }
-    addTopicHandlers() {
-        this.addTopicHandler('topicGetStatusActive', this.onStatusActiveUpdate.bind(this), false);
-    }
-    async getStatusActive() {
-        return this.get(CharacteristicKey.StatusActive);
-    }
-    async onStatusActiveUpdate(topic, value) {
-        const statusActive = value === this.getPrimitiveValue('valueStatusActive');
-        if (!this.onUpdate(CharacteristicKey.StatusActive, statusActive)) {
-            return;
-        }
-        if (statusActive) {
-            this.logIfDesired(strings.accessory.statusActive);
-        }
-        else {
-            this.log.warning(strings.accessory.statusInactive, this.name);
-        }
-    }
-}
-//# sourceMappingURL=statusActive.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"statusActive.js","sourceRoot":"","sources":["../../../src/accessory/abstract/statusActive.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAKzD,MAAM,OAAgB,qBAAyE,SAAQ,aAAgB;IAErH,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAAS,EAAE,GAAQ,EAAE,SAAiB;QACxI,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;QAElE,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QAE/C,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,sBAAsB,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAClG,CAAC;IAES,gBAAgB;QACxB,IAAI,CAAC,eAAe,CAAC,sBAAsB,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;IAC5F,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,OAAO,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,KAAa,EAAE,KAAqB;QAErE,MAAM,YAAY,GAAG,KAAK,KAAK,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;QAC3E,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;YACjE,OAAO;QACT,CAAC;QAED,IAAI,YAAY,EAAE,CAAC;YACjB,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;CACF"}