iobroker.tibberlink 1.3.1 → 1.4.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 +6 -0
- package/admin/i18n/de/translations.json +0 -8
- package/admin/i18n/en/translations.json +0 -8
- package/admin/i18n/es/translations.json +0 -8
- package/admin/i18n/fr/translations.json +0 -8
- package/admin/i18n/it/translations.json +0 -8
- package/admin/i18n/nl/translations.json +0 -8
- package/admin/i18n/pl/translations.json +0 -8
- package/admin/i18n/pt/translations.json +0 -8
- package/admin/i18n/ru/translations.json +0 -8
- package/admin/i18n/uk/translations.json +0 -8
- package/admin/i18n/zh-cn/translations.json +0 -8
- package/admin/jsonConfig.json +105 -9
- package/build/lib/tibberAPICaller.js +43 -9
- package/build/lib/tibberAPICaller.js.map +1 -1
- package/build/lib/tibberCalculator.js +17 -3
- package/build/lib/tibberCalculator.js.map +1 -1
- package/build/lib/tibberHelper.js +16 -23
- package/build/lib/tibberHelper.js.map +1 -1
- package/build/lib/tibberPulse.js +5 -5
- package/build/lib/tibberPulse.js.map +1 -1
- package/build/main.js +28 -49
- package/build/main.js.map +1 -1
- package/io-package.json +14 -14
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -54,6 +54,12 @@ This adapter employs Sentry libraries to automatically report exceptions and cod
|
|
|
54
54
|
|
|
55
55
|
! Note that missing version entries are typically dependency updates for improved security.
|
|
56
56
|
|
|
57
|
+
### 1.4.0 (2023-10-24)
|
|
58
|
+
|
|
59
|
+
- (HombachC) implement min/max states (#131)
|
|
60
|
+
- (HombachC) fix error with ignored calculator channel deaktivations (#143)
|
|
61
|
+
- (HombachC) optimize translation handling, code cleanup
|
|
62
|
+
|
|
57
63
|
### 1.3.1 (2023-10-21)
|
|
58
64
|
|
|
59
65
|
- (HombachC) fix initialisiation of channel states (#141)
|
|
@@ -1,13 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"s_StandardSettings": "Standard-Einstellungen",
|
|
3
|
-
"s_ReferalLink": "Wenn Sie derzeit kein Tibber-Benutzer sind, würden ich es sehr schätzen, wenn Sie meinen Empfehlungslink verwenden.",
|
|
4
|
-
"s_TibberAPIToken": "Token für die Tibber-API",
|
|
5
|
-
"s_HomesFeedTable": "Konfiguration der Pulse-Live-Datenströme",
|
|
6
2
|
"s_Home": "Tibber Zuhause",
|
|
7
|
-
"s_PulseActive": "Tibber Pulse für dieses Zuhause verwenden",
|
|
8
|
-
"s_SelectFieldsForFeed": "Wählen Sie alle Felder aus, die Sie in den Feed-Daten laden möchten (Leistung und Zeitstempel sind Standard):",
|
|
9
|
-
"s_PhasesExplanation": "Spannungs- und Stromwerte - auf mehreren Zählern sind diese Werte nicht Teil des Datenrahmens, daher können die Werte null sein. Es können andere Abweichungen aufgrund der konkreten Zähler-Firmware auftreten. Nullwerte generieren überhaupt keinen Status in Ihren ioBroker-Objekten.",
|
|
10
|
-
"s_CalculatorSettings": "Automatisierungs-Einstellungen",
|
|
11
3
|
"s_CalculatorChannels": "Automatisierungs-Kanäle",
|
|
12
4
|
"s_UseCalculator": "Automatisierung verwenden",
|
|
13
5
|
"s_ChannelHome": "Kanal Zuhause",
|
|
@@ -1,13 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"s_StandardSettings": "Standard settings",
|
|
3
|
-
"s_ReferalLink": "If you're not a Tibber user right now, it's greatly appreciated when you're using my reveral link.",
|
|
4
|
-
"s_TibberAPIToken": "token for Tibber api",
|
|
5
|
-
"s_HomesFeedTable": "Configuration of Pulse live data streams",
|
|
6
2
|
"s_Home": "Tibber Home",
|
|
7
|
-
"s_PulseActive": "use Tibber pulse for this home",
|
|
8
|
-
"s_SelectFieldsForFeed": "Select all fields you want to load in feed data (power and timestamp are default):",
|
|
9
|
-
"s_PhasesExplanation": "Voltage and current values - on several meters these values are not part of the data frame, therefore the values might be null. There can be other deviations based on concrete meter firmware. Null values won't generate a state in your ioBroker objects at all.",
|
|
10
|
-
"s_CalculatorSettings": "Calculator settings",
|
|
11
3
|
"s_CalculatorChannels": "Calculator Channels",
|
|
12
4
|
"s_UseCalculator": "Use Calculator",
|
|
13
5
|
"s_ChannelHome": "Channel Home",
|
|
@@ -1,13 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"s_StandardSettings": "Configuración estándar",
|
|
3
|
-
"s_ReferalLink": "Si en este momento no eres un usuario de Tibber, te agradecemos mucho si usas nuestro enlace de referencia.",
|
|
4
|
-
"s_TibberAPIToken": "Token para la API de Tibber",
|
|
5
|
-
"s_HomesFeedTable": "Configuración de los flujos de datos en vivo de Pulse",
|
|
6
2
|
"s_Home": "Casa Tibber",
|
|
7
|
-
"s_PulseActive": "Usar Tibber Pulse para esta casa",
|
|
8
|
-
"s_SelectFieldsForFeed": "Selecciona todos los campos que deseas cargar en los datos del feed (la potencia y la marca de tiempo son los valores predeterminados):",
|
|
9
|
-
"s_PhasesExplanation": "Valores de voltaje y corriente - en varios medidores, estos valores no forman parte del marco de datos, por lo que los valores pueden ser nulos. Puede haber otras desviaciones basadas en el firmware del medidor concreto. Los valores nulos no generarán un estado en tus objetos ioBroker.",
|
|
10
|
-
"s_CalculatorSettings": "Configuración de automatización",
|
|
11
3
|
"s_CalculatorChannels": "Canales de automatización",
|
|
12
4
|
"s_UseCalculator": "Usar automatización",
|
|
13
5
|
"s_ChannelHome": "Canal Casa",
|
|
@@ -1,13 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"s_StandardSettings": "Paramètres standards",
|
|
3
|
-
"s_ReferalLink": "Si vous n'êtes pas actuellement un utilisateur de Tibber, nous vous en serions très reconnaissants si vous utilisiez mon lien de parrainage.",
|
|
4
|
-
"s_TibberAPIToken": "Jeton pour l'API Tibber",
|
|
5
|
-
"s_HomesFeedTable": "Configuration des flux de données en direct de Pulse",
|
|
6
2
|
"s_Home": "Maison Tibber",
|
|
7
|
-
"s_PulseActive": "Utiliser Tibber Pulse pour cette maison",
|
|
8
|
-
"s_SelectFieldsForFeed": "Sélectionnez tous les champs que vous souhaitez charger dans les données du flux (la puissance et l'horodatage sont les valeurs par défaut) :",
|
|
9
|
-
"s_PhasesExplanation": "Valeurs de tension et de courant - sur plusieurs compteurs, ces valeurs ne font pas partie du cadre de données, donc les valeurs peuvent être nulles. Il peut y avoir d'autres écarts en fonction du firmware du compteur concret. Les valeurs nulles ne généreront aucun état dans vos objets ioBroker.",
|
|
10
|
-
"s_CalculatorSettings": "Paramètres d'automatisation",
|
|
11
3
|
"s_CalculatorChannels": "Canaux d'automatisation",
|
|
12
4
|
"s_UseCalculator": "Utiliser l'automatisation",
|
|
13
5
|
"s_ChannelHome": "Canal Maison",
|
|
@@ -1,13 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"s_StandardSettings": "Impostazioni standard",
|
|
3
|
-
"s_ReferalLink": "Se al momento non sei un utente Tibber, apprezziamo molto se utilizzi il nostro link di riferimento.",
|
|
4
|
-
"s_TibberAPIToken": "Token per l'API di Tibber",
|
|
5
|
-
"s_HomesFeedTable": "Configurazione dei flussi di dati live di Pulse",
|
|
6
2
|
"s_Home": "Casa Tibber",
|
|
7
|
-
"s_PulseActive": "Utilizza Tibber Pulse per questa casa",
|
|
8
|
-
"s_SelectFieldsForFeed": "Seleziona tutti i campi che desideri caricare nei dati del feed (potenza e timestamp sono i valori predefiniti):",
|
|
9
|
-
"s_PhasesExplanation": "Valori di tensione e corrente - su diversi contatori questi valori non fanno parte del frame dati, quindi i valori potrebbero essere nulli. Potrebbero esserci altre deviazioni basate sul firmware del contatore concreto. I valori nulli non genereranno uno stato nei tuoi oggetti ioBroker.",
|
|
10
|
-
"s_CalculatorSettings": "Impostazioni di automazione",
|
|
11
3
|
"s_CalculatorChannels": "Canali di automazione",
|
|
12
4
|
"s_UseCalculator": "Utilizza l'automazione",
|
|
13
5
|
"s_ChannelHome": "Canale Casa",
|
|
@@ -1,13 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"s_StandardSettings": "Standaardinstellingen",
|
|
3
|
-
"s_ReferalLink": "Als u op dit moment geen Tibber-gebruiker bent, waarderen we het zeer als u onze verwijzingslink gebruikt.",
|
|
4
|
-
"s_TibberAPIToken": "Token voor Tibber API",
|
|
5
|
-
"s_HomesFeedTable": "Configuratie van livegegevensstromen van Pulse",
|
|
6
2
|
"s_Home": "Tibber Thuis",
|
|
7
|
-
"s_PulseActive": "Gebruik Tibber Pulse voor dit huis",
|
|
8
|
-
"s_SelectFieldsForFeed": "Selecteer alle velden die u wilt laden in de feedgegevens (vermogen en tijdstempel zijn de standaardwaarden):",
|
|
9
|
-
"s_PhasesExplanation": "Spannings- en stroomwaarden - op verschillende meters maken deze waarden geen deel uit van het gegevensframe, dus de waarden kunnen nul zijn. Er kunnen andere afwijkingen zijn op basis van de concrete meterfirmware. Nulwaarden genereren helemaal geen status in uw ioBroker-objecten.",
|
|
10
|
-
"s_CalculatorSettings": "Automatiseringsinstellingen",
|
|
11
3
|
"s_CalculatorChannels": "Automatiseringskanalen",
|
|
12
4
|
"s_UseCalculator": "Automatisering gebruiken",
|
|
13
5
|
"s_ChannelHome": "Kanaal Thuis",
|
|
@@ -1,13 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"s_StandardSettings": "Ustawienia standardowe",
|
|
3
|
-
"s_ReferalLink": "Jeśli nie jesteś obecnie użytkownikiem Tibber, bardzo byśmy to docenili, gdybyś użył mojego linku polecającego.",
|
|
4
|
-
"s_TibberAPIToken": "Token dla API Tibber",
|
|
5
|
-
"s_HomesFeedTable": "Konfiguracja strumieni danych na żywo Pulse",
|
|
6
2
|
"s_Home": "Dom Tibber",
|
|
7
|
-
"s_PulseActive": "Użyj Tibber Pulse w tym domu",
|
|
8
|
-
"s_SelectFieldsForFeed": "Wybierz wszystkie pola, które chcesz załadować do danych zasilania (moc i znacznik czasu są domyślnymi wartościami):",
|
|
9
|
-
"s_PhasesExplanation": "Wartości napięcia i prądu - na kilku licznikach te wartości nie są częścią ramki danych, dlatego wartości mogą być zerowe. Mogą wystąpić inne odstępstwa w zależności od konkretnego oprogramowania licznika. Zera nie generują stanu w twoich obiektach ioBroker.",
|
|
10
|
-
"s_CalculatorSettings": "Ustawienia automatyzacji",
|
|
11
3
|
"s_CalculatorChannels": "Kanały automatyzacji",
|
|
12
4
|
"s_UseCalculator": "Użyj automatyzacji",
|
|
13
5
|
"s_ChannelHome": "Kanał domowy",
|
|
@@ -1,13 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"s_StandardSettings": "Configurações padrão",
|
|
3
|
-
"s_ReferalLink": "Se você não é um usuário Tibber neste momento, ficaríamos muito agradecidos se você usasse o nosso link de referência.",
|
|
4
|
-
"s_TibberAPIToken": "Token para a API Tibber",
|
|
5
|
-
"s_HomesFeedTable": "Configuração de fluxos de dados ao vivo do Pulse",
|
|
6
2
|
"s_Home": "Casa Tibber",
|
|
7
|
-
"s_PulseActive": "Usar Tibber Pulse para esta casa",
|
|
8
|
-
"s_SelectFieldsForFeed": "Selecione todos os campos que deseja carregar nos dados do feed (potência e carimbo de data/hora são os valores padrão):",
|
|
9
|
-
"s_PhasesExplanation": "Valores de tensão e corrente - em vários medidores, esses valores não fazem parte do quadro de dados, portanto, os valores podem ser nulos. Pode haver outras variações com base no firmware do medidor concreto. Valores nulos não gerarão um estado em seus objetos ioBroker.",
|
|
10
|
-
"s_CalculatorSettings": "Configurações de automação",
|
|
11
3
|
"s_CalculatorChannels": "Canais de automação",
|
|
12
4
|
"s_UseCalculator": "Usar automação",
|
|
13
5
|
"s_ChannelHome": "Canal Casa",
|
|
@@ -1,13 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"s_StandardSettings": "Стандартные настройки",
|
|
3
|
-
"s_ReferalLink": "Если вы сейчас не являетесь пользователем Tibber, мы очень ценим, если вы используете мою реферальную ссылку.",
|
|
4
|
-
"s_TibberAPIToken": "Токен для API Tibber",
|
|
5
|
-
"s_HomesFeedTable": "Конфигурация потоков данных в реальном времени Pulse",
|
|
6
2
|
"s_Home": "Дом Tibber",
|
|
7
|
-
"s_PulseActive": "Использовать Tibber Pulse для этого дома",
|
|
8
|
-
"s_SelectFieldsForFeed": "Выберите все поля, которые вы хотите загрузить в данные потока (мощность и временная метка - значения по умолчанию):",
|
|
9
|
-
"s_PhasesExplanation": "Значения напряжения и тока - на нескольких счетчиках эти значения не являются частью данных, поэтому значения могут быть нулевыми. Могут быть и другие отклонения в зависимости от прошивки конкретного счетчика. Нулевые значения не будут генерировать состояние в ваших объектах ioBroker.",
|
|
10
|
-
"s_CalculatorSettings": "Настройки автоматизации",
|
|
11
3
|
"s_CalculatorChannels": "Каналы автоматизации",
|
|
12
4
|
"s_UseCalculator": "Использовать автоматизацию",
|
|
13
5
|
"s_ChannelHome": "Канал Дом",
|
|
@@ -1,13 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"s_StandardSettings": "Стандартні налаштування",
|
|
3
|
-
"s_ReferalLink": "Якщо ви не є користувачем Tibber зараз, ми дуже вдячні, якщо ви використовуєте мій реферальний посилання.",
|
|
4
|
-
"s_TibberAPIToken": "Токен для Tibber API",
|
|
5
|
-
"s_HomesFeedTable": "Конфігурація потоків живих даних Pulse",
|
|
6
2
|
"s_Home": "Tibber Дім",
|
|
7
|
-
"s_PulseActive": "Використовувати Tibber Pulse для цього будинку",
|
|
8
|
-
"s_SelectFieldsForFeed": "Виберіть всі поля, які ви хочете завантажити в дані потоку (потужність і мітка часу - значення за замовчуванням):",
|
|
9
|
-
"s_PhasesExplanation": "Значення напруги і струму - на декількох лічильниках ці значення не є частиною кадру даних, тому значення можуть бути нульовими. Можуть бути інші відхилення в залежності від прошивки конкретного лічильника. Нульові значення не будуть генерувати стан в ваших об'єктах ioBroker.",
|
|
10
|
-
"s_CalculatorSettings": "Налаштування автоматизації",
|
|
11
3
|
"s_CalculatorChannels": "Канали автоматизації",
|
|
12
4
|
"s_UseCalculator": "Використовувати автоматизацію",
|
|
13
5
|
"s_ChannelHome": "Канал Дім",
|
|
@@ -1,13 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"s_StandardSettings": "标准设置",
|
|
3
|
-
"s_ReferalLink": "如果您目前不是Tibber用户,我们非常感谢您使用我的推荐链接。",
|
|
4
|
-
"s_TibberAPIToken": "Tibber API令牌",
|
|
5
|
-
"s_HomesFeedTable": "Pulse实时数据流配置",
|
|
6
2
|
"s_Home": "Tibber家",
|
|
7
|
-
"s_PulseActive": "为此家使用Tibber Pulse",
|
|
8
|
-
"s_SelectFieldsForFeed": "选择要加载到数据流中的所有字段(功率和时间戳是默认值):",
|
|
9
|
-
"s_PhasesExplanation": "电压和电流值 - 在多个电表上,这些值不是数据帧的一部分,因此值可能为null。具体电表固件可能存在其他偏差。null值不会在您的ioBroker对象中生成状态。",
|
|
10
|
-
"s_CalculatorSettings": "自动化设置",
|
|
11
3
|
"s_CalculatorChannels": "自动化通道",
|
|
12
4
|
"s_UseCalculator": "使用自动化",
|
|
13
5
|
"s_ChannelHome": "家庭通道",
|
package/admin/jsonConfig.json
CHANGED
|
@@ -4,11 +4,35 @@
|
|
|
4
4
|
"items": {
|
|
5
5
|
"_StandardTab": {
|
|
6
6
|
"type": "panel",
|
|
7
|
-
"label":
|
|
7
|
+
"label": {
|
|
8
|
+
"en": "Standard settings",
|
|
9
|
+
"de": "Standard-Einstellungen",
|
|
10
|
+
"ru": "Стандартные настройки",
|
|
11
|
+
"pt": "Configurações padrão",
|
|
12
|
+
"nl": "Standaardinstellingen",
|
|
13
|
+
"fr": "Paramètres standard",
|
|
14
|
+
"it": "Impostazioni predefinite",
|
|
15
|
+
"es": "Configuración estándar",
|
|
16
|
+
"pl": "Ustawienia standardowe",
|
|
17
|
+
"uk": "Стандартні налаштування",
|
|
18
|
+
"zh-cn": "标准设置"
|
|
19
|
+
},
|
|
8
20
|
"items": {
|
|
9
21
|
"TibberAPIToken": {
|
|
10
22
|
"type": "text",
|
|
11
|
-
"label":
|
|
23
|
+
"label": {
|
|
24
|
+
"en": "Token for Tibber API",
|
|
25
|
+
"de": "Token für Tibber API",
|
|
26
|
+
"ru": "Токен для Tibber API",
|
|
27
|
+
"pt": "Token para a API Tibber",
|
|
28
|
+
"nl": "Token voor Tibber API",
|
|
29
|
+
"fr": "Token pour l'API Tibber",
|
|
30
|
+
"it": "Token per l'API di Tibber",
|
|
31
|
+
"es": "Token para la API de Tibber",
|
|
32
|
+
"pl": "Token do API Tibber",
|
|
33
|
+
"uk": "Токен для API Tibber",
|
|
34
|
+
"zh-cn": "Tibber API 的令牌"
|
|
35
|
+
},
|
|
12
36
|
"maxLength": 60,
|
|
13
37
|
"sm": 12,
|
|
14
38
|
"md": 6,
|
|
@@ -18,8 +42,20 @@
|
|
|
18
42
|
|
|
19
43
|
"_link": {
|
|
20
44
|
"type": "staticLink",
|
|
21
|
-
"label":
|
|
22
|
-
|
|
45
|
+
"label": {
|
|
46
|
+
"en": "If you're not currently a Tibber user, I would greatly appreciate it if you could use my referral link",
|
|
47
|
+
"de": "Wenn Sie derzeit kein Tibber-Benutzer sind, würde ich es sehr schätzen, wenn Sie meinen Empfehlungslink verwenden könnten",
|
|
48
|
+
"ru": "Если вы в настоящее время не являетесь пользователем Tibber, я был бы очень признателен, если бы вы могли использовать мою реферальную ссылку",
|
|
49
|
+
"pt": "Se você não é atualmente um usuário da Tibber, eu ficaria muito agradecido se você pudesse usar meu link de referência",
|
|
50
|
+
"nl": "Als u op dit moment geen Tibber-gebruiker bent, zou ik het zeer waarderen als u mijn verwijzingslink zou kunnen gebruiken",
|
|
51
|
+
"fr": "Si vous n'êtes pas actuellement un utilisateur de Tibber, je vous serais très reconnaissant si vous pouviez utiliser mon lien de parrainage",
|
|
52
|
+
"it": "Se al momento non sei un utente di Tibber, sarei molto grato se potessi utilizzare il mio link di riferimento",
|
|
53
|
+
"es": "Si actualmente no eres usuario de Tibber, te agradecería mucho si pudieras usar mi enlace de referencia",
|
|
54
|
+
"pl": "Jeśli obecnie nie jesteś użytkownikiem Tibber, bardzo bym docenił, gdybyś mógł skorzystać z mojego linku polecającego",
|
|
55
|
+
"uk": "Якщо ви в даний момент не є користувачем Tibber, я б вдячний, якщо ви могли б використовувати мій реферальний посилання",
|
|
56
|
+
"zh-cn": "如果您目前不是Tibber的用户,如果您能使用我的推荐链接,我将非常感激"
|
|
57
|
+
},
|
|
58
|
+
"href": "https://invite.tibber.com/mu8c82n5",
|
|
23
59
|
"newLine": true
|
|
24
60
|
},
|
|
25
61
|
|
|
@@ -28,7 +64,19 @@
|
|
|
28
64
|
"sm": 12,
|
|
29
65
|
"md": 12,
|
|
30
66
|
"lg": 12,
|
|
31
|
-
"label":
|
|
67
|
+
"label": {
|
|
68
|
+
"en": "Configuration of Pulse live data streams",
|
|
69
|
+
"de": "Konfiguration von Pulse-Live-Datenströmen",
|
|
70
|
+
"ru": "Настройка потоковых данных в режиме реального времени Pulse",
|
|
71
|
+
"pt": "Configuração de transmissões de dados ao vivo do Pulse",
|
|
72
|
+
"nl": "Configuratie van Pulse live gegevensstromen",
|
|
73
|
+
"fr": "Configuration des flux de données en direct Pulse",
|
|
74
|
+
"it": "Configurazione dei flussi di dati in tempo reale di Pulse",
|
|
75
|
+
"es": "Configuración de transmisiones de datos en tiempo real de Pulse",
|
|
76
|
+
"pl": "Konfiguracja strumieni danych na żywo Pulse",
|
|
77
|
+
"uk": "Налаштування потокових даних в режимі реального часу Pulse",
|
|
78
|
+
"zh-cn": "Pulse实时数据流配置"
|
|
79
|
+
},
|
|
32
80
|
"hidden": "!data.TibberAPIToken",
|
|
33
81
|
"items": [
|
|
34
82
|
{
|
|
@@ -43,7 +91,19 @@
|
|
|
43
91
|
},
|
|
44
92
|
{
|
|
45
93
|
"type": "checkbox",
|
|
46
|
-
"title":
|
|
94
|
+
"title": {
|
|
95
|
+
"en": "use Tibber Pulse for this home",
|
|
96
|
+
"de": "Verwenden Sie Tibber Pulse für dieses Zuhause",
|
|
97
|
+
"ru": "Используйте Tibber Pulse для этого дома",
|
|
98
|
+
"pt": "Use o Tibber Pulse para esta casa",
|
|
99
|
+
"nl": "Gebruik Tibber Pulse voor dit huis",
|
|
100
|
+
"fr": "Utilisez Tibber Pulse pour cette maison",
|
|
101
|
+
"it": "Usa Tibber Pulse per questa casa",
|
|
102
|
+
"es": "Usar Tibber Pulse para esta casa",
|
|
103
|
+
"pl": "Użyj Tibber Pulse w tym domu",
|
|
104
|
+
"uk": "Використовуйте Tibber Pulse для цього будинку",
|
|
105
|
+
"zh-cn": "为这个家使用Tibber Pulse"
|
|
106
|
+
},
|
|
47
107
|
"attr": "feedActive",
|
|
48
108
|
"filter": false,
|
|
49
109
|
"sort": false,
|
|
@@ -55,7 +115,19 @@
|
|
|
55
115
|
|
|
56
116
|
"_feedDataDetail": {
|
|
57
117
|
"type": "header",
|
|
58
|
-
"text":
|
|
118
|
+
"text": {
|
|
119
|
+
"en": "Select all fields you want to load in feed data (power and timestamp are on by default):",
|
|
120
|
+
"de": "Wählen Sie alle Felder aus, die Sie in den Feed-Daten laden möchten (Leistung und Zeitstempel sind standardmäßig aktiviert):",
|
|
121
|
+
"ru": "Выберите все поля, которые вы хотите загрузить в данные ленты (мощность и временная метка включены по умолчанию):",
|
|
122
|
+
"pt": "Selecione todos os campos que deseja carregar nos dados do feed (a potência e o carimbo de hora estão ativados por padrão):",
|
|
123
|
+
"nl": "Selecteer alle velden die u wilt laden in de feedgegevens (vermogen en tijdstempel zijn standaard ingeschakeld):",
|
|
124
|
+
"fr": "Sélectionnez tous les champs que vous souhaitez charger dans les données du flux (la puissance et l'horodatage sont activés par défaut) :",
|
|
125
|
+
"it": "Seleziona tutti i campi che desideri caricare nei dati del feed (potenza e timestamp sono attivi per impostazione predefinita):",
|
|
126
|
+
"es": "Seleccione todos los campos que desea cargar en los datos del feed (la potencia y la marca de tiempo están habilitados por defecto):",
|
|
127
|
+
"pl": "Wybierz wszystkie pola, które chcesz załadować do danych kanału (moc i znacznik czasu są domyślnie włączone):",
|
|
128
|
+
"uk": "Виберіть всі поля, які ви хочете завантажити в дані каналу (потужність та відмітка часу активовані за замовчуванням):",
|
|
129
|
+
"zh-cn": "选择要加载到数据中的所有字段(功率和时间戳默认处于启用状态):"
|
|
130
|
+
},
|
|
59
131
|
"hidden": "!data.TibberAPIToken",
|
|
60
132
|
"size": 3
|
|
61
133
|
},
|
|
@@ -211,7 +283,19 @@
|
|
|
211
283
|
"_phases": {
|
|
212
284
|
"type": "staticText",
|
|
213
285
|
"hidden": "!data.TibberAPIToken",
|
|
214
|
-
"label":
|
|
286
|
+
"label": {
|
|
287
|
+
"en": "Voltage and current values - In the case of several meters, these values may not be included in the data frame, which could result in null values. Other deviations may also occur based on the specific firmware of the meter. Null values will not generate a state in your ioBroker objects.",
|
|
288
|
+
"de": "Spannungs- und Stromwerte - In einigen Fällen können diese Werte bei mehreren Zählern nicht im Datenrahmen enthalten sein, was zu Nullwerten führen kann. Weitere Abweichungen können auch auf der spezifischen Firmware des Zählers basieren. Nullwerte generieren keine Zustände in Ihren ioBroker-Objekten.",
|
|
289
|
+
"ru": "Значения напряжения и тока - В случае нескольких счетчиков эти значения могут не включаться в кадр данных, что может привести к нулевым значениям. Другие отклонения также могут возникнуть на основе конкретной прошивки счетчика. Нулевые значения не создадут состояние в ваших объектах ioBroker.",
|
|
290
|
+
"pt": "Valores de tensão e corrente - No caso de vários medidores, esses valores podem não estar incluídos no quadro de dados, o que pode resultar em valores nulos. Outras discrepâncias também podem ocorrer com base na firmware específica do medidor. Valores nulos não gerarão um estado em seus objetos ioBroker.",
|
|
291
|
+
"nl": "Spannings- en stroomwaarden - In het geval van meerdere meters kunnen deze waarden mogelijk niet zijn opgenomen in het gegevenskader, wat kan resulteren in nulwaarden. Andere afwijkingen kunnen ook optreden op basis van de specifieke firmware van de meter. Nulwaarden genereren geen toestand in uw ioBroker-objecten.",
|
|
292
|
+
"fr": "Valeurs de tension et de courant - Dans le cas de plusieurs compteurs, ces valeurs peuvent ne pas être incluses dans le cadre de données, ce qui pourrait entraîner des valeurs nulles. D'autres écarts peuvent également se produire en fonction du firmware spécifique du compteur. Les valeurs nulles ne généreront pas d'état dans vos objets ioBroker.",
|
|
293
|
+
"it": "Valori di tensione e corrente - Nel caso di diversi contatori, questi valori potrebbero non essere inclusi nel frame dati, il che potrebbe comportare valori nulli. Possono verificarsi altre deviazioni in base alla specifica firmware del contatore. I valori nulli non genereranno uno stato nei vostri oggetti ioBroker.",
|
|
294
|
+
"es": "Valores de voltaje y corriente - En el caso de varios medidores, estos valores pueden no estar incluidos en el marco de datos, lo que podría dar lugar a valores nulos. También pueden producirse otras desviaciones según la firmware específica del medidor. Los valores nulos no generarán un estado en sus objetos ioBroker.",
|
|
295
|
+
"pl": "Wartości napięcia i prądu - W przypadku kilku liczników te wartości mogą nie być uwzględnione w ramce danych, co może skutkować wartościami zerowymi. Inne odstępstwa mogą również wystąpić na podstawie konkretnej wersji firmware licznika. Wartości zerowe nie wygenerują stanu w twoich obiektach ioBroker.",
|
|
296
|
+
"uk": "Значення напруги та струму - В разі кількох лічильників ці значення можуть не включати в кадр даних, що може призвести до нульових значень. Інші відхилення також можуть виникнути на основі конкретної прошивки лічильника. Нульові значення не створять стан в ваших об'єктах ioBroker.",
|
|
297
|
+
"zh-cn": "电压和电流数值 - 在多台仪表的情况下,这些数值可能不包括在数据帧中,可能导致空值。根据电表的具体固件,还可能出现其他偏差。空值不会在您的ioBroker对象中生成状态。"
|
|
298
|
+
}
|
|
215
299
|
},
|
|
216
300
|
|
|
217
301
|
"FeedConfigVoltagePhase1": {
|
|
@@ -270,7 +354,19 @@
|
|
|
270
354
|
|
|
271
355
|
"_CalculatorTab": {
|
|
272
356
|
"type": "panel",
|
|
273
|
-
"label":
|
|
357
|
+
"label": {
|
|
358
|
+
"en": "Calculator Settings",
|
|
359
|
+
"de": "Automatisierungs-Einstellungen",
|
|
360
|
+
"ru": "Настройки автоматизации",
|
|
361
|
+
"pt": "Configurações de automação",
|
|
362
|
+
"nl": "Automatiseringsinstellingen",
|
|
363
|
+
"fr": "Paramètres d'automatisation",
|
|
364
|
+
"it": "Impostazioni di automazione",
|
|
365
|
+
"es": "Configuración de automatización",
|
|
366
|
+
"pl": "Ustawienia automatyzacji",
|
|
367
|
+
"uk": "Налаштування автоматизації",
|
|
368
|
+
"zh-cn": "自动化设置"
|
|
369
|
+
},
|
|
274
370
|
"hidden": "!data.TibberAPIToken",
|
|
275
371
|
"items": {
|
|
276
372
|
"_CalculatorHeader": {
|
|
@@ -81,8 +81,10 @@ class TibberAPICaller extends tibberHelper_1.TibberHelper {
|
|
|
81
81
|
if (!exDate || exDate <= today) {
|
|
82
82
|
const pricesToday = await this.tibberQuery.getTodaysEnergyPrices(homeId);
|
|
83
83
|
this.adapter.log.debug(`Got prices today from tibber api: ${JSON.stringify(pricesToday)}`);
|
|
84
|
-
this.checkAndSetValue(this.getStatePrefix(homeId, "PricesToday", "json"),
|
|
84
|
+
this.checkAndSetValue(this.getStatePrefix(homeId, "PricesToday", "json"), JSON.stringify(pricesToday), "The prices today as json");
|
|
85
85
|
this.fetchPriceAverage(homeId, `PricesToday.average`, pricesToday);
|
|
86
|
+
this.fetchPriceMaximum(homeId, `PricesToday.maximum`, pricesToday.sort((a, b) => a.total - b.total));
|
|
87
|
+
this.fetchPriceMinimum(homeId, `PricesToday.minimum`, pricesToday.sort((a, b) => a.total - b.total));
|
|
86
88
|
for (const i in pricesToday) {
|
|
87
89
|
const price = pricesToday[i];
|
|
88
90
|
const hour = new Date(price.startsAt.substr(0, 19)).getHours();
|
|
@@ -90,11 +92,11 @@ class TibberAPICaller extends tibberHelper_1.TibberHelper {
|
|
|
90
92
|
}
|
|
91
93
|
if (Array.isArray(pricesToday)) {
|
|
92
94
|
// Sort the array if it is an array - possible type error discovered by sentry
|
|
93
|
-
this.checkAndSetValue(this.getStatePrefix(homeId, "PricesToday", "jsonBYpriceASC"),
|
|
95
|
+
this.checkAndSetValue(this.getStatePrefix(homeId, "PricesToday", "jsonBYpriceASC"), JSON.stringify(pricesToday.sort((a, b) => a.total - b.total)), "prices sorted by cost ascending as json");
|
|
94
96
|
}
|
|
95
97
|
else {
|
|
96
|
-
// Handle the case when pricesToday is not an array, it's empty
|
|
97
|
-
this.checkAndSetValue(this.getStatePrefix(homeId, "PricesToday", "jsonBYpriceASC"),
|
|
98
|
+
// Handle the case when pricesToday is not an array, it's empty!, so just don't sort and write
|
|
99
|
+
this.checkAndSetValue(this.getStatePrefix(homeId, "PricesToday", "jsonBYpriceASC"), JSON.stringify(pricesToday), "prices sorted by cost ascending as json");
|
|
98
100
|
}
|
|
99
101
|
}
|
|
100
102
|
else {
|
|
@@ -121,6 +123,8 @@ class TibberAPICaller extends tibberHelper_1.TibberHelper {
|
|
|
121
123
|
this.emptyingPrice(homeId, `PricesTomorrow.${hour}`);
|
|
122
124
|
}
|
|
123
125
|
this.emptyingPriceAverage(homeId, `PricesTomorrow.average`);
|
|
126
|
+
this.emptyingPriceMaximum(homeId, `PricesTomorrow.maximum`);
|
|
127
|
+
this.emptyingPriceMinimum(homeId, `PricesTomorrow.minimum`);
|
|
124
128
|
}
|
|
125
129
|
else if (pricesTomorrow) {
|
|
126
130
|
// pricing known, after about 13:00 - write the states
|
|
@@ -129,17 +133,19 @@ class TibberAPICaller extends tibberHelper_1.TibberHelper {
|
|
|
129
133
|
const hour = new Date(price.startsAt.substr(0, 19)).getHours();
|
|
130
134
|
await this.fetchPrice(homeId, "PricesTomorrow." + hour, price);
|
|
131
135
|
}
|
|
136
|
+
this.fetchPriceAverage(homeId, `PricesTomorrow.average`, pricesTomorrow);
|
|
137
|
+
this.fetchPriceMaximum(homeId, `PricesTomorrow.maximum`, pricesTomorrow.sort((a, b) => a.total - b.total));
|
|
138
|
+
this.fetchPriceMinimum(homeId, `PricesTomorrow.minimum`, pricesTomorrow.sort((a, b) => a.total - b.total));
|
|
132
139
|
}
|
|
133
|
-
this.checkAndSetValue(this.getStatePrefix(homeId, "PricesTomorrow", "json"),
|
|
140
|
+
this.checkAndSetValue(this.getStatePrefix(homeId, "PricesTomorrow", "json"), JSON.stringify(pricesTomorrow), "The prices tomorrow as json");
|
|
134
141
|
if (Array.isArray(pricesTomorrow)) {
|
|
135
142
|
// Sort the array if it is an array - possible type error discovered by sentry
|
|
136
|
-
this.checkAndSetValue(this.getStatePrefix(homeId, "PricesTomorrow", "jsonBYpriceASC"),
|
|
143
|
+
this.checkAndSetValue(this.getStatePrefix(homeId, "PricesTomorrow", "jsonBYpriceASC"), JSON.stringify(pricesTomorrow.sort((a, b) => a.total - b.total)), "prices sorted by cost ascending as json");
|
|
137
144
|
}
|
|
138
145
|
else {
|
|
139
|
-
// Handle the case when pricesToday is not an array, it's empty
|
|
140
|
-
this.checkAndSetValue(this.getStatePrefix(homeId, "PricesTomorrow", "jsonBYpriceASC"),
|
|
146
|
+
// Handle the case when pricesToday is not an array, it's empty!, so just don't sort and write
|
|
147
|
+
this.checkAndSetValue(this.getStatePrefix(homeId, "PricesTomorrow", "jsonBYpriceASC"), JSON.stringify(pricesTomorrow), "prices sorted by cost ascending as json");
|
|
141
148
|
}
|
|
142
|
-
this.fetchPriceAverage(homeId, `PricesTomorrow.average`, pricesTomorrow);
|
|
143
149
|
}
|
|
144
150
|
else {
|
|
145
151
|
this.adapter.log.debug(`Existing date (${exDate}) of price info is already the tomorrow date, polling of prices tomorrow from Tibber skipped`);
|
|
@@ -161,6 +167,20 @@ class TibberAPICaller extends tibberHelper_1.TibberHelper {
|
|
|
161
167
|
const taxSum = price.reduce((sum, item) => sum + item.tax, 0);
|
|
162
168
|
this.checkAndSetValueNumber(this.getStatePrefix(homeId, objectDestination, "tax"), Math.round(1000 * (taxSum / price.length)) / 1000, "Todays avarage tax price");
|
|
163
169
|
}
|
|
170
|
+
fetchPriceMaximum(homeId, objectDestination, price) {
|
|
171
|
+
this.checkAndSetValueNumber(this.getStatePrefix(homeId, objectDestination, "total"), Math.round(1000 * price[23].total) / 1000, "Todays total price maximum");
|
|
172
|
+
this.checkAndSetValueNumber(this.getStatePrefix(homeId, objectDestination, "energy"), Math.round(1000 * price[23].energy) / 1000, "Todays spotmarket price at total price maximum");
|
|
173
|
+
this.checkAndSetValueNumber(this.getStatePrefix(homeId, objectDestination, "tax"), Math.round(1000 * price[23].tax) / 1000, "Todays tax price at total price maximum");
|
|
174
|
+
this.checkAndSetValue(this.getStatePrefix(homeId, objectDestination, "level"), price[23].level, "Price level compared to recent price values");
|
|
175
|
+
this.checkAndSetValue(this.getStatePrefix(homeId, objectDestination, "startsAt"), price[23].startsAt, "Start time of the price maximum");
|
|
176
|
+
}
|
|
177
|
+
fetchPriceMinimum(homeId, objectDestination, price) {
|
|
178
|
+
this.checkAndSetValueNumber(this.getStatePrefix(homeId, objectDestination, "total"), Math.round(1000 * price[0].total) / 1000, "Todays total price minimum");
|
|
179
|
+
this.checkAndSetValueNumber(this.getStatePrefix(homeId, objectDestination, "energy"), Math.round(1000 * price[0].energy) / 1000, "Todays spotmarket price at total price minimum");
|
|
180
|
+
this.checkAndSetValueNumber(this.getStatePrefix(homeId, objectDestination, "tax"), Math.round(1000 * price[0].tax) / 1000, "Todays tax price at total price minimum");
|
|
181
|
+
this.checkAndSetValue(this.getStatePrefix(homeId, objectDestination, "level"), price[0].level, "Price level compared to recent price values");
|
|
182
|
+
this.checkAndSetValue(this.getStatePrefix(homeId, objectDestination, "startsAt"), price[0].startsAt, "Start time of the price minimum");
|
|
183
|
+
}
|
|
164
184
|
emptyingPrice(homeId, objectDestination) {
|
|
165
185
|
this.checkAndSetValueNumber(this.getStatePrefix(homeId, objectDestination, "total"), 0, "The total price (energy + taxes)");
|
|
166
186
|
this.checkAndSetValueNumber(this.getStatePrefix(homeId, objectDestination, "energy"), 0, "Spotmarket price");
|
|
@@ -172,6 +192,20 @@ class TibberAPICaller extends tibberHelper_1.TibberHelper {
|
|
|
172
192
|
this.checkAndSetValueNumber(this.getStatePrefix(homeId, objectDestination, "energy"), 0, "The todays avarage spotmarket price");
|
|
173
193
|
this.checkAndSetValueNumber(this.getStatePrefix(homeId, objectDestination, "tax"), 0, "The todays avarage tax price");
|
|
174
194
|
}
|
|
195
|
+
emptyingPriceMaximum(homeId, objectDestination) {
|
|
196
|
+
this.checkAndSetValueNumber(this.getStatePrefix(homeId, objectDestination, "total"), 0, "Todays total price maximum");
|
|
197
|
+
this.checkAndSetValueNumber(this.getStatePrefix(homeId, objectDestination, "energy"), 0, "Todays spotmarket price at total price maximum");
|
|
198
|
+
this.checkAndSetValueNumber(this.getStatePrefix(homeId, objectDestination, "tax"), 0, "Todays tax price at total price maximum");
|
|
199
|
+
this.checkAndSetValue(this.getStatePrefix(homeId, objectDestination, "level"), "Not known now", "Price level compared to recent price values");
|
|
200
|
+
this.checkAndSetValue(this.getStatePrefix(homeId, objectDestination, "startsAt"), "Not known now", "Start time of the price maximum");
|
|
201
|
+
}
|
|
202
|
+
emptyingPriceMinimum(homeId, objectDestination) {
|
|
203
|
+
this.checkAndSetValueNumber(this.getStatePrefix(homeId, objectDestination, "total"), 0, "Todays total price minimum");
|
|
204
|
+
this.checkAndSetValueNumber(this.getStatePrefix(homeId, objectDestination, "energy"), 0, "Todays spotmarket price at total price minimum");
|
|
205
|
+
this.checkAndSetValueNumber(this.getStatePrefix(homeId, objectDestination, "tax"), 0, "Todays tax price at total price minimum");
|
|
206
|
+
this.checkAndSetValue(this.getStatePrefix(homeId, objectDestination, "level"), "Not known now", "Price level compared to recent price values");
|
|
207
|
+
this.checkAndSetValue(this.getStatePrefix(homeId, objectDestination, "startsAt"), "Not known now", "Start time of the price minimum");
|
|
208
|
+
}
|
|
175
209
|
fetchAddress(homeId, objectDestination, address) {
|
|
176
210
|
this.checkAndSetValue(this.getStatePrefix(homeId, objectDestination, "address1"), address.address1);
|
|
177
211
|
this.checkAndSetValue(this.getStatePrefix(homeId, objectDestination, "address2"), address.address2);
|
|
@@ -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":"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"}
|
|
@@ -52,9 +52,8 @@ class TibberCalculator extends tibberHelper_1.TibberHelper {
|
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
async startCalculatorTasks() {
|
|
55
|
-
if (!this.adapter.config.UseCalculator)
|
|
55
|
+
if (!this.adapter.config.UseCalculator)
|
|
56
56
|
return;
|
|
57
|
-
}
|
|
58
57
|
for (const channel in this.adapter.config.CalculatorList) {
|
|
59
58
|
if (!this.adapter.config.CalculatorList[channel].chTargetState.trim()) {
|
|
60
59
|
this.adapter.log.warn(`Empty destination state in calculator channel ${channel} defined - provide correct external state - execution of channel skipped`);
|
|
@@ -82,8 +81,13 @@ class TibberCalculator extends tibberHelper_1.TibberHelper {
|
|
|
82
81
|
}
|
|
83
82
|
async executeCalculatorBestCost(channel) {
|
|
84
83
|
try {
|
|
84
|
+
// if not chActive write chValueOff
|
|
85
|
+
if (!this.adapter.config.CalculatorList[channel].chActive) {
|
|
86
|
+
this.adapter.setForeignStateAsync(this.adapter.config.CalculatorList[channel].chTargetState, convertValue(this.adapter.config.CalculatorList[channel].chValueOff));
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
85
89
|
const currentPrice = await this.getStateValue(`Homes.${this.adapter.config.CalculatorList[channel].chHomeID}.CurrentPrice.total`);
|
|
86
|
-
if (this.adapter.config.CalculatorList[channel].chTriggerPrice > currentPrice
|
|
90
|
+
if (this.adapter.config.CalculatorList[channel].chTriggerPrice > currentPrice) {
|
|
87
91
|
this.adapter.setForeignStateAsync(this.adapter.config.CalculatorList[channel].chTargetState, convertValue(this.adapter.config.CalculatorList[channel].chValueOn));
|
|
88
92
|
}
|
|
89
93
|
else {
|
|
@@ -97,6 +101,11 @@ class TibberCalculator extends tibberHelper_1.TibberHelper {
|
|
|
97
101
|
}
|
|
98
102
|
async executeCalculatorBestSingleHours(channel) {
|
|
99
103
|
try {
|
|
104
|
+
// if not chActive write chValueOff
|
|
105
|
+
if (!this.adapter.config.CalculatorList[channel].chActive) {
|
|
106
|
+
this.adapter.setForeignStateAsync(this.adapter.config.CalculatorList[channel].chTargetState, convertValue(this.adapter.config.CalculatorList[channel].chValueOff));
|
|
107
|
+
return;
|
|
108
|
+
}
|
|
100
109
|
const currentDateTime = new Date();
|
|
101
110
|
const jsonPrices = JSON.parse(await this.getStateValue(`Homes.${this.adapter.config.CalculatorList[channel].chHomeID}.PricesToday.jsonBYpriceASC`));
|
|
102
111
|
// function to check for equal hour values
|
|
@@ -122,6 +131,11 @@ class TibberCalculator extends tibberHelper_1.TibberHelper {
|
|
|
122
131
|
}
|
|
123
132
|
async executeCalculatorBestHoursBlock(channel) {
|
|
124
133
|
try {
|
|
134
|
+
// if not chActive write chValueOff
|
|
135
|
+
if (!this.adapter.config.CalculatorList[channel].chActive) {
|
|
136
|
+
this.adapter.setForeignStateAsync(this.adapter.config.CalculatorList[channel].chTargetState, convertValue(this.adapter.config.CalculatorList[channel].chValueOff));
|
|
137
|
+
return;
|
|
138
|
+
}
|
|
125
139
|
const currentDateTime = new Date();
|
|
126
140
|
const jsonPrices = JSON.parse(await this.getStateValue(`Homes.${this.adapter.config.CalculatorList[channel].chHomeID}.PricesToday.json`));
|
|
127
141
|
let minSum = Number.MAX_VALUE;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tibberCalculator.js","sourceRoot":"","sources":["../../src/lib/tibberCalculator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tibberCalculator.js","sourceRoot":"","sources":["../../src/lib/tibberCalculator.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ var enCalcType;
|
|
|
6
6
|
enCalcType[enCalcType["BestCost"] = 1] = "BestCost";
|
|
7
7
|
enCalcType[enCalcType["BestSingleHours"] = 2] = "BestSingleHours";
|
|
8
8
|
enCalcType[enCalcType["BestHoursBlock"] = 3] = "BestHoursBlock";
|
|
9
|
+
//BestCostMaxHours = 4,
|
|
9
10
|
})(enCalcType || (exports.enCalcType = enCalcType = {}));
|
|
10
11
|
class TibberHelper {
|
|
11
12
|
constructor(adapter) {
|
|
@@ -21,12 +22,12 @@ class TibberHelper {
|
|
|
21
22
|
async getStateValue(stateName) {
|
|
22
23
|
try {
|
|
23
24
|
const stateObject = await this.getState(stateName);
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
return stateObject.val;
|
|
25
|
+
return stateObject?.val ?? null; // Errors have already been handled in getState()
|
|
26
|
+
//OLD if (stateObject == null) return null; // Errors have already been handled in getState()
|
|
27
|
+
//OLD return stateObject.val;
|
|
27
28
|
}
|
|
28
|
-
catch (
|
|
29
|
-
this.adapter.log.error(`[getStateValue](${stateName}): ${
|
|
29
|
+
catch (error) {
|
|
30
|
+
this.adapter.log.error(`[getStateValue](${stateName}): ${error}`);
|
|
30
31
|
return null;
|
|
31
32
|
}
|
|
32
33
|
}
|
|
@@ -43,8 +44,8 @@ class TibberHelper {
|
|
|
43
44
|
}
|
|
44
45
|
}
|
|
45
46
|
}
|
|
46
|
-
catch (
|
|
47
|
-
this.adapter.log.error(`[asyncGetState](${stateName}): ${
|
|
47
|
+
catch (error) {
|
|
48
|
+
this.adapter.log.error(`[asyncGetState](${stateName}): ${error}`);
|
|
48
49
|
return null;
|
|
49
50
|
}
|
|
50
51
|
}
|
|
@@ -78,12 +79,10 @@ class TibberHelper {
|
|
|
78
79
|
}
|
|
79
80
|
}
|
|
80
81
|
async checkAndSetValue(stateName, value, description, writeable, dontUpdate) {
|
|
81
|
-
if (writeable === undefined)
|
|
82
|
+
if (writeable === undefined)
|
|
82
83
|
writeable = false;
|
|
83
|
-
|
|
84
|
-
if (dontUpdate === undefined) {
|
|
84
|
+
if (dontUpdate === undefined)
|
|
85
85
|
dontUpdate = false;
|
|
86
|
-
}
|
|
87
86
|
if (value != undefined) {
|
|
88
87
|
if (value.trim().length > 0) {
|
|
89
88
|
await this.adapter.setObjectNotExistsAsync(stateName.value, {
|
|
@@ -105,12 +104,10 @@ class TibberHelper {
|
|
|
105
104
|
}
|
|
106
105
|
}
|
|
107
106
|
async checkAndSetValueNumber(stateName, value, description, writeable, dontUpdate) {
|
|
108
|
-
if (writeable === undefined)
|
|
107
|
+
if (writeable === undefined)
|
|
109
108
|
writeable = false;
|
|
110
|
-
|
|
111
|
-
if (dontUpdate === undefined) {
|
|
109
|
+
if (dontUpdate === undefined)
|
|
112
110
|
dontUpdate = false;
|
|
113
|
-
}
|
|
114
111
|
if (value || value === 0) {
|
|
115
112
|
await this.adapter.setObjectNotExistsAsync(stateName.value, {
|
|
116
113
|
type: "state",
|
|
@@ -130,9 +127,8 @@ class TibberHelper {
|
|
|
130
127
|
}
|
|
131
128
|
}
|
|
132
129
|
async checkAndSetValueNumberUnit(stateName, value, unit, description, writeable) {
|
|
133
|
-
if (writeable === undefined)
|
|
130
|
+
if (writeable === undefined)
|
|
134
131
|
writeable = false;
|
|
135
|
-
}
|
|
136
132
|
if (value || value === 0) {
|
|
137
133
|
await this.adapter.setObjectNotExistsAsync(stateName.value, {
|
|
138
134
|
type: "state",
|
|
@@ -151,12 +147,10 @@ class TibberHelper {
|
|
|
151
147
|
}
|
|
152
148
|
}
|
|
153
149
|
async checkAndSetValueBoolean(stateName, value, description, writeable, dontUpdate) {
|
|
154
|
-
if (writeable === undefined)
|
|
150
|
+
if (writeable === undefined)
|
|
155
151
|
writeable = false;
|
|
156
|
-
|
|
157
|
-
if (dontUpdate === undefined) {
|
|
152
|
+
if (dontUpdate === undefined)
|
|
158
153
|
dontUpdate = false;
|
|
159
|
-
}
|
|
160
154
|
if (value !== undefined && value !== null) {
|
|
161
155
|
await this.adapter.setObjectNotExistsAsync(stateName.value, {
|
|
162
156
|
type: "state",
|
|
@@ -178,9 +172,8 @@ class TibberHelper {
|
|
|
178
172
|
generateErrorMessage(error, context) {
|
|
179
173
|
let errorMessages = "";
|
|
180
174
|
for (const index in error.errors) {
|
|
181
|
-
if (errorMessages)
|
|
175
|
+
if (errorMessages)
|
|
182
176
|
errorMessages += ", ";
|
|
183
|
-
}
|
|
184
177
|
errorMessages += error.errors[index].message;
|
|
185
178
|
}
|
|
186
179
|
return `Error (${error.statusMessage}) occured during: -${context}- : ${errorMessages}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tibberHelper.js","sourceRoot":"","sources":["../../src/lib/tibberHelper.ts"],"names":[],"mappings":";;;AAEA,IAAY,
|
|
1
|
+
{"version":3,"file":"tibberHelper.js","sourceRoot":"","sources":["../../src/lib/tibberHelper.ts"],"names":[],"mappings":"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"}
|
package/build/lib/tibberPulse.js
CHANGED
|
@@ -17,18 +17,18 @@ class TibberPulse extends tibberHelper_1.TibberHelper {
|
|
|
17
17
|
try {
|
|
18
18
|
this.tibberFeed.connect();
|
|
19
19
|
}
|
|
20
|
-
catch (
|
|
21
|
-
this.adapter.log.warn(`Error on connect Feed: ${
|
|
20
|
+
catch (error) {
|
|
21
|
+
this.adapter.log.warn(`Error on connect Feed: ${error.message}`);
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
DisconnectPulseStream() {
|
|
25
25
|
try {
|
|
26
26
|
this.tibberFeed.close();
|
|
27
27
|
}
|
|
28
|
-
catch (
|
|
29
|
-
this.adapter.log.warn(`Error on Feed closed: ${
|
|
28
|
+
catch (error) {
|
|
29
|
+
this.adapter.log.warn(`Error on Feed closed: ${error.message}`);
|
|
30
30
|
}
|
|
31
|
-
//
|
|
31
|
+
// Reinitialize TibberFeed
|
|
32
32
|
this.tibberFeed = new tibber_api_1.TibberFeed(new tibber_api_1.TibberQuery(this.tibberConfig));
|
|
33
33
|
}
|
|
34
34
|
addEventHandlerOnFeed(currentFeed) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tibberPulse.js","sourceRoot":"","sources":["../../src/lib/tibberPulse.ts"],"names":[],"mappings":";;;AACA,2CAA8D;AAE9D,iDAA8C;AAE9C,MAAa,WAAY,SAAQ,2BAAY;IAO5C,YAAY,YAAqB,EAAE,OAA8B;QAChE,KAAK,CAAC,OAAO,CAAC,CAAC;QAHhB,kBAAa,GAAW,IAAI,CAAC;QAI5B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,WAAW,GAAG,IAAI,wBAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACtD,IAAI,CAAC,UAAU,GAAG,IAAI,uBAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACnD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC;QACtD,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC7C,CAAC;IAED,kBAAkB;QACjB,IAAI;YACH,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;SAC1B;QAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"tibberPulse.js","sourceRoot":"","sources":["../../src/lib/tibberPulse.ts"],"names":[],"mappings":"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"}
|
package/build/main.js
CHANGED
|
@@ -136,7 +136,8 @@ class Tibberlink extends utils.Adapter {
|
|
|
136
136
|
const adapterrestart = this.setInterval(() => {
|
|
137
137
|
this.restart();
|
|
138
138
|
}, 120000);
|
|
139
|
-
|
|
139
|
+
if (adapterrestart)
|
|
140
|
+
this.intervalList.push(adapterrestart);
|
|
140
141
|
}
|
|
141
142
|
// if there are any homes the adapter will do something
|
|
142
143
|
// Init load data and calculator for all homes
|
|
@@ -222,7 +223,8 @@ class Tibberlink extends utils.Adapter {
|
|
|
222
223
|
}
|
|
223
224
|
}
|
|
224
225
|
}, 1500000);
|
|
225
|
-
|
|
226
|
+
if (energyPricesListUpdateInterval)
|
|
227
|
+
this.intervalList.push(energyPricesListUpdateInterval);
|
|
226
228
|
// If user uses live feed - start feed connection
|
|
227
229
|
if (this.homeInfoList.some((info) => info.FeedActive)) {
|
|
228
230
|
// array with configs of feeds, init with base data set
|
|
@@ -244,76 +246,53 @@ class Tibberlink extends utils.Adapter {
|
|
|
244
246
|
// define the fields for datafeed
|
|
245
247
|
tibberFeedConfigs[index].homeId = this.homeInfoList[index].ID;
|
|
246
248
|
tibberFeedConfigs[index].power = true;
|
|
247
|
-
if (this.config.FeedConfigLastMeterConsumption)
|
|
249
|
+
if (this.config.FeedConfigLastMeterConsumption)
|
|
248
250
|
tibberFeedConfigs[index].lastMeterConsumption = true;
|
|
249
|
-
|
|
250
|
-
if (this.config.FeedConfigAccumulatedConsumption) {
|
|
251
|
+
if (this.config.FeedConfigAccumulatedConsumption)
|
|
251
252
|
tibberFeedConfigs[index].accumulatedConsumption = true;
|
|
252
|
-
|
|
253
|
-
if (this.config.FeedConfigAccumulatedProduction) {
|
|
253
|
+
if (this.config.FeedConfigAccumulatedProduction)
|
|
254
254
|
tibberFeedConfigs[index].accumulatedProduction = true;
|
|
255
|
-
|
|
256
|
-
if (this.config.FeedConfigAccumulatedConsumptionLastHour) {
|
|
255
|
+
if (this.config.FeedConfigAccumulatedConsumptionLastHour)
|
|
257
256
|
tibberFeedConfigs[index].accumulatedConsumptionLastHour = true;
|
|
258
|
-
|
|
259
|
-
if (this.config.FeedConfigAccumulatedProductionLastHour) {
|
|
257
|
+
if (this.config.FeedConfigAccumulatedProductionLastHour)
|
|
260
258
|
tibberFeedConfigs[index].accumulatedProductionLastHour = true;
|
|
261
|
-
|
|
262
|
-
if (this.config.FeedConfigAccumulatedCost) {
|
|
259
|
+
if (this.config.FeedConfigAccumulatedCost)
|
|
263
260
|
tibberFeedConfigs[index].accumulatedCost = true;
|
|
264
|
-
|
|
265
|
-
if (this.config.FeedConfigAccumulatedCost) {
|
|
261
|
+
if (this.config.FeedConfigAccumulatedCost)
|
|
266
262
|
tibberFeedConfigs[index].accumulatedReward = true;
|
|
267
|
-
|
|
268
|
-
if (this.config.FeedConfigCurrency) {
|
|
263
|
+
if (this.config.FeedConfigCurrency)
|
|
269
264
|
tibberFeedConfigs[index].currency = true;
|
|
270
|
-
|
|
271
|
-
if (this.config.FeedConfigMinPower) {
|
|
265
|
+
if (this.config.FeedConfigMinPower)
|
|
272
266
|
tibberFeedConfigs[index].minPower = true;
|
|
273
|
-
|
|
274
|
-
if (this.config.FeedConfigAveragePower) {
|
|
267
|
+
if (this.config.FeedConfigAveragePower)
|
|
275
268
|
tibberFeedConfigs[index].averagePower = true;
|
|
276
|
-
|
|
277
|
-
if (this.config.FeedConfigMaxPower) {
|
|
269
|
+
if (this.config.FeedConfigMaxPower)
|
|
278
270
|
tibberFeedConfigs[index].maxPower = true;
|
|
279
|
-
|
|
280
|
-
if (this.config.FeedConfigPowerProduction) {
|
|
271
|
+
if (this.config.FeedConfigPowerProduction)
|
|
281
272
|
tibberFeedConfigs[index].powerProduction = true;
|
|
282
|
-
|
|
283
|
-
if (this.config.FeedConfigMinPowerProduction) {
|
|
273
|
+
if (this.config.FeedConfigMinPowerProduction)
|
|
284
274
|
tibberFeedConfigs[index].minPowerProduction = true;
|
|
285
|
-
|
|
286
|
-
if (this.config.FeedConfigMaxPowerProduction) {
|
|
275
|
+
if (this.config.FeedConfigMaxPowerProduction)
|
|
287
276
|
tibberFeedConfigs[index].maxPowerProduction = true;
|
|
288
|
-
|
|
289
|
-
if (this.config.FeedConfigLastMeterProduction) {
|
|
277
|
+
if (this.config.FeedConfigLastMeterProduction)
|
|
290
278
|
tibberFeedConfigs[index].lastMeterProduction = true;
|
|
291
|
-
|
|
292
|
-
if (this.config.FeedConfigPowerFactor) {
|
|
279
|
+
if (this.config.FeedConfigPowerFactor)
|
|
293
280
|
tibberFeedConfigs[index].powerFactor = true;
|
|
294
|
-
|
|
295
|
-
if (this.config.FeedConfigVoltagePhase1) {
|
|
281
|
+
if (this.config.FeedConfigVoltagePhase1)
|
|
296
282
|
tibberFeedConfigs[index].voltagePhase1 = true;
|
|
297
|
-
|
|
298
|
-
if (this.config.FeedConfigVoltagePhase2) {
|
|
283
|
+
if (this.config.FeedConfigVoltagePhase2)
|
|
299
284
|
tibberFeedConfigs[index].voltagePhase2 = true;
|
|
300
|
-
|
|
301
|
-
if (this.config.FeedConfigVoltagePhase3) {
|
|
285
|
+
if (this.config.FeedConfigVoltagePhase3)
|
|
302
286
|
tibberFeedConfigs[index].voltagePhase3 = true;
|
|
303
|
-
|
|
304
|
-
if (this.config.FeedConfigCurrentL1) {
|
|
287
|
+
if (this.config.FeedConfigCurrentL1)
|
|
305
288
|
tibberFeedConfigs[index].currentL1 = true;
|
|
306
|
-
|
|
307
|
-
if (this.config.FeedConfigCurrentL2) {
|
|
289
|
+
if (this.config.FeedConfigCurrentL2)
|
|
308
290
|
tibberFeedConfigs[index].currentL2 = true;
|
|
309
|
-
|
|
310
|
-
if (this.config.FeedConfigCurrentL3) {
|
|
291
|
+
if (this.config.FeedConfigCurrentL3)
|
|
311
292
|
tibberFeedConfigs[index].currentL3 = true;
|
|
312
|
-
|
|
313
|
-
if (this.config.FeedConfigSignalStrength) {
|
|
293
|
+
if (this.config.FeedConfigSignalStrength)
|
|
314
294
|
tibberFeedConfigs[index].signalStrength = true;
|
|
315
|
-
|
|
316
|
-
tibberPulseInstances[index] = new tibberPulse_1.TibberPulse(tibberFeedConfigs[index], this); //add instance to array
|
|
295
|
+
tibberPulseInstances[index] = new tibberPulse_1.TibberPulse(tibberFeedConfigs[index], this); // add instance to array
|
|
317
296
|
tibberPulseInstances[index].ConnectPulseStream();
|
|
318
297
|
}
|
|
319
298
|
catch (e) {
|
package/build/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wGAAwG;AACxG,8DAAgD;AAEhD,2DAAwD;AACxD,6DAA0D;AAE1D,mDAAgD;AAEhD,MAAM,UAAW,SAAQ,KAAK,CAAC,OAAO;IAMrC,YAAmB,UAAyC,EAAE;QAC7D,KAAK,CAAC;YACL,GAAG,OAAO;YACV,IAAI,EAAE,YAAY;SAClB,CAAC,CAAC;QARJ,iBAAY,GAAgB,EAAE,CAAC;QAC/B,aAAQ,GAAW,EAAE,CAAC;QACtB,qBAAgB,GAAG,IAAI,mCAAgB,CAAC,IAAI,CAAC,CAAC;QAO7C,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1C,IAAI,CAAC,EAAE,CAAC,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACtD,2DAA2D;QAC3D,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC9C,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,oCAAoC,CAAC;IACtD,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,OAAO;QACpB,iDAAiD;QACjD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE;YAChC,oCAAoC;YACpC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;YACjE,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;SAC9C;aAAM;YACN,yDAAyD;YACzD,MAAM,eAAe,GAAY;gBAChC,MAAM,EAAE,IAAI;gBACZ,WAAW,EAAE;oBACZ,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc;oBAClC,QAAQ,EAAE,IAAI,CAAC,QAAQ;iBACvB;aACD,CAAC;YACF,+BAA+B;YAC/B,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;YACnE,IAAI;gBACH,IAAI,CAAC,YAAY,GAAG,MAAM,eAAe,CAAC,kBAAkB,EAAE,CAAC;gBAC/D,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;oBACrC,yCAAyC;oBACzC,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;wBACjC,mDAAmD;wBACnD,MAAM,MAAM,GAAU,EAAE,CAAC;wBACzB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;4BACzC,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,MAAM,CAAC,CAAC;4BACnF,IAAI,CAAC,gBAAgB,EAAE;gCACtB,IAAI,CAAC,GAAG,CAAC,KAAK,CACb,gCAAgC,IAAI,CAAC,MAAM,8HAA8H,CACzK,CAAC;gCACF,SAAS;6BACT;4BACD,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,gBAAgB,CAAC,EAAE,CAAC,EAAE;gCAC3D,IAAI,CAAC,GAAG,CAAC,IAAI,CACZ,oCAAoC,IAAI,CAAC,MAAM,sFAAsF,CACrI,CAAC;gCACF,SAAS;6BACT;4BACD,gBAAgB,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;4BAC9C,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;yBAC9B;wBACD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,YAAY,EAAE;4BACtC,IAAI,CAAC,GAAG,CAAC,KAAK,CACb,wBAAwB,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,SAAS,KAAK,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,gCAAgC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,QAAQ,iCAAiC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,CACjO,CAAC;yBACF;qBACD;iBACD;qBAAM;oBACN,IAAI,CAAC,GAAG,CAAC,IAAI,CACZ,kIAAkI,CAClI,CAAC;iBACF;aACD;YAAC,OAAO,KAAU,EAAE;gBACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,EAAE,kCAAkC,CAAC,CAAC,CAAC;aAChG;YAED,6DAA6D;YAC7D,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;gBAC7D,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;oBACjC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;oBAC7C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,wFAAwF,CAAC,CAAC;iBACzG;qBAAM;oBACN,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;oBAC9C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yFAAyF,CAAC,CAAC;iBAC1G;aACD;YAED,iBAAiB;YACjB,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE;gBAC5D,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;gBACxD,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC;gBACzB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,uBAAuB,CAAC,CAAC;gBAC/D,IAAI,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE;oBACzC,IAAI,cAAc,EAAE;wBACnB,MAAM,MAAM,GAAG,cAAc,CAAC,eAAe,EAAE,CAAC;wBAChD,MAAM;4BACL,MAAM,CAAC,SAAS,CAAC,CAAC,KAAyF,EAAE,EAAE;gCAC9G,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gCACvB,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gCAC3C,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;gCAClD,MAAM,CAAC,cAAc,CAAC,4BAA4B,EAAE,MAAM,CAAC,CAAC,CAAC,eAAe;4BAC7E,CAAC,CAAC,CAAC;qBACJ;oBACD,sHAAsH;oBACtH,IAAI,CAAC,aAAa,CAAC,uBAAuB,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;iBACjF;aACD;YAED,oEAAoE;YACpE,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;gBACnC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iGAAiG,CAAC,CAAC;gBACjH,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE;oBAC5C,IAAI,CAAC,OAAO,EAAE,CAAC;gBAChB,CAAC,EAAE,MAAM,CAAC,CAAC;gBACX,IAAI,cAAc;oBAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;aAC3D;YAED,uDAAuD;YACvD,8CAA8C;YAC9C,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;gBACjC,MAAM,gBAAgB,GAAG,IAAI,mCAAgB,CAAC,IAAI,CAAC,CAAC;gBACpD,kDAAkD;gBAClD,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;oBAC9B,IAAI;wBACH,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oCAAoC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,WAAW,CAAC,CAAC;wBACjG,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE;4BACjD,MAAM,gBAAgB,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;yBAC9G;qBACD;oBAAC,OAAO,KAAU,EAAE;wBACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,EAAE,4BAA4B,CAAC,CAAC,CAAC;qBACzF;iBACD;gBACD,gCAAgC;gBAChC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,YAAY,EAAE;oBACtC,uEAAuE;oBACvE,IAAI;wBACH,MAAM,eAAe,CAAC,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;qBACtE;oBAAC,OAAO,KAAU,EAAE;wBACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,EAAE,6BAA6B,CAAC,CAAC,CAAC;qBAC3F;oBAED,sCAAsC;oBACtC,IAAI;wBACH,MAAM,eAAe,CAAC,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;qBACrE;oBAAC,OAAO,KAAU,EAAE;wBACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,EAAE,4BAA4B,CAAC,CAAC,CAAC;qBAC1F;oBAED,yCAAyC;oBACzC,IAAI;wBACH,MAAM,eAAe,CAAC,oBAAoB,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;qBACxE;oBAAC,OAAO,KAAU,EAAE;wBACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,EAAE,+BAA+B,CAAC,CAAC,CAAC;qBAC7F;oBACD,gBAAgB,CAAC,oBAAoB,EAAE,CAAC;iBACxC;gBAED,MAAM,kBAAkB,GAAG,GAAS,EAAE;oBACrC,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC;oBAC/B,MAAM,mBAAmB,GAAG,EAAE,GAAG,WAAW,CAAC,UAAU,EAAE,GAAG,GAAG,CAAC;oBAChE,UAAU,CACT,KAAK,IAAI,EAAE;wBACV,IAAI,QAAQ,GAAG,KAAK,CAAC;wBACrB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,YAAY,EAAE;4BACtC,MAAM,eAAe;iCACnB,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;iCAC/C,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;gCAChB,QAAQ,GAAG,MAAM,CAAC;4BACnB,CAAC,CAAC;iCACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gCAChB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,EAAE,uBAAuB,CAAC,CAAC,CAAC;4BACrF,CAAC,CAAC,CAAC;yBACJ;wBACD,IAAI,QAAQ,EAAE;4BACb,iDAAiD;4BACjD,gBAAgB,CAAC,oBAAoB,EAAE,CAAC;4BACxC,kBAAkB,EAAE,CAAC;yBACrB;6BAAM;4BACN,qDAAqD;4BACrD,UAAU,CAAC,kBAAkB,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;yBAC9C;oBACF,CAAC,EACD,mBAAmB,GAAG,EAAE,GAAG,IAAI,CAC/B,CAAC;gBACH,CAAC,CAAC;gBACF,kBAAkB,EAAE,CAAC;gBAErB,MAAM,8BAA8B,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE;oBAC5D,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,YAAY,EAAE;wBACtC,IAAI;4BACH,eAAe,CAAC,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;yBAC/D;wBAAC,OAAO,KAAU,EAAE;4BACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,EAAE,sBAAsB,CAAC,CAAC,CAAC;yBACnF;wBACD,IAAI;4BACH,eAAe,CAAC,oBAAoB,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;yBAClE;wBAAC,OAAO,KAAU,EAAE;4BACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,CAAC,CAAC,CAAC;yBACtF;qBACD;gBACF,CAAC,EAAE,OAAO,CAAC,CAAC;gBACZ,IAAI,8BAA8B;oBAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;gBAE3F,iDAAiD;gBACjD,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;oBACtD,uDAAuD;oBACvD,MAAM,iBAAiB,GAAc,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE;wBAC1F,OAAO;4BACN,MAAM,EAAE,IAAI;4BACZ,WAAW,EAAE;gCACZ,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc;gCAClC,QAAQ,EAAE,IAAI,CAAC,QAAQ;6BACvB;4BACD,SAAS,EAAE,IAAI;yBACf,CAAC;oBACH,CAAC,CAAC,CAAC;oBACH,MAAM,oBAAoB,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,kCAAkC;oBACpG,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,YAAY,EAAE;wBACtC,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,UAAU,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE;4BAC7E,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mDAAmD,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;4BACjG,IAAI;gCACH,iCAAiC;gCACjC,iBAAiB,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;gCAC9D,iBAAiB,CAAC,KAAK,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC;gCACtC,IAAI,IAAI,CAAC,MAAM,CAAC,8BAA8B;oCAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,oBAAoB,GAAG,IAAI,CAAC;gCACrG,IAAI,IAAI,CAAC,MAAM,CAAC,gCAAgC;oCAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,sBAAsB,GAAG,IAAI,CAAC;gCACzG,IAAI,IAAI,CAAC,MAAM,CAAC,+BAA+B;oCAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,qBAAqB,GAAG,IAAI,CAAC;gCACvG,IAAI,IAAI,CAAC,MAAM,CAAC,wCAAwC;oCAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,8BAA8B,GAAG,IAAI,CAAC;gCACzH,IAAI,IAAI,CAAC,MAAM,CAAC,uCAAuC;oCAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,6BAA6B,GAAG,IAAI,CAAC;gCACvH,IAAI,IAAI,CAAC,MAAM,CAAC,yBAAyB;oCAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,eAAe,GAAG,IAAI,CAAC;gCAC3F,IAAI,IAAI,CAAC,MAAM,CAAC,yBAAyB;oCAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,iBAAiB,GAAG,IAAI,CAAC;gCAC7F,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB;oCAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC;gCAC7E,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB;oCAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC;gCAC7E,IAAI,IAAI,CAAC,MAAM,CAAC,sBAAsB;oCAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,YAAY,GAAG,IAAI,CAAC;gCACrF,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB;oCAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC;gCAC7E,IAAI,IAAI,CAAC,MAAM,CAAC,yBAAyB;oCAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,eAAe,GAAG,IAAI,CAAC;gCAC3F,IAAI,IAAI,CAAC,MAAM,CAAC,4BAA4B;oCAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,kBAAkB,GAAG,IAAI,CAAC;gCACjG,IAAI,IAAI,CAAC,MAAM,CAAC,4BAA4B;oCAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,kBAAkB,GAAG,IAAI,CAAC;gCACjG,IAAI,IAAI,CAAC,MAAM,CAAC,6BAA6B;oCAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,mBAAmB,GAAG,IAAI,CAAC;gCACnG,IAAI,IAAI,CAAC,MAAM,CAAC,qBAAqB;oCAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,WAAW,GAAG,IAAI,CAAC;gCACnF,IAAI,IAAI,CAAC,MAAM,CAAC,uBAAuB;oCAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,aAAa,GAAG,IAAI,CAAC;gCACvF,IAAI,IAAI,CAAC,MAAM,CAAC,uBAAuB;oCAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,aAAa,GAAG,IAAI,CAAC;gCACvF,IAAI,IAAI,CAAC,MAAM,CAAC,uBAAuB;oCAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,aAAa,GAAG,IAAI,CAAC;gCACvF,IAAI,IAAI,CAAC,MAAM,CAAC,mBAAmB;oCAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC;gCAC/E,IAAI,IAAI,CAAC,MAAM,CAAC,mBAAmB;oCAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC;gCAC/E,IAAI,IAAI,CAAC,MAAM,CAAC,mBAAmB;oCAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC;gCAC/E,IAAI,IAAI,CAAC,MAAM,CAAC,wBAAwB;oCAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,cAAc,GAAG,IAAI,CAAC;gCACzF,oBAAoB,CAAC,KAAK,CAAC,GAAG,IAAI,yBAAW,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,wBAAwB;gCACvG,oBAAoB,CAAC,KAAK,CAAC,CAAC,kBAAkB,EAAE,CAAC;6BACjD;4BAAC,OAAO,CAAC,EAAE;gCACX,IAAI,CAAC,GAAG,CAAC,IAAI,CAAE,CAAW,CAAC,OAAO,CAAC,CAAC;6BACpC;yBACD;6BAAM;4BACN,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,2FAA2F,CAAC,CAAC;yBAC3G;qBACD;iBACD;aACD;SACD;IACF,CAAC;IAED;;OAEG;IACK,SAAS,CAAC,GAAQ;QACzB,IAAI,GAAG,EAAE;YACR,QAAQ,GAAG,CAAC,OAAO,EAAE;gBACpB,KAAK,gBAAgB;oBACpB,IAAI,GAAG,CAAC,QAAQ,EAAE;wBACjB,IAAI;4BACH,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;gCACjC,IAAI,CAAC,MAAM,CACV,GAAG,CAAC,IAAI,EACR,GAAG,CAAC,OAAO,EACX,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oCAChC,KAAK,EAAE,GAAG,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,EAAE,GAAG;oCACvC,KAAK,EAAE,IAAI,CAAC,EAAE;iCACd,CAAC,CAAC,EACH,GAAG,CAAC,QAAQ,CACZ,CAAC;6BACF;iCAAM;gCACN,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;gCACpE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;6BACzG;yBACD;wBAAC,OAAO,KAAK,EAAE;4BACf,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;yBACzG;qBACD;oBACD,MAAM;aACP;SACD;IACF,CAAC;IAED;;OAEG;IACK,QAAQ,CAAC,QAAoB;QACpC,IAAI;YACH,yEAAyE;YACzE,0BAA0B;YAC1B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,YAAY,EAAE;gBACtC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;aAC7C;YACD,8CAA8C;YAC9C,IAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;YAC9C,QAAQ,EAAE,CAAC;SACX;QAAC,OAAO,CAAC,EAAE;YACX,QAAQ,EAAE,CAAC;SACX;IACF,CAAC;IAED;;OAEG;IACK,aAAa,CAAC,EAAU,EAAE,KAAwC;QACzE,IAAI;YACH,IAAI,KAAK,EAAE;gBACV,wBAAwB;gBACxB,6EAA6E;gBAC7E,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE;oBACf,IAAI,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE;wBAClC,MAAM,SAAS,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;wBAChC,MAAM,aAAa,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;wBACnC,MAAM,WAAW,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC3C,MAAM,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;wBACjC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,IAAI,WAAW,KAAK,SAAS,EAAE;4BACxG,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,QAAQ,KAAK,aAAa,EAAE;gCACvE,QAAQ,WAAW,EAAE;oCACpB,KAAK,QAAQ;wCACZ,wDAAwD;wCACxD,IAAI,OAAO,KAAK,CAAC,GAAG,KAAK,SAAS,EAAE;4CACnC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC;4CAC7D,IAAI,CAAC,GAAG,CAAC,KAAK,CACb,sCAAsC,aAAa,eAAe,WAAW,yBAAyB,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CACxJ,CAAC;4CACF,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;yCACxC;6CAAM;4CACN,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;yCACxD;wCACD,MAAM;oCACP,KAAK,cAAc;wCAClB,6DAA6D;wCAC7D,IAAI,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ,EAAE;4CAClC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,cAAc,GAAG,KAAK,CAAC,GAAG,CAAC;4CACnE,IAAI,CAAC,GAAG,CAAC,KAAK,CACb,sCAAsC,aAAa,eAAe,WAAW,+BAA+B,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,cAAc,EAAE,CACpK,CAAC;4CACF,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;yCACxC;6CAAM;4CACN,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kCAAkC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;yCAC9D;wCACD,MAAM;oCACP,KAAK,aAAa;wCACjB,4DAA4D;wCAC5D,IAAI,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ,EAAE;4CAClC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,aAAa,GAAG,KAAK,CAAC,GAAG,CAAC;4CAClE,IAAI,CAAC,GAAG,CAAC,KAAK,CACb,sCAAsC,aAAa,eAAe,WAAW,8BAA8B,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,aAAa,EAAE,CAClK,CAAC;4CACF,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;yCACxC;6CAAM;4CACN,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iCAAiC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;yCAC7D;wCACD,MAAM;oCACP;wCACC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mCAAmC,WAAW,EAAE,CAAC,CAAC;iCAClE;gCACD,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,EAAE,CAAC;6BAC7C;iCAAM;gCACN,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iEAAiE,CAAC,CAAC;6BAClF;yBACD;qBACD;iBACD;aACD;iBAAM;gBACN,wBAAwB;gBACxB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;aACrC;SACD;QAAC,OAAO,CAAC,EAAE;YACX,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iDAAiD,CAAC,EAAE,CAAC,CAAC;SACrE;IACF,CAAC;CACD;AAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE;IAC5B,yCAAyC;IACzC,MAAM,CAAC,OAAO,GAAG,CAAC,OAAkD,EAAE,EAAE,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;CACjG;KAAM;IACN,wCAAwC;IACxC,CAAC,GAAG,EAAE,CAAC,IAAI,UAAU,EAAE,CAAC,EAAE,CAAC;CAC3B"}
|
package/io-package.json
CHANGED
|
@@ -1,8 +1,21 @@
|
|
|
1
1
|
{
|
|
2
2
|
"common": {
|
|
3
3
|
"name": "tibberlink",
|
|
4
|
-
"version": "1.
|
|
4
|
+
"version": "1.4.0",
|
|
5
5
|
"news": {
|
|
6
|
+
"1.4.0": {
|
|
7
|
+
"en": "implement min/max states (#131); fix error with ignored calculator channel deactivations (#143)",
|
|
8
|
+
"de": "Implementiere Min-/Max-Werte (#131); Behebung des Fehlers bei ignorierten Deaktivierungen von Taschenrechnerkanälen (#143)",
|
|
9
|
+
"ru": "Реализованы состояния минимума/максимума (#131); исправлена ошибка с игнорированием деактивации калькуляторных каналов (#143)",
|
|
10
|
+
"pt": "Implementar estados mínimo/máximo (#131); corrigir erro de desativações ignoradas de canais de calculadora (#143)",
|
|
11
|
+
"nl": "Implementeer min/max-statussen (#131); fout opgelost met genegeerde deactiveringen van rekenmachinekanalen (#143)",
|
|
12
|
+
"fr": "Mise en œuvre des états min/max (#131); correction de l'erreur d'activation ignorée des canaux de calcul (#143)",
|
|
13
|
+
"it": "Implementa stati min/max (#131); risoluzione dell'errore con disattivazioni ignorate dei canali del calcolatore (#143)",
|
|
14
|
+
"es": "Implementar estados mínimo/máximo (#131); corregir error de desactivaciones de canales de calculadora ignoradas (#143)",
|
|
15
|
+
"pl": "Wdrożenie stanów min/max (#131); naprawa błędu z pominiętymi dezaktywacjami kanałów kalkulatora (#143)",
|
|
16
|
+
"uk": "Реалізовано стани мінімуму/максимуму (#131); виправлено помилку з ігноруванням деактивації калькуляторних каналів (#143)",
|
|
17
|
+
"zh-cn": "实现最小/最大状态 (#131); 修复忽略计算器通道停用错误 (#143)"
|
|
18
|
+
},
|
|
6
19
|
"1.3.1": {
|
|
7
20
|
"en": "Changed message 'reconnect successful' to level info (#80); fixed initialization of channel states (#141)",
|
|
8
21
|
"de": "Geänderte Meldung 'Neuverbindung erfolgreich' auf Stufe Info (#80); behob die Initialisierung der Kanalzustände (#141)",
|
|
@@ -237,19 +250,6 @@
|
|
|
237
250
|
"uk": "увімкніть правильний ціновий пил також для адаптерів, що працюють в різних часових поясах (#63)",
|
|
238
251
|
"zh-cn": "能够纠正价格污染,使不同时间区(63年)的适应行动更加适应。"
|
|
239
252
|
},
|
|
240
|
-
"0.2.2": {
|
|
241
|
-
"en": "reducing polls at Tibber server by precheck of known data, code optimizations, fix config screen (#55)",
|
|
242
|
-
"de": "Reduktion von Anfragen am Tibber-Server durch Vorprüfung bekannter Daten, Codeoptimierungen, Fix Config-Bildschirm (#55)",
|
|
243
|
-
"ru": "сокращение опросов на сервере Tibber путем предварительного проверки известных данных, оптимизации кода, фиксации config экрана (#55)",
|
|
244
|
-
"pt": "reduzindo pesquisas no servidor Tibber por pré-verificação de dados conhecidos, otimizações de código, corrigir tela de configuração (#55)",
|
|
245
|
-
"nl": "polls verminderen bij Tibberserver met voorzien van bekende gegevens, code optimaties, config screen repareren",
|
|
246
|
-
"fr": "réduire les sondages sur le serveur Tibber en prévérant les données connues, les optimisations de code, fixer l'écran de configuration (#55)",
|
|
247
|
-
"it": "ridurre i sondaggi al server Tibber precheck di dati noti, ottimizzazioni di codice, fix config screen (#55)",
|
|
248
|
-
"es": "reducir las encuestas en el servidor Tibber por precheck de datos conocidos, optimizaciones de códigos, fijar la pantalla de configuración (#55)",
|
|
249
|
-
"pl": "zmniejszanie zanieczyszczeń w serwerze Tibber poprzez sprawdzanie znanych danych, optymalizacje kodu, naprawy ekranu (#55)",
|
|
250
|
-
"uk": "знижувати опитування на сервері Tibber за допомогою пречбеку відомих даних, оптимізації коду, фіксації екрана конфігурації (#55)",
|
|
251
|
-
"zh-cn": "通过预先检查已知数据、守则优化、固定集群筛查(第55号)减少Tibber服务器的污染"
|
|
252
|
-
},
|
|
253
253
|
"0.2.0": {
|
|
254
254
|
"en": "introduces JSONs for prices sorted by total price ascending",
|
|
255
255
|
"de": "führt JSONs für Preise sortiert nach Gesamtpreis aufsteigend ein",
|