homebridge-easy-mqtt 1.4.0-beta.11 → 1.4.0-beta.13
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 +4 -2
- package/README.md +32 -2
- package/config.schema.json +256 -3
- package/dist/accessory/abstract/base.js +1 -1
- package/dist/accessory/abstract/base.js.map +1 -1
- package/dist/accessory/abstract/common.d.ts +13 -9
- package/dist/accessory/abstract/common.js +13 -14
- package/dist/accessory/abstract/common.js.map +1 -1
- package/dist/accessory/abstract/helper.d.ts +1 -0
- package/dist/accessory/abstract/helper.js +9 -2
- package/dist/accessory/abstract/helper.js.map +1 -1
- package/dist/accessory/abstract/mqtt.d.ts +11 -4
- package/dist/accessory/abstract/mqtt.js +25 -9
- package/dist/accessory/abstract/mqtt.js.map +1 -1
- package/dist/accessory/addons/addon.d.ts +19 -7
- package/dist/accessory/addons/addon.js +39 -12
- package/dist/accessory/addons/addon.js.map +1 -1
- package/dist/accessory/addons/filter.d.ts +6 -6
- package/dist/accessory/addons/filter.js +6 -5
- package/dist/accessory/addons/filter.js.map +1 -1
- package/dist/accessory/climate/heaterCooler.js +1 -1
- package/dist/accessory/climate/heaterCooler.js.map +1 -1
- package/dist/accessory/climate/purifier.js +1 -1
- package/dist/accessory/climate/purifier.js.map +1 -1
- package/dist/accessory/climate/thermostat.js +1 -1
- package/dist/accessory/climate/thermostat.js.map +1 -1
- package/dist/accessory/garage.d.ts +17 -0
- package/dist/accessory/garage.js +110 -0
- package/dist/accessory/garage.js.map +1 -0
- package/dist/accessory/lock.d.ts +2 -2
- package/dist/accessory/lock.js +3 -3
- package/dist/accessory/lock.js.map +1 -1
- package/dist/homebridge/platform.js +4 -2
- package/dist/homebridge/platform.js.map +1 -1
- package/dist/homebridge-ui/public/index.html +1 -1
- package/dist/homebridge-ui/public/ui.js +1 -1
- package/dist/i18n/en.d.ts +33 -0
- package/dist/i18n/en.js +33 -0
- package/dist/i18n/en.js.map +1 -1
- package/dist/i18n/fr.d.ts +33 -0
- package/dist/i18n/i18n.d.ts +33 -0
- package/dist/i18n/ro.d.ts +33 -0
- package/dist/i18n/template.d.ts +33 -0
- package/dist/model/enums.d.ts +4 -0
- package/dist/model/enums.js +4 -0
- package/dist/model/enums.js.map +1 -1
- package/dist/model/mqtt.js +21 -21
- package/dist/model/mqtt.js.map +1 -1
- package/dist/model/types.d.ts +20 -1
- package/dist/tools/properties.d.ts +11 -0
- package/dist/tools/properties.js +73 -0
- package/dist/tools/properties.js.map +1 -0
- package/package.json +1 -1
package/dist/i18n/ro.d.ts
CHANGED
|
@@ -39,6 +39,7 @@ declare const ro: {
|
|
|
39
39
|
celsius: string;
|
|
40
40
|
contactSensor: string;
|
|
41
41
|
fahrenheit: string;
|
|
42
|
+
garageDoorOpener: string;
|
|
42
43
|
heaterCooler: string;
|
|
43
44
|
humiditySensor: string;
|
|
44
45
|
leakSensor: string;
|
|
@@ -67,6 +68,7 @@ declare const ro: {
|
|
|
67
68
|
name: string;
|
|
68
69
|
options: string;
|
|
69
70
|
password: string;
|
|
71
|
+
resetOnRestart: string;
|
|
70
72
|
sourceUnits: string;
|
|
71
73
|
topicGetActive: string;
|
|
72
74
|
topicGetBatteryLevel: string;
|
|
@@ -82,10 +84,12 @@ declare const ro: {
|
|
|
82
84
|
topicGetContactSensorState: string;
|
|
83
85
|
topicGetCoolingThresholdTemperature: string;
|
|
84
86
|
topicGetCurrentAmbientLightLevel: string;
|
|
87
|
+
topicGetCurrentDoorState: string;
|
|
85
88
|
topicGetCurrentHeaterCoolerState: string;
|
|
86
89
|
topicGetCurrentHeatingCoolingState: string;
|
|
87
90
|
topicGetCurrentPurifierState: string;
|
|
88
91
|
topicGetCurrentLockState: string;
|
|
92
|
+
topicGetCurrentLockStateOptional: string;
|
|
89
93
|
topicGetCurrentRelativeHumidity: string;
|
|
90
94
|
topicGetCurrentRelativeHumidityOptional: string;
|
|
91
95
|
topicGetCurrentSecurityState: string;
|
|
@@ -97,6 +101,7 @@ declare const ro: {
|
|
|
97
101
|
topicGetLeakDetected: string;
|
|
98
102
|
topicGetLockPhysicalControls: string;
|
|
99
103
|
topicGetMotionDetected: string;
|
|
104
|
+
topicGetObstructionDetected: string;
|
|
100
105
|
topicGetOccupancyDetected: string;
|
|
101
106
|
topicGetOn: string;
|
|
102
107
|
topicGetOutletInUse: string;
|
|
@@ -107,10 +112,12 @@ declare const ro: {
|
|
|
107
112
|
topicGetStatusActive: string;
|
|
108
113
|
topicGetStatusFault: string;
|
|
109
114
|
topicGetStatusTampered: string;
|
|
115
|
+
topicGetTargetDoorState: string;
|
|
110
116
|
topicGetTargetHeaterCoolerState: string;
|
|
111
117
|
topicGetTargetHeatingCoolingState: string;
|
|
112
118
|
topicGetTargetPurifierState: string;
|
|
113
119
|
topicGetTargetLockState: string;
|
|
120
|
+
topicGetTargetLockStateOptional: string;
|
|
114
121
|
topicGetTargetRelativeHumidity: string;
|
|
115
122
|
topicGetTargetSecurityState: string;
|
|
116
123
|
topicGetTargetTemperature: string;
|
|
@@ -131,10 +138,12 @@ declare const ro: {
|
|
|
131
138
|
topicSetRotationSpeed: string;
|
|
132
139
|
topicSetSaturation: string;
|
|
133
140
|
topicSetSwingMode: string;
|
|
141
|
+
topicSetTargetDoorState: string;
|
|
134
142
|
topicSetTargetHeaterCoolerState: string;
|
|
135
143
|
topicSetTargetHeatingCoolingState: string;
|
|
136
144
|
topicSetTargetPurifierState: string;
|
|
137
145
|
topicSetTargetLockState: string;
|
|
146
|
+
topicSetTargetLockStateOptional: string;
|
|
138
147
|
topicSetTargetRelativeHumidity: string;
|
|
139
148
|
topicSetTargetSecurityState: string;
|
|
140
149
|
topicSetTargetTemperature: string;
|
|
@@ -158,6 +167,12 @@ declare const ro: {
|
|
|
158
167
|
valueControlLock: string;
|
|
159
168
|
valueControlUnlock: string;
|
|
160
169
|
valueDisarm: string;
|
|
170
|
+
valueDoorObstructed: string;
|
|
171
|
+
valueDoorStateClosed: string;
|
|
172
|
+
valueDoorStateClosing: string;
|
|
173
|
+
valueDoorStateOpen: string;
|
|
174
|
+
valueDoorStateOpening: string;
|
|
175
|
+
valueDoorStateStopped: string;
|
|
161
176
|
valueFault: string;
|
|
162
177
|
valueFilterChange: string;
|
|
163
178
|
valueFilterReset: string;
|
|
@@ -166,7 +181,9 @@ declare const ro: {
|
|
|
166
181
|
valueLeakDetected: string;
|
|
167
182
|
valueLockStateJammed: string;
|
|
168
183
|
valueLockStateSecured: string;
|
|
184
|
+
valueLockStateSecuredOptional: string;
|
|
169
185
|
valueLockStateUnsecured: string;
|
|
186
|
+
valueLockStateUnsecuredOptional: string;
|
|
170
187
|
valueModeAuto: string;
|
|
171
188
|
valueModeCool: string;
|
|
172
189
|
valueModeHeat: string;
|
|
@@ -205,6 +222,22 @@ declare const ro: {
|
|
|
205
222
|
ok: string;
|
|
206
223
|
reset: string;
|
|
207
224
|
};
|
|
225
|
+
garage: {
|
|
226
|
+
badValue: string;
|
|
227
|
+
noCurrentStateValues: string;
|
|
228
|
+
noTargetStateValues: string;
|
|
229
|
+
obstructed: string;
|
|
230
|
+
stateClosed: string;
|
|
231
|
+
stateClosedFuture: string;
|
|
232
|
+
stateClosing: string;
|
|
233
|
+
stateOpen: string;
|
|
234
|
+
stateOpenFuture: string;
|
|
235
|
+
stateOpening: string;
|
|
236
|
+
stateStopped: string;
|
|
237
|
+
stateUnknown: string;
|
|
238
|
+
unknownValue: string;
|
|
239
|
+
unobstructed: string;
|
|
240
|
+
};
|
|
208
241
|
heaterCooler: {
|
|
209
242
|
active: string;
|
|
210
243
|
activeSet: string;
|
package/dist/i18n/template.d.ts
CHANGED
|
@@ -39,6 +39,7 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
|
|
|
39
39
|
celsius: string;
|
|
40
40
|
contactSensor: string;
|
|
41
41
|
fahrenheit: string;
|
|
42
|
+
garageDoorOpener: string;
|
|
42
43
|
heaterCooler: string;
|
|
43
44
|
humiditySensor: string;
|
|
44
45
|
leakSensor: string;
|
|
@@ -67,6 +68,7 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
|
|
|
67
68
|
name: string;
|
|
68
69
|
options: string;
|
|
69
70
|
password: string;
|
|
71
|
+
resetOnRestart: string;
|
|
70
72
|
sourceUnits: string;
|
|
71
73
|
topicGetActive: string;
|
|
72
74
|
topicGetBatteryLevel: string;
|
|
@@ -82,10 +84,12 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
|
|
|
82
84
|
topicGetContactSensorState: string;
|
|
83
85
|
topicGetCoolingThresholdTemperature: string;
|
|
84
86
|
topicGetCurrentAmbientLightLevel: string;
|
|
87
|
+
topicGetCurrentDoorState: string;
|
|
85
88
|
topicGetCurrentHeaterCoolerState: string;
|
|
86
89
|
topicGetCurrentHeatingCoolingState: string;
|
|
87
90
|
topicGetCurrentPurifierState: string;
|
|
88
91
|
topicGetCurrentLockState: string;
|
|
92
|
+
topicGetCurrentLockStateOptional: string;
|
|
89
93
|
topicGetCurrentRelativeHumidity: string;
|
|
90
94
|
topicGetCurrentRelativeHumidityOptional: string;
|
|
91
95
|
topicGetCurrentSecurityState: string;
|
|
@@ -97,6 +101,7 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
|
|
|
97
101
|
topicGetLeakDetected: string;
|
|
98
102
|
topicGetLockPhysicalControls: string;
|
|
99
103
|
topicGetMotionDetected: string;
|
|
104
|
+
topicGetObstructionDetected: string;
|
|
100
105
|
topicGetOccupancyDetected: string;
|
|
101
106
|
topicGetOn: string;
|
|
102
107
|
topicGetOutletInUse: string;
|
|
@@ -107,10 +112,12 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
|
|
|
107
112
|
topicGetStatusActive: string;
|
|
108
113
|
topicGetStatusFault: string;
|
|
109
114
|
topicGetStatusTampered: string;
|
|
115
|
+
topicGetTargetDoorState: string;
|
|
110
116
|
topicGetTargetHeaterCoolerState: string;
|
|
111
117
|
topicGetTargetHeatingCoolingState: string;
|
|
112
118
|
topicGetTargetPurifierState: string;
|
|
113
119
|
topicGetTargetLockState: string;
|
|
120
|
+
topicGetTargetLockStateOptional: string;
|
|
114
121
|
topicGetTargetRelativeHumidity: string;
|
|
115
122
|
topicGetTargetSecurityState: string;
|
|
116
123
|
topicGetTargetTemperature: string;
|
|
@@ -131,10 +138,12 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
|
|
|
131
138
|
topicSetRotationSpeed: string;
|
|
132
139
|
topicSetSaturation: string;
|
|
133
140
|
topicSetSwingMode: string;
|
|
141
|
+
topicSetTargetDoorState: string;
|
|
134
142
|
topicSetTargetHeaterCoolerState: string;
|
|
135
143
|
topicSetTargetHeatingCoolingState: string;
|
|
136
144
|
topicSetTargetPurifierState: string;
|
|
137
145
|
topicSetTargetLockState: string;
|
|
146
|
+
topicSetTargetLockStateOptional: string;
|
|
138
147
|
topicSetTargetRelativeHumidity: string;
|
|
139
148
|
topicSetTargetSecurityState: string;
|
|
140
149
|
topicSetTargetTemperature: string;
|
|
@@ -158,6 +167,12 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
|
|
|
158
167
|
valueControlLock: string;
|
|
159
168
|
valueControlUnlock: string;
|
|
160
169
|
valueDisarm: string;
|
|
170
|
+
valueDoorObstructed: string;
|
|
171
|
+
valueDoorStateClosed: string;
|
|
172
|
+
valueDoorStateClosing: string;
|
|
173
|
+
valueDoorStateOpen: string;
|
|
174
|
+
valueDoorStateOpening: string;
|
|
175
|
+
valueDoorStateStopped: string;
|
|
161
176
|
valueFault: string;
|
|
162
177
|
valueFilterChange: string;
|
|
163
178
|
valueFilterReset: string;
|
|
@@ -166,7 +181,9 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
|
|
|
166
181
|
valueLeakDetected: string;
|
|
167
182
|
valueLockStateJammed: string;
|
|
168
183
|
valueLockStateSecured: string;
|
|
184
|
+
valueLockStateSecuredOptional: string;
|
|
169
185
|
valueLockStateUnsecured: string;
|
|
186
|
+
valueLockStateUnsecuredOptional: string;
|
|
170
187
|
valueModeAuto: string;
|
|
171
188
|
valueModeCool: string;
|
|
172
189
|
valueModeHeat: string;
|
|
@@ -205,6 +222,22 @@ declare const REPLACE_THIS_WITH_ISO_CODE: {
|
|
|
205
222
|
ok: string;
|
|
206
223
|
reset: string;
|
|
207
224
|
};
|
|
225
|
+
garage: {
|
|
226
|
+
badValue: string;
|
|
227
|
+
noCurrentStateValues: string;
|
|
228
|
+
noTargetStateValues: string;
|
|
229
|
+
obstructed: string;
|
|
230
|
+
stateClosed: string;
|
|
231
|
+
stateClosedFuture: string;
|
|
232
|
+
stateClosing: string;
|
|
233
|
+
stateOpen: string;
|
|
234
|
+
stateOpenFuture: string;
|
|
235
|
+
stateOpening: string;
|
|
236
|
+
stateStopped: string;
|
|
237
|
+
stateUnknown: string;
|
|
238
|
+
unknownValue: string;
|
|
239
|
+
unobstructed: string;
|
|
240
|
+
};
|
|
208
241
|
heaterCooler: {
|
|
209
242
|
active: string;
|
|
210
243
|
activeSet: string;
|
package/dist/model/enums.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ export declare enum AccessoryType {
|
|
|
3
3
|
CarbonDioxideSensor = "CarbonDioxideSensor",
|
|
4
4
|
CarbonMonoxideSensor = "CarbonMonoxideSensor",
|
|
5
5
|
ContactSensor = "ContactSensor",
|
|
6
|
+
GarageDoorOpener = "GarageDoorOpener",
|
|
6
7
|
HeaterCooler = "HeaterCooler",
|
|
7
8
|
HumiditySensor = "HumiditySensor",
|
|
8
9
|
LeakSensor = "LeakSensor",
|
|
@@ -37,6 +38,7 @@ export declare enum CharacteristicKey {
|
|
|
37
38
|
CoolingThresholdTemperature = "CoolingThresholdTemperature",
|
|
38
39
|
CurrentAmbientLightLevel = "CurrentAmbientLightLevel",
|
|
39
40
|
CurrentAirPurifierState = "CurrentAirPurifierState",
|
|
41
|
+
CurrentDoorState = "CurrentDoorState",
|
|
40
42
|
CurrentHeaterCoolerState = "CurrentHeaterCoolerState",
|
|
41
43
|
CurrentHeatingCoolingState = "CurrentHeatingCoolingState",
|
|
42
44
|
CurrentRelativeHumidity = "CurrentRelativeHumidity",
|
|
@@ -52,6 +54,7 @@ export declare enum CharacteristicKey {
|
|
|
52
54
|
LockPhysicalControls = "LockPhysicalControls",
|
|
53
55
|
LockTargetState = "LockTargetState",
|
|
54
56
|
MotionDetected = "MotionDetected",
|
|
57
|
+
ObstructionDetected = "ObstructionDetected",
|
|
55
58
|
OccupancyDetected = "OccupancyDetected",
|
|
56
59
|
On = "On",
|
|
57
60
|
OutletInUse = "OutletInUse",
|
|
@@ -69,6 +72,7 @@ export declare enum CharacteristicKey {
|
|
|
69
72
|
StatusTampered = "StatusTampered",
|
|
70
73
|
SwingMode = "SwingMode",
|
|
71
74
|
TargetAirPurifierState = "TargetAirPurifierState",
|
|
75
|
+
TargetDoorState = "TargetDoorState",
|
|
72
76
|
TargetHeaterCoolerState = "TargetHeaterCoolerState",
|
|
73
77
|
TargetHeatingCoolingState = "TargetHeatingCoolingState",
|
|
74
78
|
TargetRelativeHumidity = "TargetRelativeHumidity",
|
package/dist/model/enums.js
CHANGED
|
@@ -4,6 +4,7 @@ export var AccessoryType;
|
|
|
4
4
|
AccessoryType["CarbonDioxideSensor"] = "CarbonDioxideSensor";
|
|
5
5
|
AccessoryType["CarbonMonoxideSensor"] = "CarbonMonoxideSensor";
|
|
6
6
|
AccessoryType["ContactSensor"] = "ContactSensor";
|
|
7
|
+
AccessoryType["GarageDoorOpener"] = "GarageDoorOpener";
|
|
7
8
|
AccessoryType["HeaterCooler"] = "HeaterCooler";
|
|
8
9
|
AccessoryType["HumiditySensor"] = "HumiditySensor";
|
|
9
10
|
AccessoryType["LeakSensor"] = "LeakSensor";
|
|
@@ -40,6 +41,7 @@ export var CharacteristicKey;
|
|
|
40
41
|
CharacteristicKey["CoolingThresholdTemperature"] = "CoolingThresholdTemperature";
|
|
41
42
|
CharacteristicKey["CurrentAmbientLightLevel"] = "CurrentAmbientLightLevel";
|
|
42
43
|
CharacteristicKey["CurrentAirPurifierState"] = "CurrentAirPurifierState";
|
|
44
|
+
CharacteristicKey["CurrentDoorState"] = "CurrentDoorState";
|
|
43
45
|
CharacteristicKey["CurrentHeaterCoolerState"] = "CurrentHeaterCoolerState";
|
|
44
46
|
CharacteristicKey["CurrentHeatingCoolingState"] = "CurrentHeatingCoolingState";
|
|
45
47
|
CharacteristicKey["CurrentRelativeHumidity"] = "CurrentRelativeHumidity";
|
|
@@ -55,6 +57,7 @@ export var CharacteristicKey;
|
|
|
55
57
|
CharacteristicKey["LockPhysicalControls"] = "LockPhysicalControls";
|
|
56
58
|
CharacteristicKey["LockTargetState"] = "LockTargetState";
|
|
57
59
|
CharacteristicKey["MotionDetected"] = "MotionDetected";
|
|
60
|
+
CharacteristicKey["ObstructionDetected"] = "ObstructionDetected";
|
|
58
61
|
CharacteristicKey["OccupancyDetected"] = "OccupancyDetected";
|
|
59
62
|
CharacteristicKey["On"] = "On";
|
|
60
63
|
CharacteristicKey["OutletInUse"] = "OutletInUse";
|
|
@@ -72,6 +75,7 @@ export var CharacteristicKey;
|
|
|
72
75
|
CharacteristicKey["StatusTampered"] = "StatusTampered";
|
|
73
76
|
CharacteristicKey["SwingMode"] = "SwingMode";
|
|
74
77
|
CharacteristicKey["TargetAirPurifierState"] = "TargetAirPurifierState";
|
|
78
|
+
CharacteristicKey["TargetDoorState"] = "TargetDoorState";
|
|
75
79
|
CharacteristicKey["TargetHeaterCoolerState"] = "TargetHeaterCoolerState";
|
|
76
80
|
CharacteristicKey["TargetHeatingCoolingState"] = "TargetHeatingCoolingState";
|
|
77
81
|
CharacteristicKey["TargetRelativeHumidity"] = "TargetRelativeHumidity";
|
package/dist/model/enums.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enums.js","sourceRoot":"","sources":["../../src/model/enums.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,
|
|
1
|
+
{"version":3,"file":"enums.js","sourceRoot":"","sources":["../../src/model/enums.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,aAqBX;AArBD,WAAY,aAAa;IACvB,4CAA2B,CAAA;IAC3B,4DAA2C,CAAA;IAC3C,8DAA6C,CAAA;IAC7C,gDAA+B,CAAA;IAC/B,sDAAqC,CAAA;IACrC,8CAA6B,CAAA;IAC7B,kDAAiC,CAAA;IACjC,0CAAyB,CAAA;IACzB,wCAAuB,CAAA;IACvB,4CAA2B,CAAA;IAC3B,gDAA+B,CAAA;IAC/B,8CAA6B,CAAA;IAC7B,oDAAmC,CAAA;IACnC,kCAAiB,CAAA;IACjB,kDAAiC,CAAA;IACjC,4CAA2B,CAAA;IAC3B,kCAAiB,CAAA;IACjB,wDAAuC,CAAA;IACvC,0CAAyB,CAAA;IACzB,gCAAe,CAAA;AACjB,CAAC,EArBW,aAAa,KAAb,aAAa,QAqBxB;AAED,MAAM,CAAN,IAAY,SAEX;AAFD,WAAY,SAAS;IACnB,oDAAuC,CAAA;AACzC,CAAC,EAFW,SAAS,KAAT,SAAS,QAEpB;AAED,MAAM,CAAN,IAAY,iBAwDX;AAxDD,WAAY,iBAAiB;IAC3B,sCAAiB,CAAA;IACjB,kDAA6B,CAAA;IAC7B,8CAAyB,CAAA;IACzB,oEAA+C,CAAA;IAC/C,8DAAyC,CAAA;IACzC,sEAAiD,CAAA;IACjD,sEAAiD,CAAA;IACjD,gEAA2C,CAAA;IAC3C,wEAAmD,CAAA;IACnD,0DAAqC,CAAA;IACrC,8DAAyC,CAAA;IACzC,gFAA2D,CAAA;IAC3D,0EAAqD,CAAA;IACrD,wEAAmD,CAAA;IACnD,0DAAqC,CAAA;IACrC,0EAAqD,CAAA;IACrD,8EAAyD,CAAA;IACzD,wEAAmD,CAAA;IACnD,8DAAyC,CAAA;IACzC,sEAAiD,CAAA;IACjD,wDAAmC,CAAA;IACnC,gFAA2D,CAAA;IAC3D,gCAAW,CAAA;IACX,oCAAe,CAAA;IACf,kDAA6B,CAAA;IAC7B,kDAA6B,CAAA;IAC7B,0DAAqC,CAAA;IACrC,kEAA6C,CAAA;IAC7C,wDAAmC,CAAA;IACnC,sDAAiC,CAAA;IACjC,gEAA2C,CAAA;IAC3C,4DAAuC,CAAA;IACvC,8BAAS,CAAA;IACT,gDAA2B,CAAA;IAC3B,4DAAuC,CAAA;IACvC,oEAA+C,CAAA;IAC/C,oDAA+B,CAAA;IAC/B,8CAAyB,CAAA;IACzB,8EAAyD,CAAA;IACzD,4EAAuD,CAAA;IACvD,gDAA2B,CAAA;IAC3B,oDAA+B,CAAA;IAC/B,kDAA6B,CAAA;IAC7B,gDAA2B,CAAA;IAC3B,0DAAqC,CAAA;IACrC,sDAAiC,CAAA;IACjC,4CAAuB,CAAA;IACvB,sEAAiD,CAAA;IACjD,wDAAmC,CAAA;IACnC,wEAAmD,CAAA;IACnD,4EAAuD,CAAA;IACvD,sEAAiD,CAAA;IACjD,4DAAuC,CAAA;IACvC,wEAAmD,CAAA;IACnD,4CAAuB,CAAA;AACzB,CAAC,EAxDW,iBAAiB,KAAjB,iBAAiB,QAwD5B;AAED,MAAM,CAAN,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,iCAAa,CAAA;IACb,oCAAgB,CAAA;AAClB,CAAC,EAHW,gBAAgB,KAAhB,gBAAgB,QAG3B;AAED,MAAM,CAAN,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,4CAA+B,CAAA;IAC/B,sCAAyB,CAAA;IACzB,wCAA2B,CAAA;IAC3B,0CAA6B,CAAA;AAC/B,CAAC,EALW,SAAS,KAAT,SAAS,QAKpB"}
|
package/dist/model/mqtt.js
CHANGED
|
@@ -73,31 +73,31 @@ export class MQTT {
|
|
|
73
73
|
if (instance.client?.connected) {
|
|
74
74
|
onConnect(instance);
|
|
75
75
|
}
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
log.ifVerbose(strings.mqttClient.new, caller, id);
|
|
79
|
+
instance = new MQTT(log, broker, options);
|
|
80
|
+
MQTT.INSTANCES.set(id, instance);
|
|
81
|
+
instance.connect();
|
|
82
|
+
}
|
|
83
|
+
instance.onConnectCallbacks.push(onConnect);
|
|
84
|
+
const onConnectMessages = config?.onConnect;
|
|
85
|
+
if (onConnectMessages !== undefined) {
|
|
86
|
+
const errorLog = '\n[ { "topic": "example/topic", "message": "example message" } ]';
|
|
87
|
+
if (!Array.isArray(onConnectMessages)) {
|
|
88
|
+
log.error(strings.mqttClient.badMessages, errorLog);
|
|
89
|
+
}
|
|
90
|
+
else {
|
|
91
|
+
for (const message of onConnectMessages) {
|
|
92
|
+
if (message.topic === undefined || message.message === undefined) {
|
|
93
|
+
log.error(strings.mqttClient.badMessages, errorLog);
|
|
94
|
+
continue;
|
|
91
95
|
}
|
|
96
|
+
const key = `${message.topic}|${message.message}`;
|
|
97
|
+
instance?.onConnectMessages.set(key, message);
|
|
92
98
|
}
|
|
93
99
|
}
|
|
94
|
-
return instance;
|
|
95
100
|
}
|
|
96
|
-
log.ifVerbose(strings.mqttClient.new, caller, id);
|
|
97
|
-
instance = new MQTT(log, broker, options);
|
|
98
|
-
MQTT.INSTANCES.set(id, instance);
|
|
99
|
-
instance.onConnectCallbacks.push(onConnect);
|
|
100
|
-
instance.connect();
|
|
101
101
|
return instance;
|
|
102
102
|
}
|
|
103
103
|
constructor(log, broker, options) {
|
package/dist/model/mqtt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mqtt.js","sourceRoot":"","sources":["../../src/model/mqtt.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AAIxB,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAO,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC;AAE9E,MAAM,cAAc,GAAG,mBAAmB,CAAC;AAM3C,SAAS,aAAa,CAAC,QAAgB;IAErC,IAAI,IAAY,CAAC;IACjB,IAAI,QAAkB,CAAC;IAEvB,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACpC,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;QACjB,IAAI,GAAG,QAAQ,CAAC;QAChB,QAAQ,GAAG,EAAE,CAAC;IAChB,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QAChC,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACrE,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;AAC5C,CAAC;AAED,MAAM,YAAY;IAML;IAJX,KAAK,CAAQ;IAEb,YACE,QAAgB,EACP,OAA2B;QAA3B,YAAO,GAAP,OAAO,CAAoB;QAEpC,IAAI,CAAC,KAAK,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;CACF;AAQD,MAAM,OAAO,IAAI;
|
|
1
|
+
{"version":3,"file":"mqtt.js","sourceRoot":"","sources":["../../src/model/mqtt.ts"],"names":[],"mappings":"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"}
|
package/dist/model/types.d.ts
CHANGED
|
@@ -23,7 +23,7 @@ type ErrorStatusConfig = {
|
|
|
23
23
|
valueFault?: string;
|
|
24
24
|
valueTampered?: string;
|
|
25
25
|
};
|
|
26
|
-
type InfoConfig = Assertable & {
|
|
26
|
+
export type InfoConfig = Assertable & {
|
|
27
27
|
id: string;
|
|
28
28
|
name: string;
|
|
29
29
|
type: AccessoryType;
|
|
@@ -50,6 +50,7 @@ export type MQTTAccessoryConfig = Assertable & {
|
|
|
50
50
|
info: InfoConfig;
|
|
51
51
|
mqtt?: MQTTConfig;
|
|
52
52
|
customCharacteristics?: CustomCharacteristicConfig[];
|
|
53
|
+
resetOnRestart?: boolean;
|
|
53
54
|
disableLogging: boolean;
|
|
54
55
|
};
|
|
55
56
|
export type CustomCharacteristicConfig = Assertable & {
|
|
@@ -186,6 +187,24 @@ export type PurifierConfig = ActiveClimateConfig & FilterMaintenanceConfig & {
|
|
|
186
187
|
valueModeManual?: string;
|
|
187
188
|
valueModePurifying?: string;
|
|
188
189
|
};
|
|
190
|
+
export type GarageDoorConfig = LockConfig & {
|
|
191
|
+
topicGetCurrentDoorState: string;
|
|
192
|
+
topicGetCurrentLockState?: string;
|
|
193
|
+
topicGetObstructionDetected: string;
|
|
194
|
+
topicGetTargetDoorState: string;
|
|
195
|
+
topicGetTargetLockState?: string;
|
|
196
|
+
topicSetTargetDoorState: string;
|
|
197
|
+
topicSetTargetLockState?: string;
|
|
198
|
+
valueDoorObstructed: string;
|
|
199
|
+
valueDoorStateClosed?: string;
|
|
200
|
+
valueDoorStateClosing?: string;
|
|
201
|
+
valueDoorStateOpen?: string;
|
|
202
|
+
valueDoorStateOpening?: string;
|
|
203
|
+
valueDoorStateStopped?: string;
|
|
204
|
+
valueLockStateJammed?: string;
|
|
205
|
+
valueLockStateSecured?: string;
|
|
206
|
+
valueLockStateUnsecured?: string;
|
|
207
|
+
};
|
|
189
208
|
export type LockConfig = BaseAccessoryConfig & {
|
|
190
209
|
topicGetCurrentLockState: string;
|
|
191
210
|
topicGetTargetLockState: string;
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { CharacteristicValue } from 'homebridge';
|
|
2
|
+
import { CharacteristicKey } from '../model/enums.js';
|
|
3
|
+
export declare class Properties {
|
|
4
|
+
private readonly identifier;
|
|
5
|
+
private readonly useStorage;
|
|
6
|
+
static initStorage(persistPath: string): Promise<void>;
|
|
7
|
+
private readonly properties;
|
|
8
|
+
constructor(identifier: string, useStorage: boolean);
|
|
9
|
+
get(key: CharacteristicKey): CharacteristicValue | undefined;
|
|
10
|
+
set(key: CharacteristicKey, value: CharacteristicValue): void;
|
|
11
|
+
}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import storage from 'node-persist';
|
|
2
|
+
function propertyStorageKey(id) {
|
|
3
|
+
return `${id}:Properties`;
|
|
4
|
+
}
|
|
5
|
+
const PRELOAD_KEYS_UUID = 'a6ac8cc1-5112-41c9-98b8-198601281ebb';
|
|
6
|
+
const PRELOAD_KEYS = new Set;
|
|
7
|
+
const PRELOADED = new Map;
|
|
8
|
+
function cacheKey(key) {
|
|
9
|
+
if (PRELOAD_KEYS.has(key)) {
|
|
10
|
+
return;
|
|
11
|
+
}
|
|
12
|
+
PRELOAD_KEYS.add(key);
|
|
13
|
+
const keysArray = Array.from(PRELOAD_KEYS);
|
|
14
|
+
const keysJson = JSON.stringify(keysArray);
|
|
15
|
+
storage.set(PRELOAD_KEYS_UUID, keysJson);
|
|
16
|
+
}
|
|
17
|
+
export class Properties {
|
|
18
|
+
identifier;
|
|
19
|
+
useStorage;
|
|
20
|
+
static async initStorage(persistPath) {
|
|
21
|
+
await storage.init({ dir: persistPath, forgiveParseErrors: true });
|
|
22
|
+
const keysJson = await storage.get(PRELOAD_KEYS_UUID);
|
|
23
|
+
if (keysJson === undefined) {
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
26
|
+
try {
|
|
27
|
+
const keysArray = JSON.parse(keysJson);
|
|
28
|
+
keysArray.forEach(key => PRELOAD_KEYS.add(key));
|
|
29
|
+
}
|
|
30
|
+
catch {
|
|
31
|
+
// ignore
|
|
32
|
+
}
|
|
33
|
+
for (const key of PRELOAD_KEYS) {
|
|
34
|
+
try {
|
|
35
|
+
const propertiesJson = await storage.get(key);
|
|
36
|
+
if (propertiesJson === undefined) {
|
|
37
|
+
continue;
|
|
38
|
+
}
|
|
39
|
+
const array = JSON.parse(propertiesJson);
|
|
40
|
+
const properties = new Map(array);
|
|
41
|
+
PRELOADED.set(key, properties);
|
|
42
|
+
}
|
|
43
|
+
catch {
|
|
44
|
+
// ignore
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
properties = new Map();
|
|
49
|
+
constructor(identifier, useStorage) {
|
|
50
|
+
this.identifier = identifier;
|
|
51
|
+
this.useStorage = useStorage;
|
|
52
|
+
if (!useStorage) {
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
const key = propertyStorageKey(identifier);
|
|
56
|
+
this.properties = PRELOADED.get(key) ?? this.properties;
|
|
57
|
+
}
|
|
58
|
+
get(key) {
|
|
59
|
+
return this.properties.get(key);
|
|
60
|
+
}
|
|
61
|
+
set(key, value) {
|
|
62
|
+
this.properties.set(key, value);
|
|
63
|
+
if (!this.useStorage) {
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
const storageKey = propertyStorageKey(this.identifier);
|
|
67
|
+
cacheKey(storageKey);
|
|
68
|
+
const propertiesArray = Array.from(this.properties.entries());
|
|
69
|
+
const propertiesJson = JSON.stringify(propertiesArray);
|
|
70
|
+
storage.set(storageKey, propertiesJson);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
//# sourceMappingURL=properties.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"properties.js","sourceRoot":"","sources":["../../src/tools/properties.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"displayName": "Homebridge Easy MQTT",
|
|
5
5
|
"description": "Homebridge plugin for easy control of MQTT devices",
|
|
6
6
|
"type": "module",
|
|
7
|
-
"version": "1.4.0-beta.
|
|
7
|
+
"version": "1.4.0-beta.13",
|
|
8
8
|
"homepage": "https://github.com/mpatfield/homebridge-easy-mqtt#readme",
|
|
9
9
|
"repository": {
|
|
10
10
|
"type": "git",
|