homebridge-easy-mqtt 1.4.1-beta.0 → 1.4.1-beta.1
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 +2 -1
- package/README.md +18 -1
- package/config.schema.json +140 -6
- package/dist/accessory/abstract/base.d.ts +2 -4
- package/dist/accessory/abstract/base.js +16 -16
- package/dist/accessory/abstract/base.js.map +1 -1
- package/dist/accessory/abstract/common.d.ts +4 -1
- package/dist/accessory/abstract/common.js +49 -1
- package/dist/accessory/abstract/common.js.map +1 -1
- package/dist/accessory/abstract/group.d.ts +2 -4
- package/dist/accessory/abstract/group.js +11 -11
- package/dist/accessory/abstract/group.js.map +1 -1
- package/dist/accessory/abstract/helper.d.ts +3 -5
- package/dist/accessory/abstract/helper.js +34 -30
- package/dist/accessory/abstract/helper.js.map +1 -1
- package/dist/accessory/abstract/mqtt.d.ts +9 -8
- package/dist/accessory/abstract/mqtt.js +31 -24
- package/dist/accessory/abstract/mqtt.js.map +1 -1
- package/dist/accessory/addons/filter.js +7 -7
- package/dist/accessory/addons/filter.js.map +1 -1
- package/dist/accessory/button/button.d.ts +6 -0
- package/dist/accessory/{button.js → button/button.js} +6 -10
- package/dist/accessory/button/button.js.map +1 -0
- package/dist/accessory/button/doorbell.d.ts +7 -0
- package/dist/accessory/button/doorbell.js +25 -0
- package/dist/accessory/button/doorbell.js.map +1 -0
- package/dist/accessory/button/stateless.d.ts +6 -0
- package/dist/accessory/button/stateless.js +8 -0
- package/dist/accessory/button/stateless.js.map +1 -0
- package/dist/accessory/{abstract/customCharacteristic.js → characteristic/custom.js} +1 -1
- package/dist/accessory/characteristic/custom.js.map +1 -0
- package/dist/accessory/climate/active.d.ts +2 -4
- package/dist/accessory/climate/active.js +13 -13
- package/dist/accessory/climate/active.js.map +1 -1
- package/dist/accessory/climate/fan2.d.ts +2 -4
- package/dist/accessory/climate/fan2.js +17 -17
- package/dist/accessory/climate/fan2.js.map +1 -1
- package/dist/accessory/climate/heaterCooler.d.ts +2 -4
- package/dist/accessory/climate/heaterCooler.js +16 -16
- package/dist/accessory/climate/heaterCooler.js.map +1 -1
- package/dist/accessory/climate/purifier.d.ts +2 -4
- package/dist/accessory/climate/purifier.js +14 -14
- package/dist/accessory/climate/purifier.js.map +1 -1
- package/dist/accessory/climate/temperatureControl.d.ts +3 -4
- package/dist/accessory/climate/temperatureControl.js +7 -7
- package/dist/accessory/climate/temperatureControl.js.map +1 -1
- package/dist/accessory/climate/thermostat.d.ts +2 -4
- package/dist/accessory/climate/thermostat.js +15 -15
- package/dist/accessory/climate/thermostat.js.map +1 -1
- package/dist/accessory/garage.d.ts +2 -4
- package/dist/accessory/garage.js +15 -15
- package/dist/accessory/garage.js.map +1 -1
- package/dist/accessory/lock.d.ts +2 -4
- package/dist/accessory/lock.js +10 -10
- package/dist/accessory/lock.js.map +1 -1
- package/dist/accessory/onoff/lightbulb.d.ts +2 -4
- package/dist/accessory/onoff/lightbulb.js +11 -11
- package/dist/accessory/onoff/lightbulb.js.map +1 -1
- package/dist/accessory/onoff/onoff.d.ts +2 -4
- package/dist/accessory/onoff/onoff.js +6 -6
- package/dist/accessory/onoff/onoff.js.map +1 -1
- package/dist/accessory/onoff/outlet.d.ts +2 -4
- package/dist/accessory/onoff/outlet.js +4 -4
- package/dist/accessory/onoff/outlet.js.map +1 -1
- package/dist/accessory/onoff/switch.d.ts +2 -4
- package/dist/accessory/onoff/switch.js +2 -2
- package/dist/accessory/onoff/switch.js.map +1 -1
- package/dist/accessory/position/blind.d.ts +2 -4
- package/dist/accessory/position/blind.js +7 -7
- package/dist/accessory/position/blind.js.map +1 -1
- package/dist/accessory/position/position.d.ts +2 -4
- package/dist/accessory/position/position.js +17 -17
- package/dist/accessory/position/position.js.map +1 -1
- package/dist/accessory/security.d.ts +2 -4
- package/dist/accessory/security.js +16 -16
- package/dist/accessory/security.js.map +1 -1
- package/dist/accessory/sensor/air.d.ts +2 -4
- package/dist/accessory/sensor/air.js +23 -23
- package/dist/accessory/sensor/air.js.map +1 -1
- package/dist/accessory/sensor/carbonDioxide.d.ts +2 -4
- package/dist/accessory/sensor/carbonDioxide.js +6 -6
- package/dist/accessory/sensor/carbonDioxide.js.map +1 -1
- package/dist/accessory/sensor/carbonMonoxide.d.ts +2 -4
- package/dist/accessory/sensor/carbonMonoxide.js +6 -6
- package/dist/accessory/sensor/carbonMonoxide.js.map +1 -1
- package/dist/accessory/sensor/contact.d.ts +2 -4
- package/dist/accessory/sensor/contact.js +5 -5
- package/dist/accessory/sensor/contact.js.map +1 -1
- package/dist/accessory/sensor/humidity.d.ts +2 -4
- package/dist/accessory/sensor/humidity.js +4 -4
- package/dist/accessory/sensor/humidity.js.map +1 -1
- package/dist/accessory/sensor/leak.d.ts +2 -4
- package/dist/accessory/sensor/leak.js +4 -4
- package/dist/accessory/sensor/leak.js.map +1 -1
- package/dist/accessory/sensor/light.d.ts +2 -4
- package/dist/accessory/sensor/light.js +4 -4
- package/dist/accessory/sensor/light.js.map +1 -1
- package/dist/accessory/sensor/motion.d.ts +2 -4
- package/dist/accessory/sensor/motion.js +4 -4
- package/dist/accessory/sensor/motion.js.map +1 -1
- package/dist/accessory/sensor/occupancy.d.ts +2 -4
- package/dist/accessory/sensor/occupancy.js +4 -4
- package/dist/accessory/sensor/occupancy.js.map +1 -1
- package/dist/accessory/sensor/sensor.d.ts +2 -4
- package/dist/accessory/sensor/sensor.js +7 -7
- package/dist/accessory/sensor/sensor.js.map +1 -1
- package/dist/accessory/sensor/smoke.d.ts +2 -4
- package/dist/accessory/sensor/smoke.js +4 -4
- package/dist/accessory/sensor/smoke.js.map +1 -1
- package/dist/accessory/sensor/temperature.d.ts +2 -4
- package/dist/accessory/sensor/temperature.js +4 -4
- package/dist/accessory/sensor/temperature.js.map +1 -1
- package/dist/accessory/valve.d.ts +2 -4
- package/dist/accessory/valve.js +14 -14
- package/dist/accessory/valve.js.map +1 -1
- package/dist/homebridge/platform.js +4 -2
- 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 +22 -0
- package/dist/i18n/en.js +23 -1
- package/dist/i18n/en.js.map +1 -1
- package/dist/i18n/fr.d.ts +22 -0
- package/dist/i18n/i18n.d.ts +22 -0
- package/dist/i18n/it.d.ts +22 -0
- package/dist/i18n/ro.d.ts +22 -0
- package/dist/i18n/template.d.ts +22 -0
- package/dist/i18n/vi.d.ts +22 -0
- package/dist/model/enums.d.ts +6 -2
- package/dist/model/enums.js +80 -77
- package/dist/model/enums.js.map +1 -1
- package/dist/model/types.d.ts +24 -1
- package/dist/tools/log.d.ts +1 -1
- package/dist/tools/log.js.map +1 -1
- package/dist/tools/properties.js +1 -1
- package/dist/tools/properties.js.map +1 -1
- package/package.json +1 -1
- package/dist/accessory/abstract/customCharacteristic.js.map +0 -1
- package/dist/accessory/button.d.ts +0 -10
- package/dist/accessory/button.js.map +0 -1
- /package/dist/accessory/{abstract/customCharacteristic.d.ts → characteristic/custom.d.ts} +0 -0
|
@@ -3,6 +3,9 @@ import { AccessoryType } from '../../model/enums.js';
|
|
|
3
3
|
import { GarageDoorAccessory } from '../garage.js';
|
|
4
4
|
import { LockMechanismAccessory } from '../lock.js';
|
|
5
5
|
import { SecuritySystemAccessory } from '../security.js';
|
|
6
|
+
import { ValveAccessory } from '../valve.js';
|
|
7
|
+
import { DoorbellAccessory } from '../button/doorbell.js';
|
|
8
|
+
import { StatelessButtonAccessory } from '../button/stateless.js';
|
|
6
9
|
import { FanV2Accessory } from '../climate/fan2.js';
|
|
7
10
|
import { HeaterCoolerAccessory } from '../climate/heaterCooler.js';
|
|
8
11
|
import { PurifierAccessory } from '../climate/purifier.js';
|
|
@@ -22,63 +25,64 @@ import { MotionSensorAccessory } from '../sensor/motion.js';
|
|
|
22
25
|
import { OccupancySensorAccessory } from '../sensor/occupancy.js';
|
|
23
26
|
import { SmokeSensorAccessory } from '../sensor/smoke.js';
|
|
24
27
|
import { TemperatureSensorAccessory } from '../sensor/temperature.js';
|
|
25
|
-
import { ButtonAccessory } from '../button.js';
|
|
26
|
-
import { ValveAccessory } from '../valve.js';
|
|
27
28
|
import { PLUGIN_NAME } from '../../homebridge/settings.js';
|
|
28
29
|
export function createIdentifier(info) {
|
|
29
30
|
return info.id ?? `${PLUGIN_NAME}:${info.type}:${info.name}`;
|
|
30
31
|
}
|
|
31
|
-
export function createAccessory(
|
|
32
|
-
|
|
32
|
+
export function createAccessory(dependency, config, isGrouped = false) {
|
|
33
|
+
const mqttDependency = { ...dependency, config, isGrouped };
|
|
34
|
+
switch (config.info.type) {
|
|
33
35
|
case AccessoryType.AirPurifier:
|
|
34
|
-
return new PurifierAccessory(
|
|
36
|
+
return new PurifierAccessory(mqttDependency);
|
|
35
37
|
case AccessoryType.AirQualitySensor:
|
|
36
|
-
return new AirSensorAccessory(
|
|
37
|
-
case AccessoryType.WindowCovering:
|
|
38
|
-
return new BlindAccessory(Service, Characteristic, platformAccessory, accessoryConfig, log, isGrouped);
|
|
38
|
+
return new AirSensorAccessory(mqttDependency);
|
|
39
39
|
case AccessoryType.CarbonDioxideSensor:
|
|
40
|
-
return new CO2SensorAccessory(
|
|
40
|
+
return new CO2SensorAccessory(mqttDependency);
|
|
41
41
|
case AccessoryType.CarbonMonoxideSensor:
|
|
42
|
-
return new COSensorAccessory(
|
|
42
|
+
return new COSensorAccessory(mqttDependency);
|
|
43
43
|
case AccessoryType.ContactSensor:
|
|
44
|
-
return new ContactSensorAccessory(
|
|
44
|
+
return new ContactSensorAccessory(mqttDependency);
|
|
45
|
+
case AccessoryType.Doorbell:
|
|
46
|
+
return new DoorbellAccessory(mqttDependency);
|
|
45
47
|
case AccessoryType.Fanv2:
|
|
46
|
-
return new FanV2Accessory(
|
|
48
|
+
return new FanV2Accessory(mqttDependency);
|
|
47
49
|
case AccessoryType.GarageDoorOpener:
|
|
48
|
-
return new GarageDoorAccessory(
|
|
50
|
+
return new GarageDoorAccessory(mqttDependency);
|
|
49
51
|
case AccessoryType.HeaterCooler:
|
|
50
|
-
return new HeaterCoolerAccessory(
|
|
52
|
+
return new HeaterCoolerAccessory(mqttDependency);
|
|
51
53
|
case AccessoryType.HumiditySensor:
|
|
52
|
-
return new HumiditySensorAccessory(
|
|
54
|
+
return new HumiditySensorAccessory(mqttDependency);
|
|
53
55
|
case AccessoryType.LeakSensor:
|
|
54
|
-
return new LeakSensorAccessory(
|
|
56
|
+
return new LeakSensorAccessory(mqttDependency);
|
|
55
57
|
case AccessoryType.Lightbulb:
|
|
56
|
-
return new LightbulbAccessory(
|
|
58
|
+
return new LightbulbAccessory(mqttDependency);
|
|
57
59
|
case AccessoryType.LightSensor:
|
|
58
|
-
return new LightSensorAccessory(
|
|
60
|
+
return new LightSensorAccessory(mqttDependency);
|
|
59
61
|
case AccessoryType.LockMechanism:
|
|
60
|
-
return new LockMechanismAccessory(
|
|
62
|
+
return new LockMechanismAccessory(mqttDependency);
|
|
61
63
|
case AccessoryType.MotionSensor:
|
|
62
|
-
return new MotionSensorAccessory(
|
|
64
|
+
return new MotionSensorAccessory(mqttDependency);
|
|
63
65
|
case AccessoryType.OccupancySensor:
|
|
64
|
-
return new OccupancySensorAccessory(
|
|
66
|
+
return new OccupancySensorAccessory(mqttDependency);
|
|
65
67
|
case AccessoryType.Outlet:
|
|
66
|
-
return new OutletAccessory(
|
|
68
|
+
return new OutletAccessory(mqttDependency);
|
|
67
69
|
case AccessoryType.SecuritySystem:
|
|
68
|
-
return new SecuritySystemAccessory(
|
|
70
|
+
return new SecuritySystemAccessory(mqttDependency);
|
|
69
71
|
case AccessoryType.SmokeSensor:
|
|
70
|
-
return new SmokeSensorAccessory(
|
|
72
|
+
return new SmokeSensorAccessory(mqttDependency);
|
|
71
73
|
case AccessoryType.StatelessProgrammableSwitch:
|
|
72
|
-
return new
|
|
74
|
+
return new StatelessButtonAccessory(mqttDependency);
|
|
73
75
|
case AccessoryType.Switch:
|
|
74
|
-
return new SwitchAccessory(
|
|
76
|
+
return new SwitchAccessory(mqttDependency);
|
|
75
77
|
case AccessoryType.TemperatureSensor:
|
|
76
|
-
return new TemperatureSensorAccessory(
|
|
78
|
+
return new TemperatureSensorAccessory(mqttDependency);
|
|
77
79
|
case AccessoryType.Thermostat:
|
|
78
|
-
return new ThermostatAccessory(
|
|
80
|
+
return new ThermostatAccessory(mqttDependency);
|
|
79
81
|
case AccessoryType.Valve:
|
|
80
|
-
return new ValveAccessory(
|
|
82
|
+
return new ValveAccessory(mqttDependency);
|
|
83
|
+
case AccessoryType.WindowCovering:
|
|
84
|
+
return new BlindAccessory(mqttDependency);
|
|
81
85
|
}
|
|
82
|
-
log.error(strings.startup.unsupportedType,
|
|
86
|
+
dependency.log.error(strings.startup.unsupportedType, config.info.type);
|
|
83
87
|
}
|
|
84
88
|
//# sourceMappingURL=helper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/accessory/abstract/helper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/accessory/abstract/helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
import { CharacteristicValue, PlatformAccessory, PrimitiveTypes, Service } from 'homebridge';
|
|
2
2
|
import { Common } from './common.js';
|
|
3
|
-
import { AccessoryType,
|
|
4
|
-
import { CharacteristicType, MQTTAccessoryConfig,
|
|
3
|
+
import { AccessoryType, HKCharacteristicKey } from '../../model/enums.js';
|
|
4
|
+
import { CharacteristicType, MQTTAccessoryConfig, MQTTAccessoryDependency } from '../../model/types.js';
|
|
5
5
|
import { Log } from '../../tools/log.js';
|
|
6
6
|
export declare abstract class MQTTAccessory<C extends MQTTAccessoryConfig> extends Common<C> {
|
|
7
|
-
readonly
|
|
8
|
-
readonly platformAccessory: PlatformAccessory;
|
|
9
|
-
readonly config: C;
|
|
10
|
-
readonly log: Log;
|
|
7
|
+
private readonly dependency;
|
|
11
8
|
private readonly mqttClient;
|
|
12
9
|
private readonly accessoryService;
|
|
13
|
-
constructor(
|
|
10
|
+
constructor(dependency: MQTTAccessoryDependency<C>);
|
|
11
|
+
get Characteristic(): CharacteristicType;
|
|
12
|
+
get platformAccessory(): PlatformAccessory;
|
|
13
|
+
protected get config(): C;
|
|
14
|
+
get log(): Log;
|
|
14
15
|
protected abstract getAccessoryType(): AccessoryType;
|
|
15
16
|
get service(): Service;
|
|
16
17
|
get identifier(): string;
|
|
@@ -20,5 +21,5 @@ export declare abstract class MQTTAccessory<C extends MQTTAccessoryConfig> exten
|
|
|
20
21
|
private setupCustomCharacteristics;
|
|
21
22
|
publish(topic: string, value: PrimitiveTypes): void;
|
|
22
23
|
teardown(): void;
|
|
23
|
-
protected setCharacteristicValue(key:
|
|
24
|
+
protected setCharacteristicValue(key: HKCharacteristicKey, value: CharacteristicValue): void;
|
|
24
25
|
}
|
|
@@ -1,45 +1,51 @@
|
|
|
1
1
|
import { Common } from './common.js';
|
|
2
|
-
import { CustomCharacteristic } from './customCharacteristic.js';
|
|
3
|
-
import { AccessoryType, CharacteristicKey } from '../../model/enums.js';
|
|
4
|
-
import { MQTT } from '../../model/mqtt.js';
|
|
5
2
|
import { createIdentifier } from './helper.js';
|
|
3
|
+
import { CustomCharacteristic } from '../characteristic/custom.js';
|
|
4
|
+
import { AccessoryType, HKCharacteristicKey } from '../../model/enums.js';
|
|
5
|
+
import { MQTT } from '../../model/mqtt.js';
|
|
6
6
|
export class MQTTAccessory extends Common {
|
|
7
|
-
|
|
8
|
-
platformAccessory;
|
|
9
|
-
config;
|
|
10
|
-
log;
|
|
7
|
+
dependency;
|
|
11
8
|
mqttClient;
|
|
12
9
|
accessoryService;
|
|
13
|
-
constructor(
|
|
14
|
-
super(config.info.name);
|
|
15
|
-
this.
|
|
16
|
-
this.
|
|
17
|
-
this.config = config;
|
|
18
|
-
this.log = log;
|
|
19
|
-
this.mqttClient = MQTT.connect(log, config.mqtt, this.name, (client) => {
|
|
10
|
+
constructor(dependency) {
|
|
11
|
+
super(dependency.config.info.name);
|
|
12
|
+
this.dependency = dependency;
|
|
13
|
+
this.mqttClient = MQTT.connect(dependency.log, dependency.config.mqtt, this.name, (client) => {
|
|
20
14
|
this.topicHandlers.forEach(topicHandler => {
|
|
21
15
|
client.subscribe(topicHandler.topic, topicHandler.handler);
|
|
22
16
|
});
|
|
23
17
|
});
|
|
24
|
-
const serviceInstance = Service[this.getAccessoryType()];
|
|
25
|
-
if (isGrouped) {
|
|
26
|
-
let accessoryService = platformAccessory.getServiceById(serviceInstance, this.identifier);
|
|
18
|
+
const serviceInstance = dependency.Service[this.getAccessoryType()];
|
|
19
|
+
if (dependency.isGrouped) {
|
|
20
|
+
let accessoryService = dependency.platformAccessory.getServiceById(serviceInstance, this.identifier);
|
|
27
21
|
if (!accessoryService) {
|
|
28
|
-
accessoryService = platformAccessory.addService(serviceInstance, config.info.name, this.identifier);
|
|
29
|
-
accessoryService.setCharacteristic(Characteristic.ConfiguredName, config.info.name);
|
|
22
|
+
accessoryService = dependency.platformAccessory.addService(serviceInstance, dependency.config.info.name, this.identifier);
|
|
23
|
+
accessoryService.setCharacteristic(dependency.Characteristic.ConfiguredName, dependency.config.info.name);
|
|
30
24
|
}
|
|
31
25
|
this.accessoryService = accessoryService;
|
|
32
26
|
return;
|
|
33
27
|
}
|
|
34
|
-
this.accessoryService = platformAccessory.getService(serviceInstance) || platformAccessory.addService(serviceInstance);
|
|
28
|
+
this.accessoryService = dependency.platformAccessory.getService(serviceInstance) || dependency.platformAccessory.addService(serviceInstance);
|
|
35
29
|
for (const type of Object.values(AccessoryType)) {
|
|
36
|
-
const existingService = platformAccessory.getService(Service[type]);
|
|
37
|
-
if (existingService && type !== config.info.type) {
|
|
38
|
-
platformAccessory.removeService(existingService);
|
|
30
|
+
const existingService = dependency.platformAccessory.getService(dependency.Service[type]);
|
|
31
|
+
if (existingService && type !== dependency.config.info.type) {
|
|
32
|
+
dependency.platformAccessory.removeService(existingService);
|
|
39
33
|
}
|
|
40
34
|
}
|
|
41
35
|
this.setupCustomCharacteristics();
|
|
42
36
|
}
|
|
37
|
+
get Characteristic() {
|
|
38
|
+
return this.dependency.Characteristic;
|
|
39
|
+
}
|
|
40
|
+
get platformAccessory() {
|
|
41
|
+
return this.dependency.platformAccessory;
|
|
42
|
+
}
|
|
43
|
+
get config() {
|
|
44
|
+
return this.dependency.config;
|
|
45
|
+
}
|
|
46
|
+
get log() {
|
|
47
|
+
return this.dependency.log;
|
|
48
|
+
}
|
|
43
49
|
get service() {
|
|
44
50
|
return this.accessoryService;
|
|
45
51
|
}
|
|
@@ -56,7 +62,8 @@ export class MQTTAccessory extends Common {
|
|
|
56
62
|
return this.accessoryService.subtype;
|
|
57
63
|
}
|
|
58
64
|
setupCustomCharacteristics() {
|
|
59
|
-
|
|
65
|
+
// TODO both hk and optional
|
|
66
|
+
const keepUUIDs = new Set(Object.values(HKCharacteristicKey).map((key) => this.Characteristic[key].UUID));
|
|
60
67
|
const toRemove = this.accessoryService.characteristics.filter((characteristic) => !keepUUIDs.has(characteristic.UUID));
|
|
61
68
|
for (const characteristic of toRemove) {
|
|
62
69
|
characteristic.updateValue(null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mqtt.js","sourceRoot":"","sources":["../../../src/accessory/abstract/mqtt.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"mqtt.js","sourceRoot":"","sources":["../../../src/accessory/abstract/mqtt.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAK3C,MAAM,OAAgB,aAA6C,SAAQ,MAAS;IAO/D;IALF,UAAU,CAAmB;IAE7B,gBAAgB,CAAU;IAE3C,YACmB,UAAsC;QAEvD,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAFlB,eAAU,GAAV,UAAU,CAA4B;QAIvD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,MAAY,EAAE,EAAE;YACjG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAE,YAAY,CAAC,EAAE;gBACzC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;YAC7D,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,eAAe,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAEpE,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;YAEzB,IAAI,gBAAgB,GAAG,UAAU,CAAC,iBAAiB,CAAC,cAAc,CAAC,eAAe,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;YACrG,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACtB,gBAAgB,GAAG,UAAU,CAAC,iBAAiB,CAAC,UAAU,CAAC,eAAe,EAAE,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;gBAC1H,gBAAgB,CAAC,iBAAiB,CAAC,UAAU,CAAC,cAAc,CAAC,cAAc,EAAE,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5G,CAAC;YAED,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;YAEzC,OAAO;QACT,CAAC;QAED,IAAI,CAAC,gBAAgB,GAAG,UAAU,CAAC,iBAAiB,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,iBAAiB,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QAE7I,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;YAChD,MAAM,eAAe,GAAG,UAAU,CAAC,iBAAiB,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;YAC1F,IAAI,eAAe,IAAI,IAAI,KAAK,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBAC5D,UAAU,CAAC,iBAAiB,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;YAC9D,CAAC;QACH,CAAC;QAED,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAED,IAAW,cAAc;QACvB,OAAO,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC;IACxC,CAAC;IAED,IAAW,iBAAiB;QAC1B,OAAO,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC;IAC3C,CAAC;IAED,IAAc,MAAM;QAClB,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IAChC,CAAC;IAED,IAAW,GAAG;QACZ,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;IAC7B,CAAC;IAID,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED,IAAW,UAAU;QACnB,OAAO,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,IAAW,mBAAmB;QAC5B,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,KAAK,IAAI,CAAC;IAC7C,CAAC;IAED,IAAW,cAAc;QACvB,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;IACpC,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;IACvC,CAAC;IAEO,0BAA0B;QAEhC,4BAA4B;QAC5B,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,GAAG,CAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3G,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,MAAM,CAAE,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;QAExH,KAAK,MAAM,cAAc,IAAI,QAAQ,EAAE,CAAC;YACtC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;QAC7D,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC;YACvC,OAAO;QACT,CAAC;QAED,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC;YACvD,MAAM,UAAU,GAAG,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;YACpJ,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC7B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,CAAC,eAAe,EAAE,CAAC,CAAC;YAC5F,CAAC;QACH,CAAC;IACH,CAAC;IAEM,OAAO,CAAC,KAAa,EAAE,KAAqB;QACjD,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACzC,CAAC;IAEM,QAAQ;QACb,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,CAAC;IAC9B,CAAC;IAES,sBAAsB,CAAC,GAAwB,EAAE,KAA0B;QACnF,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAE,GAAG,EAAE;YAC5E,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Addon } from './addon.js';
|
|
2
2
|
import { strings } from '../../i18n/i18n.js';
|
|
3
|
-
import { AddonType,
|
|
3
|
+
import { AddonType, HKCharacteristicKey } from '../../model/enums.js';
|
|
4
4
|
import { LogType } from '../../tools/log.js';
|
|
5
5
|
export class FilterMaintenance extends Addon {
|
|
6
6
|
static topicHandlers(Service, parentAccessory, config) {
|
|
@@ -10,13 +10,13 @@ export class FilterMaintenance extends Addon {
|
|
|
10
10
|
}
|
|
11
11
|
constructor(service, parentAccessory, config) {
|
|
12
12
|
super(parentAccessory, service, config);
|
|
13
|
-
this.setup(
|
|
14
|
-
this.setup(
|
|
15
|
-
this.setupSet(
|
|
13
|
+
this.setup(HKCharacteristicKey.FilterChangeIndication, this.Characteristic.FilterChangeIndication.FILTER_OK, 'topicGetFilterChangeIndication', this.onChangeIndicationUpdate.bind(this), false);
|
|
14
|
+
this.setup(HKCharacteristicKey.FilterLifeLevel, 100, 'topicGetFilterLifeLevel', this.bindOnUpdateNumeric(HKCharacteristicKey.FilterLifeLevel, strings.filter.level), false);
|
|
15
|
+
this.setupSet(HKCharacteristicKey.ResetFilterIndication, 'topicResetFilterIndication', this.onResetIndication.bind(this));
|
|
16
16
|
}
|
|
17
17
|
async onChangeIndicationUpdate(topic, value) {
|
|
18
18
|
const indication = value === this.getPrimitiveValue('valueFilterChange') ? 1 : 0;
|
|
19
|
-
if (!this.onUpdate(
|
|
19
|
+
if (!this.onUpdate(HKCharacteristicKey.FilterChangeIndication, indication)) {
|
|
20
20
|
return;
|
|
21
21
|
}
|
|
22
22
|
if (indication === this.Characteristic.FilterChangeIndication.FILTER_OK) {
|
|
@@ -30,8 +30,8 @@ export class FilterMaintenance extends Addon {
|
|
|
30
30
|
if (!this.assert('valueFilterReset')) {
|
|
31
31
|
return;
|
|
32
32
|
}
|
|
33
|
-
this.onSet(
|
|
34
|
-
this.properties.set(
|
|
33
|
+
this.onSet(HKCharacteristicKey.ResetFilterIndication, value, this.config.valueFilterReset, 'topicResetFilterIndication', strings.filter.reset);
|
|
34
|
+
this.properties.set(HKCharacteristicKey.ResetFilterIndication, 0);
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
37
|
//# sourceMappingURL=filter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../src/accessory/addons/filter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAInC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../src/accessory/addons/filter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAInC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAGtE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAG7C,MAAM,OAAO,iBAAkB,SAAQ,KAA8B;IAEnE,MAAM,CAAC,aAAa,CAClB,OAAoB,EACpB,eAAmD,EACnD,MAA+B;QAE/B,MAAM,wBAAwB,GAAG,OAAO,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;QACtE,MAAM,iBAAiB,GACrB,KAAK,CAAC,GAAG,CAAC,eAAe,EAAE,wBAAwB,EAAE,MAAM,EAAE,CAAC,gCAAgC,CAAC,EAAE,iBAAiB,CAAC,CAAC;QACtH,OAAO,iBAAiB,EAAE,aAAa,IAAI,EAAE,CAAC;IAChD,CAAC;IAED,YACE,OAAgB,EAChB,eAAmD,EACnD,MAA+B;QAE/B,KAAK,CAAC,eAAe,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAExC,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,SAAS,EACzG,gCAAgC,EAAE,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;QAErF,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,eAAe,EAAE,GAAG,EACjD,yBAAyB,EAAE,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;QAEzH,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,qBAAqB,EAAE,4BAA4B,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5H,CAAC;IAEO,KAAK,CAAC,wBAAwB,CAAC,KAAa,EAAE,KAAqB;QAEzE,MAAM,UAAU,GAAG,KAAK,KAAK,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACjF,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,UAAU,CAAC,EAAE,CAAC;YAC3E,OAAO;QACT,CAAC;QAED,IAAI,UAAU,KAAK,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,SAAS,EAAE,CAAC;YACxE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACvC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,KAA0B;QAExD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACrC,OAAO;QACT,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,qBAAqB,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,4BAA4B,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC/I,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,mBAAmB,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;IACpE,CAAC;CACF"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { BaseAccessory } from '../abstract/base.js';
|
|
2
|
+
import { ButtonConfig, MQTTAccessoryDependency } from '../../model/types.js';
|
|
3
|
+
export declare abstract class ButtonAccessory<C extends ButtonConfig = ButtonConfig> extends BaseAccessory<C> {
|
|
4
|
+
constructor(dependency: MQTTAccessoryDependency<C>);
|
|
5
|
+
private onPress;
|
|
6
|
+
}
|
|
@@ -1,20 +1,16 @@
|
|
|
1
|
-
import { BaseAccessory } from '
|
|
2
|
-
import { strings } from '
|
|
3
|
-
import { AccessoryType } from '../model/enums.js';
|
|
1
|
+
import { BaseAccessory } from '../abstract/base.js';
|
|
2
|
+
import { strings } from '../../i18n/i18n.js';
|
|
4
3
|
export class ButtonAccessory extends BaseAccessory {
|
|
5
|
-
constructor(
|
|
6
|
-
super(
|
|
4
|
+
constructor(dependency) {
|
|
5
|
+
super(dependency);
|
|
7
6
|
if (!this.assert('topicEventButtonPress')) {
|
|
8
7
|
return;
|
|
9
8
|
}
|
|
10
|
-
if (!config.valueSinglePress && !config.valueDoublePress && !config.valueLongPress) {
|
|
9
|
+
if (!dependency.config.valueSinglePress && !dependency.config.valueDoublePress && !dependency.config.valueLongPress) {
|
|
11
10
|
this.log.error(strings.button.noValues, this.name);
|
|
12
11
|
return;
|
|
13
12
|
}
|
|
14
|
-
this.topicHandlers.push({ topic: config.topicEventButtonPress, handler: this.onPress.bind(this) });
|
|
15
|
-
}
|
|
16
|
-
getAccessoryType() {
|
|
17
|
-
return AccessoryType.StatelessProgrammableSwitch;
|
|
13
|
+
this.topicHandlers.push({ topic: dependency.config.topicEventButtonPress, handler: this.onPress.bind(this) });
|
|
18
14
|
}
|
|
19
15
|
async onPress(_topic, value) {
|
|
20
16
|
let charValue;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"button.js","sourceRoot":"","sources":["../../../src/accessory/button/button.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAI7C,MAAM,OAAgB,eAAuD,SAAQ,aAAgB;IAEnG,YAAY,UAAsC;QAChD,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,EAAE,CAAC;YAC1C,OAAO;QACT,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,gBAAgB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,gBAAgB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;YACpH,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACnD,OAAO;QACT,CAAC;QAED,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,qBAAqB,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAChH,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,MAAc,EAAE,KAAqB;QAEzD,IAAI,SAAiB,CAAC;QACtB,IAAI,SAAiB,CAAC;QAEtB,QAAQ,KAAK,EAAE,CAAC;YAChB,KAAK,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,KAAK,CAAC;gBACpD,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,uBAAuB,CAAC,YAAY,CAAC;gBACrE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC;gBACvC,MAAM;YACR,KAAK,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,KAAK,CAAC;gBACpD,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,uBAAuB,CAAC,YAAY,CAAC;gBACrE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC;gBACvC,MAAM;YACR,KAAK,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,KAAK,CAAC;gBAClD,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,uBAAuB,CAAC,UAAU,CAAC;gBACnE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;gBACrC,MAAM;YACR;gBACE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,KAAK,GAAG,CAAC,CAAC;gBAC7D,OAAO;QACT,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,cAAc,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAC;QAC1F,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;IAC/B,CAAC;CACF"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { ButtonAccessory } from './button.js';
|
|
2
|
+
import { AccessoryType } from '../../model/enums.js';
|
|
3
|
+
import { DoorbellConfig, MQTTAccessoryDependency } from '../../model/types.js';
|
|
4
|
+
export declare class DoorbellAccessory extends ButtonAccessory<DoorbellConfig> {
|
|
5
|
+
protected getAccessoryType(): AccessoryType;
|
|
6
|
+
constructor(dependency: MQTTAccessoryDependency<DoorbellConfig>);
|
|
7
|
+
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { ButtonAccessory } from './button.js';
|
|
2
|
+
import { strings } from '../../i18n/i18n.js';
|
|
3
|
+
import { AccessoryType, HKCharacteristicKey } from '../../model/enums.js';
|
|
4
|
+
export class DoorbellAccessory extends ButtonAccessory {
|
|
5
|
+
getAccessoryType() {
|
|
6
|
+
return AccessoryType.Doorbell;
|
|
7
|
+
}
|
|
8
|
+
constructor(dependency) {
|
|
9
|
+
super(dependency);
|
|
10
|
+
if (!dependency.config.maximumBrightness || !this.assertType('number', 'maximumBrightness')) {
|
|
11
|
+
dependency.config.maximumBrightness = 100;
|
|
12
|
+
}
|
|
13
|
+
if (!dependency.config.maximumVolume || !this.assertType('number', 'maximumVolume')) {
|
|
14
|
+
dependency.config.maximumVolume = 100;
|
|
15
|
+
}
|
|
16
|
+
const brightnessGetTemplate = dependency.config.maximumBrightness < 100 ? strings.doorbell.brightnessValue : strings.doorbell.brightnessPercent;
|
|
17
|
+
const brightnessSetTemplate = dependency.config.maximumBrightness < 100 ? strings.doorbell.brightnessValueFuture : strings.doorbell.brightnessPercentFuture;
|
|
18
|
+
this.setup(HKCharacteristicKey.Brightness, dependency.config.maximumBrightness, 'topicGetBrightness', this.bindOnUpdateNumeric(HKCharacteristicKey.Brightness, brightnessGetTemplate), false, 'topicSetBrightness', this.bindOnSetNumeric(HKCharacteristicKey.Brightness, 'topicSetBrightness', brightnessSetTemplate))?.setProps({ maxValue: dependency.config.maximumBrightness });
|
|
19
|
+
this.setup(HKCharacteristicKey.Mute, true, 'topicGetMuted', this.bindOnUpdateBoolean(HKCharacteristicKey.Mute, 'valueMuted', 'valueUnmuted', strings.doorbell.muted, strings.doorbell.unmuted), false, 'topicSetMuted', this.bindOnSetBoolean(HKCharacteristicKey.Mute, 'topicSetMuted', 'valueMuted', 'valueUnmuted', true, strings.doorbell.mutedFuture, strings.doorbell.unmutedFuture));
|
|
20
|
+
const volumeGetTemplate = dependency.config.maximumVolume < 100 ? strings.doorbell.volumeValue : strings.doorbell.volumePercent;
|
|
21
|
+
const volumeSetTemplate = dependency.config.maximumVolume < 100 ? strings.doorbell.volumeValueFuture : strings.doorbell.volumePercentFuture;
|
|
22
|
+
this.setup(HKCharacteristicKey.Volume, dependency.config.maximumVolume, 'topicGetVolume', this.bindOnUpdateNumeric(HKCharacteristicKey.Volume, volumeGetTemplate), false, 'topicSetVolume', this.bindOnSetNumeric(HKCharacteristicKey.Volume, 'topicSetVolume', volumeSetTemplate))?.setProps({ maxValue: dependency.config.maximumVolume });
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=doorbell.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"doorbell.js","sourceRoot":"","sources":["../../../src/accessory/button/doorbell.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { ButtonAccessory } from './button.js';
|
|
2
|
+
import { AccessoryType } from '../../model/enums.js';
|
|
3
|
+
import { ButtonConfig } from '../../model/types.js';
|
|
4
|
+
export declare class StatelessButtonAccessory extends ButtonAccessory<ButtonConfig> {
|
|
5
|
+
protected getAccessoryType(): AccessoryType;
|
|
6
|
+
}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { ButtonAccessory } from './button.js';
|
|
2
|
+
import { AccessoryType } from '../../model/enums.js';
|
|
3
|
+
export class StatelessButtonAccessory extends ButtonAccessory {
|
|
4
|
+
getAccessoryType() {
|
|
5
|
+
return AccessoryType.StatelessProgrammableSwitch;
|
|
6
|
+
}
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=stateless.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stateless.js","sourceRoot":"","sources":["../../../src/accessory/button/stateless.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAGrD,MAAM,OAAO,wBAAyB,SAAQ,eAA6B;IAE/D,gBAAgB;QACxB,OAAO,aAAa,CAAC,2BAA2B,CAAC;IACnD,CAAC;CACF"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/custom.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAEnD,MAAM,OAAO,oBAAoB;IAyBZ;IACA;IACA;IACA;IA1BX,cAAc,CAAiB;IAE/B,KAAK,GAAkC,IAAI,CAAC;IAE7C,MAAM,CAAC,MAAM,CAClB,OAAgB,EAChB,cAAkC,EAClC,MAAkC,EAClC,MAAc,EACd,GAAQ,EACR,cAAuB;QAGvB,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,IAAI,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC;YAC/F,OAAO;QACT,CAAC;QAED,OAAO,IAAI,oBAAoB,CAAC,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,CAAC;IAChG,CAAC;IAED,YACE,OAAgB,EAChB,cAAkC,EACjB,MAAkC,EAClC,MAAc,EACd,GAAQ,EACR,cAAuB;QAHvB,WAAM,GAAN,MAAM,CAA4B;QAClC,WAAM,GAAN,MAAM,CAAQ;QACd,QAAG,GAAH,GAAG,CAAK;QACR,mBAAc,GAAd,cAAc,CAAS;QAGxC,IAAI,OAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5C,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAE,CAAC;QAChE,CAAC;aAAM,CAAC;YACN,MAAM,oBAAoB,GAAG,MAAM,oBAAqB,SAAQ,cAAc;gBAC5E;oBACE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE;wBAC9B,MAAM,+BAAgB;wBACtB,KAAK,EAAE,uDAAmC;wBAC1C,IAAI,EAAE,MAAM,CAAC,KAAK;qBACnB,CAAC,CAAC;oBACH,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;gBACtC,CAAC;aACF,CAAC;YACF,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,CAAC;YACtE,IAAI,CAAC,cAAc,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACzC,CAAC;QAED,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;IAC9B,CAAC;IAED,IAAW,eAAe;QACxB,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,KAAa,EAAE,KAAqB;QAE9D,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,IAAI,KAAK,GAAG,CAAC,CAAC;YAC5G,OAAO;QACT,CAAC;QAED,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;YACzB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QAEnB,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE5C,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,IAAI,KAAK,GAAG,CAAC,CAAC;IAC9G,CAAC;CACF"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
import { PlatformAccessory } from 'homebridge';
|
|
2
1
|
import { TemperatureControlAccessory } from './temperatureControl.js';
|
|
3
|
-
import {
|
|
4
|
-
import { Log } from '../../tools/log.js';
|
|
2
|
+
import { ActiveClimateConfig, MQTTAccessoryDependency } from '../../model/types.js';
|
|
5
3
|
export declare abstract class ActiveClimateAccessory<C extends ActiveClimateConfig = ActiveClimateConfig> extends TemperatureControlAccessory<C> {
|
|
6
|
-
constructor(
|
|
4
|
+
constructor(dependency: MQTTAccessoryDependency<C>);
|
|
7
5
|
private onSetActive;
|
|
8
6
|
private onSetLockControls;
|
|
9
7
|
private onSetRotationSpeed;
|
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
import { TemperatureControlAccessory } from './temperatureControl.js';
|
|
2
2
|
import { strings } from '../../i18n/i18n.js';
|
|
3
|
-
import {
|
|
3
|
+
import { HKCharacteristicKey } from '../../model/enums.js';
|
|
4
4
|
export class ActiveClimateAccessory extends TemperatureControlAccessory {
|
|
5
|
-
constructor(
|
|
6
|
-
super(
|
|
7
|
-
this.setup(
|
|
8
|
-
this.setup(
|
|
5
|
+
constructor(dependency) {
|
|
6
|
+
super(dependency);
|
|
7
|
+
this.setup(HKCharacteristicKey.Active, dependency.Characteristic.Active.INACTIVE, 'topicGetActive', this.bindOnUpdateNumericBoolean(HKCharacteristicKey.Active, 'valueStateActive', strings.active.active, strings.active.notActive), true, 'topicSetActive', this.onSetActive.bind(this));
|
|
8
|
+
this.setup(HKCharacteristicKey.LockPhysicalControls, dependency.Characteristic.LockPhysicalControls.CONTROL_LOCK_DISABLED, 'topicGetLockPhysicalControls', this.bindOnUpdateNumericBoolean(HKCharacteristicKey.LockPhysicalControls, 'valueControlLock', strings.active.controlsLocked, strings.active.controlsUnLocked), false, 'topicSetLockPhysicalControls', this.onSetLockControls.bind(this));
|
|
9
9
|
let rotationLogString = strings.active.rotationValueUpdate;
|
|
10
|
-
if (!config.maximumRotationSpeed || !this.assertType('number', 'maximumRotationSpeed')) {
|
|
11
|
-
config.maximumRotationSpeed = 100;
|
|
10
|
+
if (!dependency.config.maximumRotationSpeed || !this.assertType('number', 'maximumRotationSpeed')) {
|
|
11
|
+
dependency.config.maximumRotationSpeed = 100;
|
|
12
12
|
rotationLogString = strings.active.rotationPercentUpdate;
|
|
13
13
|
}
|
|
14
|
-
this.setup(
|
|
15
|
-
this.setup(
|
|
14
|
+
this.setup(HKCharacteristicKey.RotationSpeed, 0, 'topicGetRotationSpeed', this.bindOnUpdateNumeric(HKCharacteristicKey.RotationSpeed, rotationLogString), false, 'topicSetRotationSpeed', this.onSetRotationSpeed.bind(this))?.setProps({ maxValue: dependency.config.maximumRotationSpeed });
|
|
15
|
+
this.setup(HKCharacteristicKey.SwingMode, dependency.Characteristic.SwingMode.SWING_DISABLED, 'topicGetSwingMode', this.bindOnUpdateNumericBoolean(HKCharacteristicKey.SwingMode, 'valueSwingEnabled', strings.active.swingEnabled, strings.active.swingDisabled), false, 'topicSetSwingMode', this.onSetSwingMode.bind(this));
|
|
16
16
|
}
|
|
17
17
|
async onSetActive(value) {
|
|
18
18
|
if (!this.assert('valueStateActive', 'valueStateInactive')) {
|
|
@@ -21,7 +21,7 @@ export class ActiveClimateAccessory extends TemperatureControlAccessory {
|
|
|
21
21
|
const active = value === this.Characteristic.Active.ACTIVE;
|
|
22
22
|
const logString = active ? strings.active.activeSet : strings.active.inactiveSet;
|
|
23
23
|
const publish = active ? this.config.valueStateActive : this.config.valueStateInactive;
|
|
24
|
-
this.onSet(
|
|
24
|
+
this.onSet(HKCharacteristicKey.Active, value, publish, 'topicSetActive', logString);
|
|
25
25
|
}
|
|
26
26
|
async onSetLockControls(value) {
|
|
27
27
|
if (!this.assert('valueControlLock', 'valueControlUnlock')) {
|
|
@@ -30,12 +30,12 @@ export class ActiveClimateAccessory extends TemperatureControlAccessory {
|
|
|
30
30
|
const lock = value === this.Characteristic.LockPhysicalControls.CONTROL_LOCK_ENABLED;
|
|
31
31
|
const logString = lock ? strings.active.controlsLockFuture : strings.active.controlsUnlockFuture;
|
|
32
32
|
const publish = lock ? this.config.valueControlLock : this.config.valueControlUnlock;
|
|
33
|
-
this.onSet(
|
|
33
|
+
this.onSet(HKCharacteristicKey.LockPhysicalControls, value, publish, 'topicSetLockPhysicalControls', logString);
|
|
34
34
|
}
|
|
35
35
|
async onSetRotationSpeed(value) {
|
|
36
36
|
const isPercent = this.config.maximumRotationSpeed === undefined || this.config.maximumRotationSpeed === 100;
|
|
37
37
|
const logString = (isPercent ? strings.active.rotationPercentSet : strings.active.rotationValueSet).replace('%d', value.toString());
|
|
38
|
-
this.onSet(
|
|
38
|
+
this.onSet(HKCharacteristicKey.RotationSpeed, value, value, 'topicSetRotationSpeed', logString);
|
|
39
39
|
}
|
|
40
40
|
async onSetSwingMode(value) {
|
|
41
41
|
if (!this.assert('valueSwingEnabled', 'valueSwingDisabled')) {
|
|
@@ -44,7 +44,7 @@ export class ActiveClimateAccessory extends TemperatureControlAccessory {
|
|
|
44
44
|
const swing = value === this.Characteristic.SwingMode.SWING_ENABLED;
|
|
45
45
|
const logString = swing ? strings.active.swingEnabledFuture : strings.active.swingDisabledFuture;
|
|
46
46
|
const publish = swing ? this.config.valueSwingEnabled : this.config.valueSwingDisabled;
|
|
47
|
-
this.onSet(
|
|
47
|
+
this.onSet(HKCharacteristicKey.SwingMode, value, publish, 'topicSetSwingMode', logString);
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
50
|
//# sourceMappingURL=active.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"active.js","sourceRoot":"","sources":["../../../src/accessory/climate/active.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"active.js","sourceRoot":"","sources":["../../../src/accessory/climate/active.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,10 @@
|
|
|
1
|
-
import { PlatformAccessory } from 'homebridge';
|
|
2
1
|
import { ActiveClimateAccessory } from './active.js';
|
|
3
2
|
import { AccessoryType } from '../../model/enums.js';
|
|
4
|
-
import {
|
|
5
|
-
import { Log } from '../../tools/log.js';
|
|
3
|
+
import { FanV2Config, MQTTAccessoryDependency } from '../../model/types.js';
|
|
6
4
|
export declare class FanV2Accessory extends ActiveClimateAccessory<FanV2Config> {
|
|
7
5
|
private readonly CURRENT_STATE_MAP;
|
|
8
6
|
private readonly TARGET_STATE_MAP;
|
|
9
|
-
constructor(
|
|
7
|
+
constructor(dependency: MQTTAccessoryDependency<FanV2Config>);
|
|
10
8
|
protected getAccessoryType(): AccessoryType;
|
|
11
9
|
private onCurrentStateUpdate;
|
|
12
10
|
private onTargetStateUpdate;
|