homebridge-easy-mqtt 1.2.0-beta.0 → 1.2.0-beta.2
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 +11 -1
- package/README.md +6 -8
- package/config.schema.json +12 -26
- package/dist/accessory/abstract/base.d.ts +20 -10
- package/dist/accessory/abstract/base.js +92 -4
- package/dist/accessory/abstract/base.js.map +1 -1
- package/dist/accessory/abstract/statusActive.d.ts +4 -7
- package/dist/accessory/abstract/statusActive.js +12 -22
- package/dist/accessory/abstract/statusActive.js.map +1 -1
- package/dist/accessory/lock.d.ts +3 -6
- package/dist/accessory/lock.js +51 -60
- package/dist/accessory/lock.js.map +1 -1
- package/dist/accessory/onoff/lightbulb.d.ts +9 -17
- package/dist/accessory/onoff/lightbulb.js +51 -76
- package/dist/accessory/onoff/lightbulb.js.map +1 -1
- package/dist/accessory/onoff/onoff.d.ts +4 -5
- package/dist/accessory/onoff/onoff.js +28 -29
- package/dist/accessory/onoff/onoff.js.map +1 -1
- package/dist/accessory/onoff/outlet.d.ts +1 -5
- package/dist/accessory/onoff/outlet.js +9 -41
- package/dist/accessory/onoff/outlet.js.map +1 -1
- package/dist/accessory/onoff/switch.js.map +1 -1
- package/dist/accessory/security.d.ts +2 -7
- package/dist/accessory/security.js +44 -81
- package/dist/accessory/security.js.map +1 -1
- package/dist/accessory/temperatureSensor.d.ts +1 -2
- package/dist/accessory/temperatureSensor.js +6 -8
- package/dist/accessory/temperatureSensor.js.map +1 -1
- package/dist/homebridge/platform.js +7 -6
- package/dist/homebridge/platform.js.map +1 -1
- package/dist/homebridge-ui/public/index.html +2 -2
- package/dist/homebridge-ui/public/ui.js +1 -1
- package/dist/i18n/en.d.ts +11 -8
- package/dist/i18n/en.js +53 -50
- package/dist/i18n/en.js.map +1 -1
- package/dist/i18n/i18n.d.ts +11 -8
- package/dist/i18n/template.d.ts +11 -8
- package/dist/model/enums.d.ts +23 -0
- package/dist/model/enums.js +25 -0
- package/dist/model/enums.js.map +1 -1
- package/dist/model/mqtt.d.ts +3 -3
- package/dist/model/mqtt.js.map +1 -1
- package/dist/model/types.d.ts +8 -7
- package/dist/tools/primitive.d.ts +3 -3
- package/dist/tools/primitive.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lock.js","sourceRoot":"","sources":["../../src/accessory/lock.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"lock.js","sourceRoot":"","sources":["../../src/accessory/lock.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,29 +1,21 @@
|
|
|
1
1
|
import { PlatformAccessory, Service } from 'homebridge';
|
|
2
|
-
import { TopicHandler } from '../abstract/base.js';
|
|
3
2
|
import { OnOffAccessory } from './onoff.js';
|
|
4
3
|
import { CharacteristicType, LightbulbConfig, ServiceType } from '../../model/types.js';
|
|
5
4
|
import { Log } from '../../tools/log.js';
|
|
6
5
|
export declare class LightbulbAccessory extends OnOffAccessory<LightbulbConfig> {
|
|
7
|
-
private brightness;
|
|
8
|
-
private hue;
|
|
9
|
-
private colorTemperature;
|
|
10
|
-
private saturation;
|
|
11
6
|
constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: LightbulbConfig, log: Log);
|
|
12
7
|
protected getAccessoryService(): Service;
|
|
13
|
-
|
|
8
|
+
addTopicHandlers(): void;
|
|
14
9
|
private getBrightness;
|
|
15
|
-
private getHue;
|
|
16
|
-
private getColorTemperature;
|
|
17
|
-
private getSaturation;
|
|
18
10
|
private onBrightnessUpdate;
|
|
19
|
-
private
|
|
20
|
-
private
|
|
21
|
-
private setHue;
|
|
11
|
+
private onSetBrightness;
|
|
12
|
+
private getColorTemperature;
|
|
22
13
|
private onColorTemperatureUpdate;
|
|
23
|
-
private
|
|
14
|
+
private onSetColorTemperature;
|
|
15
|
+
private getHue;
|
|
16
|
+
private onHueUpdate;
|
|
17
|
+
private onSetHue;
|
|
18
|
+
private getSaturation;
|
|
24
19
|
private onSaturationUpdate;
|
|
25
|
-
private
|
|
26
|
-
private _onUpdate;
|
|
27
|
-
private _set;
|
|
28
|
-
private toCharacteristicKey;
|
|
20
|
+
private onSetSaturation;
|
|
29
21
|
}
|
|
@@ -1,104 +1,79 @@
|
|
|
1
|
-
import { makeHandler } from '../abstract/base.js';
|
|
2
1
|
import { OnOffAccessory } from './onoff.js';
|
|
3
2
|
import { strings } from '../../i18n/i18n.js';
|
|
4
|
-
import {
|
|
3
|
+
import { CharacteristicKey } from '../../model/enums.js';
|
|
5
4
|
export class LightbulbAccessory extends OnOffAccessory {
|
|
6
|
-
brightness = 100;
|
|
7
|
-
hue = 0;
|
|
8
|
-
colorTemperature = 500;
|
|
9
|
-
saturation = 100;
|
|
10
5
|
constructor(Service, Characteristic, accessory, config, log) {
|
|
11
6
|
super(Service, Characteristic, accessory, config, log, LightbulbAccessory.name);
|
|
12
|
-
this.
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
this.
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
this.
|
|
19
|
-
|
|
20
|
-
.onSet(this.setColorTemperature.bind(this));
|
|
21
|
-
this.accessoryService.getCharacteristic(this.Characteristic.Saturation)
|
|
22
|
-
.onGet(this.getSaturation.bind(this))
|
|
23
|
-
.onSet(this.setSaturation.bind(this));
|
|
7
|
+
this.set(CharacteristicKey.Brightness, 100);
|
|
8
|
+
this.set(CharacteristicKey.ColorTemperature, 500);
|
|
9
|
+
this.set(CharacteristicKey.Hue, 0);
|
|
10
|
+
this.set(CharacteristicKey.Saturation, 100);
|
|
11
|
+
this.bind(Characteristic.Brightness, 'topicGetBrightness', this.getBrightness.bind(this), 'topicSetBrightness', this.onSetBrightness.bind(this));
|
|
12
|
+
this.bind(Characteristic.ColorTemperature, 'topicGetColorTemperature', this.getColorTemperature.bind(this), 'topicSetColorTemperature', this.onSetColorTemperature.bind(this));
|
|
13
|
+
this.bind(Characteristic.Hue, 'topicGetHue', this.getHue.bind(this), 'topicSetHue', this.onSetHue.bind(this));
|
|
14
|
+
this.bind(Characteristic.Saturation, 'topicGetSaturation', this.getSaturation.bind(this), 'topicSetSaturation', this.onSetSaturation.bind(this));
|
|
24
15
|
}
|
|
25
16
|
getAccessoryService() {
|
|
26
17
|
return this.accessory.getService(this.Service.Lightbulb) || this.accessory.addService(this.Service.Lightbulb);
|
|
27
18
|
}
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
topicHandlers.push(makeHandler(this.config.topicGetHue, this.onHueUpdate.bind(this)));
|
|
35
|
-
}
|
|
36
|
-
if (this.config.topicGetColorTemperature) {
|
|
37
|
-
topicHandlers.push(makeHandler(this.config.topicGetColorTemperature, this.onColorTemperatureUpdate.bind(this)));
|
|
38
|
-
}
|
|
39
|
-
if (this.config.topicGetSaturation) {
|
|
40
|
-
topicHandlers.push(makeHandler(this.config.topicGetSaturation, this.onSaturationUpdate.bind(this)));
|
|
41
|
-
}
|
|
42
|
-
return topicHandlers;
|
|
19
|
+
addTopicHandlers() {
|
|
20
|
+
super.addTopicHandlers();
|
|
21
|
+
this.addTopicHandler('topicGetBrightness', this.onBrightnessUpdate.bind(this), false);
|
|
22
|
+
this.addTopicHandler('topicGetColorTemperature', this.onColorTemperatureUpdate.bind(this), false);
|
|
23
|
+
this.addTopicHandler('topicGetHue', this.onHueUpdate.bind(this), false);
|
|
24
|
+
this.addTopicHandler('topicGetSaturation', this.onSaturationUpdate.bind(this), false);
|
|
43
25
|
}
|
|
44
26
|
async getBrightness() {
|
|
45
|
-
return this.
|
|
27
|
+
return this.get(CharacteristicKey.Brightness);
|
|
46
28
|
}
|
|
47
|
-
async
|
|
48
|
-
|
|
29
|
+
async onBrightnessUpdate(topic, value) {
|
|
30
|
+
if (this.assertNumber(value, strings.lightbulb.badBrightness)) {
|
|
31
|
+
const logString = strings.lightbulb.brightness.replace('%d', `${value.toString()}%`);
|
|
32
|
+
this.onUpdate(CharacteristicKey.Brightness, value, logString);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
async onSetBrightness(value) {
|
|
36
|
+
const logString = strings.lightbulb.futureBrightness.replace('%d', `${value.toString()}%`);
|
|
37
|
+
this.onSet(CharacteristicKey.Brightness, value, value, 'topicSetBrightness', logString);
|
|
49
38
|
}
|
|
50
39
|
async getColorTemperature() {
|
|
51
|
-
return this.
|
|
40
|
+
return this.get(CharacteristicKey.ColorTemperature);
|
|
52
41
|
}
|
|
53
|
-
async
|
|
54
|
-
|
|
42
|
+
async onColorTemperatureUpdate(topic, value) {
|
|
43
|
+
if (this.assertNumber(value, strings.lightbulb.badColorTemperature)) {
|
|
44
|
+
const logString = strings.lightbulb.colorTemperature.replace('%d', `${value.toString()}M`);
|
|
45
|
+
this.onUpdate(CharacteristicKey.ColorTemperature, value, logString);
|
|
46
|
+
}
|
|
55
47
|
}
|
|
56
|
-
async
|
|
57
|
-
|
|
48
|
+
async onSetColorTemperature(value) {
|
|
49
|
+
const logString = strings.lightbulb.futureColorTemperature.replace('%d', `${value.toString()}M`);
|
|
50
|
+
this.onSet(CharacteristicKey.ColorTemperature, value, value, 'topicSetColorTemperature', logString);
|
|
58
51
|
}
|
|
59
|
-
async
|
|
60
|
-
this.
|
|
52
|
+
async getHue() {
|
|
53
|
+
return this.get(CharacteristicKey.Hue);
|
|
61
54
|
}
|
|
62
55
|
async onHueUpdate(topic, value) {
|
|
63
|
-
this.
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
56
|
+
if (this.assertNumber(value, strings.lightbulb.badHue)) {
|
|
57
|
+
const logString = strings.lightbulb.hue.replace('%d', `${value.toString()}°`);
|
|
58
|
+
this.onUpdate(CharacteristicKey.Hue, value, logString);
|
|
59
|
+
}
|
|
67
60
|
}
|
|
68
|
-
async
|
|
69
|
-
|
|
61
|
+
async onSetHue(value) {
|
|
62
|
+
const logString = strings.lightbulb.futureHue.replace('%d', `${value.toString()}°`);
|
|
63
|
+
this.onSet(CharacteristicKey.Hue, value, value, 'topicSetHue', logString);
|
|
70
64
|
}
|
|
71
|
-
async
|
|
72
|
-
this.
|
|
65
|
+
async getSaturation() {
|
|
66
|
+
return this.get(CharacteristicKey.Saturation);
|
|
73
67
|
}
|
|
74
68
|
async onSaturationUpdate(topic, value) {
|
|
75
|
-
this.
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
this._set('topicSetSaturation', 'saturation', value, strings.lightbulb.futureSaturation);
|
|
79
|
-
}
|
|
80
|
-
async _onUpdate(propertyKey, value, logString) {
|
|
81
|
-
if (value === this[propertyKey]) {
|
|
82
|
-
return;
|
|
83
|
-
}
|
|
84
|
-
this[propertyKey] = value;
|
|
85
|
-
const characteristicKey = this.toCharacteristicKey(propertyKey);
|
|
86
|
-
this.accessoryService.updateCharacteristic(this.Characteristic[characteristicKey], value);
|
|
87
|
-
this.logIfDesired(logString, value.toString());
|
|
88
|
-
}
|
|
89
|
-
_set(topic, propertyKey, value, logString) {
|
|
90
|
-
if (!this.assert(topic)) {
|
|
91
|
-
return;
|
|
69
|
+
if (this.assertNumber(value, strings.lightbulb.badSaturation)) {
|
|
70
|
+
const logString = strings.lightbulb.saturation.replace('%d', `${value.toString()}%`);
|
|
71
|
+
this.onUpdate(CharacteristicKey.Saturation, value, logString);
|
|
92
72
|
}
|
|
93
|
-
this[propertyKey] = value;
|
|
94
|
-
this.logIfDesired(logString, value.toString());
|
|
95
|
-
const characteristicKey = this.toCharacteristicKey(propertyKey);
|
|
96
|
-
this.accessoryService.updateCharacteristic(this.Characteristic[characteristicKey], value);
|
|
97
|
-
this.publish(this.config[topic], toPrimitive(value));
|
|
98
73
|
}
|
|
99
|
-
|
|
100
|
-
const
|
|
101
|
-
|
|
74
|
+
async onSetSaturation(value) {
|
|
75
|
+
const logString = strings.lightbulb.futureSaturation.replace('%d', `${value.toString()}%`);
|
|
76
|
+
this.onSet(CharacteristicKey.Saturation, value, value, 'topicSetSaturation', logString);
|
|
102
77
|
}
|
|
103
78
|
}
|
|
104
79
|
//# sourceMappingURL=lightbulb.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lightbulb.js","sourceRoot":"","sources":["../../../src/accessory/onoff/lightbulb.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"lightbulb.js","sourceRoot":"","sources":["../../../src/accessory/onoff/lightbulb.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
import { PlatformAccessory } from 'homebridge';
|
|
2
|
-
import { TopicHandler } from '../abstract/base.js';
|
|
3
2
|
import { StatusActiveAccessory } from '../abstract/statusActive.js';
|
|
4
3
|
import { CharacteristicType, OnOffConfig, ServiceType } from '../../model/types.js';
|
|
5
4
|
import { Log } from '../../tools/log.js';
|
|
6
5
|
export declare abstract class OnOffAccessory<C extends OnOffConfig = OnOffConfig> extends StatusActiveAccessory<C> {
|
|
7
|
-
private on;
|
|
8
6
|
constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: C, log: Log, className: string);
|
|
9
|
-
|
|
10
|
-
private onOnUpdate;
|
|
7
|
+
addTopicHandlers(): void;
|
|
11
8
|
private getOn;
|
|
12
|
-
private
|
|
9
|
+
private onOnUpdate;
|
|
10
|
+
private onSetOn;
|
|
11
|
+
private booleanForValue;
|
|
13
12
|
private stringForState;
|
|
14
13
|
}
|
|
@@ -1,47 +1,46 @@
|
|
|
1
|
-
import { makeHandler } from '../abstract/base.js';
|
|
2
1
|
import { StatusActiveAccessory } from '../abstract/statusActive.js';
|
|
3
2
|
import { strings } from '../../i18n/i18n.js';
|
|
4
|
-
import {
|
|
3
|
+
import { CharacteristicKey } from '../../model/enums.js';
|
|
5
4
|
export class OnOffAccessory extends StatusActiveAccessory {
|
|
6
|
-
on = false;
|
|
7
5
|
constructor(Service, Characteristic, accessory, config, log, className) {
|
|
8
6
|
super(Service, Characteristic, accessory, config, log, className);
|
|
7
|
+
this.set(CharacteristicKey.On, false);
|
|
9
8
|
this.accessoryService.getCharacteristic(Characteristic.On)
|
|
10
9
|
.onGet(this.getOn.bind(this))
|
|
11
|
-
.onSet(this.
|
|
10
|
+
.onSet(this.onSetOn.bind(this));
|
|
12
11
|
}
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
return topicHandlers;
|
|
12
|
+
addTopicHandlers() {
|
|
13
|
+
super.addTopicHandlers();
|
|
14
|
+
this.addTopicHandler('topicGetOn', this.onOnUpdate.bind(this));
|
|
15
|
+
}
|
|
16
|
+
async getOn() {
|
|
17
|
+
return this.get(CharacteristicKey.On);
|
|
20
18
|
}
|
|
21
19
|
async onOnUpdate(topic, value) {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
const on = value === toPrimitive(this.config.valueOn);
|
|
26
|
-
if (on === this.on) {
|
|
27
|
-
return;
|
|
20
|
+
const on = this.booleanForValue(value, 'valueOn', 'valueOff', strings.onOff.badValue);
|
|
21
|
+
if (on !== undefined) {
|
|
22
|
+
this.onUpdate(CharacteristicKey.On, on, this.stringForState(on));
|
|
28
23
|
}
|
|
29
|
-
this.on = on;
|
|
30
|
-
this.accessoryService.updateCharacteristic(this.Characteristic.On, this.on);
|
|
31
|
-
this.logIfDesired(this.stringForState(this.on));
|
|
32
24
|
}
|
|
33
|
-
async
|
|
34
|
-
|
|
25
|
+
async onSetOn(value) {
|
|
26
|
+
const on = value ? this.getPrimitiveValue('valueOn') : this.getPrimitiveValue('valueOff');
|
|
27
|
+
if (on !== undefined) {
|
|
28
|
+
this.onSet(CharacteristicKey.On, value, on, 'topicSetOn', this.stringForState(value, true));
|
|
29
|
+
}
|
|
35
30
|
}
|
|
36
|
-
|
|
37
|
-
|
|
31
|
+
booleanForValue(value, positive, negative, errorString) {
|
|
32
|
+
let bool = undefined;
|
|
33
|
+
if (value === this.getPrimitiveValue(positive)) {
|
|
34
|
+
bool = true;
|
|
35
|
+
}
|
|
36
|
+
else if (value === this.getPrimitiveValue(negative)) {
|
|
37
|
+
bool = false;
|
|
38
|
+
}
|
|
39
|
+
if (bool === undefined) {
|
|
40
|
+
this.log.error(errorString, this.name, `'${value}'`);
|
|
38
41
|
return;
|
|
39
42
|
}
|
|
40
|
-
|
|
41
|
-
this.on = value;
|
|
42
|
-
this.logIfDesired(this.stringForState(this.on, true));
|
|
43
|
-
this.accessoryService.updateCharacteristic(this.Characteristic.On, this.on);
|
|
44
|
-
this.publish(this.config.topicSetOn, on);
|
|
43
|
+
return bool;
|
|
45
44
|
}
|
|
46
45
|
stringForState(on, future = false) {
|
|
47
46
|
if (on) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onoff.js","sourceRoot":"","sources":["../../../src/accessory/onoff/onoff.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"onoff.js","sourceRoot":"","sources":["../../../src/accessory/onoff/onoff.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEpE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAKzD,MAAM,OAAgB,cAAoD,SAAQ,qBAAwB;IAExG,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAAS,EAAE,GAAQ,EAAE,SAAiB;QACxI,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;QAElE,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAEtC,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,cAAc,CAAC,EAAE,CAAC;aACvD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC5B,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACpC,CAAC;IAEQ,gBAAgB;QACvB,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACjE,CAAC;IAEO,KAAK,CAAC,KAAK;QACjB,OAAO,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;IACxC,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,KAAa,EAAE,KAAqB;QAC3D,MAAM,EAAE,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACtF,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;YACrB,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,KAA0B;QAC9C,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAC1F,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;YACrB,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;QAC9F,CAAC;IACH,CAAC;IAEO,eAAe,CAAC,KAAqB,EAAE,QAAiB,EAAE,QAAiB,EAAE,WAAmB;QAEtG,IAAI,IAAI,GAAwB,SAAS,CAAC;QAC1C,IAAI,KAAK,KAAK,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC/C,IAAI,GAAG,IAAI,CAAC;QACd,CAAC;aAAM,IAAI,KAAK,KAAK,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtD,IAAI,GAAG,KAAK,CAAC;QACf,CAAC;QAED,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,KAAK,GAAG,CAAC,CAAC;YACrD,OAAO;QACT,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,cAAc,CAAC,EAAuB,EAAE,SAAkB,KAAK;QACrE,IAAI,EAAE,EAAE,CAAC;YACP,OAAO,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;QACtE,CAAC;aAAM,CAAC;YACN,OAAO,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC;QACxE,CAAC;IACH,CAAC;CACF"}
|
|
@@ -1,15 +1,11 @@
|
|
|
1
1
|
import { PlatformAccessory, Service } from 'homebridge';
|
|
2
2
|
import { OnOffAccessory } from './onoff.js';
|
|
3
|
-
import { TopicHandler } from '../abstract/base.js';
|
|
4
3
|
import { CharacteristicType, OutletConfig, ServiceType } from '../../model/types.js';
|
|
5
4
|
import { Log } from '../../tools/log.js';
|
|
6
5
|
export declare class OutletAccessory extends OnOffAccessory<OutletConfig> {
|
|
7
|
-
private inUse;
|
|
8
6
|
constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: OutletConfig, log: Log);
|
|
9
7
|
protected getAccessoryService(): Service;
|
|
10
|
-
|
|
8
|
+
addTopicHandlers(): void;
|
|
11
9
|
private getInUse;
|
|
12
10
|
private onInUseUpdate;
|
|
13
|
-
private setInUse;
|
|
14
|
-
private stringForInUse;
|
|
15
11
|
}
|
|
@@ -1,57 +1,25 @@
|
|
|
1
1
|
import { OnOffAccessory } from './onoff.js';
|
|
2
|
-
import { makeHandler } from '../abstract/base.js';
|
|
3
2
|
import { strings } from '../../i18n/i18n.js';
|
|
4
|
-
import {
|
|
3
|
+
import { CharacteristicKey } from '../../model/enums.js';
|
|
5
4
|
export class OutletAccessory extends OnOffAccessory {
|
|
6
|
-
inUse = false;
|
|
7
5
|
constructor(Service, Characteristic, accessory, config, log) {
|
|
8
6
|
super(Service, Characteristic, accessory, config, log, OutletAccessory.name);
|
|
9
|
-
this.
|
|
10
|
-
|
|
11
|
-
.onSet(this.setInUse.bind(this));
|
|
7
|
+
this.set(CharacteristicKey.OutletInUse, false);
|
|
8
|
+
this.bind(Characteristic.OutletInUse, 'topicGetOutletInUse', this.getInUse.bind(this));
|
|
12
9
|
}
|
|
13
10
|
getAccessoryService() {
|
|
14
11
|
return this.accessory.getService(this.Service.Outlet) || this.accessory.addService(this.Service.Outlet);
|
|
15
12
|
}
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
topicHandlers.push(makeHandler(this.config.topicGetOutletInUse, this.onInUseUpdate.bind(this)));
|
|
20
|
-
}
|
|
21
|
-
return topicHandlers;
|
|
13
|
+
addTopicHandlers() {
|
|
14
|
+
super.addTopicHandlers();
|
|
15
|
+
this.addTopicHandler('topicGetOutletInUse', this.onInUseUpdate.bind(this), false);
|
|
22
16
|
}
|
|
23
17
|
async getInUse() {
|
|
24
|
-
return this.
|
|
18
|
+
return this.get(CharacteristicKey.OutletInUse);
|
|
25
19
|
}
|
|
26
20
|
async onInUseUpdate(topic, value) {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
}
|
|
30
|
-
const inUse = value === toPrimitive(this.config.valueOutletInUse);
|
|
31
|
-
if (inUse === this.inUse) {
|
|
32
|
-
return;
|
|
33
|
-
}
|
|
34
|
-
this.inUse = inUse;
|
|
35
|
-
this.accessoryService.updateCharacteristic(this.Characteristic.OutletInUse, this.inUse);
|
|
36
|
-
this.logIfDesired(this.stringForInUse(this.inUse));
|
|
37
|
-
}
|
|
38
|
-
async setInUse(value) {
|
|
39
|
-
if (!this.assert('topicSetOutletInUse', 'valueOutletInUse', 'valueOutletNotInUse')) {
|
|
40
|
-
return;
|
|
41
|
-
}
|
|
42
|
-
const inUse = value ? this.config.valueOutletInUse : this.config.valueOutletNotInUse;
|
|
43
|
-
this.inUse = value;
|
|
44
|
-
this.logIfDesired(this.stringForInUse(this.inUse, true));
|
|
45
|
-
this.accessoryService.updateCharacteristic(this.Characteristic.OutletInUse, this.inUse);
|
|
46
|
-
this.publish(this.config.topicSetOutletInUse, inUse);
|
|
47
|
-
}
|
|
48
|
-
stringForInUse(inUse, future = false) {
|
|
49
|
-
if (inUse) {
|
|
50
|
-
return future ? strings.outlet.futureInUse : strings.outlet.inUse;
|
|
51
|
-
}
|
|
52
|
-
else {
|
|
53
|
-
return future ? strings.outlet.futureNotInUse : strings.outlet.notInUse;
|
|
54
|
-
}
|
|
21
|
+
const inUse = value === this.getPrimitiveValue('valueOutletInUse') ? 1 : 0;
|
|
22
|
+
this.onUpdate(CharacteristicKey.OutletInUse, inUse, inUse ? strings.outlet.inUse : strings.outlet.notInUse);
|
|
55
23
|
}
|
|
56
24
|
}
|
|
57
25
|
//# sourceMappingURL=outlet.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outlet.js","sourceRoot":"","sources":["../../../src/accessory/onoff/outlet.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"outlet.js","sourceRoot":"","sources":["../../../src/accessory/onoff/outlet.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAKzD,MAAM,OAAO,eAAgB,SAAQ,cAA4B;IAE/D,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAAoB,EAAE,GAAQ;QAChI,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;QAE7E,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAE/C,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,qBAAqB,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACzF,CAAC;IAES,mBAAmB;QAC3B,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1G,CAAC;IAEQ,gBAAgB;QACvB,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,IAAI,CAAC,eAAe,CAAC,qBAAqB,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;IACpF,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,OAAO,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IACjD,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,KAAa,EAAE,KAAqB;QAC9D,MAAM,KAAK,GAAG,KAAK,KAAK,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3E,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,WAAW,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC9G,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"switch.js","sourceRoot":"","sources":["../../../src/accessory/onoff/switch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAM5C,MAAM,OAAO,eAAgB,SAAQ,cAA4B;IAE/D,
|
|
1
|
+
{"version":3,"file":"switch.js","sourceRoot":"","sources":["../../../src/accessory/onoff/switch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAM5C,MAAM,OAAO,eAAgB,SAAQ,cAA4B;IAE/D,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAAoB,EAAE,GAAQ;QAChI,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;IAC/E,CAAC;IAES,mBAAmB;QAC3B,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1G,CAAC;CACF"}
|
|
@@ -2,16 +2,11 @@ import { PlatformAccessory, Service } from 'homebridge';
|
|
|
2
2
|
import { StatusActiveAccessory } from './abstract/statusActive.js';
|
|
3
3
|
import { CharacteristicType, SecuritySystemConfig, ServiceType } from '../model/types.js';
|
|
4
4
|
import { Log } from '../tools/log.js';
|
|
5
|
-
import { TopicHandler } from './abstract/base.js';
|
|
6
5
|
export declare class SecuritySystemAccessory extends StatusActiveAccessory<SecuritySystemConfig> {
|
|
7
|
-
private currentState;
|
|
8
|
-
private targetState;
|
|
9
|
-
private isTampered;
|
|
10
|
-
private hasStatusFault;
|
|
11
6
|
private readonly STATE_MAP;
|
|
12
7
|
constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: SecuritySystemConfig, log: Log);
|
|
13
8
|
protected getAccessoryService(): Service;
|
|
14
|
-
|
|
9
|
+
addTopicHandlers(): void;
|
|
15
10
|
private getCurrentState;
|
|
16
11
|
private getTargetState;
|
|
17
12
|
private getIsTampered;
|
|
@@ -20,7 +15,7 @@ export declare class SecuritySystemAccessory extends StatusActiveAccessory<Secur
|
|
|
20
15
|
private onTargetStateUpdate;
|
|
21
16
|
private onTamperedUpdate;
|
|
22
17
|
private onStatusFaultUpdate;
|
|
23
|
-
private
|
|
18
|
+
private onSetTargetState;
|
|
24
19
|
private fromCVState;
|
|
25
20
|
private toCVState;
|
|
26
21
|
private stateStringForCV;
|