homebridge-easy-mqtt 1.4.0-beta.16 → 1.4.0-beta.3
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 +7 -10
- package/README.md +25 -246
- package/config.schema.json +400 -1991
- package/dist/accessory/abstract/base.js +2 -2
- package/dist/accessory/abstract/base.js.map +1 -1
- package/dist/accessory/abstract/helper.d.ts +0 -1
- package/dist/accessory/abstract/helper.js +0 -19
- package/dist/accessory/abstract/helper.js.map +1 -1
- package/dist/accessory/abstract/mqtt.d.ts +26 -15
- package/dist/accessory/abstract/mqtt.js +148 -29
- package/dist/accessory/abstract/mqtt.js.map +1 -1
- package/dist/accessory/climate/{temperatureControl.d.ts → climate.d.ts} +2 -3
- package/dist/accessory/climate/{temperatureControl.js → climate.js} +5 -7
- package/dist/accessory/climate/climate.js.map +1 -0
- package/dist/accessory/climate/heaterCooler.d.ts +6 -2
- package/dist/accessory/climate/heaterCooler.js +37 -5
- package/dist/accessory/climate/heaterCooler.js.map +1 -1
- package/dist/accessory/climate/thermostat.d.ts +2 -2
- package/dist/accessory/climate/thermostat.js +2 -3
- package/dist/accessory/climate/thermostat.js.map +1 -1
- package/dist/accessory/lock.d.ts +2 -2
- package/dist/accessory/lock.js +3 -3
- package/dist/accessory/lock.js.map +1 -1
- package/dist/accessory/sensor/sensor.js +2 -2
- package/dist/accessory/sensor/sensor.js.map +1 -1
- package/dist/homebridge/platform.js +3 -5
- 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 +0 -155
- package/dist/i18n/en.js +1 -156
- package/dist/i18n/en.js.map +1 -1
- package/dist/i18n/fr.d.ts +0 -155
- package/dist/i18n/i18n.d.ts +1 -157
- package/dist/i18n/i18n.js +0 -6
- package/dist/i18n/i18n.js.map +1 -1
- package/dist/i18n/template.d.ts +0 -155
- package/dist/model/enums.d.ts +2 -39
- package/dist/model/enums.js +0 -39
- package/dist/model/enums.js.map +1 -1
- package/dist/model/mqtt.d.ts +4 -5
- package/dist/model/mqtt.js +25 -41
- package/dist/model/mqtt.js.map +1 -1
- package/dist/model/types.d.ts +24 -115
- package/package.json +1 -1
- package/dist/accessory/abstract/common.d.ts +0 -42
- package/dist/accessory/abstract/common.js +0 -158
- package/dist/accessory/abstract/common.js.map +0 -1
- package/dist/accessory/addons/addon.d.ts +0 -24
- package/dist/accessory/addons/addon.js +0 -52
- package/dist/accessory/addons/addon.js.map +0 -1
- package/dist/accessory/addons/filter.d.ts +0 -11
- package/dist/accessory/addons/filter.js +0 -37
- package/dist/accessory/addons/filter.js.map +0 -1
- package/dist/accessory/climate/active.d.ts +0 -11
- package/dist/accessory/climate/active.js +0 -44
- package/dist/accessory/climate/active.js.map +0 -1
- package/dist/accessory/climate/fan2.d.ts +0 -20
- package/dist/accessory/climate/fan2.js +0 -122
- package/dist/accessory/climate/fan2.js.map +0 -1
- package/dist/accessory/climate/purifier.d.ts +0 -19
- package/dist/accessory/climate/purifier.js +0 -114
- package/dist/accessory/climate/purifier.js.map +0 -1
- package/dist/accessory/climate/temperatureControl.js.map +0 -1
- package/dist/accessory/garage.d.ts +0 -17
- package/dist/accessory/garage.js +0 -110
- package/dist/accessory/garage.js.map +0 -1
- package/dist/accessory/sensor/air.d.ts +0 -14
- package/dist/accessory/sensor/air.js +0 -94
- package/dist/accessory/sensor/air.js.map +0 -1
- package/dist/accessory/valve.d.ts +0 -14
- package/dist/accessory/valve.js +0 -71
- package/dist/accessory/valve.js.map +0 -1
- package/dist/i18n/ro.d.ts +0 -846
- package/dist/i18n/ro.js +0 -381
- package/dist/i18n/ro.js.map +0 -1
- package/dist/tools/properties.d.ts +0 -11
- package/dist/tools/properties.js +0 -73
- package/dist/tools/properties.js.map +0 -1
|
@@ -13,7 +13,7 @@ export class BaseAccessory extends MQTTAccessory {
|
|
|
13
13
|
.setCharacteristic(Characteristic.ConfiguredName, config.info.name)
|
|
14
14
|
.setCharacteristic(Characteristic.Manufacturer, config.info.manufacturer ?? PLATFORM_NAME)
|
|
15
15
|
.setCharacteristic(Characteristic.Model, config.info.model ?? config.info.type)
|
|
16
|
-
.setCharacteristic(Characteristic.SerialNumber, config.info.serialNumber ??
|
|
16
|
+
.setCharacteristic(Characteristic.SerialNumber, config.info.serialNumber ?? config.info.id)
|
|
17
17
|
.setCharacteristic(Characteristic.FirmwareRevision, config.info.version ?? getVersion());
|
|
18
18
|
}
|
|
19
19
|
this.setupCharacteristic(CharacteristicKey.BatteryLevel, 100, 'topicGetBatteryLevel', this.bindOnUpdateNumeric(CharacteristicKey.BatteryLevel, strings.accessory.batteryLevel), false);
|
|
@@ -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');
|
|
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,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/accessory/abstract/base.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,5 +2,4 @@ import { PlatformAccessory } from 'homebridge';
|
|
|
2
2
|
import { BaseAccessory } from './base.js';
|
|
3
3
|
import * as Configs from '../../model/types.js';
|
|
4
4
|
import { Log } from '../../tools/log.js';
|
|
5
|
-
export declare function createIdentifier(info: Configs.InfoConfig): string;
|
|
6
5
|
export declare function createAccessory(Service: Configs.ServiceType, Characteristic: Configs.CharacteristicType, platformAccessory: PlatformAccessory, accessoryConfig: Configs.BaseAccessoryConfig, log: Log, isGrouped?: boolean): BaseAccessory | undefined;
|
|
@@ -1,16 +1,12 @@
|
|
|
1
1
|
import { strings } from '../../i18n/i18n.js';
|
|
2
2
|
import { AccessoryType } from '../../model/enums.js';
|
|
3
|
-
import { GarageDoorAccessory } from '../garage.js';
|
|
4
3
|
import { LockMechanismAccessory } from '../lock.js';
|
|
5
4
|
import { SecuritySystemAccessory } from '../security.js';
|
|
6
|
-
import { FanV2Accessory } from '../climate/fan2.js';
|
|
7
5
|
import { HeaterCoolerAccessory } from '../climate/heaterCooler.js';
|
|
8
|
-
import { PurifierAccessory } from '../climate/purifier.js';
|
|
9
6
|
import { ThermostatAccessory } from '../climate/thermostat.js';
|
|
10
7
|
import { LightbulbAccessory } from '../onoff/lightbulb.js';
|
|
11
8
|
import { OutletAccessory } from '../onoff/outlet.js';
|
|
12
9
|
import { SwitchAccessory } from '../onoff/switch.js';
|
|
13
|
-
import { AirSensorAccessory } from '../sensor/air.js';
|
|
14
10
|
import { CO2SensorAccessory } from '../sensor/carbonDioxide.js';
|
|
15
11
|
import { COSensorAccessory } from '../sensor/carbonMonoxide.js';
|
|
16
12
|
import { ContactSensorAccessory } from '../sensor/contact.js';
|
|
@@ -21,27 +17,14 @@ import { MotionSensorAccessory } from '../sensor/motion.js';
|
|
|
21
17
|
import { OccupancySensorAccessory } from '../sensor/occupancy.js';
|
|
22
18
|
import { SmokeSensorAccessory } from '../sensor/smoke.js';
|
|
23
19
|
import { TemperatureSensorAccessory } from '../sensor/temperature.js';
|
|
24
|
-
import { ValveAccessory } from '../valve.js';
|
|
25
|
-
import { PLUGIN_NAME } from '../../homebridge/settings.js';
|
|
26
|
-
export function createIdentifier(info) {
|
|
27
|
-
return info.id ?? `${PLUGIN_NAME}:${info.type}:${info.name}`;
|
|
28
|
-
}
|
|
29
20
|
export function createAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped = false) {
|
|
30
21
|
switch (accessoryConfig.info.type) {
|
|
31
|
-
case AccessoryType.AirPurifier:
|
|
32
|
-
return new PurifierAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
|
|
33
|
-
case AccessoryType.AirQualitySensor:
|
|
34
|
-
return new AirSensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
|
|
35
22
|
case AccessoryType.CarbonDioxideSensor:
|
|
36
23
|
return new CO2SensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
|
|
37
24
|
case AccessoryType.CarbonMonoxideSensor:
|
|
38
25
|
return new COSensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
|
|
39
26
|
case AccessoryType.ContactSensor:
|
|
40
27
|
return new ContactSensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
|
|
41
|
-
case AccessoryType.Fanv2:
|
|
42
|
-
return new FanV2Accessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
|
|
43
|
-
case AccessoryType.GarageDoorOpener:
|
|
44
|
-
return new GarageDoorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
|
|
45
28
|
case AccessoryType.HeaterCooler:
|
|
46
29
|
return new HeaterCoolerAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
|
|
47
30
|
case AccessoryType.HumiditySensor:
|
|
@@ -70,8 +53,6 @@ export function createAccessory(Service, Characteristic, platformAccessory, acce
|
|
|
70
53
|
return new TemperatureSensorAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
|
|
71
54
|
case AccessoryType.Thermostat:
|
|
72
55
|
return new ThermostatAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
|
|
73
|
-
case AccessoryType.Valve:
|
|
74
|
-
return new ValveAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
|
|
75
56
|
}
|
|
76
57
|
log.error(strings.startup.unsupportedType, accessoryConfig.info.type);
|
|
77
58
|
}
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/accessory/abstract/helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,24 +1,35 @@
|
|
|
1
|
-
import { CharacteristicValue, PlatformAccessory, PrimitiveTypes
|
|
2
|
-
import { Common } from './common.js';
|
|
1
|
+
import { Characteristic, CharacteristicSetHandler, CharacteristicValue, PlatformAccessory, PrimitiveTypes } from 'homebridge';
|
|
3
2
|
import { AccessoryType, CharacteristicKey } from '../../model/enums.js';
|
|
4
|
-
import { CharacteristicType, MQTTAccessoryConfig, ServiceType } from '../../model/types.js';
|
|
5
|
-
import { Log } from '../../tools/log.js';
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
readonly
|
|
9
|
-
readonly config: C;
|
|
10
|
-
readonly log: Log;
|
|
3
|
+
import { CharacteristicType, MQTTAccessoryConfig, ServiceType, TemperatureConfig } from '../../model/types.js';
|
|
4
|
+
import { Log, LogType } from '../../tools/log.js';
|
|
5
|
+
type OnUpdateHandler = (topic: string, value: PrimitiveTypes) => (Promise<void>);
|
|
6
|
+
export declare abstract class MQTTAccessory<C extends MQTTAccessoryConfig> {
|
|
7
|
+
protected readonly Characteristic: CharacteristicType;
|
|
8
|
+
protected readonly config: C;
|
|
9
|
+
protected readonly log: Log;
|
|
11
10
|
private readonly mqttClient;
|
|
11
|
+
private readonly properties;
|
|
12
|
+
private readonly topicHandlers;
|
|
12
13
|
private readonly accessoryService;
|
|
13
|
-
constructor(Service: ServiceType, Characteristic: CharacteristicType,
|
|
14
|
+
constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: C, log: Log, isGrouped: boolean);
|
|
14
15
|
protected abstract getAccessoryType(): AccessoryType;
|
|
15
|
-
get
|
|
16
|
-
get identifier(): string;
|
|
17
|
-
get useStoredProperties(): boolean;
|
|
18
|
-
get disableLogging(): boolean;
|
|
16
|
+
protected get name(): string;
|
|
19
17
|
get subtype(): string | undefined;
|
|
20
18
|
private setupCustomCharacteristics;
|
|
21
|
-
|
|
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
|
+
protected publish(topic: string, value: PrimitiveTypes): void;
|
|
22
27
|
teardown(): void;
|
|
28
|
+
protected assert(...keys: (keyof C)[]): boolean;
|
|
23
29
|
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;
|
|
24
34
|
}
|
|
35
|
+
export {};
|
|
@@ -1,56 +1,52 @@
|
|
|
1
|
-
import { Common } from './common.js';
|
|
2
1
|
import { CustomCharacteristic } from './customCharacteristic.js';
|
|
3
|
-
import {
|
|
2
|
+
import { strings } from '../../i18n/i18n.js';
|
|
3
|
+
import { AccessoryType, CharacteristicKey, TemperatureUnits } from '../../model/enums.js';
|
|
4
4
|
import { MQTT } from '../../model/mqtt.js';
|
|
5
|
-
import {
|
|
6
|
-
|
|
5
|
+
import { LogType } from '../../tools/log.js';
|
|
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 {
|
|
7
10
|
Characteristic;
|
|
8
|
-
platformAccessory;
|
|
9
11
|
config;
|
|
10
12
|
log;
|
|
11
13
|
mqttClient;
|
|
14
|
+
properties = new Map();
|
|
15
|
+
topicHandlers = [];
|
|
12
16
|
accessoryService;
|
|
13
|
-
constructor(Service, Characteristic,
|
|
14
|
-
super(config.info.name);
|
|
17
|
+
constructor(Service, Characteristic, accessory, config, log, isGrouped) {
|
|
15
18
|
this.Characteristic = Characteristic;
|
|
16
|
-
this.platformAccessory = platformAccessory;
|
|
17
19
|
this.config = config;
|
|
18
20
|
this.log = log;
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
21
|
+
const name = config.info.name;
|
|
22
|
+
if (this.assert('mqtt')) {
|
|
23
|
+
this.mqttClient = MQTT.connect(log, config.mqtt, name, (client) => {
|
|
24
|
+
this.topicHandlers.forEach(topicHandler => {
|
|
25
|
+
client.subscribe(topicHandler.topic, topicHandler.handler);
|
|
26
|
+
});
|
|
22
27
|
});
|
|
23
|
-
}
|
|
28
|
+
}
|
|
24
29
|
const serviceInstance = Service[this.getAccessoryType()];
|
|
25
30
|
if (isGrouped) {
|
|
26
|
-
let accessoryService =
|
|
31
|
+
let accessoryService = accessory.getServiceById(serviceInstance, config.info.id);
|
|
27
32
|
if (!accessoryService) {
|
|
28
|
-
accessoryService =
|
|
33
|
+
accessoryService = accessory.addService(serviceInstance, config.info.name, config.info.id);
|
|
29
34
|
accessoryService.setCharacteristic(Characteristic.ConfiguredName, config.info.name);
|
|
30
35
|
}
|
|
31
36
|
this.accessoryService = accessoryService;
|
|
32
37
|
return;
|
|
33
38
|
}
|
|
34
|
-
this.accessoryService =
|
|
39
|
+
this.accessoryService = accessory.getService(serviceInstance) || accessory.addService(serviceInstance);
|
|
35
40
|
for (const type of Object.values(AccessoryType)) {
|
|
36
|
-
const existingService =
|
|
41
|
+
const existingService = accessory.getService(Service[type]);
|
|
37
42
|
if (existingService && type !== config.info.type) {
|
|
38
|
-
|
|
43
|
+
accessory.removeService(existingService);
|
|
39
44
|
}
|
|
40
45
|
}
|
|
41
46
|
this.setupCustomCharacteristics();
|
|
42
47
|
}
|
|
43
|
-
get
|
|
44
|
-
return this.
|
|
45
|
-
}
|
|
46
|
-
get identifier() {
|
|
47
|
-
return createIdentifier(this.config.info);
|
|
48
|
-
}
|
|
49
|
-
get useStoredProperties() {
|
|
50
|
-
return this.config.resetOnRestart !== true;
|
|
51
|
-
}
|
|
52
|
-
get disableLogging() {
|
|
53
|
-
return this.config.disableLogging;
|
|
48
|
+
get name() {
|
|
49
|
+
return this.config.info.name;
|
|
54
50
|
}
|
|
55
51
|
get subtype() {
|
|
56
52
|
return this.accessoryService.subtype;
|
|
@@ -68,9 +64,86 @@ export class MQTTAccessory extends Common {
|
|
|
68
64
|
for (const config of this.config.customCharacteristics) {
|
|
69
65
|
const customChar = CustomCharacteristic.create(this.accessoryService, this.Characteristic, config, this.name, this.log, this.config.disableLogging);
|
|
70
66
|
if (customChar !== undefined) {
|
|
71
|
-
this.
|
|
67
|
+
this.addTopicHandler(customChar.topic, customChar.onUpdateHandler);
|
|
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;
|
|
72
125
|
}
|
|
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
|
+
}
|
|
139
|
+
if (assert && !this.assert(property)) {
|
|
140
|
+
return;
|
|
73
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;
|
|
74
147
|
}
|
|
75
148
|
publish(topic, value) {
|
|
76
149
|
this.mqttClient?.publish(topic, value);
|
|
@@ -78,10 +151,56 @@ export class MQTTAccessory extends Common {
|
|
|
78
151
|
teardown() {
|
|
79
152
|
this.mqttClient?.teardown();
|
|
80
153
|
}
|
|
154
|
+
assert(...keys) {
|
|
155
|
+
return assert(this.log, this.name, this.config, ...keys);
|
|
156
|
+
}
|
|
81
157
|
setCharacteristicValue(key, value) {
|
|
82
158
|
this.accessoryService.getCharacteristic(this.Characteristic[key]).onGet(() => {
|
|
83
159
|
return value;
|
|
84
160
|
});
|
|
85
161
|
}
|
|
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
|
+
}
|
|
86
205
|
}
|
|
87
206
|
//# 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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"}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
import { CharacteristicValue, PlatformAccessory } from 'homebridge';
|
|
2
2
|
import { BaseAccessory } from '../abstract/base.js';
|
|
3
3
|
import { TemperatureUnits } from '../../model/enums.js';
|
|
4
|
-
import { CharacteristicType,
|
|
4
|
+
import { CharacteristicType, ClimateControlConfig, ServiceType } from '../../model/types.js';
|
|
5
5
|
import { Log } from '../../tools/log.js';
|
|
6
6
|
export declare const DEFAULT_TEMPERATURE = 10;
|
|
7
|
-
export declare abstract class
|
|
7
|
+
export declare abstract class ClimateControlAccessory<C extends ClimateControlConfig = ClimateControlConfig> extends BaseAccessory<C> {
|
|
8
8
|
constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: C, log: Log, isGrouped: boolean);
|
|
9
|
-
protected setupTemperatureControlCharacteristics(): void;
|
|
10
9
|
protected get temperatureUnits(): TemperatureUnits;
|
|
11
10
|
private bindOnSetThreshold;
|
|
12
11
|
protected temperatureFromCV(value: CharacteristicValue): number;
|
|
@@ -5,15 +5,13 @@ import { fromCelsius } from '../../tools/temperature.js';
|
|
|
5
5
|
export const DEFAULT_TEMPERATURE = 10;
|
|
6
6
|
const DEFAULT_COOLING_THRESHOLD = 25;
|
|
7
7
|
const DEFAULT_HEATING_THRESHOLD = 20;
|
|
8
|
-
export class
|
|
8
|
+
export class ClimateControlAccessory extends BaseAccessory {
|
|
9
9
|
constructor(Service, Characteristic, accessory, config, log, isGrouped) {
|
|
10
10
|
super(Service, Characteristic, accessory, config, log, isGrouped);
|
|
11
|
-
}
|
|
12
|
-
setupTemperatureControlCharacteristics() {
|
|
13
11
|
this.setCharacteristicValue(CharacteristicKey.TemperatureDisplayUnits, this.temperatureUnits === TemperatureUnits.FAHRENHEIT ? 1 : 0);
|
|
14
|
-
this.setupCharacteristic(CharacteristicKey.CurrentTemperature, DEFAULT_TEMPERATURE, 'topicGetCurrentTemperature', this.bindTemperatureUpdate(
|
|
15
|
-
this.setupCharacteristic(CharacteristicKey.CoolingThresholdTemperature, DEFAULT_COOLING_THRESHOLD, 'topicGetCoolingThresholdTemperature', this.bindTemperatureUpdate(
|
|
16
|
-
this.setupCharacteristic(CharacteristicKey.HeatingThresholdTemperature, DEFAULT_HEATING_THRESHOLD, 'topicGetHeatingThresholdTemperature', this.bindTemperatureUpdate(
|
|
12
|
+
this.setupCharacteristic(CharacteristicKey.CurrentTemperature, DEFAULT_TEMPERATURE, 'topicGetCurrentTemperature', this.bindTemperatureUpdate(config, CharacteristicKey.CurrentTemperature, strings.climate.temperatureUpdate), true);
|
|
13
|
+
this.setupCharacteristic(CharacteristicKey.CoolingThresholdTemperature, DEFAULT_COOLING_THRESHOLD, 'topicGetCoolingThresholdTemperature', this.bindTemperatureUpdate(config, CharacteristicKey.CoolingThresholdTemperature, strings.climate.coolingThreshold), false, 'topicSetCoolingThresholdTemperature', this.bindOnSetThreshold(CharacteristicKey.CoolingThresholdTemperature, 'topicSetCoolingThresholdTemperature', strings.climate.coolingThresholdFuture));
|
|
14
|
+
this.setupCharacteristic(CharacteristicKey.HeatingThresholdTemperature, DEFAULT_HEATING_THRESHOLD, 'topicGetHeatingThresholdTemperature', this.bindTemperatureUpdate(config, CharacteristicKey.HeatingThresholdTemperature, strings.climate.heatingThreshold), false, 'topicSetHeatingThresholdTemperature', this.bindOnSetThreshold(CharacteristicKey.HeatingThresholdTemperature, 'topicSetHeatingThresholdTemperature', strings.climate.heatingThresholdFuture));
|
|
17
15
|
}
|
|
18
16
|
get temperatureUnits() {
|
|
19
17
|
return this.config.temperatureUnits ?? TemperatureUnits.CELSIUS;
|
|
@@ -30,4 +28,4 @@ export class TemperatureControlAccessory extends BaseAccessory {
|
|
|
30
28
|
return this.temperatureUnits === TemperatureUnits.FAHRENHEIT ? fromCelsius(celsiusTemperature, this.temperatureUnits) : celsiusTemperature;
|
|
31
29
|
}
|
|
32
30
|
}
|
|
33
|
-
//# sourceMappingURL=
|
|
31
|
+
//# sourceMappingURL=climate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"climate.js","sourceRoot":"","sources":["../../../src/accessory/climate/climate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { PlatformAccessory } from 'homebridge';
|
|
2
|
-
import {
|
|
2
|
+
import { ClimateControlAccessory } from './climate.js';
|
|
3
3
|
import { AccessoryType } from '../../model/enums.js';
|
|
4
4
|
import { CharacteristicType, ServiceType, HeaterCoolerConfig } from '../../model/types.js';
|
|
5
5
|
import { Log } from '../../tools/log.js';
|
|
6
|
-
export declare class HeaterCoolerAccessory extends
|
|
6
|
+
export declare class HeaterCoolerAccessory extends ClimateControlAccessory<HeaterCoolerConfig> {
|
|
7
7
|
private readonly CURRENT_STATE_MAP;
|
|
8
8
|
private readonly TARGET_STATE_MAP;
|
|
9
9
|
constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: HeaterCoolerConfig, log: Log, isGrouped: boolean);
|
|
@@ -11,6 +11,10 @@ export declare class HeaterCoolerAccessory extends ActiveClimateAccessory<Heater
|
|
|
11
11
|
private onCurrentStateUpdate;
|
|
12
12
|
private onTargetStateUpdate;
|
|
13
13
|
private onSetTargetState;
|
|
14
|
+
private onSetActive;
|
|
15
|
+
private onSetLockControls;
|
|
16
|
+
private onSetRotationSpeed;
|
|
17
|
+
private onSetSwingMode;
|
|
14
18
|
private fromCVState;
|
|
15
19
|
private toCurrentCVState;
|
|
16
20
|
private toTargetCVState;
|
|
@@ -1,13 +1,11 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { FilterMaintenance } from '../addons/filter.js';
|
|
1
|
+
import { ClimateControlAccessory } from './climate.js';
|
|
3
2
|
import { strings } from '../../i18n/i18n.js';
|
|
4
3
|
import { AccessoryType, CharacteristicKey } from '../../model/enums.js';
|
|
5
|
-
export class HeaterCoolerAccessory extends
|
|
4
|
+
export class HeaterCoolerAccessory extends ClimateControlAccessory {
|
|
6
5
|
CURRENT_STATE_MAP;
|
|
7
6
|
TARGET_STATE_MAP;
|
|
8
7
|
constructor(Service, Characteristic, accessory, config, log, isGrouped) {
|
|
9
8
|
super(Service, Characteristic, accessory, config, log, isGrouped);
|
|
10
|
-
this.setupTemperatureControlCharacteristics();
|
|
11
9
|
this.CURRENT_STATE_MAP = new Map([
|
|
12
10
|
['valueModeInactive', Characteristic.CurrentHeaterCoolerState.INACTIVE],
|
|
13
11
|
['valueModeIdle', Characteristic.CurrentHeaterCoolerState.IDLE],
|
|
@@ -33,7 +31,10 @@ export class HeaterCoolerAccessory extends ActiveClimateAccessory {
|
|
|
33
31
|
}
|
|
34
32
|
this.setupCharacteristic(CharacteristicKey.TargetHeaterCoolerState, this.TARGET_STATE_MAP.get(validTargetStates[0]), 'topicGetTargetHeaterCoolerState', this.onTargetStateUpdate.bind(this), true, 'topicSetTargetHeaterCoolerState', this.onSetTargetState.bind(this))
|
|
35
33
|
?.setProps({ validValues: validTargetStates.map((key) => this.TARGET_STATE_MAP.get(key)) });
|
|
36
|
-
this.
|
|
34
|
+
this.setupCharacteristic(CharacteristicKey.Active, 0, 'topicGetActive', this.bindOnUpdateNumericBoolean(CharacteristicKey.Active, 'valueStateActive', strings.heaterCooler.active, strings.heaterCooler.notActive), true, 'topicSetActive', this.onSetActive.bind(this));
|
|
35
|
+
this.setupCharacteristic(CharacteristicKey.LockPhysicalControls, Characteristic.LockPhysicalControls.CONTROL_LOCK_DISABLED, 'topicGetLockPhysicalControls', this.bindOnUpdateNumericBoolean(CharacteristicKey.LockPhysicalControls, 'valueControlLock', strings.heaterCooler.controlsLocked, strings.heaterCooler.controlsUnLocked), false, 'topicSetLockPhysicalControls', this.onSetLockControls.bind(this));
|
|
36
|
+
this.setupCharacteristic(CharacteristicKey.RotationSpeed, 0, 'topicGetRotationSpeed', this.bindOnUpdateNumeric(CharacteristicKey.RotationSpeed, strings.heaterCooler.rotationUpdate), false, 'topicSetRotationSpeed', this.onSetRotationSpeed.bind(this));
|
|
37
|
+
this.setupCharacteristic(CharacteristicKey.SwingMode, Characteristic.SwingMode.SWING_DISABLED, 'topicGetSwingMode', this.bindOnUpdateNumericBoolean(CharacteristicKey.SwingMode, 'valueSwingEnabled', strings.heaterCooler.swingEnabled, strings.heaterCooler.swingDisabled), false, 'topicSetSwingMode', this.onSetSwingMode.bind(this));
|
|
37
38
|
}
|
|
38
39
|
getAccessoryType() {
|
|
39
40
|
return AccessoryType.HeaterCooler;
|
|
@@ -59,6 +60,37 @@ export class HeaterCoolerAccessory extends ActiveClimateAccessory {
|
|
|
59
60
|
}
|
|
60
61
|
this.onSet(CharacteristicKey.TargetHeaterCoolerState, value, target, 'topicSetTargetHeaterCoolerState', this.stateStringForTargetCV(value));
|
|
61
62
|
}
|
|
63
|
+
async onSetActive(value) {
|
|
64
|
+
if (!this.assert('valueStateActive', 'valueStateInactive')) {
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
const active = value === this.Characteristic.Active.ACTIVE;
|
|
68
|
+
const logString = active ? strings.heaterCooler.activeSet : strings.heaterCooler.inactiveSet;
|
|
69
|
+
const publish = active ? this.config.valueStateActive : this.config.valueStateInactive;
|
|
70
|
+
this.onSet(CharacteristicKey.Active, value, publish, 'topicSetActive', logString);
|
|
71
|
+
}
|
|
72
|
+
async onSetLockControls(value) {
|
|
73
|
+
if (!this.assert('valueControlLock', 'valueControlUnlock')) {
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
76
|
+
const lock = value === this.Characteristic.LockPhysicalControls.CONTROL_LOCK_ENABLED;
|
|
77
|
+
const logString = lock ? strings.heaterCooler.controlsLockFuture : strings.heaterCooler.controlsUnlockFuture;
|
|
78
|
+
const publish = lock ? this.config.valueControlLock : this.config.valueControlUnlock;
|
|
79
|
+
this.onSet(CharacteristicKey.LockPhysicalControls, value, publish, 'topicSetLockPhysicalControls', logString);
|
|
80
|
+
}
|
|
81
|
+
async onSetRotationSpeed(value) {
|
|
82
|
+
const logString = strings.heaterCooler.rotationSet.replace('%d', value.toString());
|
|
83
|
+
this.onSet(CharacteristicKey.RotationSpeed, value, value, 'topicSetRotationSpeed', logString);
|
|
84
|
+
}
|
|
85
|
+
async onSetSwingMode(value) {
|
|
86
|
+
if (!this.assert('valueSwingEnabled', 'valueSwingDisabled')) {
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
const swing = value === this.Characteristic.SwingMode.SWING_ENABLED;
|
|
90
|
+
const logString = swing ? strings.heaterCooler.swingEnabledFuture : strings.heaterCooler.swingDisabledFuture;
|
|
91
|
+
const publish = swing ? this.config.valueSwingEnabled : this.config.valueSwingDisabled;
|
|
92
|
+
this.onSet(CharacteristicKey.SwingMode, value, publish, 'topicSetSwingMode', logString);
|
|
93
|
+
}
|
|
62
94
|
fromCVState(value) {
|
|
63
95
|
let primative = undefined;
|
|
64
96
|
this.TARGET_STATE_MAP.forEach((test, key) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"heaterCooler.js","sourceRoot":"","sources":["../../../src/accessory/climate/heaterCooler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"heaterCooler.js","sourceRoot":"","sources":["../../../src/accessory/climate/heaterCooler.ts"],"names":[],"mappings":"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"}
|