iobroker.hass 2.0.4 → 2.1.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 +39 -31
- package/admin/hass.png +0 -0
- package/admin/i18n/de.json +8 -2
- package/admin/i18n/en.json +8 -2
- package/admin/i18n/es.json +8 -2
- package/admin/i18n/fr.json +11 -5
- package/admin/i18n/it.json +8 -2
- package/admin/i18n/nl.json +8 -2
- package/admin/i18n/pl.json +8 -2
- package/admin/i18n/pt.json +8 -2
- package/admin/i18n/ru.json +8 -2
- package/admin/i18n/uk.json +8 -2
- package/admin/i18n/zh-cn.json +8 -2
- package/admin/jsonConfig.json +22 -0
- package/build/lib/entityFilter.js +34 -0
- package/build/lib/entityFilter.js.map +1 -0
- package/build/lib/hass.js +4 -3
- package/build/lib/hass.js.map +1 -1
- package/build/main.js +157 -6
- package/build/main.js.map +1 -1
- package/io-package.json +23 -18
- package/package.json +12 -7
package/README.md
CHANGED
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
[](https://weblate.iobroker.net/engage/adapters/?utm_source=widget)
|
|
10
10
|
[](https://www.npmjs.com/package/iobroker.hass)
|
|
11
11
|
|
|
12
|
-
**This adapter uses Sentry libraries to automatically report exceptions and code errors to the developers.** For more details and for information how to disable the error reporting see [Sentry-Plugin Documentation](https://github.com/ioBroker/plugin-sentry#plugin-sentry)! Sentry reporting is used starting with js-controller 3.0.
|
|
12
|
+
**This adapter uses Sentry libraries to automatically report exceptions and code errors to the developers.** For more details and for information on how to disable the error reporting, see [Sentry-Plugin Documentation](https://github.com/ioBroker/plugin-sentry#plugin-sentry)! Sentry reporting is used starting with js-controller 3.0.
|
|
13
13
|
|
|
14
14
|
|
|
15
15
|
This adapter allows the connecting of Home Assistant to ioBroker.
|
|
@@ -20,7 +20,7 @@ Create a long-term token in HASS and use it as PW (copy it also in the repeat fi
|
|
|
20
20
|
Then it should read out all attributes for all devices. Services might be controllable (e.g. "turn_on"). To control services, you have two options:
|
|
21
21
|
|
|
22
22
|
### Set a direct value
|
|
23
|
-
Set the state with an ack=false value which is not a string (e.g. Boolean true) then it will be triggered also in HASS without additional service data. This will only work if the service has one field to be sent - then the value is sent as this field! If the service has more than one field, you will find a warning in the log that provides more details about the fields that are possible to be sent, e.g.
|
|
23
|
+
Set the state with an ack=false value which is not a string (e.g. Boolean true), then it will be triggered also in HASS without additional service data. This will only work if the service has one field to be sent - then the value is sent as this field! If the service has more than one field, you will find a warning in the log that provides more details about the fields that are possible to be sent, e.g.
|
|
24
24
|
|
|
25
25
|
```
|
|
26
26
|
Please make sure to provide a stringified JSON as value to set relevant fields! Please refer to the Readme for details!
|
|
@@ -94,18 +94,53 @@ For some services like set_speed it is required to call with a JSON object like
|
|
|
94
94
|
```
|
|
95
95
|
|
|
96
96
|
## Configuration
|
|
97
|
-
There is a good article about connection.
|
|
97
|
+
There is a good article about the connection.
|
|
98
98
|
|
|
99
99
|
Please check it https://www.smarthomejetzt.de/mit-iobroker-auf-eine-home-assistant-hass-io-installation-und-die-geraete-zugreifen/
|
|
100
100
|
|
|
101
101
|
**Unfortunately only in German, but the [Google Translate works rather good](https://translate.google.com/translate?hl=en&sl=de&tl=en&u=https%3A%2F%2Fwww.smarthomejetzt.de%2Fmit-iobroker-auf-eine-home-assistant-hass-io-installation-und-die-geraete-zugreifen%2F)**
|
|
102
102
|
|
|
103
|
+
## Entity exclude filter
|
|
104
|
+
|
|
105
|
+
Optionally, restrict which Home Assistant entities are synchronised into ioBroker.
|
|
106
|
+
|
|
107
|
+
Each non-empty, non-comment line in the **Exclude patterns** field is a glob
|
|
108
|
+
(only `*` is a wildcard and matches any sequence of characters, including `.`).
|
|
109
|
+
Patterns are matched case-sensitively against the full `entity_id` (e.g.
|
|
110
|
+
`switch.living_room`). An entity that matches any pattern is:
|
|
111
|
+
|
|
112
|
+
- skipped when objects are created or updated (initial sync and re-syncs)
|
|
113
|
+
- ignored when its state changes in HASS (no state writes triggered in ioBroker)
|
|
114
|
+
|
|
115
|
+
Lines starting with `#` are treated as comments.
|
|
116
|
+
|
|
117
|
+
Examples:
|
|
118
|
+
|
|
119
|
+
```
|
|
120
|
+
# Drop every entity whose name starts with `iob_`, regardless of domain:
|
|
121
|
+
*.iob_*
|
|
122
|
+
|
|
123
|
+
# Drop sensors only:
|
|
124
|
+
sensor.iob_*
|
|
125
|
+
```
|
|
126
|
+
|
|
127
|
+
Tick **Verbose filter logging** to log every excluded `entity_id` individually
|
|
128
|
+
during the first sync (requires adapter loglevel `info` or `debug`). Subsequent
|
|
129
|
+
re-syncs only emit the aggregate count to keep the log clean.
|
|
130
|
+
|
|
131
|
+
An empty pattern list leaves the adapter behaviour identical to previous versions.
|
|
132
|
+
|
|
103
133
|
<!--
|
|
104
134
|
Placeholder for the next version (at the beginning of the line):
|
|
105
135
|
### **WORK IN PROGRESS**
|
|
106
136
|
-->
|
|
107
137
|
|
|
108
138
|
## Changelog
|
|
139
|
+
### 2.1.0 (2026-05-16)
|
|
140
|
+
* (mokusone) Added optional entity exclude filter with glob patterns, configurable via the admin UI, plus a verbose-logging toggle for inspecting matches
|
|
141
|
+
* (@klein0r) Use `/core/` instead of `/api/` when connecting to supervisor directly (e.g., in ha app)
|
|
142
|
+
* (@klein0r) Use ENV var SUPERVISOR_TOKEN as fallback for password
|
|
143
|
+
|
|
109
144
|
### 2.0.4 (2026-05-05)
|
|
110
145
|
* (@GermanBluefox) Tried to keep the custom settings of the objects when updating them with new data from HASS
|
|
111
146
|
|
|
@@ -121,34 +156,7 @@ Please check it https://www.smarthomejetzt.de/mit-iobroker-auf-eine-home-assista
|
|
|
121
156
|
### 1.3.0 (2022-07-01)
|
|
122
157
|
* (Apollon77) Further optimize sending data to HASS and allow setting values like numbers as normal states if the service has one attribute and it can be mapped
|
|
123
158
|
|
|
124
|
-
|
|
125
|
-
* (Apollon77) IMPORTANT: Replace special characters in entity attribute names with an underscore! Object IDs might change!
|
|
126
|
-
* (Apollon77) make sure a "null" value in state changes is not crashing
|
|
127
|
-
|
|
128
|
-
### 1.1.2 (2022-03-29)
|
|
129
|
-
* (Apollon77) Fix crash cases reported by Sentry
|
|
130
|
-
|
|
131
|
-
### 1.1.1 (2022-03-25)
|
|
132
|
-
* (Apollon77) Show password fields masked again in config
|
|
133
|
-
|
|
134
|
-
### 1.1.0 (2022-03-24)
|
|
135
|
-
* IMPORTANT: You need to re-enter the password once after installing this version!
|
|
136
|
-
* (Apollon77) Implement Service triggers to use any value to trigger or stringified JSON to call with fields
|
|
137
|
-
* (Apollon77) Optimize unload handling
|
|
138
|
-
* (Apollon7) Add Sentry for crash reporting
|
|
139
|
-
|
|
140
|
-
### 1.0.1 (2021-09-04)
|
|
141
|
-
* IMPORTANT: js-controller 2.0 is needed at least!
|
|
142
|
-
* (Apollon77) Fix start issue
|
|
143
|
-
* (Apollon77/Garfonso) Fix issue where value could not be set in hass
|
|
144
|
-
|
|
145
|
-
### 1.0.0 (2020-12-13)
|
|
146
|
-
* (bluefox) added the support of compact mode
|
|
147
|
-
|
|
148
|
-
### 0.1.0
|
|
149
|
-
* (bluefox) initial release
|
|
150
|
-
|
|
151
|
-
## License
|
|
159
|
+
[Older changelogs can be found there](CHANGELOG_OLD.md)## License
|
|
152
160
|
The MIT License (MIT)
|
|
153
161
|
|
|
154
162
|
Copyright (c) 2018-2026 bluefox <dogafox@gmail.com>
|
package/admin/hass.png
CHANGED
|
Binary file
|
package/admin/i18n/de.json
CHANGED
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
{
|
|
2
|
+
"Cleanup excluded entities on adapter start": "Ausgefilterte Entitäten beim Adapter-Start löschen",
|
|
3
|
+
"Exclude patterns (one per line)": "Filter-Patterns (eines pro Zeile)",
|
|
4
|
+
"Glob patterns, * wildcard. Lines starting with # are comments. Empty = filter off.": "Glob-Patterns mit * als Wildcard. Zeilen mit # sind Kommentare. Leer = Filter aus.",
|
|
2
5
|
"Home assistant IP": "IP-Adresse von Home Assistant",
|
|
3
6
|
"Home assistant WS Port": "Home Assistant WebSocket-Port",
|
|
4
|
-
"Password repeat": "Passwort wiederholen",
|
|
5
7
|
"Password": "Passwort",
|
|
8
|
+
"Password repeat": "Passwort wiederholen",
|
|
6
9
|
"Passwords missmatch!": "Passwörter stimmen nicht überein!",
|
|
7
|
-
"Secure": "HTTPS?"
|
|
10
|
+
"Secure": "HTTPS?",
|
|
11
|
+
"Verbose filter logging": "Ausführliches Filter-Logging",
|
|
12
|
+
"When enabled, log each excluded entity_id individually during the initial adapter sync (requires loglevel info or debug).": "Wenn aktiv: jede ausgeschlossene entity_id wird beim initialen Adapter-Sync einzeln geloggt (benötigt Loglevel info oder debug).",
|
|
13
|
+
"When enabled, on each adapter start delete existing objects under entities.* whose entity_id matches the exclude patterns. Objects with custom adapter config (history/influxdb/sql) are kept and logged.": "Wenn aktiv: bei jedem Adapter-Start werden vorhandene Objekte unter entities.*, deren entity_id auf die Filter-Patterns matched, gelöscht. Objekte mit Custom-Adapter-Konfiguration (history/influxdb/sql) bleiben erhalten und werden geloggt."
|
|
8
14
|
}
|
package/admin/i18n/en.json
CHANGED
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
{
|
|
2
|
+
"Cleanup excluded entities on adapter start": "Cleanup excluded entities on adapter start",
|
|
3
|
+
"Exclude patterns (one per line)": "Exclude patterns (one per line)",
|
|
4
|
+
"Glob patterns, * wildcard. Lines starting with # are comments. Empty = filter off.": "Glob patterns, * wildcard. Lines starting with # are comments. Empty = filter off.",
|
|
2
5
|
"Home assistant IP": "Home assistant IP",
|
|
3
6
|
"Home assistant WS Port": "Home assistant WS Port",
|
|
4
|
-
"Password repeat": "Password repeat",
|
|
5
7
|
"Password": "Password",
|
|
8
|
+
"Password repeat": "Password repeat",
|
|
6
9
|
"Passwords missmatch!": "Passwords missmatch!",
|
|
7
|
-
"Secure": "HTTPS?"
|
|
10
|
+
"Secure": "HTTPS?",
|
|
11
|
+
"Verbose filter logging": "Verbose filter logging",
|
|
12
|
+
"When enabled, log each excluded entity_id individually during the initial adapter sync (requires loglevel info or debug).": "When enabled, log each excluded entity_id individually during the initial adapter sync (requires loglevel info or debug).",
|
|
13
|
+
"When enabled, on each adapter start delete existing objects under entities.* whose entity_id matches the exclude patterns. Objects with custom adapter config (history/influxdb/sql) are kept and logged.": "When enabled, on each adapter start delete existing objects under entities.* whose entity_id matches the exclude patterns. Objects with custom adapter config (history/influxdb/sql) are kept and logged."
|
|
8
14
|
}
|
package/admin/i18n/es.json
CHANGED
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
{
|
|
2
|
+
"Cleanup excluded entities on adapter start": "Limpiar las entidades excluidas al iniciar el adaptador.",
|
|
3
|
+
"Exclude patterns (one per line)": "Patrones de exclusión (uno por línea)",
|
|
4
|
+
"Glob patterns, * wildcard. Lines starting with # are comments. Empty = filter off.": "Patrones glob, * como comodín. Las líneas que empiezan con # son comentarios. Vacío = filtro desactivado.",
|
|
2
5
|
"Home assistant IP": "IP del asistente de hogar",
|
|
3
6
|
"Home assistant WS Port": "Asistente doméstico Puerto WS",
|
|
4
|
-
"Password repeat": "Repite la contraseña",
|
|
5
7
|
"Password": "Clave",
|
|
8
|
+
"Password repeat": "Repite la contraseña",
|
|
6
9
|
"Passwords missmatch!": "¡Las contraseñas no coinciden!",
|
|
7
|
-
"Secure": "¿HTTPS?"
|
|
10
|
+
"Secure": "¿HTTPS?",
|
|
11
|
+
"Verbose filter logging": "Registro detallado del filtro",
|
|
12
|
+
"When enabled, log each excluded entity_id individually during the initial adapter sync (requires loglevel info or debug).": "Cuando está activado, cada entity_id excluido se registra individualmente durante la sincronización inicial del adaptador (requiere loglevel info o debug).",
|
|
13
|
+
"When enabled, on each adapter start delete existing objects under entities.* whose entity_id matches the exclude patterns. Objects with custom adapter config (history/influxdb/sql) are kept and logged.": "Cuando está habilitada, en cada inicio del adaptador se eliminan los objetos existentes en entities.* cuyo entity_id coincida con los patrones de exclusión. Los objetos con configuración de adaptador personalizada (history/influxdb/sql) se conservan y se registran."
|
|
8
14
|
}
|
package/admin/i18n/fr.json
CHANGED
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
{
|
|
2
|
-
"
|
|
3
|
-
"
|
|
4
|
-
"
|
|
2
|
+
"Cleanup excluded entities on adapter start": "Nettoyage des entités exclues au démarrage de l'adaptateur",
|
|
3
|
+
"Exclude patterns (one per line)": "Modèles d'exclusion (un par ligne)",
|
|
4
|
+
"Glob patterns, * wildcard. Lines starting with # are comments. Empty = filter off.": "Modèles glob, * comme joker. Les lignes commençant par # sont des commentaires. Vide = filtre désactivé.",
|
|
5
|
+
"Home assistant IP": "IP de l'assistant à domicile ",
|
|
6
|
+
"Home assistant WS Port": "Port WS de l'assistant domestique ",
|
|
5
7
|
"Password": "Mot de passe",
|
|
6
|
-
"
|
|
7
|
-
"
|
|
8
|
+
"Password repeat": "Répéter le mot de passe ",
|
|
9
|
+
"Passwords missmatch!": "Les mots de passe ne correspondent pas !",
|
|
10
|
+
"Secure": "HTTPS ?",
|
|
11
|
+
"Verbose filter logging": "Journalisation détaillée du filtre",
|
|
12
|
+
"When enabled, log each excluded entity_id individually during the initial adapter sync (requires loglevel info or debug).": "Lorsqu'activé, chaque entity_id exclu est journalisé individuellement pendant la synchronisation initiale de l'adaptateur (nécessite loglevel info ou debug).",
|
|
13
|
+
"When enabled, on each adapter start delete existing objects under entities.* whose entity_id matches the exclude patterns. Objects with custom adapter config (history/influxdb/sql) are kept and logged.": "Lorsqu'elle est activée, cette option supprime, à chaque démarrage de l'adaptateur, les objets existants sous entities.* dont l'entity_id correspond aux critères d'exclusion. Les objets avec une configuration d'adaptateur personnalisée (history/influxdb/sql) sont conservés et consignés."
|
|
8
14
|
}
|
package/admin/i18n/it.json
CHANGED
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
{
|
|
2
|
+
"Cleanup excluded entities on adapter start": "Pulizia delle entità escluse all'avvio dell'adattatore",
|
|
3
|
+
"Exclude patterns (one per line)": "Pattern di esclusione (uno per riga)",
|
|
4
|
+
"Glob patterns, * wildcard. Lines starting with # are comments. Empty = filter off.": "Pattern glob, * come wildcard. Le righe che iniziano con # sono commenti. Vuoto = filtro disattivato.",
|
|
2
5
|
"Home assistant IP": "IP assistente domestico",
|
|
3
6
|
"Home assistant WS Port": "Porta WS dell'assistente domestico",
|
|
4
|
-
"Password repeat": "Ripeti password",
|
|
5
7
|
"Password": "Parola d'ordine",
|
|
8
|
+
"Password repeat": "Ripeti password",
|
|
6
9
|
"Passwords missmatch!": "Le password non corrispondono!",
|
|
7
|
-
"Secure": "HTTPS?"
|
|
10
|
+
"Secure": "HTTPS?",
|
|
11
|
+
"Verbose filter logging": "Logging dettagliato del filtro",
|
|
12
|
+
"When enabled, log each excluded entity_id individually during the initial adapter sync (requires loglevel info or debug).": "Se attivato, registra ogni entity_id escluso individualmente durante la sincronizzazione iniziale dell'adattatore (richiede loglevel info o debug).",
|
|
13
|
+
"When enabled, on each adapter start delete existing objects under entities.* whose entity_id matches the exclude patterns. Objects with custom adapter config (history/influxdb/sql) are kept and logged.": "Quando abilitata, all'avvio di ogni adattatore vengono eliminati gli oggetti esistenti in entities.* il cui entity_id corrisponde ai modelli di esclusione. Gli oggetti con configurazione personalizzata dell'adattatore (history/influxdb/sql) vengono mantenuti e registrati."
|
|
8
14
|
}
|
package/admin/i18n/nl.json
CHANGED
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
{
|
|
2
|
+
"Cleanup excluded entities on adapter start": "Verwijder uitgesloten entiteiten bij het opstarten van de adapter.",
|
|
3
|
+
"Exclude patterns (one per line)": "Uitsluitpatronen (één per regel)",
|
|
4
|
+
"Glob patterns, * wildcard. Lines starting with # are comments. Empty = filter off.": "Glob-patronen, * als wildcard. Regels die beginnen met # zijn commentaar. Leeg = filter uit.",
|
|
2
5
|
"Home assistant IP": "Thuisassistent IP",
|
|
3
6
|
"Home assistant WS Port": "Thuisassistent WS Poort",
|
|
4
|
-
"Password repeat": "Wachtwoord herhalen",
|
|
5
7
|
"Password": "Wachtwoord",
|
|
8
|
+
"Password repeat": "Wachtwoord herhalen",
|
|
6
9
|
"Passwords missmatch!": "Wachtwoorden komen niet overeen!",
|
|
7
|
-
"Secure": "HTTPS?"
|
|
10
|
+
"Secure": "HTTPS?",
|
|
11
|
+
"Verbose filter logging": "Uitgebreide filterlogging",
|
|
12
|
+
"When enabled, log each excluded entity_id individually during the initial adapter sync (requires loglevel info or debug).": "Indien ingeschakeld, wordt elke uitgesloten entity_id afzonderlijk gelogd tijdens de initiële adapter-synchronisatie (vereist loglevel info of debug).",
|
|
13
|
+
"When enabled, on each adapter start delete existing objects under entities.* whose entity_id matches the exclude patterns. Objects with custom adapter config (history/influxdb/sql) are kept and logged.": "Indien ingeschakeld, worden bij elke adapterstart bestaande objecten onder entities.* verwijderd waarvan de entity_id overeenkomt met de uitsluitingspatronen. Objecten met een aangepaste adapterconfiguratie (history/influxdb/sql) worden behouden en gelogd."
|
|
8
14
|
}
|
package/admin/i18n/pl.json
CHANGED
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
{
|
|
2
|
+
"Cleanup excluded entities on adapter start": "Wyczyść wykluczone jednostki podczas uruchamiania adaptera",
|
|
3
|
+
"Exclude patterns (one per line)": "Wzorce wykluczeń (jeden na linię)",
|
|
4
|
+
"Glob patterns, * wildcard. Lines starting with # are comments. Empty = filter off.": "Wzorce glob, * jako symbol wieloznaczny. Linie zaczynające się od # to komentarze. Puste = filtr wyłączony.",
|
|
2
5
|
"Home assistant IP": "Adres IP asystenta domowego",
|
|
3
6
|
"Home assistant WS Port": "Asystent domowy Port WS",
|
|
4
|
-
"Password repeat": "Powtórz hasło",
|
|
5
7
|
"Password": "Hasło",
|
|
8
|
+
"Password repeat": "Powtórz hasło",
|
|
6
9
|
"Passwords missmatch!": "Niezgodność haseł!",
|
|
7
|
-
"Secure": "HTTPS?"
|
|
10
|
+
"Secure": "HTTPS?",
|
|
11
|
+
"Verbose filter logging": "Szczegółowe logowanie filtra",
|
|
12
|
+
"When enabled, log each excluded entity_id individually during the initial adapter sync (requires loglevel info or debug).": "Gdy włączone, każde wykluczone entity_id jest logowane osobno podczas początkowej synchronizacji adaptera (wymaga poziomu logowania info lub debug).",
|
|
13
|
+
"When enabled, on each adapter start delete existing objects under entities.* whose entity_id matches the exclude patterns. Objects with custom adapter config (history/influxdb/sql) are kept and logged.": "Po włączeniu, przy każdym uruchomieniu adaptera usuwane są istniejące obiekty w encji.*, których identyfikator encji pasuje do wzorców wykluczeń. Obiekty z niestandardową konfiguracją adaptera (history/influxdb/sql) są zachowywane i rejestrowane."
|
|
8
14
|
}
|
package/admin/i18n/pt.json
CHANGED
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
{
|
|
2
|
+
"Cleanup excluded entities on adapter start": "Limpeza de entidades excluídas na inicialização do adaptador",
|
|
3
|
+
"Exclude patterns (one per line)": "Padrões de exclusão (um por linha)",
|
|
4
|
+
"Glob patterns, * wildcard. Lines starting with # are comments. Empty = filter off.": "Padrões glob, * como wildcard. Linhas começando com # são comentários. Vazio = filtro desligado.",
|
|
2
5
|
"Home assistant IP": "IP do assistente doméstico",
|
|
3
6
|
"Home assistant WS Port": "Assistente doméstico Porta WS",
|
|
4
|
-
"Password repeat": "Repetição de senha",
|
|
5
7
|
"Password": "Senha",
|
|
8
|
+
"Password repeat": "Repetição de senha",
|
|
6
9
|
"Passwords missmatch!": "As senhas não correspondem!",
|
|
7
|
-
"Secure": "HTTPS?"
|
|
10
|
+
"Secure": "HTTPS?",
|
|
11
|
+
"Verbose filter logging": "Registro detalhado do filtro",
|
|
12
|
+
"When enabled, log each excluded entity_id individually during the initial adapter sync (requires loglevel info or debug).": "Quando ativado, cada entity_id excluído é registrado individualmente durante a sincronização inicial do adaptador (requer loglevel info ou debug).",
|
|
13
|
+
"When enabled, on each adapter start delete existing objects under entities.* whose entity_id matches the exclude patterns. Objects with custom adapter config (history/influxdb/sql) are kept and logged.": "Quando ativado, a cada inicialização do adaptador, os objetos existentes em entities.* cujo entity_id corresponde aos padrões de exclusão são excluídos. Os objetos com configuração de adaptador personalizada (history/influxdb/sql) são mantidos e registrados."
|
|
8
14
|
}
|
package/admin/i18n/ru.json
CHANGED
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
{
|
|
2
|
+
"Cleanup excluded entities on adapter start": "Удалите исключенные объекты при запуске адаптера.",
|
|
3
|
+
"Exclude patterns (one per line)": "Шаблоны исключения (по одному на строку)",
|
|
4
|
+
"Glob patterns, * wildcard. Lines starting with # are comments. Empty = filter off.": "Glob-шаблоны, * — подстановочный знак. Строки, начинающиеся с #, являются комментариями. Пусто = фильтр выключен.",
|
|
2
5
|
"Home assistant IP": "Домашний помощник IP",
|
|
3
6
|
"Home assistant WS Port": "Домашний помощник WS Порт",
|
|
4
|
-
"Password repeat": "Повтор пароля",
|
|
5
7
|
"Password": "Пароль",
|
|
8
|
+
"Password repeat": "Повтор пароля",
|
|
6
9
|
"Passwords missmatch!": "Пароли не совпадают!",
|
|
7
|
-
"Secure": "HTTPS?"
|
|
10
|
+
"Secure": "HTTPS?",
|
|
11
|
+
"Verbose filter logging": "Подробное логирование фильтра",
|
|
12
|
+
"When enabled, log each excluded entity_id individually during the initial adapter sync (requires loglevel info or debug).": "Когда включено, каждый исключённый entity_id логируется отдельно во время начальной синхронизации адаптера (требуется loglevel info или debug).",
|
|
13
|
+
"When enabled, on each adapter start delete existing objects under entities.* whose entity_id matches the exclude patterns. Objects with custom adapter config (history/influxdb/sql) are kept and logged.": "При включении этой функции при каждом запуске адаптера удалять существующие объекты в папке entities.*, чей entity_id соответствует шаблонам исключения. Объекты с пользовательской конфигурацией адаптера (history/influxdb/sql) сохраняются и записываются в журнал."
|
|
8
14
|
}
|
package/admin/i18n/uk.json
CHANGED
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
{
|
|
2
|
+
"Cleanup excluded entities on adapter start": "Очищення виключених об'єктів під час запуску адаптера",
|
|
3
|
+
"Exclude patterns (one per line)": "Шаблони виключення (по одному в рядку)",
|
|
4
|
+
"Glob patterns, * wildcard. Lines starting with # are comments. Empty = filter off.": "Glob-шаблони, * — підстановочний знак. Рядки, що починаються з #, є коментарями. Порожньо = фільтр вимкнено.",
|
|
2
5
|
"Home assistant IP": "Домашній помічник IP",
|
|
3
6
|
"Home assistant WS Port": "Домашній помічник WS Порт",
|
|
4
|
-
"Password repeat": "Повторення пароля",
|
|
5
7
|
"Password": "Пароль",
|
|
8
|
+
"Password repeat": "Повторення пароля",
|
|
6
9
|
"Passwords missmatch!": "Паролі не збігаються!",
|
|
7
|
-
"Secure": "HTTPS?"
|
|
10
|
+
"Secure": "HTTPS?",
|
|
11
|
+
"Verbose filter logging": "Детальне логування фільтра",
|
|
12
|
+
"When enabled, log each excluded entity_id individually during the initial adapter sync (requires loglevel info or debug).": "Коли увімкнено, кожен виключений entity_id логується окремо під час початкової синхронізації адаптера (потрібен loglevel info або debug).",
|
|
13
|
+
"When enabled, on each adapter start delete existing objects under entities.* whose entity_id matches the exclude patterns. Objects with custom adapter config (history/influxdb/sql) are kept and logged.": "Якщо ввімкнено, на кожному адаптері починається видалення існуючих об'єктів у розділі entity.*, чий entity_id відповідає шаблонам виключення. Об'єкти з власною конфігурацією адаптера (history/influxdb/sql) зберігаються та реєструються."
|
|
8
14
|
}
|
package/admin/i18n/zh-cn.json
CHANGED
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
{
|
|
2
|
+
"Cleanup excluded entities on adapter start": "适配器启动时清理排除的实体",
|
|
3
|
+
"Exclude patterns (one per line)": "排除模式(每行一个)",
|
|
4
|
+
"Glob patterns, * wildcard. Lines starting with # are comments. Empty = filter off.": "Glob 模式,* 通配符。以 # 开头的行是注释。为空 = 过滤器关闭。",
|
|
2
5
|
"Home assistant IP": "家庭助理IP:",
|
|
3
6
|
"Home assistant WS Port": "家庭助理 WS 端口:",
|
|
4
|
-
"Password repeat": "密码重复:",
|
|
5
7
|
"Password": "密码:",
|
|
8
|
+
"Password repeat": "密码重复:",
|
|
6
9
|
"Passwords missmatch!": "密码不匹配!",
|
|
7
|
-
"Secure": "HTTPS?"
|
|
10
|
+
"Secure": "HTTPS?",
|
|
11
|
+
"Verbose filter logging": "详细过滤器日志",
|
|
12
|
+
"When enabled, log each excluded entity_id individually during the initial adapter sync (requires loglevel info or debug).": "启用后,在适配器初始同步期间单独记录每个被排除的 entity_id(需要日志级别 info 或 debug)。",
|
|
13
|
+
"When enabled, on each adapter start delete existing objects under entities.* whose entity_id matches the exclude patterns. Objects with custom adapter config (history/influxdb/sql) are kept and logged.": "启用此功能后,每次适配器启动时,都会删除 entities.* 下 entity_id 与排除模式匹配的现有对象。具有自定义适配器配置(history/influxdb/sql)的对象将被保留并记录。"
|
|
8
14
|
}
|
package/admin/jsonConfig.json
CHANGED
|
@@ -39,6 +39,28 @@
|
|
|
39
39
|
"sm": 12,
|
|
40
40
|
"md": 6,
|
|
41
41
|
"lg": 4
|
|
42
|
+
},
|
|
43
|
+
"_divider3": {
|
|
44
|
+
"type": "divider"
|
|
45
|
+
},
|
|
46
|
+
"excludePatterns": {
|
|
47
|
+
"type": "text",
|
|
48
|
+
"label": "Exclude patterns (one per line)",
|
|
49
|
+
"help": "Glob patterns, * wildcard. Lines starting with # are comments. Empty = filter off.",
|
|
50
|
+
"minRows": 6,
|
|
51
|
+
"sm": 12
|
|
52
|
+
},
|
|
53
|
+
"verboseFilterLog": {
|
|
54
|
+
"type": "checkbox",
|
|
55
|
+
"label": "Verbose filter logging",
|
|
56
|
+
"help": "When enabled, log each excluded entity_id individually during the initial adapter sync (requires loglevel info or debug).",
|
|
57
|
+
"sm": 12
|
|
58
|
+
},
|
|
59
|
+
"cleanupExcludedOnStart": {
|
|
60
|
+
"type": "checkbox",
|
|
61
|
+
"label": "Cleanup excluded entities on adapter start",
|
|
62
|
+
"help": "When enabled, on each adapter start delete existing objects under entities.* whose entity_id matches the exclude patterns. Objects with custom adapter config (history/influxdb/sql) are kept and logged.",
|
|
63
|
+
"sm": 12
|
|
42
64
|
}
|
|
43
65
|
}
|
|
44
66
|
}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isExcluded = isExcluded;
|
|
4
|
+
exports.buildExcludeRegexps = buildExcludeRegexps;
|
|
5
|
+
/**
|
|
6
|
+
* Returns true if entityId matches any of the supplied glob patterns.
|
|
7
|
+
* Glob syntax: `*` is the only wildcard and matches any sequence of characters
|
|
8
|
+
* (including dots). All other characters are matched literally (regex
|
|
9
|
+
* metacharacters are escaped). Matching is case-sensitive and anchored to
|
|
10
|
+
* the full entity_id.
|
|
11
|
+
*
|
|
12
|
+
* An empty patterns array always returns false.
|
|
13
|
+
*/
|
|
14
|
+
function isExcluded(entityId, patterns) {
|
|
15
|
+
if (!patterns?.length) {
|
|
16
|
+
return false;
|
|
17
|
+
}
|
|
18
|
+
for (const pattern of patterns) {
|
|
19
|
+
if (pattern.test(entityId)) {
|
|
20
|
+
return true;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
return false;
|
|
24
|
+
}
|
|
25
|
+
function buildExcludeRegexps(patterns) {
|
|
26
|
+
if (!patterns?.length) {
|
|
27
|
+
return [];
|
|
28
|
+
}
|
|
29
|
+
return patterns.map(pattern => {
|
|
30
|
+
const escaped = pattern.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*');
|
|
31
|
+
return new RegExp(`^${escaped}$`);
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=entityFilter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"entityFilter.js","sourceRoot":"","sources":["../../src/lib/entityFilter.ts"],"names":[],"mappings":";;AASA,gCAUC;AAED,kDAQC;AA7BD;;;;;;;;GAQG;AACH,SAAgB,UAAU,CAAC,QAAgB,EAAE,QAAkB;IAC3D,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;QACpB,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC7B,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAgB,mBAAmB,CAAC,QAAkB;IAClD,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;QACpB,OAAO,EAAE,CAAC;IACd,CAAC;IACD,OAAO,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QAC1B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACnF,OAAO,IAAI,MAAM,CAAC,IAAI,OAAO,GAAG,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACP,CAAC"}
|
package/build/lib/hass.js
CHANGED
|
@@ -88,12 +88,13 @@ class HASS extends node_events_1.EventEmitter {
|
|
|
88
88
|
}
|
|
89
89
|
}
|
|
90
90
|
else if (response.type === 'auth_required') {
|
|
91
|
-
|
|
91
|
+
const password = this.options.password || process.env.SUPERVISOR_TOKEN;
|
|
92
|
+
if (!password) {
|
|
92
93
|
this.emit('error', 'Password required. Connection closed');
|
|
93
94
|
socket.terminate();
|
|
94
95
|
}
|
|
95
96
|
else {
|
|
96
|
-
setTimeout(() => this.sendAuth(socket,
|
|
97
|
+
setTimeout(() => this.sendAuth(socket, password), 50);
|
|
97
98
|
}
|
|
98
99
|
}
|
|
99
100
|
else if (response.type === 'auth_ok') {
|
|
@@ -196,7 +197,7 @@ class HASS extends node_events_1.EventEmitter {
|
|
|
196
197
|
clearTimeout(this.connectTimeout);
|
|
197
198
|
this.connectTimeout = null;
|
|
198
199
|
}
|
|
199
|
-
this.socket = new ws_1.default(`ws${this.options.secure ? 's' : ''}://${this.options.host}:${this.options.port}
|
|
200
|
+
this.socket = new ws_1.default(`ws${this.options.secure ? 's' : ''}://${this.options.host}:${this.options.port}/${this.options.host === 'supervisor' ? 'core' : 'api'}/websocket`, { perMessageDeflate: false });
|
|
200
201
|
this.initSocket(this.socket);
|
|
201
202
|
}
|
|
202
203
|
close() {
|
package/build/lib/hass.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hass.js","sourceRoot":"","sources":["../../src/lib/hass.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"hass.js","sourceRoot":"","sources":["../../src/lib/hass.ts"],"names":[],"mappings":"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"}
|
package/build/main.js
CHANGED
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const adapter_core_1 = require("@iobroker/adapter-core");
|
|
7
7
|
const hass_1 = __importDefault(require("./lib/hass"));
|
|
8
|
+
const entityFilter_1 = require("./lib/entityFilter");
|
|
8
9
|
const knownAttributes = {
|
|
9
10
|
azimuth: { write: false, read: true, unit: '°' },
|
|
10
11
|
elevation: { write: false, read: true, unit: '°' },
|
|
@@ -156,6 +157,8 @@ class HassAdapter extends adapter_core_1.Adapter {
|
|
|
156
157
|
delayTimeout = null;
|
|
157
158
|
syncDebounceTimeout = null;
|
|
158
159
|
stopped = false;
|
|
160
|
+
excludePatterns = [];
|
|
161
|
+
initialSyncCompleted = false;
|
|
159
162
|
constructor(options = {}) {
|
|
160
163
|
super({
|
|
161
164
|
...options,
|
|
@@ -381,11 +384,20 @@ class HassAdapter extends adapter_core_1.Adapter {
|
|
|
381
384
|
const objs = [];
|
|
382
385
|
const states = [];
|
|
383
386
|
const expectedObjects = new Set();
|
|
387
|
+
let excludedCount = 0;
|
|
388
|
+
const excludedIds = [];
|
|
384
389
|
for (let e = 0; e < entities.length; e++) {
|
|
385
390
|
const entity = entities[e];
|
|
386
391
|
if (!entity) {
|
|
387
392
|
continue;
|
|
388
393
|
}
|
|
394
|
+
if ((0, entityFilter_1.isExcluded)(entity.entity_id, this.excludePatterns)) {
|
|
395
|
+
excludedCount++;
|
|
396
|
+
if (this.config.verboseFilterLog && !this.initialSyncCompleted) {
|
|
397
|
+
excludedIds.push(entity.entity_id);
|
|
398
|
+
}
|
|
399
|
+
continue;
|
|
400
|
+
}
|
|
389
401
|
const name = entity.name || entity.attributes?.friendly_name || entity.entity_id;
|
|
390
402
|
const desc = entity.attributes?.attribution || undefined;
|
|
391
403
|
const channelId = `${this.namespace}.entities.${entity.entity_id}`;
|
|
@@ -555,24 +567,142 @@ class HassAdapter extends adapter_core_1.Adapter {
|
|
|
555
567
|
}
|
|
556
568
|
this.log.info(`Synchronization completed: ${changes.join(', ')}`);
|
|
557
569
|
}
|
|
570
|
+
if (excludedCount > 0) {
|
|
571
|
+
this.log.info(`Entity filter excluded ${excludedCount} entit${excludedCount === 1 ? 'y' : 'ies'} from sync`);
|
|
572
|
+
}
|
|
573
|
+
if (excludedIds.length > 0) {
|
|
574
|
+
for (const id of excludedIds) {
|
|
575
|
+
this.log.info(`Entity filter excluded: ${id}`);
|
|
576
|
+
}
|
|
577
|
+
}
|
|
578
|
+
this.initialSyncCompleted = true;
|
|
579
|
+
}
|
|
580
|
+
async cleanupExcludedObjects() {
|
|
581
|
+
if (!this.config.cleanupExcludedOnStart) {
|
|
582
|
+
return;
|
|
583
|
+
}
|
|
584
|
+
if (this.excludePatterns.length === 0) {
|
|
585
|
+
this.log.info('Cleanup skipped: no exclude patterns configured');
|
|
586
|
+
return;
|
|
587
|
+
}
|
|
588
|
+
let allObjects;
|
|
589
|
+
try {
|
|
590
|
+
allObjects = await this.getAdapterObjectsAsync();
|
|
591
|
+
}
|
|
592
|
+
catch (err) {
|
|
593
|
+
this.log.error(`Cleanup: failed to load adapter objects: ${err}`);
|
|
594
|
+
return;
|
|
595
|
+
}
|
|
596
|
+
const prefix = `${this.namespace}.entities.`;
|
|
597
|
+
// Group every object under entities.* by its derived entity_id. We extract
|
|
598
|
+
// the entity_id from the object id (first two path components after the
|
|
599
|
+
// prefix) instead of native.entity_id — older objects from previous adapter
|
|
600
|
+
// versions may have been written as flat states without a parent channel
|
|
601
|
+
// and without native.entity_id, but their id still encodes the entity.
|
|
602
|
+
const matchedByEntity = new Map();
|
|
603
|
+
for (const id in allObjects) {
|
|
604
|
+
if (!Object.prototype.hasOwnProperty.call(allObjects, id) || !id.startsWith(prefix)) {
|
|
605
|
+
continue;
|
|
606
|
+
}
|
|
607
|
+
const rest = id.substring(prefix.length);
|
|
608
|
+
const parts = rest.split('.');
|
|
609
|
+
if (parts.length < 2) {
|
|
610
|
+
continue;
|
|
611
|
+
}
|
|
612
|
+
const entityId = `${parts[0]}.${parts[1]}`;
|
|
613
|
+
if (!(0, entityFilter_1.isExcluded)(entityId, this.excludePatterns)) {
|
|
614
|
+
continue;
|
|
615
|
+
}
|
|
616
|
+
const ids = matchedByEntity.get(entityId);
|
|
617
|
+
if (ids) {
|
|
618
|
+
ids.push(id);
|
|
619
|
+
}
|
|
620
|
+
else {
|
|
621
|
+
matchedByEntity.set(entityId, [id]);
|
|
622
|
+
}
|
|
623
|
+
}
|
|
624
|
+
if (matchedByEntity.size === 0) {
|
|
625
|
+
this.log.info('Cleanup: no existing objects matched exclude patterns');
|
|
626
|
+
return;
|
|
627
|
+
}
|
|
628
|
+
let deletedEntityCount = 0;
|
|
629
|
+
let deletedIdCount = 0;
|
|
630
|
+
let keptForCustomCount = 0;
|
|
631
|
+
for (const [entityId, ids] of matchedByEntity) {
|
|
632
|
+
// Custom-config protection: scan all ids of the group; if any holds
|
|
633
|
+
// common.custom (history/influxdb/sql) keep the whole entity.
|
|
634
|
+
let hasCustom = false;
|
|
635
|
+
for (const id of ids) {
|
|
636
|
+
const custom = allObjects[id].common?.custom;
|
|
637
|
+
if (custom && Object.keys(custom).length) {
|
|
638
|
+
hasCustom = true;
|
|
639
|
+
break;
|
|
640
|
+
}
|
|
641
|
+
}
|
|
642
|
+
if (hasCustom) {
|
|
643
|
+
keptForCustomCount++;
|
|
644
|
+
this.log.warn(`Cleanup: keeping entity "${entityId}" — has custom adapter config (history/influxdb/sql); remove it manually if you really want to drop it`);
|
|
645
|
+
continue;
|
|
646
|
+
}
|
|
647
|
+
// Delete sub-states first (longest ids), then any parent channel last.
|
|
648
|
+
const sortedIds = [...ids].sort((a, b) => b.length - a.length);
|
|
649
|
+
let entityFullyDeleted = true;
|
|
650
|
+
for (const id of sortedIds) {
|
|
651
|
+
try {
|
|
652
|
+
await this.delObjectAsync(id);
|
|
653
|
+
delete this.hassObjects[id];
|
|
654
|
+
deletedIdCount++;
|
|
655
|
+
}
|
|
656
|
+
catch (err) {
|
|
657
|
+
entityFullyDeleted = false;
|
|
658
|
+
this.log.error(`Cleanup: failed to delete "${id}": ${err}`);
|
|
659
|
+
}
|
|
660
|
+
}
|
|
661
|
+
if (entityFullyDeleted) {
|
|
662
|
+
deletedEntityCount++;
|
|
663
|
+
if (this.config.verboseFilterLog) {
|
|
664
|
+
this.log.info(`Cleanup: deleted entity "${entityId}" (${ids.length} object${ids.length === 1 ? '' : 's'})`);
|
|
665
|
+
}
|
|
666
|
+
}
|
|
667
|
+
}
|
|
668
|
+
this.log.info(`Cleanup: deleted ${deletedEntityCount} excluded entit${deletedEntityCount === 1 ? 'y' : 'ies'} (${deletedIdCount} object${deletedIdCount === 1 ? '' : 's'} total)${keptForCustomCount > 0
|
|
669
|
+
? `, kept ${keptForCustomCount} entit${keptForCustomCount === 1 ? 'y' : 'ies'} with custom config (see warnings above)`
|
|
670
|
+
: ''}`);
|
|
558
671
|
}
|
|
559
672
|
async main() {
|
|
560
673
|
this.config.host ||= '127.0.0.1';
|
|
561
674
|
this.config.port = parseInt(String(this.config.port), 10) || 8123;
|
|
675
|
+
const rawPatterns = (this.config.excludePatterns || '').toString();
|
|
676
|
+
const stringPatterns = rawPatterns
|
|
677
|
+
.split(/\r?\n/)
|
|
678
|
+
.map(s => s.trim())
|
|
679
|
+
.filter(line => line.length > 0 && !line.startsWith('#'));
|
|
680
|
+
this.excludePatterns = (0, entityFilter_1.buildExcludeRegexps)(stringPatterns);
|
|
681
|
+
if (this.excludePatterns.length === 0) {
|
|
682
|
+
this.log.info('Entity filter inactive (no exclude patterns configured)');
|
|
683
|
+
}
|
|
684
|
+
else {
|
|
685
|
+
this.log.info(`Entity filter active: ${this.excludePatterns.length} pattern(s) loaded: ${stringPatterns.join(', ')}`);
|
|
686
|
+
}
|
|
687
|
+
await this.cleanupExcludedObjects();
|
|
562
688
|
await this.setStateAsync('info.connection', false, true);
|
|
563
689
|
this.hass = new hass_1.default(this.config, this.log);
|
|
564
690
|
this.hass.on('error', err => this.log.error(err));
|
|
565
|
-
this.hass.on('state_changed', entity => {
|
|
691
|
+
this.hass.on('state_changed', async (entity) => {
|
|
566
692
|
this.log.debug(`HASS-Message: State Changed: ${JSON.stringify(entity)}`);
|
|
567
693
|
if (!entity || typeof entity.entity_id !== 'string') {
|
|
568
694
|
return;
|
|
569
695
|
}
|
|
696
|
+
if ((0, entityFilter_1.isExcluded)(entity.entity_id, this.excludePatterns)) {
|
|
697
|
+
this.log.debug(`Entity filter: ignored state_changed for ${entity.entity_id}`);
|
|
698
|
+
return;
|
|
699
|
+
}
|
|
570
700
|
const id = `entities.${entity.entity_id}.`;
|
|
571
701
|
const lc = entity.last_changed ? new Date(entity.last_changed).getTime() : undefined;
|
|
572
702
|
const ts = entity.last_updated ? new Date(entity.last_updated).getTime() : undefined;
|
|
573
703
|
if (entity.state !== undefined) {
|
|
574
704
|
if (this.hassObjects[`${this.namespace}.${id}state`]) {
|
|
575
|
-
this.
|
|
705
|
+
await this.setStateAsync(`${id}state`, { val: entity.state, ack: true, lc, ts });
|
|
576
706
|
}
|
|
577
707
|
else {
|
|
578
708
|
this.log.info(`State changed for unknown object ${id}state. Triggering synchronization to resync the objects.`);
|
|
@@ -580,7 +710,7 @@ class HassAdapter extends adapter_core_1.Adapter {
|
|
|
580
710
|
}
|
|
581
711
|
// Update boolean state
|
|
582
712
|
if (this.hassObjects[`${this.namespace}.${id}state_boolean`]) {
|
|
583
|
-
this.
|
|
713
|
+
await this.setStateAsync(`${id}state_boolean`, {
|
|
584
714
|
val: entity.state === 'on',
|
|
585
715
|
ack: true,
|
|
586
716
|
lc: lc || Date.now(),
|
|
@@ -603,7 +733,28 @@ class HassAdapter extends adapter_core_1.Adapter {
|
|
|
603
733
|
}
|
|
604
734
|
const attrId = attr.replace(this.FORBIDDEN_CHARS, '_').replace(/\.+$/, '_');
|
|
605
735
|
if (this.hassObjects[`${this.namespace}.${id}state`]) {
|
|
606
|
-
|
|
736
|
+
const fullAttrId = `${this.namespace}.${id}${attrId}`;
|
|
737
|
+
if (!this.hassObjects[fullAttrId]) {
|
|
738
|
+
// Attribute appeared after initial sync — create object dynamically
|
|
739
|
+
const common = {
|
|
740
|
+
...knownAttributes[attr],
|
|
741
|
+
name: attr.replace(/_/g, ' '),
|
|
742
|
+
read: true,
|
|
743
|
+
write: false,
|
|
744
|
+
role: 'state',
|
|
745
|
+
type: mapTypes[typeof entity.attributes[attr]] ?? 'mixed',
|
|
746
|
+
};
|
|
747
|
+
const newObj = {
|
|
748
|
+
_id: fullAttrId,
|
|
749
|
+
type: 'state',
|
|
750
|
+
common,
|
|
751
|
+
native: { entity_id: entity.entity_id, attr },
|
|
752
|
+
};
|
|
753
|
+
this.log.debug(`Creating missing attribute object ${fullAttrId}`);
|
|
754
|
+
await this.setForeignObjectAsync(fullAttrId, newObj);
|
|
755
|
+
this.hassObjects[fullAttrId] = newObj;
|
|
756
|
+
}
|
|
757
|
+
await this.setStateAsync(id + attrId, { val, ack: true, lc, ts });
|
|
607
758
|
}
|
|
608
759
|
else {
|
|
609
760
|
this.log.info(`State changed for unknown object ${id + attrId}. Triggering synchronization to resync the objects.`);
|
|
@@ -616,7 +767,7 @@ class HassAdapter extends adapter_core_1.Adapter {
|
|
|
616
767
|
if (!this.hassConnected) {
|
|
617
768
|
this.log.debug('Connected');
|
|
618
769
|
this.hassConnected = true;
|
|
619
|
-
this.setState('info.connection', true, true);
|
|
770
|
+
void this.setState('info.connection', true, true);
|
|
620
771
|
this.hass.getConfig(err => {
|
|
621
772
|
if (err) {
|
|
622
773
|
this.log.error(`Cannot read config: ${err}`);
|
|
@@ -661,7 +812,7 @@ class HassAdapter extends adapter_core_1.Adapter {
|
|
|
661
812
|
if (this.hassConnected) {
|
|
662
813
|
this.log.debug('Disconnected');
|
|
663
814
|
this.hassConnected = false;
|
|
664
|
-
this.setState('info.connection', false, true);
|
|
815
|
+
void this.setState('info.connection', false, true);
|
|
665
816
|
}
|
|
666
817
|
});
|
|
667
818
|
this.hass.connect();
|
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,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"common": {
|
|
3
3
|
"name": "hass",
|
|
4
|
-
"version": "2.0
|
|
5
|
-
"title": "Home Assistant",
|
|
4
|
+
"version": "2.1.0",
|
|
6
5
|
"titleLang": {
|
|
7
6
|
"en": "Home Assistant",
|
|
8
7
|
"de": "Home Assistant",
|
|
@@ -30,6 +29,19 @@
|
|
|
30
29
|
"uk": "Підключення Home Assistant для ioBroker"
|
|
31
30
|
},
|
|
32
31
|
"news": {
|
|
32
|
+
"2.1.0": {
|
|
33
|
+
"en": "Added optional entity exclude filter with glob patterns, configurable via the admin UI, plus a verbose-logging toggle for inspecting matches\nUse `/core/` instead of `/api/` when connecting to supervisor directly (e.g., in ha app)\nUse ENV var SUPERVISOR_TOKEN as fallback for password",
|
|
34
|
+
"de": "Zusätzliche optionale Entität schließt Filter mit Glocke-Muster aus, konfigurierbar über den Admin UI, plus ein Verbose-Logging-Toggle für die Überprüfung von Übereinstimmungen\nVerwenden Sie `/core/` anstelle von `/api/`, wenn Sie direkt mit dem Supervisor (z.B. in ha App)\nVerwenden Sie ENV var SUPERVISOR TOKEN als Rückfall für das Passwort",
|
|
35
|
+
"ru": "Добавленный дополнительный объект исключает фильтр с шаблонами шаров, настраиваемый через пользовательский интерфейс администратора, а также переключатель verbose-logging для проверки совпадений\nИспользуйте «/core/» вместо «/api/» при подключении непосредственно к диспетчеру (например, в приложении ha)\nИспользуйте ENV var SUPERVISOR TOKEN в качестве резервного копия для пароля",
|
|
36
|
+
"pt": "Adicionada entidade opcional excluir filtro com padrões glob, configurável através da interface de administração, além de uma opção de registro de verbose para inspecionar correspondências\nUtilizar `/core/` em vez de `/api/` ao ligar directamente ao supervisor (por exemplo, em ha app)\nUse ENV var SUPERVISOR TOKEN como recurso para senha",
|
|
37
|
+
"nl": "Toegevoegd optionele entiteit filter met glob patronen uitsluiten, configureerbaar via de admin UI, plus een werkbose-logging toggle voor het inspecteren van lucifers\nGebruik \nGebruik ENV var SUPERVISOR TOKEN als terugval voor wachtwoord",
|
|
38
|
+
"fr": "Ajout d'une entité optionnelle excluant le filtre avec des modèles glob, configurable via l'interface utilisateur admin, plus un toggle verbose-logging pour l'inspection des correspondances\nUtiliser `/core/` au lieu de `/api/` pour se connecter directement au superviseur (par exemple, dans l'application ha)\nUtiliser ENV var SUPERVISOR TOKEN comme retour au mot de passe",
|
|
39
|
+
"it": "Aggiunta di entità facoltativa escludere il filtro con i modelli glob, configurabile tramite l'interfaccia utente di amministrazione, più un gioco di registrazione verbose per ispezionare le partite\nUtilizzare `/core/` invece di `/api/` quando si collega direttamente al supervisore (ad esempio, in ha app)\nUtilizzare ENV var SUPERVISOR TOKEN come failback per la password",
|
|
40
|
+
"es": "La entidad opcional agregada excluye el filtro con patrones de glob, configurable a través de la interfaz de usuario del administrador, además de una mezcla de verbose-logging para inspeccionar los partidos\nUse `/core/` en lugar de `/api/` cuando se conecte al supervisor directamente (por ejemplo, en la aplicación ha)\nUtilizar ENV var SUPERVISOR TOKEN como inconveniente para contraseña",
|
|
41
|
+
"pl": "Dodano opcjonalny podmiot wyłączający filtr ze wzorami glob, konfigurowalny za pomocą interfejsu użytkownika admin, plus verbose- logowanie przełączanie do kontroli meczów\nUżyj '/ core /' zamiast '/ api /' podczas bezpośredniego połączenia z przełożonym (np. w aplikacji ha)\nUżyj ENV var SUPERVISOR _ TOKEN jako awaryjnego hasła",
|
|
42
|
+
"uk": "Додана додаткова особа виключить фільтр з лобовими візерунками, налаштовується через адміністратор UI, а також словесний блок для перевірок матчів\nВикористовуйте `/core/` замість `/api/` при підключенні до супервайзера безпосередньо (наприклад, у додатку га)\nВикористовуйте ENV var SUPERVISOR TOKEN як випадання для пароля",
|
|
43
|
+
"zh-cn": "添加的可选实体排除带有 glob 模式的过滤器, 通过 admin UI 可配置, 外加用于检查匹配的动词日志\n在直接连接主管时使用`/core/'而不是`/api/'(例如在ha app中)\n使用 ENV var SUPERVISOR TOKEN 作为密码的倒置"
|
|
44
|
+
},
|
|
33
45
|
"2.0.4": {
|
|
34
46
|
"en": "Tried to keep the custom settings of the objects when updating them with new data from HASS",
|
|
35
47
|
"de": "Versuche, die benutzerdefinierten Einstellungen der Objekte bei der Aktualisierung mit neuen Daten von HASS zu halten",
|
|
@@ -107,27 +119,17 @@
|
|
|
107
119
|
"pl": "Napraw przypadki awarii zgłoszone przez Sentry",
|
|
108
120
|
"zh-cn": "修复 Sentry 报告的崩溃案例",
|
|
109
121
|
"uk": "Виправте випадки збоїв, про які повідомляє Sentry"
|
|
110
|
-
},
|
|
111
|
-
"1.1.1": {
|
|
112
|
-
"en": "Show password fields masked again in config",
|
|
113
|
-
"de": "Passwortfelder in config wieder maskiert anzeigen",
|
|
114
|
-
"ru": "Показать поля пароля снова замаскированные в конфигурации",
|
|
115
|
-
"pt": "Mostrar campos de senha mascarados novamente na configuração",
|
|
116
|
-
"nl": "Toon wachtwoordvelden opnieuw gemaskeerd in config",
|
|
117
|
-
"fr": "Afficher à nouveau les champs de mot de passe masqués dans la configuration",
|
|
118
|
-
"it": "Mostra i campi password mascherati di nuovo in config",
|
|
119
|
-
"es": "Mostrar campos de contraseña enmascarados nuevamente en la configuración",
|
|
120
|
-
"pl": "Pokaż ponownie zamaskowane pola haseł w konfiguracji",
|
|
121
|
-
"zh-cn": "在配置中再次显示被屏蔽的密码字段",
|
|
122
|
-
"uk": "Знову показати замасковані поля пароля в конфігурації"
|
|
123
122
|
}
|
|
124
123
|
},
|
|
125
|
-
"
|
|
124
|
+
"localLinks": {
|
|
125
|
+
"_default": "http://%host%:8123"
|
|
126
|
+
},
|
|
126
127
|
"platform": "Javascript/Node.js",
|
|
127
128
|
"mode": "daemon",
|
|
128
129
|
"icon": "hass.png",
|
|
129
130
|
"enabled": true,
|
|
130
131
|
"compact": true,
|
|
132
|
+
"nogit": true,
|
|
131
133
|
"adminUI": {
|
|
132
134
|
"config": "json"
|
|
133
135
|
},
|
|
@@ -154,7 +156,7 @@
|
|
|
154
156
|
],
|
|
155
157
|
"globalDependencies": [
|
|
156
158
|
{
|
|
157
|
-
"admin": ">=6.
|
|
159
|
+
"admin": ">=7.6.17"
|
|
158
160
|
}
|
|
159
161
|
],
|
|
160
162
|
"plugins": {
|
|
@@ -252,7 +254,10 @@
|
|
|
252
254
|
"host": "127.0.0.1",
|
|
253
255
|
"port": 8123,
|
|
254
256
|
"password": "",
|
|
255
|
-
"secure": false
|
|
257
|
+
"secure": false,
|
|
258
|
+
"excludePatterns": "# Glob patterns, one per line. Lines starting with # are comments.\n# Example: filter out all entities prefixed with `iob_` regardless of domain:\n# *.iob_*",
|
|
259
|
+
"verboseFilterLog": false,
|
|
260
|
+
"cleanupExcludedOnStart": false
|
|
256
261
|
},
|
|
257
262
|
"protectedNative": [
|
|
258
263
|
"password"
|
package/package.json
CHANGED
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "iobroker.hass",
|
|
3
|
-
"version": "2.0
|
|
3
|
+
"version": "2.1.0",
|
|
4
4
|
"description": "Home Assistant",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "bluefox",
|
|
7
7
|
"email": "dogafox@gmail.com"
|
|
8
8
|
},
|
|
9
|
+
"engines": {
|
|
10
|
+
"node": ">=20"
|
|
11
|
+
},
|
|
9
12
|
"contributors": [
|
|
10
13
|
{
|
|
11
14
|
"name": "bluefox",
|
|
@@ -25,19 +28,20 @@
|
|
|
25
28
|
"url": "https://github.com/ioBroker/ioBroker.hass"
|
|
26
29
|
},
|
|
27
30
|
"dependencies": {
|
|
28
|
-
"ws": "^8.20.
|
|
31
|
+
"ws": "^8.20.1",
|
|
29
32
|
"@iobroker/adapter-core": "^3.3.2"
|
|
30
33
|
},
|
|
31
34
|
"devDependencies": {
|
|
32
|
-
"@alcalzone/release-script": "^5.
|
|
33
|
-
"@alcalzone/release-script-plugin-iobroker": "^5.
|
|
34
|
-
"@alcalzone/release-script-plugin-license": "^5.
|
|
35
|
+
"@alcalzone/release-script": "^5.2.0",
|
|
36
|
+
"@alcalzone/release-script-plugin-iobroker": "^5.2.0",
|
|
37
|
+
"@alcalzone/release-script-plugin-license": "^5.2.0",
|
|
35
38
|
"@iobroker/adapter-dev": "^1.5.0",
|
|
36
39
|
"@iobroker/build-tools": "^3.0.1",
|
|
37
|
-
"@iobroker/eslint-config": "^2.
|
|
40
|
+
"@iobroker/eslint-config": "^2.3.4",
|
|
38
41
|
"@iobroker/legacy-testing": "^2.0.2",
|
|
39
42
|
"@iobroker/testing": "^5.2.2",
|
|
40
|
-
"@types/ws": "^8.18.1"
|
|
43
|
+
"@types/ws": "^8.18.1",
|
|
44
|
+
"typescript": "^6.0.3"
|
|
41
45
|
},
|
|
42
46
|
"main": "build/main.js",
|
|
43
47
|
"files": [
|
|
@@ -50,6 +54,7 @@
|
|
|
50
54
|
"scripts": {
|
|
51
55
|
"test:integration": "mocha --exit",
|
|
52
56
|
"test:package": "mocha test/testPackageFiles.js --exit",
|
|
57
|
+
"test:unit": "mocha test/testEntityFilter.js --exit",
|
|
53
58
|
"test": "npm run test:integration",
|
|
54
59
|
"build:tsc": "tsc -p tsconfig.build.json",
|
|
55
60
|
"build": "npm run build:tsc",
|