homebridge-solaxcloud-api 2.0.2-beta.0 → 2.1.1-beta.0
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 +17 -11
- package/config.json +6 -1
- package/config.sample +6 -2
- package/config.schema.json +27 -17
- package/dist/lightSensorAccessory.d.ts +3 -4
- package/dist/lightSensorAccessory.d.ts.map +1 -1
- package/dist/lightSensorAccessory.js +6 -7
- package/dist/lightSensorAccessory.js.map +1 -1
- package/dist/motionAccessory.d.ts +3 -4
- package/dist/motionAccessory.d.ts.map +1 -1
- package/dist/motionAccessory.js +6 -7
- package/dist/motionAccessory.js.map +1 -1
- package/dist/outletAccessory.d.ts +11 -4
- package/dist/outletAccessory.d.ts.map +1 -1
- package/dist/outletAccessory.js +19 -11
- package/dist/outletAccessory.js.map +1 -1
- package/dist/platform.d.ts +10 -54
- package/dist/platform.d.ts.map +1 -1
- package/dist/platform.js +80 -181
- package/dist/platform.js.map +1 -1
- package/dist/platformAccessory.d.ts +7 -8
- package/dist/platformAccessory.d.ts.map +1 -1
- package/dist/platformAccessory.js +13 -14
- package/dist/platformAccessory.js.map +1 -1
- package/dist/platformInverter.d.ts +97 -0
- package/dist/platformInverter.d.ts.map +1 -0
- package/dist/platformInverter.js +206 -0
- package/dist/platformInverter.js.map +1 -0
- package/dist/util.d.ts +6 -0
- package/dist/util.d.ts.map +1 -1
- package/dist/util.js +8 -0
- package/dist/util.js.map +1 -1
- package/images/homebridge-ui.png +0 -0
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -11,9 +11,11 @@
|
|
|
11
11
|
  [](https://github.com/homebridge/homebridge/wiki/Verified-Plugins)
|
|
12
12
|
|
|
13
13
|
|
|
14
|
-
The Solax Cloud Plugin for [Homebridge](https://homebridge.io/) was created as a platform plugin to gather data exposed by Solax inverters to the cloud through the [Solax Cloud API](https://www.eu.solaxcloud.com/phoebus/resource/files/userGuide/Solax_API_for_End-user_V1.0.pdf).
|
|
14
|
+
The Solax Cloud Plugin for [Homebridge](https://homebridge.io/) was created as a platform plugin to gather data exposed by Solax inverters to the cloud through the [Solax Cloud API](https://www.eu.solaxcloud.com/phoebus/resource/files/userGuide/Solax_API_for_End-user_V1.0.pdf).
|
|
15
15
|
|
|
16
|
-
|
|
16
|
+
Now with **support for multiple inverters**!
|
|
17
|
+
|
|
18
|
+
As HomeKit is still clueless about what a solar panel is, this plugin exposes a set of standard HomeKit accessories though Homebridge for each configured inverter that will allow interacting and automating your smart home based on the data made available from the Solax platform:
|
|
17
19
|
|
|
18
20
|
- **PV** (PV outlet with power consumption)
|
|
19
21
|
- **AC** (Inverter AC outlet with power and total energy consumptions)
|
|
@@ -28,10 +30,10 @@ Please note that additional accessories are created by default with smooth power
|
|
|
28
30
|
|
|
29
31
|
## Required information
|
|
30
32
|
|
|
31
|
-
For this plugin to work, two critical pieces of information are required:
|
|
33
|
+
For this plugin to work, two critical pieces of information are required from Solax Cloud:
|
|
32
34
|
|
|
33
35
|
- **Token ID**: Solax users can get inverter information through the granted tokenID. You need to obtain your tokenID on the API page of Solaxcloud.
|
|
34
|
-
- **SN**: Registration No (communication module SN).
|
|
36
|
+
- **SN**: Registration No (communication module SN) for each desired inverter.
|
|
35
37
|
|
|
36
38
|
## Installation
|
|
37
39
|
|
|
@@ -51,9 +53,13 @@ Minimal platform configuration is depicted by the example configuration file bel
|
|
|
51
53
|
"platforms": [
|
|
52
54
|
{
|
|
53
55
|
"platform": "SolaxCloudAPI",
|
|
54
|
-
"name": "Solax",
|
|
55
56
|
"tokenId": "20200722185111234567890",
|
|
56
|
-
"
|
|
57
|
+
"inverters": [
|
|
58
|
+
{
|
|
59
|
+
"name": "Solax",
|
|
60
|
+
"sn": "ABCDEFGHIJ"
|
|
61
|
+
}
|
|
62
|
+
],
|
|
57
63
|
}
|
|
58
64
|
]
|
|
59
65
|
}
|
|
@@ -63,9 +69,8 @@ Configuration parameters are described on the table below:
|
|
|
63
69
|
| **Parameter** | **Type** | **Description** | **Default** | **Mandatory?** |
|
|
64
70
|
| ------------------ | -------- | ------------------------------------------------------------------------------------------------------------------------------- | -------------:| :------------: |
|
|
65
71
|
| `platform` | string | Platform name (must be SolaxCloudAPI) | - | Y |
|
|
66
|
-
| `name` | string | Inverter name, used as prefix for accessory naming | - | Y |
|
|
67
72
|
| `tokenId` | string | Users get information from Solax Cloud through the granted tokenID. Please obtain your tokenID on the API page of Solax Cloud | - | Y |
|
|
68
|
-
| `
|
|
73
|
+
| `inverters` | array | Array of configured inverters as objects with `{ name: string, sn: string }`, where `name` is the inverter name, used as prefix for accessory naming and `sn` is the inverter registration no. (inverter module SN). | - | Y |
|
|
69
74
|
| `pollingFrequency` | number | Plugin data polling frequency from Solax Cloud (in seconds) | 300 | N |
|
|
70
75
|
| `smoothingMeters` | boolean | Whether to create additional meters by smoothing raw values from Solax Cloud | true | N |
|
|
71
76
|
| `smoothingMethod` | string | Statistical method to use for smoothing raw values from Solax Cloud (simple or exponential moving average - "sma" or "ema") | "sma" | N |
|
|
@@ -91,11 +96,11 @@ If you want to rely solely on the native Home App, please enable the `pureHomeAp
|
|
|
91
96
|
|
|
92
97
|
# Automation
|
|
93
98
|
|
|
94
|
-
Automation can be achieved with the help of the virtual **Update** motion sensor that was specifically tailored for this effect. This motion sensor will be triggered whenever data gets updated from the Solax Cloud API (according to what is defined on the `pollingFrequency` configuration setting).
|
|
99
|
+
Automation can be achieved with the help of the virtual **Update** motion sensor that was specifically tailored for this effect and which is available for each inverter. This motion sensor will be triggered whenever inverter data gets updated from the Solax Cloud API (according to what is defined on the `pollingFrequency` configuration setting).
|
|
95
100
|
|
|
96
101
|
<img src="images/plugin-accessories-eve.png" width="50%" height="50%">
|
|
97
102
|
|
|
98
|
-
Motion is detected by the **Update** motion sensor whenever there is newly fetched data from Solax Cloud. Using this sensor as a trigger combined with power and energy data from the virtual outlets enumerated above forms the basic building blocks for defining an automation.
|
|
103
|
+
Motion is detected by the **Update** motion sensor whenever there is newly fetched inverter data from Solax Cloud. Using this sensor as a trigger combined with power and energy data from the virtual outlets enumerated above forms the basic building blocks for defining an automation.
|
|
99
104
|
|
|
100
105
|
## Automation example
|
|
101
106
|
|
|
@@ -178,4 +183,5 @@ Next planned plugin releases should include:
|
|
|
178
183
|
- [X] Consumption history through the [fakegato-history](https://github.com/simont77/fakegato-history) module
|
|
179
184
|
- [x] Enable support for "pure" Home App accessories (power meters will be exposed as Ambient Light sensors)
|
|
180
185
|
- [x] Add "smooth" accessories for power meters (compensating for sporadic scenarios like cloud a passing)
|
|
181
|
-
- [
|
|
186
|
+
- [x] Support for multiple inverters
|
|
187
|
+
- [ ] Accessories for battery state and consumptions (work in progress)
|
package/config.json
CHANGED
package/config.sample
CHANGED
package/config.schema.json
CHANGED
|
@@ -6,15 +6,6 @@
|
|
|
6
6
|
"schema": {
|
|
7
7
|
"type": "object",
|
|
8
8
|
"properties": {
|
|
9
|
-
"name": {
|
|
10
|
-
"title": "Inverter name",
|
|
11
|
-
"type": "string",
|
|
12
|
-
"required": true,
|
|
13
|
-
"description": "Inverter name for description purposes.",
|
|
14
|
-
"default": "My Solax Inverter",
|
|
15
|
-
"minLength": 1,
|
|
16
|
-
"maxLength": 30
|
|
17
|
-
},
|
|
18
9
|
"tokenId": {
|
|
19
10
|
"title": "TokenID from Solax",
|
|
20
11
|
"type": "string",
|
|
@@ -24,14 +15,33 @@
|
|
|
24
15
|
"minLength": 23,
|
|
25
16
|
"maxLength": 23
|
|
26
17
|
},
|
|
27
|
-
"
|
|
28
|
-
"title": "
|
|
29
|
-
"type": "
|
|
30
|
-
"
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
18
|
+
"inverters": {
|
|
19
|
+
"title": "Inverters",
|
|
20
|
+
"type": "array",
|
|
21
|
+
"items": {
|
|
22
|
+
"title": "Inverter",
|
|
23
|
+
"type": "object",
|
|
24
|
+
"properties": {
|
|
25
|
+
"name": {
|
|
26
|
+
"title": "Inverter name (unique)",
|
|
27
|
+
"type": "string",
|
|
28
|
+
"required": true,
|
|
29
|
+
"description": "Inverter name for description purposes.",
|
|
30
|
+
"default": "My Solax Inverter",
|
|
31
|
+
"minLength": 1,
|
|
32
|
+
"maxLength": 30
|
|
33
|
+
},
|
|
34
|
+
"sn": {
|
|
35
|
+
"title": "Inverter module SN",
|
|
36
|
+
"type": "string",
|
|
37
|
+
"required": true,
|
|
38
|
+
"description": "Registration No. (inverter module SN)",
|
|
39
|
+
"default": "ABCDEFGHIJ",
|
|
40
|
+
"minLength": 10,
|
|
41
|
+
"maxLength": 10
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
35
45
|
},
|
|
36
46
|
"pollingFrequency": {
|
|
37
47
|
"title": "Polling frequency (seconds)",
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import { AccessoryPlugin, CharacteristicGetCallback, Logging, Service } from 'homebridge';
|
|
2
|
-
import { SolaxCloudAPIPlatform } from './platform';
|
|
1
|
+
import { AccessoryPlugin, API, CharacteristicGetCallback, Logging, Service } from 'homebridge';
|
|
3
2
|
import { SolaxPlatformAccessory } from './platformAccessory';
|
|
4
3
|
/**
|
|
5
4
|
* Solax Light Sensor Accessory.
|
|
@@ -15,13 +14,13 @@ export declare class SolaxLightSensorAccessory extends SolaxPlatformAccessory im
|
|
|
15
14
|
private lux;
|
|
16
15
|
/**
|
|
17
16
|
* Solax virtual light sensor class constructor.
|
|
18
|
-
* @param {SolaxCloudApiPlatform} platform The API Platform for Solax Cloud.
|
|
19
17
|
* @param {Logging} log The platform logging for homebridge.
|
|
18
|
+
* @param {API} api The platform API.
|
|
20
19
|
* @param {string} name The accessory name.
|
|
21
20
|
* @param {string} serial "Real world" serial number for this accessory.
|
|
22
21
|
* @param {string} model Accessory model.
|
|
23
22
|
*/
|
|
24
|
-
constructor(
|
|
23
|
+
constructor(log: Logging, api: API, name: string, serial: string, model: string);
|
|
25
24
|
/**
|
|
26
25
|
* Gets the current ambient light level (power consumpion in Watts).
|
|
27
26
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lightSensorAccessory.d.ts","sourceRoot":"","sources":["../src/lightSensorAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAA4B,yBAAyB,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"lightSensorAccessory.d.ts","sourceRoot":"","sources":["../src/lightSensorAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,GAAG,EAA4B,yBAAyB,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAEzH,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE7D;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,sBAAuB,YAAW,eAAe;IAC9F,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAU;IAEvC;;OAEG;IACH,OAAO,CAAC,GAAG,CAAK;IAEhB;;;;;;;OAOG;gBACS,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAc/E;;OAEG;IACI,oBAAoB,CAAC,QAAQ,EAAE,yBAAyB,GAAG,IAAI;IAMtE;;;OAGG;IACI,oBAAoB,CAAC,GAAG,EAAE,MAAM;IAavC,WAAW,IAAI,OAAO,EAAE;CAIzB"}
|
|
@@ -11,23 +11,22 @@ const platformAccessory_1 = require("./platformAccessory");
|
|
|
11
11
|
class SolaxLightSensorAccessory extends platformAccessory_1.SolaxPlatformAccessory {
|
|
12
12
|
/**
|
|
13
13
|
* Solax virtual light sensor class constructor.
|
|
14
|
-
* @param {SolaxCloudApiPlatform} platform The API Platform for Solax Cloud.
|
|
15
14
|
* @param {Logging} log The platform logging for homebridge.
|
|
15
|
+
* @param {API} api The platform API.
|
|
16
16
|
* @param {string} name The accessory name.
|
|
17
17
|
* @param {string} serial "Real world" serial number for this accessory.
|
|
18
18
|
* @param {string} model Accessory model.
|
|
19
19
|
*/
|
|
20
|
-
constructor(
|
|
21
|
-
super(
|
|
20
|
+
constructor(log, api, name, serial, model) {
|
|
21
|
+
super(log, api, name, serial, model);
|
|
22
22
|
/**
|
|
23
23
|
* Ambient light level.
|
|
24
24
|
*/
|
|
25
25
|
this.lux = 0;
|
|
26
|
-
const hap = this.platform.api.hap;
|
|
27
26
|
this.log.debug(`Creating light "${this.name}"`);
|
|
28
|
-
this.lightService = new hap.Service.LightSensor(name);
|
|
27
|
+
this.lightService = new this.api.hap.Service.LightSensor(name);
|
|
29
28
|
this.lightService
|
|
30
|
-
.getCharacteristic(hap.Characteristic.CurrentAmbientLightLevel)
|
|
29
|
+
.getCharacteristic(this.api.hap.Characteristic.CurrentAmbientLightLevel)
|
|
31
30
|
.on("get" /* GET */, this.getAmbientLightLevel.bind(this));
|
|
32
31
|
log.info(`Solax light (watts reader) ${name} created!`);
|
|
33
32
|
}
|
|
@@ -46,7 +45,7 @@ class SolaxLightSensorAccessory extends platformAccessory_1.SolaxPlatformAccesso
|
|
|
46
45
|
this.log.debug(`${this.name}: SET Ambient Light Level (lux=${lux})`);
|
|
47
46
|
// Minimum value allowed for light sensor is 0.1
|
|
48
47
|
this.lux = Math.max(0.1, lux);
|
|
49
|
-
this.lightService.updateCharacteristic(this.
|
|
48
|
+
this.lightService.updateCharacteristic(this.api.hap.Characteristic.CurrentAmbientLightLevel, this.lux);
|
|
50
49
|
}
|
|
51
50
|
/*
|
|
52
51
|
* This method is called directly after creation of this instance.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lightSensorAccessory.js","sourceRoot":"","sources":["../src/lightSensorAccessory.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"lightSensorAccessory.js","sourceRoot":"","sources":["../src/lightSensorAccessory.ts"],"names":[],"mappings":";;;AAEA,2DAA6D;AAE7D;;;;;GAKG;AACH,MAAa,yBAA0B,SAAQ,0CAAsB;IAQnE;;;;;;;OAOG;IACH,YAAY,GAAY,EAAE,GAAQ,EAAE,IAAY,EAAE,MAAc,EAAE,KAAa;QAC7E,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAdvC;;WAEG;QACK,QAAG,GAAG,CAAC,CAAC;QAad,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;QAEhD,IAAI,CAAC,YAAY,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAE/D,IAAI,CAAC,YAAY;aACd,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,wBAAwB,CAAC;aACvE,EAAE,kBAA+B,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAE1E,GAAG,CAAC,IAAI,CAAC,8BAA8B,IAAI,WAAW,CAAC,CAAC;IAC1D,CAAC;IAED;;OAEG;IACI,oBAAoB,CAAC,QAAmC;QAC7D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,kCAAkC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;QAE1E,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAED;;;OAGG;IACI,oBAAoB,CAAC,GAAW;QACrC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,kCAAkC,GAAG,GAAG,CAAC,CAAC;QAErE,gDAAgD;QAChD,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAE9B,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,wBAAwB,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IACzG,CAAC;IAED;;;OAGG;IACH,WAAW;QACT,OAAO,CAAE,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,YAAY,CAAE,CAAC;IACxD,CAAC;CAEF;AA5DD,8DA4DC"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { Service, AccessoryPlugin, Logging, CharacteristicGetCallback } from 'homebridge';
|
|
3
|
-
import { SolaxCloudAPIPlatform } from './platform';
|
|
2
|
+
import { Service, AccessoryPlugin, Logging, CharacteristicGetCallback, API } from 'homebridge';
|
|
4
3
|
import { SolaxPlatformAccessory } from './platformAccessory';
|
|
5
4
|
/**
|
|
6
5
|
* Solax Motion Accessory.
|
|
@@ -22,13 +21,13 @@ export declare class SolaxMotionAccessory extends SolaxPlatformAccessory impleme
|
|
|
22
21
|
private motionTimeout;
|
|
23
22
|
/**
|
|
24
23
|
* Solax virtual motion sensor class constructor.
|
|
25
|
-
* @param {SolaxCloudApiPlatform} platform The API Platform for Solax Cloud.
|
|
26
24
|
* @param {Logging} log The platform logging for homebridge.
|
|
25
|
+
* @param {API} api The API for Solax Cloud platform.
|
|
27
26
|
* @param {string} name The accessory name.
|
|
28
27
|
* @param {string} serial "Real-world" serial number for this accessory.
|
|
29
28
|
* @param {string} model Accessory model.
|
|
30
29
|
*/
|
|
31
|
-
constructor(
|
|
30
|
+
constructor(log: Logging, api: API, name: string, serial: string, model: string);
|
|
32
31
|
sleep: typeof import("timers/promises").setTimeout;
|
|
33
32
|
/**
|
|
34
33
|
* Gets the motion sensor state Characteristic.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"motionAccessory.d.ts","sourceRoot":"","sources":["../src/motionAccessory.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,yBAAyB,EAAE,
|
|
1
|
+
{"version":3,"file":"motionAccessory.d.ts","sourceRoot":"","sources":["../src/motionAccessory.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,yBAAyB,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAI/F,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAO7D;;;;GAIG;AACH,qBAAa,oBAAqB,SAAQ,sBAAuB,YAAW,eAAe;IAEzF;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAU;IAExC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAS;IAEvB;;OAEG;IACH,OAAO,CAAC,aAAa,CAA0B;IAE/C;;;;;;;OAOG;gBACS,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAa/E,KAAK,8CAA8B;IAEnC;;;OAGG;IACI,QAAQ,CAAC,QAAQ,EAAE,yBAAyB,GAAG,IAAI;IAM1D;;;OAGG;IACI,QAAQ,CAAC,MAAM,EAAE,OAAO;IAe/B;;;OAGG;IACH,gBAAgB,CAAC,OAAO,EAAE,MAAM;IAIhC;;;OAGG;IACH,gBAAgB,IAAI,MAAM;IAQ1B,WAAW,IAAI,OAAO,EAAE;CAOzB"}
|
package/dist/motionAccessory.js
CHANGED
|
@@ -18,14 +18,14 @@ const MOTION_TIMEOUT = 5;
|
|
|
18
18
|
class SolaxMotionAccessory extends platformAccessory_1.SolaxPlatformAccessory {
|
|
19
19
|
/**
|
|
20
20
|
* Solax virtual motion sensor class constructor.
|
|
21
|
-
* @param {SolaxCloudApiPlatform} platform The API Platform for Solax Cloud.
|
|
22
21
|
* @param {Logging} log The platform logging for homebridge.
|
|
22
|
+
* @param {API} api The API for Solax Cloud platform.
|
|
23
23
|
* @param {string} name The accessory name.
|
|
24
24
|
* @param {string} serial "Real-world" serial number for this accessory.
|
|
25
25
|
* @param {string} model Accessory model.
|
|
26
26
|
*/
|
|
27
|
-
constructor(
|
|
28
|
-
super(
|
|
27
|
+
constructor(log, api, name, serial, model) {
|
|
28
|
+
super(log, api, name, serial, model);
|
|
29
29
|
/**
|
|
30
30
|
* Whether motion is detected (Solax Cloud data updated).
|
|
31
31
|
*/
|
|
@@ -35,11 +35,10 @@ class SolaxMotionAccessory extends platformAccessory_1.SolaxPlatformAccessory {
|
|
|
35
35
|
*/
|
|
36
36
|
this.motionTimeout = MOTION_TIMEOUT;
|
|
37
37
|
this.sleep = util_1.default.promisify(setTimeout);
|
|
38
|
-
const hap = this.platform.api.hap;
|
|
39
38
|
this.log.debug(`Creating motion sensor "${this.name}"`);
|
|
40
|
-
this.motionService = new hap.Service.MotionSensor(this.name);
|
|
39
|
+
this.motionService = new this.api.hap.Service.MotionSensor(this.name);
|
|
41
40
|
this.motionService
|
|
42
|
-
.getCharacteristic(hap.Characteristic.MotionDetected)
|
|
41
|
+
.getCharacteristic(this.api.hap.Characteristic.MotionDetected)
|
|
43
42
|
.on("get" /* GET */, this.getState.bind(this));
|
|
44
43
|
log.info(`Motion sensor "${name}" created!`);
|
|
45
44
|
}
|
|
@@ -58,7 +57,7 @@ class SolaxMotionAccessory extends platformAccessory_1.SolaxPlatformAccessory {
|
|
|
58
57
|
setState(motion) {
|
|
59
58
|
this.log.debug(`${this.name}: SET State (motion=${motion})`);
|
|
60
59
|
this.motionService
|
|
61
|
-
.getCharacteristic(this.
|
|
60
|
+
.getCharacteristic(this.api.hap.Characteristic.MotionDetected)
|
|
62
61
|
.updateValue(motion);
|
|
63
62
|
this.motion = motion;
|
|
64
63
|
if (this.motion) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"motionAccessory.js","sourceRoot":"","sources":["../src/motionAccessory.ts"],"names":[],"mappings":";;;;;;AAEA,gDAAwB;
|
|
1
|
+
{"version":3,"file":"motionAccessory.js","sourceRoot":"","sources":["../src/motionAccessory.ts"],"names":[],"mappings":";;;;;;AAEA,gDAAwB;AAExB,2DAA6D;AAE7D;;GAEG;AACH,MAAM,cAAc,GAAG,CAAC,CAAC;AAEzB;;;;GAIG;AACH,MAAa,oBAAqB,SAAQ,0CAAsB;IAiB9D;;;;;;;OAOG;IACH,YAAY,GAAY,EAAE,GAAQ,EAAE,IAAY,EAAE,MAAc,EAAE,KAAa;QAC7E,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAnBvC;;WAEG;QACK,WAAM,GAAG,KAAK,CAAC;QAEvB;;WAEG;QACK,kBAAa,GAAW,cAAc,CAAC;QAuB/C,UAAK,GAAG,cAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAVjC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2BAA2B,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;QAExD,IAAI,CAAC,aAAa,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtE,IAAI,CAAC,aAAa;aACf,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,cAAc,CAAC;aAC7D,EAAE,kBAA4C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAE3E,GAAG,CAAC,IAAI,CAAC,kBAAkB,IAAI,YAAY,CAAC,CAAC;IAC/C,CAAC;IAID;;;OAGG;IACI,QAAQ,CAAC,QAAmC;QACjD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,uBAAuB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAElE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED;;;OAGG;IACI,QAAQ,CAAC,MAAe;QAC7B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,IAAI,uBAAuB,MAAM,GAAG,CAAC,CAAC;QAE7D,IAAI,CAAC,aAAa;aACf,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,cAAc,CAAC;aAC7D,WAAW,CAAC,MAAM,CAAC,CAAC;QAEvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,4BAA4B;YAC5B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;SACxE;IACH,CAAC;IAED;;;OAGG;IACH,gBAAgB,CAAC,OAAe;QAC9B,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC;IAC/B,CAAC;IAED;;;OAGG;IACH,gBAAgB;QACd,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED;;;OAGG;IACH,WAAW;QACT,OAAO;YACL,IAAI,CAAC,kBAAkB;YACvB,IAAI,CAAC,aAAa;SACnB,CAAC;IACJ,CAAC;CAEF;AAhGD,oDAgGC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import { Service, AccessoryPlugin, Logging, CharacteristicGetCallback } from 'homebridge';
|
|
2
|
-
import { SolaxCloudAPIPlatform } from './platform';
|
|
1
|
+
import { Service, AccessoryPlugin, Logging, CharacteristicGetCallback, API } from 'homebridge';
|
|
3
2
|
import { SolaxPlatformAccessory } from './platformAccessory';
|
|
4
3
|
/**
|
|
5
4
|
* Solax Outlet Accessory.
|
|
@@ -7,6 +6,14 @@ import { SolaxPlatformAccessory } from './platformAccessory';
|
|
|
7
6
|
* Outlet use is inferred from a positive power comsumption.
|
|
8
7
|
*/
|
|
9
8
|
export declare class SolaxOutletAccessory extends SolaxPlatformAccessory implements AccessoryPlugin {
|
|
9
|
+
/**
|
|
10
|
+
* Eve Homekit types helper
|
|
11
|
+
* */
|
|
12
|
+
private readonly eve;
|
|
13
|
+
/**
|
|
14
|
+
* Eve Service for fakegato.
|
|
15
|
+
*/
|
|
16
|
+
private readonly eveService;
|
|
10
17
|
/**
|
|
11
18
|
* Outlet service with power meter.
|
|
12
19
|
*/
|
|
@@ -33,13 +40,13 @@ export declare class SolaxOutletAccessory extends SolaxPlatformAccessory impleme
|
|
|
33
40
|
private lastEMA;
|
|
34
41
|
/**
|
|
35
42
|
* Solax virtual outlet class constructor.
|
|
36
|
-
* @param {SolaxCloudApiPlatform} platform The API Platform for Solax Cloud.
|
|
37
43
|
* @param {Logging} log The platform logging for homebridge.
|
|
44
|
+
* @param {API} api The API for Solax Cloud platform.
|
|
38
45
|
* @param {string} name The accessory name.
|
|
39
46
|
* @param {string} serial "Real world" serial number for this accessory.
|
|
40
47
|
* @param {string} model Accessory model.
|
|
41
48
|
*/
|
|
42
|
-
constructor(
|
|
49
|
+
constructor(log: Logging, api: API, name: string, serial: string, model: string);
|
|
43
50
|
/**
|
|
44
51
|
* Adds new power entry to series array of power values.
|
|
45
52
|
* @param {number} powerConsumption Power value to add (in Watts).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outletAccessory.d.ts","sourceRoot":"","sources":["../src/outletAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,yBAAyB,EAAE,
|
|
1
|
+
{"version":3,"file":"outletAccessory.d.ts","sourceRoot":"","sources":["../src/outletAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,yBAAyB,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAE/F,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAa7D;;;;GAIG;AACH,qBAAa,oBAAqB,SAAQ,sBAAuB,YAAW,eAAe;IAEzF;;SAEK;IACL,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAkB;IAEtC;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAW;IAEtC;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAU;IAExC;;OAEG;IACH,OAAO,CAAC,gBAAgB,CAAK;IAE7B;;OAEG;IACH,OAAO,CAAC,sBAAsB,CAAO;IAErC;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAyB;IAExD;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgB;IAE5C;;OAEG;IACH,OAAO,CAAC,OAAO,CAAK;IAEpB;;;;;;;OAOG;gBACS,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAiC/E;;;OAGG;IACH,OAAO,CAAC,aAAa;IAWrB;;;OAGG;IACI,cAAc,IAAI,MAAM,EAAE;IAIjC;;;;;OAKG;IACI,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAwC5E;;OAEG;IACI,mBAAmB,CAAC,QAAQ,EAAE,yBAAyB,GAAG,IAAI;IAMrE;;wEAEoE;IAC7D,mBAAmB,CAAC,gBAAgB,EAAE,MAAM;IAcnD;;OAEG;IACI,yBAAyB,CAAC,QAAQ,EAAE,yBAAyB,GAAG,IAAI;IAM3E;;;OAGG;IACI,yBAAyB,CAAC,sBAAsB,EAAE,MAAM;IAQ/D;;;OAGG;IACI,QAAQ,CAAC,QAAQ,EAAE,yBAAyB,GAAG,IAAI;IAU1D,WAAW,IAAI,OAAO,EAAE;CAIzB"}
|
package/dist/outletAccessory.js
CHANGED
|
@@ -1,8 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.SolaxOutletAccessory = void 0;
|
|
4
7
|
const platformAccessory_1 = require("./platformAccessory");
|
|
5
8
|
const statistics_1 = require("./statistics");
|
|
9
|
+
const homebridge_lib_1 = require("homebridge-lib");
|
|
10
|
+
const fakegato_history_1 = __importDefault(require("fakegato-history"));
|
|
6
11
|
/**
|
|
7
12
|
* Maximum size for the outlet power series.
|
|
8
13
|
*/
|
|
@@ -15,14 +20,14 @@ const MAX_POWER_SERIES_SIZE = 1024;
|
|
|
15
20
|
class SolaxOutletAccessory extends platformAccessory_1.SolaxPlatformAccessory {
|
|
16
21
|
/**
|
|
17
22
|
* Solax virtual outlet class constructor.
|
|
18
|
-
* @param {SolaxCloudApiPlatform} platform The API Platform for Solax Cloud.
|
|
19
23
|
* @param {Logging} log The platform logging for homebridge.
|
|
24
|
+
* @param {API} api The API for Solax Cloud platform.
|
|
20
25
|
* @param {string} name The accessory name.
|
|
21
26
|
* @param {string} serial "Real world" serial number for this accessory.
|
|
22
27
|
* @param {string} model Accessory model.
|
|
23
28
|
*/
|
|
24
|
-
constructor(
|
|
25
|
-
super(
|
|
29
|
+
constructor(log, api, name, serial, model) {
|
|
30
|
+
super(log, api, name, serial, model);
|
|
26
31
|
/**
|
|
27
32
|
* Current power reading in Watt.
|
|
28
33
|
*/
|
|
@@ -39,22 +44,25 @@ class SolaxOutletAccessory extends platformAccessory_1.SolaxPlatformAccessory {
|
|
|
39
44
|
* Last Exponential Moving Average.
|
|
40
45
|
*/
|
|
41
46
|
this.lastEMA = 0;
|
|
42
|
-
const hap = this.platform.api.hap;
|
|
43
47
|
this.log.debug(`Creating outlet "${this.name}"`);
|
|
48
|
+
// init fakegato objects
|
|
49
|
+
this.eve = new homebridge_lib_1.EveHomeKitTypes(this.api);
|
|
50
|
+
this.eveService = (0, fakegato_history_1.default)(this.api);
|
|
44
51
|
// create power meter service
|
|
45
|
-
this.outletService = new this.
|
|
52
|
+
this.outletService = new this.eve.Services.Outlet(this.name);
|
|
46
53
|
// outlet on/off state
|
|
47
|
-
this.outletService.getCharacteristic(hap.Characteristic.On)
|
|
54
|
+
this.outletService.getCharacteristic(this.api.hap.Characteristic.On)
|
|
55
|
+
.on("get" /* GET */, this.getState.bind(this));
|
|
48
56
|
// in use
|
|
49
57
|
//this.outletService.getCharacteristic(hap.Characteristic.OutletInUse).on(hap.CharacteristicEventTypes.GET, this.getState.bind(this));
|
|
50
58
|
// current consumption
|
|
51
|
-
this.outletService.getCharacteristic(this.
|
|
59
|
+
this.outletService.getCharacteristic(this.eve.Characteristics.CurrentConsumption)
|
|
52
60
|
.on("get" /* GET */, this.getPowerConsumption.bind(this));
|
|
53
61
|
// total consumption
|
|
54
|
-
this.outletService.getCharacteristic(this.
|
|
62
|
+
this.outletService.getCharacteristic(this.eve.Characteristics.TotalConsumption)
|
|
55
63
|
.on("get" /* GET */, this.getTotalEnergyConsumption.bind(this));
|
|
56
64
|
// history logging services
|
|
57
|
-
this.loggingService = new this.
|
|
65
|
+
this.loggingService = new this.eveService('energy', this, { storage: 'fs', log: this.log, disableRepeatLastData: true });
|
|
58
66
|
log.info(`Outlet "${name}" created!`);
|
|
59
67
|
}
|
|
60
68
|
/**
|
|
@@ -124,7 +132,7 @@ class SolaxOutletAccessory extends platformAccessory_1.SolaxPlatformAccessory {
|
|
|
124
132
|
setPowerConsumption(powerConsumption) {
|
|
125
133
|
this.log.debug(`${this.name}: SET Power (power=${powerConsumption}W)`);
|
|
126
134
|
this.powerConsumption = powerConsumption >= 0 ? powerConsumption : 0;
|
|
127
|
-
this.outletService.getCharacteristic(this.
|
|
135
|
+
this.outletService.getCharacteristic(this.eve.Characteristics.CurrentConsumption).updateValue(this.powerConsumption);
|
|
128
136
|
// add entries to history
|
|
129
137
|
this.loggingService.addEntry({ time: Math.round(new Date().valueOf() / 1000), power: this.powerConsumption });
|
|
130
138
|
// add new value to power series
|
|
@@ -144,7 +152,7 @@ class SolaxOutletAccessory extends platformAccessory_1.SolaxPlatformAccessory {
|
|
|
144
152
|
setTotalEnergyConsumption(totalEnergyConsumption) {
|
|
145
153
|
this.log.debug(`${this.name}: SET Total Energy (energy=${totalEnergyConsumption}kWh)`);
|
|
146
154
|
this.totalEnergyConsumption = totalEnergyConsumption;
|
|
147
|
-
this.outletService.getCharacteristic(this.
|
|
155
|
+
this.outletService.getCharacteristic(this.eve.Characteristics.TotalConsumption).updateValue(this.totalEnergyConsumption);
|
|
148
156
|
}
|
|
149
157
|
/**
|
|
150
158
|
* Gets the outlet state Characteristic based on its consumed power.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outletAccessory.js","sourceRoot":"","sources":["../src/outletAccessory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"outletAccessory.js","sourceRoot":"","sources":["../src/outletAccessory.ts"],"names":[],"mappings":"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"}
|
package/dist/platform.d.ts
CHANGED
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { AccessoryPlugin, API, StaticPlatformPlugin, Logging, PlatformConfig } from 'homebridge';
|
|
3
|
-
import { EveHomeKitTypes } from 'homebridge-lib';
|
|
4
|
-
import fakegato from 'fakegato-history';
|
|
5
3
|
/**
|
|
6
4
|
* SolaxCloudAPIPlatform.
|
|
7
5
|
* This class is the main constructor for your plugin, this is where you should
|
|
@@ -10,40 +8,15 @@ import fakegato from 'fakegato-history';
|
|
|
10
8
|
export declare class SolaxCloudAPIPlatform implements StaticPlatformPlugin {
|
|
11
9
|
private readonly log;
|
|
12
10
|
private readonly config;
|
|
13
|
-
readonly api
|
|
14
|
-
readonly eve: EveHomeKitTypes;
|
|
15
|
-
eveService: fakegato;
|
|
16
|
-
private readonly solaxCloudAPI;
|
|
11
|
+
private readonly api;
|
|
17
12
|
/**
|
|
18
|
-
*
|
|
13
|
+
* Number of periods to use for data smoothing.
|
|
19
14
|
*/
|
|
20
15
|
private smoothingWindow;
|
|
21
16
|
/**
|
|
22
|
-
*
|
|
17
|
+
* Array of inverters.
|
|
23
18
|
*/
|
|
24
|
-
private
|
|
25
|
-
/**
|
|
26
|
-
* Smooth data outlets.
|
|
27
|
-
* These outlets present smoothed values based on the raw data figures to
|
|
28
|
-
* prevent events like the temporary passage of a cloud to directly affect values.
|
|
29
|
-
*/
|
|
30
|
-
private smoothOutlets;
|
|
31
|
-
/**
|
|
32
|
-
* Virtual motion sensor triggered by data updates from Solax Cloud.
|
|
33
|
-
*/
|
|
34
|
-
private motionUpdate;
|
|
35
|
-
/**
|
|
36
|
-
* Ambient light sensors for Power Consumption (pure Home App config)
|
|
37
|
-
*/
|
|
38
|
-
private rawLightSensors;
|
|
39
|
-
/**
|
|
40
|
-
* Ambient light sensors for smooth power consumption lights.
|
|
41
|
-
* These lights present smoothed values based on the raw data figures to
|
|
42
|
-
* prevent events like the temporary passage of a cloud to directly affect values.
|
|
43
|
-
*/
|
|
44
|
-
private smoothLightSensors;
|
|
45
|
-
/** Array with all accessories */
|
|
46
|
-
private solaxAccessories;
|
|
19
|
+
private inverters;
|
|
47
20
|
/**
|
|
48
21
|
* Platform constructor.
|
|
49
22
|
* @param log
|
|
@@ -54,32 +27,15 @@ export declare class SolaxCloudAPIPlatform implements StaticPlatformPlugin {
|
|
|
54
27
|
constructor(log: Logging, config: PlatformConfig, api: API);
|
|
55
28
|
sleep: typeof import("timers/promises").setTimeout;
|
|
56
29
|
/**
|
|
57
|
-
*
|
|
30
|
+
* Check whether object implements interface InverterConfig.
|
|
31
|
+
* @param obj Any object.
|
|
32
|
+
* @returns Whether object implements interface InverterConfig.
|
|
58
33
|
*/
|
|
59
|
-
private
|
|
34
|
+
private static isInverterConfig;
|
|
60
35
|
/**
|
|
61
|
-
*
|
|
62
|
-
* @param {SolaxCloudAPIResponse} apiData API data from Solax Cloud.
|
|
63
|
-
*/
|
|
64
|
-
private updateAccessories;
|
|
65
|
-
/**
|
|
66
|
-
* Updates smooth ambient light sensors data from raw outlet data by applying configured smoothing function.
|
|
67
|
-
*/
|
|
68
|
-
private updateSmoothLightSensors;
|
|
69
|
-
/**
|
|
70
|
-
* Update raw ambient light sensors with power consumption data from Solax Cloud API.
|
|
71
|
-
* @param {SolaxCloudAPIResponse} apiData API data retrieved from Solax Cloud.
|
|
72
|
-
*/
|
|
73
|
-
private updateRawLightSensors;
|
|
74
|
-
/**
|
|
75
|
-
* Updates smooth outlet data from raw outlet data by applying configured smoothing function.
|
|
36
|
+
* Periodically retrieves inverter data from Solax Cloud API using configured tokenID and SN.
|
|
76
37
|
*/
|
|
77
|
-
private
|
|
78
|
-
/**
|
|
79
|
-
* Update raw outlet data from API data read from Solax Cloud.
|
|
80
|
-
* @param {SolaxCloudAPIResponse} apiData Solax Cloud API data.
|
|
81
|
-
* */
|
|
82
|
-
private updateRawOutlets;
|
|
38
|
+
private fetchDataPeriodically;
|
|
83
39
|
/**
|
|
84
40
|
* Checks platform config validity and sets defaults whenever needed.
|
|
85
41
|
* @returns {boolean} Whether the config is valid.
|
package/dist/platform.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,eAAe,EAAE,GAAG,EAAE,oBAAoB,EAAE,OAAO,EAAE,cAAc,EAAY,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,eAAe,EAAE,GAAG,EAAE,oBAAoB,EAAE,OAAO,EAAE,cAAc,EAAY,MAAM,YAAY,CAAC;AA6C3G;;;;GAIG;AACH,qBAAa,qBAAsB,YAAW,oBAAoB;IAChE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAU;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAM;IAE1B;;OAEG;IACH,OAAO,CAAC,eAAe,CAAK;IAE5B;;OAEG;IACH,OAAO,CAAC,SAAS,CAAuC;IAExD;;;;;;OAMG;gBACU,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG;IA6C3D,KAAK,8CAA8B;IAEnC;;;;OAIG;IAEH,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAI/B;;OAEG;YACW,qBAAqB;IASnC;;;OAGG;IACH,OAAO,CAAC,WAAW;IAqInB,WAAW,CAAC,QAAQ,EAAE,CAAC,gBAAgB,EAAE,eAAe,EAAE,KAAK,IAAI,GAAG,IAAI;CAQ3E"}
|