@marcel2215/homebridge-supla-plugin 2.1.7 → 2.1.9

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.
Files changed (83) hide show
  1. package/config.schema.json +104 -1
  2. package/dist/Accesories/ActionTriggerAccessory.d.ts.map +1 -1
  3. package/dist/Accesories/ActionTriggerAccessory.js +5 -10
  4. package/dist/Accesories/ActionTriggerAccessory.js.map +1 -1
  5. package/dist/Accesories/AirQualityAccessory.d.ts.map +1 -1
  6. package/dist/Accesories/AirQualityAccessory.js +9 -13
  7. package/dist/Accesories/AirQualityAccessory.js.map +1 -1
  8. package/dist/Accesories/ContactSensorAccessory.d.ts.map +1 -1
  9. package/dist/Accesories/ContactSensorAccessory.js +10 -14
  10. package/dist/Accesories/ContactSensorAccessory.js.map +1 -1
  11. package/dist/Accesories/DimmerAccessory.d.ts.map +1 -1
  12. package/dist/Accesories/DimmerAccessory.js +17 -23
  13. package/dist/Accesories/DimmerAccessory.js.map +1 -1
  14. package/dist/Accesories/DimmerRgbLightAccessory.d.ts.map +1 -1
  15. package/dist/Accesories/DimmerRgbLightAccessory.js +27 -37
  16. package/dist/Accesories/DimmerRgbLightAccessory.js.map +1 -1
  17. package/dist/Accesories/DoorAccessory.d.ts.map +1 -1
  18. package/dist/Accesories/DoorAccessory.js +11 -16
  19. package/dist/Accesories/DoorAccessory.js.map +1 -1
  20. package/dist/Accesories/ElectricityMeterAccessory.d.ts.map +1 -1
  21. package/dist/Accesories/ElectricityMeterAccessory.js +16 -24
  22. package/dist/Accesories/ElectricityMeterAccessory.js.map +1 -1
  23. package/dist/Accesories/FacadeBlindAccessory.d.ts +9 -0
  24. package/dist/Accesories/FacadeBlindAccessory.d.ts.map +1 -1
  25. package/dist/Accesories/FacadeBlindAccessory.js +127 -31
  26. package/dist/Accesories/FacadeBlindAccessory.js.map +1 -1
  27. package/dist/Accesories/GarageDoorOpenerAccesory.d.ts.map +1 -1
  28. package/dist/Accesories/GarageDoorOpenerAccesory.js +10 -13
  29. package/dist/Accesories/GarageDoorOpenerAccesory.js.map +1 -1
  30. package/dist/Accesories/GateAccessory.d.ts +21 -0
  31. package/dist/Accesories/GateAccessory.d.ts.map +1 -0
  32. package/dist/Accesories/GateAccessory.js +98 -0
  33. package/dist/Accesories/GateAccessory.js.map +1 -0
  34. package/dist/Accesories/GateLockAccessory.d.ts +18 -0
  35. package/dist/Accesories/GateLockAccessory.d.ts.map +1 -0
  36. package/dist/Accesories/GateLockAccessory.js +95 -0
  37. package/dist/Accesories/GateLockAccessory.js.map +1 -0
  38. package/dist/Accesories/LeakSensorAccessory.d.ts.map +1 -1
  39. package/dist/Accesories/LeakSensorAccessory.js +10 -14
  40. package/dist/Accesories/LeakSensorAccessory.js.map +1 -1
  41. package/dist/Accesories/LightBulbAccesory.d.ts.map +1 -1
  42. package/dist/Accesories/LightBulbAccesory.js +12 -17
  43. package/dist/Accesories/LightBulbAccesory.js.map +1 -1
  44. package/dist/Accesories/PressureAccessory.d.ts.map +1 -1
  45. package/dist/Accesories/PressureAccessory.js +9 -13
  46. package/dist/Accesories/PressureAccessory.js.map +1 -1
  47. package/dist/Accesories/RGBLightBulbAccesory.d.ts.map +1 -1
  48. package/dist/Accesories/RGBLightBulbAccesory.js +16 -24
  49. package/dist/Accesories/RGBLightBulbAccesory.js.map +1 -1
  50. package/dist/Accesories/RollerShutterAccessory.d.ts +18 -0
  51. package/dist/Accesories/RollerShutterAccessory.d.ts.map +1 -1
  52. package/dist/Accesories/RollerShutterAccessory.js +215 -22
  53. package/dist/Accesories/RollerShutterAccessory.js.map +1 -1
  54. package/dist/Accesories/SwitchAccessory.d.ts.map +1 -1
  55. package/dist/Accesories/SwitchAccessory.js +11 -16
  56. package/dist/Accesories/SwitchAccessory.js.map +1 -1
  57. package/dist/Accesories/TemperatureAccessory.d.ts.map +1 -1
  58. package/dist/Accesories/TemperatureAccessory.js +9 -13
  59. package/dist/Accesories/TemperatureAccessory.js.map +1 -1
  60. package/dist/Accesories/TemperatureHumidityAccessory.d.ts.map +1 -1
  61. package/dist/Accesories/TemperatureHumidityAccessory.js +17 -22
  62. package/dist/Accesories/TemperatureHumidityAccessory.js.map +1 -1
  63. package/dist/Accesories/ThermostatAccessory.d.ts.map +1 -1
  64. package/dist/Accesories/ThermostatAccessory.js +35 -43
  65. package/dist/Accesories/ThermostatAccessory.js.map +1 -1
  66. package/dist/Accesories/ValveAccessory.d.ts.map +1 -1
  67. package/dist/Accesories/ValveAccessory.js +18 -23
  68. package/dist/Accesories/ValveAccessory.js.map +1 -1
  69. package/dist/Accesories/WicketAccesory.js +3 -6
  70. package/dist/Accesories/WicketAccesory.js.map +1 -1
  71. package/dist/Heplers/SuplaMqttClient.d.ts +6 -0
  72. package/dist/Heplers/SuplaMqttClient.d.ts.map +1 -1
  73. package/dist/Heplers/SuplaMqttClient.js +174 -10
  74. package/dist/Heplers/SuplaMqttClient.js.map +1 -1
  75. package/dist/Heplers/SuplaMqttClientContext.d.ts +5 -1
  76. package/dist/Heplers/SuplaMqttClientContext.d.ts.map +1 -1
  77. package/dist/Heplers/SuplaMqttClientContext.js +5 -1
  78. package/dist/Heplers/SuplaMqttClientContext.js.map +1 -1
  79. package/dist/platform.d.ts +37 -0
  80. package/dist/platform.d.ts.map +1 -1
  81. package/dist/platform.js +153 -3
  82. package/dist/platform.js.map +1 -1
  83. package/package.json +1 -1
@@ -10,6 +10,9 @@ class RollerShutterAccessory {
10
10
  this.targetPosition = 0;
11
11
  this.positionState = this.platform.Characteristic.PositionState.STOPPED;
12
12
  this.connected = true;
13
+ this.legacyMode = false;
14
+ this.hasReceivedPosition = false;
15
+ this.pendingTargetExpiresAt = 0;
13
16
  this.accessory.getService(this.platform.Service.AccessoryInformation)
14
17
  .setCharacteristic(this.platform.Characteristic.Manufacturer, 'Supla')
15
18
  .setCharacteristic(this.platform.Characteristic.Model, 'RollerShutter');
@@ -23,27 +26,34 @@ class RollerShutterAccessory {
23
26
  .onSet(this.handleTargetPositionSet.bind(this));
24
27
  this.service.getCharacteristic(this.platform.Characteristic.PositionState)
25
28
  .onGet(this.handlePositionStateGet.bind(this));
26
- this.platform.MqttClient.client.subscribe(`${this.context.topic}/state/shut`);
27
- this.platform.MqttClient.client.subscribe(`${this.context.topic}/state/connected`);
28
- this.platform.MqttClient.client.on('message', (topic, message) => {
29
- if (topic === `${this.context.topic}/state/shut`) {
30
- const value = parseFloat(message.toString());
31
- if (!Number.isNaN(value)) {
32
- this.currentPosition = this.toPosition(value);
33
- if (Math.abs(this.targetPosition - this.currentPosition) <= 1) {
34
- this.targetPosition = this.currentPosition;
35
- }
36
- this.positionState = this.platform.Characteristic.PositionState.STOPPED;
37
- this.service.updateCharacteristic(this.platform.Characteristic.CurrentPosition, this.currentPosition);
38
- this.service.updateCharacteristic(this.platform.Characteristic.TargetPosition, this.targetPosition);
39
- this.service.updateCharacteristic(this.platform.Characteristic.PositionState, this.positionState);
29
+ this.legacyMode = this.isLegacyTopic();
30
+ const statusTopic = this.legacyMode
31
+ ? this.getLegacyStatusTopic()
32
+ : `${this.context.topic}/state/shut`;
33
+ const connectedTopic = this.legacyMode
34
+ ? undefined
35
+ : `${this.context.topic}/state/connected`;
36
+ this.platform.registerMqttHandler(statusTopic, (message) => {
37
+ if (this.legacyMode) {
38
+ const parsed = this.parseLegacyPayload(message.toString());
39
+ if ((parsed === null || parsed === void 0 ? void 0 : parsed.shut) !== undefined) {
40
+ this.applyShutUpdate(parsed.shut);
41
+ }
42
+ if ((parsed === null || parsed === void 0 ? void 0 : parsed.online) !== undefined) {
43
+ this.updateConnection(parsed.online);
40
44
  }
45
+ return;
41
46
  }
42
- if (topic === `${this.context.topic}/state/connected`) {
43
- this.connected = message.toString() === 'true';
44
- this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected ? 0 : 1);
47
+ const value = parseFloat(message.toString());
48
+ if (!Number.isNaN(value)) {
49
+ this.applyShutUpdate(value);
45
50
  }
46
51
  });
52
+ if (connectedTopic) {
53
+ this.platform.registerMqttHandler(connectedTopic, (message) => {
54
+ this.updateConnection(this.platform.parseBoolean(message.toString()));
55
+ });
56
+ }
47
57
  }
48
58
  async handleCurrentPositionGet() {
49
59
  return this.currentPosition;
@@ -65,6 +75,17 @@ class RollerShutterAccessory {
65
75
  }
66
76
  this.service.updateCharacteristic(this.platform.Characteristic.TargetPosition, this.targetPosition);
67
77
  this.service.updateCharacteristic(this.platform.Characteristic.PositionState, this.positionState);
78
+ if (this.targetPosition !== this.currentPosition) {
79
+ this.pendingTargetPosition = this.targetPosition;
80
+ this.schedulePendingTimeout(this.targetPosition, this.currentPosition);
81
+ }
82
+ else {
83
+ this.clearPendingTarget(false);
84
+ }
85
+ if (this.legacyMode) {
86
+ this.publishLegacyCommand(this.targetPosition);
87
+ return;
88
+ }
68
89
  const controlMode = this.platform.getCoveringControlMode();
69
90
  const shutValue = this.toShut(this.targetPosition).toString();
70
91
  if (controlMode === 'set' || controlMode === 'hybrid') {
@@ -77,9 +98,12 @@ class RollerShutterAccessory {
77
98
  });
78
99
  }
79
100
  if (controlMode === 'execute_action' || controlMode === 'hybrid') {
80
- if (this.targetPosition === 0 || this.targetPosition === 100) {
81
- const action = this.targetPosition === 0 ? 'close' : 'open';
82
- const actionTopic = `${this.context.topic}/execute_action`;
101
+ const actionTopic = `${this.context.topic}/execute_action`;
102
+ if (controlMode === 'hybrid' && this.targetPosition !== 0 && this.targetPosition !== 100) {
103
+ return;
104
+ }
105
+ const action = this.resolveAction(this.targetPosition, this.currentPosition);
106
+ if (action) {
83
107
  this.platform.log.debug(`Publishing ${actionTopic} = ${action}`);
84
108
  this.platform.MqttClient.client.publish(actionTopic, action, (error) => {
85
109
  if (error) {
@@ -87,9 +111,143 @@ class RollerShutterAccessory {
87
111
  }
88
112
  });
89
113
  }
90
- else if (controlMode === 'execute_action') {
91
- this.platform.log.warn(`Covering control mode execute_action does not support partial positions (${this.targetPosition}).`);
114
+ if (controlMode === 'execute_action') {
115
+ this.scheduleStopIfNeeded(this.targetPosition, this.currentPosition);
116
+ }
117
+ }
118
+ }
119
+ applyShutUpdate(shutValue) {
120
+ this.currentPosition = this.toPosition(shutValue);
121
+ this.positionState = this.platform.Characteristic.PositionState.STOPPED;
122
+ const now = Date.now();
123
+ if (!this.hasReceivedPosition) {
124
+ this.hasReceivedPosition = true;
125
+ this.clearPendingTarget(false);
126
+ this.targetPosition = this.currentPosition;
127
+ }
128
+ else if (this.pendingTargetPosition !== undefined) {
129
+ const reached = Math.abs(this.pendingTargetPosition - this.currentPosition) <= 1;
130
+ const expired = this.pendingTargetExpiresAt > 0 && now > this.pendingTargetExpiresAt;
131
+ if (reached || expired) {
132
+ this.clearPendingTarget(false);
133
+ this.targetPosition = this.currentPosition;
134
+ }
135
+ else {
136
+ this.schedulePendingTimeout(this.pendingTargetPosition, this.currentPosition);
137
+ }
138
+ }
139
+ else {
140
+ this.targetPosition = this.currentPosition;
141
+ }
142
+ this.service.updateCharacteristic(this.platform.Characteristic.CurrentPosition, this.currentPosition);
143
+ this.service.updateCharacteristic(this.platform.Characteristic.TargetPosition, this.targetPosition);
144
+ this.service.updateCharacteristic(this.platform.Characteristic.PositionState, this.positionState);
145
+ }
146
+ updateConnection(isConnected) {
147
+ this.connected = isConnected;
148
+ this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected ? 0 : 1);
149
+ }
150
+ parseLegacyPayload(payload) {
151
+ let data;
152
+ try {
153
+ data = JSON.parse(payload);
154
+ }
155
+ catch (_a) {
156
+ return null;
157
+ }
158
+ if (!data || typeof data !== 'object') {
159
+ return null;
160
+ }
161
+ const record = data;
162
+ const result = {};
163
+ const shutValue = Number(record.shut);
164
+ if (!Number.isNaN(shutValue)) {
165
+ result.shut = shutValue;
166
+ }
167
+ if (typeof record.online !== 'undefined') {
168
+ result.online = this.platform.parseBoolean(record.online);
169
+ }
170
+ return result;
171
+ }
172
+ publishLegacyCommand(targetPosition) {
173
+ const channelId = this.getLegacyChannelId();
174
+ if (channelId === null) {
175
+ this.platform.log.warn(`Legacy rollershutter channel id missing for ${this.accessory.displayName}`);
176
+ return;
177
+ }
178
+ const shutValue = Math.round(this.toShut(targetPosition));
179
+ const topic = this.getLegacyCommandTopic();
180
+ const payload = JSON.stringify({ id: channelId, shut: shutValue });
181
+ this.platform.log.debug(`Publishing ${topic} = ${payload}`);
182
+ this.platform.MqttClient.client.publish(topic, payload, (error) => {
183
+ if (error) {
184
+ this.platform.log.error(`Publish failed for ${topic}: ${error.message}`);
185
+ }
186
+ });
187
+ }
188
+ isLegacyTopic() {
189
+ return this.context.topic.startsWith('supla/channels/status/rollershutter/');
190
+ }
191
+ getLegacyStatusTopic() {
192
+ return this.context.topic;
193
+ }
194
+ getLegacyCommandTopic() {
195
+ if (this.context.topic.includes('/channels/status/rollershutter/')) {
196
+ return this.context.topic.replace('/channels/status/rollershutter/', '/channels/command/rollershutter/');
197
+ }
198
+ const channelId = this.getLegacyChannelId();
199
+ if (channelId === null) {
200
+ return 'supla/channels/command/rollershutter/unknown';
201
+ }
202
+ return `supla/channels/command/rollershutter/${channelId}`;
203
+ }
204
+ getLegacyChannelId() {
205
+ const idValue = Number(this.context.channelId);
206
+ if (!Number.isNaN(idValue)) {
207
+ return idValue;
208
+ }
209
+ const match = this.context.topic.match(/rollershutter\/(\d+)$/);
210
+ if (!match) {
211
+ return null;
212
+ }
213
+ const parsed = Number(match[1]);
214
+ return Number.isNaN(parsed) ? null : parsed;
215
+ }
216
+ schedulePendingTimeout(target, current) {
217
+ const travelTimeSeconds = this.platform.getCoveringTravelTimeSeconds();
218
+ const delta = Math.abs(target - current);
219
+ let timeoutMs = 15000;
220
+ if (travelTimeSeconds > 0 && delta > 0) {
221
+ timeoutMs = Math.round((delta / 100) * travelTimeSeconds * 1000) + 1000;
222
+ }
223
+ if (timeoutMs <= 0) {
224
+ return;
225
+ }
226
+ this.pendingTargetExpiresAt = Date.now() + timeoutMs;
227
+ if (this.pendingTargetTimer) {
228
+ clearTimeout(this.pendingTargetTimer);
229
+ }
230
+ this.pendingTargetTimer = setTimeout(() => {
231
+ this.pendingTargetTimer = undefined;
232
+ this.pendingTargetPosition = undefined;
233
+ this.pendingTargetExpiresAt = 0;
234
+ if (this.positionState !== this.platform.Characteristic.PositionState.STOPPED) {
235
+ this.positionState = this.platform.Characteristic.PositionState.STOPPED;
236
+ this.service.updateCharacteristic(this.platform.Characteristic.PositionState, this.positionState);
92
237
  }
238
+ this.platform.log.debug(`No state updates for ${this.accessory.displayName} within ${timeoutMs}ms; marking STOPPED.`);
239
+ }, timeoutMs);
240
+ }
241
+ clearPendingTarget(syncTarget) {
242
+ if (this.pendingTargetTimer) {
243
+ clearTimeout(this.pendingTargetTimer);
244
+ this.pendingTargetTimer = undefined;
245
+ }
246
+ this.pendingTargetPosition = undefined;
247
+ this.pendingTargetExpiresAt = 0;
248
+ if (syncTarget) {
249
+ this.targetPosition = this.currentPosition;
250
+ this.service.updateCharacteristic(this.platform.Characteristic.TargetPosition, this.targetPosition);
93
251
  }
94
252
  }
95
253
  async handlePositionStateGet() {
@@ -104,6 +262,41 @@ class RollerShutterAccessory {
104
262
  clamp(value, min, max) {
105
263
  return Math.min(Math.max(value, min), max);
106
264
  }
265
+ resolveAction(target, current) {
266
+ if (target > current) {
267
+ return this.platform.getCoveringExecuteActionOpen();
268
+ }
269
+ if (target < current) {
270
+ return this.platform.getCoveringExecuteActionClose();
271
+ }
272
+ const stopAction = this.platform.getCoveringExecuteActionStop();
273
+ return stopAction ? stopAction : null;
274
+ }
275
+ scheduleStopIfNeeded(target, current) {
276
+ const travelTimeSeconds = this.platform.getCoveringTravelTimeSeconds();
277
+ const stopAction = this.platform.getCoveringExecuteActionStop();
278
+ if (!travelTimeSeconds || !stopAction || target === current) {
279
+ if (this.stopTimer) {
280
+ clearTimeout(this.stopTimer);
281
+ this.stopTimer = undefined;
282
+ }
283
+ return;
284
+ }
285
+ const proportion = Math.abs(target - current) / 100;
286
+ const delayMs = Math.max(250, Math.round(proportion * travelTimeSeconds * 1000));
287
+ if (this.stopTimer) {
288
+ clearTimeout(this.stopTimer);
289
+ }
290
+ this.stopTimer = setTimeout(() => {
291
+ const actionTopic = `${this.context.topic}/execute_action`;
292
+ this.platform.log.debug(`Publishing ${actionTopic} = ${stopAction} (auto-stop)`);
293
+ this.platform.MqttClient.client.publish(actionTopic, stopAction, (error) => {
294
+ if (error) {
295
+ this.platform.log.error(`Publish failed for ${actionTopic}: ${error.message}`);
296
+ }
297
+ });
298
+ }, delayMs);
299
+ }
107
300
  }
108
301
  exports.RollerShutterAccessory = RollerShutterAccessory;
109
302
  //# sourceMappingURL=RollerShutterAccessory.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"RollerShutterAccessory.js","sourceRoot":"","sources":["../../src/Accesories/RollerShutterAccessory.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RollerShutterAccessory.js","sourceRoot":"","sources":["../../src/Accesories/RollerShutterAccessory.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"SwitchAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/SwitchAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,qBAAa,eAAe;IAOxB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAR1B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,WAAW,CAAS;gBAGT,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,mBAAmB;IAkCzC,WAAW,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAI3C,WAAW,CAAC,KAAK,EAAE,mBAAmB;IAa5C,OAAO,CAAC,WAAW;CAIpB"}
1
+ {"version":3,"file":"SwitchAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/SwitchAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,qBAAa,eAAe;IAOxB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAR1B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,WAAW,CAAS;gBAGT,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,mBAAmB;IAsCzC,WAAW,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAI3C,WAAW,CAAC,KAAK,EAAE,mBAAmB;IAa5C,OAAO,CAAC,WAAW;CAIpB"}
@@ -18,22 +18,17 @@ class SwitchAccessory {
18
18
  this.service.getCharacteristic(this.platform.Characteristic.On)
19
19
  .onGet(this.handleOnGet.bind(this))
20
20
  .onSet(this.handleOnSet.bind(this));
21
- this.platform.MqttClient.client.subscribe(`${this.context.topic}/state/on`);
22
- this.platform.MqttClient.client.subscribe(`${this.context.topic}/state/connected`);
23
- this.platform.MqttClient.client.subscribe(`${this.context.topic}/state/overcurrent_relay_off`);
24
- this.platform.MqttClient.client.on('message', (topic, message) => {
25
- if (topic === `${this.context.topic}/state/on`) {
26
- this.state = message.toString() === 'true';
27
- this.service.updateCharacteristic(this.platform.Characteristic.On, this.state);
28
- }
29
- if (topic === `${this.context.topic}/state/connected`) {
30
- this.connected = message.toString() === 'true';
31
- this.updateFault();
32
- }
33
- if (topic === `${this.context.topic}/state/overcurrent_relay_off`) {
34
- this.overcurrent = message.toString() === 'true';
35
- this.updateFault();
36
- }
21
+ this.platform.registerMqttHandler(`${this.context.topic}/state/on`, (message) => {
22
+ this.state = this.platform.parseBoolean(message.toString());
23
+ this.service.updateCharacteristic(this.platform.Characteristic.On, this.state);
24
+ });
25
+ this.platform.registerMqttHandler(`${this.context.topic}/state/connected`, (message) => {
26
+ this.connected = this.platform.parseBoolean(message.toString());
27
+ this.updateFault();
28
+ });
29
+ this.platform.registerMqttHandler(`${this.context.topic}/state/overcurrent_relay_off`, (message) => {
30
+ this.overcurrent = this.platform.parseBoolean(message.toString());
31
+ this.updateFault();
37
32
  });
38
33
  }
39
34
  async handleOnGet() {
@@ -1 +1 @@
1
- {"version":3,"file":"SwitchAccessory.js","sourceRoot":"","sources":["../../src/Accesories/SwitchAccessory.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SwitchAccessory.js","sourceRoot":"","sources":["../../src/Accesories/SwitchAccessory.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"TemperatureAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/TemperatureAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,qBAAa,oBAAoB;IAM7B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAP1B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,SAAS,CAAQ;gBAGN,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,mBAAmB;IAqCzC,oBAAoB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAI1D,OAAO,CAAC,KAAK;CAGd"}
1
+ {"version":3,"file":"TemperatureAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/TemperatureAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,qBAAa,oBAAoB;IAM7B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAP1B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,SAAS,CAAQ;gBAGN,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,mBAAmB;IAuCzC,oBAAoB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAI1D,OAAO,CAAC,KAAK;CAGd"}
@@ -16,21 +16,17 @@ class TemperatureAccessory {
16
16
  this.service.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
17
17
  this.service.getCharacteristic(this.platform.Characteristic.CurrentTemperature)
18
18
  .onGet(this.handleTemperatureGet.bind(this));
19
- this.platform.MqttClient.client.subscribe(`${this.context.topic}/state/temperature`);
20
- this.platform.MqttClient.client.subscribe(`${this.context.topic}/state/connected`);
21
- this.platform.MqttClient.client.on('message', (topic, message) => {
22
- if (topic === `${this.context.topic}/state/temperature`) {
23
- const value = parseFloat(message.toString());
24
- if (!Number.isNaN(value)) {
25
- this.temperature = this.clamp(value, -50, 100);
26
- this.service.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, this.temperature);
27
- }
28
- }
29
- if (topic === `${this.context.topic}/state/connected`) {
30
- this.connected = message.toString() === 'true';
31
- this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected ? 0 : 1);
19
+ this.platform.registerMqttHandler(`${this.context.topic}/state/temperature`, (message) => {
20
+ const value = parseFloat(message.toString());
21
+ if (!Number.isNaN(value)) {
22
+ this.temperature = this.clamp(value, -50, 100);
23
+ this.service.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, this.temperature);
32
24
  }
33
25
  });
26
+ this.platform.registerMqttHandler(`${this.context.topic}/state/connected`, (message) => {
27
+ this.connected = this.platform.parseBoolean(message.toString());
28
+ this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected ? 0 : 1);
29
+ });
34
30
  }
35
31
  async handleTemperatureGet() {
36
32
  return this.temperature;
@@ -1 +1 @@
1
- {"version":3,"file":"TemperatureAccessory.js","sourceRoot":"","sources":["../../src/Accesories/TemperatureAccessory.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TemperatureAccessory.js","sourceRoot":"","sources":["../../src/Accesories/TemperatureAccessory.ts"],"names":[],"mappings":";;;AAIA,MAAa,oBAAoB;IAK/B,YACmB,QAAuB,EACvB,SAA4B,EAC5B,OAA4B;QAF5B,aAAQ,GAAR,QAAQ,CAAe;QACvB,cAAS,GAAT,SAAS,CAAmB;QAC5B,YAAO,GAAP,OAAO,CAAqB;QANvC,gBAAW,GAAG,CAAC,CAAC;QAChB,cAAS,GAAG,IAAI,CAAC;QAOvB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAE;aACnE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,OAAO,CAAC;aACrE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAC;QAE9E,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC;eAC5E,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAExE,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;QAEzF,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC;aAC5E,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAE/C,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAC/B,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,oBAAoB,EACzC,CAAC,OAAO,EAAE,EAAE;YACV,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC7C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBACxB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;gBAC/C,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAC/B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,EAC/C,IAAI,CAAC,WAAW,CACjB,CAAC;aACH;QACH,CAAC,CACF,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAC/B,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,kBAAkB,EACvC,CAAC,OAAO,EAAE,EAAE;YACV,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAChE,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAC/B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,EACxC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACvB,CAAC;QACJ,CAAC,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,oBAAoB;QACxB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAEO,KAAK,CAAC,KAAa,EAAE,GAAW,EAAE,GAAW;QACnD,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;CACF;AAtDD,oDAsDC"}
@@ -1 +1 @@
1
- {"version":3,"file":"TemperatureHumidityAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/TemperatureHumidityAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,qBAAa,4BAA4B;IAQrC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAT1B,OAAO,CAAC,kBAAkB,CAAU;IACpC,OAAO,CAAC,eAAe,CAAU;IACjC,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,QAAQ,CAAK;IACrB,OAAO,CAAC,SAAS,CAAQ;gBAGN,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,mBAAmB;IAyDzC,oBAAoB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAIpD,iBAAiB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAIvD,OAAO,CAAC,KAAK;CAGd"}
1
+ {"version":3,"file":"TemperatureHumidityAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/TemperatureHumidityAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,qBAAa,4BAA4B;IAQrC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAT1B,OAAO,CAAC,kBAAkB,CAAU;IACpC,OAAO,CAAC,eAAe,CAAU;IACjC,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,QAAQ,CAAK;IACrB,OAAO,CAAC,SAAS,CAAQ;gBAGN,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,mBAAmB;IA6DzC,oBAAoB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAIpD,iBAAiB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAIvD,OAAO,CAAC,KAAK;CAGd"}
@@ -22,31 +22,26 @@ class TemperatureHumidityAccessory {
22
22
  this.humidityService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
23
23
  this.humidityService.getCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity)
24
24
  .onGet(this.handleHumidityGet.bind(this));
25
- this.platform.MqttClient.client.subscribe(`${this.context.topic}/state/temperature`);
26
- this.platform.MqttClient.client.subscribe(`${this.context.topic}/state/humidity`);
27
- this.platform.MqttClient.client.subscribe(`${this.context.topic}/state/connected`);
28
- this.platform.MqttClient.client.on('message', (topic, message) => {
29
- if (topic === `${this.context.topic}/state/temperature`) {
30
- const value = parseFloat(message.toString());
31
- if (!Number.isNaN(value)) {
32
- this.temperature = this.clamp(value, -50, 100);
33
- this.temperatureService.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, this.temperature);
34
- }
25
+ this.platform.registerMqttHandler(`${this.context.topic}/state/temperature`, (message) => {
26
+ const value = parseFloat(message.toString());
27
+ if (!Number.isNaN(value)) {
28
+ this.temperature = this.clamp(value, -50, 100);
29
+ this.temperatureService.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, this.temperature);
35
30
  }
36
- if (topic === `${this.context.topic}/state/humidity`) {
37
- const value = parseFloat(message.toString());
38
- if (!Number.isNaN(value)) {
39
- this.humidity = this.clamp(value, 0, 100);
40
- this.humidityService.updateCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity, this.humidity);
41
- }
42
- }
43
- if (topic === `${this.context.topic}/state/connected`) {
44
- this.connected = message.toString() === 'true';
45
- const faultValue = this.connected ? 0 : 1;
46
- this.temperatureService.updateCharacteristic(this.platform.Characteristic.StatusFault, faultValue);
47
- this.humidityService.updateCharacteristic(this.platform.Characteristic.StatusFault, faultValue);
31
+ });
32
+ this.platform.registerMqttHandler(`${this.context.topic}/state/humidity`, (message) => {
33
+ const value = parseFloat(message.toString());
34
+ if (!Number.isNaN(value)) {
35
+ this.humidity = this.clamp(value, 0, 100);
36
+ this.humidityService.updateCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity, this.humidity);
48
37
  }
49
38
  });
39
+ this.platform.registerMqttHandler(`${this.context.topic}/state/connected`, (message) => {
40
+ this.connected = this.platform.parseBoolean(message.toString());
41
+ const faultValue = this.connected ? 0 : 1;
42
+ this.temperatureService.updateCharacteristic(this.platform.Characteristic.StatusFault, faultValue);
43
+ this.humidityService.updateCharacteristic(this.platform.Characteristic.StatusFault, faultValue);
44
+ });
50
45
  }
51
46
  async handleTemperatureGet() {
52
47
  return this.temperature;
@@ -1 +1 @@
1
- {"version":3,"file":"TemperatureHumidityAccessory.js","sourceRoot":"","sources":["../../src/Accesories/TemperatureHumidityAccessory.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TemperatureHumidityAccessory.js","sourceRoot":"","sources":["../../src/Accesories/TemperatureHumidityAccessory.ts"],"names":[],"mappings":";;;AAIA,MAAa,4BAA4B;IAOvC,YACmB,QAAuB,EACvB,SAA4B,EAC5B,OAA4B;QAF5B,aAAQ,GAAR,QAAQ,CAAe;QACvB,cAAS,GAAT,SAAS,CAAmB;QAC5B,YAAO,GAAP,OAAO,CAAqB;QAPvC,gBAAW,GAAG,CAAC,CAAC;QAChB,aAAQ,GAAG,CAAC,CAAC;QACb,cAAS,GAAG,IAAI,CAAC;QAOvB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAE;aACnE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,OAAO,CAAC;aACrE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,2BAA2B,CAAC,CAAC;QAEtF,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC;eACvF,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACxE,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;QACpG,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC;aACvF,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAE/C,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC;eACjF,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACrE,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;QACjG,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,uBAAuB,CAAC;aACzF,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAE5C,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAC/B,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,oBAAoB,EACzC,CAAC,OAAO,EAAE,EAAE;YACV,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC7C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBACxB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;gBAC/C,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAC1C,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,EAC/C,IAAI,CAAC,WAAW,CACjB,CAAC;aACH;QACH,CAAC,CACF,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAC/B,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,iBAAiB,EACtC,CAAC,OAAO,EAAE,EAAE;YACV,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC7C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBACxB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;gBAC1C,IAAI,CAAC,eAAe,CAAC,oBAAoB,CACvC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,uBAAuB,EACpD,IAAI,CAAC,QAAQ,CACd,CAAC;aACH;QACH,CAAC,CACF,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAC/B,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,kBAAkB,EACvC,CAAC,OAAO,EAAE,EAAE;YACV,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAChE,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1C,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAC1C,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,EACxC,UAAU,CACX,CAAC;YACF,IAAI,CAAC,eAAe,CAAC,oBAAoB,CACvC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,EACxC,UAAU,CACX,CAAC;QACJ,CAAC,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,oBAAoB;QACxB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAEO,KAAK,CAAC,KAAa,EAAE,GAAW,EAAE,GAAW;QACnD,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IAC7C,CAAC;CACF;AAlFD,oEAkFC"}
@@ -1 +1 @@
1
- {"version":3,"file":"ThermostatAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/ThermostatAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,qBAAa,mBAAmB;IAW5B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAZ1B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,kBAAkB,CAAM;IAChC,OAAO,CAAC,iBAAiB,CAAM;IAC/B,OAAO,CAAC,WAAW,CAA8D;IACjF,OAAO,CAAC,YAAY,CAA+D;IACnF,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,qBAAqB,CAAS;gBAGnB,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,mBAAmB;IAgGzC,2BAA2B,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAI3D,0BAA0B,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAI1D,0BAA0B,CAAC,KAAK,EAAE,mBAAmB;IAYrD,qBAAqB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAIrD,oBAAoB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAIpD,oBAAoB,CAAC,KAAK,EAAE,mBAAmB;IAqBrD,OAAO,CAAC,aAAa;IAyBrB,OAAO,CAAC,cAAc;IAqBtB,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,KAAK;CAGd"}
1
+ {"version":3,"file":"ThermostatAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/ThermostatAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAErE,qBAAa,mBAAmB;IAW5B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAZ1B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,kBAAkB,CAAM;IAChC,OAAO,CAAC,iBAAiB,CAAM;IAC/B,OAAO,CAAC,WAAW,CAA8D;IACjF,OAAO,CAAC,YAAY,CAA+D;IACnF,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,qBAAqB,CAAS;gBAGnB,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,mBAAmB;IA0GzC,2BAA2B,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAI3D,0BAA0B,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAI1D,0BAA0B,CAAC,KAAK,EAAE,mBAAmB;IAYrD,qBAAqB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAIrD,oBAAoB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAIpD,oBAAoB,CAAC,KAAK,EAAE,mBAAmB;IAqBrD,OAAO,CAAC,aAAa;IAyBrB,OAAO,CAAC,cAAc;IAqBtB,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,KAAK;CAGd"}
@@ -29,54 +29,46 @@ class ThermostatAccessory {
29
29
  this.service.getCharacteristic(this.platform.Characteristic.TargetHeatingCoolingState)
30
30
  .onGet(this.handleTargetStateGet.bind(this))
31
31
  .onSet(this.handleTargetStateSet.bind(this));
32
- this.platform.MqttClient.client.subscribe(`${this.context.topic}/state/temperature_setpoint`);
33
- this.platform.MqttClient.client.subscribe(`${this.context.topic}/state/mode`);
34
- this.platform.MqttClient.client.subscribe(`${this.context.topic}/state/action`);
35
- this.platform.MqttClient.client.subscribe(`${this.context.topic}/state/is_on`);
36
- this.platform.MqttClient.client.subscribe(`${this.context.topic}/state/temperature`);
37
- this.platform.MqttClient.client.subscribe(`${this.context.topic}/state/connected`);
38
- this.platform.MqttClient.client.on('message', (topic, message) => {
39
- if (topic === `${this.context.topic}/state/temperature_setpoint`) {
40
- const value = parseFloat(message.toString());
41
- if (!Number.isNaN(value)) {
42
- this.targetTemperature = this.clamp(value, 5, 35);
43
- this.service.updateCharacteristic(this.platform.Characteristic.TargetTemperature, this.targetTemperature);
44
- if (!this.hasCurrentTemperature) {
45
- this.currentTemperature = this.targetTemperature;
46
- this.service.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, this.currentTemperature);
47
- }
48
- }
49
- }
50
- if (topic === `${this.context.topic}/state/temperature`) {
51
- const value = parseFloat(message.toString());
52
- if (!Number.isNaN(value)) {
53
- this.currentTemperature = this.clamp(value, -50, 100);
54
- this.hasCurrentTemperature = true;
32
+ this.platform.registerMqttHandler(`${this.context.topic}/state/temperature_setpoint`, (message) => {
33
+ const value = parseFloat(message.toString());
34
+ if (!Number.isNaN(value)) {
35
+ this.targetTemperature = this.clamp(value, 5, 35);
36
+ this.service.updateCharacteristic(this.platform.Characteristic.TargetTemperature, this.targetTemperature);
37
+ if (!this.hasCurrentTemperature) {
38
+ this.currentTemperature = this.targetTemperature;
55
39
  this.service.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, this.currentTemperature);
56
40
  }
57
41
  }
58
- if (topic === `${this.context.topic}/state/mode`) {
59
- const mode = message.toString();
60
- this.targetState = this.toTargetState(mode, this.isOn);
61
- this.service.updateCharacteristic(this.platform.Characteristic.TargetHeatingCoolingState, this.targetState);
62
- }
63
- if (topic === `${this.context.topic}/state/action`) {
64
- const action = message.toString();
65
- this.currentState = this.toCurrentState(action, this.isOn);
66
- this.service.updateCharacteristic(this.platform.Characteristic.CurrentHeatingCoolingState, this.currentState);
67
- }
68
- if (topic === `${this.context.topic}/state/is_on`) {
69
- this.isOn = message.toString() === 'true';
70
- this.targetState = this.toTargetState(undefined, this.isOn, this.targetState);
71
- this.currentState = this.toCurrentState(undefined, this.isOn, this.currentState);
72
- this.service.updateCharacteristic(this.platform.Characteristic.TargetHeatingCoolingState, this.targetState);
73
- this.service.updateCharacteristic(this.platform.Characteristic.CurrentHeatingCoolingState, this.currentState);
74
- }
75
- if (topic === `${this.context.topic}/state/connected`) {
76
- this.connected = message.toString() === 'true';
77
- this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected ? 0 : 1);
42
+ });
43
+ this.platform.registerMqttHandler(`${this.context.topic}/state/temperature`, (message) => {
44
+ const value = parseFloat(message.toString());
45
+ if (!Number.isNaN(value)) {
46
+ this.currentTemperature = this.clamp(value, -50, 100);
47
+ this.hasCurrentTemperature = true;
48
+ this.service.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, this.currentTemperature);
78
49
  }
79
50
  });
51
+ this.platform.registerMqttHandler(`${this.context.topic}/state/mode`, (message) => {
52
+ const mode = message.toString();
53
+ this.targetState = this.toTargetState(mode, this.isOn);
54
+ this.service.updateCharacteristic(this.platform.Characteristic.TargetHeatingCoolingState, this.targetState);
55
+ });
56
+ this.platform.registerMqttHandler(`${this.context.topic}/state/action`, (message) => {
57
+ const action = message.toString();
58
+ this.currentState = this.toCurrentState(action, this.isOn);
59
+ this.service.updateCharacteristic(this.platform.Characteristic.CurrentHeatingCoolingState, this.currentState);
60
+ });
61
+ this.platform.registerMqttHandler(`${this.context.topic}/state/is_on`, (message) => {
62
+ this.isOn = this.platform.parseBoolean(message.toString());
63
+ this.targetState = this.toTargetState(undefined, this.isOn, this.targetState);
64
+ this.currentState = this.toCurrentState(undefined, this.isOn, this.currentState);
65
+ this.service.updateCharacteristic(this.platform.Characteristic.TargetHeatingCoolingState, this.targetState);
66
+ this.service.updateCharacteristic(this.platform.Characteristic.CurrentHeatingCoolingState, this.currentState);
67
+ });
68
+ this.platform.registerMqttHandler(`${this.context.topic}/state/connected`, (message) => {
69
+ this.connected = this.platform.parseBoolean(message.toString());
70
+ this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected ? 0 : 1);
71
+ });
80
72
  }
81
73
  async handleCurrentTemperatureGet() {
82
74
  return this.currentTemperature;