homebridge-easy-mqtt 1.2.0 → 1.3.0-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 +11 -1
- package/README.md +72 -5
- package/config.schema.json +37 -0
- package/dist/accessory/abstract/base.d.ts +1 -5
- package/dist/accessory/abstract/base.js +24 -28
- package/dist/accessory/abstract/base.js.map +1 -1
- package/dist/accessory/abstract/customCharacteristic.d.ts +17 -0
- package/dist/accessory/abstract/customCharacteristic.js +65 -0
- package/dist/accessory/abstract/customCharacteristic.js.map +1 -0
- package/dist/accessory/abstract/mqtt.d.ts +7 -10
- package/dist/accessory/abstract/mqtt.js +55 -48
- package/dist/accessory/abstract/mqtt.js.map +1 -1
- package/dist/accessory/lock.d.ts +0 -3
- package/dist/accessory/lock.js +11 -26
- package/dist/accessory/lock.js.map +1 -1
- package/dist/accessory/onoff/lightbulb.d.ts +1 -13
- package/dist/accessory/onoff/lightbulb.js +9 -66
- package/dist/accessory/onoff/lightbulb.js.map +1 -1
- package/dist/accessory/onoff/onoff.d.ts +0 -2
- package/dist/accessory/onoff/onoff.js +1 -11
- package/dist/accessory/onoff/onoff.js.map +1 -1
- package/dist/accessory/onoff/outlet.d.ts +0 -3
- package/dist/accessory/onoff/outlet.js +1 -13
- package/dist/accessory/onoff/outlet.js.map +1 -1
- package/dist/accessory/security.d.ts +0 -7
- package/dist/accessory/security.js +4 -40
- package/dist/accessory/security.js.map +1 -1
- package/dist/accessory/temperatureSensor.d.ts +0 -3
- package/dist/accessory/temperatureSensor.js +5 -17
- package/dist/accessory/temperatureSensor.js.map +1 -1
- package/dist/homebridge-ui/public/index.html +4 -4
- package/dist/homebridge-ui/public/ui.js +1 -1
- package/dist/i18n/en.d.ts +5 -5
- package/dist/i18n/en.js +14 -14
- package/dist/i18n/en.js.map +1 -1
- package/dist/i18n/i18n.d.ts +5 -5
- package/dist/i18n/template.d.ts +5 -5
- package/dist/model/enums.d.ts +1 -0
- package/dist/model/enums.js +1 -0
- package/dist/model/enums.js.map +1 -1
- package/dist/model/mqtt.d.ts +1 -1
- package/dist/model/mqtt.js +60 -32
- package/dist/model/mqtt.js.map +1 -1
- package/dist/model/types.d.ts +14 -0
- package/img/banner.png +0 -0
- package/img/banner.xcf +0 -0
- package/img/icon.png +0 -0
- package/img/icon.xcf +0 -0
- package/img/screenshot_1.png +0 -0
- package/package.json +1 -1
package/dist/accessory/lock.js
CHANGED
|
@@ -5,37 +5,22 @@ import { LogType } from '../tools/log.js';
|
|
|
5
5
|
export class LockMechanismAccessory extends BaseAccessory {
|
|
6
6
|
constructor(Service, Characteristic, accessory, config, log) {
|
|
7
7
|
super(Service, Characteristic, accessory, config, log);
|
|
8
|
-
this.
|
|
9
|
-
|
|
10
|
-
this.
|
|
11
|
-
|
|
12
|
-
this.accessoryService.getCharacteristic(this.Characteristic.LockTargetState)
|
|
13
|
-
.onGet(this.getTargetState.bind(this))
|
|
14
|
-
.onSet(this.onSetTargetState.bind(this));
|
|
15
|
-
}
|
|
16
|
-
getAccessoryService() {
|
|
17
|
-
return this.accessory.getService(this.Service.LockMechanism) || this.accessory.addService(this.Service.LockMechanism);
|
|
18
|
-
}
|
|
19
|
-
addTopicHandlers() {
|
|
20
|
-
super.addTopicHandlers();
|
|
21
|
-
if (this.config.topicGetLockCurrentState !== undefined && this.config.topicGetCurrentLockState === undefined) {
|
|
22
|
-
this.addTopicHandler('topicGetLockCurrentState', this.onCurrentStateUpdate.bind(this));
|
|
23
|
-
}
|
|
24
|
-
else {
|
|
25
|
-
this.addTopicHandler('topicGetCurrentLockState', this.onCurrentStateUpdate.bind(this));
|
|
26
|
-
}
|
|
8
|
+
const getTopicCurrent = this.config.topicGetLockCurrentState !== undefined && this.config.topicGetCurrentLockState === undefined
|
|
9
|
+
? 'topicGetLockCurrentState' : 'topicGetCurrentLockState';
|
|
10
|
+
this.setupCharacteristic(CharacteristicKey.LockCurrentState, Characteristic.LockCurrentState.UNKNOWN, getTopicCurrent, this.onCurrentStateUpdate.bind(this), true);
|
|
11
|
+
let getTargetTopic, setTargetTopic;
|
|
27
12
|
if (this.config.topicGetLockTargetState !== undefined && this.config.topicGetTargetLockState === undefined) {
|
|
28
|
-
|
|
13
|
+
getTargetTopic = 'topicGetLockTargetState';
|
|
14
|
+
setTargetTopic = 'topicSetTargetState';
|
|
29
15
|
}
|
|
30
16
|
else {
|
|
31
|
-
|
|
17
|
+
getTargetTopic = 'topicGetTargetLockState';
|
|
18
|
+
setTargetTopic = 'topicSetTargetLockState';
|
|
32
19
|
}
|
|
20
|
+
this.setupCharacteristic(CharacteristicKey.LockTargetState, Characteristic.LockTargetState.SECURED, getTargetTopic, this.onTargetStateUpdate.bind(this), true, setTargetTopic, this.onSetTargetState.bind(this));
|
|
33
21
|
}
|
|
34
|
-
|
|
35
|
-
return this.
|
|
36
|
-
}
|
|
37
|
-
async getTargetState() {
|
|
38
|
-
return this.get(CharacteristicKey.LockTargetState);
|
|
22
|
+
getAccessoryService() {
|
|
23
|
+
return this.accessory.getService(this.Service.LockMechanism) || this.accessory.addService(this.Service.LockMechanism);
|
|
39
24
|
}
|
|
40
25
|
async onCurrentStateUpdate(topic, value) {
|
|
41
26
|
const current = this.currentStateFromValue(value);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lock.js","sourceRoot":"","sources":["../../src/accessory/lock.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAGtD,OAAO,EAAO,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE/C,MAAM,OAAO,sBAAuB,SAAQ,aAAkC;IAE5E,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAA2B,EAAE,GAAQ;QACvI,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAEvD,
|
|
1
|
+
{"version":3,"file":"lock.js","sourceRoot":"","sources":["../../src/accessory/lock.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,17 +5,5 @@ import { Log } from '../../tools/log.js';
|
|
|
5
5
|
export declare class LightbulbAccessory extends OnOffAccessory<LightbulbConfig> {
|
|
6
6
|
constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: LightbulbConfig, log: Log);
|
|
7
7
|
protected getAccessoryService(): Service;
|
|
8
|
-
|
|
9
|
-
private getBrightness;
|
|
10
|
-
private onBrightnessUpdate;
|
|
11
|
-
private onSetBrightness;
|
|
12
|
-
private getColorTemperature;
|
|
13
|
-
private onColorTemperatureUpdate;
|
|
14
|
-
private onSetColorTemperature;
|
|
15
|
-
private getHue;
|
|
16
|
-
private onHueUpdate;
|
|
17
|
-
private onSetHue;
|
|
18
|
-
private getSaturation;
|
|
19
|
-
private onSaturationUpdate;
|
|
20
|
-
private onSetSaturation;
|
|
8
|
+
private onSetValue;
|
|
21
9
|
}
|
|
@@ -4,76 +4,19 @@ import { CharacteristicKey } from '../../model/enums.js';
|
|
|
4
4
|
export class LightbulbAccessory extends OnOffAccessory {
|
|
5
5
|
constructor(Service, Characteristic, accessory, config, log) {
|
|
6
6
|
super(Service, Characteristic, accessory, config, log);
|
|
7
|
-
this.
|
|
8
|
-
this.
|
|
9
|
-
this.
|
|
10
|
-
this.
|
|
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));
|
|
7
|
+
this.setupCharacteristic(CharacteristicKey.Brightness, 100, 'topicGetBrightness', this.bindOnUpdateNumeric(CharacteristicKey.Brightness, strings.lightbulb.brightness), false, 'topicSetBrightness', this.onSetValue(CharacteristicKey.Brightness, 'topicSetBrightness', strings.lightbulb.futureBrightness));
|
|
8
|
+
this.setupCharacteristic(CharacteristicKey.ColorTemperature, 500, 'topicGetColorTemperature', this.bindOnUpdateNumeric(CharacteristicKey.ColorTemperature, strings.lightbulb.colorTemperature), false, 'topicSetColorTemperature', this.onSetValue(CharacteristicKey.ColorTemperature, 'topicSetColorTemperature', strings.lightbulb.futureColorTemperature));
|
|
9
|
+
this.setupCharacteristic(CharacteristicKey.Hue, 0, 'topicGetHue', this.bindOnUpdateNumeric(CharacteristicKey.Hue, strings.lightbulb.hue), false, 'topicSetHue', this.onSetValue(CharacteristicKey.Hue, 'topicSetHue', strings.lightbulb.futureHue));
|
|
10
|
+
this.setupCharacteristic(CharacteristicKey.Saturation, 100, 'topicGetSaturation', this.bindOnUpdateNumeric(CharacteristicKey.Saturation, strings.lightbulb.saturation), false, 'topicSetSaturation', this.onSetValue(CharacteristicKey.Saturation, 'topicSetSaturation', strings.lightbulb.futureSaturation));
|
|
15
11
|
}
|
|
16
12
|
getAccessoryService() {
|
|
17
13
|
return this.accessory.getService(this.Service.Lightbulb) || this.accessory.addService(this.Service.Lightbulb);
|
|
18
14
|
}
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
this.addTopicHandler('topicGetSaturation', this.onSaturationUpdate.bind(this), false);
|
|
25
|
-
}
|
|
26
|
-
async getBrightness() {
|
|
27
|
-
return this.get(CharacteristicKey.Brightness);
|
|
28
|
-
}
|
|
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);
|
|
38
|
-
}
|
|
39
|
-
async getColorTemperature() {
|
|
40
|
-
return this.get(CharacteristicKey.ColorTemperature);
|
|
41
|
-
}
|
|
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
|
-
}
|
|
47
|
-
}
|
|
48
|
-
async onSetColorTemperature(value) {
|
|
49
|
-
const logString = strings.lightbulb.futureColorTemperature.replace('%d', `${value.toString()}M`);
|
|
50
|
-
this.onSet(CharacteristicKey.ColorTemperature, value, value, 'topicSetColorTemperature', logString);
|
|
51
|
-
}
|
|
52
|
-
async getHue() {
|
|
53
|
-
return this.get(CharacteristicKey.Hue);
|
|
54
|
-
}
|
|
55
|
-
async onHueUpdate(topic, value) {
|
|
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
|
-
}
|
|
60
|
-
}
|
|
61
|
-
async onSetHue(value) {
|
|
62
|
-
const logString = strings.lightbulb.futureHue.replace('%d', `${value.toString()}°`);
|
|
63
|
-
this.onSet(CharacteristicKey.Hue, value, value, 'topicSetHue', logString);
|
|
64
|
-
}
|
|
65
|
-
async getSaturation() {
|
|
66
|
-
return this.get(CharacteristicKey.Saturation);
|
|
67
|
-
}
|
|
68
|
-
async onSaturationUpdate(topic, value) {
|
|
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);
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
async onSetSaturation(value) {
|
|
75
|
-
const logString = strings.lightbulb.futureSaturation.replace('%d', `${value.toString()}%`);
|
|
76
|
-
this.onSet(CharacteristicKey.Saturation, value, value, 'topicSetSaturation', logString);
|
|
15
|
+
onSetValue(key, topic, logTemplate) {
|
|
16
|
+
return (async (value) => {
|
|
17
|
+
const logString = logTemplate.replace('%d', value.toString());
|
|
18
|
+
this.onSet(key, value, value, topic, logString);
|
|
19
|
+
}).bind(this);
|
|
77
20
|
}
|
|
78
21
|
}
|
|
79
22
|
//# sourceMappingURL=lightbulb.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lightbulb.js","sourceRoot":"","sources":["../../../src/accessory/onoff/lightbulb.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAK7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,MAAM,OAAO,kBAAmB,SAAQ,cAA+B;IAErE,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAAuB,EAAE,GAAQ;QACnI,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAEvD,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"lightbulb.js","sourceRoot":"","sources":["../../../src/accessory/onoff/lightbulb.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAK7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,MAAM,OAAO,kBAAmB,SAAQ,cAA+B;IAErE,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAAuB,EAAE,GAAQ;QACnI,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAEvD,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,UAAU,EAAE,GAAG,EACxD,oBAAoB,EAAE,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,UAAU,EAAE,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,KAAK,EACjH,oBAAoB,EAAE,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,UAAU,EAAE,oBAAoB,EAAE,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAC9H,CAAC;QAEF,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,GAAG,EAC9D,0BAA0B,EAAE,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,KAAK,EACnI,0BAA0B,EAAE,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,0BAA0B,EAAE,OAAO,CAAC,SAAS,CAAC,sBAAsB,CAAC,CACtJ,CAAC;QAEF,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,GAAG,EAAE,CAAC,EAC/C,aAAa,EAAE,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,GAAG,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,KAAK,EAC5F,aAAa,EAAE,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,GAAG,EAAE,aAAa,EAAE,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAClG,CAAC;QAEF,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,UAAU,EAAE,GAAG,EACxD,oBAAoB,EAAE,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,UAAU,EAAE,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,KAAK,EACjH,oBAAoB,EAAE,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,UAAU,EAAE,oBAAoB,EAAE,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAC9H,CAAC;IACJ,CAAC;IAES,mBAAmB;QAC3B,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAChH,CAAC;IAEO,UAAU,CAAC,GAAsB,EAAE,KAA4B,EAAE,WAAmB;QAC1F,OAAO,CAAC,KAAK,EAAE,KAA0B,EAAE,EAAE;YAC3C,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC9D,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,KAAe,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC;CACF"}
|
|
@@ -4,8 +4,6 @@ import { CharacteristicType, OnOffConfig, ServiceType } from '../../model/types.
|
|
|
4
4
|
import { Log } from '../../tools/log.js';
|
|
5
5
|
export declare abstract class OnOffAccessory<C extends OnOffConfig = OnOffConfig> extends BaseAccessory<C> {
|
|
6
6
|
constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: C, log: Log);
|
|
7
|
-
addTopicHandlers(): void;
|
|
8
|
-
private getOn;
|
|
9
7
|
private onOnUpdate;
|
|
10
8
|
private onSetOn;
|
|
11
9
|
private booleanForValue;
|
|
@@ -4,17 +4,7 @@ import { CharacteristicKey } from '../../model/enums.js';
|
|
|
4
4
|
export class OnOffAccessory extends BaseAccessory {
|
|
5
5
|
constructor(Service, Characteristic, accessory, config, log) {
|
|
6
6
|
super(Service, Characteristic, accessory, config, log);
|
|
7
|
-
this.
|
|
8
|
-
this.accessoryService.getCharacteristic(Characteristic.On)
|
|
9
|
-
.onGet(this.getOn.bind(this))
|
|
10
|
-
.onSet(this.onSetOn.bind(this));
|
|
11
|
-
}
|
|
12
|
-
addTopicHandlers() {
|
|
13
|
-
super.addTopicHandlers();
|
|
14
|
-
this.addTopicHandler('topicGetOn', this.onOnUpdate.bind(this));
|
|
15
|
-
}
|
|
16
|
-
async getOn() {
|
|
17
|
-
return this.get(CharacteristicKey.On);
|
|
7
|
+
this.setupCharacteristic(CharacteristicKey.On, false, 'topicGetOn', this.onOnUpdate.bind(this), true, 'topicSetOn', this.onSetOn.bind(this));
|
|
18
8
|
}
|
|
19
9
|
async onOnUpdate(topic, value) {
|
|
20
10
|
const on = this.booleanForValue(value, 'valueOn', 'valueOff');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onoff.js","sourceRoot":"","sources":["../../../src/accessory/onoff/onoff.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAKzD,MAAM,OAAgB,cAAoD,SAAQ,aAAgB;IAEhG,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAAS,EAAE,GAAQ;QACrH,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAEvD,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"onoff.js","sourceRoot":"","sources":["../../../src/accessory/onoff/onoff.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAKzD,MAAM,OAAgB,cAAoD,SAAQ,aAAgB;IAEhG,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAAS,EAAE,GAAQ;QACrH,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAEvD,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,EAAE,EAAE,KAAK,EAClD,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAC9C,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CACtC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,KAAa,EAAE,KAAqB;QAC3D,MAAM,EAAE,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QAC9D,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;QAEjF,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,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,IAAI,KAAK,GAAG,CAAC,CAAC;YAC5D,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"}
|
|
@@ -5,7 +5,4 @@ import { Log } from '../../tools/log.js';
|
|
|
5
5
|
export declare class OutletAccessory extends OnOffAccessory<OutletConfig> {
|
|
6
6
|
constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: OutletConfig, log: Log);
|
|
7
7
|
protected getAccessoryService(): Service;
|
|
8
|
-
addTopicHandlers(): void;
|
|
9
|
-
private getInUse;
|
|
10
|
-
private onInUseUpdate;
|
|
11
8
|
}
|
|
@@ -4,22 +4,10 @@ import { CharacteristicKey } from '../../model/enums.js';
|
|
|
4
4
|
export class OutletAccessory extends OnOffAccessory {
|
|
5
5
|
constructor(Service, Characteristic, accessory, config, log) {
|
|
6
6
|
super(Service, Characteristic, accessory, config, log);
|
|
7
|
-
this.
|
|
8
|
-
this.bind(Characteristic.OutletInUse, 'topicGetOutletInUse', this.getInUse.bind(this));
|
|
7
|
+
this.setupCharacteristic(CharacteristicKey.OutletInUse, false, 'topicGetOutletInUse', this.bindOnUpdateNumericBoolean(CharacteristicKey.OutletInUse, 'valueOutletInUse', strings.outlet.inUse, strings.outlet.notInUse), false);
|
|
9
8
|
}
|
|
10
9
|
getAccessoryService() {
|
|
11
10
|
return this.accessory.getService(this.Service.Outlet) || this.accessory.addService(this.Service.Outlet);
|
|
12
11
|
}
|
|
13
|
-
addTopicHandlers() {
|
|
14
|
-
super.addTopicHandlers();
|
|
15
|
-
this.addTopicHandler('topicGetOutletInUse', this.onInUseUpdate.bind(this), false);
|
|
16
|
-
}
|
|
17
|
-
async getInUse() {
|
|
18
|
-
return this.get(CharacteristicKey.OutletInUse);
|
|
19
|
-
}
|
|
20
|
-
async onInUseUpdate(topic, value) {
|
|
21
|
-
const inUse = value === this.getPrimitiveValue('valueOutletInUse') ? 1 : 0;
|
|
22
|
-
this.onUpdate(CharacteristicKey.OutletInUse, inUse, inUse ? strings.outlet.inUse : strings.outlet.notInUse);
|
|
23
|
-
}
|
|
24
12
|
}
|
|
25
13
|
//# 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;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,CAAC,CAAC;QAEvD,IAAI,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,CAAC,CAAC;QAEvD,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,WAAW,EAAE,KAAK,EAAE,qBAAqB,EAClF,IAAI,CAAC,0BAA0B,CAAC,iBAAiB,CAAC,WAAW,EAAE,kBAAkB,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EACjI,KAAK,CACN,CAAC;IACJ,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"}
|
|
@@ -6,15 +6,8 @@ export declare class SecuritySystemAccessory extends BaseAccessory<SecuritySyste
|
|
|
6
6
|
private readonly STATE_MAP;
|
|
7
7
|
constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: SecuritySystemConfig, log: Log);
|
|
8
8
|
protected getAccessoryService(): Service;
|
|
9
|
-
addTopicHandlers(): void;
|
|
10
|
-
private getCurrentState;
|
|
11
|
-
private getTargetState;
|
|
12
|
-
private getIsTampered;
|
|
13
|
-
private getHasStatusFault;
|
|
14
9
|
private onCurrentStateUpdate;
|
|
15
10
|
private onTargetStateUpdate;
|
|
16
|
-
private onTamperedUpdate;
|
|
17
|
-
private onStatusFaultUpdate;
|
|
18
11
|
private onSetTargetState;
|
|
19
12
|
private fromCVState;
|
|
20
13
|
private toCVState;
|
|
@@ -6,10 +6,6 @@ export class SecuritySystemAccessory extends BaseAccessory {
|
|
|
6
6
|
STATE_MAP;
|
|
7
7
|
constructor(Service, Characteristic, accessory, config, log) {
|
|
8
8
|
super(Service, Characteristic, accessory, config, log);
|
|
9
|
-
this.set(CharacteristicKey.SecuritySystemCurrentState, Characteristic.SecuritySystemCurrentState.DISARMED);
|
|
10
|
-
this.set(CharacteristicKey.SecuritySystemTargetState, Characteristic.SecuritySystemTargetState.DISARM);
|
|
11
|
-
this.set(CharacteristicKey.StatusTampered, 0);
|
|
12
|
-
this.set(CharacteristicKey.StatusFault, 0);
|
|
13
9
|
this.STATE_MAP = new Map([
|
|
14
10
|
['valueArmStay', Characteristic.SecuritySystemCurrentState.STAY_ARM],
|
|
15
11
|
['valueArmAway', Characteristic.SecuritySystemCurrentState.AWAY_ARM],
|
|
@@ -22,39 +18,15 @@ export class SecuritySystemAccessory extends BaseAccessory {
|
|
|
22
18
|
this.log.error(strings.security.noStateValues, this.name);
|
|
23
19
|
return;
|
|
24
20
|
}
|
|
25
|
-
this.
|
|
26
|
-
.setProps({ validValues: validCurrentStates.map((key) => this.STATE_MAP.get(key)) })
|
|
27
|
-
.onGet(this.getCurrentState.bind(this));
|
|
21
|
+
this.setupCharacteristic(CharacteristicKey.SecuritySystemCurrentState, Characteristic.SecuritySystemCurrentState.DISARMED, 'topicGetCurrentSecurityState', this.onCurrentStateUpdate.bind(this), true)?.setProps({ validValues: validCurrentStates.map((key) => this.STATE_MAP.get(key)) });
|
|
28
22
|
const validTargetStates = validCurrentStates.filter((key) => key !== 'valueAlarmTriggered');
|
|
29
|
-
this.
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
.onSet(this.onSetTargetState.bind(this));
|
|
33
|
-
this.bind(Characteristic.StatusTampered, 'topicGetStatusTampered', this.getIsTampered.bind(this));
|
|
34
|
-
this.bind(Characteristic.StatusFault, 'topicGetStatusFault', this.getHasStatusFault.bind(this));
|
|
23
|
+
this.setupCharacteristic(CharacteristicKey.SecuritySystemTargetState, Characteristic.SecuritySystemTargetState.DISARM, 'topicGetTargetSecurityState', this.onTargetStateUpdate.bind(this), true, 'topicSetTargetSecurityState', this.onSetTargetState.bind(this))?.setProps({ validValues: validTargetStates.map((key) => this.STATE_MAP.get(key)) });
|
|
24
|
+
this.setupCharacteristic(CharacteristicKey.StatusTampered, 0, 'topicGetStatusTampered', this.bindOnUpdateNumericBoolean(CharacteristicKey.StatusTampered, 'valueTampered', strings.security.isTampered, strings.security.notTampered), false);
|
|
25
|
+
this.setupCharacteristic(CharacteristicKey.StatusFault, 0, 'topicGetStatusFault', this.bindOnUpdateNumericBoolean(CharacteristicKey.StatusFault, 'valueFault', strings.security.hasFault, strings.security.noFault), false);
|
|
35
26
|
}
|
|
36
27
|
getAccessoryService() {
|
|
37
28
|
return this.accessory.getService(this.Service.SecuritySystem) || this.accessory.addService(this.Service.SecuritySystem);
|
|
38
29
|
}
|
|
39
|
-
addTopicHandlers() {
|
|
40
|
-
super.addTopicHandlers();
|
|
41
|
-
this.addTopicHandler('topicGetCurrentSecurityState', this.onCurrentStateUpdate.bind(this));
|
|
42
|
-
this.addTopicHandler('topicGetTargetSecurityState', this.onTargetStateUpdate.bind(this));
|
|
43
|
-
this.addTopicHandler('topicGetStatusTampered', this.onTamperedUpdate.bind(this), false);
|
|
44
|
-
this.addTopicHandler('topicGetStatusFault', this.onStatusFaultUpdate.bind(this), false);
|
|
45
|
-
}
|
|
46
|
-
async getCurrentState() {
|
|
47
|
-
return this.get(CharacteristicKey.SecuritySystemCurrentState);
|
|
48
|
-
}
|
|
49
|
-
async getTargetState() {
|
|
50
|
-
return this.get(CharacteristicKey.SecuritySystemTargetState);
|
|
51
|
-
}
|
|
52
|
-
async getIsTampered() {
|
|
53
|
-
return this.get(CharacteristicKey.StatusTampered);
|
|
54
|
-
}
|
|
55
|
-
async getHasStatusFault() {
|
|
56
|
-
return this.get(CharacteristicKey.StatusFault);
|
|
57
|
-
}
|
|
58
30
|
async onCurrentStateUpdate(topic, value) {
|
|
59
31
|
const current = this.toCVState(value);
|
|
60
32
|
if (current === undefined) {
|
|
@@ -80,14 +52,6 @@ export class SecuritySystemAccessory extends BaseAccessory {
|
|
|
80
52
|
}
|
|
81
53
|
this.onUpdate(CharacteristicKey.SecuritySystemTargetState, target, this.stateStringForCV(target, true));
|
|
82
54
|
}
|
|
83
|
-
async onTamperedUpdate(topic, value) {
|
|
84
|
-
const statusTampered = value === this.getPrimitiveValue('valueTampered') ? 1 : 0;
|
|
85
|
-
this.onUpdate(CharacteristicKey.StatusTampered, statusTampered, statusTampered ? strings.security.isTampered : strings.security.notTampered);
|
|
86
|
-
}
|
|
87
|
-
async onStatusFaultUpdate(topic, value) {
|
|
88
|
-
const statusFault = value === this.getPrimitiveValue('valueFault') ? 1 : 0;
|
|
89
|
-
this.onUpdate(CharacteristicKey.StatusFault, statusFault, statusFault ? strings.security.hasFault : strings.security.noFault);
|
|
90
|
-
}
|
|
91
55
|
async onSetTargetState(value) {
|
|
92
56
|
const target = this.fromCVState(value);
|
|
93
57
|
if (target === undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"security.js","sourceRoot":"","sources":["../../src/accessory/security.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAI1C,OAAO,EAAO,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,MAAM,OAAO,uBAAwB,SAAQ,aAAmC;IAE7D,SAAS,CAA0C;IAEpE,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAA4B,EAAE,GAAQ;QACxI,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAEvD,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"security.js","sourceRoot":"","sources":["../../src/accessory/security.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,10 +3,7 @@ import { BaseAccessory } from './abstract/base.js';
|
|
|
3
3
|
import { CharacteristicType, ServiceType, TemperatureSensorConfig } from '../model/types.js';
|
|
4
4
|
import { Log } from '../tools/log.js';
|
|
5
5
|
export declare class TemperatureSensorAccessory extends BaseAccessory<TemperatureSensorConfig> {
|
|
6
|
-
private currentTemperature;
|
|
7
6
|
constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: TemperatureSensorConfig, log: Log);
|
|
8
7
|
protected getAccessoryService(): Service;
|
|
9
|
-
addTopicHandlers(): void;
|
|
10
8
|
private onCurrentTemperatureUpdate;
|
|
11
|
-
private getCurrentTemperature;
|
|
12
9
|
}
|
|
@@ -2,36 +2,24 @@ import { BaseAccessory } from './abstract/base.js';
|
|
|
2
2
|
import { strings } from '../i18n/i18n.js';
|
|
3
3
|
import { toNumber } from '../tools/primitive.js';
|
|
4
4
|
import { toCelsius } from '../tools/temperature.js';
|
|
5
|
-
import { TemperatureUnits } from '../model/enums.js';
|
|
5
|
+
import { CharacteristicKey, TemperatureUnits } from '../model/enums.js';
|
|
6
6
|
export class TemperatureSensorAccessory extends BaseAccessory {
|
|
7
|
-
currentTemperature = 0;
|
|
8
7
|
constructor(Service, Characteristic, accessory, config, log) {
|
|
9
8
|
super(Service, Characteristic, accessory, config, log);
|
|
10
|
-
this.
|
|
11
|
-
.onGet(this.getCurrentTemperature.bind(this));
|
|
9
|
+
this.setupCharacteristic(CharacteristicKey.CurrentTemperature, 0, 'topicGetCurrentTemperature', this.onCurrentTemperatureUpdate.bind(this), true);
|
|
12
10
|
}
|
|
13
11
|
getAccessoryService() {
|
|
14
12
|
return this.accessory.getService(this.Service.TemperatureSensor) || this.accessory.addService(this.Service.TemperatureSensor);
|
|
15
13
|
}
|
|
16
|
-
addTopicHandlers() {
|
|
17
|
-
super.addTopicHandlers();
|
|
18
|
-
this.addTopicHandler('topicGetCurrentTemperature', this.onCurrentTemperatureUpdate.bind(this));
|
|
19
|
-
}
|
|
20
14
|
async onCurrentTemperatureUpdate(topic, value) {
|
|
21
|
-
if (
|
|
15
|
+
if (typeof value !== 'number') {
|
|
16
|
+
this.log.error(strings.temperatureSensor.badValue, this.name, `'${value}'`);
|
|
22
17
|
return;
|
|
23
18
|
}
|
|
24
19
|
const units = this.config.temperatureUnits ?? TemperatureUnits.CELSIUS;
|
|
25
20
|
const temperature = toCelsius(toNumber(value), units);
|
|
26
|
-
|
|
27
|
-
return;
|
|
28
|
-
}
|
|
29
|
-
this.currentTemperature = temperature;
|
|
30
|
-
this.accessoryService.updateCharacteristic(this.Characteristic.CurrentTemperature, this.currentTemperature);
|
|
21
|
+
this.onUpdate(CharacteristicKey.CurrentTemperature, temperature);
|
|
31
22
|
this.logIfDesired(strings.temperatureSensor.temperature, value.toString(), units);
|
|
32
23
|
}
|
|
33
|
-
async getCurrentTemperature() {
|
|
34
|
-
return this.currentTemperature;
|
|
35
|
-
}
|
|
36
24
|
}
|
|
37
25
|
//# sourceMappingURL=temperatureSensor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"temperatureSensor.js","sourceRoot":"","sources":["../../src/accessory/temperatureSensor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAK1C,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"temperatureSensor.js","sourceRoot":"","sources":["../../src/accessory/temperatureSensor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAK1C,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAExE,MAAM,OAAO,0BAA2B,SAAQ,aAAsC;IAEpF,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAA+B,EAAE,GAAQ;QAC3I,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAEvD,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,CAAC,EAAE,4BAA4B,EAAE,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;IACpJ,CAAC;IAES,mBAAmB;QAC3B,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAChI,CAAC;IAEO,KAAK,CAAC,0BAA0B,CAAC,KAAa,EAAE,KAAqB;QAE3E,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,KAAK,GAAG,CAAC,CAAC;YAC5E,OAAO;QACT,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,OAAO,CAAC;QACvE,MAAM,WAAW,GAAG,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;QAEtD,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,WAAW,CAAC,CAAC;QAEjE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,iBAAiB,CAAC,WAAW,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,CAAC;IACpF,CAAC;CACF"}
|
|
@@ -5,13 +5,13 @@
|
|
|
5
5
|
}
|
|
6
6
|
</style>
|
|
7
7
|
|
|
8
|
-
|
|
8
|
+
<p class="text-center">
|
|
9
9
|
<img
|
|
10
|
-
src="https://
|
|
10
|
+
src="https://raw.githubusercontent.com/mpatfield/homebridge-easy-mqtt/refs/heads/latest/img/banner.png"
|
|
11
11
|
alt="homebridge-easy-mqtt"
|
|
12
12
|
style="width: 60%;"
|
|
13
13
|
/>
|
|
14
|
-
</p>
|
|
14
|
+
</p>
|
|
15
15
|
|
|
16
16
|
<div id="support" class="text-center" style="display: none;">
|
|
17
17
|
<p i18n="support" i18n_replace="github"></p>
|
|
@@ -24,4 +24,4 @@
|
|
|
24
24
|
|
|
25
25
|
<footer id="footer" class="text-center" style="display: none; font-style: italic; font-size: 0.9em;" i18n="required"></footer>
|
|
26
26
|
|
|
27
|
-
<script src="ui.js?v=1.
|
|
27
|
+
<script src="ui.js?v=1.3.0-beta.1"></script>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";(()=>{var
|
|
1
|
+
"use strict";(()=>{var u={arrow:"→",easy_mqtt:"Easy MQTT",github:'<a target="_blank" href="https://github.com/mpatfield/homebridge-easy-mqtt/">GitHub</a>'};function g(n){document.querySelectorAll("[i18n]").forEach(t=>{let o=t.getAttribute("i18n"),r=n.config[o],e=t.getAttribute("i18n_replace");e&&(r=r.replace("%s",u[e])),t.innerHTML=r})}function f(n){let t=["span","label","legend","option","p"];Array.from(window.parent.document.querySelectorAll(t.join(","))).sort((r,e)=>t.indexOf(r.tagName.toLowerCase())-t.indexOf(e.tagName.toLowerCase())).forEach(r=>{let e=r.innerHTML;e=e.replaceAll(/\$\{config\.(title|description|enumNames)\.([^}]+)\}/g,(l,i,a)=>n.config[i]&&typeof n.config[i]=="object"&&a in n.config[i]?n.config[i][a]:l),r.innerHTML!==e&&(r.innerHTML=e)})}function s(n){let t=Array.from(window.parent.document.querySelectorAll("fieldset legend"));for(let o of t){let e=o.closest("fieldset")?.querySelector('input[type="text"][name="name"]');e&&o.textContent!==(e.value||n.config.title.accessory)&&(o.textContent=e.value!==""?e.value:n.config.title.accessory),e&&!e.dataset.accessoryNameListener&&(e.addEventListener("input",()=>s(n)),e.dataset.accessoryNameListener="true")}}function d(){if(typeof crypto<"u"){if(crypto.randomUUID)return crypto.randomUUID();if(crypto.getRandomValues)return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,n=>{let t=crypto.getRandomValues(new Uint8Array(1))[0]&15;return(n==="x"?t:t&3|8).toString(16)})}return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,n=>{let t=Math.random()*16|0;return(n==="x"?t:t&3|8).toString(16)})}function m(n){let t=!1;n.accessories?.forEach(o=>{if(o.info.id===void 0){let r=d();o.info.id=r,t=!0}}),t&&homebridge.updatePluginConfig([n])}async function x(n){let t=!1;for(let o of n)for(let r of o.accessories??[]){if(r.info.type!=="LockMechanism")continue;let e=r;e.topicGetLockCurrentState!==void 0&&(e.topicGetCurrentLockState=e.topicGetLockCurrentState,e.topicGetLockCurrentState=void 0,t=!0),e.topicGetLockTargetState!==void 0&&(e.topicGetTargetLockState=e.topicGetLockTargetState,e.topicGetLockTargetState=void 0,t=!0),e.topicSetTargetState!==void 0&&(e.topicSetTargetLockState=e.topicSetTargetState,e.topicSetTargetState=void 0,t=!0)}t&&await homebridge.updatePluginConfig(n)}function c(n){document.getElementById("pageIntro").style.display="none",document.getElementById("support").style.display="block",document.getElementById("footer").style.display="block",new MutationObserver(()=>{f(n),s(n)}).observe(window.parent.document.body,{childList:!0,subtree:!0}),homebridge.showSchemaForm(),homebridge.addEventListener("configChanged",o=>{let r=o.data;r.length&&m(r[0])}),homebridge.hideSpinner()}function p(n){document.getElementById("introContinue").addEventListener("click",async()=>{c(n)}),document.getElementById("pageIntro").style.display="block",homebridge.hideSpinner()}homebridge.showSpinner();(async()=>{let n=await homebridge.i18nCurrentLang(),t=await homebridge.request("i18n",n);g(t);let o=await homebridge.getPluginConfig();o.length?(await x(o),c(t)):(await homebridge.updatePluginConfig([{name:u.easy_mqtt}]),p(t))})();})();
|
package/dist/i18n/en.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
declare const en: {
|
|
2
2
|
accessory: {
|
|
3
|
-
|
|
3
|
+
badNumericValue: string;
|
|
4
4
|
batteryLevel: string;
|
|
5
5
|
batteryLow: string;
|
|
6
6
|
batteryNotLow: string;
|
|
@@ -82,11 +82,11 @@ declare const en: {
|
|
|
82
82
|
verbose: string;
|
|
83
83
|
};
|
|
84
84
|
};
|
|
85
|
+
characteristic: {
|
|
86
|
+
badValue: string;
|
|
87
|
+
updated: string;
|
|
88
|
+
};
|
|
85
89
|
lightbulb: {
|
|
86
|
-
badBrightness: string;
|
|
87
|
-
badColorTemperature: string;
|
|
88
|
-
badHue: string;
|
|
89
|
-
badSaturation: string;
|
|
90
90
|
brightness: string;
|
|
91
91
|
futureBrightness: string;
|
|
92
92
|
hue: string;
|
package/dist/i18n/en.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
const en = {
|
|
2
2
|
accessory: {
|
|
3
|
-
|
|
4
|
-
batteryLevel: '%s battery is at %d',
|
|
3
|
+
badNumericValue: '%s expected a number for %s but received %s',
|
|
4
|
+
batteryLevel: '%s battery is at %d%',
|
|
5
5
|
batteryLow: '%s battery is low',
|
|
6
6
|
batteryNotLow: '%s battery is okay',
|
|
7
7
|
missingRequired: '%s is missing required config variable %s',
|
|
@@ -82,19 +82,19 @@ const en = {
|
|
|
82
82
|
verbose: 'Additional Logging',
|
|
83
83
|
},
|
|
84
84
|
},
|
|
85
|
+
characteristic: {
|
|
86
|
+
badValue: '%s expected a number for %s but received %s',
|
|
87
|
+
updated: '%s updated %s with value %s',
|
|
88
|
+
},
|
|
85
89
|
lightbulb: {
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
colorTemperature: '%s color temperature is %d',
|
|
95
|
-
futureColorTemperature: 'Setting %s color temperature to %d…',
|
|
96
|
-
saturation: '%s saturation is %d',
|
|
97
|
-
futureSaturation: 'Setting %s saturation to %d…',
|
|
90
|
+
brightness: '%s brightness is %d%',
|
|
91
|
+
futureBrightness: 'Setting %s brightness to %d%…',
|
|
92
|
+
hue: '%s hue is %d°',
|
|
93
|
+
futureHue: 'Setting %s hue to %d°…',
|
|
94
|
+
colorTemperature: '%s color temperature is %dM',
|
|
95
|
+
futureColorTemperature: 'Setting %s color temperature to %dM…',
|
|
96
|
+
saturation: '%s saturation is %d%',
|
|
97
|
+
futureSaturation: 'Setting %s saturation to %d%…',
|
|
98
98
|
},
|
|
99
99
|
lock: {
|
|
100
100
|
badValue: '%s unable to determine lock state from %s',
|