@marcel2215/homebridge-supla-plugin 2.1.29 → 2.1.30
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 +25 -1
- package/config.schema.json +26 -5
- package/dist/Accesories/ActionTriggerAccessory.d.ts +0 -1
- package/dist/Accesories/ActionTriggerAccessory.d.ts.map +1 -1
- package/dist/Accesories/ActionTriggerAccessory.js +15 -9
- package/dist/Accesories/ActionTriggerAccessory.js.map +1 -1
- package/dist/Accesories/AirQualityAccessory.d.ts +3 -1
- package/dist/Accesories/AirQualityAccessory.d.ts.map +1 -1
- package/dist/Accesories/AirQualityAccessory.js +47 -5
- package/dist/Accesories/AirQualityAccessory.js.map +1 -1
- package/dist/Accesories/ContactSensorAccessory.d.ts +3 -1
- package/dist/Accesories/ContactSensorAccessory.d.ts.map +1 -1
- package/dist/Accesories/ContactSensorAccessory.js +32 -4
- package/dist/Accesories/ContactSensorAccessory.js.map +1 -1
- package/dist/Accesories/DimmerAccessory.d.ts +4 -2
- package/dist/Accesories/DimmerAccessory.d.ts.map +1 -1
- package/dist/Accesories/DimmerAccessory.js +51 -14
- package/dist/Accesories/DimmerAccessory.js.map +1 -1
- package/dist/Accesories/DimmerRgbLightAccessory.d.ts +10 -2
- package/dist/Accesories/DimmerRgbLightAccessory.d.ts.map +1 -1
- package/dist/Accesories/DimmerRgbLightAccessory.js +149 -26
- package/dist/Accesories/DimmerRgbLightAccessory.js.map +1 -1
- package/dist/Accesories/DoorAccessory.d.ts +14 -1
- package/dist/Accesories/DoorAccessory.d.ts.map +1 -1
- package/dist/Accesories/DoorAccessory.js +146 -20
- package/dist/Accesories/DoorAccessory.js.map +1 -1
- package/dist/Accesories/ElectricityMeterAccessory.d.ts +13 -1
- package/dist/Accesories/ElectricityMeterAccessory.d.ts.map +1 -1
- package/dist/Accesories/ElectricityMeterAccessory.js +127 -12
- package/dist/Accesories/ElectricityMeterAccessory.js.map +1 -1
- package/dist/Accesories/FacadeBlindAccessory.d.ts +6 -0
- package/dist/Accesories/FacadeBlindAccessory.d.ts.map +1 -1
- package/dist/Accesories/FacadeBlindAccessory.js +205 -64
- package/dist/Accesories/FacadeBlindAccessory.js.map +1 -1
- package/dist/Accesories/FrontGateFsm.d.ts +8 -2
- package/dist/Accesories/FrontGateFsm.d.ts.map +1 -1
- package/dist/Accesories/FrontGateFsm.js +79 -19
- package/dist/Accesories/FrontGateFsm.js.map +1 -1
- package/dist/Accesories/GarageDoorOpenerAccesory.d.ts +12 -3
- package/dist/Accesories/GarageDoorOpenerAccesory.d.ts.map +1 -1
- package/dist/Accesories/GarageDoorOpenerAccesory.js +168 -21
- package/dist/Accesories/GarageDoorOpenerAccesory.js.map +1 -1
- package/dist/Accesories/GateAccessory.d.ts +6 -0
- package/dist/Accesories/GateAccessory.d.ts.map +1 -1
- package/dist/Accesories/GateAccessory.js +127 -19
- package/dist/Accesories/GateAccessory.js.map +1 -1
- package/dist/Accesories/GateLockAccessory.d.ts +17 -1
- package/dist/Accesories/GateLockAccessory.d.ts.map +1 -1
- package/dist/Accesories/GateLockAccessory.js +375 -50
- package/dist/Accesories/GateLockAccessory.js.map +1 -1
- package/dist/Accesories/LeakSensorAccessory.d.ts +3 -1
- package/dist/Accesories/LeakSensorAccessory.d.ts.map +1 -1
- package/dist/Accesories/LeakSensorAccessory.js +32 -4
- package/dist/Accesories/LeakSensorAccessory.js.map +1 -1
- package/dist/Accesories/LightBulbAccesory.d.ts +3 -2
- package/dist/Accesories/LightBulbAccesory.d.ts.map +1 -1
- package/dist/Accesories/LightBulbAccesory.js +41 -12
- package/dist/Accesories/LightBulbAccesory.js.map +1 -1
- package/dist/Accesories/PressureAccessory.d.ts +3 -1
- package/dist/Accesories/PressureAccessory.d.ts.map +1 -1
- package/dist/Accesories/PressureAccessory.js +28 -5
- package/dist/Accesories/PressureAccessory.js.map +1 -1
- package/dist/Accesories/RGBLightBulbAccesory.d.ts +9 -0
- package/dist/Accesories/RGBLightBulbAccesory.d.ts.map +1 -1
- package/dist/Accesories/RGBLightBulbAccesory.js +137 -17
- package/dist/Accesories/RGBLightBulbAccesory.js.map +1 -1
- package/dist/Accesories/RollerShutterAccessory.d.ts +6 -0
- package/dist/Accesories/RollerShutterAccessory.d.ts.map +1 -1
- package/dist/Accesories/RollerShutterAccessory.js +219 -74
- package/dist/Accesories/RollerShutterAccessory.js.map +1 -1
- package/dist/Accesories/SwitchAccessory.d.ts +3 -2
- package/dist/Accesories/SwitchAccessory.d.ts.map +1 -1
- package/dist/Accesories/SwitchAccessory.js +41 -12
- package/dist/Accesories/SwitchAccessory.js.map +1 -1
- package/dist/Accesories/TemperatureAccessory.d.ts +3 -1
- package/dist/Accesories/TemperatureAccessory.d.ts.map +1 -1
- package/dist/Accesories/TemperatureAccessory.js +28 -5
- package/dist/Accesories/TemperatureAccessory.js.map +1 -1
- package/dist/Accesories/TemperatureHumidityAccessory.d.ts +5 -1
- package/dist/Accesories/TemperatureHumidityAccessory.d.ts.map +1 -1
- package/dist/Accesories/TemperatureHumidityAccessory.js +40 -9
- package/dist/Accesories/TemperatureHumidityAccessory.js.map +1 -1
- package/dist/Accesories/ThermostatAccessory.d.ts +18 -1
- package/dist/Accesories/ThermostatAccessory.d.ts.map +1 -1
- package/dist/Accesories/ThermostatAccessory.js +193 -34
- package/dist/Accesories/ThermostatAccessory.js.map +1 -1
- package/dist/Accesories/ValveAccessory.d.ts +5 -2
- package/dist/Accesories/ValveAccessory.d.ts.map +1 -1
- package/dist/Accesories/ValveAccessory.js +47 -8
- package/dist/Accesories/ValveAccessory.js.map +1 -1
- package/dist/Accesories/WicketAccesory.d.ts +18 -3
- package/dist/Accesories/WicketAccesory.d.ts.map +1 -1
- package/dist/Accesories/WicketAccesory.js +154 -14
- 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 +7 -3
- package/dist/Heplers/ColorConverters.js.map +1 -1
- package/dist/Heplers/DisplayName.d.ts +15 -0
- package/dist/Heplers/DisplayName.d.ts.map +1 -0
- package/dist/Heplers/DisplayName.js +174 -0
- package/dist/Heplers/DisplayName.js.map +1 -0
- package/dist/Heplers/SuplaChannelContext.d.ts +3 -1
- package/dist/Heplers/SuplaChannelContext.d.ts.map +1 -1
- package/dist/Heplers/SuplaChannelContext.js +3 -1
- package/dist/Heplers/SuplaChannelContext.js.map +1 -1
- package/dist/Heplers/SuplaMqttClient.d.ts +12 -4
- package/dist/Heplers/SuplaMqttClient.d.ts.map +1 -1
- package/dist/Heplers/SuplaMqttClient.js +214 -112
- package/dist/Heplers/SuplaMqttClient.js.map +1 -1
- package/dist/platform.d.ts +58 -3
- package/dist/platform.d.ts.map +1 -1
- package/dist/platform.js +1087 -115
- package/dist/platform.js.map +1 -1
- package/package.json +7 -3
- package/config.json +0 -3
|
@@ -7,7 +7,7 @@ class LeakSensorAccessory {
|
|
|
7
7
|
this.accessory = accessory;
|
|
8
8
|
this.context = context;
|
|
9
9
|
this.state = this.platform.Characteristic.LeakDetected.LEAK_NOT_DETECTED;
|
|
10
|
-
this.
|
|
10
|
+
this.hasState = false;
|
|
11
11
|
this.accessory.getService(this.platform.Service.AccessoryInformation)
|
|
12
12
|
.setCharacteristic(this.platform.Characteristic.Manufacturer, 'Supla')
|
|
13
13
|
.setCharacteristic(this.platform.Characteristic.Model, 'LeakSensor');
|
|
@@ -17,20 +17,48 @@ class LeakSensorAccessory {
|
|
|
17
17
|
this.service.getCharacteristic(this.platform.Characteristic.LeakDetected)
|
|
18
18
|
.onGet(this.handleStateGet.bind(this));
|
|
19
19
|
this.platform.registerMqttHandler(`${this.context.topic}/state/hi`, (message) => {
|
|
20
|
-
const leak = this.platform.
|
|
20
|
+
const leak = this.platform.parseBooleanStrict(message.toString());
|
|
21
|
+
if (leak === undefined) {
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
this.hasState = true;
|
|
21
25
|
this.state = leak
|
|
22
26
|
? this.platform.Characteristic.LeakDetected.LEAK_DETECTED
|
|
23
27
|
: this.platform.Characteristic.LeakDetected.LEAK_NOT_DETECTED;
|
|
24
28
|
this.service.updateCharacteristic(this.platform.Characteristic.LeakDetected, this.state);
|
|
29
|
+
this.updateFault();
|
|
25
30
|
}, this.accessory.UUID);
|
|
26
31
|
this.platform.registerMqttHandler(`${this.context.topic}/state/connected`, (message) => {
|
|
27
|
-
|
|
28
|
-
|
|
32
|
+
const connected = this.platform.parseBooleanStrict(message.toString());
|
|
33
|
+
if (connected === undefined) {
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
this.connected = connected;
|
|
37
|
+
if (!connected) {
|
|
38
|
+
this.hasState = false;
|
|
39
|
+
}
|
|
40
|
+
this.updateFault();
|
|
29
41
|
}, this.accessory.UUID);
|
|
42
|
+
this.platform.registerMqttTransportHandler?.((transportConnected) => {
|
|
43
|
+
if (!transportConnected) {
|
|
44
|
+
this.connected = undefined;
|
|
45
|
+
this.hasState = false;
|
|
46
|
+
this.updateFault();
|
|
47
|
+
}
|
|
48
|
+
}, this.accessory.UUID);
|
|
49
|
+
this.updateFault();
|
|
30
50
|
}
|
|
31
51
|
async handleStateGet() {
|
|
52
|
+
if (this.connected !== true || !this.hasState) {
|
|
53
|
+
throw new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
|
|
54
|
+
}
|
|
32
55
|
return this.state;
|
|
33
56
|
}
|
|
57
|
+
updateFault() {
|
|
58
|
+
this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected === true && this.hasState
|
|
59
|
+
? this.platform.Characteristic.StatusFault.NO_FAULT
|
|
60
|
+
: this.platform.Characteristic.StatusFault.GENERAL_FAULT);
|
|
61
|
+
}
|
|
34
62
|
}
|
|
35
63
|
exports.LeakSensorAccessory = LeakSensorAccessory;
|
|
36
64
|
//# sourceMappingURL=LeakSensorAccessory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LeakSensorAccessory.js","sourceRoot":"","sources":["../../src/Accesories/LeakSensorAccessory.ts"],"names":[],"mappings":";;;AAIA,MAAa,mBAAmB;
|
|
1
|
+
{"version":3,"file":"LeakSensorAccessory.js","sourceRoot":"","sources":["../../src/Accesories/LeakSensorAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,12 +8,13 @@ export declare class LightAccesory {
|
|
|
8
8
|
private service;
|
|
9
9
|
private state;
|
|
10
10
|
private connected;
|
|
11
|
-
private overcurrent
|
|
11
|
+
private overcurrent?;
|
|
12
|
+
private hasState;
|
|
12
13
|
private updateTimer?;
|
|
13
14
|
constructor(platform: SuplaPlatform, accessory: PlatformAccessory, context: SuplaChannelContext);
|
|
14
15
|
handleOnGet(): Promise<CharacteristicValue>;
|
|
15
16
|
handleOnSet(value: CharacteristicValue): Promise<void>;
|
|
16
|
-
private updateFault;
|
|
17
17
|
private clearUpdateTimer;
|
|
18
|
+
private assertAvailable;
|
|
18
19
|
}
|
|
19
20
|
//# sourceMappingURL=LightBulbAccesory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LightBulbAccesory.d.ts","sourceRoot":"","sources":["../../src/Accesories/LightBulbAccesory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAC,mBAAmB,EAAC,MAAM,gCAAgC,CAAC;AAEnE,qBAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"LightBulbAccesory.d.ts","sourceRoot":"","sources":["../../src/Accesories/LightBulbAccesory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAC,mBAAmB,EAAC,MAAM,gCAAgC,CAAC;AAEnE,qBAAa,aAAa;IASlB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAV9B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,WAAW,CAAC,CAAU;IAC9B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,WAAW,CAAC,CAAiB;gBAGd,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,mBAAmB;IAsE7C,WAAW,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAS3C,WAAW,CAAC,KAAK,EAAE,mBAAmB;IAc5C,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,eAAe;CAOxB"}
|
|
@@ -7,8 +7,8 @@ class LightAccesory {
|
|
|
7
7
|
this.accessory = accessory;
|
|
8
8
|
this.context = context;
|
|
9
9
|
this.state = false;
|
|
10
|
-
this.connected =
|
|
11
|
-
this.
|
|
10
|
+
this.connected = false;
|
|
11
|
+
this.hasState = false;
|
|
12
12
|
this.accessory.getService(this.platform.Service.AccessoryInformation)
|
|
13
13
|
.setCharacteristic(this.platform.Characteristic.Manufacturer, 'Supla')
|
|
14
14
|
.setCharacteristic(this.platform.Characteristic.Model, 'LightController');
|
|
@@ -23,39 +23,68 @@ class LightAccesory {
|
|
|
23
23
|
});
|
|
24
24
|
this.platform.registerMqttHandler(`${this.context.topic}/state/on`, (message) => {
|
|
25
25
|
this.platform.log.info(`Light ${this.context.channelCaption} state changed to ${message.toString()}`);
|
|
26
|
-
|
|
26
|
+
const state = this.platform.parseBooleanStrict(message.toString());
|
|
27
|
+
if (state === undefined) {
|
|
28
|
+
return;
|
|
29
|
+
}
|
|
30
|
+
this.state = state;
|
|
31
|
+
this.hasState = true;
|
|
27
32
|
this.service.updateCharacteristic(this.platform.Characteristic.On, this.state);
|
|
28
33
|
}, this.accessory.UUID);
|
|
29
34
|
this.platform.registerMqttHandler(`${this.context.topic}/state/connected`, (message) => {
|
|
30
|
-
|
|
31
|
-
|
|
35
|
+
const connected = this.platform.parseBooleanStrict(message.toString());
|
|
36
|
+
if (connected === undefined) {
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
this.connected = connected;
|
|
40
|
+
if (!connected) {
|
|
41
|
+
this.hasState = false;
|
|
42
|
+
this.overcurrent = undefined;
|
|
43
|
+
this.clearUpdateTimer();
|
|
44
|
+
}
|
|
32
45
|
}, this.accessory.UUID);
|
|
33
46
|
this.platform.registerMqttHandler(`${this.context.topic}/state/overcurrent_relay_off`, (message) => {
|
|
34
|
-
|
|
35
|
-
|
|
47
|
+
const overcurrent = this.platform.parseBooleanStrict(message.toString());
|
|
48
|
+
if (overcurrent === undefined) {
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
this.overcurrent = overcurrent;
|
|
52
|
+
}, this.accessory.UUID);
|
|
53
|
+
this.platform.registerMqttTransportHandler?.((transportConnected) => {
|
|
54
|
+
if (!transportConnected) {
|
|
55
|
+
this.connected = false;
|
|
56
|
+
this.hasState = false;
|
|
57
|
+
this.overcurrent = undefined;
|
|
58
|
+
this.clearUpdateTimer();
|
|
59
|
+
}
|
|
36
60
|
}, this.accessory.UUID);
|
|
37
61
|
}
|
|
38
62
|
async handleOnGet() {
|
|
63
|
+
if (!this.connected || !this.hasState || this.overcurrent !== false) {
|
|
64
|
+
throw new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
|
|
65
|
+
}
|
|
39
66
|
return this.state;
|
|
40
67
|
}
|
|
41
68
|
async handleOnSet(value) {
|
|
69
|
+
this.assertAvailable();
|
|
42
70
|
this.platform.log.debug(`Publishing ${this.context.topic}/set/on = ${value.toString()}`);
|
|
43
|
-
this.platform.
|
|
71
|
+
await this.platform.publishCommandAsync(`${this.context.topic}/set/on`, value.toString());
|
|
44
72
|
this.clearUpdateTimer();
|
|
45
73
|
this.updateTimer = setTimeout(() => {
|
|
46
74
|
this.service.updateCharacteristic(this.platform.Characteristic.On, this.state);
|
|
47
75
|
}, 300);
|
|
48
76
|
}
|
|
49
|
-
updateFault() {
|
|
50
|
-
const fault = this.connected && !this.overcurrent ? 0 : 1;
|
|
51
|
-
this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, fault);
|
|
52
|
-
}
|
|
53
77
|
clearUpdateTimer() {
|
|
54
78
|
if (this.updateTimer) {
|
|
55
79
|
clearTimeout(this.updateTimer);
|
|
56
80
|
this.updateTimer = undefined;
|
|
57
81
|
}
|
|
58
82
|
}
|
|
83
|
+
assertAvailable() {
|
|
84
|
+
if (!this.connected || !this.hasState || this.overcurrent !== false) {
|
|
85
|
+
throw new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
59
88
|
}
|
|
60
89
|
exports.LightAccesory = LightAccesory;
|
|
61
90
|
//# sourceMappingURL=LightBulbAccesory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LightBulbAccesory.js","sourceRoot":"","sources":["../../src/Accesories/LightBulbAccesory.ts"],"names":[],"mappings":";;;AAKA,MAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"LightBulbAccesory.js","sourceRoot":"","sources":["../../src/Accesories/LightBulbAccesory.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,9 +7,11 @@ export declare class PressureAccessory {
|
|
|
7
7
|
private readonly context;
|
|
8
8
|
private service;
|
|
9
9
|
private value;
|
|
10
|
-
private connected
|
|
10
|
+
private connected?;
|
|
11
|
+
private hasValue;
|
|
11
12
|
constructor(platform: SuplaPlatform, accessory: PlatformAccessory, context: SuplaChannelContext);
|
|
12
13
|
handleValueGet(): Promise<CharacteristicValue>;
|
|
14
|
+
private updateFault;
|
|
13
15
|
private clamp;
|
|
14
16
|
}
|
|
15
17
|
//# sourceMappingURL=PressureAccessory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PressureAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/PressureAccessory.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,iBAAiB;
|
|
1
|
+
{"version":3,"file":"PressureAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/PressureAccessory.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,iBAAiB;IAO1B,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,CAAU;IACvB,OAAO,CAAC,SAAS,CAAC,CAAU;IAC5B,OAAO,CAAC,QAAQ,CAAS;gBAGN,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,mBAAmB;IAuDzC,cAAc,IAAI,OAAO,CAAC,mBAAmB,CAAC;IASpD,OAAO,CAAC,WAAW;IAOnB,OAAO,CAAC,KAAK;CAGd"}
|
|
@@ -7,7 +7,7 @@ class PressureAccessory {
|
|
|
7
7
|
this.accessory = accessory;
|
|
8
8
|
this.context = context;
|
|
9
9
|
this.value = 0.0001;
|
|
10
|
-
this.
|
|
10
|
+
this.hasValue = false;
|
|
11
11
|
this.accessory.getService(this.platform.Service.AccessoryInformation)
|
|
12
12
|
.setCharacteristic(this.platform.Characteristic.Manufacturer, 'Supla')
|
|
13
13
|
.setCharacteristic(this.platform.Characteristic.Model, 'PressureSensor');
|
|
@@ -17,20 +17,43 @@ class PressureAccessory {
|
|
|
17
17
|
this.service.getCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel)
|
|
18
18
|
.onGet(this.handleValueGet.bind(this));
|
|
19
19
|
this.platform.registerMqttHandler(`${this.context.topic}/state/value`, (message) => {
|
|
20
|
-
const value =
|
|
21
|
-
if (
|
|
20
|
+
const value = this.platform.parseFiniteNumberStrict(message.toString());
|
|
21
|
+
if (value !== undefined) {
|
|
22
22
|
this.value = this.clamp(value, 0.0001, 100000);
|
|
23
|
+
this.hasValue = true;
|
|
23
24
|
this.service.updateCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel, this.value);
|
|
25
|
+
this.updateFault();
|
|
24
26
|
}
|
|
25
27
|
}, this.accessory.UUID);
|
|
26
28
|
this.platform.registerMqttHandler(`${this.context.topic}/state/connected`, (message) => {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
+
const connected = this.platform.parseBooleanStrict(message.toString());
|
|
30
|
+
if (connected === undefined) {
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
this.connected = connected;
|
|
34
|
+
if (!connected) {
|
|
35
|
+
this.hasValue = false;
|
|
36
|
+
}
|
|
37
|
+
this.updateFault();
|
|
29
38
|
}, this.accessory.UUID);
|
|
39
|
+
this.platform.registerMqttTransportHandler?.((transportConnected) => {
|
|
40
|
+
if (!transportConnected) {
|
|
41
|
+
this.connected = undefined;
|
|
42
|
+
this.hasValue = false;
|
|
43
|
+
this.updateFault();
|
|
44
|
+
}
|
|
45
|
+
}, this.accessory.UUID);
|
|
46
|
+
this.updateFault();
|
|
30
47
|
}
|
|
31
48
|
async handleValueGet() {
|
|
49
|
+
if (this.connected !== true || !this.hasValue) {
|
|
50
|
+
throw new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
|
|
51
|
+
}
|
|
32
52
|
return this.value;
|
|
33
53
|
}
|
|
54
|
+
updateFault() {
|
|
55
|
+
this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected === true && this.hasValue ? 0 : 1);
|
|
56
|
+
}
|
|
34
57
|
clamp(value, min, max) {
|
|
35
58
|
return Math.min(Math.max(value, min), max);
|
|
36
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PressureAccessory.js","sourceRoot":"","sources":["../../src/Accesories/PressureAccessory.ts"],"names":[],"mappings":";;;AAIA,MAAa,iBAAiB;
|
|
1
|
+
{"version":3,"file":"PressureAccessory.js","sourceRoot":"","sources":["../../src/Accesories/PressureAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,11 @@ export declare class RGBLightAccesory {
|
|
|
10
10
|
private hsv;
|
|
11
11
|
private rgb;
|
|
12
12
|
private connected;
|
|
13
|
+
private hasState;
|
|
14
|
+
private hasColor;
|
|
15
|
+
private hasColorBrightness;
|
|
16
|
+
private colorWriteTimer?;
|
|
17
|
+
private colorWriteWaiters;
|
|
13
18
|
constructor(platform: SuplaPlatform, accessory: PlatformAccessory, context: SuplaChannelContext);
|
|
14
19
|
handleOnGet(): Promise<CharacteristicValue>;
|
|
15
20
|
handleOnSet(value: CharacteristicValue): Promise<void>;
|
|
@@ -20,5 +25,9 @@ export declare class RGBLightAccesory {
|
|
|
20
25
|
handleSaturationGet(): Promise<CharacteristicValue>;
|
|
21
26
|
handleSaturationSet(value: CharacteristicValue): Promise<void>;
|
|
22
27
|
private updateColor;
|
|
28
|
+
private queueColorWrite;
|
|
29
|
+
private flushColorWrite;
|
|
30
|
+
private communicationError;
|
|
31
|
+
private assertAvailable;
|
|
23
32
|
}
|
|
24
33
|
//# sourceMappingURL=RGBLightBulbAccesory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RGBLightBulbAccesory.d.ts","sourceRoot":"","sources":["../../src/Accesories/RGBLightBulbAccesory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAC,mBAAmB,EAAC,MAAM,gCAAgC,CAAC;AAEnE,qBAAa,gBAAgB;
|
|
1
|
+
{"version":3,"file":"RGBLightBulbAccesory.d.ts","sourceRoot":"","sources":["../../src/Accesories/RGBLightBulbAccesory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAC,mBAAmB,EAAC,MAAM,gCAAgC,CAAC;AAEnE,qBAAa,gBAAgB;IAczB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAf1B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,GAAG,CAAsB;IACjC,OAAO,CAAC,GAAG,CAAsB;IACjC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,kBAAkB,CAAS;IACnC,OAAO,CAAC,eAAe,CAAC,CAAiB;IACzC,OAAO,CAAC,iBAAiB,CAAoE;gBAI1E,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,mBAAmB;IA4HzC,WAAW,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAK3C,WAAW,CAAC,KAAK,EAAE,mBAAmB;IAUtC,mBAAmB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAKnD,mBAAmB,CAAC,KAAK,EAAE,mBAAmB;IAiB9C,YAAY,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAK5C,YAAY,CAAC,KAAK,EAAE,mBAAmB;IAYvC,mBAAmB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAKnD,mBAAmB,CAAC,KAAK,EAAE,mBAAmB;IAYpD,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,eAAe;YAcT,eAAe;IAiB7B,OAAO,CAAC,kBAAkB;IAM1B,OAAO,CAAC,eAAe;CAKxB"}
|
|
@@ -10,7 +10,11 @@ class RGBLightAccesory {
|
|
|
10
10
|
this.state = false;
|
|
11
11
|
this.hsv = { h: 0, s: 0, v: 0 };
|
|
12
12
|
this.rgb = { r: 0, g: 0, b: 0 };
|
|
13
|
-
this.connected =
|
|
13
|
+
this.connected = false;
|
|
14
|
+
this.hasState = false;
|
|
15
|
+
this.hasColor = false;
|
|
16
|
+
this.hasColorBrightness = false;
|
|
17
|
+
this.colorWriteWaiters = [];
|
|
14
18
|
this.accessory.getService(this.platform.Service.AccessoryInformation)
|
|
15
19
|
.setCharacteristic(this.platform.Characteristic.Manufacturer, 'Supla')
|
|
16
20
|
.setCharacteristic(this.platform.Characteristic.Model, 'RGBLightController');
|
|
@@ -29,61 +33,177 @@ class RGBLightAccesory {
|
|
|
29
33
|
this.service.getCharacteristic(this.platform.Characteristic.Saturation)
|
|
30
34
|
.onGet(this.handleSaturationGet.bind(this))
|
|
31
35
|
.onSet(this.handleSaturationSet.bind(this));
|
|
36
|
+
this.platform.registerOwnerCleanup(this.accessory.UUID, () => {
|
|
37
|
+
if (this.colorWriteTimer) {
|
|
38
|
+
clearTimeout(this.colorWriteTimer);
|
|
39
|
+
this.colorWriteTimer = undefined;
|
|
40
|
+
}
|
|
41
|
+
const error = this.communicationError();
|
|
42
|
+
for (const waiter of this.colorWriteWaiters.splice(0)) {
|
|
43
|
+
waiter.reject(error);
|
|
44
|
+
}
|
|
45
|
+
});
|
|
32
46
|
this.platform.registerMqttHandler(`${this.context.topic}/state/on`, (message) => {
|
|
33
|
-
|
|
47
|
+
const state = this.platform.parseBooleanStrict(message.toString());
|
|
48
|
+
if (state === undefined) {
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
this.state = state;
|
|
52
|
+
this.hasState = true;
|
|
34
53
|
this.service.updateCharacteristic(this.platform.Characteristic.On, this.state);
|
|
35
54
|
}, this.accessory.UUID);
|
|
36
55
|
this.platform.registerMqttHandler(`${this.context.topic}/state/color`, (message) => {
|
|
37
|
-
|
|
38
|
-
|
|
56
|
+
const rgb = (0, ColorConverters_1.HexToRGB)(message.toString());
|
|
57
|
+
if (!rgb) {
|
|
58
|
+
return;
|
|
59
|
+
}
|
|
60
|
+
const hsv = (0, ColorConverters_1.RGBtoHSV)(rgb.r, rgb.g, rgb.b);
|
|
61
|
+
if (![hsv.h, hsv.s, hsv.v].every(Number.isFinite)) {
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
this.rgb = rgb;
|
|
65
|
+
this.hsv = hsv;
|
|
66
|
+
this.hasColor = true;
|
|
39
67
|
this.updateColor();
|
|
40
68
|
}, this.accessory.UUID);
|
|
41
69
|
this.platform.registerMqttHandler(`${this.context.topic}/state/color_brightness`, (message) => {
|
|
42
|
-
this.
|
|
70
|
+
const brightness = this.platform.parseFiniteNumberStrict(message.toString());
|
|
71
|
+
if (brightness === undefined || brightness < 0 || brightness > 100) {
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
this.hsv.v = brightness;
|
|
75
|
+
this.hasColorBrightness = true;
|
|
43
76
|
this.updateColor();
|
|
44
77
|
}, this.accessory.UUID);
|
|
45
78
|
this.platform.registerMqttHandler(`${this.context.topic}/state/connected`, (message) => {
|
|
46
|
-
|
|
47
|
-
|
|
79
|
+
const connected = this.platform.parseBooleanStrict(message.toString());
|
|
80
|
+
if (connected === undefined) {
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
83
|
+
this.connected = connected;
|
|
84
|
+
if (!connected) {
|
|
85
|
+
this.hasState = false;
|
|
86
|
+
this.hasColor = false;
|
|
87
|
+
this.hasColorBrightness = false;
|
|
88
|
+
if (this.colorWriteTimer) {
|
|
89
|
+
clearTimeout(this.colorWriteTimer);
|
|
90
|
+
this.colorWriteTimer = undefined;
|
|
91
|
+
}
|
|
92
|
+
const error = this.communicationError();
|
|
93
|
+
for (const waiter of this.colorWriteWaiters.splice(0)) {
|
|
94
|
+
waiter.reject(error);
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
}, this.accessory.UUID);
|
|
98
|
+
this.platform.registerMqttTransportHandler?.((transportConnected) => {
|
|
99
|
+
if (!transportConnected) {
|
|
100
|
+
this.connected = false;
|
|
101
|
+
this.hasState = false;
|
|
102
|
+
this.hasColor = false;
|
|
103
|
+
this.hasColorBrightness = false;
|
|
104
|
+
if (this.colorWriteTimer) {
|
|
105
|
+
clearTimeout(this.colorWriteTimer);
|
|
106
|
+
this.colorWriteTimer = undefined;
|
|
107
|
+
}
|
|
108
|
+
const error = this.communicationError();
|
|
109
|
+
for (const waiter of this.colorWriteWaiters.splice(0)) {
|
|
110
|
+
waiter.reject(error);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
48
113
|
}, this.accessory.UUID);
|
|
49
114
|
}
|
|
50
115
|
async handleOnGet() {
|
|
116
|
+
this.assertAvailable(this.hasState);
|
|
51
117
|
return this.state;
|
|
52
118
|
}
|
|
53
119
|
async handleOnSet(value) {
|
|
120
|
+
this.assertAvailable(this.hasState);
|
|
54
121
|
this.platform.log.debug(`Publishing ${this.context.topic}/set/on = ${value.toString()}`);
|
|
55
|
-
this.platform.
|
|
122
|
+
await this.platform.publishCommandAsync(`${this.context.topic}/set/on`, value.toString());
|
|
56
123
|
}
|
|
57
124
|
async handleBrightnessGet() {
|
|
125
|
+
this.assertAvailable(this.hasColor || this.hasColorBrightness);
|
|
58
126
|
return this.hsv.v;
|
|
59
127
|
}
|
|
60
128
|
async handleBrightnessSet(value) {
|
|
129
|
+
this.assertAvailable(this.hasColor || this.hasColorBrightness);
|
|
130
|
+
const brightness = value;
|
|
131
|
+
if (!Number.isFinite(brightness) || brightness < 0 || brightness > 100) {
|
|
132
|
+
throw new this.platform.api.hap.HapStatusError(-70410 /* this.platform.api.hap.HAPStatus.INVALID_VALUE_IN_REQUEST */);
|
|
133
|
+
}
|
|
134
|
+
this.hsv.v = brightness;
|
|
61
135
|
this.platform.log.debug(`Publishing ${this.context.topic}/set/color_brightness = ${value.toString()}`);
|
|
62
|
-
this.platform.
|
|
136
|
+
await this.platform.publishCommandAsync(`${this.context.topic}/set/color_brightness`, value.toString());
|
|
63
137
|
}
|
|
64
138
|
async handleHueGet() {
|
|
139
|
+
this.assertAvailable(this.hasColor);
|
|
65
140
|
return this.hsv.h;
|
|
66
141
|
}
|
|
67
142
|
async handleHueSet(value) {
|
|
68
|
-
this.
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
143
|
+
this.assertAvailable(this.hasColor);
|
|
144
|
+
const hue = value;
|
|
145
|
+
if (!Number.isFinite(hue) || hue < 0 || hue > 360) {
|
|
146
|
+
throw new this.platform.api.hap.HapStatusError(-70410 /* this.platform.api.hap.HAPStatus.INVALID_VALUE_IN_REQUEST */);
|
|
147
|
+
}
|
|
148
|
+
this.hsv.h = hue;
|
|
149
|
+
await this.queueColorWrite();
|
|
72
150
|
}
|
|
73
151
|
async handleSaturationGet() {
|
|
152
|
+
this.assertAvailable(this.hasColor);
|
|
74
153
|
return this.hsv.s;
|
|
75
154
|
}
|
|
76
155
|
async handleSaturationSet(value) {
|
|
77
|
-
this.
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
156
|
+
this.assertAvailable(this.hasColor);
|
|
157
|
+
const saturation = value;
|
|
158
|
+
if (!Number.isFinite(saturation) || saturation < 0 || saturation > 100) {
|
|
159
|
+
throw new this.platform.api.hap.HapStatusError(-70410 /* this.platform.api.hap.HAPStatus.INVALID_VALUE_IN_REQUEST */);
|
|
160
|
+
}
|
|
161
|
+
this.hsv.s = saturation;
|
|
162
|
+
await this.queueColorWrite();
|
|
81
163
|
}
|
|
82
164
|
updateColor() {
|
|
83
165
|
this.service.updateCharacteristic(this.platform.Characteristic.Hue, this.hsv.h);
|
|
84
166
|
this.service.updateCharacteristic(this.platform.Characteristic.Saturation, this.hsv.s);
|
|
85
167
|
this.service.updateCharacteristic(this.platform.Characteristic.Brightness, this.hsv.v);
|
|
86
168
|
}
|
|
169
|
+
queueColorWrite() {
|
|
170
|
+
if (this.colorWriteTimer) {
|
|
171
|
+
clearTimeout(this.colorWriteTimer);
|
|
172
|
+
}
|
|
173
|
+
const promise = new Promise((resolve, reject) => {
|
|
174
|
+
this.colorWriteWaiters.push({ resolve, reject });
|
|
175
|
+
});
|
|
176
|
+
this.colorWriteTimer = setTimeout(() => {
|
|
177
|
+
this.colorWriteTimer = undefined;
|
|
178
|
+
void this.flushColorWrite();
|
|
179
|
+
}, 50);
|
|
180
|
+
return promise;
|
|
181
|
+
}
|
|
182
|
+
async flushColorWrite() {
|
|
183
|
+
const waiters = this.colorWriteWaiters.splice(0);
|
|
184
|
+
this.rgb = (0, ColorConverters_1.HSVtoRGB)(this.hsv.h, this.hsv.s, this.hsv.v);
|
|
185
|
+
const payload = (0, ColorConverters_1.RGBToHex)(this.rgb.r, this.rgb.g, this.rgb.b);
|
|
186
|
+
this.platform.log.debug(`Publishing ${this.context.topic}/set/color = ${payload}`);
|
|
187
|
+
try {
|
|
188
|
+
await this.platform.publishCommandAsync(`${this.context.topic}/set/color`, payload);
|
|
189
|
+
for (const waiter of waiters) {
|
|
190
|
+
waiter.resolve();
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
catch (error) {
|
|
194
|
+
for (const waiter of waiters) {
|
|
195
|
+
waiter.reject(error);
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
communicationError() {
|
|
200
|
+
return new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
|
|
201
|
+
}
|
|
202
|
+
assertAvailable(hasValue) {
|
|
203
|
+
if (!this.connected || !hasValue) {
|
|
204
|
+
throw this.communicationError();
|
|
205
|
+
}
|
|
206
|
+
}
|
|
87
207
|
}
|
|
88
208
|
exports.RGBLightAccesory = RGBLightAccesory;
|
|
89
209
|
//# sourceMappingURL=RGBLightBulbAccesory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RGBLightBulbAccesory.js","sourceRoot":"","sources":["../../src/Accesories/RGBLightBulbAccesory.ts"],"names":[],"mappings":";;;AAEA,gEAAkF;AAGlF,MAAa,gBAAgB;
|
|
1
|
+
{"version":3,"file":"RGBLightBulbAccesory.js","sourceRoot":"","sources":["../../src/Accesories/RGBLightBulbAccesory.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ export declare class RollerShutterAccessory {
|
|
|
11
11
|
private positionState;
|
|
12
12
|
private connected;
|
|
13
13
|
private stopTimer?;
|
|
14
|
+
private pendingStop?;
|
|
14
15
|
private legacyMode;
|
|
15
16
|
private readonly baseTopic;
|
|
16
17
|
private hasReceivedPosition;
|
|
@@ -40,6 +41,7 @@ export declare class RollerShutterAccessory {
|
|
|
40
41
|
private clearPendingNoProgressTimeout;
|
|
41
42
|
private clearPendingTarget;
|
|
42
43
|
private clearStopTimer;
|
|
44
|
+
private cancelStopTimer;
|
|
43
45
|
private scheduleMotionStopTimer;
|
|
44
46
|
private clearMotionStopTimer;
|
|
45
47
|
private disposeTimers;
|
|
@@ -52,5 +54,9 @@ export declare class RollerShutterAccessory {
|
|
|
52
54
|
private clamp;
|
|
53
55
|
private resolveAction;
|
|
54
56
|
private scheduleStopIfNeeded;
|
|
57
|
+
private readPersistedStop;
|
|
58
|
+
private setPendingStop;
|
|
59
|
+
private resumePendingStop;
|
|
60
|
+
private publishPendingStop;
|
|
55
61
|
}
|
|
56
62
|
//# sourceMappingURL=RollerShutterAccessory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RollerShutterAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/RollerShutterAccessory.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":"RollerShutterAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/RollerShutterAccessory.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;AASrE,qBAAa,sBAAsB;IAoB/B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IArB1B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,aAAa,CAAsD;IAC3E,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,SAAS,CAAC,CAAiB;IACnC,OAAO,CAAC,WAAW,CAAC,CAAwB;IAC5C,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,mBAAmB,CAAS;IACpC,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;gBAGJ,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,mBAAmB;IAmGzC,wBAAwB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAKxD,uBAAuB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAKvD,uBAAuB,CAAC,KAAK,EAAE,mBAAmB;IA8GlD,qBAAqB,CAAC,KAAK,EAAE,mBAAmB;IAoCtD,OAAO,CAAC,eAAe;IA0FvB,OAAO,CAAC,gBAAgB;IAiBxB,OAAO,CAAC,kBAAkB;IA2B1B,OAAO,CAAC,mBAAmB;YAkCb,oBAAoB;IAoBlC,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,qBAAqB;IAc7B,OAAO,CAAC,kBAAkB;IAa1B,OAAO,CAAC,sBAAsB;IA8B9B,OAAO,CAAC,gCAAgC;IAgCxC,OAAO,CAAC,6BAA6B;IAOrC,OAAO,CAAC,kBAAkB;IAe1B,OAAO,CAAC,cAAc;IAqBtB,OAAO,CAAC,eAAe;IAOvB,OAAO,CAAC,uBAAuB;IAqB/B,OAAO,CAAC,oBAAoB;IAO5B,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,SAAS;IAWjB,OAAO,CAAC,yBAAyB;IAe3B,sBAAsB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAK5D,OAAO,CAAC,uBAAuB;IAQ/B,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,KAAK;IAIb,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,oBAAoB;IAkB5B,OAAO,CAAC,iBAAiB;IAqBzB,OAAO,CAAC,cAAc;IAoBtB,OAAO,CAAC,iBAAiB;YAYX,kBAAkB;CAyBjC"}
|