iobroker.faikout 0.0.10 → 0.0.12
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 +9 -0
- package/io-package.json +27 -14
- package/lib/broker.js +39 -14
- package/lib/fields.js +7 -0
- package/lib/namen.js +11 -0
- package/main.js +3 -3
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -70,6 +70,15 @@ module's **Extra** settings makes it report immediately.
|
|
|
70
70
|
### **WORK IN PROGRESS**
|
|
71
71
|
-->
|
|
72
72
|
|
|
73
|
+
### 0.0.12
|
|
74
|
+
- New state `status.reason`: the disconnect reason the broker publishes from the module's MQTT last will (value `LWT`),
|
|
75
|
+
now described with role and names in all eleven languages (it was created as an unknown field before).
|
|
76
|
+
|
|
77
|
+
### 0.0.11
|
|
78
|
+
- Remaining log messages in English (hour change, client disconnect/error, failed command).
|
|
79
|
+
- Stopping the adapter no longer hangs while faikout modules stay connected: open MQTT connections are closed actively,
|
|
80
|
+
with a 2 s upper limit (previously the js-controller killed the process after its stop timeout). New test.
|
|
81
|
+
|
|
73
82
|
### 0.0.10
|
|
74
83
|
- Review findings (PR #6700): all log messages and error texts in English (`main.js`, `lib/broker.js`, `lib/verbrauch.js`).
|
|
75
84
|
- `control.swing`: state labels in English (`off`, `on`, `vertical`, `horizontal`, `both`, `comfort`).
|
package/io-package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"common": {
|
|
3
3
|
"name": "faikout",
|
|
4
|
-
"version": "0.0.
|
|
4
|
+
"version": "0.0.12",
|
|
5
5
|
"titleLang": {
|
|
6
6
|
"en": "Faikout",
|
|
7
7
|
"de": "Faikout",
|
|
@@ -68,6 +68,32 @@
|
|
|
68
68
|
}
|
|
69
69
|
],
|
|
70
70
|
"news": {
|
|
71
|
+
"0.0.12": {
|
|
72
|
+
"en": "New state status.reason (disconnect reason from the MQTT last will, e.g. \"LWT\") with names in all languages",
|
|
73
|
+
"de": "Neuer Datenpunkt status.reason (Grund der Trennung aus dem MQTT-„Last Will“, z. B. „LWT“) mit Namen in allen Sprachen",
|
|
74
|
+
"ru": "Новое состояние status.reason (причина отключения из MQTT last will, например «LWT») с названиями на всех языках",
|
|
75
|
+
"pt": "Novo estado status.reason (motivo da desconexão do MQTT last will, p. ex. «LWT») com nomes em todos os idiomas",
|
|
76
|
+
"nl": "Nieuwe status status.reason (reden van verbreking uit de MQTT last will, bijv. \"LWT\") met namen in alle talen",
|
|
77
|
+
"fr": "Nouvel état status.reason (cause de la déconnexion issue du last will MQTT, p. ex. « LWT ») avec des noms dans toutes les langues",
|
|
78
|
+
"it": "Nuovo stato status.reason (motivo della disconnessione dal last will MQTT, ad es. \"LWT\") con nomi in tutte le lingue",
|
|
79
|
+
"es": "Nuevo estado status.reason (motivo de la desconexión del last will de MQTT, p. ej. «LWT») con nombres en todos los idiomas",
|
|
80
|
+
"pl": "Nowy stan status.reason (przyczyna rozłączenia z MQTT last will, np. „LWT”) z nazwami we wszystkich językach",
|
|
81
|
+
"uk": "Новий стан status.reason (причина відключення з MQTT last will, напр. «LWT») з назвами всіма мовами",
|
|
82
|
+
"zh-cn": "新状态 status.reason(来自 MQTT 遗嘱消息的断开原因,例如“LWT”),名称支持所有语言"
|
|
83
|
+
},
|
|
84
|
+
"0.0.11": {
|
|
85
|
+
"en": "Remaining log messages in English; the adapter now stops quickly even while faikout modules stay connected (no more forced kill on stop)",
|
|
86
|
+
"de": "Restliche Log-Meldungen auf Englisch; der Adapter beendet sich jetzt schnell, auch wenn faikout-Module verbunden bleiben (kein erzwungener Abbruch mehr beim Stoppen)",
|
|
87
|
+
"ru": "Оставшиеся сообщения журнала на английском; адаптер теперь быстро останавливается, даже если модули faikout остаются подключёнными (больше нет принудительного завершения)",
|
|
88
|
+
"pt": "Restantes mensagens de registo em inglês; o adaptador para agora rapidamente mesmo com módulos faikout ligados (sem encerramento forçado ao parar)",
|
|
89
|
+
"nl": "Resterende logberichten in het Engels; de adapter stopt nu snel, ook als faikout-modules verbonden blijven (geen geforceerde beëindiging meer)",
|
|
90
|
+
"fr": "Messages de journal restants en anglais ; l'adaptateur s'arrête désormais rapidement même si des modules faikout restent connectés (plus d'arrêt forcé)",
|
|
91
|
+
"it": "Messaggi di log rimanenti in inglese; l'adattatore ora si arresta rapidamente anche con moduli faikout connessi (nessuna terminazione forzata)",
|
|
92
|
+
"es": "Mensajes de registro restantes en inglés; el adaptador ahora se detiene rápidamente aunque los módulos faikout sigan conectados (sin cierre forzado)",
|
|
93
|
+
"pl": "Pozostałe komunikaty dziennika po angielsku; adapter zatrzymuje się teraz szybko, nawet gdy moduły faikout pozostają połączone (bez wymuszonego zakończenia)",
|
|
94
|
+
"uk": "Решта повідомлень журналу англійською; адаптер тепер швидко зупиняється, навіть якщо модулі faikout залишаються підключеними (без примусового завершення)",
|
|
95
|
+
"zh-cn": "其余日志消息改为英文;即使 faikout 模块保持连接,适配器现在也能快速停止(停止时不再被强制终止)"
|
|
96
|
+
},
|
|
71
97
|
"0.0.10": {
|
|
72
98
|
"en": "Review findings: all log messages in English, swing state labels in English, VIS widgets show English texts outside German (decimal separator and month names follow the VIS language)",
|
|
73
99
|
"de": "Review-Befunde: alle Log-Meldungen auf Englisch, Bezeichnungen der Schwenk-Zustände auf Englisch, VIS-Bausteine außerhalb von Deutsch auf Englisch (Dezimaltrennzeichen und Monatsnamen folgen der VIS-Sprache)",
|
|
@@ -132,19 +158,6 @@
|
|
|
132
158
|
"pl": "Opublikowano przez GitHub Actions z npm provenance",
|
|
133
159
|
"uk": "Опубліковано через GitHub Actions з npm provenance",
|
|
134
160
|
"zh-cn": "通过 GitHub Actions 发布并附带 npm 来源证明"
|
|
135
|
-
},
|
|
136
|
-
"0.0.5": {
|
|
137
|
-
"en": "Meet the ioBroker repository requirements",
|
|
138
|
-
"de": "Anforderungen des ioBroker-Repositorys erfuellt",
|
|
139
|
-
"ru": "Соответствие требованиям репозитория ioBroker",
|
|
140
|
-
"pt": "Cumpre os requisitos do repositório ioBroker",
|
|
141
|
-
"nl": "Voldoet aan de eisen van het ioBroker-repository",
|
|
142
|
-
"fr": "Conforme aux exigences du dépôt ioBroker",
|
|
143
|
-
"it": "Conforme ai requisiti del repository ioBroker",
|
|
144
|
-
"es": "Cumple los requisitos del repositorio ioBroker",
|
|
145
|
-
"pl": "Spełnia wymagania repozytorium ioBroker",
|
|
146
|
-
"uk": "Відповідає вимогам репозиторію ioBroker",
|
|
147
|
-
"zh-cn": "满足 ioBroker 仓库的收录要求"
|
|
148
161
|
}
|
|
149
162
|
},
|
|
150
163
|
"restartAdapters": [
|
package/lib/broker.js
CHANGED
|
@@ -72,11 +72,11 @@ class FaikoutBroker {
|
|
|
72
72
|
this.onClient(client.id, true);
|
|
73
73
|
});
|
|
74
74
|
this.broker.on('clientDisconnect', client => {
|
|
75
|
-
this.log.info(`MQTT
|
|
75
|
+
this.log.info(`MQTT client disconnected: ${client.id}`);
|
|
76
76
|
this.onClient(client.id, false);
|
|
77
77
|
});
|
|
78
78
|
this.broker.on('clientError', (client, err) => {
|
|
79
|
-
this.log.debug(`MQTT
|
|
79
|
+
this.log.debug(`MQTT client error ${client && client.id}: ${err.message}`);
|
|
80
80
|
});
|
|
81
81
|
this.broker.on('publish', (packet, client) => {
|
|
82
82
|
// Ohne client sind es die internen $SYS-Nachrichten des Brokers.
|
|
@@ -90,7 +90,15 @@ class FaikoutBroker {
|
|
|
90
90
|
}
|
|
91
91
|
});
|
|
92
92
|
|
|
93
|
-
|
|
93
|
+
// Offene Verbindungen merken: server.close() wartet sonst, bis jedes Modul von sich aus
|
|
94
|
+
// trennt - die faikout-Module halten ihre Verbindung aber dauerhaft. Ohne das hing das
|
|
95
|
+
// Beenden, und der js-controller brach den Prozess nach der Wartezeit hart ab (SIGKILL).
|
|
96
|
+
this.sockets = new Set();
|
|
97
|
+
this.server = net.createServer(stream => {
|
|
98
|
+
this.sockets.add(stream);
|
|
99
|
+
stream.on('close', () => this.sockets.delete(stream));
|
|
100
|
+
this.broker.handle(stream);
|
|
101
|
+
});
|
|
94
102
|
this.server.on('error', err => {
|
|
95
103
|
if (err.code === 'EADDRINUSE') {
|
|
96
104
|
this.log.error(`Port ${this.port} is in use - choose another port in the instance settings.`);
|
|
@@ -120,7 +128,7 @@ class FaikoutBroker {
|
|
|
120
128
|
{ topic, payload: Buffer.from(String(payload)), qos: 0, retain: false, cmd: 'publish' },
|
|
121
129
|
err => {
|
|
122
130
|
if (err) {
|
|
123
|
-
this.log.warn(`
|
|
131
|
+
this.log.warn(`Sending to "${topic}" failed: ${err.message}`);
|
|
124
132
|
}
|
|
125
133
|
resolve(!err);
|
|
126
134
|
},
|
|
@@ -135,19 +143,36 @@ class FaikoutBroker {
|
|
|
135
143
|
*/
|
|
136
144
|
stop() {
|
|
137
145
|
return new Promise(resolve => {
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
146
|
+
let erledigt = false;
|
|
147
|
+
const ende = () => {
|
|
148
|
+
if (!erledigt) {
|
|
149
|
+
erledigt = true;
|
|
150
|
+
clearTimeout(notbremse);
|
|
143
151
|
resolve();
|
|
144
152
|
}
|
|
145
153
|
};
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
154
|
+
// Obergrenze: Das Beenden darf den Adapter nie blockieren (Unload-Zeitlimit).
|
|
155
|
+
const notbremse = setTimeout(ende, 2000);
|
|
156
|
+
const server = this.server;
|
|
157
|
+
const broker = this.broker;
|
|
158
|
+
this.server = null;
|
|
159
|
+
this.broker = null;
|
|
160
|
+
if (server) {
|
|
161
|
+
server.close(() => (broker ? broker.close(ende) : ende()));
|
|
162
|
+
}
|
|
163
|
+
// Die dauerhaft offenen Modul-Verbindungen aktiv trennen, damit server.close() fertig wird.
|
|
164
|
+
for (const s of this.sockets || []) {
|
|
165
|
+
s.destroy();
|
|
166
|
+
}
|
|
167
|
+
if (this.sockets) {
|
|
168
|
+
this.sockets.clear();
|
|
169
|
+
}
|
|
170
|
+
if (!server) {
|
|
171
|
+
if (broker) {
|
|
172
|
+
broker.close(ende);
|
|
173
|
+
} else {
|
|
174
|
+
ende();
|
|
175
|
+
}
|
|
151
176
|
}
|
|
152
177
|
});
|
|
153
178
|
}
|
package/lib/fields.js
CHANGED
|
@@ -442,6 +442,13 @@ const FELDER = {
|
|
|
442
442
|
},
|
|
443
443
|
flash: { kanal: 'info', type: 'number', role: 'value', unit: 'B', name: { en: 'Flash size', de: 'Flash-Größe' } },
|
|
444
444
|
rst: { kanal: 'info', type: 'number', role: 'value', name: { en: 'Reset reason', de: 'Neustartgrund' } },
|
|
445
|
+
// Kommt mit der "Last Will"-Nachricht, wenn die Verbindung des Moduls abreisst (Wert "LWT").
|
|
446
|
+
reason: {
|
|
447
|
+
kanal: 'status',
|
|
448
|
+
type: 'string',
|
|
449
|
+
role: 'text',
|
|
450
|
+
name: { en: 'Disconnect reason', de: 'Grund der Trennung' },
|
|
451
|
+
},
|
|
445
452
|
up: {
|
|
446
453
|
kanal: 'info',
|
|
447
454
|
type: 'boolean',
|
package/lib/namen.js
CHANGED
|
@@ -709,6 +709,17 @@ const UEBERSETZUNGEN = {
|
|
|
709
709
|
uk: 'Вільна пам’ять SPI',
|
|
710
710
|
'zh-cn': '可用 SPI 内存',
|
|
711
711
|
},
|
|
712
|
+
'Disconnect reason': {
|
|
713
|
+
ru: 'Причина отключения',
|
|
714
|
+
pt: 'Motivo da desconexão',
|
|
715
|
+
nl: 'Reden van verbreking',
|
|
716
|
+
fr: 'Cause de la déconnexion',
|
|
717
|
+
it: 'Motivo della disconnessione',
|
|
718
|
+
es: 'Motivo de la desconexión',
|
|
719
|
+
pl: 'Przyczyna rozłączenia',
|
|
720
|
+
uk: 'Причина відключення',
|
|
721
|
+
'zh-cn': '断开原因',
|
|
722
|
+
},
|
|
712
723
|
'Reset reason': {
|
|
713
724
|
ru: 'Причина перезапуска',
|
|
714
725
|
pt: 'Motivo do reinício',
|
package/main.js
CHANGED
|
@@ -107,7 +107,7 @@ class Faikout extends utils.Adapter {
|
|
|
107
107
|
const naechste = new Date(jetzt);
|
|
108
108
|
naechste.setHours(jetzt.getHours() + 1, 0, 5, 0); // 5 s nach der vollen Stunde
|
|
109
109
|
this.stundenTimer = this.setTimeout(() => {
|
|
110
|
-
this.stundenwechsel().catch(e => this.log.warn(`
|
|
110
|
+
this.stundenwechsel().catch(e => this.log.warn(`Hour change: ${e.message}`));
|
|
111
111
|
this.stundenTaktStarten();
|
|
112
112
|
}, naechste - jetzt);
|
|
113
113
|
}
|
|
@@ -120,7 +120,7 @@ class Faikout extends utils.Adapter {
|
|
|
120
120
|
continue;
|
|
121
121
|
}
|
|
122
122
|
g.zaehler[z.feld] = ergebnis.stand;
|
|
123
|
-
ergebnis.hinweise.forEach(h => this.log.info(`${g.name} ${z.
|
|
123
|
+
ergebnis.hinweise.forEach(h => this.log.info(`${g.name} ${z.name.en.toLowerCase()}: ${h}`));
|
|
124
124
|
await this.verbrauchSchreiben(id, g, z, ergebnis.werte);
|
|
125
125
|
}
|
|
126
126
|
await this.zaehlerstandSichern(id, g);
|
|
@@ -337,7 +337,7 @@ class Faikout extends utils.Adapter {
|
|
|
337
337
|
const ergebnis = verbrauch.verarbeiten(g.zaehler[z.feld] || null, roh, new Date());
|
|
338
338
|
g.zaehler[z.feld] = ergebnis.stand;
|
|
339
339
|
veraendert = true;
|
|
340
|
-
ergebnis.hinweise.forEach(h => this.log.info(`${g.name} ${z.
|
|
340
|
+
ergebnis.hinweise.forEach(h => this.log.info(`${g.name} ${z.name.en.toLowerCase()}: ${h}`));
|
|
341
341
|
await this.verbrauchSchreiben(id, g, z, ergebnis.werte);
|
|
342
342
|
}
|
|
343
343
|
if (veraendert) {
|