homebridge-easy-mqtt 1.2.0-beta.0 → 1.2.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 +6 -1
- package/config.schema.json +2 -3
- package/dist/accessory/abstract/base.d.ts +17 -10
- package/dist/accessory/abstract/base.js +74 -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 +11 -20
- package/dist/accessory/abstract/statusActive.js.map +1 -1
- package/dist/accessory/lock.d.ts +3 -6
- package/dist/accessory/lock.js +38 -62
- package/dist/accessory/lock.js.map +1 -1
- package/dist/accessory/onoff/lightbulb.d.ts +9 -17
- package/dist/accessory/onoff/lightbulb.js +53 -70
- package/dist/accessory/onoff/lightbulb.js.map +1 -1
- package/dist/accessory/onoff/onoff.d.ts +5 -6
- package/dist/accessory/onoff/onoff.js +28 -29
- package/dist/accessory/onoff/onoff.js.map +1 -1
- package/dist/accessory/onoff/outlet.d.ts +2 -4
- package/dist/accessory/onoff/outlet.js +14 -27
- 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 +42 -77
- 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/i18n/en.d.ts +8 -2
- package/dist/i18n/en.js +54 -48
- package/dist/i18n/en.js.map +1 -1
- package/dist/i18n/i18n.d.ts +8 -2
- package/dist/i18n/template.d.ts +8 -2
- 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 +2 -2
- package/dist/tools/primitive.d.ts +3 -3
- package/dist/tools/primitive.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,17 +1,14 @@
|
|
|
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 SecuritySystemAccessory extends StatusActiveAccessory {
|
|
6
|
-
currentState;
|
|
7
|
-
targetState;
|
|
8
|
-
isTampered = 0;
|
|
9
|
-
hasStatusFault = 0;
|
|
10
5
|
STATE_MAP;
|
|
11
6
|
constructor(Service, Characteristic, accessory, config, log) {
|
|
12
7
|
super(Service, Characteristic, accessory, config, log, SecuritySystemAccessory.name);
|
|
13
|
-
this.
|
|
14
|
-
this.
|
|
8
|
+
this.set(CharacteristicKey.SecuritySystemCurrentState, Characteristic.SecuritySystemCurrentState.DISARMED);
|
|
9
|
+
this.set(CharacteristicKey.SecuritySystemTargetState, Characteristic.SecuritySystemTargetState.DISARM);
|
|
10
|
+
this.set(CharacteristicKey.StatusTampered, 0);
|
|
11
|
+
this.set(CharacteristicKey.StatusFault, 0);
|
|
15
12
|
this.STATE_MAP = new Map([
|
|
16
13
|
['valueArmStay', Characteristic.SecuritySystemCurrentState.STAY_ARM],
|
|
17
14
|
['valueArmAway', Characteristic.SecuritySystemCurrentState.AWAY_ARM],
|
|
@@ -19,7 +16,7 @@ export class SecuritySystemAccessory extends StatusActiveAccessory {
|
|
|
19
16
|
['valueDisarm', Characteristic.SecuritySystemCurrentState.DISARMED],
|
|
20
17
|
['valueAlarmTriggered', Characteristic.SecuritySystemCurrentState.ALARM_TRIGGERED],
|
|
21
18
|
]);
|
|
22
|
-
const validCurrentStates = Array.from(this.STATE_MAP.keys()).filter((key) => this.
|
|
19
|
+
const validCurrentStates = Array.from(this.STATE_MAP.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
|
|
23
20
|
if (validCurrentStates.length === 0) {
|
|
24
21
|
this.log.error(strings.security.noStateValues, this.name);
|
|
25
22
|
return;
|
|
@@ -31,7 +28,7 @@ export class SecuritySystemAccessory extends StatusActiveAccessory {
|
|
|
31
28
|
this.accessoryService.getCharacteristic(Characteristic.SecuritySystemTargetState)
|
|
32
29
|
.setProps({ validValues: validTargetStates.map((key) => this.STATE_MAP.get(key)) })
|
|
33
30
|
.onGet(this.getTargetState.bind(this))
|
|
34
|
-
.onSet(this.
|
|
31
|
+
.onSet(this.onSetTargetState.bind(this));
|
|
35
32
|
this.accessoryService.getCharacteristic(Characteristic.StatusTampered)
|
|
36
33
|
.onGet(this.getIsTampered.bind(this));
|
|
37
34
|
this.accessoryService.getCharacteristic(Characteristic.StatusFault)
|
|
@@ -40,120 +37,88 @@ export class SecuritySystemAccessory extends StatusActiveAccessory {
|
|
|
40
37
|
getAccessoryService() {
|
|
41
38
|
return this.accessory.getService(this.Service.SecuritySystem) || this.accessory.addService(this.Service.SecuritySystem);
|
|
42
39
|
}
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
topicHandlers.push(makeHandler(this.config.topicGetTargetSecurityState, this.onTargetStateUpdate.bind(this)));
|
|
50
|
-
if (this.config.topicGetStatusTampered) {
|
|
51
|
-
topicHandlers.push(makeHandler(this.config.topicGetStatusTampered, this.onTamperedUpdate.bind(this)));
|
|
52
|
-
}
|
|
53
|
-
if (this.config.topicGetStatusFault) {
|
|
54
|
-
topicHandlers.push(makeHandler(this.config.topicGetStatusFault, this.onStatusFaultUpdate.bind(this)));
|
|
55
|
-
}
|
|
56
|
-
return topicHandlers;
|
|
40
|
+
addTopicHandlers() {
|
|
41
|
+
super.addTopicHandlers();
|
|
42
|
+
this.addTopicHandler('topicGetCurrentSecurityState', this.onCurrentStateUpdate.bind(this));
|
|
43
|
+
this.addTopicHandler('topicGetTargetSecurityState', this.onTargetStateUpdate.bind(this));
|
|
44
|
+
this.addTopicHandler('topicGetStatusTampered', this.onTamperedUpdate.bind(this), false);
|
|
45
|
+
this.addTopicHandler('topicGetStatusFault', this.onStatusFaultUpdate.bind(this), false);
|
|
57
46
|
}
|
|
58
47
|
async getCurrentState() {
|
|
59
|
-
return this.
|
|
48
|
+
return this.get(CharacteristicKey.SecuritySystemCurrentState);
|
|
60
49
|
}
|
|
61
50
|
async getTargetState() {
|
|
62
|
-
return this.
|
|
51
|
+
return this.get(CharacteristicKey.SecuritySystemTargetState);
|
|
63
52
|
}
|
|
64
53
|
async getIsTampered() {
|
|
65
|
-
return this.
|
|
54
|
+
return this.get(CharacteristicKey.StatusTampered);
|
|
66
55
|
}
|
|
67
56
|
async getHasStatusFault() {
|
|
68
|
-
return this.
|
|
57
|
+
return this.get(CharacteristicKey.StatusFault);
|
|
69
58
|
}
|
|
70
59
|
async onCurrentStateUpdate(topic, value) {
|
|
71
60
|
const current = this.toCVState(value);
|
|
72
|
-
if (current === undefined
|
|
61
|
+
if (current === undefined) {
|
|
73
62
|
return;
|
|
74
63
|
}
|
|
75
|
-
this.
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
this.
|
|
79
|
-
|
|
80
|
-
|
|
64
|
+
if (current <= this.Characteristic.SecuritySystemTargetState.DISARM) {
|
|
65
|
+
this.onUpdate(CharacteristicKey.SecuritySystemTargetState, current);
|
|
66
|
+
}
|
|
67
|
+
if (!this.onUpdate(CharacteristicKey.SecuritySystemCurrentState, current)) {
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
if (current === this.Characteristic.SecuritySystemCurrentState.ALARM_TRIGGERED) {
|
|
71
|
+
this.log.error(this.stateStringForCV(current), this.name);
|
|
81
72
|
}
|
|
82
73
|
else {
|
|
83
|
-
this.logIfDesired(this.stateStringForCV(
|
|
74
|
+
this.logIfDesired(this.stateStringForCV(current));
|
|
84
75
|
}
|
|
85
76
|
}
|
|
86
77
|
async onTargetStateUpdate(topic, value) {
|
|
87
78
|
const target = this.toCVState(value);
|
|
88
|
-
if (target === undefined
|
|
79
|
+
if (target === undefined) {
|
|
89
80
|
return;
|
|
90
81
|
}
|
|
91
|
-
this.
|
|
92
|
-
this.accessoryService.updateCharacteristic(this.Characteristic.SecuritySystemTargetState, this.targetState);
|
|
93
|
-
this.logIfDesired(this.stateStringForCV(this.targetState, true));
|
|
82
|
+
this.onUpdate(CharacteristicKey.SecuritySystemTargetState, target, this.stateStringForCV(target, true));
|
|
94
83
|
}
|
|
95
84
|
async onTamperedUpdate(topic, value) {
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
}
|
|
99
|
-
const isTampered = value === toPrimitive(this.config.valueTampered) ? 1 : 0;
|
|
100
|
-
if (isTampered === this.isTampered) {
|
|
101
|
-
return;
|
|
102
|
-
}
|
|
103
|
-
this.isTampered = isTampered;
|
|
104
|
-
this.accessoryService.updateCharacteristic(this.Characteristic.StatusTampered, this.isTampered);
|
|
105
|
-
this.logIfDesired(this.isTampered ? strings.security.isTampered : strings.security.notTampered);
|
|
85
|
+
const statusTampered = value === this.getPrimitiveValue('valueTampered') ? 1 : 0;
|
|
86
|
+
this.onUpdate(CharacteristicKey.StatusTampered, statusTampered, statusTampered ? strings.security.isTampered : strings.security.notTampered);
|
|
106
87
|
}
|
|
107
88
|
async onStatusFaultUpdate(topic, value) {
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
}
|
|
111
|
-
const hasStatusFault = value === toPrimitive(this.config.valueFault) ? 1 : 0;
|
|
112
|
-
if (hasStatusFault === this.hasStatusFault) {
|
|
113
|
-
return;
|
|
114
|
-
}
|
|
115
|
-
this.hasStatusFault = hasStatusFault;
|
|
116
|
-
this.accessoryService.updateCharacteristic(this.Characteristic.StatusFault, this.hasStatusFault);
|
|
117
|
-
this.logIfDesired(this.hasStatusFault ? strings.security.hasFault : strings.security.noFault);
|
|
89
|
+
const statusFault = value === this.getPrimitiveValue('valueFault') ? 1 : 0;
|
|
90
|
+
this.onUpdate(CharacteristicKey.StatusFault, statusFault, statusFault ? strings.security.hasFault : strings.security.noFault);
|
|
118
91
|
}
|
|
119
|
-
async
|
|
120
|
-
if (!this.assert('topicSetTargetSecurityState')) {
|
|
121
|
-
return;
|
|
122
|
-
}
|
|
92
|
+
async onSetTargetState(value) {
|
|
123
93
|
const target = this.fromCVState(value);
|
|
124
94
|
if (target === undefined) {
|
|
125
95
|
return;
|
|
126
96
|
}
|
|
127
|
-
|
|
128
|
-
this.logIfDesired(this.stateStringForCV(value, true));
|
|
129
|
-
}
|
|
130
|
-
this.targetState = value;
|
|
131
|
-
this.accessoryService.updateCharacteristic(this.Characteristic.SecuritySystemTargetState, this.targetState);
|
|
132
|
-
this.publish(this.config.topicSetTargetSecurityState, target);
|
|
97
|
+
this.onSet(CharacteristicKey.SecuritySystemTargetState, value, target, 'topicSetTargetSecurityState', this.stateStringForCV(value, true));
|
|
133
98
|
}
|
|
134
99
|
fromCVState(value) {
|
|
135
100
|
let primative = undefined;
|
|
136
101
|
this.STATE_MAP.forEach((test, key) => {
|
|
137
102
|
if (value === test) {
|
|
138
|
-
primative =
|
|
103
|
+
primative = this.getPrimitiveValue(key);
|
|
139
104
|
}
|
|
140
105
|
});
|
|
141
106
|
if (primative === undefined) {
|
|
142
|
-
this.log.error(strings.security.badTarget, this.name, value);
|
|
107
|
+
this.log.error(strings.security.badTarget, this.name, `'${value}'`);
|
|
143
108
|
}
|
|
144
109
|
return primative;
|
|
145
110
|
}
|
|
146
111
|
toCVState(value) {
|
|
147
112
|
switch (value) {
|
|
148
|
-
case
|
|
113
|
+
case this.getPrimitiveValue('valueArmStay', false):
|
|
149
114
|
return this.STATE_MAP.get('valueArmStay');
|
|
150
|
-
case
|
|
115
|
+
case this.getPrimitiveValue('valueArmAway', false):
|
|
151
116
|
return this.STATE_MAP.get('valueArmAway');
|
|
152
|
-
case
|
|
117
|
+
case this.getPrimitiveValue('valueArmNight', false):
|
|
153
118
|
return this.STATE_MAP.get('valueArmNight');
|
|
154
|
-
case
|
|
119
|
+
case this.getPrimitiveValue('valueDisarm', false):
|
|
155
120
|
return this.STATE_MAP.get('valueDisarm');
|
|
156
|
-
case
|
|
121
|
+
case this.getPrimitiveValue('valueAlarmTriggered', false):
|
|
157
122
|
return this.STATE_MAP.get('valueAlarmTriggered');
|
|
158
123
|
}
|
|
159
124
|
this.log.error(strings.security.unknownValue, this.name, value);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"security.js","sourceRoot":"","sources":["../../src/accessory/security.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"security.js","sourceRoot":"","sources":["../../src/accessory/security.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { PlatformAccessory, Service } from 'homebridge';
|
|
2
|
-
import { TopicHandler } from './abstract/base.js';
|
|
3
2
|
import { StatusActiveAccessory } from './abstract/statusActive.js';
|
|
4
3
|
import { CharacteristicType, ServiceType, TemperatureSensorConfig } from '../model/types.js';
|
|
5
4
|
import { Log } from '../tools/log.js';
|
|
@@ -7,7 +6,7 @@ export declare class TemperatureSensorAccessory extends StatusActiveAccessory<Te
|
|
|
7
6
|
private currentTemperature;
|
|
8
7
|
constructor(Service: ServiceType, Characteristic: CharacteristicType, accessory: PlatformAccessory, config: TemperatureSensorConfig, log: Log);
|
|
9
8
|
protected getAccessoryService(): Service;
|
|
10
|
-
|
|
9
|
+
addTopicHandlers(): void;
|
|
11
10
|
private onCurrentTemperatureUpdate;
|
|
12
11
|
private getCurrentTemperature;
|
|
13
12
|
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { makeHandler } from './abstract/base.js';
|
|
2
1
|
import { StatusActiveAccessory } from './abstract/statusActive.js';
|
|
3
2
|
import { strings } from '../i18n/i18n.js';
|
|
4
3
|
import { toNumber } from '../tools/primitive.js';
|
|
@@ -14,15 +13,14 @@ export class TemperatureSensorAccessory extends StatusActiveAccessory {
|
|
|
14
13
|
getAccessoryService() {
|
|
15
14
|
return this.accessory.getService(this.Service.TemperatureSensor) || this.accessory.addService(this.Service.TemperatureSensor);
|
|
16
15
|
}
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
return topicHandlers;
|
|
21
|
-
}
|
|
22
|
-
topicHandlers.push(makeHandler(this.config.topicGetCurrentTemperature, this.onCurrentTemperatureUpdate.bind(this)));
|
|
23
|
-
return topicHandlers;
|
|
16
|
+
addTopicHandlers() {
|
|
17
|
+
super.addTopicHandlers();
|
|
18
|
+
this.addTopicHandler('topicGetCurrentTemperature', this.onCurrentTemperatureUpdate.bind(this));
|
|
24
19
|
}
|
|
25
20
|
async onCurrentTemperatureUpdate(topic, value) {
|
|
21
|
+
if (!this.assertNumber(value, strings.temperatureSensor.badValue)) {
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
26
24
|
const units = this.config.temperatureUnits ?? TemperatureUnits.CELSIUS;
|
|
27
25
|
const temperature = toCelsius(toNumber(value), units);
|
|
28
26
|
if (temperature === this.currentTemperature) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"temperatureSensor.js","sourceRoot":"","sources":["../../src/accessory/temperatureSensor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"temperatureSensor.js","sourceRoot":"","sources":["../../src/accessory/temperatureSensor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAEnE,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;AAErD,MAAM,OAAO,0BAA2B,SAAQ,qBAA8C;IAEpF,kBAAkB,GAAW,CAAC,CAAC;IAEvC,YAAY,OAAoB,EAAE,cAAkC,EAAE,SAA4B,EAAE,MAA+B,EAAE,GAAQ;QAC3I,KAAK,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,0BAA0B,CAAC,IAAI,CAAC,CAAC;QAExF,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,cAAc,CAAC,kBAAkB,CAAC;aACvE,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAClD,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;IAEQ,gBAAgB;QACvB,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACzB,IAAI,CAAC,eAAe,CAAC,4BAA4B,EAAE,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACjG,CAAC;IAEO,KAAK,CAAC,0BAA0B,CAAC,KAAa,EAAE,KAAqB;QAE3E,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;YAClE,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;QACtD,IAAI,WAAW,KAAK,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC5C,OAAO;QACT,CAAC;QAED,IAAI,CAAC,kBAAkB,GAAG,WAAW,CAAC;QAEtC,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,IAAI,CAAC,cAAc,CAAC,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAE5G,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,iBAAiB,CAAC,WAAW,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,CAAC;IACpF,CAAC;IAEO,KAAK,CAAC,qBAAqB;QACjC,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;CACF"}
|
|
@@ -6,6 +6,7 @@ import { SecuritySystemAccessory } from '../accessory/security.js';
|
|
|
6
6
|
import { SwitchAccessory } from '../accessory/onoff/switch.js';
|
|
7
7
|
import { TemperatureSensorAccessory } from '../accessory/temperatureSensor.js';
|
|
8
8
|
import { setLanguage, strings } from '../i18n/i18n.js';
|
|
9
|
+
import { AccessoryType } from '../model/enums.js';
|
|
9
10
|
import { Log } from '../tools/log.js';
|
|
10
11
|
import getVersion from '../tools/version.js';
|
|
11
12
|
import { assert } from '../tools/validation.js';
|
|
@@ -62,22 +63,22 @@ export class HomebridgeEasyMQTT {
|
|
|
62
63
|
const Characteristic = this.api.hap.Characteristic;
|
|
63
64
|
let mqttAccessory;
|
|
64
65
|
switch (accessoryConfig.info.type) {
|
|
65
|
-
case
|
|
66
|
+
case AccessoryType.Lightbulb:
|
|
66
67
|
mqttAccessory = new LightbulbAccessory(Service, Characteristic, accessory, accessoryConfig, this.log);
|
|
67
68
|
break;
|
|
68
|
-
case
|
|
69
|
+
case AccessoryType.LockMechanism:
|
|
69
70
|
mqttAccessory = new LockMechanismAccessory(Service, Characteristic, accessory, accessoryConfig, this.log);
|
|
70
71
|
break;
|
|
71
|
-
case
|
|
72
|
+
case AccessoryType.Outlet:
|
|
72
73
|
mqttAccessory = new OutletAccessory(Service, Characteristic, accessory, accessoryConfig, this.log);
|
|
73
74
|
break;
|
|
74
|
-
case
|
|
75
|
+
case AccessoryType.SecuritySystem:
|
|
75
76
|
mqttAccessory = new SecuritySystemAccessory(Service, Characteristic, accessory, accessoryConfig, this.log);
|
|
76
77
|
break;
|
|
77
|
-
case
|
|
78
|
+
case AccessoryType.Switch:
|
|
78
79
|
mqttAccessory = new SwitchAccessory(Service, Characteristic, accessory, accessoryConfig, this.log);
|
|
79
80
|
break;
|
|
80
|
-
case
|
|
81
|
+
case AccessoryType.TemperatureSensor:
|
|
81
82
|
mqttAccessory = new TemperatureSensorAccessory(Service, Characteristic, accessory, accessoryConfig, this.log);
|
|
82
83
|
break;
|
|
83
84
|
default:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../../src/homebridge/platform.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAI3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../../src/homebridge/platform.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,6 @@
|
|
|
22
22
|
</br><button type="button" class="btn btn-primary" id="introContinue" i18n="continue", i18n_replace="arrow"></button>
|
|
23
23
|
</div>
|
|
24
24
|
|
|
25
|
-
<footer id="footer" class="text-center" style="display: none; font-style: italic; font-size: 0.9em;" i18n="
|
|
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.2.0-beta.
|
|
27
|
+
<script src="ui.js?v=1.2.0-beta.1"></script>
|
package/dist/i18n/en.d.ts
CHANGED
|
@@ -6,14 +6,13 @@ declare const en: {
|
|
|
6
6
|
};
|
|
7
7
|
config: {
|
|
8
8
|
continue: string;
|
|
9
|
-
|
|
9
|
+
required: string;
|
|
10
10
|
support: string;
|
|
11
11
|
thankYou: string;
|
|
12
12
|
description: {
|
|
13
13
|
disableLogging: string;
|
|
14
14
|
options: string;
|
|
15
15
|
topics: string;
|
|
16
|
-
valueStatusActive: string;
|
|
17
16
|
verbose: string;
|
|
18
17
|
};
|
|
19
18
|
enumNames: {
|
|
@@ -85,6 +84,10 @@ declare const en: {
|
|
|
85
84
|
};
|
|
86
85
|
};
|
|
87
86
|
lightbulb: {
|
|
87
|
+
badBrightness: string;
|
|
88
|
+
badColorTemperature: string;
|
|
89
|
+
badHue: string;
|
|
90
|
+
badSaturation: string;
|
|
88
91
|
brightness: string;
|
|
89
92
|
futureBrightness: string;
|
|
90
93
|
hue: string;
|
|
@@ -118,12 +121,14 @@ declare const en: {
|
|
|
118
121
|
reconnectInSeconds: string;
|
|
119
122
|
};
|
|
120
123
|
onOff: {
|
|
124
|
+
badValue: string;
|
|
121
125
|
stateFutureOff: string;
|
|
122
126
|
stateFutureOn: string;
|
|
123
127
|
stateOn: string;
|
|
124
128
|
stateOff: string;
|
|
125
129
|
};
|
|
126
130
|
outlet: {
|
|
131
|
+
badValue: string;
|
|
127
132
|
futureInUse: string;
|
|
128
133
|
futureNotInUse: string;
|
|
129
134
|
inUse: string;
|
|
@@ -157,6 +162,7 @@ declare const en: {
|
|
|
157
162
|
welcome: string[];
|
|
158
163
|
};
|
|
159
164
|
temperatureSensor: {
|
|
165
|
+
badValue: string;
|
|
160
166
|
temperature: string;
|
|
161
167
|
};
|
|
162
168
|
};
|
package/dist/i18n/en.js
CHANGED
|
@@ -6,14 +6,13 @@ const en = {
|
|
|
6
6
|
},
|
|
7
7
|
config: {
|
|
8
8
|
continue: 'Continue %s',
|
|
9
|
-
|
|
9
|
+
required: 'Required fields are marked with an asterisk (*)',
|
|
10
10
|
support: 'For documentation and support please visit %s',
|
|
11
11
|
thankYou: 'Thank you for installing homebridge-easy-mqtt',
|
|
12
12
|
description: {
|
|
13
13
|
disableLogging: 'If true, only critical events will be logged for this accessory.',
|
|
14
14
|
options: 'Additional MQTT parameters such as clientId or protocolVersion. Must be valid JSON.',
|
|
15
15
|
topics: 'Supports JSONPath using dot notation, i.e. "my/topic$.path.to.value"',
|
|
16
|
-
valueStatusActive: 'Required if "Get Availability" topic is defined above.',
|
|
17
16
|
verbose: 'If true, additional MQTT info will be logged for debugging purposes.',
|
|
18
17
|
},
|
|
19
18
|
enumNames: {
|
|
@@ -36,66 +35,70 @@ const en = {
|
|
|
36
35
|
model: 'Model',
|
|
37
36
|
mqtt: 'MQTT Settings',
|
|
38
37
|
options: 'Options',
|
|
39
|
-
password: 'Password
|
|
38
|
+
password: 'Password',
|
|
40
39
|
sourceUnits: 'Source Units',
|
|
41
40
|
serialNumber: 'Serial Number',
|
|
42
|
-
topicGetStatusActive: 'Get Availability
|
|
43
|
-
topicGetLockCurrentState: 'Get Current State',
|
|
44
|
-
topicGetOutletInUse: 'Get In Use State
|
|
45
|
-
topicGetOn: 'Get On/Off State',
|
|
46
|
-
topicGetLockTargetState: 'Get Target State',
|
|
47
|
-
topicGetBrightness: 'Get Brightness
|
|
48
|
-
topicSetBrightness: 'Set Brightness
|
|
49
|
-
topicGetHue: 'Get Hue
|
|
50
|
-
topicSetHue: 'Set Hue
|
|
51
|
-
topicGetColorTemperature: 'Get Color Temperature
|
|
52
|
-
topicSetColorTemperature: 'Set Color Temperature
|
|
53
|
-
topicGetSaturation: 'Get Saturation
|
|
54
|
-
topicSetSaturation: 'Set Saturation
|
|
55
|
-
topicSetOutletInUse: 'Set In Use State
|
|
56
|
-
topicSetOn: 'Set On/Off State',
|
|
57
|
-
topicSetTargetState: 'Set Target State',
|
|
58
|
-
topicGetCurrentTemperature: 'Get Current Temperature',
|
|
59
|
-
topicGetCurrentSecurityState: 'Get Current State',
|
|
60
|
-
topicGetTargetSecurityState: 'Get Target State',
|
|
61
|
-
topicSetTargetSecurityState: 'Set Target State',
|
|
62
|
-
topicGetStatusTampered: 'Get Tampered
|
|
63
|
-
topicGetStatusFault: 'Get Fault
|
|
41
|
+
topicGetStatusActive: 'Get Availability',
|
|
42
|
+
topicGetLockCurrentState: 'Get Current State*',
|
|
43
|
+
topicGetOutletInUse: 'Get In Use State',
|
|
44
|
+
topicGetOn: 'Get On/Off State*',
|
|
45
|
+
topicGetLockTargetState: 'Get Target State*',
|
|
46
|
+
topicGetBrightness: 'Get Brightness',
|
|
47
|
+
topicSetBrightness: 'Set Brightness',
|
|
48
|
+
topicGetHue: 'Get Hue',
|
|
49
|
+
topicSetHue: 'Set Hue',
|
|
50
|
+
topicGetColorTemperature: 'Get Color Temperature',
|
|
51
|
+
topicSetColorTemperature: 'Set Color Temperature',
|
|
52
|
+
topicGetSaturation: 'Get Saturation',
|
|
53
|
+
topicSetSaturation: 'Set Saturation',
|
|
54
|
+
topicSetOutletInUse: 'Set In Use State',
|
|
55
|
+
topicSetOn: 'Set On/Off State*',
|
|
56
|
+
topicSetTargetState: 'Set Target State*',
|
|
57
|
+
topicGetCurrentTemperature: 'Get Current Temperature*',
|
|
58
|
+
topicGetCurrentSecurityState: 'Get Current State*',
|
|
59
|
+
topicGetTargetSecurityState: 'Get Target State*',
|
|
60
|
+
topicSetTargetSecurityState: 'Set Target State*',
|
|
61
|
+
topicGetStatusTampered: 'Get Tampered',
|
|
62
|
+
topicGetStatusFault: 'Get Fault',
|
|
64
63
|
topics: 'Topics',
|
|
65
64
|
type: 'Type',
|
|
66
|
-
username: 'Username
|
|
65
|
+
username: 'Username',
|
|
67
66
|
valueStatusActive: 'Available/Reachable',
|
|
68
|
-
valueLockStateJammed: 'Jammed
|
|
67
|
+
valueLockStateJammed: 'Jammed',
|
|
69
68
|
valueOutletInUse: 'In Use',
|
|
70
69
|
valueOutletNotInUse: 'Not In Use',
|
|
71
|
-
valueOff: 'Off',
|
|
72
|
-
valueOn: 'On',
|
|
73
|
-
valueLockStateSecured: 'Secured/Locked',
|
|
74
|
-
valueLockStateUnsecured: 'Unsecured/Unlocked',
|
|
75
|
-
valueArmStay: 'Arm Stay
|
|
76
|
-
valueArmAway: 'Arm Away
|
|
77
|
-
valueArmNight: 'Arm Night
|
|
78
|
-
valueDisarm: 'Disarm
|
|
79
|
-
valueAlarmTriggered: 'Triggered
|
|
80
|
-
valueTampered: 'Tampered
|
|
81
|
-
valueFault: 'Fault
|
|
70
|
+
valueOff: 'Off*',
|
|
71
|
+
valueOn: 'On*',
|
|
72
|
+
valueLockStateSecured: 'Secured/Locked*',
|
|
73
|
+
valueLockStateUnsecured: 'Unsecured/Unlocked*',
|
|
74
|
+
valueArmStay: 'Arm Stay',
|
|
75
|
+
valueArmAway: 'Arm Away',
|
|
76
|
+
valueArmNight: 'Arm Night',
|
|
77
|
+
valueDisarm: 'Disarm',
|
|
78
|
+
valueAlarmTriggered: 'Triggered',
|
|
79
|
+
valueTampered: 'Tampered',
|
|
80
|
+
valueFault: 'Fault',
|
|
82
81
|
values: 'Values',
|
|
83
82
|
verbose: 'Additional Logging',
|
|
84
83
|
version: 'Version',
|
|
85
84
|
},
|
|
86
85
|
},
|
|
87
86
|
lightbulb: {
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
87
|
+
badBrightness: '%s expected a number for brightness but received %s',
|
|
88
|
+
badColorTemperature: '%s expected a number for color temperature but received %s',
|
|
89
|
+
badHue: '%s expected a number for hue but received %s',
|
|
90
|
+
badSaturation: '%s expected a number for saturation but received %s',
|
|
91
|
+
brightness: '%s brightness is %d',
|
|
92
|
+
futureBrightness: 'Setting %s brightness to %d…',
|
|
93
|
+
hue: '%s hue is %d',
|
|
94
|
+
futureHue: 'Setting %s hue to %d…',
|
|
95
|
+
colorTemperature: '%s color temperature is %d',
|
|
96
|
+
futureColorTemperature: 'Setting %s color temperature to %d…',
|
|
97
|
+
saturation: '%s saturation is %d',
|
|
98
|
+
futureSaturation: 'Setting %s saturation to %d…',
|
|
96
99
|
},
|
|
97
100
|
lock: {
|
|
98
|
-
badTarget: '%s unable to get target
|
|
101
|
+
badTarget: '%s unable to get target state for %s',
|
|
99
102
|
stateCurrentSecured: '%s is locked',
|
|
100
103
|
stateCurrentUnsecured: '%s is unlocked',
|
|
101
104
|
stateFutureSecured: 'Locking %s…',
|
|
@@ -118,19 +121,21 @@ const en = {
|
|
|
118
121
|
reconnectInSeconds: '%s will attempt to reconnect in %s seconds…',
|
|
119
122
|
},
|
|
120
123
|
onOff: {
|
|
124
|
+
badValue: '%s unable to get on/off state for %s',
|
|
121
125
|
stateFutureOff: 'Turning off %s…',
|
|
122
126
|
stateFutureOn: 'Turning on %s…',
|
|
123
127
|
stateOn: '%s is on',
|
|
124
128
|
stateOff: '%s is off',
|
|
125
129
|
},
|
|
126
130
|
outlet: {
|
|
131
|
+
badValue: '%s unable to get in use state for %s',
|
|
127
132
|
futureInUse: 'Setting %s to in use…',
|
|
128
133
|
futureNotInUse: 'Setting %s to not in use…',
|
|
129
134
|
inUse: '%s is in use',
|
|
130
135
|
notInUse: '%s is not in use',
|
|
131
136
|
},
|
|
132
137
|
security: {
|
|
133
|
-
badTarget: '%s unable to get target
|
|
138
|
+
badTarget: '%s unable to get target state for %s',
|
|
134
139
|
isTampered: '%s is tampered',
|
|
135
140
|
hasFault: '%s has a fault',
|
|
136
141
|
noStateValues: '%s must have at least one state value defined (Arm Away, Disarm, etc.)',
|
|
@@ -161,6 +166,7 @@ const en = {
|
|
|
161
166
|
],
|
|
162
167
|
},
|
|
163
168
|
temperatureSensor: {
|
|
169
|
+
badValue: '%s expected a number for temperature but received %s',
|
|
164
170
|
temperature: '%s temperature is %s°%s',
|
|
165
171
|
},
|
|
166
172
|
};
|
package/dist/i18n/en.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"en.js","sourceRoot":"","sources":["../../src/i18n/en.ts"],"names":[],"mappings":"AAAA,MAAM,EAAE,GAAG;IAET,SAAS,EAAE;QACT,eAAe,EAAE,2CAA2C;QAC5D,YAAY,EAAE,qBAAqB;QACnC,cAAc,EAAE,mBAAmB;KACpC;IAED,MAAM,EAAE;QACN,QAAQ,EAAE,aAAa;QACvB,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"en.js","sourceRoot":"","sources":["../../src/i18n/en.ts"],"names":[],"mappings":"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"}
|