homebridge-easy-mqtt 1.4.0-beta.1 → 1.4.0-beta.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +10 -2
- package/README.md +170 -25
- package/config.schema.json +985 -38
- package/dist/accessory/abstract/base.js +1 -1
- package/dist/accessory/abstract/base.js.map +1 -1
- package/dist/accessory/abstract/common.d.ts +38 -0
- package/dist/accessory/abstract/common.js +159 -0
- package/dist/accessory/abstract/common.js.map +1 -0
- package/dist/accessory/abstract/helper.js +9 -0
- package/dist/accessory/abstract/helper.js.map +1 -1
- package/dist/accessory/abstract/mqtt.d.ts +7 -25
- package/dist/accessory/abstract/mqtt.js +13 -148
- package/dist/accessory/abstract/mqtt.js.map +1 -1
- package/dist/accessory/addons/addon.d.ts +12 -0
- package/dist/accessory/addons/addon.js +25 -0
- package/dist/accessory/addons/addon.js.map +1 -0
- package/dist/accessory/addons/filter.d.ts +11 -0
- package/dist/accessory/addons/filter.js +36 -0
- package/dist/accessory/addons/filter.js.map +1 -0
- package/dist/accessory/climate/active.d.ts +11 -0
- package/dist/accessory/climate/active.js +44 -0
- package/dist/accessory/climate/active.js.map +1 -0
- package/dist/accessory/climate/heaterCooler.d.ts +2 -6
- package/dist/accessory/climate/heaterCooler.js +5 -37
- package/dist/accessory/climate/heaterCooler.js.map +1 -1
- package/dist/accessory/climate/purifier.d.ts +19 -0
- package/dist/accessory/climate/purifier.js +114 -0
- package/dist/accessory/climate/purifier.js.map +1 -0
- package/dist/accessory/climate/{climate.d.ts → temperatureControl.d.ts} +3 -2
- package/dist/accessory/climate/{climate.js → temperatureControl.js} +7 -5
- package/dist/accessory/climate/temperatureControl.js.map +1 -0
- package/dist/accessory/climate/thermostat.d.ts +2 -2
- package/dist/accessory/climate/thermostat.js +5 -2
- package/dist/accessory/climate/thermostat.js.map +1 -1
- package/dist/accessory/sensor/light.d.ts +9 -0
- package/dist/accessory/sensor/light.js +13 -0
- package/dist/accessory/sensor/light.js.map +1 -0
- package/dist/accessory/sensor/sensor.js +2 -2
- package/dist/accessory/sensor/sensor.js.map +1 -1
- package/dist/accessory/valve.d.ts +14 -0
- package/dist/accessory/valve.js +71 -0
- package/dist/accessory/valve.js.map +1 -0
- package/dist/homebridge/platform.js +1 -1
- package/dist/homebridge/platform.js.map +1 -1
- package/dist/homebridge-ui/public/index.html +1 -1
- package/dist/homebridge-ui/public/ui.js +1 -1
- package/dist/i18n/en.d.ts +72 -0
- package/dist/i18n/en.js +72 -0
- package/dist/i18n/en.js.map +1 -1
- package/dist/i18n/fr.d.ts +72 -0
- package/dist/i18n/i18n.d.ts +74 -1
- package/dist/i18n/i18n.js +6 -0
- package/dist/i18n/i18n.js.map +1 -1
- package/dist/i18n/ro.d.ts +758 -0
- package/dist/i18n/ro.js +381 -0
- package/dist/i18n/ro.js.map +1 -0
- package/dist/i18n/template.d.ts +72 -0
- package/dist/model/enums.d.ts +25 -2
- package/dist/model/enums.js +25 -0
- package/dist/model/enums.js.map +1 -1
- package/dist/model/mqtt.d.ts +5 -4
- package/dist/model/mqtt.js +38 -22
- package/dist/model/mqtt.js.map +1 -1
- package/dist/model/types.d.ts +69 -23
- package/package.json +1 -1
- package/dist/accessory/climate/climate.js.map +0 -1
|
@@ -21,7 +21,7 @@ export class BaseAccessory extends MQTTAccessory {
|
|
|
21
21
|
this.setupCharacteristic(CharacteristicKey.StatusActive, true, 'topicGetStatusActive', this.onStatusActiveUpdate.bind(this), false);
|
|
22
22
|
}
|
|
23
23
|
async onBatteryLowUpdate(topic, value) {
|
|
24
|
-
const batteryLow = value === this.getPrimitiveValue('valueBatteryLow');
|
|
24
|
+
const batteryLow = value === this.getPrimitiveValue('valueBatteryLow') ? 1 : 0;
|
|
25
25
|
if (!this.onUpdate(CharacteristicKey.StatusLowBattery, batteryLow)) {
|
|
26
26
|
return;
|
|
27
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/accessory/abstract/base.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGzD,OAAO,EAAO,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,UAAU,MAAM,wBAAwB,CAAC;AAEhD,MAAM,OAAgB,aAAmE,SAAQ,aAAgB;IAE/G,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAAS,EAAE,GAAQ,EAAE,SAAkB;QACzI,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;QAElE,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,oBAAoB,CAAE;iBAChD,iBAAiB,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;iBACxD,iBAAiB,CAAC,cAAc,CAAC,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;iBAClE,iBAAiB,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,aAAa,CAAC;iBACzF,iBAAiB,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;iBAC9E,iBAAiB,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;iBAC1F,iBAAiB,CAAC,cAAc,CAAC,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,UAAU,EAAE,CAAC,CAAC;QAC3F,CAAC;QAED,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,YAAY,EAAE,GAAG,EAC1D,sBAAsB,EAAE,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,YAAY,EAAE,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,KAAK,CAAC,CAAC;QAE3H,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,cAAc,CAAC,gBAAgB,CAAC,oBAAoB,EAC/G,oBAAoB,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;QAEnE,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,YAAY,EAAE,IAAI,EAC3D,sBAAsB,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;IACzE,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,KAAa,EAAE,KAAqB;QAEnE,MAAM,UAAU,GAAG,KAAK,KAAK,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/accessory/abstract/base.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGzD,OAAO,EAAO,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,UAAU,MAAM,wBAAwB,CAAC;AAEhD,MAAM,OAAgB,aAAmE,SAAQ,aAAgB;IAE/G,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAAS,EAAE,GAAQ,EAAE,SAAkB;QACzI,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;QAElE,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,oBAAoB,CAAE;iBAChD,iBAAiB,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;iBACxD,iBAAiB,CAAC,cAAc,CAAC,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;iBAClE,iBAAiB,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,aAAa,CAAC;iBACzF,iBAAiB,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;iBAC9E,iBAAiB,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;iBAC1F,iBAAiB,CAAC,cAAc,CAAC,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,UAAU,EAAE,CAAC,CAAC;QAC3F,CAAC;QAED,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,YAAY,EAAE,GAAG,EAC1D,sBAAsB,EAAE,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,YAAY,EAAE,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,KAAK,CAAC,CAAC;QAE3H,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,cAAc,CAAC,gBAAgB,CAAC,oBAAoB,EAC/G,oBAAoB,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;QAEnE,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,YAAY,EAAE,IAAI,EAC3D,sBAAsB,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;IACzE,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,KAAa,EAAE,KAAqB;QAEnE,MAAM,UAAU,GAAG,KAAK,KAAK,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/E,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAAE,CAAC;YACnE,OAAO;QACT,CAAC;QAED,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACnE,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QACrD,CAAC;IACH,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,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;CACF"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { Characteristic, CharacteristicSetHandler, CharacteristicValue, PrimitiveTypes, Service } from 'homebridge';
|
|
2
|
+
import { CharacteristicKey } from '../../model/enums.js';
|
|
3
|
+
import { CharacteristicType, TemperatureConfig } from '../../model/types.js';
|
|
4
|
+
import { Log, LogType } from '../../tools/log.js';
|
|
5
|
+
import { Assertable } from '../../tools/validation.js';
|
|
6
|
+
type OnUpdateHandler = (topic: string, value: PrimitiveTypes) => (Promise<void>);
|
|
7
|
+
export type TopicHandler = {
|
|
8
|
+
topic: string;
|
|
9
|
+
handler: OnUpdateHandler;
|
|
10
|
+
};
|
|
11
|
+
export type PublishHandler = (topic: string, value: PrimitiveTypes) => void;
|
|
12
|
+
export declare abstract class Common<C extends Assertable> {
|
|
13
|
+
protected readonly Characteristic: CharacteristicType;
|
|
14
|
+
protected readonly log: Log;
|
|
15
|
+
private readonly disableLogging;
|
|
16
|
+
protected readonly config: C;
|
|
17
|
+
protected readonly name: string;
|
|
18
|
+
private readonly publishHandler;
|
|
19
|
+
protected readonly properties: Map<string, CharacteristicValue>;
|
|
20
|
+
readonly topicHandlers: TopicHandler[];
|
|
21
|
+
constructor(Characteristic: CharacteristicType, log: Log, disableLogging: boolean, config: C, name: string, publishHandler: PublishHandler);
|
|
22
|
+
protected abstract get service(): Service;
|
|
23
|
+
protected assert(...keys: (keyof C)[]): boolean;
|
|
24
|
+
protected getRawValue(property: keyof C, assert?: boolean): string | undefined;
|
|
25
|
+
protected getPrimitiveValue(property: keyof C, assert?: boolean): PrimitiveTypes | undefined;
|
|
26
|
+
protected addTopicHandlers(topicHandlers: TopicHandler[]): void;
|
|
27
|
+
protected setupCharacteristic(characteristicKey: CharacteristicKey, defaultValue: CharacteristicValue, getTopicKey: keyof C, onUpdateHandler: OnUpdateHandler, assertGetTopic?: boolean, setTopicKey?: keyof C | undefined, onSetHandler?: CharacteristicSetHandler | undefined): Characteristic | undefined;
|
|
28
|
+
protected setupCharacteristicOnGet(characteristicKey: CharacteristicKey, defaultValue: CharacteristicValue, getTopicKey: keyof C, onUpdateHandler: OnUpdateHandler, assertGetTopic?: boolean): Characteristic | undefined;
|
|
29
|
+
protected setupCharacteristicOnSet(characteristicKey: CharacteristicKey, setTopicKey?: keyof C | undefined, onSetHandler?: CharacteristicSetHandler | undefined): void;
|
|
30
|
+
protected bindOnUpdateNumeric(charKey: CharacteristicKey, logTemplate: string): OnUpdateHandler;
|
|
31
|
+
protected bindOnUpdateNumericBoolean(charKey: CharacteristicKey, valueKey: keyof C, logTrue: string, logFalse: string): OnUpdateHandler;
|
|
32
|
+
protected bindTemperatureUpdate<C extends TemperatureConfig>(config: C, charKey: CharacteristicKey, logTemplate: string): OnUpdateHandler;
|
|
33
|
+
protected onUpdate(key: CharacteristicKey, value: CharacteristicValue, logString?: string | undefined): boolean;
|
|
34
|
+
protected onSet(key: CharacteristicKey, value: CharacteristicValue, publish: PrimitiveTypes, topic: keyof C, logString: string | undefined): void;
|
|
35
|
+
protected logIfDesired(message: string, ...parameters: string[]): void;
|
|
36
|
+
protected logIfDesired(level: LogType, message: string, ...parameters: string[]): void;
|
|
37
|
+
}
|
|
38
|
+
export {};
|
|
@@ -0,0 +1,159 @@
|
|
|
1
|
+
import { strings } from '../../i18n/i18n.js';
|
|
2
|
+
import { TemperatureUnits } from '../../model/enums.js';
|
|
3
|
+
import { LogType } from '../../tools/log.js';
|
|
4
|
+
import { toNumber, toPrimitive } from '../../tools/primitive.js';
|
|
5
|
+
import { assert } from '../../tools/validation.js';
|
|
6
|
+
import { toCelsius } from '../../tools/temperature.js';
|
|
7
|
+
export class Common {
|
|
8
|
+
Characteristic;
|
|
9
|
+
log;
|
|
10
|
+
disableLogging;
|
|
11
|
+
config;
|
|
12
|
+
name;
|
|
13
|
+
publishHandler;
|
|
14
|
+
properties = new Map();
|
|
15
|
+
topicHandlers = [];
|
|
16
|
+
constructor(Characteristic, log, disableLogging, config, name, publishHandler) {
|
|
17
|
+
this.Characteristic = Characteristic;
|
|
18
|
+
this.log = log;
|
|
19
|
+
this.disableLogging = disableLogging;
|
|
20
|
+
this.config = config;
|
|
21
|
+
this.name = name;
|
|
22
|
+
this.publishHandler = publishHandler;
|
|
23
|
+
}
|
|
24
|
+
assert(...keys) {
|
|
25
|
+
return assert(this.log, this.name, this.config, ...keys);
|
|
26
|
+
}
|
|
27
|
+
getRawValue(property, assert = true) {
|
|
28
|
+
if (!property.toString().startsWith('value')) {
|
|
29
|
+
throw new Error(`Trying to fetch value with unexpected property name '${property.toString()}'`);
|
|
30
|
+
}
|
|
31
|
+
if (assert && !this.assert(property)) {
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
return this.config[property];
|
|
35
|
+
}
|
|
36
|
+
getPrimitiveValue(property, assert = true) {
|
|
37
|
+
const stringValue = this.getRawValue(property, assert);
|
|
38
|
+
return stringValue ? toPrimitive(stringValue) : undefined;
|
|
39
|
+
}
|
|
40
|
+
addTopicHandlers(topicHandlers) {
|
|
41
|
+
this.topicHandlers.push(...topicHandlers);
|
|
42
|
+
}
|
|
43
|
+
setupCharacteristic(characteristicKey, defaultValue, getTopicKey, onUpdateHandler, assertGetTopic = false, setTopicKey = undefined, onSetHandler = undefined) {
|
|
44
|
+
const characteristic = this.setupCharacteristicOnGet(characteristicKey, defaultValue, getTopicKey, onUpdateHandler, assertGetTopic);
|
|
45
|
+
if (!characteristic) {
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
this.setupCharacteristicOnSet(characteristicKey, setTopicKey, onSetHandler);
|
|
49
|
+
}
|
|
50
|
+
setupCharacteristicOnGet(characteristicKey, defaultValue, getTopicKey, onUpdateHandler, assertGetTopic = false) {
|
|
51
|
+
if (!getTopicKey.toString().startsWith('topic')) {
|
|
52
|
+
throw new Error(`Trying to fetch topic with unexpected property name '${getTopicKey.toString()}'`);
|
|
53
|
+
}
|
|
54
|
+
if (assertGetTopic) {
|
|
55
|
+
this.assert(getTopicKey);
|
|
56
|
+
}
|
|
57
|
+
if (this.config[getTopicKey] === undefined) {
|
|
58
|
+
for (const characteristic of this.service.characteristics) {
|
|
59
|
+
if (characteristic.UUID === this.Characteristic[characteristicKey].UUID) {
|
|
60
|
+
this.service.removeCharacteristic(characteristic);
|
|
61
|
+
break;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
const characteristic = this.service.getCharacteristic(this.Characteristic[characteristicKey]);
|
|
67
|
+
this.properties.set(characteristicKey, defaultValue);
|
|
68
|
+
characteristic.onGet(async () => {
|
|
69
|
+
return this.properties.get(characteristicKey) ?? null;
|
|
70
|
+
});
|
|
71
|
+
this.topicHandlers.push({ topic: this.config[getTopicKey], handler: onUpdateHandler });
|
|
72
|
+
return characteristic;
|
|
73
|
+
}
|
|
74
|
+
setupCharacteristicOnSet(characteristicKey, setTopicKey = undefined, onSetHandler = undefined) {
|
|
75
|
+
if (setTopicKey === undefined) {
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
if (!setTopicKey.toString().startsWith('topic')) {
|
|
79
|
+
throw new Error(`Trying to fetch topic with unexpected property name '${setTopicKey.toString()}'`);
|
|
80
|
+
}
|
|
81
|
+
if (!onSetHandler) {
|
|
82
|
+
throw new Error(`Missing onSetHandler for topic '${setTopicKey.toString()}'`);
|
|
83
|
+
}
|
|
84
|
+
const characteristic = this.service.getCharacteristic(this.Characteristic[characteristicKey]);
|
|
85
|
+
characteristic.onSet(onSetHandler);
|
|
86
|
+
}
|
|
87
|
+
bindOnUpdateNumeric(charKey, logTemplate) {
|
|
88
|
+
return (async (_topic, value) => {
|
|
89
|
+
if (typeof value !== 'number') {
|
|
90
|
+
this.log.error(strings.characteristic.badValue, this.name, charKey, `'${value.toString()}'`);
|
|
91
|
+
return;
|
|
92
|
+
}
|
|
93
|
+
const logString = logTemplate.replace('%d', value.toString());
|
|
94
|
+
this.onUpdate(charKey, value, logString);
|
|
95
|
+
}).bind(this);
|
|
96
|
+
}
|
|
97
|
+
bindOnUpdateNumericBoolean(charKey, valueKey, logTrue, logFalse) {
|
|
98
|
+
return (async (_topic, value) => {
|
|
99
|
+
const numeric = value === this.getPrimitiveValue(valueKey) ? 1 : 0;
|
|
100
|
+
this.onUpdate(charKey, numeric, numeric ? logTrue : logFalse);
|
|
101
|
+
}).bind(this);
|
|
102
|
+
}
|
|
103
|
+
bindTemperatureUpdate(config, charKey, logTemplate) {
|
|
104
|
+
return (async (_topic, value) => {
|
|
105
|
+
if (typeof value !== 'number') {
|
|
106
|
+
this.log.error(strings.climate.badTemperatureValue, this.name, `'${value}'`);
|
|
107
|
+
return;
|
|
108
|
+
}
|
|
109
|
+
const units = config.temperatureUnits ?? TemperatureUnits.CELSIUS;
|
|
110
|
+
const temperature = toCelsius(toNumber(value), units);
|
|
111
|
+
const logString = logTemplate.replace('%d°%s', `${value}°${units}`);
|
|
112
|
+
this.onUpdate(charKey, temperature, logString);
|
|
113
|
+
}).bind(this);
|
|
114
|
+
}
|
|
115
|
+
onUpdate(key, value, logString = undefined) {
|
|
116
|
+
if (value === this.properties.get(key)) {
|
|
117
|
+
return false;
|
|
118
|
+
}
|
|
119
|
+
this.properties.set(key, value);
|
|
120
|
+
this.service.updateCharacteristic(this.Characteristic[key], value);
|
|
121
|
+
if (logString) {
|
|
122
|
+
this.logIfDesired(logString);
|
|
123
|
+
}
|
|
124
|
+
return true;
|
|
125
|
+
}
|
|
126
|
+
onSet(key, value, publish, topic, logString) {
|
|
127
|
+
if (!this.assert(topic)) {
|
|
128
|
+
return;
|
|
129
|
+
}
|
|
130
|
+
if (logString && value !== this.properties.get(key)) {
|
|
131
|
+
this.logIfDesired(logString);
|
|
132
|
+
}
|
|
133
|
+
this.properties.set(key, value);
|
|
134
|
+
this.service.updateCharacteristic(this.Characteristic[key], value);
|
|
135
|
+
this.publishHandler(this.config[topic], publish);
|
|
136
|
+
}
|
|
137
|
+
logIfDesired(levelOrMessage, ...rest) {
|
|
138
|
+
if (this.disableLogging) {
|
|
139
|
+
return;
|
|
140
|
+
}
|
|
141
|
+
if (typeof levelOrMessage === 'string') {
|
|
142
|
+
this.log.always(levelOrMessage, this.name, ...rest);
|
|
143
|
+
return;
|
|
144
|
+
}
|
|
145
|
+
const [message, ...parameters] = rest;
|
|
146
|
+
switch (levelOrMessage) {
|
|
147
|
+
case LogType.WARNING:
|
|
148
|
+
this.log.warning(message, this.name, ...parameters);
|
|
149
|
+
break;
|
|
150
|
+
case LogType.ERROR:
|
|
151
|
+
this.log.error(message, this.name, ...parameters);
|
|
152
|
+
break;
|
|
153
|
+
default:
|
|
154
|
+
this.log.always(message, this.name, ...parameters);
|
|
155
|
+
break;
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
//# sourceMappingURL=common.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/accessory/abstract/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { AccessoryType } from '../../model/enums.js';
|
|
|
3
3
|
import { LockMechanismAccessory } from '../lock.js';
|
|
4
4
|
import { SecuritySystemAccessory } from '../security.js';
|
|
5
5
|
import { HeaterCoolerAccessory } from '../climate/heaterCooler.js';
|
|
6
|
+
import { PurifierAccessory } from '../climate/purifier.js';
|
|
6
7
|
import { ThermostatAccessory } from '../climate/thermostat.js';
|
|
7
8
|
import { LightbulbAccessory } from '../onoff/lightbulb.js';
|
|
8
9
|
import { OutletAccessory } from '../onoff/outlet.js';
|
|
@@ -12,10 +13,12 @@ import { COSensorAccessory } from '../sensor/carbonMonoxide.js';
|
|
|
12
13
|
import { ContactSensorAccessory } from '../sensor/contact.js';
|
|
13
14
|
import { HumiditySensorAccessory } from '../sensor/humidity.js';
|
|
14
15
|
import { LeakSensorAccessory } from '../sensor/leak.js';
|
|
16
|
+
import { LightSensorAccessory } from '../sensor/light.js';
|
|
15
17
|
import { MotionSensorAccessory } from '../sensor/motion.js';
|
|
16
18
|
import { OccupancySensorAccessory } from '../sensor/occupancy.js';
|
|
17
19
|
import { SmokeSensorAccessory } from '../sensor/smoke.js';
|
|
18
20
|
import { TemperatureSensorAccessory } from '../sensor/temperature.js';
|
|
21
|
+
import { ValveAccessory } from '../valve.js';
|
|
19
22
|
export function createAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped = false) {
|
|
20
23
|
switch (accessoryConfig.info.type) {
|
|
21
24
|
case AccessoryType.CarbonDioxideSensor:
|
|
@@ -26,12 +29,16 @@ export function createAccessory(Service, Characteristic, platformAccessory, acce
|
|
|
26
29
|
return new ContactSensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
|
|
27
30
|
case AccessoryType.HeaterCooler:
|
|
28
31
|
return new HeaterCoolerAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
|
|
32
|
+
case AccessoryType.AirPurifier:
|
|
33
|
+
return new PurifierAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
|
|
29
34
|
case AccessoryType.HumiditySensor:
|
|
30
35
|
return new HumiditySensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
|
|
31
36
|
case AccessoryType.LeakSensor:
|
|
32
37
|
return new LeakSensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
|
|
33
38
|
case AccessoryType.Lightbulb:
|
|
34
39
|
return new LightbulbAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
|
|
40
|
+
case AccessoryType.LightSensor:
|
|
41
|
+
return new LightSensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
|
|
35
42
|
case AccessoryType.LockMechanism:
|
|
36
43
|
return new LockMechanismAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
|
|
37
44
|
case AccessoryType.MotionSensor:
|
|
@@ -50,6 +57,8 @@ export function createAccessory(Service, Characteristic, platformAccessory, acce
|
|
|
50
57
|
return new TemperatureSensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
|
|
51
58
|
case AccessoryType.Thermostat:
|
|
52
59
|
return new ThermostatAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
|
|
60
|
+
case AccessoryType.Valve:
|
|
61
|
+
return new ValveAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
|
|
53
62
|
}
|
|
54
63
|
log.error(strings.startup.unsupportedType, accessoryConfig.info.type);
|
|
55
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/accessory/abstract/helper.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAGrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAEzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/accessory/abstract/helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,35 +1,17 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { CharacteristicValue, PlatformAccessory, PrimitiveTypes, Service } from 'homebridge';
|
|
2
|
+
import { Common } from './common.js';
|
|
2
3
|
import { AccessoryType, CharacteristicKey } from '../../model/enums.js';
|
|
3
|
-
import { CharacteristicType, MQTTAccessoryConfig, ServiceType
|
|
4
|
-
import { Log
|
|
5
|
-
|
|
6
|
-
export declare abstract class MQTTAccessory<C extends MQTTAccessoryConfig> {
|
|
7
|
-
protected readonly Characteristic: CharacteristicType;
|
|
8
|
-
protected readonly config: C;
|
|
9
|
-
protected readonly log: Log;
|
|
4
|
+
import { CharacteristicType, MQTTAccessoryConfig, ServiceType } from '../../model/types.js';
|
|
5
|
+
import { Log } from '../../tools/log.js';
|
|
6
|
+
export declare abstract class MQTTAccessory<C extends MQTTAccessoryConfig> extends Common<C> {
|
|
10
7
|
private readonly mqttClient;
|
|
11
|
-
|
|
12
|
-
private readonly topicHandlers;
|
|
13
|
-
private readonly accessoryService;
|
|
8
|
+
protected readonly accessoryService: Service;
|
|
14
9
|
constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: C, log: Log, isGrouped: boolean);
|
|
15
10
|
protected abstract getAccessoryType(): AccessoryType;
|
|
16
|
-
protected get
|
|
11
|
+
protected get service(): Service;
|
|
17
12
|
get subtype(): string | undefined;
|
|
18
13
|
private setupCustomCharacteristics;
|
|
19
|
-
protected setupCharacteristic(characteristicKey: CharacteristicKey, defaultValue: CharacteristicValue, getTopicKey: keyof C, onUpdateHandler: OnUpdateHandler, assertGetTopic: boolean, setTopicKey?: keyof C | undefined, onSetHandler?: CharacteristicSetHandler | undefined): Characteristic | undefined;
|
|
20
|
-
protected bindOnUpdateNumeric(charKey: CharacteristicKey, logTemplate: string): OnUpdateHandler;
|
|
21
|
-
protected bindOnUpdateNumericBoolean(charKey: CharacteristicKey, valueKey: keyof C, logTrue: string, logFalse: string): OnUpdateHandler;
|
|
22
|
-
protected bindTemperatureUpdate<C extends TemperatureConfig>(config: C, charKey: CharacteristicKey, logTemplate: string): OnUpdateHandler;
|
|
23
|
-
protected addTopicHandler(topic: string, handler: (topic: string, value: PrimitiveTypes) => Promise<void>): void;
|
|
24
|
-
protected getRawValue(property: keyof C, assert?: boolean): string | undefined;
|
|
25
|
-
protected getPrimitiveValue(property: keyof C, assert?: boolean): PrimitiveTypes | undefined;
|
|
26
14
|
protected publish(topic: string, value: PrimitiveTypes): void;
|
|
27
15
|
teardown(): void;
|
|
28
|
-
protected assert(...keys: (keyof C)[]): boolean;
|
|
29
16
|
protected setCharacteristicValue(key: CharacteristicKey, value: CharacteristicValue): void;
|
|
30
|
-
protected onUpdate(key: CharacteristicKey, value: CharacteristicValue, logString?: string | undefined): boolean;
|
|
31
|
-
protected onSet(key: CharacteristicKey, value: CharacteristicValue, publish: PrimitiveTypes, topic: keyof C, logString: string | undefined): void;
|
|
32
|
-
protected logIfDesired(message: string, ...parameters: string[]): void;
|
|
33
|
-
protected logIfDesired(level: LogType, message: string, ...parameters: string[]): void;
|
|
34
17
|
}
|
|
35
|
-
export {};
|
|
@@ -1,31 +1,19 @@
|
|
|
1
|
+
import { Common } from './common.js';
|
|
1
2
|
import { CustomCharacteristic } from './customCharacteristic.js';
|
|
2
|
-
import {
|
|
3
|
-
import { AccessoryType, CharacteristicKey, TemperatureUnits } from '../../model/enums.js';
|
|
3
|
+
import { AccessoryType, CharacteristicKey } from '../../model/enums.js';
|
|
4
4
|
import { MQTT } from '../../model/mqtt.js';
|
|
5
|
-
|
|
6
|
-
import { toNumber, toPrimitive } from '../../tools/primitive.js';
|
|
7
|
-
import { toCelsius } from '../../tools/temperature.js';
|
|
8
|
-
import { assert } from '../../tools/validation.js';
|
|
9
|
-
export class MQTTAccessory {
|
|
10
|
-
Characteristic;
|
|
11
|
-
config;
|
|
12
|
-
log;
|
|
5
|
+
export class MQTTAccessory extends Common {
|
|
13
6
|
mqttClient;
|
|
14
|
-
properties = new Map();
|
|
15
|
-
topicHandlers = [];
|
|
16
7
|
accessoryService;
|
|
17
8
|
constructor(Service, Characteristic, accessory, config, log, isGrouped) {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
this.topicHandlers.forEach(topicHandler => {
|
|
25
|
-
client.subscribe(topicHandler.topic, topicHandler.handler);
|
|
26
|
-
});
|
|
9
|
+
super(Characteristic, log, config.disableLogging, config, config.info.name, (topic, value) => {
|
|
10
|
+
this.mqttClient?.publish(topic, value);
|
|
11
|
+
});
|
|
12
|
+
this.mqttClient = MQTT.connect(log, config.mqtt, this.name, (client) => {
|
|
13
|
+
this.topicHandlers.forEach(topicHandler => {
|
|
14
|
+
client.subscribe(topicHandler.topic, topicHandler.handler);
|
|
27
15
|
});
|
|
28
|
-
}
|
|
16
|
+
});
|
|
29
17
|
const serviceInstance = Service[this.getAccessoryType()];
|
|
30
18
|
if (isGrouped) {
|
|
31
19
|
let accessoryService = accessory.getServiceById(serviceInstance, config.info.id);
|
|
@@ -45,8 +33,8 @@ export class MQTTAccessory {
|
|
|
45
33
|
}
|
|
46
34
|
this.setupCustomCharacteristics();
|
|
47
35
|
}
|
|
48
|
-
get
|
|
49
|
-
return this.
|
|
36
|
+
get service() {
|
|
37
|
+
return this.accessoryService;
|
|
50
38
|
}
|
|
51
39
|
get subtype() {
|
|
52
40
|
return this.accessoryService.subtype;
|
|
@@ -64,86 +52,9 @@ export class MQTTAccessory {
|
|
|
64
52
|
for (const config of this.config.customCharacteristics) {
|
|
65
53
|
const customChar = CustomCharacteristic.create(this.accessoryService, this.Characteristic, config, this.name, this.log, this.config.disableLogging);
|
|
66
54
|
if (customChar !== undefined) {
|
|
67
|
-
this.
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
setupCharacteristic(characteristicKey, defaultValue, getTopicKey, onUpdateHandler, assertGetTopic, setTopicKey = undefined, onSetHandler = undefined) {
|
|
72
|
-
if (!getTopicKey.toString().startsWith('topic')) {
|
|
73
|
-
throw new Error(`Trying to fetch topic with unexpected property name '${getTopicKey.toString()}'`);
|
|
74
|
-
}
|
|
75
|
-
if (assertGetTopic) {
|
|
76
|
-
this.assert(getTopicKey);
|
|
77
|
-
}
|
|
78
|
-
if (this.config[getTopicKey] === undefined) {
|
|
79
|
-
for (const characteristic of this.accessoryService.characteristics) {
|
|
80
|
-
if (characteristic.UUID === this.Characteristic[characteristicKey].UUID) {
|
|
81
|
-
this.accessoryService.removeCharacteristic(characteristic);
|
|
82
|
-
break;
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
return;
|
|
86
|
-
}
|
|
87
|
-
const characteristic = this.accessoryService.getCharacteristic(this.Characteristic[characteristicKey]);
|
|
88
|
-
this.properties.set(characteristicKey, defaultValue);
|
|
89
|
-
characteristic.onGet(async () => {
|
|
90
|
-
return this.properties.get(characteristicKey) ?? null;
|
|
91
|
-
});
|
|
92
|
-
this.addTopicHandler(this.config[getTopicKey], onUpdateHandler);
|
|
93
|
-
if (setTopicKey !== undefined) {
|
|
94
|
-
if (!setTopicKey.toString().startsWith('topic')) {
|
|
95
|
-
throw new Error(`Trying to fetch topic with unexpected property name '${setTopicKey.toString()}'`);
|
|
96
|
-
}
|
|
97
|
-
if (!onSetHandler) {
|
|
98
|
-
throw new Error(`Missing onSetHandler for topic '${setTopicKey.toString()}'`);
|
|
99
|
-
}
|
|
100
|
-
characteristic.onSet(onSetHandler);
|
|
101
|
-
}
|
|
102
|
-
return characteristic;
|
|
103
|
-
}
|
|
104
|
-
bindOnUpdateNumeric(charKey, logTemplate) {
|
|
105
|
-
return (async (_topic, value) => {
|
|
106
|
-
if (typeof value !== 'number') {
|
|
107
|
-
this.log.error(strings.characteristic.badValue, this.name, charKey, `'${value.toString()}'`);
|
|
108
|
-
return;
|
|
109
|
-
}
|
|
110
|
-
const logString = logTemplate.replace('%d', value.toString());
|
|
111
|
-
this.onUpdate(charKey, value, logString);
|
|
112
|
-
}).bind(this);
|
|
113
|
-
}
|
|
114
|
-
bindOnUpdateNumericBoolean(charKey, valueKey, logTrue, logFalse) {
|
|
115
|
-
return (async (_topic, value) => {
|
|
116
|
-
const numeric = value === this.getPrimitiveValue(valueKey) ? 1 : 0;
|
|
117
|
-
this.onUpdate(charKey, numeric, numeric ? logTrue : logFalse);
|
|
118
|
-
}).bind(this);
|
|
119
|
-
}
|
|
120
|
-
bindTemperatureUpdate(config, charKey, logTemplate) {
|
|
121
|
-
return (async (_topic, value) => {
|
|
122
|
-
if (typeof value !== 'number') {
|
|
123
|
-
this.log.error(strings.climate.badTemperatureValue, this.name, `'${value}'`);
|
|
124
|
-
return;
|
|
55
|
+
this.topicHandlers.push({ topic: customChar.topic, handler: customChar.onUpdateHandler });
|
|
125
56
|
}
|
|
126
|
-
const units = config.temperatureUnits ?? TemperatureUnits.CELSIUS;
|
|
127
|
-
const temperature = toCelsius(toNumber(value), units);
|
|
128
|
-
const logString = logTemplate.replace('%d°%s', `${value}°${units}`);
|
|
129
|
-
this.onUpdate(charKey, temperature, logString);
|
|
130
|
-
}).bind(this);
|
|
131
|
-
}
|
|
132
|
-
addTopicHandler(topic, handler) {
|
|
133
|
-
this.topicHandlers.push({ topic: topic, handler: handler });
|
|
134
|
-
}
|
|
135
|
-
getRawValue(property, assert = true) {
|
|
136
|
-
if (!property.toString().startsWith('value')) {
|
|
137
|
-
throw new Error(`Trying to fetch value with unexpected property name '${property.toString()}'`);
|
|
138
57
|
}
|
|
139
|
-
if (assert && !this.assert(property)) {
|
|
140
|
-
return;
|
|
141
|
-
}
|
|
142
|
-
return this.config[property];
|
|
143
|
-
}
|
|
144
|
-
getPrimitiveValue(property, assert = true) {
|
|
145
|
-
const stringValue = this.getRawValue(property, assert);
|
|
146
|
-
return stringValue ? toPrimitive(stringValue) : undefined;
|
|
147
58
|
}
|
|
148
59
|
publish(topic, value) {
|
|
149
60
|
this.mqttClient?.publish(topic, value);
|
|
@@ -151,56 +62,10 @@ export class MQTTAccessory {
|
|
|
151
62
|
teardown() {
|
|
152
63
|
this.mqttClient?.teardown();
|
|
153
64
|
}
|
|
154
|
-
assert(...keys) {
|
|
155
|
-
return assert(this.log, this.name, this.config, ...keys);
|
|
156
|
-
}
|
|
157
65
|
setCharacteristicValue(key, value) {
|
|
158
66
|
this.accessoryService.getCharacteristic(this.Characteristic[key]).onGet(() => {
|
|
159
67
|
return value;
|
|
160
68
|
});
|
|
161
69
|
}
|
|
162
|
-
onUpdate(key, value, logString = undefined) {
|
|
163
|
-
if (value === this.properties.get(key)) {
|
|
164
|
-
return false;
|
|
165
|
-
}
|
|
166
|
-
this.properties.set(key, value);
|
|
167
|
-
this.accessoryService.updateCharacteristic(this.Characteristic[key], value);
|
|
168
|
-
if (logString) {
|
|
169
|
-
this.logIfDesired(logString);
|
|
170
|
-
}
|
|
171
|
-
return true;
|
|
172
|
-
}
|
|
173
|
-
onSet(key, value, publish, topic, logString) {
|
|
174
|
-
if (!this.assert(topic)) {
|
|
175
|
-
return;
|
|
176
|
-
}
|
|
177
|
-
if (logString && value !== this.properties.get(key)) {
|
|
178
|
-
this.logIfDesired(logString);
|
|
179
|
-
}
|
|
180
|
-
this.properties.set(key, value);
|
|
181
|
-
this.accessoryService.updateCharacteristic(this.Characteristic[key], value);
|
|
182
|
-
this.publish(this.config[topic], publish);
|
|
183
|
-
}
|
|
184
|
-
logIfDesired(levelOrMessage, ...rest) {
|
|
185
|
-
if (this.config.disableLogging) {
|
|
186
|
-
return;
|
|
187
|
-
}
|
|
188
|
-
if (typeof levelOrMessage === 'string') {
|
|
189
|
-
this.log.always(levelOrMessage, this.name, ...rest);
|
|
190
|
-
return;
|
|
191
|
-
}
|
|
192
|
-
const [message, ...parameters] = rest;
|
|
193
|
-
switch (levelOrMessage) {
|
|
194
|
-
case LogType.WARNING:
|
|
195
|
-
this.log.warning(message, this.name, ...parameters);
|
|
196
|
-
break;
|
|
197
|
-
case LogType.ERROR:
|
|
198
|
-
this.log.error(message, this.name, ...parameters);
|
|
199
|
-
break;
|
|
200
|
-
default:
|
|
201
|
-
this.log.always(message, this.name, ...parameters);
|
|
202
|
-
break;
|
|
203
|
-
}
|
|
204
|
-
}
|
|
205
70
|
}
|
|
206
71
|
//# sourceMappingURL=mqtt.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mqtt.js","sourceRoot":"","sources":["../../../src/accessory/abstract/mqtt.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"mqtt.js","sourceRoot":"","sources":["../../../src/accessory/abstract/mqtt.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { PlatformAccessory, Service } from 'homebridge';
|
|
2
|
+
import { Common, PublishHandler } from '../abstract/common.js';
|
|
3
|
+
import { AddonType } from '../../model/enums.js';
|
|
4
|
+
import { AddonConfig, CharacteristicType, ServiceType } from '../../model/types.js';
|
|
5
|
+
import { Log } from '../../tools/log.js';
|
|
6
|
+
type AddonConstructor<C extends AddonConfig, A extends Addon<C>> = new (service: Service, Characteristic: CharacteristicType, log: Log, disableLogging: boolean, config: C, name: string, publishHandler: PublishHandler) => A;
|
|
7
|
+
export declare abstract class Addon<C extends AddonConfig> extends Common<C> {
|
|
8
|
+
protected readonly service: Service;
|
|
9
|
+
static new<C extends AddonConfig, A extends Addon<C>>(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, parentService: Service, name: string, config: C, log: Log, disableLogging: boolean, publishHandler: PublishHandler, addonType: AddonType, constructor: AddonConstructor<C, A>, required: (keyof C)[]): A | undefined;
|
|
10
|
+
protected constructor(service: Service, Characteristic: CharacteristicType, log: Log, disableLogging: boolean, config: C, name: string, publishHandler: PublishHandler);
|
|
11
|
+
}
|
|
12
|
+
export {};
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { Common } from '../abstract/common.js';
|
|
2
|
+
import { assert } from '../../tools/validation.js';
|
|
3
|
+
export class Addon extends Common {
|
|
4
|
+
service;
|
|
5
|
+
static new(Service, Characteristic, accessory, parentService, name, config, log, disableLogging, publishHandler, addonType, constructor, required) {
|
|
6
|
+
const addonServiceInstance = Service[addonType];
|
|
7
|
+
const existingAddonService = accessory.getService(addonServiceInstance);
|
|
8
|
+
if (required.filter((key) => config[key] !== undefined).length === 0 || !assert(log, name, config, ...required)) {
|
|
9
|
+
if (existingAddonService !== undefined) {
|
|
10
|
+
accessory.removeService(existingAddonService);
|
|
11
|
+
}
|
|
12
|
+
return;
|
|
13
|
+
}
|
|
14
|
+
const addonService = existingAddonService ?? accessory.addService(addonServiceInstance);
|
|
15
|
+
if (existingAddonService === undefined) {
|
|
16
|
+
parentService.addLinkedService(addonService);
|
|
17
|
+
}
|
|
18
|
+
return new constructor(addonService, Characteristic, log, disableLogging, config, name, publishHandler);
|
|
19
|
+
}
|
|
20
|
+
constructor(service, Characteristic, log, disableLogging, config, name, publishHandler) {
|
|
21
|
+
super(Characteristic, log, disableLogging, config, name, publishHandler);
|
|
22
|
+
this.service = service;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=addon.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"addon.js","sourceRoot":"","sources":["../../../src/accessory/addons/addon.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAkB,MAAM,uBAAuB,CAAC;AAM/D,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAKnD,MAAM,OAAgB,KAA6B,SAAQ,MAAS;IAqC7C;IAnCrB,MAAM,CAAC,GAAG,CACR,OAAoB,EACpB,cAAkC,EAClC,SAA4B,EAC5B,aAAsB,EACtB,IAAY,EACZ,MAAS,EACT,GAAQ,EACR,cAAuB,EACvB,cAA8B,EAC9B,SAAoB,EACpB,WAAmC,EACnC,QAAqB;QAGrB,MAAM,oBAAoB,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;QAChD,MAAM,oBAAoB,GAAG,SAAS,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;QAExE,IAAI,QAAQ,CAAC,MAAM,CAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,SAAS,CAAE,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;YAClH,IAAI,oBAAoB,KAAK,SAAS,EAAE,CAAC;gBACvC,SAAS,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;YAChD,CAAC;YACD,OAAO;QACT,CAAC;QAED,MAAM,YAAY,GAAG,oBAAoB,IAAI,SAAS,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;QAExF,IAAI,oBAAoB,KAAK,SAAS,EAAE,CAAC;YACvC,aAAa,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,IAAI,WAAW,CAAC,YAAY,EAAE,cAAc,EAAE,GAAG,EAAE,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;IAC1G,CAAC;IAED,YACqB,OAAgB,EACnC,cAAkC,EAClC,GAAQ,EACR,cAAuB,EACvB,MAAS,EACT,IAAY,EACZ,cAA8B;QAE9B,KAAK,CAAC,cAAc,EAAE,GAAG,EAAE,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QARtD,YAAO,GAAP,OAAO,CAAS;IASrC,CAAC;CACF"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { PlatformAccessory, Service } from 'homebridge';
|
|
2
|
+
import { Addon } from './addon.js';
|
|
3
|
+
import { PublishHandler, TopicHandler } from '../abstract/common.js';
|
|
4
|
+
import { CharacteristicType, FilterMaintenanceConfig, ServiceType } from '../../model/types.js';
|
|
5
|
+
import { Log } from '../../tools/log.js';
|
|
6
|
+
export declare class FilterMaintenance extends Addon<FilterMaintenanceConfig> {
|
|
7
|
+
static topicHandlers(Service: ServiceType, Characteristic: CharacteristicType, log: Log, disableLogging: boolean, accessory: PlatformAccessory, parentService: Service, config: FilterMaintenanceConfig, name: string, publishHandler: PublishHandler): TopicHandler[];
|
|
8
|
+
constructor(service: Service, Characteristic: CharacteristicType, log: Log, disableLogging: boolean, config: FilterMaintenanceConfig, name: string, publishHandler: PublishHandler);
|
|
9
|
+
private onChangeIndicationUpdate;
|
|
10
|
+
private onResetIndication;
|
|
11
|
+
}
|