iobroker.tibberlink 1.2.0 → 1.3.1
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 +32 -20
- package/admin/calculatorStates.png +0 -0
- package/admin/jsonConfig.json +33 -33
- package/build/lib/tibberCalculator.js +24 -19
- package/build/lib/tibberCalculator.js.map +1 -1
- package/build/lib/tibberHelper.js +3 -3
- package/build/lib/tibberHelper.js.map +1 -1
- package/build/lib/tibberPulse.js +5 -4
- package/build/lib/tibberPulse.js.map +1 -1
- package/io-package.json +27 -14
- package/package.json +11 -11
package/README.md
CHANGED
|
@@ -15,44 +15,56 @@
|
|
|
15
15
|
|
|
16
16
|
[](https://nodei.co/npm/iobroker.tibberlink/)
|
|
17
17
|
|
|
18
|
-
## Adapter for
|
|
18
|
+
## Adapter for Utilizing TIBBER energy data in ioBroker
|
|
19
19
|
|
|
20
|
-
This adapter
|
|
20
|
+
This adapter facilitates the connection of data from your Tibber account's API to be used within ioBroker, whether for a single home or multiple residences.
|
|
21
21
|
|
|
22
|
-
If you're not a Tibber user
|
|
23
|
-
[https://invite.tibber.com/2gwuign3.](https://invite.tibber.com/2gwuign3.)
|
|
22
|
+
If you're not currently a Tibber user, I would greatly appreciate it if you could use my referral link: [Tibber Referral Link](https://invite.tibber.com/mu8c82n5).
|
|
24
23
|
|
|
25
24
|
## Standard Configuration
|
|
26
25
|
|
|
27
|
-
-
|
|
28
|
-
- You
|
|
29
|
-
- Enter your Tibber API token in the standard settings and
|
|
30
|
-
- Save the settings and exit the
|
|
31
|
-
- Return to the configuration screen and select the homes from which you
|
|
26
|
+
- Begin by creating a new instance of the adapter.
|
|
27
|
+
- You'll also require an API token from Tibber, which you can obtain here: [Tibber Developer API](https://developer.tibber.com).
|
|
28
|
+
- Enter your Tibber API token in the standard settings and configure at least one line for live feed settings (select "None available").
|
|
29
|
+
- Save the settings and exit the configuration to restart the adapter; this step allows your home(s) to be queried from the Tibber server.
|
|
30
|
+
- Return to the configuration screen and select the homes from which you wish to fetch real-time data using your Tibber Pulse. You can also select homes and disable the feed (Note: This works only if the hardware is installed and the Tibber server has verified the connection to Pulse).
|
|
32
31
|
- Save the settings.
|
|
33
32
|
|
|
34
33
|
## Calculator Configuration
|
|
35
34
|
|
|
36
|
-
-
|
|
37
|
-
- The Calculator
|
|
38
|
-
-
|
|
39
|
-
-
|
|
40
|
-
- The
|
|
41
|
-
|
|
42
|
-
- The
|
|
35
|
+
- Now that the Tibber connection is up and running, you can also leverage the Calculator to incorporate additional automation features into the TibberLink adapter.
|
|
36
|
+
- The Calculator operates using channels, with each channel linked to a selected home.
|
|
37
|
+
- These channels can be activated or deactivated based on corresponding states.
|
|
38
|
+
- These states are designed to serve as external, dynamic inputs for TibberLink, allowing you to, for example, adjust the marginal cost ("TriggerPrice") from an external source or disable the calculator channel ("Active").
|
|
39
|
+
- The states of a calculator channel are positioned adjacent to the home states and named according to the channel number.
|
|
40
|
+
|
|
41
|
+
- The behavior of each channel is determined by its type: "best cost," "best single hours," or "best hours block".
|
|
42
|
+
- Each channel populates an external state as output, which has to be selected in the settings tab. For instance, this state might be "0_userdata.0.example_state" or any other writable external state.
|
|
43
|
+
- 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
44
|
- Outputs:
|
|
44
|
-
- "Best cost":
|
|
45
|
-
-
|
|
46
|
-
- "Best hours block"
|
|
45
|
+
- "Best cost": Utilizes the "TriggerPrice" state as input, and the output is "YES" every hour when the current Tibber energy cost is below the trigger price.
|
|
46
|
+
- "Best single hours": The output is "YES" during the cheapest number of hours, with the number defined in the "AmountHours" state.
|
|
47
|
+
- "Best hours block": The output is "YES" during the best block of hours, with the number of hours defined in the "AmountHours" state.
|
|
47
48
|
|
|
48
49
|
## Notes
|
|
49
50
|
|
|
50
|
-
This adapter
|
|
51
|
+
This adapter employs Sentry libraries to automatically report exceptions and code errors to the developers. For more details and information on how to disable error reporting, please consult the [Sentry-Plugin Documentation](https://github.com/ioBroker/plugin-sentry#plugin-sentry)! Sentry reporting is initiated starting with js-controller 3.0.
|
|
51
52
|
|
|
52
53
|
## Changelog
|
|
53
54
|
|
|
54
55
|
! Note that missing version entries are typically dependency updates for improved security.
|
|
55
56
|
|
|
57
|
+
### 1.3.1 (2023-10-21)
|
|
58
|
+
|
|
59
|
+
- (HombachC) fix initialisiation of channel states (#141)
|
|
60
|
+
- (HombachC) change message "reconnect successful" to level info (#80)
|
|
61
|
+
- (HombachC) documentation tweaks - dependency updates
|
|
62
|
+
|
|
63
|
+
### 1.3.0 (2023-10-20)
|
|
64
|
+
|
|
65
|
+
- (HombachC) implement tibber calculator mode "best hours block" (#16)
|
|
66
|
+
- (HombachC) handle empty calculator destination states - detected by sentry
|
|
67
|
+
|
|
56
68
|
### 1.2.0 (2023-10-18)
|
|
57
69
|
|
|
58
70
|
- (HombachC) implement tibber calculator mode "best single hours" (#16)
|
|
Binary file
|
package/admin/jsonConfig.json
CHANGED
|
@@ -345,17 +345,17 @@
|
|
|
345
345
|
},
|
|
346
346
|
{
|
|
347
347
|
"label": {
|
|
348
|
-
"en": "best hours block
|
|
349
|
-
"de": "beste Stundenblock
|
|
350
|
-
"ru": "лучший часовой блок
|
|
351
|
-
"pt": "melhor bloco de horas
|
|
352
|
-
"nl": "beste uren blok
|
|
353
|
-
"fr": "meilleur bloc d'heures
|
|
354
|
-
"it": "miglior blocco di ore
|
|
355
|
-
"es": "mejor bloque de horas
|
|
356
|
-
"pl": "najlepszy blok godzin
|
|
357
|
-
"uk": "кращий годинний блок
|
|
358
|
-
"zh-cn": "
|
|
348
|
+
"en": "best hours block",
|
|
349
|
+
"de": "beste Stundenblock",
|
|
350
|
+
"ru": "лучший часовой блок",
|
|
351
|
+
"pt": "melhor bloco de horas",
|
|
352
|
+
"nl": "beste uren blok",
|
|
353
|
+
"fr": "meilleur bloc d'heures",
|
|
354
|
+
"it": "miglior blocco di ore",
|
|
355
|
+
"es": "mejor bloque de horas",
|
|
356
|
+
"pl": "najlepszy blok godzin",
|
|
357
|
+
"uk": "кращий годинний блок",
|
|
358
|
+
"zh-cn": "最佳小时块"
|
|
359
359
|
},
|
|
360
360
|
"value": 3
|
|
361
361
|
}
|
|
@@ -460,17 +460,17 @@
|
|
|
460
460
|
"type": "staticText",
|
|
461
461
|
"hidden": "!data.UseCalculator",
|
|
462
462
|
"label": {
|
|
463
|
-
"en": "The behavior of a channel is defined by its type: 'best cost'; 'best single hours'; 'best hours block'
|
|
464
|
-
"de": "Das Verhalten eines Kanals wird durch seinen Typ definiert: 'beste Kosten'; 'beste Einzelstunden'; 'beste Stundenblock'
|
|
465
|
-
"ru": "Поведение канала определяется его типом: 'лучшие затраты'; 'лучшие отдельные часы'; 'лучший часовой блок'
|
|
466
|
-
"pt": "O comportamento de um canal é definido por seu tipo: 'melhor custo'; 'melhores horas únicas'; 'melhor bloco de horas'
|
|
467
|
-
"nl": "Het gedrag van een kanaal wordt bepaald door het type: 'beste kosten'; 'beste enkele uren'; 'beste uren blok'
|
|
468
|
-
"fr": "Le comportement d'un canal est défini par son type : 'meilleur coût' ; 'meilleures heures uniques' ; 'meilleur bloc d'heures'
|
|
469
|
-
"it": "Il comportamento di un canale è definito dal suo tipo: 'miglior costo'; 'migliori ore singole'; 'miglior blocco di ore'
|
|
470
|
-
"es": "El comportamiento de un canal se define por su tipo: 'mejor costo'; 'mejores horas individuales'; 'mejor bloque de horas'
|
|
471
|
-
"pl": "Zachowanie kanału jest określane przez jego typ: 'najlepszy koszt'; 'najlepsze pojedyncze godziny'; 'najlepszy blok godzin'
|
|
472
|
-
"uk": "Поведінка каналу визначається його типом: 'найкращі витрати'; 'найкращі години'; 'найкращий годинний блок'
|
|
473
|
-
"zh-cn": "通道的行为由其类型定义：'最佳成本'；'最佳单个小时'；'最佳小时块'
|
|
463
|
+
"en": "The behavior of a channel is defined by its type: 'best cost'; 'best single hours'; 'best hours block'.",
|
|
464
|
+
"de": "Das Verhalten eines Kanals wird durch seinen Typ definiert: 'beste Kosten'; 'beste Einzelstunden'; 'beste Stundenblock'.",
|
|
465
|
+
"ru": "Поведение канала определяется его типом: 'лучшие затраты'; 'лучшие отдельные часы'; 'лучший часовой блок'.",
|
|
466
|
+
"pt": "O comportamento de um canal é definido por seu tipo: 'melhor custo'; 'melhores horas únicas'; 'melhor bloco de horas'.",
|
|
467
|
+
"nl": "Het gedrag van een kanaal wordt bepaald door het type: 'beste kosten'; 'beste enkele uren'; 'beste uren blok'.",
|
|
468
|
+
"fr": "Le comportement d'un canal est défini par son type : 'meilleur coût' ; 'meilleures heures uniques' ; 'meilleur bloc d'heures'.",
|
|
469
|
+
"it": "Il comportamento di un canale è definito dal suo tipo: 'miglior costo'; 'migliori ore singole'; 'miglior blocco di ore'.",
|
|
470
|
+
"es": "El comportamiento de un canal se define por su tipo: 'mejor costo'; 'mejores horas individuales'; 'mejor bloque de horas'.",
|
|
471
|
+
"pl": "Zachowanie kanału jest określane przez jego typ: 'najlepszy koszt'; 'najlepsze pojedyncze godziny'; 'najlepszy blok godzin'.",
|
|
472
|
+
"uk": "Поведінка каналу визначається його типом: 'найкращі витрати'; 'найкращі години'; 'найкращий годинний блок'.",
|
|
473
|
+
"zh-cn": "通道的行为由其类型定义：'最佳成本'；'最佳单个小时'；'最佳小时块'"
|
|
474
474
|
},
|
|
475
475
|
"newLine": true
|
|
476
476
|
},
|
|
@@ -568,17 +568,17 @@
|
|
|
568
568
|
"type": "staticText",
|
|
569
569
|
"hidden": "!data.UseCalculator",
|
|
570
570
|
"label": {
|
|
571
|
-
"en": " 'Best hours block' -
|
|
572
|
-
"de": " '
|
|
573
|
-
"ru": " 'Лучший часовой блок' -
|
|
574
|
-
"pt": " 'Melhor bloco de horas' -
|
|
575
|
-
"nl": " 'Beste uren blok' -
|
|
576
|
-
"fr": " 'Meilleur bloc d'heures' -
|
|
577
|
-
"it": " 'Miglior blocco di ore' -
|
|
578
|
-
"es": " 'Mejor bloque de horas' -
|
|
579
|
-
"pl": " 'Najlepszy blok godzin' -
|
|
580
|
-
"uk": " 'Кращий годинний блок' -
|
|
581
|
-
"zh-cn": " “最佳小时块” -
|
|
571
|
+
"en": " 'Best hours block' - output is 'YES' in the best block of consecutive hours. Number of hours is defined in state 'AmountHours'.",
|
|
572
|
+
"de": " 'Bester Stundenblock' - Ausgabe ist 'JA' im besten Block aufeinanderfolgender Stunden. Die Anzahl der Stunden ist im Zustand 'AmountHours' definiert.",
|
|
573
|
+
"ru": " 'Лучший часовой блок' - вывод 'ДА' в лучшем блоке последовательных часов. Количество часов определено в состоянии 'AmountHours'.",
|
|
574
|
+
"pt": " 'Melhor bloco de horas' - a saída é 'SIM' no melhor bloco de horas consecutivas. O número de horas é definido no estado 'AmountHours'.",
|
|
575
|
+
"nl": " 'Beste uren blok' - uitvoer is 'JA' in het beste blok opeenvolgende uren. Het aantal uren is gedefinieerd in de staat 'AmountHours'.",
|
|
576
|
+
"fr": " 'Meilleur bloc d'heures' - la sortie est 'OUI' dans le meilleur bloc d'heures consécutives. Le nombre d'heures est défini dans l'état 'AmountHours'.",
|
|
577
|
+
"it": " 'Miglior blocco di ore' - l'uscita è 'SÌ' nel miglior blocco di ore consecutive. Il numero di ore è definito nello stato 'AmountHours'.",
|
|
578
|
+
"es": " 'Mejor bloque de horas' - la salida es 'SÍ' en el mejor bloque de horas consecutivas. El número de horas está definido en el estado 'AmountHours'.",
|
|
579
|
+
"pl": " 'Najlepszy blok godzin' - wyjście to 'TAK' w najlepszym bloku kolejnych godzin. Liczba godzin jest określona w stanie 'AmountHours'.",
|
|
580
|
+
"uk": " 'Кращий годинний блок' - вивід 'ТАК' в найкращому блоку послідовних годин. Кількість годин визначено в стані 'AmountHours'.",
|
|
581
|
+
"zh-cn": " “最佳小时块” - 输出在最佳连续小时块中为 '是'。 小时数在状态 'AmountHours' 中定义。"
|
|
582
582
|
},
|
|
583
583
|
"newLine": true
|
|
584
584
|
}
|
|
@@ -52,27 +52,32 @@ class TibberCalculator extends tibberHelper_1.TibberHelper {
|
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
async startCalculatorTasks() {
|
|
55
|
-
if (this.adapter.config.UseCalculator) {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
55
|
+
if (!this.adapter.config.UseCalculator) {
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
for (const channel in this.adapter.config.CalculatorList) {
|
|
59
|
+
if (!this.adapter.config.CalculatorList[channel].chTargetState.trim()) {
|
|
60
|
+
this.adapter.log.warn(`Empty destination state in calculator channel ${channel} defined - provide correct external state - execution of channel skipped`);
|
|
61
|
+
continue;
|
|
62
|
+
}
|
|
63
|
+
try {
|
|
64
|
+
switch (this.adapter.config.CalculatorList[channel].chType) {
|
|
65
|
+
case tibberHelper_1.enCalcType.BestCost:
|
|
66
|
+
this.executeCalculatorBestCost(parseInt(channel));
|
|
67
|
+
break;
|
|
68
|
+
case tibberHelper_1.enCalcType.BestSingleHours:
|
|
69
|
+
this.executeCalculatorBestSingleHours(parseInt(channel));
|
|
70
|
+
break;
|
|
71
|
+
case tibberHelper_1.enCalcType.BestHoursBlock:
|
|
72
|
+
this.executeCalculatorBestHoursBlock(parseInt(channel));
|
|
73
|
+
break;
|
|
74
|
+
default:
|
|
75
|
+
this.adapter.log.debug(`unknown value for calculator type: ${this.adapter.config.CalculatorList[channel].chType}`);
|
|
74
76
|
}
|
|
75
77
|
}
|
|
78
|
+
catch (error) {
|
|
79
|
+
this.adapter.log.warn(`unhandled error execute calculator channel ${channel}`);
|
|
80
|
+
}
|
|
76
81
|
}
|
|
77
82
|
}
|
|
78
83
|
async executeCalculatorBestCost(channel) {
|
|
@@ -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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"}
|
|
@@ -98,7 +98,7 @@ class TibberHelper {
|
|
|
98
98
|
},
|
|
99
99
|
native: {},
|
|
100
100
|
});
|
|
101
|
-
if (!dontUpdate) {
|
|
101
|
+
if (!dontUpdate || (await this.adapter.getStateAsync(stateName.value)) === null) {
|
|
102
102
|
await this.adapter.setStateAsync(stateName.value, { val: value, ack: true });
|
|
103
103
|
}
|
|
104
104
|
}
|
|
@@ -124,7 +124,7 @@ class TibberHelper {
|
|
|
124
124
|
},
|
|
125
125
|
native: {},
|
|
126
126
|
});
|
|
127
|
-
if (!dontUpdate) {
|
|
127
|
+
if (!dontUpdate || (await this.adapter.getStateAsync(stateName.value)) === null) {
|
|
128
128
|
await this.adapter.setStateAsync(stateName.value, { val: value, ack: true });
|
|
129
129
|
}
|
|
130
130
|
}
|
|
@@ -170,7 +170,7 @@ class TibberHelper {
|
|
|
170
170
|
},
|
|
171
171
|
native: {},
|
|
172
172
|
});
|
|
173
|
-
if (!dontUpdate) {
|
|
173
|
+
if (!dontUpdate || (await this.adapter.getStateAsync(stateName.value)) === null) {
|
|
174
174
|
await this.adapter.setStateAsync(stateName.value, { val: value, ack: true });
|
|
175
175
|
}
|
|
176
176
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tibberHelper.js","sourceRoot":"","sources":["../../src/lib/tibberHelper.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tibberHelper.js","sourceRoot":"","sources":["../../src/lib/tibberHelper.ts"],"names":[],"mappings":"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"}
|
package/build/lib/tibberPulse.js
CHANGED
|
@@ -6,6 +6,7 @@ const tibberHelper_1 = require("./tibberHelper");
|
|
|
6
6
|
class TibberPulse extends tibberHelper_1.TibberHelper {
|
|
7
7
|
constructor(tibberConfig, adapter) {
|
|
8
8
|
super(adapter);
|
|
9
|
+
this.reconnectTime = 6000;
|
|
9
10
|
this.tibberConfig = tibberConfig;
|
|
10
11
|
this.tibberQuery = new tibber_api_1.TibberQuery(this.tibberConfig);
|
|
11
12
|
this.tibberFeed = new tibber_api_1.TibberFeed(this.tibberQuery);
|
|
@@ -41,7 +42,7 @@ class TibberPulse extends tibberHelper_1.TibberHelper {
|
|
|
41
42
|
this.adapter.log.debug(`Tibber Feed: ${data.toString()}`);
|
|
42
43
|
this.adapter.setState("info.connection", false, true);
|
|
43
44
|
if (this.adapter.config.HomesList.some((info) => info.feedActive)) {
|
|
44
|
-
this.adapter.log.warn(`A feed was disconnected. I try to reconnect in
|
|
45
|
+
this.adapter.log.warn(`A feed was disconnected. I try to reconnect in ${this.reconnectTime / 1000}sec`);
|
|
45
46
|
this.reconnect();
|
|
46
47
|
}
|
|
47
48
|
});
|
|
@@ -95,14 +96,14 @@ class TibberPulse extends tibberHelper_1.TibberHelper {
|
|
|
95
96
|
reconnect() {
|
|
96
97
|
const reconnectionInterval = this.adapter.setInterval(() => {
|
|
97
98
|
if (!this.tibberFeed.connected) {
|
|
98
|
-
this.adapter.log.debug(`No TibberFeed connected try reconnecting now in
|
|
99
|
+
this.adapter.log.debug(`No TibberFeed connected try reconnecting now in ${this.reconnectTime / 1000}sec interval!`);
|
|
99
100
|
this.ConnectPulseStream();
|
|
100
101
|
}
|
|
101
102
|
else {
|
|
102
|
-
this.adapter.log.
|
|
103
|
+
this.adapter.log.info(`Reconnection successful! Stopping reconnection interval.`);
|
|
103
104
|
this.adapter.clearInterval(reconnectionInterval);
|
|
104
105
|
}
|
|
105
|
-
},
|
|
106
|
+
}, this.reconnectTime);
|
|
106
107
|
}
|
|
107
108
|
}
|
|
108
109
|
exports.TibberPulse = TibberPulse;
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"tibberPulse.js","sourceRoot":"","sources":["../../src/lib/tibberPulse.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.
|
|
4
|
+
"version": "1.3.1",
|
|
5
5
|
"news": {
|
|
6
|
+
"1.3.1": {
|
|
7
|
+
"en": "Changed message 'reconnect successful' to level info (#80); fixed initialization of channel states (#141)",
|
|
8
|
+
"de": "Geänderte Meldung 'Neuverbindung erfolgreich' auf Stufe Info (#80); behob die Initialisierung der Kanalzustände (#141)",
|
|
9
|
+
"ru": "Изменено сообщение 'повторное подключение успешно' на уровень информации (#80); исправлено начальное состояние канала (#141)",
|
|
10
|
+
"pt": "Alterou a mensagem 'reconexão bem-sucedida' para o nível de informação (#80); corrigiu a inicialização dos estados do canal (#141)",
|
|
11
|
+
"nl": "Bericht 'herverbinding gelukt' gewijzigd naar infoniveau (#80); initialisatie van kanaalstaten hersteld (#141)",
|
|
12
|
+
"fr": "Message 'reconnexion réussie' modifié au niveau info (#80); initialisation corrigée des états de canal (#141)",
|
|
13
|
+
"it": "Messaggio 'riconnessione riuscita' modificato a livello di informazioni (#80); corretta l'inizializzazione degli stati del canale (#141)",
|
|
14
|
+
"es": "Cambió el mensaje 'reconexión exitosa' al nivel de información (#80); corrigió la inicialización de los estados del canal (#141)",
|
|
15
|
+
"pl": "Zmieniono komunikat 'ponowne połączenie udane' na poziomie informacji (#80); naprawiono inicjowanie stanów kanału (#141)",
|
|
16
|
+
"uk": "Змінено повідомлення 'повторне підключення успішне' на рівень інформації (#80); виправлено ініціалізацію станів каналу (#141)",
|
|
17
|
+
"zh-cn": "将消息 '重新连接成功' 更改为信息级别 (#80); 修复渠道状态的初始化 (#141)"
|
|
18
|
+
},
|
|
19
|
+
"1.3.0": {
|
|
20
|
+
"en": "Implement Tibber calculator mode 'best hours block' (#16)",
|
|
21
|
+
"de": "Implementieren des Tibber-Rechnermodus 'beste Stundenblock' (#16)",
|
|
22
|
+
"ru": "Реализация режима калькулятора Tibber 'лучший часовой блок' (#16)",
|
|
23
|
+
"pt": "Implementar o modo de calculadora Tibber 'melhor bloco de horas' (#16)",
|
|
24
|
+
"nl": "Implementeer de Tibber rekenmachine modus 'beste uren blok' (#16)",
|
|
25
|
+
"fr": "Implémenter le mode calculatrice Tibber 'meilleur bloc d'heures' (#16)",
|
|
26
|
+
"it": "Implementare la modalità calcolatrice Tibber 'miglior blocco di ore' (#16)",
|
|
27
|
+
"es": "Implementar el modo calculadora Tibber 'mejor bloque de horas' (#16)",
|
|
28
|
+
"pl": "Wdrożenie trybu kalkulatora Tibber 'najlepszy blok godzin' (#16)",
|
|
29
|
+
"uk": "Впровадження режиму калькулятора Tibber 'кращий годинний блок' (#16)",
|
|
30
|
+
"zh-cn": "实施Tibber计算器模式 '最佳小时块' (#16)"
|
|
31
|
+
},
|
|
6
32
|
"1.2.0": {
|
|
7
33
|
"en": "Implement Tibber calculator mode 'best single hours' (#16); fixed translations (#128); fixed error in initial read of calculator states (#129)",
|
|
8
34
|
"de": "Implementieren des Tibber-Rechnermodus 'beste Einzelstunden' (#16); behobene Übersetzungen (#128); Fehler bei der initialen Lesung der Rechnerzustände behoben (#129)",
|
|
@@ -211,19 +237,6 @@
|
|
|
211
237
|
"uk": "увімкніть правильний ціновий пил також для адаптерів, що працюють в різних часових поясах (#63)",
|
|
212
238
|
"zh-cn": "能够纠正价格污染,使不同时间区(63年)的适应行动更加适应。"
|
|
213
239
|
},
|
|
214
|
-
"0.2.3": {
|
|
215
|
-
"en": "fix error in 0.2.2 in start conditions of adapter",
|
|
216
|
-
"de": "korrigiert Fehler in 0.2.2 bei Startbedingungen des Adapters",
|
|
217
|
-
"ru": "исправить ошибку в 0.2.2 в начальных условиях адаптера",
|
|
218
|
-
"pt": "corrigir erro em 0,2.2 em condições de início do adaptador",
|
|
219
|
-
"nl": "herstel in 0.2.2 in de start voorwaarden van adapter",
|
|
220
|
-
"fr": "corriger l'erreur dans 0.2.2 dans les conditions de démarrage de l'adaptateur",
|
|
221
|
-
"it": "errore di correzione in 0.2.2 in condizioni di inizio dell'adattatore",
|
|
222
|
-
"es": "error de fijación en 0.2.2 en las condiciones de inicio del adaptador",
|
|
223
|
-
"pl": "ustępowanie błędów 0,2 w warunkach startowych",
|
|
224
|
-
"uk": "виправити помилку в 0.2.2 в початкових умовах адаптера",
|
|
225
|
-
"zh-cn": "f 在适应人员开始的条件下,在0.2.2年内出现错误"
|
|
226
|
-
},
|
|
227
240
|
"0.2.2": {
|
|
228
241
|
"en": "reducing polls at Tibber server by precheck of known data, code optimizations, fix config screen (#55)",
|
|
229
242
|
"de": "Reduktion von Anfragen am Tibber-Server durch Vorprüfung bekannter Daten, Codeoptimierungen, Fix Config-Bildschirm (#55)",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "iobroker.tibberlink",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.3.1",
|
|
4
4
|
"description": "links tibber API data to be used in ioBroker",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "Hombach",
|
|
@@ -28,27 +28,27 @@
|
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
30
|
"@iobroker/testing": "^4.1.0",
|
|
31
|
-
"@iobroker/types": "^5.0.
|
|
32
|
-
"@types/chai": "^4.3.
|
|
33
|
-
"@types/chai-as-promised": "^7.1.
|
|
34
|
-
"@types/mocha": "^10.0.
|
|
35
|
-
"@types/node": "^20.8.
|
|
36
|
-
"@types/proxyquire": "^1.3.
|
|
37
|
-
"@types/sinon": "^10.0.
|
|
38
|
-
"@types/sinon-chai": "^3.2.
|
|
31
|
+
"@iobroker/types": "^5.0.14",
|
|
32
|
+
"@types/chai": "^4.3.9",
|
|
33
|
+
"@types/chai-as-promised": "^7.1.7",
|
|
34
|
+
"@types/mocha": "^10.0.3",
|
|
35
|
+
"@types/node": "^20.8.7",
|
|
36
|
+
"@types/proxyquire": "^1.3.30",
|
|
37
|
+
"@types/sinon": "^10.0.20",
|
|
38
|
+
"@types/sinon-chai": "^3.2.11",
|
|
39
39
|
"@typescript-eslint/eslint-plugin": "^6.8.0",
|
|
40
40
|
"@typescript-eslint/parser": "^6.8.0",
|
|
41
41
|
"axios": "^1.5.1",
|
|
42
42
|
"chai": "^4.3.10",
|
|
43
43
|
"chai-as-promised": "^7.1.1",
|
|
44
|
-
"eslint": "^8.
|
|
44
|
+
"eslint": "^8.52.0",
|
|
45
45
|
"eslint-config-prettier": "^9.0.0",
|
|
46
46
|
"eslint-plugin-prettier": "^5.0.1",
|
|
47
47
|
"mocha": "^10.2.0",
|
|
48
48
|
"prettier": "^3.0.3",
|
|
49
49
|
"proxyquire": "^2.1.3",
|
|
50
50
|
"rimraf": "^5.0.5",
|
|
51
|
-
"sinon": "^
|
|
51
|
+
"sinon": "^17.0.0",
|
|
52
52
|
"sinon-chai": "^3.7.0",
|
|
53
53
|
"source-map-support": "^0.5.21",
|
|
54
54
|
"ts-node": "^10.9.1",
|