@marcel2215/homebridge-supla-plugin 2.1.31 → 2.1.33
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/README.md +1 -67
- package/config.json +3 -0
- package/config.schema.json +75 -92
- package/dist/Accesories/ActionTriggerAccessory.d.ts +1 -0
- package/dist/Accesories/ActionTriggerAccessory.d.ts.map +1 -1
- package/dist/Accesories/ActionTriggerAccessory.js +9 -15
- package/dist/Accesories/ActionTriggerAccessory.js.map +1 -1
- package/dist/Accesories/AirQualityAccessory.d.ts +1 -3
- package/dist/Accesories/AirQualityAccessory.d.ts.map +1 -1
- package/dist/Accesories/AirQualityAccessory.js +5 -47
- package/dist/Accesories/AirQualityAccessory.js.map +1 -1
- package/dist/Accesories/ContactSensorAccessory.d.ts +1 -3
- package/dist/Accesories/ContactSensorAccessory.d.ts.map +1 -1
- package/dist/Accesories/ContactSensorAccessory.js +4 -32
- package/dist/Accesories/ContactSensorAccessory.js.map +1 -1
- package/dist/Accesories/DimmerAccessory.d.ts +3 -5
- package/dist/Accesories/DimmerAccessory.d.ts.map +1 -1
- package/dist/Accesories/DimmerAccessory.js +14 -50
- package/dist/Accesories/DimmerAccessory.js.map +1 -1
- package/dist/Accesories/DimmerRgbLightAccessory.d.ts +3 -11
- package/dist/Accesories/DimmerRgbLightAccessory.d.ts.map +1 -1
- package/dist/Accesories/DimmerRgbLightAccessory.js +26 -148
- package/dist/Accesories/DimmerRgbLightAccessory.js.map +1 -1
- package/dist/Accesories/DoorAccessory.d.ts +1 -14
- package/dist/Accesories/DoorAccessory.d.ts.map +1 -1
- package/dist/Accesories/DoorAccessory.js +20 -146
- package/dist/Accesories/DoorAccessory.js.map +1 -1
- package/dist/Accesories/ElectricityMeterAccessory.d.ts +1 -13
- package/dist/Accesories/ElectricityMeterAccessory.d.ts.map +1 -1
- package/dist/Accesories/ElectricityMeterAccessory.js +12 -127
- package/dist/Accesories/ElectricityMeterAccessory.js.map +1 -1
- package/dist/Accesories/FacadeBlindAccessory.d.ts +0 -6
- package/dist/Accesories/FacadeBlindAccessory.d.ts.map +1 -1
- package/dist/Accesories/FacadeBlindAccessory.js +64 -205
- package/dist/Accesories/FacadeBlindAccessory.js.map +1 -1
- package/dist/Accesories/FrontGateFsm.d.ts +68 -74
- package/dist/Accesories/FrontGateFsm.d.ts.map +1 -1
- package/dist/Accesories/FrontGateFsm.js +403 -563
- package/dist/Accesories/FrontGateFsm.js.map +1 -1
- package/dist/Accesories/GarageDoorOpenerAccesory.d.ts +3 -12
- package/dist/Accesories/GarageDoorOpenerAccesory.d.ts.map +1 -1
- package/dist/Accesories/GarageDoorOpenerAccesory.js +21 -168
- package/dist/Accesories/GarageDoorOpenerAccesory.js.map +1 -1
- package/dist/Accesories/GateAccessory.d.ts +2 -12
- package/dist/Accesories/GateAccessory.d.ts.map +1 -1
- package/dist/Accesories/GateAccessory.js +89 -258
- package/dist/Accesories/GateAccessory.js.map +1 -1
- package/dist/Accesories/GateLockAccessory.d.ts +1 -17
- package/dist/Accesories/GateLockAccessory.d.ts.map +1 -1
- package/dist/Accesories/GateLockAccessory.js +50 -375
- package/dist/Accesories/GateLockAccessory.js.map +1 -1
- package/dist/Accesories/LeakSensorAccessory.d.ts +1 -3
- package/dist/Accesories/LeakSensorAccessory.d.ts.map +1 -1
- package/dist/Accesories/LeakSensorAccessory.js +4 -32
- package/dist/Accesories/LeakSensorAccessory.js.map +1 -1
- package/dist/Accesories/LightBulbAccesory.d.ts +3 -4
- package/dist/Accesories/LightBulbAccesory.d.ts.map +1 -1
- package/dist/Accesories/LightBulbAccesory.js +12 -40
- package/dist/Accesories/LightBulbAccesory.js.map +1 -1
- package/dist/Accesories/PressureAccessory.d.ts +1 -3
- package/dist/Accesories/PressureAccessory.d.ts.map +1 -1
- package/dist/Accesories/PressureAccessory.js +5 -28
- package/dist/Accesories/PressureAccessory.js.map +1 -1
- package/dist/Accesories/RGBLightBulbAccesory.d.ts +1 -10
- package/dist/Accesories/RGBLightBulbAccesory.d.ts.map +1 -1
- package/dist/Accesories/RGBLightBulbAccesory.js +17 -136
- package/dist/Accesories/RGBLightBulbAccesory.js.map +1 -1
- package/dist/Accesories/RollerShutterAccessory.d.ts +0 -6
- package/dist/Accesories/RollerShutterAccessory.d.ts.map +1 -1
- package/dist/Accesories/RollerShutterAccessory.js +75 -221
- package/dist/Accesories/RollerShutterAccessory.js.map +1 -1
- package/dist/Accesories/SwitchAccessory.d.ts +3 -4
- package/dist/Accesories/SwitchAccessory.d.ts.map +1 -1
- package/dist/Accesories/SwitchAccessory.js +12 -40
- package/dist/Accesories/SwitchAccessory.js.map +1 -1
- package/dist/Accesories/TemperatureAccessory.d.ts +1 -3
- package/dist/Accesories/TemperatureAccessory.d.ts.map +1 -1
- package/dist/Accesories/TemperatureAccessory.js +5 -28
- package/dist/Accesories/TemperatureAccessory.js.map +1 -1
- package/dist/Accesories/TemperatureHumidityAccessory.d.ts +1 -5
- package/dist/Accesories/TemperatureHumidityAccessory.d.ts.map +1 -1
- package/dist/Accesories/TemperatureHumidityAccessory.js +9 -40
- package/dist/Accesories/TemperatureHumidityAccessory.js.map +1 -1
- package/dist/Accesories/ThermostatAccessory.d.ts +1 -18
- package/dist/Accesories/ThermostatAccessory.d.ts.map +1 -1
- package/dist/Accesories/ThermostatAccessory.js +34 -193
- package/dist/Accesories/ThermostatAccessory.js.map +1 -1
- package/dist/Accesories/ValveAccessory.d.ts +2 -5
- package/dist/Accesories/ValveAccessory.d.ts.map +1 -1
- package/dist/Accesories/ValveAccessory.js +8 -47
- package/dist/Accesories/ValveAccessory.js.map +1 -1
- package/dist/Accesories/WicketAccesory.d.ts +3 -18
- package/dist/Accesories/WicketAccesory.d.ts.map +1 -1
- package/dist/Accesories/WicketAccesory.js +14 -154
- package/dist/Accesories/WicketAccesory.js.map +1 -1
- package/dist/Heplers/ColorConverters.d.ts +2 -2
- package/dist/Heplers/ColorConverters.d.ts.map +1 -1
- package/dist/Heplers/ColorConverters.js +3 -7
- package/dist/Heplers/ColorConverters.js.map +1 -1
- package/dist/Heplers/SuplaChannelContext.d.ts +1 -3
- package/dist/Heplers/SuplaChannelContext.d.ts.map +1 -1
- package/dist/Heplers/SuplaChannelContext.js +1 -3
- package/dist/Heplers/SuplaChannelContext.js.map +1 -1
- package/dist/Heplers/SuplaMqttClient.d.ts +3 -11
- package/dist/Heplers/SuplaMqttClient.d.ts.map +1 -1
- package/dist/Heplers/SuplaMqttClient.js +112 -215
- package/dist/Heplers/SuplaMqttClient.js.map +1 -1
- package/dist/Heplers/SuplaMqttClientContext.d.ts +1 -2
- package/dist/Heplers/SuplaMqttClientContext.d.ts.map +1 -1
- package/dist/Heplers/SuplaMqttClientContext.js +1 -2
- package/dist/Heplers/SuplaMqttClientContext.js.map +1 -1
- package/dist/platform.d.ts +36 -93
- package/dist/platform.d.ts.map +1 -1
- package/dist/platform.js +236 -1285
- package/dist/platform.js.map +1 -1
- package/package.json +5 -10
- package/dist/Heplers/DisplayName.d.ts +0 -15
- package/dist/Heplers/DisplayName.d.ts.map +0 -1
- package/dist/Heplers/DisplayName.js +0 -174
- package/dist/Heplers/DisplayName.js.map +0 -1
|
@@ -9,19 +9,16 @@ class DoorAccessory {
|
|
|
9
9
|
this.currentPosition = 0;
|
|
10
10
|
this.targetPosition = 0;
|
|
11
11
|
this.positionState = this.platform.Characteristic.PositionState.STOPPED;
|
|
12
|
-
this.connected =
|
|
13
|
-
this.hasPosition = false;
|
|
14
|
-
this.hasHi = false;
|
|
15
|
-
this.hasPartialHi = false;
|
|
12
|
+
this.connected = true;
|
|
16
13
|
this.hi = false;
|
|
17
14
|
this.partialHi = false;
|
|
18
|
-
this.hiRevision = 0;
|
|
19
|
-
this.partialHiRevision = 0;
|
|
20
|
-
this.pendingHiRevision = 0;
|
|
21
|
-
this.pendingPartialHiRevision = 0;
|
|
22
15
|
this.accessory.getService(this.platform.Service.AccessoryInformation)
|
|
23
16
|
.setCharacteristic(this.platform.Characteristic.Manufacturer, 'Supla')
|
|
24
17
|
.setCharacteristic(this.platform.Characteristic.Model, 'DoorController');
|
|
18
|
+
const legacyGarage = this.accessory.getService(this.platform.Service.GarageDoorOpener);
|
|
19
|
+
if (legacyGarage) {
|
|
20
|
+
this.accessory.removeService(legacyGarage);
|
|
21
|
+
}
|
|
25
22
|
this.service = this.accessory.getService(this.platform.Service.Door)
|
|
26
23
|
|| this.accessory.addService(this.platform.Service.Door);
|
|
27
24
|
this.service.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
|
|
@@ -32,80 +29,27 @@ class DoorAccessory {
|
|
|
32
29
|
.onSet(this.handleTargetPositionSet.bind(this));
|
|
33
30
|
this.service.getCharacteristic(this.platform.Characteristic.PositionState)
|
|
34
31
|
.onGet(this.handlePositionStateGet.bind(this));
|
|
35
|
-
this.platform.
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
return;
|
|
39
|
-
}
|
|
40
|
-
const hi = this.platform.parseBooleanStrict(message.toString());
|
|
41
|
-
if (hi === undefined) {
|
|
42
|
-
return;
|
|
43
|
-
}
|
|
44
|
-
this.hi = hi;
|
|
45
|
-
this.hasHi = true;
|
|
46
|
-
if (packet?.retain !== true) {
|
|
47
|
-
this.hiRevision += 1;
|
|
48
|
-
}
|
|
49
|
-
if (this.hasPartialHi && this.hasCoherentPendingSnapshot()) {
|
|
50
|
-
this.updatePositionsFromState();
|
|
51
|
-
}
|
|
32
|
+
this.platform.registerMqttHandler(`${this.context.topic}/state/hi`, (message) => {
|
|
33
|
+
this.hi = this.platform.parseBoolean(message.toString());
|
|
34
|
+
this.updatePositionsFromState();
|
|
52
35
|
}, this.accessory.UUID);
|
|
53
|
-
this.platform.registerMqttHandler(`${this.context.topic}/state/partial_hi`, (message
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
}
|
|
57
|
-
const partialHi = this.platform.parseBooleanStrict(message.toString());
|
|
58
|
-
if (partialHi === undefined) {
|
|
59
|
-
return;
|
|
60
|
-
}
|
|
61
|
-
this.partialHi = partialHi;
|
|
62
|
-
this.hasPartialHi = true;
|
|
63
|
-
if (packet?.retain !== true) {
|
|
64
|
-
this.partialHiRevision += 1;
|
|
65
|
-
}
|
|
66
|
-
if (this.hasHi && this.hasCoherentPendingSnapshot()) {
|
|
67
|
-
this.updatePositionsFromState();
|
|
68
|
-
}
|
|
36
|
+
this.platform.registerMqttHandler(`${this.context.topic}/state/partial_hi`, (message) => {
|
|
37
|
+
this.partialHi = this.platform.parseBoolean(message.toString());
|
|
38
|
+
this.updatePositionsFromState();
|
|
69
39
|
}, this.accessory.UUID);
|
|
70
40
|
this.platform.registerMqttHandler(`${this.context.topic}/state/connected`, (message) => {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
return;
|
|
74
|
-
}
|
|
75
|
-
this.connected = connected;
|
|
76
|
-
if (!connected) {
|
|
77
|
-
this.invalidateState();
|
|
78
|
-
}
|
|
79
|
-
}, this.accessory.UUID);
|
|
80
|
-
this.platform.registerMqttTransportHandler?.((transportConnected) => {
|
|
81
|
-
if (!transportConnected) {
|
|
82
|
-
this.connected = false;
|
|
83
|
-
this.invalidateState();
|
|
84
|
-
}
|
|
41
|
+
this.connected = this.platform.parseBoolean(message.toString());
|
|
42
|
+
this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected ? 0 : 1);
|
|
85
43
|
}, this.accessory.UUID);
|
|
86
44
|
}
|
|
87
45
|
async handleCurrentPositionGet() {
|
|
88
|
-
this.assertAvailable();
|
|
89
46
|
return this.currentPosition;
|
|
90
47
|
}
|
|
91
48
|
async handleTargetPositionGet() {
|
|
92
|
-
this.assertAvailable();
|
|
93
49
|
return this.targetPosition;
|
|
94
50
|
}
|
|
95
51
|
async handleTargetPositionSet(value) {
|
|
96
|
-
const target = value;
|
|
97
|
-
if (!Number.isFinite(target) || (target !== 0 && target !== 100)) {
|
|
98
|
-
throw new this.platform.api.hap.HapStatusError(-70410 /* this.platform.api.hap.HAPStatus.INVALID_VALUE_IN_REQUEST */);
|
|
99
|
-
}
|
|
100
|
-
if (this.pendingTarget !== undefined) {
|
|
101
|
-
throw new this.platform.api.hap.HapStatusError(-70403 /* this.platform.api.hap.HAPStatus.RESOURCE_BUSY */);
|
|
102
|
-
}
|
|
103
|
-
this.assertAvailable();
|
|
104
|
-
if (target === this.currentPosition) {
|
|
105
|
-
return;
|
|
106
|
-
}
|
|
107
|
-
const previousTarget = this.targetPosition;
|
|
108
|
-
const previousState = this.positionState;
|
|
52
|
+
const target = this.clamp(value, 0, 100);
|
|
109
53
|
this.targetPosition = target;
|
|
110
54
|
if (this.targetPosition > this.currentPosition) {
|
|
111
55
|
this.positionState = this.platform.Characteristic.PositionState.INCREASING;
|
|
@@ -118,39 +62,14 @@ class DoorAccessory {
|
|
|
118
62
|
}
|
|
119
63
|
this.service.updateCharacteristic(this.platform.Characteristic.TargetPosition, this.targetPosition);
|
|
120
64
|
this.service.updateCharacteristic(this.platform.Characteristic.PositionState, this.positionState);
|
|
121
|
-
const action = this.targetPosition
|
|
122
|
-
this.pendingTarget = target;
|
|
123
|
-
this.pendingHiRevision = this.hiRevision;
|
|
124
|
-
this.pendingPartialHiRevision = this.partialHiRevision;
|
|
125
|
-
this.armPendingTimer();
|
|
65
|
+
const action = this.targetPosition <= 10 ? 'close' : 'open';
|
|
126
66
|
this.platform.log.debug(`Publishing ${this.context.topic}/execute_action = ${action}`);
|
|
127
|
-
|
|
128
|
-
await this.platform.publishActionAsync(`${this.context.topic}/execute_action`, action);
|
|
129
|
-
}
|
|
130
|
-
catch (error) {
|
|
131
|
-
if (this.platform.isPublishCompletionUnknown?.(error)) {
|
|
132
|
-
throw error;
|
|
133
|
-
}
|
|
134
|
-
if (this.pendingTarget === undefined) {
|
|
135
|
-
// A fresh two-sensor snapshot can confirm the physical result before
|
|
136
|
-
// the MQTT callback reports an error. Keep that authoritative state.
|
|
137
|
-
throw error;
|
|
138
|
-
}
|
|
139
|
-
this.pendingTarget = undefined;
|
|
140
|
-
this.clearPendingTimer();
|
|
141
|
-
this.targetPosition = previousTarget;
|
|
142
|
-
this.positionState = previousState;
|
|
143
|
-
this.service.updateCharacteristic(this.platform.Characteristic.TargetPosition, this.targetPosition);
|
|
144
|
-
this.service.updateCharacteristic(this.platform.Characteristic.PositionState, this.positionState);
|
|
145
|
-
throw error;
|
|
146
|
-
}
|
|
67
|
+
this.platform.publishCommand(`${this.context.topic}/execute_action`, action);
|
|
147
68
|
}
|
|
148
69
|
async handlePositionStateGet() {
|
|
149
|
-
this.assertAvailable();
|
|
150
70
|
return this.positionState;
|
|
151
71
|
}
|
|
152
72
|
updatePositionsFromState() {
|
|
153
|
-
this.hasPosition = true;
|
|
154
73
|
if (this.hi) {
|
|
155
74
|
this.currentPosition = 0;
|
|
156
75
|
}
|
|
@@ -160,59 +79,14 @@ class DoorAccessory {
|
|
|
160
79
|
else {
|
|
161
80
|
this.currentPosition = 100;
|
|
162
81
|
}
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
this.clearPendingTimer();
|
|
166
|
-
this.targetPosition = this.currentPosition;
|
|
167
|
-
this.positionState = this.platform.Characteristic.PositionState.STOPPED;
|
|
168
|
-
}
|
|
169
|
-
else {
|
|
170
|
-
this.targetPosition = this.pendingTarget;
|
|
171
|
-
this.positionState = this.targetPosition > this.currentPosition
|
|
172
|
-
? this.platform.Characteristic.PositionState.INCREASING
|
|
173
|
-
: this.platform.Characteristic.PositionState.DECREASING;
|
|
174
|
-
this.pendingHiRevision = this.hiRevision;
|
|
175
|
-
this.pendingPartialHiRevision = this.partialHiRevision;
|
|
176
|
-
}
|
|
82
|
+
this.targetPosition = this.currentPosition;
|
|
83
|
+
this.positionState = this.platform.Characteristic.PositionState.STOPPED;
|
|
177
84
|
this.service.updateCharacteristic(this.platform.Characteristic.CurrentPosition, this.currentPosition);
|
|
178
85
|
this.service.updateCharacteristic(this.platform.Characteristic.TargetPosition, this.targetPosition);
|
|
179
86
|
this.service.updateCharacteristic(this.platform.Characteristic.PositionState, this.positionState);
|
|
180
87
|
}
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
throw new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
|
|
184
|
-
}
|
|
185
|
-
}
|
|
186
|
-
hasCoherentPendingSnapshot() {
|
|
187
|
-
return this.pendingTarget === undefined
|
|
188
|
-
|| (this.hiRevision > this.pendingHiRevision
|
|
189
|
-
&& this.partialHiRevision > this.pendingPartialHiRevision);
|
|
190
|
-
}
|
|
191
|
-
armPendingTimer() {
|
|
192
|
-
this.clearPendingTimer();
|
|
193
|
-
this.pendingTimer = setTimeout(() => {
|
|
194
|
-
this.pendingTimer = undefined;
|
|
195
|
-
this.pendingTarget = undefined;
|
|
196
|
-
this.targetPosition = this.currentPosition;
|
|
197
|
-
this.positionState = this.platform.Characteristic.PositionState.STOPPED;
|
|
198
|
-
this.service.updateCharacteristic(this.platform.Characteristic.TargetPosition, this.targetPosition);
|
|
199
|
-
this.service.updateCharacteristic(this.platform.Characteristic.PositionState, this.positionState);
|
|
200
|
-
this.platform.log.warn(`Door ${this.accessory.displayName} did not report a confirming state within 15000ms.`);
|
|
201
|
-
}, 15000);
|
|
202
|
-
}
|
|
203
|
-
clearPendingTimer() {
|
|
204
|
-
if (this.pendingTimer) {
|
|
205
|
-
clearTimeout(this.pendingTimer);
|
|
206
|
-
this.pendingTimer = undefined;
|
|
207
|
-
}
|
|
208
|
-
}
|
|
209
|
-
invalidateState() {
|
|
210
|
-
this.hasPosition = false;
|
|
211
|
-
this.hasHi = false;
|
|
212
|
-
this.hasPartialHi = false;
|
|
213
|
-
this.pendingTarget = undefined;
|
|
214
|
-
this.clearPendingTimer();
|
|
215
|
-
this.positionState = this.platform.Characteristic.PositionState.STOPPED;
|
|
88
|
+
clamp(value, min, max) {
|
|
89
|
+
return Math.min(Math.max(value, min), max);
|
|
216
90
|
}
|
|
217
91
|
}
|
|
218
92
|
exports.DoorAccessory = DoorAccessory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DoorAccessory.js","sourceRoot":"","sources":["../../src/Accesories/DoorAccessory.ts"],"names":[],"mappings":";;;AAIA,MAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"DoorAccessory.js","sourceRoot":"","sources":["../../src/Accesories/DoorAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,22 +8,10 @@ export declare class ElectricityMeterAccessory {
|
|
|
8
8
|
private service;
|
|
9
9
|
private value;
|
|
10
10
|
private connected;
|
|
11
|
-
private
|
|
12
|
-
private selectedMetric?;
|
|
13
|
-
private readonly metricValues;
|
|
14
|
-
private readonly metricSelectionCandidates;
|
|
15
|
-
private metricSelectionMaxTimer?;
|
|
16
|
-
private metricSelectionMaxWaitMs;
|
|
11
|
+
private selectedMetricIndex;
|
|
17
12
|
private readonly metricPriority;
|
|
18
13
|
constructor(platform: SuplaPlatform, accessory: PlatformAccessory, context: SuplaChannelContext);
|
|
19
14
|
handleValueGet(): Promise<CharacteristicValue>;
|
|
20
15
|
private clamp;
|
|
21
|
-
private armMetricSelectionTimers;
|
|
22
|
-
private finalizeMetricSelection;
|
|
23
|
-
private applySelectedMetricValue;
|
|
24
|
-
private invalidateMetricEpoch;
|
|
25
|
-
private clearMetricSelectionTimers;
|
|
26
|
-
private updateServiceLabel;
|
|
27
|
-
private updateFault;
|
|
28
16
|
}
|
|
29
17
|
//# sourceMappingURL=ElectricityMeterAccessory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ElectricityMeterAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/ElectricityMeterAccessory.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;
|
|
1
|
+
{"version":3,"file":"ElectricityMeterAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/ElectricityMeterAccessory.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,yBAAyB;IAkBlC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAnB1B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,KAAK,CAAU;IACvB,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,mBAAmB,CAA2B;IACtD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAU7B;gBAGiB,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,mBAAmB;IA+CzC,cAAc,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAIpD,OAAO,CAAC,KAAK;CAGd"}
|
|
@@ -1,18 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ElectricityMeterAccessory = void 0;
|
|
4
|
-
const DisplayName_1 = require("../Heplers/DisplayName");
|
|
5
4
|
class ElectricityMeterAccessory {
|
|
6
5
|
constructor(platform, accessory, context) {
|
|
7
6
|
this.platform = platform;
|
|
8
7
|
this.accessory = accessory;
|
|
9
8
|
this.context = context;
|
|
10
9
|
this.value = 0.0001;
|
|
11
|
-
this.connected =
|
|
12
|
-
this.
|
|
13
|
-
this.metricValues = new Map();
|
|
14
|
-
this.metricSelectionCandidates = new Set();
|
|
15
|
-
this.metricSelectionMaxWaitMs = 4000;
|
|
10
|
+
this.connected = true;
|
|
11
|
+
this.selectedMetricIndex = Number.MAX_SAFE_INTEGER;
|
|
16
12
|
this.metricPriority = [
|
|
17
13
|
'total_forward_active_power',
|
|
18
14
|
'active_power',
|
|
@@ -30,143 +26,32 @@ class ElectricityMeterAccessory {
|
|
|
30
26
|
this.service = this.accessory.getService(this.platform.Service.LightSensor)
|
|
31
27
|
|| this.accessory.addService(this.platform.Service.LightSensor);
|
|
32
28
|
this.service.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
|
|
33
|
-
const persistedMetric = this.accessory.context.suplaElectricityMetric;
|
|
34
|
-
if (typeof persistedMetric === 'string' && this.metricPriority.includes(persistedMetric)) {
|
|
35
|
-
this.selectedMetric = persistedMetric;
|
|
36
|
-
this.updateServiceLabel();
|
|
37
|
-
}
|
|
38
|
-
else if (persistedMetric !== undefined) {
|
|
39
|
-
this.platform.log.warn(`Ignoring invalid persisted electricity metric for ${this.accessory.displayName}: ` +
|
|
40
|
-
`${String(persistedMetric)}`);
|
|
41
|
-
}
|
|
42
29
|
this.service.getCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel)
|
|
43
30
|
.onGet(this.handleValueGet.bind(this));
|
|
44
|
-
this.platform.registerOwnerCleanup(this.accessory.UUID, () => {
|
|
45
|
-
this.clearMetricSelectionTimers();
|
|
46
|
-
});
|
|
47
31
|
this.platform.registerMqttHandler(`${this.context.topic}/state/connected`, (message) => {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
return;
|
|
51
|
-
}
|
|
52
|
-
this.connected = connected;
|
|
53
|
-
if (!connected) {
|
|
54
|
-
this.invalidateMetricEpoch();
|
|
55
|
-
}
|
|
56
|
-
this.updateFault();
|
|
32
|
+
this.connected = this.platform.parseBoolean(message.toString());
|
|
33
|
+
this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected ? 0 : 1);
|
|
57
34
|
}, this.accessory.UUID);
|
|
58
|
-
this.metricPriority.forEach((key) => {
|
|
59
|
-
this.platform.registerMqttHandler(`${this.context.topic}/state/${key}`, (message
|
|
60
|
-
const value =
|
|
61
|
-
if (value
|
|
35
|
+
this.metricPriority.forEach((key, metricIndex) => {
|
|
36
|
+
this.platform.registerMqttHandler(`${this.context.topic}/state/${key}`, (message) => {
|
|
37
|
+
const value = parseFloat(message.toString());
|
|
38
|
+
if (Number.isNaN(value)) {
|
|
62
39
|
return;
|
|
63
40
|
}
|
|
64
|
-
this.
|
|
65
|
-
|
|
66
|
-
this.
|
|
67
|
-
this.
|
|
41
|
+
if (metricIndex <= this.selectedMetricIndex) {
|
|
42
|
+
this.selectedMetricIndex = metricIndex;
|
|
43
|
+
this.value = this.clamp(value, 0.0001, 100000);
|
|
44
|
+
this.service.updateCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel, this.value);
|
|
68
45
|
}
|
|
69
|
-
this.applySelectedMetricValue();
|
|
70
46
|
}, this.accessory.UUID);
|
|
71
47
|
});
|
|
72
|
-
this.platform.registerMqttTransportHandler?.((transportConnected) => {
|
|
73
|
-
if (!transportConnected) {
|
|
74
|
-
this.connected = false;
|
|
75
|
-
this.invalidateMetricEpoch();
|
|
76
|
-
this.updateFault();
|
|
77
|
-
}
|
|
78
|
-
}, this.accessory.UUID);
|
|
79
|
-
this.updateFault();
|
|
80
48
|
}
|
|
81
49
|
async handleValueGet() {
|
|
82
|
-
if (!this.connected || !this.hasValue) {
|
|
83
|
-
throw new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
|
|
84
|
-
}
|
|
85
50
|
return this.value;
|
|
86
51
|
}
|
|
87
52
|
clamp(value, min, max) {
|
|
88
53
|
return Math.min(Math.max(value, min), max);
|
|
89
54
|
}
|
|
90
|
-
armMetricSelectionTimers() {
|
|
91
|
-
if (this.selectedMetric !== undefined) {
|
|
92
|
-
return;
|
|
93
|
-
}
|
|
94
|
-
if (!this.metricSelectionMaxTimer) {
|
|
95
|
-
// Retained topics are independent MQTT publications. A quiet gap does not
|
|
96
|
-
// prove inventory completion, so select only after the full bounded
|
|
97
|
-
// collection window and then apply the stable priority order.
|
|
98
|
-
this.metricSelectionMaxTimer = setTimeout(() => {
|
|
99
|
-
this.finalizeMetricSelection();
|
|
100
|
-
}, this.metricSelectionMaxWaitMs);
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
finalizeMetricSelection() {
|
|
104
|
-
this.clearMetricSelectionTimers();
|
|
105
|
-
if (this.selectedMetric !== undefined) {
|
|
106
|
-
return;
|
|
107
|
-
}
|
|
108
|
-
const nextMetric = this.metricPriority.find(metric => this.metricSelectionCandidates.has(metric));
|
|
109
|
-
if (!nextMetric) {
|
|
110
|
-
return;
|
|
111
|
-
}
|
|
112
|
-
const previousContextMetric = this.accessory.context.suplaElectricityMetric;
|
|
113
|
-
this.accessory.context.suplaElectricityMetric = nextMetric;
|
|
114
|
-
try {
|
|
115
|
-
// Persist the semantic choice before exposing it. The LightSensor value
|
|
116
|
-
// must never silently change units after a restart or retained-message reorder.
|
|
117
|
-
this.platform.api.updatePlatformAccessories([this.accessory]);
|
|
118
|
-
}
|
|
119
|
-
catch (error) {
|
|
120
|
-
this.accessory.context.suplaElectricityMetric = previousContextMetric;
|
|
121
|
-
this.platform.log.error(`Failed to persist electricity metric selection for ${this.accessory.displayName}: ` +
|
|
122
|
-
`${error.message}`);
|
|
123
|
-
return;
|
|
124
|
-
}
|
|
125
|
-
this.selectedMetric = nextMetric;
|
|
126
|
-
this.metricSelectionCandidates.clear();
|
|
127
|
-
this.updateServiceLabel();
|
|
128
|
-
this.applySelectedMetricValue();
|
|
129
|
-
}
|
|
130
|
-
applySelectedMetricValue() {
|
|
131
|
-
if (this.selectedMetric === undefined) {
|
|
132
|
-
return;
|
|
133
|
-
}
|
|
134
|
-
const selectedValue = this.metricValues.get(this.selectedMetric);
|
|
135
|
-
if (selectedValue === undefined) {
|
|
136
|
-
return;
|
|
137
|
-
}
|
|
138
|
-
this.value = this.clamp(selectedValue, 0.0001, 100000);
|
|
139
|
-
this.hasValue = true;
|
|
140
|
-
this.service.updateCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel, this.value);
|
|
141
|
-
this.updateFault();
|
|
142
|
-
}
|
|
143
|
-
invalidateMetricEpoch() {
|
|
144
|
-
this.hasValue = false;
|
|
145
|
-
this.metricValues.clear();
|
|
146
|
-
if (this.selectedMetric === undefined) {
|
|
147
|
-
this.metricSelectionCandidates.clear();
|
|
148
|
-
this.clearMetricSelectionTimers();
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
|
-
clearMetricSelectionTimers() {
|
|
152
|
-
if (this.metricSelectionMaxTimer) {
|
|
153
|
-
clearTimeout(this.metricSelectionMaxTimer);
|
|
154
|
-
this.metricSelectionMaxTimer = undefined;
|
|
155
|
-
}
|
|
156
|
-
}
|
|
157
|
-
updateServiceLabel() {
|
|
158
|
-
if (!this.selectedMetric) {
|
|
159
|
-
return;
|
|
160
|
-
}
|
|
161
|
-
const serviceName = (0, DisplayName_1.homeKitElectricityServiceName)(this.accessory.displayName, this.selectedMetric);
|
|
162
|
-
this.service.displayName = serviceName;
|
|
163
|
-
this.service.setCharacteristic(this.platform.Characteristic.Name, serviceName);
|
|
164
|
-
}
|
|
165
|
-
updateFault() {
|
|
166
|
-
this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected && this.hasValue
|
|
167
|
-
? this.platform.Characteristic.StatusFault.NO_FAULT
|
|
168
|
-
: this.platform.Characteristic.StatusFault.GENERAL_FAULT);
|
|
169
|
-
}
|
|
170
55
|
}
|
|
171
56
|
exports.ElectricityMeterAccessory = ElectricityMeterAccessory;
|
|
172
57
|
//# sourceMappingURL=ElectricityMeterAccessory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ElectricityMeterAccessory.js","sourceRoot":"","sources":["../../src/Accesories/ElectricityMeterAccessory.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ElectricityMeterAccessory.js","sourceRoot":"","sources":["../../src/Accesories/ElectricityMeterAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,6 @@ export declare class FacadeBlindAccessory {
|
|
|
13
13
|
private targetTiltAngle;
|
|
14
14
|
private connected;
|
|
15
15
|
private stopTimer?;
|
|
16
|
-
private pendingStop?;
|
|
17
16
|
private readonly baseTopic;
|
|
18
17
|
private hasReceivedPosition;
|
|
19
18
|
private hasReceivedTilt;
|
|
@@ -37,7 +36,6 @@ export declare class FacadeBlindAccessory {
|
|
|
37
36
|
private clearPendingNoProgressTimeout;
|
|
38
37
|
private clearPendingTarget;
|
|
39
38
|
private clearStopTimer;
|
|
40
|
-
private cancelStopTimer;
|
|
41
39
|
private scheduleMotionStopTimer;
|
|
42
40
|
private clearMotionStopTimer;
|
|
43
41
|
private disposeTimers;
|
|
@@ -57,9 +55,5 @@ export declare class FacadeBlindAccessory {
|
|
|
57
55
|
private clamp;
|
|
58
56
|
private resolveAction;
|
|
59
57
|
private scheduleStopIfNeeded;
|
|
60
|
-
private readPersistedStop;
|
|
61
|
-
private setPendingStop;
|
|
62
|
-
private resumePendingStop;
|
|
63
|
-
private publishPendingStop;
|
|
64
58
|
}
|
|
65
59
|
//# sourceMappingURL=FacadeBlindAccessory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FacadeBlindAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/FacadeBlindAccessory.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;
|
|
1
|
+
{"version":3,"file":"FacadeBlindAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/FacadeBlindAccessory.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;IAsB7B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAvB1B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,aAAa,CAAsD;IAC3E,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,SAAS,CAAC,CAAiB;IACnC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,mBAAmB,CAAS;IACpC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,qBAAqB,CAAC,CAAS;IACvC,OAAO,CAAC,sBAAsB,CAAK;IACnC,OAAO,CAAC,kBAAkB,CAAC,CAAiB;IAC5C,OAAO,CAAC,sBAAsB,CAAC,CAAiB;IAChD,OAAO,CAAC,mBAAmB,CAAC,CAAS;IACrC,OAAO,CAAC,eAAe,CAAC,CAAiB;IACzC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,iBAAiB,CAAK;gBAGX,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,mBAAmB;IA2HzC,wBAAwB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAKxD,uBAAuB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAKvD,uBAAuB,CAAC,KAAK,EAAE,mBAAmB;IA6DlD,qBAAqB,CAAC,KAAK,EAAE,mBAAmB;IAkCtD,OAAO,CAAC,eAAe;IAiFvB,OAAO,CAAC,sBAAsB;IA8B9B,OAAO,CAAC,gCAAgC;IAgCxC,OAAO,CAAC,mBAAmB;IAmC3B,OAAO,CAAC,6BAA6B;IAOrC,OAAO,CAAC,kBAAkB;IAe1B,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,uBAAuB;IAqB/B,OAAO,CAAC,oBAAoB;IAO5B,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,SAAS;IAWjB,OAAO,CAAC,yBAAyB;IAejC,OAAO,CAAC,gBAAgB;IAqBlB,sBAAsB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAKtD,oBAAoB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAKpD,mBAAmB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAKnD,mBAAmB,CAAC,KAAK,EAAE,mBAAmB;IAkBpD,OAAO,CAAC,uBAAuB;IAQ/B,OAAO,CAAC,mBAAmB;IAQ3B,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,KAAK;IAIb,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,oBAAoB;CAyB7B"}
|