iobroker.tibberlink 1.1.0 → 1.1.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 +70 -24
- package/admin/i18n/de/translations.json +1 -1
- package/admin/i18n/en/translations.json +1 -1
- package/admin/i18n/es/translations.json +1 -1
- package/admin/i18n/fr/translations.json +1 -1
- package/admin/i18n/it/translations.json +1 -1
- package/admin/i18n/nl/translations.json +1 -1
- package/admin/i18n/pl/translations.json +1 -1
- package/admin/i18n/pt/translations.json +1 -1
- package/admin/i18n/ru/translations.json +1 -1
- package/admin/i18n/uk/translations.json +1 -1
- package/admin/i18n/zh-cn/translations.json +1 -1
- package/build/lib/tibberCalculator.js +34 -4
- package/build/lib/tibberCalculator.js.map +1 -1
- package/build/main.js +3 -3
- package/build/main.js.map +1 -1
- package/io-package.json +27 -40
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -16,151 +16,197 @@
|
|
|
16
16
|
[](https://nodei.co/npm/iobroker.tibberlink/)
|
|
17
17
|
|
|
18
18
|
## Adapter for utilizing TIBBER energy data in ioBroker
|
|
19
|
+
|
|
19
20
|
This adapter connects data from your Tibber account API for use in ioBroker. It can be used for single or multiple homes.
|
|
20
21
|
|
|
21
22
|
If you're not a Tibber user currently, it would be greatly appreciated if you use my referral link:
|
|
22
23
|
[https://invite.tibber.com/2gwuign3.](https://invite.tibber.com/2gwuign3.)
|
|
23
24
|
|
|
24
25
|
## Standard Configuration
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
26
|
+
|
|
27
|
+
- Create a new instance of the adapter
|
|
28
|
+
- You will also need an API token from Tibber. Get it here: [https://developer.tibber.com/](https://developer.tibber.com/)
|
|
29
|
+
- Enter your Tibber API token in the standard settings and create at least one line for live feed configuration (select "None available").
|
|
30
|
+
- Save the settings and exit the configaration to restart the adapter (your home(s) will now be queried from the Tibber server).
|
|
31
|
+
- Return to the configuration screen and select the homes from which you want to pull real-time data from your Tibber Pulse or select homes and disable the feed - (!! Only works if hardware is installed and the Tibber server has verified the connection to Pulse).
|
|
32
|
+
- Save the settings.
|
|
31
33
|
|
|
32
34
|
## Calculator Configuration
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
35
|
+
|
|
36
|
+
- Since the Tibber connection is up and running, you can also use the Calculator to include some automation add-ons in the TibberLink adapter.
|
|
37
|
+
- The Calculator works with channels. Each channel is linked to a selected home.
|
|
38
|
+
- Channels can be activated or deactivated in a corresponding state.
|
|
39
|
+
- All states of a calculator channel are placed near the homes states, named by the channel number.
|
|
40
|
+
- The behavior of a channel is defined by its type: "best cost"; "best single hours" - not implemented yet; "best hours block" - not implemented yet.
|
|
41
|
+
- Each channel has an external state as output, which can be chosen in the settings tab. This state could be, for example, "0_userdata.0.example_state" or any other writable external state.
|
|
42
|
+
- The values to be written to the output state can be defined in "value YES" and "value NO," e.g., "true" for boolean states, or a number or text to be written.
|
|
43
|
+
- Outputs:
|
|
44
|
+
- "Best cost": Uses the "TriggerPrice" state as input - output is "YES" every hour the current Tibber energy cost is below the trigger price.
|
|
45
|
+
- "Best single hours" - not implemented yet.
|
|
46
|
+
- "Best hours block" - not implemented yet.
|
|
44
47
|
|
|
45
48
|
## Notes
|
|
49
|
+
|
|
46
50
|
This adapter uses Sentry libraries to automatically report exceptions and code errors to the developers. For more details and information on how to disable the error reporting; see the [Sentry-Plugin Documentation](https://github.com/ioBroker/plugin-sentry#plugin-sentry)! Sentry reporting is used starting with js-controller 3.0.
|
|
47
51
|
|
|
48
52
|
## Changelog
|
|
53
|
+
|
|
49
54
|
! Note that missing version entries are typically dependency updates for improved security.
|
|
50
55
|
|
|
56
|
+
### 1.2.0 (2023-10-2x) WORK in PROGRESS
|
|
57
|
+
|
|
58
|
+
- (HombachC) implement tibber calculator mode "best single hours" (#16)
|
|
59
|
+
|
|
60
|
+
### 1.1.2 (2023-10-15)
|
|
61
|
+
|
|
62
|
+
- (HombachC) fix timing error in calculator
|
|
63
|
+
|
|
64
|
+
### 1.1.1 (2023-10-14)
|
|
65
|
+
|
|
66
|
+
- (HombachC) fix error in startup of additional channels
|
|
67
|
+
|
|
51
68
|
### 1.1.0 (2023-10-14)
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
69
|
+
|
|
70
|
+
- (HombachC) implement tibber calculator mode "best price" (#16)
|
|
71
|
+
- (HombachC) precised pull times of current cost
|
|
72
|
+
- (HombachC) reduced error messages (#80)
|
|
73
|
+
- (HombachC) extend documentation
|
|
74
|
+
- (HombachC) update adapter-core
|
|
57
75
|
|
|
58
76
|
### 1.0.0 (2023-10-05)
|
|
59
|
-
|
|
60
|
-
|
|
77
|
+
|
|
78
|
+
- (HombachC) Increase to the first major release, as now a stable level is reached
|
|
79
|
+
- (HombachC) Code cleanup
|
|
61
80
|
|
|
62
81
|
### 0.4.2 (2023-10-03)
|
|
82
|
+
|
|
63
83
|
- (HombachC) fixed error with polling multiple homes live data (#108)
|
|
64
84
|
- (HombachC) Lots of dependency updates; code optimizations
|
|
65
85
|
|
|
66
86
|
### 0.4.1 (2023-09-24)
|
|
87
|
+
|
|
67
88
|
- (HombachC) Hardened 2 typeerrors uppon sentry recognition
|
|
68
89
|
- (HombachC) Fix error with not deleted averages of tomorrow pricing (#95)
|
|
69
90
|
- (HombachC) preparations for tibber calculator
|
|
70
91
|
|
|
71
92
|
### 0.4.0 (2023-09-20)
|
|
93
|
+
|
|
72
94
|
- (HombachC) Added daily average price values (#89)
|
|
73
95
|
|
|
74
96
|
### 0.3.3 (2023-09-17)
|
|
97
|
+
|
|
75
98
|
- (HombachC) Fixed false positive connection message (#87)
|
|
76
99
|
- (HombachC) Updated translations with ChatGPT
|
|
77
100
|
- (HombachC) preparations for tibber calculator
|
|
78
101
|
|
|
79
102
|
### 0.3.2 (2023-09-14)
|
|
103
|
+
|
|
80
104
|
- (HombachC) Fixed error when starting adapter first time (#82)
|
|
81
105
|
- (HombachC) Fixed error in admin config from 0.3.0 (#81)
|
|
82
106
|
|
|
83
107
|
### 0.3.1 (2023-09-13)
|
|
108
|
+
|
|
84
109
|
- (HombachC) Mitigate error in admin config from 0.3.0 (#81)
|
|
85
110
|
- (HombachC) Change logging of TibberFeed errors from type error to type warn - because of too many downtimes of Tibber server (#80)
|
|
86
111
|
|
|
87
112
|
### 0.3.0 (2023-09-12)
|
|
113
|
+
|
|
88
114
|
- (HombachC) BREAKING: change Pulse usage to be configurable for all homes seperately (#41)
|
|
89
115
|
- (HombachC) optimize code again to mitigate set state timing for long JSON states (#68)
|
|
90
116
|
- (HombachC) preparations for tibber calculator
|
|
91
117
|
|
|
92
118
|
### 0.2.7 (2023-09-07)
|
|
119
|
+
|
|
93
120
|
- (HombachC) reducing polls at Tibber server by precheck of current price data
|
|
94
121
|
- (HombachC) preparations for tibber calculator
|
|
95
122
|
|
|
96
123
|
### 0.2.6 (2023-09-04)
|
|
124
|
+
|
|
97
125
|
- (HombachC) fix error with boolean states
|
|
98
126
|
|
|
99
127
|
### 0.2.5 (2023-09-03)
|
|
128
|
+
|
|
100
129
|
- (HombachC) optimize code to mitigate set state timing for long JSON states (#68)
|
|
101
130
|
|
|
102
131
|
### 0.2.4 (2023-08-30)
|
|
132
|
+
|
|
103
133
|
- (HombachC) enable correct price poll also for adapter running in different timezones (#63)
|
|
104
134
|
|
|
105
135
|
### 0.2.3 (2023-08-27)
|
|
136
|
+
|
|
106
137
|
- (HombachC) fix error in 0.2.2 in start conditions of adapter
|
|
107
138
|
|
|
108
139
|
### 0.2.2 (2023-08-24)
|
|
140
|
+
|
|
109
141
|
- (HombachC) reducing polls at Tibber server by precheck of known data
|
|
110
142
|
- (HombachC) code optimizations
|
|
111
143
|
- (HombachC) fix config screen (#55)
|
|
112
144
|
|
|
113
145
|
### 0.2.1 (2023-08-21)
|
|
146
|
+
|
|
114
147
|
- (HombachC) double timeout for Tibber server queries
|
|
115
148
|
|
|
116
149
|
### 0.2.0 (2023-08-18)
|
|
150
|
+
|
|
117
151
|
- (HombachC) introduces JSONs for prices sorted by price ascending
|
|
118
152
|
- (HombachC) fix stupid error for obsolete next day pricing (#23, #50)
|
|
119
153
|
|
|
120
154
|
### 0.1.10 (2023-08-15)
|
|
155
|
+
|
|
121
156
|
- (HombachC) bump dependencies, code cleanups
|
|
122
157
|
- (HombachC) preparations for tibber calculator
|
|
123
158
|
- (HombachC) mitigate multi homes & pulse problems (#41)
|
|
124
159
|
- (HombachC) add documentation to config screen (#47)
|
|
125
160
|
|
|
126
161
|
### 0.1.9 (2023-08-14)
|
|
162
|
+
|
|
127
163
|
- (HombachC) optimizing fetching homes list (#32) after Tibber server error, restart adapter in case of trouble
|
|
128
164
|
|
|
129
165
|
### 0.1.8 (2023-08-12)
|
|
166
|
+
|
|
130
167
|
- (HombachC) bump dev-dependencies, fix eslint/prettier issue
|
|
131
168
|
|
|
132
169
|
### 0.1.7 (2023-08-11)
|
|
170
|
+
|
|
133
171
|
- (HombachC) code cleanup, fix error for obsolete next day pricing (#23)
|
|
134
172
|
- (HombachC) add another try/catch while fetching homes list (#32)
|
|
135
173
|
|
|
136
174
|
### 0.1.6 (2023-07-30)
|
|
175
|
+
|
|
137
176
|
- (HombachC) add units for live data, bump adapter-core to 3.x
|
|
138
177
|
|
|
139
178
|
### 0.1.5 (2023-07-18)
|
|
179
|
+
|
|
140
180
|
- (HombachC) fix error in sentry logging
|
|
141
181
|
|
|
142
182
|
### 0.1.4 (2023-07-17)
|
|
183
|
+
|
|
143
184
|
- (HombachC) BREAKING: encrypted API-Token in ioBroker
|
|
144
185
|
- (HombachC) rearranged configuration options
|
|
145
186
|
- (HombachC) fixed bug in state generation
|
|
146
187
|
|
|
147
188
|
### 0.1.3 (2023-07-17)
|
|
189
|
+
|
|
148
190
|
- (HombachC) all log messages in English
|
|
149
191
|
- (HombachC) remove unused state change handler
|
|
150
192
|
- (HombachC) fixed state roles
|
|
151
193
|
|
|
152
194
|
### 0.1.2 (2023-07-17)
|
|
195
|
+
|
|
153
196
|
- (HombachC) round grid consumption meter values to Wh accuracy
|
|
154
197
|
- (HombachC) hide unused checkboxes in config
|
|
155
198
|
- (HombachC) fix snyc and appveyor
|
|
156
199
|
|
|
157
200
|
### 0.1.1 (2023-07-16)
|
|
201
|
+
|
|
158
202
|
- (HombachC) remove release script and dev-server
|
|
159
203
|
|
|
160
204
|
### 0.1.0 (2023-07-14)
|
|
205
|
+
|
|
161
206
|
- (HombachC) initial version
|
|
162
207
|
|
|
163
208
|
## License
|
|
209
|
+
|
|
164
210
|
GNU General Public License v3.0 only
|
|
165
211
|
|
|
166
212
|
Copyright (c) 2023 Hombach <TibberLink@homba.ch>
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"s_ChannelHome": "Kanal Zuhause",
|
|
14
14
|
"s_ChannelType": "Kanaltyp",
|
|
15
15
|
"s_BestCost": "Beste Kosten",
|
|
16
|
-
"s_BestSingleHours": "Beste Einzelstunden
|
|
16
|
+
"s_BestSingleHours": "Beste Einzelstunden",
|
|
17
17
|
"s_BestHoursBlock": "Beste Stundenblöcke - Nicht implementiert",
|
|
18
18
|
"s_Active": "Aktiv",
|
|
19
19
|
"s_TargetState": "Ziel State",
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"s_ChannelHome": "Channel Home",
|
|
14
14
|
"s_ChannelType": "Channel Type",
|
|
15
15
|
"s_BestCost": "best cost",
|
|
16
|
-
"s_BestSingleHours": "best single hours
|
|
16
|
+
"s_BestSingleHours": "best single hours",
|
|
17
17
|
"s_BestHoursBlock": "best hours block- not implemented",
|
|
18
18
|
"s_Active": "Active",
|
|
19
19
|
"s_TargetState": "Target State",
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"s_ChannelHome": "Canal Casa",
|
|
14
14
|
"s_ChannelType": "Tipo de canal",
|
|
15
15
|
"s_BestCost": "Mejor costo",
|
|
16
|
-
"s_BestSingleHours": "Mejores horas individuales
|
|
16
|
+
"s_BestSingleHours": "Mejores horas individuales",
|
|
17
17
|
"s_BestHoursBlock": "Mejor bloque de horas - No implementado",
|
|
18
18
|
"s_Active": "Activo",
|
|
19
19
|
"s_TargetState": "Estado objetivo",
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"s_ChannelHome": "Canal Maison",
|
|
14
14
|
"s_ChannelType": "Type de canal",
|
|
15
15
|
"s_BestCost": "Meilleur coût",
|
|
16
|
-
"s_BestSingleHours": "Meilleures heures individuelles
|
|
16
|
+
"s_BestSingleHours": "Meilleures heures individuelles",
|
|
17
17
|
"s_BestHoursBlock": "Meilleur bloc d'heures - Non implémenté",
|
|
18
18
|
"s_Active": "Actif",
|
|
19
19
|
"s_TargetState": "État cible",
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"s_ChannelHome": "Canale Casa",
|
|
14
14
|
"s_ChannelType": "Tipo di canale",
|
|
15
15
|
"s_BestCost": "Miglior costo",
|
|
16
|
-
"s_BestSingleHours": "Migliori ore singole
|
|
16
|
+
"s_BestSingleHours": "Migliori ore singole",
|
|
17
17
|
"s_BestHoursBlock": "Miglior blocco di ore - Non implementato",
|
|
18
18
|
"s_Active": "Attivo",
|
|
19
19
|
"s_TargetState": "Stato obiettivo",
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"s_ChannelHome": "Kanaal Thuis",
|
|
14
14
|
"s_ChannelType": "Kanaaltype",
|
|
15
15
|
"s_BestCost": "Beste kostprijs",
|
|
16
|
-
"s_BestSingleHours": "Beste enkele uren
|
|
16
|
+
"s_BestSingleHours": "Beste enkele uren",
|
|
17
17
|
"s_BestHoursBlock": "Beste urenreeks - Niet ge�mplementeerd",
|
|
18
18
|
"s_Active": "Actief",
|
|
19
19
|
"s_TargetState": "Doelstaat",
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"s_ChannelHome": "Kanał domowy",
|
|
14
14
|
"s_ChannelType": "Typ kanału",
|
|
15
15
|
"s_BestCost": "Najlepszy koszt",
|
|
16
|
-
"s_BestSingleHours": "Najlepsze pojedyncze godziny
|
|
16
|
+
"s_BestSingleHours": "Najlepsze pojedyncze godziny",
|
|
17
17
|
"s_BestHoursBlock": "Najlepszy blok godzin - Nie zaimplementowane",
|
|
18
18
|
"s_Active": "Aktywny",
|
|
19
19
|
"s_TargetState": "Stan docelowy",
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"s_ChannelHome": "Canal Casa",
|
|
14
14
|
"s_ChannelType": "Tipo de canal",
|
|
15
15
|
"s_BestCost": "Melhor custo",
|
|
16
|
-
"s_BestSingleHours": "Melhores horas individuais
|
|
16
|
+
"s_BestSingleHours": "Melhores horas individuais",
|
|
17
17
|
"s_BestHoursBlock": "Melhor bloco de horas - Não implementado",
|
|
18
18
|
"s_Active": "Ativo",
|
|
19
19
|
"s_TargetState": "Estado alvo",
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"s_ChannelHome": "Канал Дом",
|
|
14
14
|
"s_ChannelType": "Тип канала",
|
|
15
15
|
"s_BestCost": "Лучшие затраты",
|
|
16
|
-
"s_BestSingleHours": "Лучшие одиночные часы
|
|
16
|
+
"s_BestSingleHours": "Лучшие одиночные часы",
|
|
17
17
|
"s_BestHoursBlock": "Лучший блок часов - Не реализовано",
|
|
18
18
|
"s_Active": "Активен",
|
|
19
19
|
"s_TargetState": "Целевое состояние",
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"s_ChannelHome": "Канал Дім",
|
|
14
14
|
"s_ChannelType": "Тип каналу",
|
|
15
15
|
"s_BestCost": "Кращі витрати",
|
|
16
|
-
"s_BestSingleHours": "Кращі окремі години
|
|
16
|
+
"s_BestSingleHours": "Кращі окремі години",
|
|
17
17
|
"s_BestHoursBlock": "Кращий блок годин - Не реалізовано",
|
|
18
18
|
"s_Active": "Активний",
|
|
19
19
|
"s_TargetState": "Цільовий стан",
|
|
@@ -12,7 +12,10 @@ class TibberCalculator extends tibberHelper_1.TibberHelper {
|
|
|
12
12
|
this.adapter.config.CalculatorList[channel].chTriggerPrice = 0;
|
|
13
13
|
}
|
|
14
14
|
this.checkAndSetValueNumber(this.getStatePrefix(homeId, `Calculations.${channel}`, `TriggerPrice`), this.adapter.config.CalculatorList[channel].chTriggerPrice, `pricelevel to trigger this channel at`, true, true);
|
|
15
|
-
|
|
15
|
+
if (this.adapter.config.CalculatorList[channel].chActive === undefined) {
|
|
16
|
+
this.adapter.config.CalculatorList[channel].chActive = false;
|
|
17
|
+
}
|
|
18
|
+
this.checkAndSetValueBoolean(this.getStatePrefix(homeId, `Calculations.${channel}`, `Active`), this.adapter.config.CalculatorList[channel].chActive, `Whether the calculation channel is active`, true, true);
|
|
16
19
|
if (this.adapter.config.CalculatorList[channel].chAmountHours === undefined) {
|
|
17
20
|
this.adapter.config.CalculatorList[channel].chAmountHours = 0;
|
|
18
21
|
}
|
|
@@ -33,10 +36,10 @@ class TibberCalculator extends tibberHelper_1.TibberHelper {
|
|
|
33
36
|
this.executeCalculatorBestCost(parseInt(channel));
|
|
34
37
|
break;
|
|
35
38
|
case tibberHelper_1.enCalcType.BestSingleHours:
|
|
36
|
-
//
|
|
39
|
+
//this.executeCalculatorBestSingleHours(parseInt(channel));
|
|
37
40
|
break;
|
|
38
41
|
case tibberHelper_1.enCalcType.BestHoursBlock:
|
|
39
|
-
//
|
|
42
|
+
//this.executeCalculatorBestHoursBlock(parseInt(channel));
|
|
40
43
|
break;
|
|
41
44
|
default:
|
|
42
45
|
this.adapter.log.debug(`unknown value for calculator type: ${this.adapter.config.CalculatorList[channel].chType}`);
|
|
@@ -51,13 +54,16 @@ class TibberCalculator extends tibberHelper_1.TibberHelper {
|
|
|
51
54
|
async executeCalculatorBestCost(channel) {
|
|
52
55
|
try {
|
|
53
56
|
const currentPrice = await this.getStateValue(`Homes.${this.adapter.config.CalculatorList[channel].chHomeID}.CurrentPrice.total`);
|
|
57
|
+
//this.adapter.log.debug(`currentPrice: ${currentPrice}`);
|
|
54
58
|
if (this.adapter.config.CalculatorList[channel].chTriggerPrice > currentPrice && this.adapter.config.CalculatorList[channel].chActive) {
|
|
55
59
|
this.adapter.setForeignStateAsync(this.adapter.config.CalculatorList[channel].chTargetState, convertValue(this.adapter.config.CalculatorList[channel].chValueOn));
|
|
60
|
+
//this.adapter.log.debug(`debug point eCBC-1: Trigger: ${this.adapter.config.CalculatorList[channel].chTriggerPrice}`);
|
|
56
61
|
}
|
|
57
62
|
else {
|
|
58
63
|
this.adapter.setForeignStateAsync(this.adapter.config.CalculatorList[channel].chTargetState, convertValue(this.adapter.config.CalculatorList[channel].chValueOff));
|
|
64
|
+
//this.adapter.log.debug(`debug point eCBC-2: Trigger: ${this.adapter.config.CalculatorList[channel].chTriggerPrice}`);
|
|
59
65
|
}
|
|
60
|
-
this.adapter.log.debug(`calculator channel: ${channel} setting state: ${this.adapter.config.CalculatorList[channel].chTargetState}`);
|
|
66
|
+
this.adapter.log.debug(`calculator channel: ${channel}-best price; setting state: ${this.adapter.config.CalculatorList[channel].chTargetState}`);
|
|
61
67
|
}
|
|
62
68
|
catch (error) {
|
|
63
69
|
this.adapter.log.warn(this.generateErrorMessage(error, `execute calculator for best price in channel ${channel}`));
|
|
@@ -65,6 +71,24 @@ class TibberCalculator extends tibberHelper_1.TibberHelper {
|
|
|
65
71
|
}
|
|
66
72
|
async executeCalculatorBestSingleHours(channel) {
|
|
67
73
|
try {
|
|
74
|
+
const currentDateTime = new Date();
|
|
75
|
+
const jsonPrices = JSON.parse(await this.getStateValue(`Homes.${this.adapter.config.CalculatorList[channel].chHomeID}.PricesToday.json`));
|
|
76
|
+
// function to check for equal hour values
|
|
77
|
+
function checkHourMatch(entry) {
|
|
78
|
+
const startDateTime = new Date(entry.startsAt);
|
|
79
|
+
return currentDateTime.getHours() === startDateTime.getHours();
|
|
80
|
+
}
|
|
81
|
+
// get first n entries und test for matching hour
|
|
82
|
+
const n = this.adapter.config.CalculatorList[channel].chAmountHours;
|
|
83
|
+
const result = jsonPrices.slice(0, n).map((entry) => checkHourMatch(entry));
|
|
84
|
+
// identify if any element is true
|
|
85
|
+
if (result.some((value) => value)) {
|
|
86
|
+
this.adapter.setForeignStateAsync(this.adapter.config.CalculatorList[channel].chTargetState, convertValue(this.adapter.config.CalculatorList[channel].chValueOn));
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
this.adapter.setForeignStateAsync(this.adapter.config.CalculatorList[channel].chTargetState, convertValue(this.adapter.config.CalculatorList[channel].chValueOff));
|
|
90
|
+
}
|
|
91
|
+
this.adapter.log.debug(`calculator channel: ${channel}-best single hours; setting state: ${this.adapter.config.CalculatorList[channel].chTargetState}`);
|
|
68
92
|
}
|
|
69
93
|
catch (error) {
|
|
70
94
|
this.adapter.log.warn(this.generateErrorMessage(error, `execute calculator for best single hours in channel ${channel}`));
|
|
@@ -72,6 +96,12 @@ class TibberCalculator extends tibberHelper_1.TibberHelper {
|
|
|
72
96
|
}
|
|
73
97
|
async executeCalculatorBestHoursBlock(channel) {
|
|
74
98
|
try {
|
|
99
|
+
if (false) {
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
this.adapter.setForeignStateAsync(this.adapter.config.CalculatorList[channel].chTargetState, convertValue(this.adapter.config.CalculatorList[channel].chValueOff));
|
|
103
|
+
}
|
|
104
|
+
this.adapter.log.debug(`calculator channel: ${channel}-besthours block; setting state: ${this.adapter.config.CalculatorList[channel].chTargetState}`);
|
|
75
105
|
}
|
|
76
106
|
catch (error) {
|
|
77
107
|
this.adapter.log.warn(this.generateErrorMessage(error, `execute calculator for best hours block in channel ${channel}`));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tibberCalculator.js","sourceRoot":"","sources":["../../src/lib/tibberCalculator.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"tibberCalculator.js","sourceRoot":"","sources":["../../src/lib/tibberCalculator.ts"],"names":[],"mappings":"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"}
|
package/build/main.js
CHANGED
|
@@ -159,7 +159,6 @@ class Tibberlink extends utils.Adapter {
|
|
|
159
159
|
// Get current price for the first time and start calculator tasks once
|
|
160
160
|
try {
|
|
161
161
|
await tibberAPICaller.updateCurrentPrice(this.homeInfoList[index].ID);
|
|
162
|
-
tibberCalculator.startCalculatorTasks();
|
|
163
162
|
}
|
|
164
163
|
catch (error) {
|
|
165
164
|
this.log.error(tibberAPICaller.generateErrorMessage(error, `first pull of current price`));
|
|
@@ -178,14 +177,15 @@ class Tibberlink extends utils.Adapter {
|
|
|
178
177
|
catch (error) {
|
|
179
178
|
this.log.error(tibberAPICaller.generateErrorMessage(error, `first pull of prices tomorrow`));
|
|
180
179
|
}
|
|
180
|
+
tibberCalculator.startCalculatorTasks();
|
|
181
181
|
}
|
|
182
182
|
const startFullHourTasks = () => {
|
|
183
183
|
const currentTime = new Date();
|
|
184
184
|
const minutesUntilNextRun = 60 - currentTime.getMinutes() + 0.3;
|
|
185
|
-
setTimeout(() => {
|
|
185
|
+
setTimeout(async () => {
|
|
186
186
|
let newprice = false;
|
|
187
187
|
for (const index in this.homeInfoList) {
|
|
188
|
-
tibberAPICaller
|
|
188
|
+
await tibberAPICaller
|
|
189
189
|
.updateCurrentPrice(this.homeInfoList[index].ID)
|
|
190
190
|
.then((result) => {
|
|
191
191
|
newprice = result;
|
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":"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"}
|
package/io-package.json
CHANGED
|
@@ -1,8 +1,34 @@
|
|
|
1
1
|
{
|
|
2
2
|
"common": {
|
|
3
3
|
"name": "tibberlink",
|
|
4
|
-
"version": "1.1.
|
|
4
|
+
"version": "1.1.2",
|
|
5
5
|
"news": {
|
|
6
|
+
"1.1.2": {
|
|
7
|
+
"en": "fix timing error in calculator",
|
|
8
|
+
"de": "Behebe Zeitfehler im Rechner",
|
|
9
|
+
"ru": "Исправьте ошибку в расчетах по времени",
|
|
10
|
+
"pt": "Corrigir erro de temporização na calculadora",
|
|
11
|
+
"nl": "Los tijdgerelateerde fout op in de calculator",
|
|
12
|
+
"fr": "Corriger l'erreur de synchronisation dans le calculateur",
|
|
13
|
+
"it": "Correggi l'errore di sincronizzazione nel calcolatore",
|
|
14
|
+
"es": "Corregir error de sincronización en la calculadora",
|
|
15
|
+
"pl": "Napraw błąd czasowania w kalkulatorze",
|
|
16
|
+
"uk": "Виправити помилку в розрахунках за часом в калькуляторі",
|
|
17
|
+
"zh-cn": "修复计算器中的时序错误"
|
|
18
|
+
},
|
|
19
|
+
"1.1.1": {
|
|
20
|
+
"en": "fix error in startup of additional channels",
|
|
21
|
+
"de": "Fehler beim Starten zusätzlicher Kanäle beheben",
|
|
22
|
+
"ru": "Исправление ошибки при запуске дополнительных каналов",
|
|
23
|
+
"pt": "Corrigir erro na inicialização de canais adicionais",
|
|
24
|
+
"nl": "Fout bij opstarten van extra kanalen herstellen",
|
|
25
|
+
"fr": "Corriger l'erreur au démarrage des canaux supplémentaires",
|
|
26
|
+
"it": "Correzione dell'errore all'avvio dei canali aggiuntivi",
|
|
27
|
+
"es": "Corregir error en el inicio de canales adicionales",
|
|
28
|
+
"pl": "Napraw błąd przy uruchamianiu dodatkowych kanałów",
|
|
29
|
+
"uk": "Виправити помилку під час запуску додаткових каналів",
|
|
30
|
+
"zh-cn": "修复启动附加通道时的错误"
|
|
31
|
+
},
|
|
6
32
|
"1.1.0": {
|
|
7
33
|
"en": "Implement Tibber Calculator Mode 'Best Price' (#16)",
|
|
8
34
|
"de": "Implementierung des Tibber Calculator Modus 'Bester Preis' (#16)",
|
|
@@ -223,45 +249,6 @@
|
|
|
223
249
|
"pl": "wprowadzanie JSON za ceny uporządkowane przez całkowity wzrost cen",
|
|
224
250
|
"uk": "вводить JSON для цін, що відсортовані загальним зростанням цін",
|
|
225
251
|
"zh-cn": "公司采用以总价格计算价格计算的价格"
|
|
226
|
-
},
|
|
227
|
-
"0.1.10": {
|
|
228
|
-
"en": "bump dependencies, preparations for tibber calculator, code cleanup, mitigate multi homes & pulse problems (#41)",
|
|
229
|
-
"de": "Abhängigkeiten aktualisiert, Vorbereitungen für tibber-rechner, Code Bereinigung, Minderung multi homes & Pulse probleme (#41)",
|
|
230
|
-
"ru": "бамповые зависимости, подготовка к калькулятору tibber, очистка кода, уменьшение нескольких домов и проблемы импульса (#41)",
|
|
231
|
-
"pt": "dependências de choque, preparações para calculadora de tibber, limpeza de código, mitigar multi casas e problemas de pulso (#41)",
|
|
232
|
-
"nl": "quality over quantity (qoq) releases vertaling:",
|
|
233
|
-
"fr": "dépendances de bosse, préparations pour calculateur de tibber, nettoyage de code, atténuer les problèmes de pulsation de plusieurs foyers (#41)",
|
|
234
|
-
"it": "paraurti dipendenze, preparazioni per calcolatore di tibber, pulizia del codice, mitigare multi case e problemi di polso (#41)",
|
|
235
|
-
"es": "unidades de parachoques, preparaciones para la calculadora de tibber, limpieza de códigos, mitigación de múltiples hogares \" problemas de pulso (#41)",
|
|
236
|
-
"pl": "w zależności od zderzenia, przygotowania kalkulatora, czyszczenie kodu, złagodzenie problemów wielodomów i impulsów (#41)",
|
|
237
|
-
"uk": "bump залежностей, підготовка до тиберного калькулятора, очищення коду, пом'якшення багатобудинків та імпульсних проблем (#41)",
|
|
238
|
-
"zh-cn": "b 倾覆依赖、浮动器的准备、守则清理、减轻多家住宅和厕所问题"
|
|
239
|
-
},
|
|
240
|
-
"0.1.9": {
|
|
241
|
-
"en": "optimizing fetching homes list (#32) after Tibber server error",
|
|
242
|
-
"de": "optimierung der Fetching-Homes-Liste (#32) nach Tibber-Server-Fehler",
|
|
243
|
-
"ru": "оптимизация выбора списка домов (#32) после ошибки сервера Tibber",
|
|
244
|
-
"pt": "otimizando a lista de casas de busca (#32) após o erro do servidor Tibber",
|
|
245
|
-
"nl": "na Tibber serverfout",
|
|
246
|
-
"fr": "l'optimisation de la liste des maisons d'accueil (#32) après l'erreur de serveur Tibber",
|
|
247
|
-
"it": "ottimizzare l'elenco delle case di acquisizione (#32) dopo l'errore del server Tibber",
|
|
248
|
-
"es": "optimización de la lista de hogares de búsqueda (#32) después del error del servidor Tibber",
|
|
249
|
-
"pl": "ostateczna lista domów (#32) po błędzie Tibber",
|
|
250
|
-
"uk": "оптимізуйте список фетешних будинків (#32) після помилки сервера Tibber",
|
|
251
|
-
"zh-cn": "在Tibber服务器错误之后,优化住房名单(32)"
|
|
252
|
-
},
|
|
253
|
-
"0.1.4": {
|
|
254
|
-
"en": "BREAKING: encrypted API-Token in ioBroker; rearranged configuration options; fixed bug in state generation",
|
|
255
|
-
"de": "BREAKING: verschlüsselte API-Token in ioBroker; erweiterte Konfigurationsoptionen; Fehler in der Zustandsgeneration behoben",
|
|
256
|
-
"ru": "ЗАВТРАК: зашифрованный API-токен в ioBroker; перестроенные варианты конфигурации; исправлена ошибка в государственном поколению",
|
|
257
|
-
"pt": "BREAKING: API-Token criptografado no ioBroker; opções de configuração rearranjada; bug fixo na geração de estado",
|
|
258
|
-
"nl": "Gecodeerde API-Token in ioBroker, herschikte configuratie opties",
|
|
259
|
-
"fr": "BREAKING: crypté API-Token dans ioBroker; réarranger les options de configuration; bug fixe dans la génération d'état",
|
|
260
|
-
"it": "BREAKING: API-Token crittografato in ioBroker; opzioni di configurazione riorganizzate; bug fisso nella generazione di stato",
|
|
261
|
-
"es": "BREAKING: API-Token encriptada en ioBroker; opciones de configuración reorganizadas; bug fijo en generación estatal",
|
|
262
|
-
"pl": "BREAKING – szyfrowany interfejs API-Token w ioBrokera, opcja konfiguracji; uruchliwy błąd w pokoleniu stanów",
|
|
263
|
-
"uk": "BREAKING: зашифрований API-Token в ioBroker; параметри перепланованої конфігурації; фіксована помилка в державному генеруванні",
|
|
264
|
-
"zh-cn": "BREAKRE: 加密的API-Token inio Broker;重新安排的备选办法;国家代代用的固定配件。"
|
|
265
252
|
}
|
|
266
253
|
},
|
|
267
254
|
"messages": [
|