iobroker.tibberlink 4.5.0 → 4.5.2
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 +14 -13
- package/admin/CalculatorTab.jsonConfig.json +5 -5
- package/admin/jsonConfig.json +1 -1
- package/build/lib/projectUtils.js +5 -4
- package/build/lib/projectUtils.js.map +1 -1
- package/build/lib/tibberAPICaller.js +5 -5
- package/build/lib/tibberAPICaller.js.map +1 -1
- package/build/lib/tibberCalculator.js +13 -20
- package/build/lib/tibberCalculator.js.map +1 -1
- package/io-package.json +292 -276
- package/package.json +9 -9
package/README.md
CHANGED
|
@@ -160,6 +160,20 @@ If you enjoyed this project — or just feeling generous, consider buying me a b
|
|
|
160
160
|
|
|
161
161
|
## Changelog
|
|
162
162
|
|
|
163
|
+
### 4.5.2 (2025-04-18)
|
|
164
|
+
|
|
165
|
+
- (HombachC) fix jsonConfig error (#686)
|
|
166
|
+
- (HombachC) bump dependencies
|
|
167
|
+
- (HombachC) add statevalue range to projectUtils
|
|
168
|
+
- (HombachC) code optimizations
|
|
169
|
+
|
|
170
|
+
### 4.5.1 (2025-03-23)
|
|
171
|
+
|
|
172
|
+
- (HombachC) fix Smart Battery Buffer JSON2 (#676)
|
|
173
|
+
- (HombachC) fix not visible SBB LTF output 2 (#681)
|
|
174
|
+
- (HombachC) enable JSON5 parsing starting with admin 7.5.3
|
|
175
|
+
- (HombachC) fix vulnerability in axios <1.8.2 (#673)
|
|
176
|
+
|
|
163
177
|
### 4.5.0 (2025-03-05)
|
|
164
178
|
|
|
165
179
|
- (HombachC) add calculator channel 'smart battery buffer LTF' (#668)
|
|
@@ -183,19 +197,6 @@ If you enjoyed this project — or just feeling generous, consider buying me a b
|
|
|
183
197
|
- (HombachC) fix logging for multiple homes (#647)
|
|
184
198
|
- (HombachC) fix encrypted element "tibberBridgePassword" (#652)
|
|
185
199
|
|
|
186
|
-
### 4.3.0 (2025-02-09)
|
|
187
|
-
|
|
188
|
-
- (HombachC) added ioBroker.FlexCharts - JSON
|
|
189
|
-
- (HombachC) Update tibber-api to 5.2.1 - handle obsolete data as default, remove option
|
|
190
|
-
- (HombachC) Calculate outputJSON prior to time frame for channels of type 'BestSingleHours', 'BestHoursBlock', 'BestPercentage', 'BestCost' and their LTF variants (#592)
|
|
191
|
-
- (HombachC) add outputJSON and outputJSON2 for 'SmartBatteryBuffer' channels (#592)
|
|
192
|
-
- (HombachC) calculator and projectUtils code optimizations
|
|
193
|
-
- (HombachC) correct role of stats states to json
|
|
194
|
-
|
|
195
|
-
### 4.2.3 (2025-01-14)
|
|
196
|
-
|
|
197
|
-
- (HombachC) bump cron to 3.5
|
|
198
|
-
|
|
199
200
|
### Old Changes see [CHANGELOG OLD](CHANGELOG_OLD.md)
|
|
200
201
|
|
|
201
202
|
## License
|
|
@@ -149,7 +149,7 @@
|
|
|
149
149
|
"label": "LBL_item_chTargetState2",
|
|
150
150
|
"tooltip": "TTIP_item_chTargetState2",
|
|
151
151
|
"attr": "chTargetState2",
|
|
152
|
-
"hidden": "data.chType !== 7",
|
|
152
|
+
"hidden": "data.chType !== 7 && data.chType !== 10",
|
|
153
153
|
"xs": 12,
|
|
154
154
|
"sm": 12,
|
|
155
155
|
"md": 12,
|
|
@@ -164,12 +164,12 @@
|
|
|
164
164
|
"maxLength": 20,
|
|
165
165
|
"attr": "chValueOn2",
|
|
166
166
|
"default": "true",
|
|
167
|
+
"hidden": "data.chType !== 7 && data.chType !== 10",
|
|
167
168
|
"xs": 12,
|
|
168
169
|
"sm": 12,
|
|
169
170
|
"md": 6,
|
|
170
171
|
"lg": 6,
|
|
171
|
-
"xl": 6
|
|
172
|
-
"hidden": "data.chType !== 7"
|
|
172
|
+
"xl": 6
|
|
173
173
|
},
|
|
174
174
|
{
|
|
175
175
|
"type": "text",
|
|
@@ -178,12 +178,12 @@
|
|
|
178
178
|
"maxLength": 20,
|
|
179
179
|
"attr": "chValueOff2",
|
|
180
180
|
"default": "false",
|
|
181
|
+
"hidden": "data.chType !== 7 && data.chType !== 10",
|
|
181
182
|
"xs": 12,
|
|
182
183
|
"sm": 12,
|
|
183
184
|
"md": 6,
|
|
184
185
|
"lg": 6,
|
|
185
|
-
"xl": 6
|
|
186
|
-
"hidden": "data.chType !== 7"
|
|
186
|
+
"xl": 6
|
|
187
187
|
},
|
|
188
188
|
{
|
|
189
189
|
"type": "checkbox",
|
package/admin/jsonConfig.json
CHANGED
|
@@ -489,7 +489,7 @@
|
|
|
489
489
|
"type": "jsonEditor",
|
|
490
490
|
"label": "Configure template to create a data string to be used in graphs - e.g. ioBroker FlexCharts",
|
|
491
491
|
"validateJson": false,
|
|
492
|
-
"
|
|
492
|
+
"json5": true,
|
|
493
493
|
"newLine": true,
|
|
494
494
|
"default": "%%xAxisData%%\n\n%%yAxisData%%\n\n%%CalcChannelsData%%",
|
|
495
495
|
"xs": 12,
|
|
@@ -135,7 +135,7 @@ class ProjectUtils {
|
|
|
135
135
|
}
|
|
136
136
|
}
|
|
137
137
|
}
|
|
138
|
-
async checkAndSetValueNumber(stateName, value, description = "-", unit, role = "value", writeable = false, dontUpdate = false, forceMode = false) {
|
|
138
|
+
async checkAndSetValueNumber(stateName, value, description = "-", unit, role = "value", writeable = false, dontUpdate = false, forceMode = false, min, max, step) {
|
|
139
139
|
if (value !== undefined) {
|
|
140
140
|
const commonObj = {
|
|
141
141
|
name: stateName.split(".").pop() ?? stateName,
|
|
@@ -144,10 +144,11 @@ class ProjectUtils {
|
|
|
144
144
|
desc: description,
|
|
145
145
|
read: true,
|
|
146
146
|
write: writeable,
|
|
147
|
+
...((unit ?? undefined) ? { unit } : {}),
|
|
148
|
+
...((min ?? undefined) ? { min } : {}),
|
|
149
|
+
...((max ?? undefined) ? { max } : {}),
|
|
150
|
+
...((step ?? undefined) ? { step } : {}),
|
|
147
151
|
};
|
|
148
|
-
if (unit !== null && unit !== undefined) {
|
|
149
|
-
commonObj.unit = unit;
|
|
150
|
-
}
|
|
151
152
|
await (forceMode
|
|
152
153
|
? this.adapter.setObject(stateName, { type: "state", common: commonObj, native: {} })
|
|
153
154
|
: this.adapter.setObjectNotExistsAsync(stateName, { type: "state", common: commonObj, native: {} }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectUtils.js","sourceRoot":"","sources":["../../src/lib/projectUtils.ts"],"names":[],"mappings":";;;AAoBA,wDAcC;AAhCD,IAAY,UAWX;AAXD,WAAY,UAAU;IACrB,mDAAY,CAAA;IACZ,iEAAmB,CAAA;IACnB,+DAAkB,CAAA;IAClB,yDAAe,CAAA;IACf,uEAAsB,CAAA;IACtB,qEAAqB,CAAA;IACrB,uEAAsB,CAAA;IACtB,+DAAkB,CAAA;IAClB,qEAAqB,CAAA;IACrB,8EAA0B,CAAA;AAC3B,CAAC,EAXW,UAAU,0BAAV,UAAU,QAWrB;AAOD,SAAgB,sBAAsB,CAAC,QAAoB;IAC1D,MAAM,YAAY,GAA+B;QAChD,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,WAAW;QAClC,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,mBAAmB;QACjD,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,kBAAkB;QAC/C,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,eAAe;QACzC,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,uBAAuB;QACxD,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,sBAAsB;QACtD,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,sBAAsB;QACvD,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,iBAAiB;QAC9C,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,qBAAqB;QACrD,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,0BAA0B;KAC9D,CAAC;IACF,OAAO,YAAY,CAAC,QAAQ,CAAC,IAAI,SAAS,CAAC;AAC5C,CAAC;AAqBD,MAAa,YAAY;IACxB,OAAO,CAAwB;IAO/B,YAAY,OAA8B;QACzC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;IAQS,KAAK,CAAC,aAAa,CAAC,SAAiB;QAC9C,IAAI,CAAC;YACJ,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACnD,OAAO,WAAW,EAAE,GAAG,IAAI,IAAI,CAAC;QACjC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,SAAS,MAAM,KAAK,EAAE,CAAC,CAAC;YAClE,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;IAQO,KAAK,CAAC,QAAQ,CAAC,SAAiB;QACvC,IAAI,CAAC;YACJ,IAAI,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,EAAE,CAAC;gBAEhD,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;gBACrE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAAE,CAAC;oBACzC,OAAO,gBAAgB,CAAC;gBACzB,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,uCAAuC,SAAS,IAAI,CAAC,CAAC;YACvE,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,SAAS,MAAM,KAAK,EAAE,CAAC,CAAC;YAClE,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;IAQO,KAAK,CAAC,oBAAoB,CAAC,SAAiB;QACnD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,EAAE,CAAC;YAClB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,0BAA0B,SAAS,0BAA0B,CAAC,CAAC;YACtF,OAAO,KAAK,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IASD,KAAK,CAAC,uBAAuB,CAAC,SAAiB;QAC9C,IAAI,CAAC;YACJ,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;YAC/D,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;gBACzB,OAAO,IAAI,CAAC;YACb,CAAC;YACD,OAAO,WAAW,CAAC,GAAG,CAAC;QACxB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,+BAA+B,SAAS,MAAM,KAAK,EAAE,CAAC,CAAC;YAC9E,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;IAQO,KAAK,CAAC,oBAAoB,CAAC,SAAiB;QACnD,IAAI,CAAC;YACJ,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;YACxE,IAAI,CAAC,WAAW,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CAAC,UAAU,SAAS,mBAAmB,CAAC,CAAC;YACzD,CAAC;iBAAM,CAAC;gBAEP,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;gBAC5E,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAAE,CAAC;oBACzC,OAAO,gBAAgB,CAAC;gBACzB,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,uCAAuC,SAAS,IAAI,CAAC,CAAC;YACvE,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,0BAA0B,SAAS,MAAM,KAAK,EAAE,CAAC,CAAC;YACzE,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;IAWO,WAAW,CAAC,QAA2C;QAC9D,IAAI,OAAO,QAAQ,KAAK,WAAW,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YAC1D,IAAI,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YACrC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAClC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACjC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACjC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAClC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAClC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAClC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAClC,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;gBAClB,OAAO,KAAK,CAAC;YACd,CAAC;YACD,OAAO,IAAI,CAAC;QACb,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAcS,KAAK,CAAC,gBAAgB,CAC/B,SAAiB,EACjB,KAAa,EACb,WAAW,GAAG,GAAG,EACjB,IAAI,GAAG,MAAM,EACb,SAAS,GAAG,KAAK,EACjB,UAAU,GAAG,KAAK,EAClB,SAAS,GAAG,KAAK;QAEjB,IAAI,KAAK,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC;YAC3B,MAAM,SAAS,GAAyB;gBACvC,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,SAAS;gBAC7C,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,SAAS;aAChB,CAAC;YACF,MAAM,CAAC,SAAS;gBACf,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;gBACrF,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;YAEtG,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;gBACnE,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;YACnE,CAAC;QACF,CAAC;IACF,CAAC;
|
|
1
|
+
{"version":3,"file":"projectUtils.js","sourceRoot":"","sources":["../../src/lib/projectUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,7 +70,7 @@ class TibberAPICaller extends projectUtils_js_1.ProjectUtils {
|
|
|
70
70
|
exDateCurrent = new Date(await this.getStateValue(`Homes.${homeId}.CurrentPrice.startsAt`));
|
|
71
71
|
pricesToday = JSON.parse(await this.getStateValue(`Homes.${homeId}.PricesToday.json`));
|
|
72
72
|
}
|
|
73
|
-
if (Array.isArray(pricesToday) && pricesToday[2]
|
|
73
|
+
if (Array.isArray(pricesToday) && pricesToday[2]?.startsAt) {
|
|
74
74
|
const exDateToday = new Date(pricesToday[2].startsAt);
|
|
75
75
|
if (now.getDate == exDateToday.getDate) {
|
|
76
76
|
this.fetchPriceRemainingAverage(homeId, `PricesToday.averageRemaining`, pricesToday);
|
|
@@ -131,14 +131,14 @@ class TibberAPICaller extends projectUtils_js_1.ProjectUtils {
|
|
|
131
131
|
if (!forceUpdate) {
|
|
132
132
|
exPricesToday = JSON.parse(await this.getStateValue(`Homes.${homeId}.PricesToday.json`));
|
|
133
133
|
}
|
|
134
|
-
if (Array.isArray(exPricesToday) && exPricesToday[2]
|
|
134
|
+
if (Array.isArray(exPricesToday) && exPricesToday[2]?.startsAt) {
|
|
135
135
|
exDate = new Date(exPricesToday[2].startsAt);
|
|
136
136
|
}
|
|
137
137
|
const today = new Date();
|
|
138
138
|
today.setHours(0, 0, 0, 0);
|
|
139
139
|
if (!exDate || exDate <= today || forceUpdate) {
|
|
140
140
|
const pricesToday = await this.tibberQuery.getTodaysEnergyPrices(homeId);
|
|
141
|
-
if (!(Array.isArray(pricesToday) && pricesToday.length > 0 && pricesToday[2]
|
|
141
|
+
if (!(Array.isArray(pricesToday) && pricesToday.length > 0 && pricesToday[2]?.total)) {
|
|
142
142
|
throw new Error(`Got invalid data structure from Tibber [you might not have a valid (or fully confirmed) contract]`);
|
|
143
143
|
}
|
|
144
144
|
this.adapter.log.debug(`Got prices today from tibber api: ${JSON.stringify(pricesToday)} Force: ${forceUpdate}`);
|
|
@@ -152,7 +152,7 @@ class TibberAPICaller extends projectUtils_js_1.ProjectUtils {
|
|
|
152
152
|
const hour = new Date(price.startsAt.substr(0, 19)).getHours();
|
|
153
153
|
await this.fetchPrice(homeId, `PricesToday.${hour}`, price);
|
|
154
154
|
}
|
|
155
|
-
if (Array.isArray(pricesToday) && pricesToday[2]
|
|
155
|
+
if (Array.isArray(pricesToday) && pricesToday[2]?.startsAt) {
|
|
156
156
|
void this.checkAndSetValue(`Homes.${homeId}.PricesToday.jsonBYpriceASC`, JSON.stringify(pricesToday.sort((a, b) => a.total - b.total)), "prices sorted by cost ascending as json");
|
|
157
157
|
exDate = new Date(pricesToday[2].startsAt);
|
|
158
158
|
if (exDate && exDate >= today) {
|
|
@@ -203,7 +203,7 @@ class TibberAPICaller extends projectUtils_js_1.ProjectUtils {
|
|
|
203
203
|
if (!forceUpdate) {
|
|
204
204
|
exPricesTomorrow = JSON.parse(await this.getStateValue(`Homes.${homeId}.PricesTomorrow.json`));
|
|
205
205
|
}
|
|
206
|
-
if (Array.isArray(exPricesTomorrow) && exPricesTomorrow[2]
|
|
206
|
+
if (Array.isArray(exPricesTomorrow) && exPricesTomorrow[2]?.startsAt) {
|
|
207
207
|
exDate = new Date(exPricesTomorrow[2].startsAt);
|
|
208
208
|
}
|
|
209
209
|
const morgen = new Date();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tibberAPICaller.js","sourceRoot":"","sources":["../../src/lib/tibberAPICaller.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tibberAPICaller.js","sourceRoot":"","sources":["../../src/lib/tibberAPICaller.ts"],"names":[],"mappings":";;;AACA,2CAAuD;AAMvD,6FAAuF;AACvF,uDAAiE;AAKjE,MAAa,eAAgB,SAAQ,8BAAY;IAChD,YAAY,CAAU;IACtB,WAAW,CAAc;IAQzB,YAAY,YAAqB,EAAE,OAA8B;QAChE,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,WAAW,GAAG,IAAI,wBAAW,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;IAC9D,CAAC;IAKD,KAAK,CAAC,kBAAkB;QACvB,IAAI,CAAC;YACJ,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;YAChD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC9E,MAAM,YAAY,GAAgB,EAAE,CAAC;YACrC,KAAK,MAAM,WAAW,IAAI,KAAK,EAAE,CAAC;gBACjC,YAAY,CAAC,IAAI,CAAC;oBACjB,EAAE,EAAE,WAAW,CAAC,EAAE;oBAClB,SAAS,EAAE,WAAW,CAAC,WAAW;oBAClC,QAAQ,EAAE,WAAW,CAAC,QAAQ,CAAC,0BAA0B;oBACzD,UAAU,EAAE,KAAK;oBACjB,mBAAmB,EAAE,IAAI;iBACzB,CAAC,CAAC;gBAEH,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,WAAW,CAAC,EAAE,CAAC;gBAE1C,MAAM,QAAQ,GAAG,SAAS,WAAW,CAAC,EAAE,EAAE,CAAC;gBAE3C,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,aAAa,EAAE,WAAW,CAAC,EAAE,EAAE,iBAAiB,CAAC,CAAC;gBACxF,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,mBAAmB,EAAE,WAAW,CAAC,QAAQ,EAAE,mCAAmC,CAAC,CAAC;gBACtH,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,oBAAoB,EAAE,WAAW,CAAC,WAAW,EAAE,gCAAgC,CAAC,CAAC;gBACvH,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,sBAAsB,EAAE,WAAW,CAAC,SAAS,EAAE,oCAAoC,CAAC,CAAC;gBAE3H,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,eAAe,EAAE,WAAW,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;gBAE9F,KAAK,IAAI,CAAC,gBAAgB,CACzB,GAAG,QAAQ,+BAA+B,EAC1C,WAAW,CAAC,oBAAoB,EAChC,yCAAyC,CACzC,CAAC;gBAEF,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,eAAe,EAAE,WAAW,CAAC,IAAI,EAAE,uCAAuC,CAAC,CAAC;gBACxH,KAAK,IAAI,CAAC,sBAAsB,CAC/B,GAAG,QAAQ,4BAA4B,EACvC,WAAW,CAAC,iBAAiB,EAC7B,yCAAyC,CACzC,CAAC;gBACF,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,uBAAuB,EAAE,WAAW,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;gBACrH,KAAK,IAAI,CAAC,uBAAuB,CAChC,GAAG,QAAQ,+BAA+B,EAC1C,WAAW,CAAC,oBAAoB,EAChC,2CAA2C,CAC3C,CAAC;gBAEF,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;gBAClE,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,EAAE,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;gBAElE,KAAK,IAAI,CAAC,uBAAuB,CAChC,GAAG,QAAQ,sCAAsC,EACjD,WAAW,CAAC,QAAQ,CAAC,0BAA0B,EAC/C,yDAAyD,CACzD,CAAC;YACH,CAAC;YACD,OAAO,YAAY,CAAC;QACrB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,gCAAgC,CAAC,CAAC,CAAC;YAC3F,OAAO,EAAE,CAAC;QACX,CAAC;IACF,CAAC;IASD,KAAK,CAAC,0BAA0B,CAAC,YAAyB,EAAE,WAAW,GAAG,KAAK;QAC9E,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;YACxC,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC;gBACtC,SAAS;YACV,CAAC;YACD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC;gBACnE,OAAO,GAAG,KAAK,CAAC;YACjB,CAAC;QACF,CAAC;QACD,OAAO,OAAO,CAAC;IAChB,CAAC;IAQO,KAAK,CAAC,kBAAkB,CAAC,MAAc,EAAE,WAAW,GAAG,KAAK;QACnE,IAAI,CAAC;YACJ,IAAI,MAAM,EAAE,CAAC;gBACZ,IAAI,aAAa,GAAgB,IAAI,CAAC;gBACtC,IAAI,WAAW,GAAa,EAAE,CAAC;gBAC/B,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,IAAI,CAAC,WAAW,EAAE,CAAC;oBAClB,aAAa,GAAG,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,MAAM,wBAAwB,CAAC,CAAC,CAAC;oBAC5F,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,MAAM,mBAAmB,CAAC,CAAC,CAAC;gBACxF,CAAC;gBAED,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC;oBAC5D,MAAM,WAAW,GAAS,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;oBAC5D,IAAI,GAAG,CAAC,OAAO,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;wBACxC,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE,8BAA8B,EAAE,WAAW,CAAC,CAAC;oBACtF,CAAC;gBACF,CAAC;gBAED,IAAI,CAAC,aAAa,IAAI,GAAG,CAAC,QAAQ,EAAE,KAAK,aAAa,CAAC,QAAQ,EAAE,IAAI,WAAW,EAAE,CAAC;oBAClF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;oBAC1E,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;oBAC5D,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,sCAAsC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,WAAW,WAAW,EAAE,CAAC,CAAC;oBACnH,aAAa,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;oBAChD,IAAI,aAAa,IAAI,GAAG,CAAC,QAAQ,EAAE,KAAK,aAAa,CAAC,QAAQ,EAAE,EAAE,CAAC;wBAClE,OAAO,IAAI,CAAC;oBACb,CAAC;gBACF,CAAC;qBAAM,IAAI,GAAG,CAAC,QAAQ,EAAE,IAAI,aAAa,CAAC,QAAQ,EAAE,EAAE,CAAC;oBACvD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CACrB,SAAS,aAAa,CAAC,QAAQ,EAAE,oGAAoG,CACrI,CAAC;oBACF,OAAO,IAAI,CAAC;gBACb,CAAC;qBAAM,CAAC;oBACP,OAAO,KAAK,CAAC;gBACd,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,OAAO,KAAK,CAAC;YACd,CAAC;QACF,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACzB,IAAI,WAAW,EAAE,CAAC;gBACjB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,uBAAuB,CAAC,CAAC,CAAC;YACnF,CAAC;iBAAM,CAAC;gBACP,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,uBAAuB,CAAC,CAAC,CAAC;YAClF,CAAC;YACD,OAAO,KAAK,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IASD,KAAK,CAAC,yBAAyB,CAAC,YAAyB,EAAE,WAAW,GAAG,KAAK;QAC7E,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;YACxC,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC;gBACtC,SAAS;YACV,CAAC;YACD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC;gBAClE,OAAO,GAAG,KAAK,CAAC;YACjB,CAAC;iBAAM,CAAC;gBACP,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,KAAK,IAAI,CAAC,gBAAgB,CAAC,SAAS,WAAW,CAAC,EAAE,yBAAyB,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,6BAA6B,CAAC,CAAC;YAC7H,CAAC;QACF,CAAC;QACD,OAAO,OAAO,CAAC;IAChB,CAAC;IAQO,KAAK,CAAC,iBAAiB,CAAC,MAAc,EAAE,WAAW,GAAG,KAAK;QAClE,IAAI,CAAC;YACJ,IAAI,MAAM,GAAgB,IAAI,CAAC;YAC/B,IAAI,aAAa,GAAa,EAAE,CAAC;YACjC,IAAI,CAAC,WAAW,EAAE,CAAC;gBAClB,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,MAAM,mBAAmB,CAAC,CAAC,CAAC;YAC1F,CAAC;YACD,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC;gBAChE,MAAM,GAAG,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC9C,CAAC;YACD,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC;YACzB,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAC3B,IAAI,CAAC,MAAM,IAAI,MAAM,IAAI,KAAK,IAAI,WAAW,EAAE,CAAC;gBAC/C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;gBACzE,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC;oBACtF,MAAM,IAAI,KAAK,CAAC,mGAAmG,CAAC,CAAC;gBACtH,CAAC;gBACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,qCAAqC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,WAAW,WAAW,EAAE,CAAC,CAAC;gBACjH,KAAK,IAAI,CAAC,gBAAgB,CAAC,SAAS,MAAM,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,0BAA0B,CAAC,CAAC;gBACxH,KAAK,IAAI,CAAC,gBAAgB,CAAC,SAAS,MAAM,uBAAuB,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,8BAA8B,CAAC,CAAC;gBAClI,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,qBAAqB,EAAE,WAAW,CAAC,CAAC;gBACnE,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE,8BAA8B,EAAE,WAAW,CAAC,CAAC;gBACrF,IAAI,CAAC,iBAAiB,CACrB,MAAM,EACN,qBAAqB,EACrB,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAC7C,CAAC;gBACF,IAAI,CAAC,iBAAiB,CACrB,MAAM,EACN,qBAAqB,EACrB,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAC7C,CAAC;gBACF,KAAK,MAAM,KAAK,IAAI,WAAW,EAAE,CAAC;oBACjC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;oBAC/D,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,eAAe,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;gBAC7D,CAAC;gBACD,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC;oBAE5D,KAAK,IAAI,CAAC,gBAAgB,CACzB,SAAS,MAAM,6BAA6B,EAC5C,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAC7D,yCAAyC,CACzC,CAAC;oBACF,MAAM,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;oBAC3C,IAAI,MAAM,IAAI,MAAM,IAAI,KAAK,EAAE,CAAC;wBAC/B,OAAO,IAAI,CAAC;oBACb,CAAC;gBACF,CAAC;qBAAM,CAAC;oBAEP,KAAK,IAAI,CAAC,gBAAgB,CACzB,SAAS,MAAM,6BAA6B,EAC5C,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAC3B,yCAAyC,CACzC,CAAC;oBACF,OAAO,KAAK,CAAC;gBACd,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,oGAAoG,CAAC,CAAC;gBAC7H,OAAO,IAAI,CAAC;YACb,CAAC;QACF,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACzB,IAAI,WAAW,EAAE,CAAC;gBACjB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,4BAA4B,CAAC,CAAC,CAAC;YACxF,CAAC;iBAAM,CAAC;gBACP,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,sBAAsB,CAAC,CAAC,CAAC;YACjF,CAAC;YACD,OAAO,KAAK,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IASD,KAAK,CAAC,4BAA4B,CAAC,YAAyB,EAAE,WAAW,GAAG,KAAK;QAChF,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;YACxC,IAAI,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC;gBACtC,SAAS;YACV,CAAC;YACD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC;gBACrE,OAAO,GAAG,KAAK,CAAC;YACjB,CAAC;iBAAM,CAAC;gBACP,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,KAAK,IAAI,CAAC,gBAAgB,CAAC,SAAS,WAAW,CAAC,EAAE,4BAA4B,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,gCAAgC,CAAC,CAAC;YACnI,CAAC;QACF,CAAC;QACD,OAAO,OAAO,CAAC;IAChB,CAAC;IAQO,KAAK,CAAC,oBAAoB,CAAC,MAAc,EAAE,WAAW,GAAG,KAAK;QACrE,IAAI,CAAC;YACJ,IAAI,MAAM,GAAgB,IAAI,CAAC;YAC/B,IAAI,gBAAgB,GAAa,EAAE,CAAC;YACpC,IAAI,CAAC,WAAW,EAAE,CAAC;gBAClB,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,MAAM,sBAAsB,CAAC,CAAC,CAAC;YAChG,CAAC;YACD,IAAI,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,gBAAgB,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC;gBACtE,MAAM,GAAG,IAAI,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YACjD,CAAC;YACD,MAAM,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YAC1B,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;YACrC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAC5B,IAAI,CAAC,MAAM,IAAI,MAAM,GAAG,MAAM,IAAI,WAAW,EAAE,CAAC;gBAC/C,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;gBAC/E,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,wCAAwC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,WAAW,WAAW,EAAE,CAAC,CAAC;gBACvH,KAAK,IAAI,CAAC,gBAAgB,CAAC,SAAS,MAAM,sBAAsB,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,6BAA6B,CAAC,CAAC;gBACjI,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAEjC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,0EAA0E,CAAC,CAAC;oBACnG,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC;wBACtC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,kBAAkB,IAAI,EAAE,CAAC,CAAC;oBACtD,CAAC;oBACD,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;oBAC5D,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;oBAC5D,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;oBAC5D,KAAK,IAAI,CAAC,gBAAgB,CACzB,SAAS,MAAM,gCAAgC,EAC/C,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,EAC9B,yCAAyC,CACzC,CAAC;oBACF,OAAO,KAAK,CAAC;gBACd,CAAC;qBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;oBAE1C,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE,CAAC;wBACpC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;wBAC/D,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,kBAAkB,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;oBAChE,CAAC;oBACD,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,wBAAwB,EAAE,cAAc,CAAC,CAAC;oBACzE,IAAI,CAAC,iBAAiB,CACrB,MAAM,EACN,wBAAwB,EACxB,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAChD,CAAC;oBACF,IAAI,CAAC,iBAAiB,CACrB,MAAM,EACN,wBAAwB,EACxB,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAChD,CAAC;oBACF,KAAK,IAAI,CAAC,gBAAgB,CACzB,SAAS,MAAM,gCAAgC,EAC/C,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAChE,yCAAyC,CACzC,CAAC;oBACF,MAAM,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;oBAC9C,IAAI,MAAM,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;wBAChC,OAAO,IAAI,CAAC;oBACb,CAAC;oBACD,OAAO,KAAK,CAAC;gBACd,CAAC;YACF,CAAC;iBAAM,IAAI,MAAM,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;gBACvC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,0GAA0G,CAAC,CAAC;gBACnI,OAAO,IAAI,CAAC;YACb,CAAC;YACD,OAAO,KAAK,CAAC;QACd,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACzB,IAAI,WAAW,EAAE,CAAC;gBACjB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,+BAA+B,CAAC,CAAC,CAAC;YAC3F,CAAC;iBAAM,CAAC;gBACP,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,CAAC,CAAC,CAAC;YACpF,CAAC;YACD,OAAO,KAAK,CAAC;QACd,CAAC;IACF,CAAC;IAOD,KAAK,CAAC,yBAAyB;QAC9B,IAAI,CAAC;YACJ,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;gBAClD,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;oBACvC,SAAS;gBACV,CAAC;gBACD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;gBAC3B,MAAM,WAAW,GAAG;oBACnB,EAAE,IAAI,EAAE,sCAAgB,CAAC,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,WAAW,EAAE,MAAM,EAAE;oBAC3G,EAAE,IAAI,EAAE,sCAAgB,CAAC,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,WAAW,EAAE,KAAK,EAAE;oBACvG,EAAE,IAAI,EAAE,sCAAgB,CAAC,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,WAAW,EAAE,MAAM,EAAE;oBAC3G,EAAE,IAAI,EAAE,sCAAgB,CAAC,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,WAAW,EAAE,OAAO,EAAE;oBAC/G,EAAE,IAAI,EAAE,sCAAgB,CAAC,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,WAAW,EAAE,MAAM,EAAE;iBAC3G,CAAC;gBACF,KAAK,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,WAAW,EAAE,CAAC;oBACjE,IAAI,OAAO,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;wBAS5B,MAAM,WAAW,GAAmB,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;wBAEjG,KAAK,IAAI,CAAC,gBAAgB,CACzB,SAAS,MAAM,gBAAgB,KAAK,EAAE,EACtC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAC3B,+BAA+B,WAAW,YAAY,EACtD,MAAM,CACN,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACP,KAAK,IAAI,CAAC,gBAAgB,CAAC,SAAS,MAAM,gBAAgB,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC;oBAC1E,CAAC;gBACF,CAAC;gBACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,yDAAyD,MAAM,EAAE,CAAC,CAAC;YAC3F,CAAC;QACF,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACzB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,0BAA0B,CAAC,CAAC,CAAC;QACtF,CAAC;IACF,CAAC;IAUO,KAAK,CAAC,UAAU,CAAC,MAAc,EAAE,iBAAyB,EAAE,KAAa;QAChF,MAAM,QAAQ,GAAG,SAAS,MAAM,IAAI,iBAAiB,EAAE,CAAC;QACxD,MAAM,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,QAAQ,EAAE,KAAK,CAAC,KAAK,EAAE,8BAA8B,CAAC,CAAC;QACpG,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,SAAS,EAAE,KAAK,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC;QAChG,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,MAAM,EAAE,KAAK,CAAC,GAAG,EAAE,6CAA6C,CAAC,CAAC;QAC9G,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,WAAW,EAAE,KAAK,CAAC,QAAQ,EAAE,yBAAyB,CAAC,CAAC;QAE9F,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,QAAQ,EAAE,KAAK,CAAC,KAAK,EAAE,6CAA6C,CAAC,CAAC;IAC7G,CAAC;IAEO,iBAAiB,CAAC,MAAc,EAAE,iBAAyB,EAAE,KAAe;QACnF,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YAC3C,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC5C,OAAO,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC;YACzB,CAAC;YACD,OAAO,GAAG,CAAC;QACZ,CAAC,EAAE,CAAC,CAAC,CAAC;QAEN,MAAM,QAAQ,GAAG,SAAS,MAAM,IAAI,iBAAiB,EAAE,CAAC;QACxD,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,EAAE,4BAA4B,CAAC,CAAC;QACzI,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACpE,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,EAAE,iCAAiC,CAAC,CAAC;QAChJ,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAC9D,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,EAAE,0BAA0B,CAAC,CAAC;IACpI,CAAC;IACO,0BAA0B,CAAC,MAAc,EAAE,iBAAyB,EAAE,KAAe;QAC5F,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,WAAW,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;QAEnC,MAAM,cAAc,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YAC1C,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;YACpD,OAAO,QAAQ,IAAI,WAAW,CAAC;QAChC,CAAC,CAAC,CAAC;QAEH,MAAM,iBAAiB,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YAC7D,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC5C,OAAO,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC;YACzB,CAAC;YACD,OAAO,GAAG,CAAC;QACZ,CAAC,EAAE,CAAC,CAAC,CAAC;QACN,MAAM,QAAQ,GAAG,SAAS,MAAM,IAAI,iBAAiB,EAAE,CAAC;QACxD,KAAK,IAAI,CAAC,sBAAsB,CAC/B,GAAG,QAAQ,QAAQ,EACnB,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,iBAAiB,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,EACrE,sCAAsC,CACtC,CAAC;QACF,MAAM,kBAAkB,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACtF,KAAK,IAAI,CAAC,sBAAsB,CAC/B,GAAG,QAAQ,SAAS,EACpB,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,kBAAkB,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,EACtE,4CAA4C,CAC5C,CAAC;QACF,MAAM,eAAe,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAChF,KAAK,IAAI,CAAC,sBAAsB,CAC/B,GAAG,QAAQ,MAAM,EACjB,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,eAAe,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,EACnE,oCAAoC,CACpC,CAAC;IACH,CAAC;IAEO,iBAAiB,CAAC,MAAc,EAAE,iBAAyB,EAAE,KAAe;QACnF,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QAGpD,CAAC;QACD,MAAM,QAAQ,GAAG,SAAS,MAAM,IAAI,iBAAiB,EAAE,CAAC;QACxD,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI,EAAE,4BAA4B,CAAC,CAAC;QAC/H,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,gDAAgD,CAAC,CAAC;QACrJ,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,yCAAyC,CAAC,CAAC;QACxI,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,6CAA6C,CAAC,CAAC;QAChH,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,iCAAiC,CAAC,CAAC;IAC3G,CAAC;IACO,iBAAiB,CAAC,MAAc,EAAE,iBAAyB,EAAE,KAAe;QACnF,MAAM,QAAQ,GAAG,SAAS,MAAM,IAAI,iBAAiB,EAAE,CAAC;QACxD,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI,EAAE,4BAA4B,CAAC,CAAC;QAC9H,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,gDAAgD,CAAC,CAAC;QACpJ,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,yCAAyC,CAAC,CAAC;QACvI,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,6CAA6C,CAAC,CAAC;QAC/G,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,iCAAiC,CAAC,CAAC;IAC1G,CAAC;IAEO,aAAa,CAAC,MAAc,EAAE,iBAAyB;QAC9D,MAAM,QAAQ,GAAG,SAAS,MAAM,IAAI,iBAAiB,EAAE,CAAC;QACxD,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,QAAQ,EAAE,CAAC,EAAE,kCAAkC,CAAC,CAAC;QAC7F,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,SAAS,EAAE,CAAC,EAAE,kBAAkB,CAAC,CAAC;QAC9E,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,MAAM,EAAE,CAAC,EAAE,+CAA+C,CAAC,CAAC;QACxG,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,QAAQ,EAAE,eAAe,EAAE,6CAA6C,CAAC,CAAC;IACjH,CAAC;IACO,oBAAoB,CAAC,MAAc,EAAE,iBAAyB;QACrE,MAAM,QAAQ,GAAG,SAAS,MAAM,IAAI,iBAAiB,EAAE,CAAC;QACxD,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,QAAQ,EAAE,CAAC,EAAE,gCAAgC,CAAC,CAAC;QAC3F,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,SAAS,EAAE,CAAC,EAAE,qCAAqC,CAAC,CAAC;QACjG,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,MAAM,EAAE,CAAC,EAAE,8BAA8B,CAAC,CAAC;IACxF,CAAC;IACO,oBAAoB,CAAC,MAAc,EAAE,iBAAyB;QACrE,MAAM,QAAQ,GAAG,SAAS,MAAM,IAAI,iBAAiB,EAAE,CAAC;QACxD,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,QAAQ,EAAE,CAAC,EAAE,4BAA4B,CAAC,CAAC;QACvF,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,SAAS,EAAE,CAAC,EAAE,gDAAgD,CAAC,CAAC;QAC5G,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,MAAM,EAAE,CAAC,EAAE,yCAAyC,CAAC,CAAC;QAClG,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,QAAQ,EAAE,eAAe,EAAE,6CAA6C,CAAC,CAAC;QAChH,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,WAAW,EAAE,eAAe,EAAE,iCAAiC,CAAC,CAAC;IACxG,CAAC;IACO,oBAAoB,CAAC,MAAc,EAAE,iBAAyB;QACrE,MAAM,QAAQ,GAAG,SAAS,MAAM,IAAI,iBAAiB,EAAE,CAAC;QACxD,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,QAAQ,EAAE,CAAC,EAAE,4BAA4B,CAAC,CAAC;QACvF,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,SAAS,EAAE,CAAC,EAAE,gDAAgD,CAAC,CAAC;QAC5G,KAAK,IAAI,CAAC,sBAAsB,CAAC,GAAG,QAAQ,MAAM,EAAE,CAAC,EAAE,yCAAyC,CAAC,CAAC;QAClG,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,QAAQ,EAAE,eAAe,EAAE,6CAA6C,CAAC,CAAC;QAChH,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,WAAW,EAAE,eAAe,EAAE,iCAAiC,CAAC,CAAC;IACxG,CAAC;IAEO,gBAAgB,CAAC,MAAc,EAAE,iBAAyB,EAAE,WAAyB;QAC5F,MAAM,QAAQ,GAAG,SAAS,MAAM,IAAI,iBAAiB,EAAE,CAAC;QACxD,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,KAAK,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;QAC7D,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;QAC3E,KAAK,IAAI,CAAC,uBAAuB,CAAC,GAAG,QAAQ,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;QAClF,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,OAAO,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;QACjE,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,aAAa,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;QAC7E,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,WAAW,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;QACzE,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,iBAAiB,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;QACrF,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,WAAW,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;QACzE,IAAI,WAAW,CAAC,WAAW,EAAE,CAAC;YAC7B,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,iBAAiB,cAAc,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC;QAC5F,CAAC;QACD,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACzB,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,GAAG,iBAAiB,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;QAChF,CAAC;IACF,CAAC;IACO,gBAAgB,CAAC,MAAc,EAAE,iBAAyB,EAAE,WAAyB;QAC5F,MAAM,QAAQ,GAAG,SAAS,MAAM,IAAI,iBAAiB,EAAE,CAAC;QACxD,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,QAAQ,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;QACnE,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACtE,CAAC;IACO,YAAY,CAAC,MAAc,EAAE,iBAAyB,EAAE,OAAiB;QAChF,MAAM,QAAQ,GAAG,SAAS,MAAM,IAAI,iBAAiB,EAAE,CAAC;QACxD,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QACrE,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QACrE,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QACrE,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7D,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,aAAa,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;QACzE,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACnE,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QACrE,KAAK,IAAI,CAAC,gBAAgB,CAAC,GAAG,QAAQ,YAAY,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IACxE,CAAC;CAgDD;AA5lBD,0CA4lBC"}
|
|
@@ -335,7 +335,7 @@ class TibberCalculator extends projectUtils_js_1.ProjectUtils {
|
|
|
335
335
|
}
|
|
336
336
|
async setup_chOutput(homeId, channel) {
|
|
337
337
|
const channelConfig = this.adapter.config.CalculatorList[channel];
|
|
338
|
-
if (channelConfig?.chTargetState
|
|
338
|
+
if (channelConfig?.chTargetState?.length > 10 && !channelConfig.chTargetState.startsWith("choose your state to drive")) {
|
|
339
339
|
await this.adapter.delObjectAsync(`Homes.${homeId}.Calculations.${channel}.Output`);
|
|
340
340
|
}
|
|
341
341
|
else {
|
|
@@ -349,9 +349,7 @@ class TibberCalculator extends projectUtils_js_1.ProjectUtils {
|
|
|
349
349
|
}
|
|
350
350
|
async setup_chOutput2(homeId, channel) {
|
|
351
351
|
const channelConfig = this.adapter.config.CalculatorList[channel];
|
|
352
|
-
if (channelConfig?.chTargetState2 &&
|
|
353
|
-
channelConfig.chTargetState2.length > 10 &&
|
|
354
|
-
!channelConfig.chTargetState2.startsWith("choose your state to drive")) {
|
|
352
|
+
if (channelConfig?.chTargetState2?.length > 10 && !channelConfig.chTargetState2.startsWith("choose your state to drive")) {
|
|
355
353
|
await this.adapter.delObjectAsync(`Homes.${homeId}.Calculations.${channel}.Output2`);
|
|
356
354
|
}
|
|
357
355
|
else {
|
|
@@ -554,8 +552,7 @@ class TibberCalculator extends projectUtils_js_1.ProjectUtils {
|
|
|
554
552
|
}
|
|
555
553
|
}
|
|
556
554
|
else {
|
|
557
|
-
this.adapter.log.debug(`[tibberCalculator]: chTargetState is null or undefined in channel ${channel}. Skipping channel
|
|
558
|
-
continue;
|
|
555
|
+
this.adapter.log.debug(`[tibberCalculator]: chTargetState is null or undefined in channel ${channel}. Skipping channel output verification.`);
|
|
559
556
|
}
|
|
560
557
|
if (this.adapter.config.CalculatorList[channel].chType === projectUtils_js_1.enCalcType.SmartBatteryBuffer ||
|
|
561
558
|
this.adapter.config.CalculatorList[channel].chType === projectUtils_js_1.enCalcType.SmartBatteryBufferLTF) {
|
|
@@ -580,8 +577,7 @@ class TibberCalculator extends projectUtils_js_1.ProjectUtils {
|
|
|
580
577
|
}
|
|
581
578
|
}
|
|
582
579
|
else {
|
|
583
|
-
this.adapter.log.debug(`[tibberCalculator]: chTargetState2 is null or undefined in channel ${channel}. Skipping channel
|
|
584
|
-
continue;
|
|
580
|
+
this.adapter.log.debug(`[tibberCalculator]: chTargetState2 is null or undefined in channel ${channel}. Skipping channel output verification.`);
|
|
585
581
|
}
|
|
586
582
|
if (this.adapter.config.CalculatorList[channel].chValueOn2 == null ||
|
|
587
583
|
this.adapter.config.CalculatorList[channel].chValueOn2 === "" ||
|
|
@@ -885,7 +881,6 @@ class TibberCalculator extends projectUtils_js_1.ProjectUtils {
|
|
|
885
881
|
this.adapter.log.debug(`[tibberCalculator]: channel ${channel} SBB-type result - normal: ${normalHours.map(hour => hour.total).join(", ")}`);
|
|
886
882
|
this.adapter.log.debug(`[tibberCalculator]: channel ${channel} SBB-type result - expensive: ${expensiveHours.map(hour => hour.total).join(", ")}`);
|
|
887
883
|
const resultCheap = cheapHours.map((entry) => checkHourMatch(entry));
|
|
888
|
-
const resultExpensive = expensiveHours.map((entry) => checkHourMatch(entry));
|
|
889
884
|
const jsonOutput = filteredPrices
|
|
890
885
|
.map((entry, index) => ({
|
|
891
886
|
hour: new Date(entry.startsAt).getHours(),
|
|
@@ -896,11 +891,11 @@ class TibberCalculator extends projectUtils_js_1.ProjectUtils {
|
|
|
896
891
|
.sort((a, b) => new Date(a.startsAt).getTime() - new Date(b.startsAt).getTime());
|
|
897
892
|
void this.adapter.setState(`Homes.${channelConfig.chHomeID}.Calculations.${channel}.OutputJSON`, JSON.stringify(jsonOutput, null, 2), true);
|
|
898
893
|
const jsonOutput2 = filteredPrices
|
|
899
|
-
.map((entry
|
|
894
|
+
.map((entry) => ({
|
|
900
895
|
hour: new Date(entry.startsAt).getHours(),
|
|
901
896
|
startsAt: entry.startsAt,
|
|
902
897
|
total: entry.total,
|
|
903
|
-
output:
|
|
898
|
+
output: expensiveHours.some((expensive) => expensive.startsAt === entry.startsAt),
|
|
904
899
|
}))
|
|
905
900
|
.sort((a, b) => new Date(a.startsAt).getTime() - new Date(b.startsAt).getTime());
|
|
906
901
|
void this.adapter.setState(`Homes.${channelConfig.chHomeID}.Calculations.${channel}.OutputJSON2`, JSON.stringify(jsonOutput2, null, 2), true);
|
|
@@ -942,9 +937,9 @@ class TibberCalculator extends projectUtils_js_1.ProjectUtils {
|
|
|
942
937
|
}
|
|
943
938
|
}
|
|
944
939
|
}
|
|
945
|
-
this.adapter.log.debug(`[tibberCalculator]: channel ${channel} SBB-type result - cheap
|
|
946
|
-
this.adapter.log.debug(`[tibberCalculator]: channel ${channel} SBB-type result - normal
|
|
947
|
-
this.adapter.log.debug(`[tibberCalculator]: channel ${channel} SBB-type result - expensive
|
|
940
|
+
this.adapter.log.debug(`[tibberCalculator]: channel ${channel} SBB-type result - cheap prices: ${cheapHours.map(hour => hour.total).join(", ")}`);
|
|
941
|
+
this.adapter.log.debug(`[tibberCalculator]: channel ${channel} SBB-type result - normal prices: ${normalHours.map(hour => hour.total).join(", ")}`);
|
|
942
|
+
this.adapter.log.debug(`[tibberCalculator]: channel ${channel} SBB-type result - expensive prices: ${expensiveHours.map(hour => hour.total).join(", ")}`);
|
|
948
943
|
const resultCheap = cheapHours.map((entry) => checkHourMatch(entry));
|
|
949
944
|
const resultNormal = normalHours.map((entry) => checkHourMatch(entry));
|
|
950
945
|
const resultExpensive = expensiveHours.map((entry) => checkHourMatch(entry));
|
|
@@ -973,11 +968,11 @@ class TibberCalculator extends projectUtils_js_1.ProjectUtils {
|
|
|
973
968
|
.sort((a, b) => new Date(a.startsAt).getTime() - new Date(b.startsAt).getTime());
|
|
974
969
|
void this.adapter.setState(`Homes.${channelConfig.chHomeID}.Calculations.${channel}.OutputJSON`, JSON.stringify(jsonOutput, null, 2), true);
|
|
975
970
|
const jsonOutput2 = filteredPrices
|
|
976
|
-
.map((entry
|
|
971
|
+
.map((entry) => ({
|
|
977
972
|
hour: new Date(entry.startsAt).getHours(),
|
|
978
973
|
startsAt: entry.startsAt,
|
|
979
974
|
total: entry.total,
|
|
980
|
-
output:
|
|
975
|
+
output: expensiveHours.some((expensive) => expensive.startsAt === entry.startsAt),
|
|
981
976
|
}))
|
|
982
977
|
.sort((a, b) => new Date(a.startsAt).getTime() - new Date(b.startsAt).getTime());
|
|
983
978
|
void this.adapter.setState(`Homes.${channelConfig.chHomeID}.Calculations.${channel}.OutputJSON2`, JSON.stringify(jsonOutput2, null, 2), true);
|
|
@@ -1050,7 +1045,7 @@ class TibberCalculator extends projectUtils_js_1.ProjectUtils {
|
|
|
1050
1045
|
setChannelOutStates(channel, valueToSet, valueToSet2 = `EMPTY`) {
|
|
1051
1046
|
let sOutState = ``;
|
|
1052
1047
|
const channelConfig = this.adapter.config.CalculatorList[channel];
|
|
1053
|
-
if (channelConfig?.chTargetState
|
|
1048
|
+
if (channelConfig?.chTargetState?.length > 10 && !channelConfig.chTargetState.startsWith("choose your state to drive")) {
|
|
1054
1049
|
sOutState = channelConfig.chTargetState;
|
|
1055
1050
|
void this.adapter.setForeignStateAsync(sOutState, convertValue(valueToSet));
|
|
1056
1051
|
}
|
|
@@ -1061,9 +1056,7 @@ class TibberCalculator extends projectUtils_js_1.ProjectUtils {
|
|
|
1061
1056
|
this.adapter.log.debug(`[tibberCalculator]: channel ${channel} - ${(0, projectUtils_js_1.getCalcTypeDescription)(channelConfig.chType)}; setting state: ${sOutState} to ${valueToSet}`);
|
|
1062
1057
|
if (valueToSet2 != `EMPTY`) {
|
|
1063
1058
|
sOutState = ``;
|
|
1064
|
-
if (channelConfig?.chTargetState2 &&
|
|
1065
|
-
channelConfig.chTargetState2.length > 10 &&
|
|
1066
|
-
!channelConfig.chTargetState2.startsWith("choose your state to drive")) {
|
|
1059
|
+
if (channelConfig?.chTargetState2?.length > 10 && !channelConfig.chTargetState2.startsWith("choose your state to drive")) {
|
|
1067
1060
|
sOutState = channelConfig.chTargetState2;
|
|
1068
1061
|
void this.adapter.setForeignStateAsync(sOutState, convertValue(valueToSet2));
|
|
1069
1062
|
}
|