iobroker.tibberlink 1.2.0 → 1.3.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 +8 -3
- package/admin/jsonConfig.json +33 -33
- package/build/lib/tibberCalculator.js +24 -19
- package/build/lib/tibberCalculator.js.map +1 -1
- package/io-package.json +14 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -37,13 +37,13 @@ If you're not a Tibber user currently, it would be greatly appreciated if you us
|
|
|
37
37
|
- The Calculator works with channels. Each channel is linked to a selected home.
|
|
38
38
|
- Channels can be activated or deactivated in a corresponding state.
|
|
39
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"; "best hours block"
|
|
40
|
+
- The behavior of a channel is defined by its type: "best cost"; "best single hours"; "best hours block".
|
|
41
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
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
43
|
- Outputs:
|
|
44
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
|
-
-
|
|
46
|
-
- "Best hours block" -
|
|
45
|
+
- "Best single hours" - output is "YES" in the cheapest number of hours. Number is defined in state "AmountHours".
|
|
46
|
+
- "Best hours block" - output is "YES" in the best block of hours. Number of hours is defined in state "AmountHours".
|
|
47
47
|
|
|
48
48
|
## Notes
|
|
49
49
|
|
|
@@ -53,6 +53,11 @@ This adapter uses Sentry libraries to automatically report exceptions and code e
|
|
|
53
53
|
|
|
54
54
|
! Note that missing version entries are typically dependency updates for improved security.
|
|
55
55
|
|
|
56
|
+
### 1.3.0 (2023-10-20)
|
|
57
|
+
|
|
58
|
+
- (HombachC) implement tibber calculator mode "best hours block" (#16)
|
|
59
|
+
- (HombachC) handle empty calculator destination states - detected by sentry
|
|
60
|
+
|
|
56
61
|
### 1.2.0 (2023-10-18)
|
|
57
62
|
|
|
58
63
|
- (HombachC) implement tibber calculator mode "best single hours" (#16)
|
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":";;;AAEA,iDAA0D;AAE1D,MAAa,gBAAiB,SAAQ,2BAAY;IACjD,YAAY,OAA8B;QACzC,KAAK,CAAC,OAAO,CAAC,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,MAAc,EAAE,OAAe;QAC1D,IAAI;YACH,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,cAAc,KAAK,SAAS,EAAE;gBAC7E,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,cAAc,GAAG,CAAC,CAAC;aAC/D;YACD,IAAI,CAAC,sBAAsB,CAC1B,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,gBAAgB,OAAO,EAAE,EAAE,cAAc,CAAC,EACtE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,cAAc,EAC1D,uCAAuC,EACvC,IAAI,EACJ,IAAI,CACJ,CAAC;YACF,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,MAAM,iBAAiB,OAAO,eAAe,CAAC,CAAC;YAC3G,IAAI,OAAO,iBAAiB,KAAK,QAAQ,EAAE;gBAC1C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,cAAc,GAAG,iBAAiB,CAAC;gBAC/E,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CACrB,sCAAsC,MAAM,eAAe,OAAO,+BAA+B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,CAC7J,CAAC;aACF;iBAAM;gBACN,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,kCAAkC,iBAAiB,EAAE,CAAC,CAAC;aAC9E;YAED,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,QAAQ,KAAK,SAAS,EAAE;gBACvE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,QAAQ,GAAG,KAAK,CAAC;aAC7D;YACD,IAAI,CAAC,uBAAuB,CAC3B,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,gBAAgB,OAAO,EAAE,EAAE,QAAQ,CAAC,EAChE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,QAAQ,EACpD,2CAA2C,EAC3C,IAAI,EACJ,IAAI,CACJ,CAAC;YACF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,MAAM,iBAAiB,OAAO,SAAS,CAAC,CAAC;YAC/F,IAAI,OAAO,WAAW,KAAK,SAAS,EAAE;gBACrC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,QAAQ,GAAG,WAAW,CAAC;gBACnE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CACrB,sCAAsC,MAAM,eAAe,OAAO,yBAAyB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CACjJ,CAAC;aACF;iBAAM;gBACN,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,WAAW,EAAE,CAAC,CAAC;aAClE;YAED,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,KAAK,SAAS,EAAE;gBAC5E,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC;aAC9D;YACD,IAAI,CAAC,sBAAsB,CAC1B,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,gBAAgB,OAAO,EAAE,EAAE,aAAa,CAAC,EACrE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,EACzD,yCAAyC,EACzC,IAAI,EACJ,IAAI,CACJ,CAAC;YACF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,MAAM,iBAAiB,OAAO,cAAc,CAAC,CAAC;YACzG,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE;gBACzC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,GAAG,gBAAgB,CAAC;gBAC7E,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CACrB,sCAAsC,MAAM,eAAe,OAAO,8BAA8B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,CAC3J,CAAC;aACF;iBAAM;gBACN,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,kCAAkC,gBAAgB,EAAE,CAAC,CAAC;aAC7E;YAED,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,SAAS,MAAM,iBAAiB,OAAO,IAAI,CAAC,CAAC;YAC1E,qFAAqF;SACrF;QAAC,OAAO,KAAK,EAAE;YACf,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,gCAAgC,CAAC,CAAC,CAAC;SAC1F;IACF,CAAC;IAED,KAAK,CAAC,oBAAoB;QACzB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE;YACvC,OAAO;SACP;QACD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE;YACzD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE;gBACtE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CACpB,iDAAiD,OAAO,0EAA0E,CAClI,CAAC;gBACF,SAAS;aACT;YACD,IAAI;gBACH,QAAQ,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE;oBAC3D,KAAK,yBAAU,CAAC,QAAQ;wBACvB,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;wBAClD,MAAM;oBACP,KAAK,yBAAU,CAAC,eAAe;wBAC9B,IAAI,CAAC,gCAAgC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;wBACzD,MAAM;oBACP,KAAK,yBAAU,CAAC,cAAc;wBAC7B,IAAI,CAAC,+BAA+B,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;wBACxD,MAAM;oBACP;wBACC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,sCAAsC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;iBACpH;aACD;YAAC,OAAO,KAAU,EAAE;gBACpB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,8CAA8C,OAAO,EAAE,CAAC,CAAC;aAC/E;SACD;IACF,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,OAAe;QAC9C,IAAI;YACH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,QAAQ,qBAAqB,CAAC,CAAC;YAClI,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,cAAc,GAAG,YAAY,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE;gBACtI,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAChC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,EACzD,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CACnE,CAAC;aACF;iBAAM;gBACN,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAChC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,EACzD,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,CACpE,CAAC;aACF;YACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CACrB,uBAAuB,OAAO,+BAA+B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,CACxH,CAAC;SACF;QAAC,OAAO,KAAK,EAAE;YACf,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,gDAAgD,OAAO,EAAE,CAAC,CAAC,CAAC;SACnH;IACF,CAAC;IAED,KAAK,CAAC,gCAAgC,CAAC,OAAe;QACrD,IAAI;YACH,MAAM,eAAe,GAAG,IAAI,IAAI,EAAE,CAAC;YACnC,MAAM,UAAU,GAAa,IAAI,CAAC,KAAK,CACtC,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,QAAQ,6BAA6B,CAAC,CACpH,CAAC;YACF,0CAA0C;YAC1C,SAAS,cAAc,CAAC,KAAa;gBACpC,MAAM,aAAa,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBAC/C,OAAO,eAAe,CAAC,QAAQ,EAAE,KAAK,aAAa,CAAC,QAAQ,EAAE,CAAC;YAChE,CAAC;YACD,iDAAiD;YACjD,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC;YACpE,MAAM,MAAM,GAAc,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAa,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;YAC/F,kCAAkC;YAClC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE;gBAClC,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAChC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,EACzD,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CACnE,CAAC;aACF;iBAAM;gBACN,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAChC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,EACzD,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,CACpE,CAAC;aACF;YACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CACrB,uBAAuB,OAAO,sCAAsC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,CAC/H,CAAC;SACF;QAAC,OAAO,KAAK,EAAE;YACf,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,uDAAuD,OAAO,EAAE,CAAC,CAAC,CAAC;SAC1H;IACF,CAAC;IAED,KAAK,CAAC,+BAA+B,CAAC,OAAe;QACpD,IAAI;YACH,MAAM,eAAe,GAAG,IAAI,IAAI,EAAE,CAAC;YACnC,MAAM,UAAU,GAAa,IAAI,CAAC,KAAK,CACtC,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,QAAQ,mBAAmB,CAAC,CAC1G,CAAC;YAEF,IAAI,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC;YAC9B,IAAI,UAAU,GAAG,CAAC,CAAC;YACnB,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC;YAEpE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;gBACnD,IAAI,GAAG,GAAG,CAAC,CAAC;gBACZ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;oBAC/B,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;iBAC3B;gBACD,IAAI,GAAG,GAAG,MAAM,EAAE;oBACjB,MAAM,GAAG,GAAG,CAAC;oBACb,UAAU,GAAG,CAAC,CAAC;iBACf;aACD;YAED,MAAM,aAAa,GAAc,UAAU,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAa,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;YAE5H,0CAA0C;YAC1C,SAAS,cAAc,CAAC,KAAa;gBACpC,MAAM,aAAa,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBAC/C,OAAO,eAAe,CAAC,QAAQ,EAAE,KAAK,aAAa,CAAC,QAAQ,EAAE,CAAC;YAChE,CAAC;YAED,kCAAkC;YAClC,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE;gBACzC,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAChC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,EACzD,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CACnE,CAAC;aACF;iBAAM;gBACN,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAChC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,EACzD,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,CACpE,CAAC;aACF;YACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CACrB,uBAAuB,OAAO,oCAAoC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,CAC7H,CAAC;SACF;QAAC,OAAO,KAAK,EAAE;YACf,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,sDAAsD,OAAO,EAAE,CAAC,CAAC,CAAC;SACzH;IACF,CAAC;CACD;AAlND,4CAkNC;AAED,SAAS,YAAY,CAAC,KAAa;IAClC,IAAI,KAAK,CAAC,WAAW,EAAE,KAAK,MAAM,EAAE;QACnC,OAAO,IAAI,CAAC;KACZ;SAAM,IAAI,KAAK,CAAC,WAAW,EAAE,KAAK,OAAO,EAAE;QAC3C,OAAO,KAAK,CAAC;KACb;SAAM;QACN,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;QACvC,OAAO,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC;KAClD;AACF,CAAC"}
|
package/io-package.json
CHANGED
|
@@ -1,8 +1,21 @@
|
|
|
1
1
|
{
|
|
2
2
|
"common": {
|
|
3
3
|
"name": "tibberlink",
|
|
4
|
-
"version": "1.
|
|
4
|
+
"version": "1.3.0",
|
|
5
5
|
"news": {
|
|
6
|
+
"1.3.0": {
|
|
7
|
+
"en": "Implement Tibber calculator mode 'best hours block' (#16)",
|
|
8
|
+
"de": "Implementieren des Tibber-Rechnermodus 'beste Stundenblock' (#16)",
|
|
9
|
+
"ru": "Реализация режима калькулятора Tibber 'лучший часовой блок' (#16)",
|
|
10
|
+
"pt": "Implementar o modo de calculadora Tibber 'melhor bloco de horas' (#16)",
|
|
11
|
+
"nl": "Implementeer de Tibber rekenmachine modus 'beste uren blok' (#16)",
|
|
12
|
+
"fr": "Implémenter le mode calculatrice Tibber 'meilleur bloc d'heures' (#16)",
|
|
13
|
+
"it": "Implementare la modalità calcolatrice Tibber 'miglior blocco di ore' (#16)",
|
|
14
|
+
"es": "Implementar el modo calculadora Tibber 'mejor bloque de horas' (#16)",
|
|
15
|
+
"pl": "Wdrożenie trybu kalkulatora Tibber 'najlepszy blok godzin' (#16)",
|
|
16
|
+
"uk": "Впровадження режиму калькулятора Tibber 'кращий годинний блок' (#16)",
|
|
17
|
+
"zh-cn": "实施Tibber计算器模式 '最佳小时块' (#16)"
|
|
18
|
+
},
|
|
6
19
|
"1.2.0": {
|
|
7
20
|
"en": "Implement Tibber calculator mode 'best single hours' (#16); fixed translations (#128); fixed error in initial read of calculator states (#129)",
|
|
8
21
|
"de": "Implementieren des Tibber-Rechnermodus 'beste Einzelstunden' (#16); behobene Übersetzungen (#128); Fehler bei der initialen Lesung der Rechnerzustände behoben (#129)",
|