iobroker.zendure-solarflow 1.6.5 → 1.6.7
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 -0
- package/build/services/jobSchedule.js +6 -32
- package/build/services/jobSchedule.js.map +2 -2
- package/io-package.json +27 -27
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -46,6 +46,14 @@ If you find the adapter useful for you and want to support my work, feel free to
|
|
|
46
46
|
[](https://www.paypal.com/paypalme/PeterFrommert)
|
|
47
47
|
|
|
48
48
|
## Changelog
|
|
49
|
+
### 1.6.7 (2024-06-23)
|
|
50
|
+
|
|
51
|
+
- Fix reconnect again. Adapter will now restart every 3 hours to cleanup fully.
|
|
52
|
+
|
|
53
|
+
### 1.6.6 (2024-06-21)
|
|
54
|
+
|
|
55
|
+
- Tweaked recurring refresh of access token.
|
|
56
|
+
|
|
49
57
|
### 1.6.5 (2024-06-20)
|
|
50
58
|
|
|
51
59
|
- Fix reconnect issue. Adapter will now restart if connection semms to be broken.
|
|
@@ -25,41 +25,15 @@ __export(jobSchedule_exports, {
|
|
|
25
25
|
});
|
|
26
26
|
module.exports = __toCommonJS(jobSchedule_exports);
|
|
27
27
|
var import_node_schedule = require("node-schedule");
|
|
28
|
-
var import_mqttService = require("./mqttService");
|
|
29
|
-
var import_webService = require("./webService");
|
|
30
28
|
var import_calculationService = require("./calculationService");
|
|
31
|
-
const refreshAccessToken = (adapter) => {
|
|
32
|
-
var _a, _b;
|
|
33
|
-
adapter.log.info(`[startRefreshAccessTokenTimerJob] Refreshing accessToken!`);
|
|
34
|
-
if (adapter.resetValuesJob) {
|
|
35
|
-
adapter.resetValuesJob.cancel();
|
|
36
|
-
adapter.resetValuesJob = void 0;
|
|
37
|
-
}
|
|
38
|
-
if (adapter.checkStatesJob) {
|
|
39
|
-
(_a = adapter.checkStatesJob) == null ? void 0 : _a.cancel();
|
|
40
|
-
adapter.checkStatesJob = void 0;
|
|
41
|
-
}
|
|
42
|
-
if (adapter.calculationJob) {
|
|
43
|
-
adapter.calculationJob.cancel();
|
|
44
|
-
adapter.calculationJob = void 0;
|
|
45
|
-
}
|
|
46
|
-
if (adapter.mqttClient) {
|
|
47
|
-
adapter.mqttClient.end();
|
|
48
|
-
adapter.mqttClient = void 0;
|
|
49
|
-
}
|
|
50
|
-
if (adapter.config.userName && adapter.config.password) {
|
|
51
|
-
(_b = (0, import_webService.login)(adapter)) == null ? void 0 : _b.then((_accessToken) => {
|
|
52
|
-
adapter.accessToken = _accessToken;
|
|
53
|
-
adapter.lastLogin = /* @__PURE__ */ new Date();
|
|
54
|
-
adapter.setState("info.connection", true, true);
|
|
55
|
-
(0, import_mqttService.connectMqttClient)(adapter);
|
|
56
|
-
});
|
|
57
|
-
}
|
|
58
|
-
};
|
|
59
29
|
const startRefreshAccessTokenTimerJob = async (adapter) => {
|
|
60
30
|
adapter.refreshAccessTokenInterval = adapter.setInterval(
|
|
61
|
-
() => {
|
|
62
|
-
|
|
31
|
+
async () => {
|
|
32
|
+
adapter.log.info(
|
|
33
|
+
`Refresh Access Token - Adapter will restart in 20 seconds!`
|
|
34
|
+
);
|
|
35
|
+
await adapter.delay(20 * 1e3);
|
|
36
|
+
adapter.restart();
|
|
63
37
|
},
|
|
64
38
|
3 * 60 * 60 * 1e3
|
|
65
39
|
);
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/services/jobSchedule.ts"],
|
|
4
|
-
"sourcesContent": ["/* eslint-disable @typescript-eslint/indent */\r\nimport { scheduleJob } from \"node-schedule\";\r\nimport { ZendureSolarflow } from \"../main\";\r\
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,2BAA4B;
|
|
4
|
+
"sourcesContent": ["/* eslint-disable @typescript-eslint/indent */\r\nimport { scheduleJob } from \"node-schedule\";\r\nimport { ZendureSolarflow } from \"../main\";\r\n/* import { connectMqttClient } from \"./mqttService\";\r\nimport { login } from \"./webService\"; */\r\nimport { ISolarFlowDeviceDetails } from \"../models/ISolarFlowDeviceDetails\";\r\nimport { calculateEnergy, resetTodaysValues } from \"./calculationService\";\r\n\r\n/* const refreshAccessToken = async (adapter: ZendureSolarflow): Promise<void> => {\r\n // Relogin every 3 hours to get a fresh accessToken!\r\n adapter.log.info(`[startRefreshAccessTokenTimerJob] Stop connections!`);\r\n\r\n // Scheduler beenden\r\n if (adapter.resetValuesJob) {\r\n adapter.resetValuesJob.cancel();\r\n }\r\n\r\n if (adapter.checkStatesJob) {\r\n adapter.checkStatesJob?.cancel();\r\n }\r\n\r\n if (adapter.calculationJob) {\r\n adapter.calculationJob.cancel();\r\n }\r\n\r\n if (adapter.mqttClient) {\r\n adapter.mqttClient.end();\r\n }\r\n\r\n adapter.log.info(\r\n `[startRefreshAccessTokenTimerJob] Refreshing accessToken in 10 seconds!`,\r\n );\r\n await adapter.delay(10 * 1000);\r\n\r\n adapter.resetValuesJob = undefined;\r\n adapter.checkStatesJob = undefined;\r\n adapter.calculationJob = undefined;\r\n adapter.mqttClient = undefined;\r\n\r\n if (adapter.config.userName && adapter.config.password) {\r\n login(adapter)?.then((_accessToken: string) => {\r\n adapter.accessToken = _accessToken;\r\n adapter.lastLogin = new Date();\r\n adapter.setState(\"info.connection\", true, true);\r\n\r\n connectMqttClient(adapter);\r\n });\r\n }\r\n}; */\r\n\r\nexport const startRefreshAccessTokenTimerJob = async (\r\n adapter: ZendureSolarflow,\r\n): Promise<void> => {\r\n adapter.refreshAccessTokenInterval = adapter.setInterval(\r\n async () => {\r\n adapter.log.info(\r\n `Refresh Access Token - Adapter will restart in 20 seconds!`,\r\n );\r\n\r\n await adapter.delay(20 * 1000);\r\n adapter.restart();\r\n },\r\n 3 * 60 * 60 * 1000,\r\n );\r\n};\r\n\r\nexport const startResetValuesJob = async (\r\n adapter: ZendureSolarflow,\r\n): Promise<void> => {\r\n adapter.resetValuesJob = scheduleJob(\"5 0 0 * * *\", () => {\r\n // Reset Values\r\n resetTodaysValues(adapter);\r\n });\r\n};\r\n\r\nexport const startCalculationJob = async (\r\n adapter: ZendureSolarflow,\r\n): Promise<void> => {\r\n adapter.calculationJob = scheduleJob(\"*/30 * * * * *\", () => {\r\n adapter.deviceList.forEach((device) => {\r\n calculateEnergy(adapter, device.productKey, device.deviceKey);\r\n });\r\n });\r\n};\r\n\r\nexport const startCheckStatesAndConnectionJob = async (\r\n adapter: ZendureSolarflow,\r\n): Promise<void> => {\r\n // Check for states that has no updates in the last 5 minutes and set them to 0\r\n const statesToReset: string[] = [\r\n \"outputHomePower\",\r\n \"outputPackPower\",\r\n \"packInputPower\",\r\n \"solarInputPower\",\r\n ];\r\n\r\n let refreshAccessTokenNeeded = false;\r\n\r\n adapter.log.debug(\r\n `[checkStatesJob] Starting check of states and connection!`,\r\n );\r\n\r\n adapter.checkStatesJob = scheduleJob(\"*/5 * * * *\", async () => {\r\n adapter.deviceList.forEach(async (device: ISolarFlowDeviceDetails) => {\r\n if (refreshAccessTokenNeeded) {\r\n return;\r\n }\r\n\r\n const lastUpdate = await adapter?.getStateAsync(\r\n device.productKey + \".\" + device.deviceKey + \".lastUpdate\",\r\n );\r\n\r\n const wifiState = await adapter?.getStateAsync(\r\n device.productKey + \".\" + device.deviceKey + \".wifiState\",\r\n );\r\n\r\n const fiveMinutesAgo = (Date.now() / 1000 - 5 * 60) * 1000; // Five minutes ago\r\n const tenMinutesAgo = (Date.now() / 1000 - 10 * 60) * 1000; // Ten minutes ago\r\n\r\n if (\r\n lastUpdate &&\r\n lastUpdate.val &&\r\n Number(lastUpdate.val) < fiveMinutesAgo &&\r\n wifiState?.val == \"Connected\"\r\n ) {\r\n adapter.log.warn(\r\n `[checkStatesJob] Last update for deviceKey ${\r\n device.deviceKey\r\n } was at ${new Date(\r\n Number(lastUpdate),\r\n )}, device seems to be online - so maybe connection is broken - restart adapter in 20 seconds!`,\r\n );\r\n\r\n await adapter.delay(20 * 1000);\r\n adapter.restart();\r\n\r\n // set marker, so we discontinue the forEach Loop because of reconnect!\r\n refreshAccessTokenNeeded = true;\r\n }\r\n\r\n if (\r\n lastUpdate &&\r\n lastUpdate.val &&\r\n Number(lastUpdate.val) < tenMinutesAgo &&\r\n !refreshAccessTokenNeeded\r\n ) {\r\n adapter.log.debug(\r\n `[checkStatesJob] Last update for deviceKey ${\r\n device.deviceKey\r\n } was at ${new Date(\r\n Number(lastUpdate),\r\n )}, checking for pseudo power values!`,\r\n );\r\n // State was not updated in the last 10 minutes... set states to 0\r\n await statesToReset.forEach(async (stateName: string) => {\r\n await adapter?.setStateAsync(\r\n device.productKey + \".\" + device.deviceKey + \".\" + stateName,\r\n 0,\r\n true,\r\n );\r\n });\r\n\r\n // set electricLevel from deviceList\r\n if (device.electricity) {\r\n await adapter?.setStateAsync(\r\n device.productKey + \".\" + device.deviceKey + \".electricLevel\",\r\n device.electricity,\r\n true,\r\n );\r\n }\r\n }\r\n });\r\n });\r\n};\r\n"],
|
|
5
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,2BAA4B;AAK5B,gCAAmD;AA4C5C,MAAM,kCAAkC,OAC7C,YACkB;AAClB,UAAQ,6BAA6B,QAAQ;AAAA,IAC3C,YAAY;AACV,cAAQ,IAAI;AAAA,QACV;AAAA,MACF;AAEA,YAAM,QAAQ,MAAM,KAAK,GAAI;AAC7B,cAAQ,QAAQ;AAAA,IAClB;AAAA,IACA,IAAI,KAAK,KAAK;AAAA,EAChB;AACF;AAEO,MAAM,sBAAsB,OACjC,YACkB;AAClB,UAAQ,qBAAiB,kCAAY,eAAe,MAAM;AAExD,qDAAkB,OAAO;AAAA,EAC3B,CAAC;AACH;AAEO,MAAM,sBAAsB,OACjC,YACkB;AAClB,UAAQ,qBAAiB,kCAAY,kBAAkB,MAAM;AAC3D,YAAQ,WAAW,QAAQ,CAAC,WAAW;AACrC,qDAAgB,SAAS,OAAO,YAAY,OAAO,SAAS;AAAA,IAC9D,CAAC;AAAA,EACH,CAAC;AACH;AAEO,MAAM,mCAAmC,OAC9C,YACkB;AAElB,QAAM,gBAA0B;AAAA,IAC9B;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAEA,MAAI,2BAA2B;AAE/B,UAAQ,IAAI;AAAA,IACV;AAAA,EACF;AAEA,UAAQ,qBAAiB,kCAAY,eAAe,YAAY;AAC9D,YAAQ,WAAW,QAAQ,OAAO,WAAoC;AACpE,UAAI,0BAA0B;AAC5B;AAAA,MACF;AAEA,YAAM,aAAa,OAAM,mCAAS;AAAA,QAChC,OAAO,aAAa,MAAM,OAAO,YAAY;AAAA;AAG/C,YAAM,YAAY,OAAM,mCAAS;AAAA,QAC/B,OAAO,aAAa,MAAM,OAAO,YAAY;AAAA;AAG/C,YAAM,kBAAkB,KAAK,IAAI,IAAI,MAAO,IAAI,MAAM;AACtD,YAAM,iBAAiB,KAAK,IAAI,IAAI,MAAO,KAAK,MAAM;AAEtD,UACE,cACA,WAAW,OACX,OAAO,WAAW,GAAG,IAAI,mBACzB,uCAAW,QAAO,aAClB;AACA,gBAAQ,IAAI;AAAA,UACV,8CACE,OAAO,SACT,WAAW,IAAI;AAAA,YACb,OAAO,UAAU;AAAA,UACnB,CAAC;AAAA,QACH;AAEA,cAAM,QAAQ,MAAM,KAAK,GAAI;AAC7B,gBAAQ,QAAQ;AAGhB,mCAA2B;AAAA,MAC7B;AAEA,UACE,cACA,WAAW,OACX,OAAO,WAAW,GAAG,IAAI,iBACzB,CAAC,0BACD;AACA,gBAAQ,IAAI;AAAA,UACV,8CACE,OAAO,SACT,WAAW,IAAI;AAAA,YACb,OAAO,UAAU;AAAA,UACnB,CAAC;AAAA,QACH;AAEA,cAAM,cAAc,QAAQ,OAAO,cAAsB;AACvD,iBAAM,mCAAS;AAAA,YACb,OAAO,aAAa,MAAM,OAAO,YAAY,MAAM;AAAA,YACnD;AAAA,YACA;AAAA;AAAA,QAEJ,CAAC;AAGD,YAAI,OAAO,aAAa;AACtB,iBAAM,mCAAS;AAAA,YACb,OAAO,aAAa,MAAM,OAAO,YAAY;AAAA,YAC7C,OAAO;AAAA,YACP;AAAA;AAAA,QAEJ;AAAA,MACF;AAAA,IACF,CAAC;AAAA,EACH,CAAC;AACH;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/io-package.json
CHANGED
|
@@ -1,8 +1,34 @@
|
|
|
1
1
|
{
|
|
2
2
|
"common": {
|
|
3
3
|
"name": "zendure-solarflow",
|
|
4
|
-
"version": "1.6.
|
|
4
|
+
"version": "1.6.7",
|
|
5
5
|
"news": {
|
|
6
|
+
"1.6.7": {
|
|
7
|
+
"en": "Fix reconnect again. Adapter will now restart every 3 hours to cleanup fully.",
|
|
8
|
+
"de": "Reconnect wieder reparieren. Adapter wird jetzt alle 3 Stunden neu starten, um vollständig zu reinigen.",
|
|
9
|
+
"ru": "Повторите подключение. Адаптер теперь перезапускается каждые 3 часа, чтобы полностью очиститься.",
|
|
10
|
+
"pt": "Reconectar novamente. O adaptador agora reiniciará a cada 3 horas para limpar totalmente.",
|
|
11
|
+
"nl": "Maak opnieuw verbinding. Adapter zal nu om de 3 uur opnieuw opstarten om volledig op te ruimen.",
|
|
12
|
+
"fr": "Réparer la connexion. Adaptateur va maintenant redémarrer toutes les 3 heures pour nettoyer complètement.",
|
|
13
|
+
"it": "Risolvi di nuovo la connessione. L'adattatore si riavvia ogni 3 ore per pulire completamente.",
|
|
14
|
+
"es": "Arregla la reconexión de nuevo. El adaptador se reiniciará cada 3 horas para limpiar completamente.",
|
|
15
|
+
"pl": "Napraw ponownie połączenie. Adapter będzie teraz ponownie uruchomić co 3 godziny, aby w pełni posprzątać.",
|
|
16
|
+
"uk": "Виправлення повторного підключення. Адаптер тепер перезавантажить кожні 3 години для очищення повністю.",
|
|
17
|
+
"zh-cn": "恢复连接 适配器现在将每3小时重新启动一次,以全面清理."
|
|
18
|
+
},
|
|
19
|
+
"1.6.6": {
|
|
20
|
+
"en": "Tweaked recurring refresh of access token.",
|
|
21
|
+
"de": "Tweaked wiederkehrende Erfrischung des Zugangs zu Token.",
|
|
22
|
+
"ru": "Сжатое повторяющееся обновление токена доступа.",
|
|
23
|
+
"pt": "Atualização recorrente de token de acesso.",
|
|
24
|
+
"nl": "Getweaked returning refresh of access token.",
|
|
25
|
+
"fr": "Changez de jeton d'accès.",
|
|
26
|
+
"it": "Tweaked rinfresco ricorrente di accesso token.",
|
|
27
|
+
"es": "Refrigerio recurrente de token de acceso.",
|
|
28
|
+
"pl": "Podmienił powtarzające się odświeżanie tokena dostępu.",
|
|
29
|
+
"uk": "Запечена рецидивна обробка токени доступу.",
|
|
30
|
+
"zh-cn": "不断刷新访问标志."
|
|
31
|
+
},
|
|
6
32
|
"1.6.5": {
|
|
7
33
|
"en": "Fix reconnect issue. Adapter will now restart if connection semms to be broken.",
|
|
8
34
|
"de": "Reconnect Problem behoben. Adapter wird jetzt neu starten, wenn Verbindungssemms gebrochen werden.",
|
|
@@ -67,32 +93,6 @@
|
|
|
67
93
|
"pl": "Popraw problem, że czasem dane nie są aktualizowane\nDodawanie trybu czuwania HUB (20W) w przypadku niskiego wejścia solarinput",
|
|
68
94
|
"uk": "Виправлення проблеми, які одноразові дані не оновлено\nДодайте автономне використання HUB (20W) при низькому доступі",
|
|
69
95
|
"zh-cn": "解决数据有时不更新的问题\n当太阳输入量低时添加 HUB( 20W) 的备用用法"
|
|
70
|
-
},
|
|
71
|
-
"1.6.0": {
|
|
72
|
-
"en": "Fix issue that sometime data is not updated\nAdd standby usage of HUB (20W) when solarinput is low",
|
|
73
|
-
"de": "Problem behoben, dass einige Zeitdaten nicht aktualisiert werden\nFügen Sie Standby-Nutzung von HUB (20W) hinzu, wenn Solarinput niedrig ist",
|
|
74
|
-
"ru": "Исправить вопрос, что когда-то данные не обновляются\nДобавить резервное использование HUB (20W), когда солнечный вход низкий",
|
|
75
|
-
"pt": "Corrigir problema que alguns dados de tempo não é atualizado\nAdicionar uso standby de HUB (20W) quando a entrada solar é baixa",
|
|
76
|
-
"nl": "Fix probleem dat sommige gegevens niet is bijgewerkt\nToevoegen stand-by gebruik van HUB (20W) wanneer zonne-input laag is",
|
|
77
|
-
"fr": "Correction de problème que parfois les données ne sont pas mises à jour\nAjouter l'utilisation en veille de HUB (20W) lorsque l'apport solaire est faible",
|
|
78
|
-
"it": "Risolvi il problema che alcuni dati non sono aggiornati\nAggiungere l'uso standby di HUB (20W) quando l'input solare è basso",
|
|
79
|
-
"es": "Problema de fijación que algunos datos no se actualizan\nAñadir el uso de reserva de HUB (20W) cuando la energía solar es baja",
|
|
80
|
-
"pl": "Popraw problem, że czasem dane nie są aktualizowane\nDodawanie trybu czuwania HUB (20W) w przypadku niskiego wejścia solarinput",
|
|
81
|
-
"uk": "Виправлення проблеми, які одноразові дані не оновлено\nДодайте автономне використання HUB (20W) при низькому доступі",
|
|
82
|
-
"zh-cn": "解决数据有时不更新的问题\n当太阳输入量低时添加 HUB( 20W) 的备用用法"
|
|
83
|
-
},
|
|
84
|
-
"1.5.3": {
|
|
85
|
-
"en": "Fix autoRecover datatype issue",
|
|
86
|
-
"de": "AutoRecover Datatype Problem",
|
|
87
|
-
"ru": "Вопрос о типе данных autoRecover",
|
|
88
|
-
"pt": "Corrigir problema do tipo de dados autoRecover",
|
|
89
|
-
"nl": "Repareren autoRecover datatype probleem",
|
|
90
|
-
"fr": "Correction problème de type de données autoRecover",
|
|
91
|
-
"it": "Risolvere il problema del tipo di dati autoRecover",
|
|
92
|
-
"es": "Corrección de autoRecover datatype problema",
|
|
93
|
-
"pl": "Napraw wydanie typu danych autoRecover",
|
|
94
|
-
"uk": "Фіксувати автоматичнийВихід даних",
|
|
95
|
-
"zh-cn": "自动恢复数据类型问题"
|
|
96
96
|
}
|
|
97
97
|
},
|
|
98
98
|
"titleLang": {
|