@marcel2215/homebridge-supla-plugin 2.1.32 → 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 -7
- package/dist/Accesories/DimmerAccessory.d.ts.map +1 -1
- package/dist/Accesories/DimmerAccessory.js +16 -84
- 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
|
@@ -1,32 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.WicketAccesory = void 0;
|
|
4
|
-
/**
|
|
5
|
-
* Legacy wicket handler retained for source compatibility. It is not selected
|
|
6
|
-
* by the current platform mapping, but must remain fail-safe if reused.
|
|
7
|
-
*/
|
|
8
4
|
class WicketAccesory {
|
|
9
5
|
constructor(platform, accessory, context) {
|
|
10
6
|
this.platform = platform;
|
|
11
7
|
this.accessory = accessory;
|
|
12
8
|
this.context = context;
|
|
13
|
-
this.
|
|
14
|
-
this.connected = false;
|
|
15
|
-
this.hasState = false;
|
|
16
|
-
this.commandUncertain = false;
|
|
17
|
-
this.confirmationExpired = false;
|
|
18
|
-
this.confirmationTimeoutMs = 15000;
|
|
9
|
+
this.connected = true;
|
|
19
10
|
this.accessory.getService(this.platform.Service.AccessoryInformation)
|
|
20
11
|
.setCharacteristic(this.platform.Characteristic.Manufacturer, 'Supla')
|
|
21
|
-
.setCharacteristic(this.platform.Characteristic.Model, '
|
|
12
|
+
.setCharacteristic(this.platform.Characteristic.Model, 'GarageDoorOpener');
|
|
22
13
|
this.service = this.accessory.getService(this.platform.Service.GarageDoorOpener)
|
|
23
14
|
|| this.accessory.addService(this.platform.Service.GarageDoorOpener);
|
|
24
15
|
this.service.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
|
|
25
|
-
this.commandUncertain = this.accessory.context.suplaWicketCommandUncertain === true;
|
|
26
|
-
this.confirmationExpired = this.commandUncertain;
|
|
27
|
-
this.platform.registerOwnerCleanup?.(this.accessory.UUID, () => {
|
|
28
|
-
this.clearConfirmationTimer();
|
|
29
|
-
});
|
|
30
16
|
this.service.getCharacteristic(this.platform.Characteristic.CurrentDoorState)
|
|
31
17
|
.onGet(this.handleCurrentDoorStateGet.bind(this));
|
|
32
18
|
this.service.getCharacteristic(this.platform.Characteristic.TargetDoorState)
|
|
@@ -34,154 +20,28 @@ class WicketAccesory {
|
|
|
34
20
|
.onSet(this.handleTargetDoorStateSet.bind(this));
|
|
35
21
|
this.service.getCharacteristic(this.platform.Characteristic.ObstructionDetected)
|
|
36
22
|
.onGet(this.handleObstructionDetectedGet.bind(this));
|
|
37
|
-
this.platform.registerMqttHandler(`${this.context.topic}/state/hi`, (message, _topic, packet) => {
|
|
38
|
-
const closed = this.platform.parseBooleanStrict(message.toString());
|
|
39
|
-
if (closed === undefined) {
|
|
40
|
-
return;
|
|
41
|
-
}
|
|
42
|
-
if (this.commandUncertain && packet?.retain === true) {
|
|
43
|
-
return;
|
|
44
|
-
}
|
|
45
|
-
this.state = closed
|
|
46
|
-
? this.platform.Characteristic.CurrentDoorState.CLOSED
|
|
47
|
-
: this.platform.Characteristic.CurrentDoorState.OPEN;
|
|
48
|
-
this.hasState = true;
|
|
49
|
-
if (this.commandUncertain && packet?.retain !== true) {
|
|
50
|
-
if (this.state === this.platform.Characteristic.CurrentDoorState.OPEN) {
|
|
51
|
-
this.setCommandUncertain(false);
|
|
52
|
-
}
|
|
53
|
-
else if (this.confirmationExpired) {
|
|
54
|
-
this.platform.log.warn(`Wicket command for ${this.accessory.displayName} was not applied; ` +
|
|
55
|
-
'reconciled from the latest live state after the confirmation window expired.');
|
|
56
|
-
this.setCommandUncertain(false);
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
|
-
this.service.updateCharacteristic(this.platform.Characteristic.CurrentDoorState, this.state);
|
|
60
|
-
if (!this.commandUncertain) {
|
|
61
|
-
const target = this.state === this.platform.Characteristic.CurrentDoorState.OPEN
|
|
62
|
-
? this.platform.Characteristic.TargetDoorState.OPEN
|
|
63
|
-
: this.platform.Characteristic.TargetDoorState.CLOSED;
|
|
64
|
-
this.service.updateCharacteristic(this.platform.Characteristic.TargetDoorState, target);
|
|
65
|
-
}
|
|
66
|
-
}, this.accessory.UUID);
|
|
67
23
|
this.platform.registerMqttHandler(`${this.context.topic}/state/connected`, (message) => {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
return;
|
|
71
|
-
}
|
|
72
|
-
this.connected = connected;
|
|
73
|
-
if (!connected) {
|
|
74
|
-
this.hasState = false;
|
|
75
|
-
this.expirePendingConfirmation();
|
|
76
|
-
}
|
|
77
|
-
}, this.accessory.UUID);
|
|
78
|
-
this.platform.registerMqttTransportHandler?.((transportConnected) => {
|
|
79
|
-
if (!transportConnected) {
|
|
80
|
-
this.connected = false;
|
|
81
|
-
this.hasState = false;
|
|
82
|
-
this.expirePendingConfirmation();
|
|
83
|
-
}
|
|
24
|
+
this.connected = this.platform.parseBoolean(message.toString());
|
|
25
|
+
this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected ? 0 : 1);
|
|
84
26
|
}, this.accessory.UUID);
|
|
85
27
|
}
|
|
86
28
|
async handleCurrentDoorStateGet() {
|
|
87
|
-
this.
|
|
88
|
-
return this.state;
|
|
29
|
+
return this.platform.Characteristic.TargetDoorState.CLOSED;
|
|
89
30
|
}
|
|
90
31
|
async handleTargetDoorStateGet() {
|
|
91
|
-
this.
|
|
92
|
-
return this.state === this.platform.Characteristic.CurrentDoorState.OPEN
|
|
93
|
-
? this.platform.Characteristic.TargetDoorState.OPEN
|
|
94
|
-
: this.platform.Characteristic.TargetDoorState.CLOSED;
|
|
32
|
+
return this.platform.Characteristic.TargetDoorState.CLOSED;
|
|
95
33
|
}
|
|
96
|
-
async handleTargetDoorStateSet(
|
|
97
|
-
if (value !== this.platform.Characteristic.TargetDoorState.OPEN
|
|
98
|
-
&& value !== this.platform.Characteristic.TargetDoorState.CLOSED) {
|
|
99
|
-
throw new this.platform.api.hap.HapStatusError(-70410 /* this.platform.api.hap.HAPStatus.INVALID_VALUE_IN_REQUEST */);
|
|
100
|
-
}
|
|
101
|
-
if (this.commandUncertain) {
|
|
102
|
-
throw new this.platform.api.hap.HapStatusError(-70403 /* this.platform.api.hap.HAPStatus.RESOURCE_BUSY */);
|
|
103
|
-
}
|
|
104
|
-
this.assertAvailable();
|
|
105
|
-
const isOpen = this.state === this.platform.Characteristic.CurrentDoorState.OPEN;
|
|
106
|
-
if (value === this.platform.Characteristic.TargetDoorState.CLOSED) {
|
|
107
|
-
if (!isOpen) {
|
|
108
|
-
return;
|
|
109
|
-
}
|
|
110
|
-
throw new this.platform.api.hap.HapStatusError(-70412 /* this.platform.api.hap.HAPStatus.NOT_ALLOWED_IN_CURRENT_STATE */);
|
|
111
|
-
}
|
|
112
|
-
if (isOpen) {
|
|
113
|
-
return;
|
|
114
|
-
}
|
|
115
|
-
this.setCommandUncertain(true, true);
|
|
116
|
-
this.armConfirmationTimer();
|
|
34
|
+
async handleTargetDoorStateSet() {
|
|
117
35
|
this.platform.log.debug(`Publishing ${this.context.topic}/execute_action = open`);
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
this.setCommandUncertain(false);
|
|
124
|
-
}
|
|
125
|
-
throw error;
|
|
126
|
-
}
|
|
36
|
+
this.platform.publishCommand(`${this.context.topic}/execute_action`, 'open');
|
|
37
|
+
this.service.updateCharacteristic(this.platform.Characteristic.CurrentDoorState, this.platform.Characteristic.CurrentDoorState.OPEN);
|
|
38
|
+
setTimeout(() => {
|
|
39
|
+
this.service.updateCharacteristic(this.platform.Characteristic.CurrentDoorState, this.platform.Characteristic.CurrentDoorState.CLOSED);
|
|
40
|
+
}, 1000);
|
|
127
41
|
}
|
|
128
42
|
async handleObstructionDetectedGet() {
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
assertAvailable() {
|
|
132
|
-
if (!this.connected || !this.hasState || this.commandUncertain) {
|
|
133
|
-
throw new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
|
|
134
|
-
}
|
|
135
|
-
}
|
|
136
|
-
setCommandUncertain(uncertain, requirePersistence = false) {
|
|
137
|
-
const previous = this.commandUncertain;
|
|
138
|
-
const previousConfirmationExpired = this.confirmationExpired;
|
|
139
|
-
const previousContext = this.accessory.context.suplaWicketCommandUncertain;
|
|
140
|
-
this.commandUncertain = uncertain;
|
|
141
|
-
this.confirmationExpired = uncertain ? this.confirmationExpired : false;
|
|
142
|
-
this.accessory.context.suplaWicketCommandUncertain = uncertain;
|
|
143
|
-
try {
|
|
144
|
-
this.platform.api.updatePlatformAccessories([this.accessory]);
|
|
145
|
-
}
|
|
146
|
-
catch (error) {
|
|
147
|
-
this.commandUncertain = previous;
|
|
148
|
-
this.confirmationExpired = previous && !uncertain
|
|
149
|
-
? true
|
|
150
|
-
: previousConfirmationExpired;
|
|
151
|
-
this.accessory.context.suplaWicketCommandUncertain = previousContext;
|
|
152
|
-
this.platform.log.error(`Failed to persist wicket command uncertainty for ${this.accessory.displayName}: ${error.message}`);
|
|
153
|
-
if (requirePersistence) {
|
|
154
|
-
throw new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
|
|
155
|
-
}
|
|
156
|
-
}
|
|
157
|
-
if (!this.commandUncertain) {
|
|
158
|
-
this.clearConfirmationTimer();
|
|
159
|
-
}
|
|
160
|
-
}
|
|
161
|
-
armConfirmationTimer() {
|
|
162
|
-
this.clearConfirmationTimer();
|
|
163
|
-
this.confirmationExpired = false;
|
|
164
|
-
this.confirmationTimer = setTimeout(() => {
|
|
165
|
-
this.confirmationTimer = undefined;
|
|
166
|
-
if (!this.commandUncertain) {
|
|
167
|
-
return;
|
|
168
|
-
}
|
|
169
|
-
this.confirmationExpired = true;
|
|
170
|
-
this.platform.log.warn(`Wicket command for ${this.accessory.displayName} was not confirmed within ` +
|
|
171
|
-
`${this.confirmationTimeoutMs}ms; waiting for a live state before allowing another action.`);
|
|
172
|
-
}, this.confirmationTimeoutMs);
|
|
173
|
-
}
|
|
174
|
-
expirePendingConfirmation() {
|
|
175
|
-
if (this.commandUncertain) {
|
|
176
|
-
this.confirmationExpired = true;
|
|
177
|
-
this.clearConfirmationTimer();
|
|
178
|
-
}
|
|
179
|
-
}
|
|
180
|
-
clearConfirmationTimer() {
|
|
181
|
-
if (this.confirmationTimer) {
|
|
182
|
-
clearTimeout(this.confirmationTimer);
|
|
183
|
-
this.confirmationTimer = undefined;
|
|
184
|
-
}
|
|
43
|
+
const state = 0;
|
|
44
|
+
return state;
|
|
185
45
|
}
|
|
186
46
|
}
|
|
187
47
|
exports.WicketAccesory = WicketAccesory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WicketAccesory.js","sourceRoot":"","sources":["../../src/Accesories/WicketAccesory.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"WicketAccesory.js","sourceRoot":"","sources":["../../src/Accesories/WicketAccesory.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,10 +8,10 @@ export declare function RGBtoHSV(r: any, g: any, b: any): {
|
|
|
8
8
|
s: number;
|
|
9
9
|
v: number;
|
|
10
10
|
};
|
|
11
|
-
export declare function HexToRGB(hex:
|
|
11
|
+
export declare function HexToRGB(hex: any): {
|
|
12
12
|
r: number;
|
|
13
13
|
g: number;
|
|
14
14
|
b: number;
|
|
15
|
-
}
|
|
15
|
+
};
|
|
16
16
|
export declare function RGBToHex(r: any, g: any, b: any): string;
|
|
17
17
|
//# sourceMappingURL=ColorConverters.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ColorConverters.d.ts","sourceRoot":"","sources":["../../src/Heplers/ColorConverters.ts"],"names":[],"mappings":"AAAA,wBAAgB,QAAQ,CAAC,CAAC,KAAA,EAAE,CAAC,KAAA,EAAE,CAAC,KAAA;;;;EAiC/B;AAED,wBAAgB,QAAQ,CAAC,CAAC,KAAA,EAAE,CAAC,KAAA,EAAE,CAAC,KAAA;;;;EA2B/B;AAED,wBAAgB,QAAQ,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"ColorConverters.d.ts","sourceRoot":"","sources":["../../src/Heplers/ColorConverters.ts"],"names":[],"mappings":"AAAA,wBAAgB,QAAQ,CAAC,CAAC,KAAA,EAAE,CAAC,KAAA,EAAE,CAAC,KAAA;;;;EAiC/B;AAED,wBAAgB,QAAQ,CAAC,CAAC,KAAA,EAAE,CAAC,KAAA,EAAE,CAAC,KAAA;;;;EA2B/B;AAED,wBAAgB,QAAQ,CAAC,GAAG,KAAA;;;;EAM3B;AAED,wBAAgB,QAAQ,CAAC,CAAC,KAAA,EAAE,CAAC,KAAA,EAAE,CAAC,KAAA,UAU/B"}
|
|
@@ -86,14 +86,10 @@ function RGBtoHSV(r, g, b) {
|
|
|
86
86
|
};
|
|
87
87
|
}
|
|
88
88
|
function HexToRGB(hex) {
|
|
89
|
-
if (typeof hex !== 'string' || !/^0x[0-9a-fA-F]{6}$/.test(hex.trim())) {
|
|
90
|
-
return undefined;
|
|
91
|
-
}
|
|
92
|
-
const normalized = hex.trim();
|
|
93
89
|
return {
|
|
94
|
-
r: parseInt(
|
|
95
|
-
g: parseInt(
|
|
96
|
-
b: parseInt(
|
|
90
|
+
r: parseInt(hex.substr(2, 2), 16),
|
|
91
|
+
g: parseInt(hex.substr(4, 2), 16),
|
|
92
|
+
b: parseInt(hex.substr(6, 2), 16),
|
|
97
93
|
};
|
|
98
94
|
}
|
|
99
95
|
function RGBToHex(r, g, b) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ColorConverters.js","sourceRoot":"","sources":["../../src/Heplers/ColorConverters.ts"],"names":[],"mappings":";;AAAA,4BAiCC;AAED,4BA2BC;AAED,
|
|
1
|
+
{"version":3,"file":"ColorConverters.js","sourceRoot":"","sources":["../../src/Heplers/ColorConverters.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,6 @@ export declare class SuplaChannelContext {
|
|
|
6
6
|
deviceId: string;
|
|
7
7
|
channelId: string;
|
|
8
8
|
rawTopic?: string | undefined;
|
|
9
|
-
|
|
10
|
-
channelCaptionSource?: "retained" | "authoritative_snapshot" | "cache" | "generated" | undefined;
|
|
11
|
-
constructor(topic: string, channelType: string, channelFunction: string, channelCaption: string, deviceId: string, channelId: string, rawTopic?: string | undefined, channelCaptionAuthoritative?: boolean | undefined, channelCaptionSource?: "retained" | "authoritative_snapshot" | "cache" | "generated" | undefined);
|
|
9
|
+
constructor(topic: string, channelType: string, channelFunction: string, channelCaption: string, deviceId: string, channelId: string, rawTopic?: string | undefined);
|
|
12
10
|
}
|
|
13
11
|
//# sourceMappingURL=SuplaChannelContext.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SuplaChannelContext.d.ts","sourceRoot":"","sources":["../../src/Heplers/SuplaChannelContext.ts"],"names":[],"mappings":"AAAA,qBAAa,mBAAmB;IAErB,KAAK,EAAE,MAAM;IACb,WAAW,EAAE,MAAM;IACnB,eAAe,EAAE,MAAM;IACvB,cAAc,EAAE,MAAM;IACtB,QAAQ,EAAE,MAAM;IAChB,SAAS,EAAE,MAAM;IACjB,QAAQ,CAAC,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"SuplaChannelContext.d.ts","sourceRoot":"","sources":["../../src/Heplers/SuplaChannelContext.ts"],"names":[],"mappings":"AAAA,qBAAa,mBAAmB;IAErB,KAAK,EAAE,MAAM;IACb,WAAW,EAAE,MAAM;IACnB,eAAe,EAAE,MAAM;IACvB,cAAc,EAAE,MAAM;IACtB,QAAQ,EAAE,MAAM;IAChB,SAAS,EAAE,MAAM;IACjB,QAAQ,CAAC,EAAE,MAAM;gBANjB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM,YAAA;CAG3B"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SuplaChannelContext = void 0;
|
|
4
4
|
class SuplaChannelContext {
|
|
5
|
-
constructor(topic, channelType, channelFunction, channelCaption, deviceId, channelId, rawTopic
|
|
5
|
+
constructor(topic, channelType, channelFunction, channelCaption, deviceId, channelId, rawTopic) {
|
|
6
6
|
this.topic = topic;
|
|
7
7
|
this.channelType = channelType;
|
|
8
8
|
this.channelFunction = channelFunction;
|
|
@@ -10,8 +10,6 @@ class SuplaChannelContext {
|
|
|
10
10
|
this.deviceId = deviceId;
|
|
11
11
|
this.channelId = channelId;
|
|
12
12
|
this.rawTopic = rawTopic;
|
|
13
|
-
this.channelCaptionAuthoritative = channelCaptionAuthoritative;
|
|
14
|
-
this.channelCaptionSource = channelCaptionSource;
|
|
15
13
|
}
|
|
16
14
|
}
|
|
17
15
|
exports.SuplaChannelContext = SuplaChannelContext;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SuplaChannelContext.js","sourceRoot":"","sources":["../../src/Heplers/SuplaChannelContext.ts"],"names":[],"mappings":";;;AAAA,MAAa,mBAAmB;IAC9B,YACS,KAAa,EACb,WAAmB,EACnB,eAAuB,EACvB,cAAsB,EACtB,QAAgB,EAChB,SAAiB,EACjB,QAAiB
|
|
1
|
+
{"version":3,"file":"SuplaChannelContext.js","sourceRoot":"","sources":["../../src/Heplers/SuplaChannelContext.ts"],"names":[],"mappings":";;;AAAA,MAAa,mBAAmB;IAC9B,YACS,KAAa,EACb,WAAmB,EACnB,eAAuB,EACvB,cAAsB,EACtB,QAAgB,EAChB,SAAiB,EACjB,QAAiB;QANjB,UAAK,GAAL,KAAK,CAAQ;QACb,gBAAW,GAAX,WAAW,CAAQ;QACnB,oBAAe,GAAf,eAAe,CAAQ;QACvB,mBAAc,GAAd,cAAc,CAAQ;QACtB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,cAAS,GAAT,SAAS,CAAQ;QACjB,aAAQ,GAAR,QAAQ,CAAS;IAE1B,CAAC;CACF;AAXD,kDAWC"}
|
|
@@ -2,24 +2,15 @@ import { MqttClient } from 'mqtt';
|
|
|
2
2
|
import { Logger } from 'homebridge';
|
|
3
3
|
import { SuplaMqttClientContext } from './SuplaMqttClientContext';
|
|
4
4
|
import { SuplaChannelContext } from './SuplaChannelContext';
|
|
5
|
-
|
|
6
|
-
items: T[];
|
|
7
|
-
observedIds: Set<string>;
|
|
8
|
-
authoritative: boolean;
|
|
9
|
-
complete: boolean;
|
|
10
|
-
warnings: string[];
|
|
11
|
-
}
|
|
5
|
+
type RegisterHandler = (topic: string, handler: (message: Buffer, topic: string) => void) => () => void;
|
|
12
6
|
export declare class SuplaMqttClient {
|
|
13
7
|
private readonly context;
|
|
14
8
|
private readonly log;
|
|
15
9
|
client: MqttClient;
|
|
16
10
|
constructor(context: SuplaMqttClientContext, log: Logger);
|
|
17
|
-
discoverChannelsAsync(): Promise<Array<SuplaChannelContext>>;
|
|
18
|
-
discoverChannelsSnapshotAsync(): Promise<DiscoverySnapshot<SuplaChannelContext>>;
|
|
11
|
+
discoverChannelsAsync(registerHandler?: RegisterHandler): Promise<Array<SuplaChannelContext>>;
|
|
19
12
|
private discoverCloudChannelsAsync;
|
|
20
13
|
private discoverLegacyRollerShuttersAsync;
|
|
21
|
-
private collectRetainedMessages;
|
|
22
|
-
private waitForConnection;
|
|
23
14
|
private resolveProtocol;
|
|
24
15
|
private resolveIncludeHidden;
|
|
25
16
|
private escapeRegex;
|
|
@@ -28,4 +19,5 @@ export declare class SuplaMqttClient {
|
|
|
28
19
|
private resolveBoolean;
|
|
29
20
|
private resolveTopicScheme;
|
|
30
21
|
}
|
|
22
|
+
export {};
|
|
31
23
|
//# sourceMappingURL=SuplaMqttClient.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SuplaMqttClient.d.ts","sourceRoot":"","sources":["../../src/Heplers/SuplaMqttClient.ts"],"names":[],"mappings":"AAAA,OAAa,
|
|
1
|
+
{"version":3,"file":"SuplaMqttClient.d.ts","sourceRoot":"","sources":["../../src/Heplers/SuplaMqttClient.ts"],"names":[],"mappings":"AAAA,OAAa,EAAC,UAAU,EAAC,MAAM,MAAM,CAAC;AAEtC,OAAO,EAAC,MAAM,EAAC,MAAM,YAAY,CAAC;AAClC,OAAO,EAAC,sBAAsB,EAAC,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAE1D,KAAK,eAAe,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,KAAK,MAAM,IAAI,CAAC;AAExG,qBAAa,eAAe;IAGxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAHf,MAAM,EAAE,UAAU,CAAC;gBAEP,OAAO,EAAG,sBAAsB,EAChC,GAAG,EAAG,MAAM;IAsClB,qBAAqB,CAAC,eAAe,CAAC,EAAE,eAAe,GAAI,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;YAiB7F,0BAA0B;YAuI1B,iCAAiC;IAoG/C,OAAO,CAAC,eAAe;IAevB,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,iBAAiB;IAoBzB,OAAO,CAAC,cAAc;IAsBtB,OAAO,CAAC,kBAAkB;CAU3B"}
|