iobroker.esphome 0.3.2 → 0.4.1

package/CHANGELOG_OLD.md

@@ -1,4 +1,12 @@
 # Older changes
+## 0.2.4 (2021-08-24)
+* (DutchmanNL) Version of ESPHome Dashboard updated to 2021.8
+* (DutchmanNL) Add option if config of ESPHome device should be shown as states (default = FALSE, safes 8 states for each sensor)
+
+## 0.2.3 (2021-06-29)
+* (Jey-Cee) Bugfix : Light component state not changed [#74](https://github.com/DrozmotiX/ioBroker.esphome/issues/74)
+* (DutchmanNL) Update compatibility to version 1.19.4 of ESPHome Dashboard
+
 ## 0.2.2 (2021-06-24)
 * (DutchmanNL) [!!! Breaking !!!] Make YAML file persistent, backup your configuration before updating ! solves [#57](https://github.com/DrozmotiX/ioBroker.esphome/issues/57)
 * (DutchmanNL) Update ESPHome Dashboard to 1.18.0, requires  Python >=3.7 (and ensure <4.0!)

package/README.md

@@ -112,29 +112,31 @@ If you like my work, please consider a personal donation
     ### __WORK IN PROGRESS__
     * (DutchmanNL) 
 -->
+### 0.4.1 (2023-11-05)
+* (DutchmanNL) Bugfix: Password / connection issues in previous beta resolves #179
+* (DutchmanNL) Bugfix: Allow individual API password or encryption keys for devices, resolves #174
+* (DutchmanNL) Support ESPHome device Encryption Key (you should migrate from API password to Encryption Key ! resolves #152)
+
+### 0.4.0 (2023-11-03)
+* (DutchmanNL) Added cleanup capability for unused channels & states after initialisation of device, resolves #39
+* (DutchmanNL) Added button to info channel which allows to delete all offline devices from adapter tree. resolves #39
+* (DutchmanNL) [Breaking] Backup strategy changed, requires [BackitUp v2.9.1](https://github.com/simatec/ioBroker.backitup) and activate option for ESPHome, fixes #129
+
 ### 0.3.2 (2023-11-01)
 * (DutchmanNL) Improved error handling if devices are not reachable/disconnected
-* (DutchmanNL) Bugfix: Allow control of brightness and color for light component, fixes #173
+* (DutchmanNL) Bugfix: Allow control of brightness and color for light component, resolves #173
 
 ### 0.3.1 (2023-10-31)
-* (DutchmanNL) Bugfix: Show online state of ESP Device correctly, Fixes #106
+* (DutchmanNL) Bugfix: Show online state of ESP Device correctly, resolves #106
 
 ### 0.3.0 (2023-10-31) - Bugfixes & Improvements
 * (Dutchman & SimonFischer04) Several Bugfixes
 * (SimonFischer04) Support type "select device"
 * (DutchmanNL) ESPHome dashboard default disabled
 * (SimonFischer04) Migrate to @2colors/esphome-native-api
-* (DutchmanNL) Automatically create needed directories, Fixes #168
+* (DutchmanNL) Automatically create needed directories, resolves #168
 * (SimonFischer04) Migrate usage of python to new structure, should solve all ESPHome Dashboard related installation issues
 
-### 0.2.4 (2021-08-24)
-* (DutchmanNL) Version of ESPHome Dashboard updated to 2021.8
-* (DutchmanNL) Add option if config of ESPHome device should be shown as states (default = FALSE, safes 8 states for each sensor)
-
-### 0.2.3 (2021-06-29)
-* (Jey-Cee) Bugfix : Light component state not changed [#74](https://github.com/DrozmotiX/ioBroker.esphome/issues/74)
-* (DutchmanNL) Update compatibility to version 1.19.4 of ESPHome Dashboard
-
 ## License
 MIT License
 

package/admin/index_m.html

@@ -88,15 +88,23 @@
                 console.log('Return of  all devices : ' + JSON.stringify(_devices));
 
                 let text = '';
-                text += `
-                    <div class="input-field ip col s4">
-                        <input placeholder="192.168.0.1" class="center" id="device-ip" type="text" value='${_devices.rows[index].value.native.ip}'/>
-                        <span class="translate">IP</span>
-                    </div>
-                    <div class="input-field pass col s4">
-                        <input class="center" id="device-pass" type="password" value='${decryptManuell(secret, _devices.rows[index].value.native.passWord)}'/>
-                        <span class="translate">device-pass</span>
-                    </div>`;
+				text += `
+
+					<p class="translate">You can either choose to use the Device Encryption Key (preferred) or API-Password (legacy)</p>
+					<p class="translate">When Encryption Key is provided, API-Password will be ignored</p>
+					<div class="input-field ip col s8">
+						<label for="device-ip"></label><input placeholder="192.168.0.100" class="center" id="device-ip" type="text"/>
+						<span class="translate">IP</span>
+					</div>
+						<div class="input-field pass col s8">
+						<label for="deviceEncryptionKey"></label><input class="center" id="deviceEncryptionKey" type="password"/>
+						<span class="translate">deviceEncryptionKey</span>
+					</div>
+						<div class="input-field pass col s8">
+						<label for="device-pass"></label><input class="center" id="device-pass" type="password"/>
+						<span class="translate">device-pass</span>
+					</div>`;
+
                 $(`#edit_device_container`).html(text);
             });
         }
@@ -190,7 +198,8 @@
                 console.log('Add device button executed');
                 messageObj = {
                     'device-ip': $('#device-ip').val(),
-                    'device-pass': encryptManuell(secret, $('#device-pass').val())
+                    'device-pass': encryptManuell(secret, $('#device-pass').val()),
+					'deviceEncryptionKey': encryptManuell(secret, $('#deviceEncryptionKey').val())
                 };
                 sendTo(null, 'addDevice', messageObj, (data) => {
                     console.log('Message from backend : ' + data);
@@ -210,7 +219,8 @@
                 messageObj = {
                     'device-ip': $('#device-ip').val(),
                     // 'device-pass': decryptManuell(secret, $('#device-pass').val())
-					'device-pass': encryptManuell(secret, $('#device-pass').val())
+					'device-pass': encryptManuell(secret, $('#device-pass').val()),
+					'deviceEncryptionKey': encryptManuell(secret, $('#deviceEncryptionKey').val())
                 };
                 sendTo(null, 'addDevice', messageObj, (data) => {
                     console.log('Message from backend : ' + data);
@@ -305,31 +315,6 @@
 					<input type="text" class="value" disabled="true" id="ESPHomeDashboardPort" />
 					<label for="ESPHomeDashboardPort" class="translate">ESPHomeDashboardPort</label>
 				</div>
-
-<!--				<div class="input-field col s4">-->
-<!--					<input placeholder="localhost" class="center" id="device-ip" type="text" id="ESPHomeDashboardEnabled" />-->
-<!--					<span class="translate">ESPHome Dashboard IP</span>-->
-<!--				</div>-->
-<!--				<div class="input-field col s4">-->
-<!--					<input type="number" class="value" id="ESPHomeDashboardPort" />-->
-<!--					<span class="translate">Port</span>-->
-<!--				</div>-->
-<!--				<div class="input-field col s2">-->
-<!--					<input type="checkbox" class="value" id="currentYearWeeks" />-->
-<!--					<span class="translate">Week</span>-->
-<!--				</div>-->
-<!--				<div class="input-field col s2">-->
-<!--					<input type="checkbox" class="value" id="currentYearMonth" />-->
-<!--					<span class="translate">Month</span>-->
-<!--				</div>-->
-<!--				<div class="input-field col s2">-->
-<!--					<input type="checkbox" class="value" id="currentYearQuarter" />-->
-<!--					<span class="translate">Quarter</span>-->
-<!--				</div>-->
-<!--				<div class="input-field col s2">-->
-<!--					<input type="checkbox" class="value" id="currentYearPrevious" />-->
-<!--					<span class="translate">Previous</span>-->
-<!--				</div>-->
 			</div>
 
 			<div class="row center">
@@ -407,11 +392,17 @@
 				<div class="modal-content">
 					<h5 class="translate center">Add device manually</h5>
 					<div class="row center">
-						<div class="input-field ip col s4">
-							<label for="device-ip"></label><input placeholder="192.168.0.1" class="center" id="device-ip" type="text"/>
+						<p class="translate">You can either choose to use the Device Encryption Key (preferred) or API-Password (legacy)</p>
+						<p class="translate">When Encryption Key is provided, API-Password will be ignored</p>
+						<div class="input-field ip col s8">
+							<label for="device-ip"></label><input placeholder="192.168.0.100" class="center" id="device-ip" type="text"/>
 							<span class="translate">IP</span>
 						</div>
-						<div class="input-field pass col s4">
+						<div class="input-field pass col s8">
+							<label for="deviceEncryptionKey"></label><input class="center" id="deviceEncryptionKey" type="password"/>
+							<span class="translate">deviceEncryptionKey</span>
+						</div>
+						<div class="input-field pass col s8">
 							<label for="device-pass"></label><input class="center" id="device-pass" type="password"/>
 							<span class="translate">device-pass</span>
 						</div>

package/admin/words.js

@@ -10,6 +10,8 @@ systemDictionary = {
 	'Connected': {                                   'en': 'Connected',                                       'de': 'Verbunden',                                       'ru': 'Подключено',                                      'pt': 'Conectado',                                       'nl': 'Verbonden',                                       'fr': 'Lié',                                             'it': 'Collegato',                                       'es': 'Conectado',                                       'pl': 'Połączony',                                       'zh-cn': '连接的'},
 	'Delete': {                                      'en': 'Delete',                                          'de': 'Löschen',                                         'ru': 'Удалить',                                         'pt': 'Excluir',                                         'nl': 'Verwijderen',                                     'fr': 'Effacer',                                         'it': 'Elimina',                                         'es': 'Borrar',                                          'pl': 'Usuń',                                            'zh-cn': '删除'},
 	'Devices can be added manually or by autodiscovery': {'en': 'Devices can be added manually or by autodiscovery', 'de': 'Geräte können manuell oder durch die automatische Erkennung hinzugefügt werden', 'ru': 'Устройства можно добавлять вручную или с помощью автообнаружения', 'pt': 'Os dispositivos podem ser adicionados manualmente ou por autodiscovery', 'nl': 'Apparaten kunnen handmatig of door autodiscovery worden toegevoegd', 'fr': 'Les appareils peuvent être ajoutés manuellement ou par découverte automatique', 'it': 'I dispositivi possono essere aggiunti manualmente o tramite rilevamento automatico', 'es': 'Los dispositivos se pueden agregar manualmente o por descubrimiento automático', 'pl': 'Urządzenia można dodawać ręcznie lub przez automatyczne wykrywanie', 'zh-cn': '可以手动添加设备或通过自动发现添加设备'},
+	'You can either choose to use the Device Encryption Key (preferred) or API-Password (legacy)': {'en': 'You can either choose to use the Device Encryption Key (preferred) or API-Password (legacy)', 'de': 'Sie können entweder den Geräteverschlüsselungsschlüssel (bevorzugt) oder das API-Passwort (alt) verwenden.', 'ru': 'Вы можете использовать либо ключ шифрования устройства (предпочтительно), либо пароль API (устаревший вариант).', 'pt': 'Você pode optar por usar a chave de criptografia do dispositivo (preferencial) ou a senha da API (legado)', 'nl': 'U kunt ervoor kiezen om de Device Encryption Key (bij voorkeur) of het API-wachtwoord (verouderd) te gebruiken', 'fr': "Vous pouvez choisir d'utiliser la clé de chiffrement de l'appareil (de préférence) ou le mot de passe API (ancien)", 'it': 'Puoi scegliere di utilizzare la chiave di crittografia del dispositivo (preferita) o la password API (legacy)', 'es': 'Puede optar por utilizar la clave de cifrado del dispositivo (preferida) o la contraseña API (heredada)', 'pl': 'Możesz wybrać użycie klucza szyfrowania urządzenia (preferowany) lub hasła API (starsza wersja)', 'zh-cn': '您可以选择使用设备加密密钥（首选）或 API 密码（旧版）'},
+	'When Encryption Key is provided, API-Password will be ignored': {'en': 'When Encryption Key is provided, API-Password will be ignored', 'de': 'Wenn der Verschlüsselungsschlüssel bereitgestellt wird, wird das API-Passwort ignoriert', 'ru': 'Если предоставлен ключ шифрования, пароль API будет игнорироваться.', 'pt': 'Quando a chave de criptografia for fornecida, a senha da API será ignorada', 'nl': 'Wanneer de coderingssleutel wordt opgegeven, wordt het API-wachtwoord genegeerd', 'fr': 'Lorsque la clé de cryptage est fournie, le mot de passe API sera ignoré', 'it': 'Quando viene fornita la chiave di crittografia, la password API verrà ignorata', 'es': 'Cuando se proporciona la clave de cifrado, se ignorará la contraseña API', 'pl': 'Po podaniu klucza szyfrowania hasło API zostanie zignorowane', 'zh-cn': '当提供加密密钥时，API-密码将被忽略'},
 	'ESPHomeDashboardEnabled': {                     'en': 'Enable built-in ESPHome dashboard',               'de': 'Aktiviere das integrierte ESPHome-Dashboard',     'ru': 'Включить встроенный ESPHome Dashboard',           'pt': 'Ativar painel ESPHome integrado',                 'nl': 'Schakel het ingebouwde ESPHome-dashboard in',     'fr': 'Activer le tableau de bord ESPHome intégré',      'it': 'Abilita il dashboard ESPHome integrato',          'es': 'Habilitar el panel de control ESPHome integrado', 'pl': 'Włącz wbudowany pulpit nawigacyjny ESPHome',      'zh-cn': '启用内置ESPHome仪表板'},
 	'ESPHome_Dashboard_Generic_info': {              'en': 'Here you can enable / disable the ESPHome dashboard hosted by ioBroker. A separate installation of ESPHome is not required!', 'de': 'Hier wird das von ioBroker bereitgestellt ESPHome-Dashboard aktiviert / deaktiviert. Eine separate Installation von ESPHome ist nicht erforderlich!', 'ru': 'Здесь вы можете включить / отключить панель управления ESPHome, запущенную  ioBroker-ом.  Устанавливать дополнительно ESPhome не нужно!', 'pt': 'Aqui você pode ativar / desativar o painel ESPHome hospedado por ioBroker. ', 'nl': 'Hier kunt u het ESPHome-dashboard dat wordt gehost door ioBroker in- / uitschakelen. Een seperate installatie is niet noodzakelijk!', 'fr': 'Ici, vous pouvez activer / désactiver le tableau de bord ESPHome hébergé par ioBroker. ', 'it': 'Qui puoi abilitare / disabilitare la dashboard ESPHome ospitata da ioBroker. ', 'es': 'Aquí puede habilitar / deshabilitar el panel de ESPHome alojado por ioBroker. ', 'pl': 'Tutaj możesz włączyć / wyłączyć pulpit nawigacyjny ESPHome obsługiwany przez ioBroker. ', 'zh-cn': '您可以在此处启用/禁用ioBroker托管的ESPHome仪表板。'},
 	'ESPHome_Dashboard_IP_info': {                   'en': 'Please provide the IP address where the ESPHome dashboard is located (ioBroker or already existing instance).', 'de': 'Bitte die IP-Adresse angeben, unter der sich das ESPHome-Dashboard befindet (ioBroker oder bereits vorhandene ESPHome Instanz).', 'ru': 'Укажите IP-адрес, на котором расположена панель управления ESPHome (ioBroker или уже существующий экземпляр?)', 'pt': 'Forneça o endereço IP onde o ESPHome Dashboard está localizado (ioBroker ou instância já existente?)', 'nl': 'IP-adres op waar het ESPHome-dashboard zich bevindt (ioBroker of een reeds bestaande instantie?)', 'fr': "Veuillez fournir l'adresse IP où se trouve le tableau de bord ESPHome (ioBroker ou instance déjà existante?)", 'it': "Fornisci l'indirizzo IP in cui si trova ESPHome Dashboard (ioBroker o istanza già esistente?)", 'es': 'Proporcione la dirección IP donde se encuentra el panel de ESPHome (¿ioBroker o una instancia ya existente?)', 'pl': 'Podaj adres IP, pod którym znajduje się pulpit nawigacyjny ESPHome (ioBroker czy już istniejąca instancja?)', 'zh-cn': '请提供ESPHome仪表板所在的IP地址（ioBroker或已经存在的实例？）'},
@@ -20,6 +22,7 @@ systemDictionary = {
 	'IP-Address': {                                  'en': 'IP Address',                                      'de': 'IP-Adresse',                                      'ru': 'IP адрес',                                        'pt': 'Endereço de IP',                                  'nl': 'IP adres',                                        'fr': 'Adresse IP',                                      'it': 'Indirizzo IP',                                    'es': 'Dirección IP',                                    'pl': 'Adres IP',                                        'zh-cn': 'IP地址'},
 	'Name': {                                        'en': 'Name',                                            'de': 'Name',                                            'ru': 'Имя',                                             'pt': 'Nome',                                            'nl': 'Naam',                                            'fr': 'Nom',                                             'it': 'Nome',                                            'es': 'Nombre',                                          'pl': 'Nazwa',                                           'zh-cn': '姓名'},
 	'Show configuration as states': {                'en': 'Show configuration as states',                    'de': 'Konfiguration als Zustände anzeigen',             'ru': 'Показать конфигурацию как состояния',             'pt': 'Mostrar configuração como estados',               'nl': 'Configuratie weergeven als toestanden',           'fr': "Afficher la configuration sous forme d'états",    'it': 'Mostra configurazione come stati',                'es': 'Mostrar configuración como estados',              'pl': 'Pokaż konfigurację jako stany',                   'zh-cn': '将配置显示为状态'},
-	'device-pass': {                                 'en': 'Password',                                        'de': 'Passwort',                                        'ru': 'Пароль',                                          'pt': 'Senha',                                           'nl': 'Wachtwoord',                                      'fr': 'Mot de passe',                                    'it': "Parola d'ordine",                                 'es': 'Contraseña',                                      'pl': 'Hasło',                                           'zh-cn': '密码'},
+	'device-pass': {                                 'en': 'Device API Password (legacy)',                    'de': 'Passwort',                                        'ru': 'Пароль',                                          'pt': 'Senha',                                           'nl': 'Wachtwoord',                                      'fr': 'Mot de passe',                                    'it': "Parola d'ordine",                                 'es': 'Contraseña',                                      'pl': 'Hasło',                                           'zh-cn': '密码'},
+	'deviceEncryptionKey': {                         'en': 'Device EncryptionKey (preferred)',                'de': 'Geräteverschlüsselungsschlüssel (bevorzugt)',     'ru': 'Ключ шифрования устройства (предпочтительно)',    'pt': 'Chave de criptografia do dispositivo (preferencial)', 'nl': 'Apparaatcoderingssleutel (bij voorkeur)',         'fr': "Clé de chiffrement de l'appareil (de préférence)", 'it': 'Chiave di crittografia del dispositivo (preferita)', 'es': 'Clave de cifrado del dispositivo (preferida)',    'pl': 'Klucz szyfrowania urządzenia (preferowany)',      'zh-cn': '设备加密密钥（首选）'},
 	'reconnect interval': {                          'en': 'Reconnect Interval',                              'de': 'Intervall für erneutes Verbinden',                'ru': 'Интервал повторного соединения',                  'pt': 'intervalo de reconexão',                          'nl': 'interval voor opnieuw verbinden',                 'fr': 'intervalle de reconnexion',                       'it': "ricollegare l'intervallo",                        'es': 'intervalo de reconexión',                         'pl': 'interwał ponownego łączenia',                     'zh-cn': '重新连接间隔'},
 };

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "esphome",
-    "version": "0.3.2",
+    "version": "0.4.1",
     "news": {
+      "0.4.1": {
+        "en": "Bugfix: Password / connection issues in previous beta resolves #179\nBugfix: Allow individual API password or encryption keys for devices, resolves #174\nSupport ESPHome device Encryption Key (you should migrate from API password to Encryption Key ! resolves #152)",
+        "de": "Bugfix: Passwort / Verbindungsprobleme in vorherigen beta löst #179\nBugfix: Lassen Sie individuelle API-Passwort oder Verschlüsselungsschlüssel für Geräte, löst #174\nSupport ESPHome Gerät Verschlüsselungsschlüssel (Sie sollten von API-Passwort zu Verschlüsselungsschlüssel migrieren! löst #152)",
+        "ru": "Bugfix: Пароль / проблемы соединения в предыдущей бета-версии решает #179\nBugfix: Разрешить индивидуальные API-пароль или ключи шифрования для устройств, решает #174\nПоддержка ESPHome устройства Encryption Key (вы должны migrate от API-пароль для Encryption Key! решает #152)",
+        "pt": "Bugfix: Problemas de senha / conexão no beta anterior resolve #179\nBugfix: Permitir senha API individual ou chaves de criptografia para dispositivos, resolve #174\nSuporte ESPHome dispositivo Encryption Key (você deve migrar da senha API para Encryption Key! resolve #152)",
+        "nl": "Vertaling:\nBugfix: Sta individuele API wachtwoord of encryptie sleutels voor apparatuur, vaststellen\nSteun ESPHome apparatuur encryption Key (je moet migreren van API wachtwoord naar Encryption Key! Vertaling:",
+        "fr": "Bugfix: Mot de passe / problèmes de connexion dans la bêta précédente résout #179\nBugfix: Permettre un mot de passe ou des clés de chiffrement de l'API pour les appareils, résout #174\nSupport ESPHome périphérique Clé de chiffrement (vous devriez migrer de l'API mot de passe à la clé de chiffrement ! résout #152)",
+        "it": "Bugfix: Password / problemi di connessione nella precedente beta risolve #179\nBugfix: Consentire singole password API o chiavi di crittografia per i dispositivi, risolve #174\nSupporto dispositivo ESPHome chiave di crittografia (si dovrebbe migrare da password API a chiave di crittografia! risolve #152)",
+        "es": "Bugfix: Problemas de contraseña / conexión en beta anterior resuelve #179\nBugfix: Permitir contraseña o claves de cifrado individuales de API para dispositivos, resuelve #174\nSoporte ESPHome dispositivo clave de cifrado (debe migrar desde contraseña de API a clave de cifrado! resuelve #152)",
+        "pl": "Bugfix: Password / Problemy połączenia w poprzednich beta rozwiązały numer #179\nBugfix: Allow indywidualny API password lub klucze szyfrujące dla urządzeń, rozwiązał numer #174\nWsparcie ESPHome: Encryption Key (you powinien wyemigrować z hasła API do Encryption Key ! Rozwiązanie #152",
+        "uk": "Помилки: Пароль / питання з'єднання у попередніх бета-рішеннях #179\nПомилки: Дозволити індивідуальний пароль API або ключі шифрування для пристроїв, вирішує #174\nПідтримка ESPHome пристрій шифрування ключа (Ви повинні мигратувати від API пароля до ключа шифрування ! розчини #152)",
+        "zh-cn": "Bugfix:在前几批被盗用词/联系问题\nBugfix: 允许个人的通用或加密装置的关键,第174号行动\n支持ESPHome装置的加密关键(you应从API密码移到恩加密的关键! 第152号决议)"
+      },
+      "0.4.0": {
+        "en": "Added cleanup capability for unused channels & states after initialisation of device, resolves #39\nAdded button to info channel which allows to delete all offline devices from adapter tree. resolves #39\n[Breaking] Backup strategy changed, requires [BackitUp v2.9.1](https://github.com/simatec/ioBroker.backitup) and activate option for ESPHome, fixes #129",
+        "de": "Zusätzliche Reinigungsfähigkeit für ungenutzte Kanäle & Zustände nach der Initialisierung des Geräts, löst #39\nZusätzlicher Button zum Info-Kanal, der alle Offline-Geräte aus dem Adapterbaum löschen kann. löst #39\n[Breaking] Backup-Strategie geändert, erfordert [BackitUp v2.9.1](https://github.com/simatec/ioBroker.backitup) und aktiviert Option für ESPHome, repariert #129",
+        "ru": "Добавлена возможность очистки неиспользуемых каналов и государств после инициализации устройства, решает #39\nДобавлена кнопка к информационному каналу, что позволяет удалить все оффлайн устройства из дерева адаптера. решает #39\n[Breaking] Стратегия резервного копирования изменена, требует [BackitUp v2.9.1](https://github.com/simatec/ioBroker.backitup) и активировать вариант для ESPHome, исправлений #129",
+        "pt": "Adicionado capacidade de limpeza para canais não utilizados & estados após a inicialização do dispositivo, resolve #39\nAdicionado botão para info canal que permite excluir todos os dispositivos off-line da árvore do adaptador. resolve #39\n[Breaking] Estratégia de backup alterada, requer [BackitUp v2.9.1](https://github.com/simatec/ioBroker.backitup) e opção ativa para ESPHome, correções #129",
+        "nl": "Vervoegde schoonmaak capaciteit voor onbruikbare kanalen apparaat na de initialisatie van 39\nKnop toegevoegd aan info kanaal dat alle offline apparaten van adapter boom laat verwijderen. 39\nOndersteuningsstrategie veranderde, vereist [Backitup v2.9.1, htps:com/simateioBroker, en tactiveer de optie van 12 uur",
+        "fr": "Ajout d'une capacité de nettoyage pour les canaux non utilisés & états après l'initialisation du dispositif, résout #39\nAjout du bouton sur le canal d'info qui permet de supprimer tous les périphériques hors ligne de l'arbre d'adaptateur. résolution #39\n[Breaking] La stratégie de sauvegarde a changé, nécessite [BackitUp v2.9.1](https://github.com/simatec/ioBroker.backitup) et l'option active pour ESPHome, corrige #129",
+        "it": "Aggiunta funzionalità di pulizia per canali e stati non utilizzati dopo l'inizializzazione del dispositivo, risolve #39\nPulsante aggiunto al canale info che consente di eliminare tutti i dispositivi offline dall'albero dell'adattatore. risolve #39\n[Breaking] La strategia di backup è cambiata, richiede [BackitUp v2.9.1](https://github.com/simatec/ioBroker.backitup) e attiva l'opzione per ESPHome, corregge #129",
+        "es": "Capacidad de limpieza agregada para canales no utilizados \" estados después de la inicialización del dispositivo, resuelve #39\nSe agregó botón a canal de información que permite eliminar todos los dispositivos fuera de línea del árbol del adaptador. resuelve #39\n[Breaking] La estrategia de respaldo cambió, requiere [BackitUp v2.9.1](https://github.com/simatec/ioBroker.backitup) y activar la opción para ESPHome, fija #129",
+        "pl": "Po zainicjowaniu możliwości usuwania nieużywanych kanałów i stanów po inicjalizacji urządzenia, rozwiązał #39\nNaciśnięty przycisk do kanału informacyjnego, który umożliwia usunięcie wszystkich urządzeń offline z drzewa adapterowego. Rozwiązanie #39\n(Po zmianie strategii Backupa, wymaga od BOATUTUp v2.9.1(https:/github.com/simatec/ioBroker.backitup) i aktywacji opcji dla ESPHome, naprawa #129",
+        "uk": "Додано можливість очищення каналів і станів після ініціалізації пристрою, вирішує #39\nДодано кнопку на інформаційний канал, який дозволяє видалити всі offline пристрої з дерева адаптера. розчини #39\n[Breaking] Стратегія резервного копіювання змінено, вимагає [BackitUp v2.9.1](https://github.com/simatec/ioBroker.backitup) і активувати варіант для ESPHome, фіксує #129",
+        "zh-cn": "在装置初始化后增加无用渠道和各州的清洁能力,第39号决定\n添加但道托顿以电器,使所有线装置能够从适应树中删除。 行动39\n[Breaking] Backup战略改变,要求[BackitUp v2.9.1](http://github.com/simatec/ioBroker.backitup)和“ESPHome”的主动选择,第129号行动。"
+      },
       "0.3.2": {
         "en": "Improved error handling if devices are not reachable/disconnected\nBugfix: Allow control of brightness and color for light component, fixes #173",
         "de": "Verbesserte Fehlerbehandlung, wenn Geräte nicht erreichbar/vernetzt sind\nBugfix: Erlauben Sie die Kontrolle von Helligkeit und Farbe für die Lichtkomponente, fixiert #173",
@@ -65,30 +91,6 @@
         "es": "Corrección de error: el estado del componente de luz no ha cambiado [# 74] (https://github.com/DrozmotiX/ioBroker.esphome/issues/74)\nActualizar la compatibilidad a la versión 1.19.4 de ESPHome Dashboard",
         "pl": "Poprawka błędu: stan lekkiego komponentu nie uległ zmianie [#74](https://github.com/DrozmotiX/ioBroker.esphome/issues/74)\nZaktualizuj kompatybilność do wersji 1.19.4 ESPHome Dashboard",
         "zh-cn": "修正：轻组件状态没有改变 [#74](https://github.com/DrozmotiX/ioBroker.esphome/issues/74)\n更新与 ESPHome Dashboard 1.19.4 版的兼容性"
-      },
-      "0.2.2": {
-        "en": "[!!! Breaking !!!] Make YAML file persistent, backup your configuration before updating ! solves [#57](https://github.com/DrozmotiX/ioBroker.esphome/issues/57)\nUpdate ESPHome Dashboard to 1.18.0, requires  Python >=3.7 (and ensure <4.0!)\nBugfix : Reconnect to devices without autodiscovery / MDNS-Broadcast in network, solves [#66](https://github.com/DrozmotiX/ioBroker.esphome/issues/66)",
-        "de": "[!!! Breaking !!!] Machen Sie die YAML-Datei persistent, sichern Sie Ihre Konfiguration vor dem Update! löst [#57](https://github.com/DrozmotiX/ioBroker.esphome/issues/57)\nAktualisieren Sie das ESPHome-Dashboard auf 1.18.0, erfordert Python >=3.7 (und stellen Sie sicher <4.0!)\nBugfix : Reconnect zu Geräten ohne Autodiscovery / MDNS-Broadcast im Netzwerk, behebt [#66](https://github.com/DrozmotiX/ioBroker.esphome/issues/66)",
-        "ru": "[!!! Ломаю !!!] Сделайте файл YAML постоянным, сделайте резервную копию конфигурации перед обновлением! решает [# 57] (https://github.com/DrozmotiX/ioBroker.esphome/issues/57)\nОбновите ESPHome Dashboard до 1.18.0, требуется Python> = 3.7 (и убедитесь, что <4.0!)\nИсправление: повторное подключение к устройствам без автообнаружения / MDNS-трансляции в сети, решает [# 66] (https://github.com/DrozmotiX/ioBroker.esphome/issues/66)",
-        "pt": "[!!! Quebrando !!!] Torne o arquivo YAML persistente, faça backup de sua configuração antes de atualizar! resolve [# 57] (https://github.com/DrozmotiX/ioBroker.esphome/issues/57)\nAtualize o painel ESPHome para 1.18.0, requer Python> = 3.7 (e garanta <4.0!)\nCorreção de bug: reconectar a dispositivos sem autodiscovery / MDNS-Broadcast na rede, resolve [# 66] (https://github.com/DrozmotiX/ioBroker.esphome/issues/66)",
-        "nl": "[!!! Breaking !!!] Maak het YAML-bestand persistent, maak een back-up van uw configuratie voordat u deze bijwerkt! lost [#57](https://github.com/DrozmotiX/ioBroker.esphome/issues/57) op\nUpdate ESPHome Dashboard naar 1.18.0, vereist Python >=3.7 (en zorg voor <4.0!)\nBugfix: opnieuw verbinding maken met apparaten zonder autodiscovery / MDNS-uitzending in netwerk, lost [#66](https://github.com/DrozmotiX/ioBroker.esphome/issues/66) op",
-        "fr": "[!!! Breaking !!!] Rendez le fichier YAML persistant, sauvegardez votre configuration avant de mettre à jour ! résout [#57](https://github.com/DrozmotiX/ioBroker.esphome/issues/57)\nMettez à jour ESPHome Dashboard vers 1.18.0, nécessite Python >=3.7 (et assurez-vous <4.0 !)\nCorrection de bug : se reconnecter aux appareils sans découverte automatique / MDNS-Broadcast en réseau, résout [#66](https://github.com/DrozmotiX/ioBroker.esphome/issues/66)",
-        "it": "[!!! Breaking !!!] Rendi persistente il file YAML, esegui il backup della configurazione prima di aggiornare! risolve [#57](https://github.com/DrozmotiX/ioBroker.esphome/issues/57)\nAggiorna ESPHome Dashboard a 1.18.0, richiede Python >=3.7 (e assicurati <4.0!)\nBugfix: riconnettersi ai dispositivi senza autodiscovery / MDNS-Broadcast in rete, risolve [#66] (https://github.com/DrozmotiX/ioBroker.esphome/issues/66)",
-        "es": "[!!! ¡¡¡Rompiendo !!!] ¡Haga que el archivo YAML sea persistente, haga una copia de seguridad de su configuración antes de actualizar! resuelve [# 57] (https://github.com/DrozmotiX/ioBroker.esphome/issues/57)\nActualice ESPHome Dashboard a 1.18.0, requiere Python> = 3.7 (¡y asegúrese de <4.0!)\nCorrección de error: vuelva a conectarse a dispositivos sin detección automática / MDNS-Broadcast en la red, resuelve [# 66] (https://github.com/DrozmotiX/ioBroker.esphome/issues/66)",
-        "pl": "[!!! Breaking !!!] Utrwal plik YAML, wykonaj kopię zapasową konfiguracji przed aktualizacją! rozwiązuje [#57](https://github.com/DrozmotiX/ioBroker.esphome/issues/57)\nZaktualizuj pulpit nawigacyjny ESPHome do wersji 1.18.0, wymaga Pythona >=3.7 (i upewnij się, że <4.0!)\nBugfix: Połącz się ponownie z urządzeniami bez automatycznego wykrywania / MDNS-Broadcast w sieci, rozwiązuje [#66](https://github.com/DrozmotiX/ioBroker.esphome/issues/66)",
-        "zh-cn": "[！！！打破 !!!] 使 YAML 文件持久化，更新前备份您的配置！解决 [#57](https://github.com/DrozmotiX/ioBroker.esphome/issues/57)\n将 ESPHome Dashboard 更新到 1.18.0，需要 Python >=3.7（并确保 <4.0！）\n修正：在网络中没有自动发现/MDNS-Broadcast 的情况下重新连接到设备，解决[#66](https://github.com/DrozmotiX/ioBroker.esphome/issues/66)"
-      },
-      "0.2.1-1": {
-        "en": "add cover component\nadd transitionLength for lights",
-        "de": "Abdeckungskomponente hinzufügen\nÜbergangslänge für Lichter hinzufügen",
-        "ru": "добавить компонент обложки\nдобавить transitionLength для огней",
-        "pt": "adicionar componente de capa\nadicionar comprimento de transição para luzes",
-        "nl": "voeg een omslagcomponent toe\nvoeg transitionLength toe voor lichten",
-        "fr": "ajouter un composant de couverture\najouter une longueur de transition pour les lumières",
-        "it": "aggiungi il componente di copertina\naggiungi TransitionLength per le luci",
-        "es": "agregar componente de portada\nagregar transiciónLength para luces",
-        "pl": "dodaj komponent okładki\ndodaj długość przejścia dla świateł",
-        "zh-cn": "添加封面组件\n为灯光添加transitionLength"
       }
     },
     "title": "Control ESPHome managed devices",
@@ -145,7 +147,6 @@
         "dsn": "https://52227cfa250b49e99b1f28408273402c@sentry.iobroker.net/122"
       }
     },
-    "dataFolder": "esphome.%INSTANCE%",
     "localLink": "http://%ESPHomeDashboardIP%:%ESPHomeDashboardPort%",
     "adminTab": {
       "link": "http://%ESPHomeDashboardIP%:%ESPHomeDashboardPort%",

package/main.js

@@ -14,8 +14,10 @@ const stateAttr = require(__dirname + '/lib/stateAttr.js'); // Load attribute li
 const disableSentry = false; // Ensure to set to true during development!
 const warnMessages = {}; // Store warn messages to avoid multiple sending to sentry
 const fs = require('fs');
+const {clearTimeout} = require('timers');
 const client = {};
-let reconnectTimer, reconnectInterval, apiPass, autodiscovery, dashboardProcess, createConfigStates;
+const resetTimers = {}; // Memory allocation for all running timers
+let reconnectInterval, apiPass, autodiscovery, dashboardProcess, createConfigStates;
 
 class Esphome extends utils.Adapter {
 
@@ -58,7 +60,11 @@ class Esphome extends utils.Adapter {
 
 			// Start MDNS discovery when enabled
 			if (autodiscovery) {
-				this.deviceDiscovery(); // Start MDNS autodiscovery
+				if (resetTimers['autodiscovery']) resetTimers['autodiscovery'] = clearTimeout(resetTimers['autodiscovery']);
+				this.log.info(`Adapter ready, automatic Device Discovery will be acticated in 30 seconds.`);
+				resetTimers['autodiscovery'] = setTimeout(async () => {
+					this.deviceDiscovery(); // Start MDNS autodiscovery
+				}, (30000));
 			} else {
 				this.log.warn(`Auto Discovery disabled, new devices (or IP changes) will NOT be detected automatically!`);
 			}
@@ -70,6 +76,21 @@ class Esphome extends utils.Adapter {
 				this.log.info(`Native Integration of ESPHome Dashboard disabled `);
 			}
 
+			// Create & Subscribe to button handling offline Device cleanup
+			this.extendObjectAsync('esphome.0.info.deviceCleanup',
+				{
+					'type': 'state',
+					'common': {
+						'role': 'button',
+						'name': 'Device or service connected',
+						'type': 'boolean',
+						'read': false,
+						'write': true,
+						'def': false
+					}
+				});
+			this.subscribeStates('esphome.0.info.deviceCleanup');
+
 		} catch (e) {
 			this.log.error(`[Adapter start] Fatal error occurred ${e}`);
 		}
@@ -154,7 +175,7 @@ class Esphome extends utils.Adapter {
 
 			// Get basic data of known devices and start reading data
 			for (const i in knownDevices) {
-				this.connectDevices(knownDevices[i].native.ip, this.decrypt(knownDevices[i].native.passWord));
+				this.connectDevices(knownDevices[i].native.ip, knownDevices[i].native.passWord, knownDevices[i].native.encryptionKey ? knownDevices[i].native.encryptionKey : '');
 			}
 		} catch (e) {
 			this.sendSentry(`[tryKnownDevices] ${e}`);
@@ -165,7 +186,7 @@ class Esphome extends utils.Adapter {
 	deviceDiscovery() {
 		try {
 
-			this.log.info(`Auto Discovery startet, new devices (or IP changes) will be detected automatically`);
+			this.log.info(`Automatic device Discovery started, new devices (or IP changes) will be detected automatically`);
 			discovery = new Discovery();
 
 			discovery.on('info', async (message) => {
@@ -173,7 +194,13 @@ class Esphome extends utils.Adapter {
 					this.log.debug(`Discovery message ${JSON.stringify(message)}`);
 					if (this.deviceInfo[message.address] == null) {
 						this.log.info(`[AutoDiscovery] New ESPHome device found at IP ${message.address}, trying to initialize`);
-						this.connectDevices(`${message.address}`, `${apiPass}`);
+						//ToDo: Add default Encryption Key
+						// Only run autodiscovery if device is unknown yet
+						if (!this.deviceInfo[message.address]
+							&& this.deviceInfo[message.address].connectError === false
+						&& !this.deviceInfo[message.address] && this.deviceInfo[message.address].connecting) {
+							this.connectDevices(`${message.address}`, apiPass, '');
+						}
 					}
 				} catch (e) {
 					this.log.error(`[deviceDiscovery handler] ${e}`);
@@ -188,42 +215,80 @@ class Esphome extends utils.Adapter {
 	/**
 	 * Handle Socket connections
 	 * @param {string} host IP adress of device
-	 * @param {string | number | boolean} pass Password used for APU
+	 * @param {string} deviceApiPass Native API credentials
+	 * @param {string} deviceEncryptionKey Encryption Key credentials
 	 */
-	connectDevices(host, pass) {
+	connectDevices(host, deviceApiPass, deviceEncryptionKey) {
 		try {
 			// const host = espDevices[device].ip;
 			this.log.info(`Try to connect to ${host}`);
-			// Prepare connection attributes
-			client[host] = new Client({
-				host: host,
-				password: apiPass,
-				clientInfo: `${this.host}`,
-				clearSession: true,
-				initializeDeviceInfo: true,
-				initializeListEntities: true,
-				initializeSubscribeStates: false,
-				// initializeSubscribeLogs: false, //ToDo: Make configurable by adapter settings
-				reconnect: true,
-				reconnectInterval: reconnectInterval,
-				pingInterval: 15000, //ToDo: Make configurable by adapter settings
-				pingAttempts: 3
-				// port: espDevices[device].port //ToDo: Make configurable by adapter settings
-			});
+
+			// Cancel process if connection try is already in progress
+			if (this.deviceInfo[host] && this.deviceInfo[host].connecting) return;
+
+			// Clear any existing memory information for this device
+			delete this.deviceInfo[host];
+
+			// Reserve basic memory information for this device
+			this.deviceInfo[host] = {
+				connected : false,
+				connecting : true,
+				connectionError : false,
+				initialized: false,
+				ip : host
+			};
+
+			if (!deviceEncryptionKey || deviceEncryptionKey === '') {
+				client[host] = new Client({
+					host: host,
+					clientInfo: `${this.host}`,
+					clearSession: true,
+					initializeDeviceInfo: true,
+					initializeListEntities: true,
+					initializeSubscribeStates: false,
+					// initializeSubscribeLogs: false, //ToDo: Make configurable by adapter settings
+					reconnect: true,
+					reconnectInterval: reconnectInterval,
+					pingInterval: 15000, //ToDo: Make configurable by adapter settings
+					pingAttempts: 3,
+					password : this.decrypt(deviceApiPass)
+					// port: espDevices[device].port //ToDo: Make configurable by adapter settings
+				});
+			} else {
+				client[host] = new Client({
+					host: host,
+					clientInfo: `${this.host}`,
+					clearSession: true,
+					initializeDeviceInfo: true,
+					initializeListEntities: true,
+					initializeSubscribeStates: false,
+					// initializeSubscribeLogs: false, //ToDo: Make configurable by adapter settings
+					reconnect: true,
+					reconnectInterval: reconnectInterval,
+					pingInterval: 15000, //ToDo: Make configurable by adapter settings
+					pingAttempts: 3,
+					encryptionKey: this.decrypt(deviceEncryptionKey)
+					// port: espDevices[device].port //ToDo: Make configurable by adapter settings
+				});
+			}
 
 			// Connection listener
 			client[host].on('connected', async () => {
 				try {
 					// Clear any existing memory information for this device
 					delete this.deviceInfo[host];
-
-					// Reserve basic memory information for this device
-					this.deviceInfo[host] = {
-						connected : true,
-						connectionError : false,
-						initialized: false,
-						ip : host
-					};
+					if (!this.deviceInfo[host]) {
+						this.deviceInfo[host] = {
+							connected : false,
+							connecting : true,
+							connectionError : false,
+							initialized: false,
+							ip : host
+						};
+					} else {
+						this.deviceInfo[host].connected = true;
+						this.deviceInfo[host].connecting = false;
+					}
 					this.log.info(`ESPHome client ${host} connected`);
 					// Clear possible present warn messages for device from previous connection
 					delete warnMessages[host];
@@ -232,10 +297,18 @@ class Esphome extends utils.Adapter {
 				}
 			});
 
-			client[host].on('disconnected', () => 	{
+			client[host].on('disconnected', async () => 	{
 				try {
 					if (this.deviceInfo[host].deviceName != null) {
-						this.setState(`${this.deviceInfo[host].deviceName}.info._online`, {val: false, ack: true});
+						await this.stateSetCreate(`${this.deviceInfo[host].deviceName}.info._online`, `Online state`, false);
+
+						// Check all created states in memory if their are related to this device
+						for (const state in this.createdStatesDetails) {
+							// Remove states from cache
+							if (state.split('.')[0] === this.deviceInfo[host].deviceName) {
+								delete this.createdStatesDetails[state];
+							}
+						}
 
 						// Cache relevant data before clearing memory space of device
 						const cacheDeviceInformation = {
@@ -249,6 +322,7 @@ class Esphome extends utils.Adapter {
 						// Reserve basic memory information for this device
 						this.deviceInfo[host] = {
 							connected : false,
+							connecting: false,
 							connectionError : true,
 							deviceName : cacheDeviceInformation.deviceName,
 							deviceInfoName : cacheDeviceInformation.deviceInfoName,
@@ -266,6 +340,12 @@ class Esphome extends utils.Adapter {
 			client[host].on('initialized', () => {
 				this.log.info(`ESPHome  client ${this.deviceInfo[host].deviceInfoName} on ip ${host} initialized`);
 				this.deviceInfo[host].initialized = true;
+
+				// Start timer to cleanup unneeded objects
+				if (resetTimers[host]) resetTimers[host] = clearTimeout(resetTimers[host]);
+				resetTimers[host] = setTimeout(async () => {
+					await this.objectCleanup(host);
+				}, (10000));
 			});
 
 			// Log message listener
@@ -286,12 +366,18 @@ class Esphome extends utils.Adapter {
 					// Store device information into memory
 					const deviceName = this.replaceAll(deviceInfo.macAddress, `:`, ``);
 					this.deviceInfo[host] = {
+						adapterObjects : {
+							channels : []
+						},
 						ip: host,
+						connectError : false,
+						connected : true,
 						mac: deviceInfo.macAddress,
 						deviceInfo: deviceInfo,
 						deviceName: deviceName,
 						deviceInfoName: deviceInfo.name,
-						passWord: apiPass,
+						passWord: deviceApiPass,
+						encryptionKey: deviceEncryptionKey,
 					};
 
 					// Store MAC & IP relation, delete possible existing entry before
@@ -314,7 +400,8 @@ class Esphome extends utils.Adapter {
 							name: this.deviceInfo[host].deviceInfoName,
 							mac: deviceInfo.macAddress,
 							deviceName: deviceName,
-							passWord: this.encrypt(apiPass),
+							passWord: deviceApiPass,
+							encryptionKey: deviceEncryptionKey
 						},
 					});
 
@@ -368,6 +455,11 @@ class Esphome extends utils.Adapter {
 						native: {},
 					});
 
+					// Cache created channel in device memory
+					if (!this.deviceInfo[host].adapterObjects.channels.includes(`${this.namespace}.${this.deviceInfo[host].deviceName}.${entity.type}`)) {
+						this.deviceInfo[host].adapterObjects.channels.push(`${this.namespace}.${this.deviceInfo[host].deviceName}.${entity.type}`);
+					}
+
 					// Create state specific channel by id
 					await this.extendObjectAsync(`${this.deviceInfo[host].deviceName}.${entity.type}.${entity.id}`, {
 						type: 'channel',
@@ -377,6 +469,11 @@ class Esphome extends utils.Adapter {
 						native: {},
 					});
 
+					// Cache created channel in device memory
+					if (!this.deviceInfo[host].adapterObjects.channels.includes(`${this.namespace}.${this.deviceInfo[host].deviceName}.${entity.type}.${entity.id}`)) {
+						this.deviceInfo[host].adapterObjects.channels.push(`${this.namespace}.${this.deviceInfo[host].deviceName}.${entity.type}.${entity.id}`);
+					}
+
 					//Check if config channel should be created
 					if (!createConfigStates) {
 						// Delete folder structure if already present
@@ -397,6 +494,12 @@ class Esphome extends utils.Adapter {
 							},
 							native: {},
 						});
+
+						// Cache created channel in device memory
+						if (!this.deviceInfo[host].adapterObjects.channels.includes(`${this.namespace}.${this.deviceInfo[host].deviceName}.${entity.type}.${entity.id}.config`)) {
+							this.deviceInfo[host].adapterObjects.channels.push(`${this.namespace}.${this.deviceInfo[host].deviceName}.${entity.type}.${entity.id}.config`);
+						}
+
 						// Handle Entity JSON structure and write related config channel data
 						await this.TraverseJson(entity.config, `${this.deviceInfo[host].deviceName}.${entity.type}.${entity.id}.config`);
 					}
@@ -492,13 +595,13 @@ class Esphome extends utils.Adapter {
 
 
 				} catch (e) {
-					this.log.error(`Connection issue for ${entity.name} ${e}`);
+					this.log.error(`Connection issue for ${entity.name} ${e} | ${e.stack}`);
 				}
 
 			});
 
 			// Connection data handler
-			client[host].on('error', (error) => {
+			client[host].on('error', async (error) => {
 				try {
 
 					// Reserve memory space for connection error if not already exist
@@ -517,24 +620,42 @@ class Esphome extends utils.Adapter {
 						if (!this.deviceInfo[host].connectError) {
 							this.log.error(optimisedError);
 							this.deviceInfo[host].connectError = true;
+							await this.stateSetCreate(`${this.deviceInfo[host].deviceName}.info._online`, `Online state`, false);
+						}
+					} else if (error.message.includes('EHOSTUNREACH')) {
+						optimisedError = `Client ${host} unreachable !`;
+						if (!this.deviceInfo[host].connectError) {
+							this.log.error(optimisedError);
+							this.deviceInfo[host].connectError = true;
+							await this.stateSetCreate(`${this.deviceInfo[host].deviceName}.info._online`, `Online state`, false);
 						}
 					} else if (error.message.includes('Invalid password')) {
 						optimisedError = `Client ${host} incorrect password !`;
 						if (!this.deviceInfo[host].connectError) {
 							this.log.error(optimisedError);
 							this.deviceInfo[host].connectError = true;
+							await this.stateSetCreate(`${this.deviceInfo[host].deviceName}.info._online`, `Online state`, false);
+						}
+					} else if (error.message.includes('Encryption expected')) {
+						optimisedError = `Client ${host} requires encryption key which has not been provided, please enter encryption key in adapter settings for this device !`;
+						if (!this.deviceInfo[host].connectError) {
+							this.log.error(optimisedError);
+							this.deviceInfo[host].connectError = true;
+							await this.stateSetCreate(`${this.deviceInfo[host].deviceName}.info._online`, `Online state`, false);
 						}
 					} else if (error.message.includes('ECONNRESET')) {
 						optimisedError = `Client ${host} Connection Lost, will reconnect automatically when device is available!`;
 						if (!this.deviceInfo[host].connectError) {
 							this.log.warn(optimisedError);
 							this.deviceInfo[host].connectError = true;
+							await this.stateSetCreate(`${this.deviceInfo[host].deviceName}.info._online`, `Online state`, false);
 						}
 					} else if (error.message.includes('timeout')) {
 						optimisedError = `Client ${host} Timeout, will reconnect automatically when device is available!`;
 						if (!this.deviceInfo[host].connectError) {
 							this.log.warn(optimisedError);
 							this.deviceInfo[host].connectError = true;
+							await this.stateSetCreate(`${this.deviceInfo[host].deviceName}.info._online`, `Online state`, false);
 						}
 					}  else if (error.message.includes('ECONNREFUSED')) {
 						optimisedError = `Client ${host} not yet ready to connect, will try again!`;
@@ -573,7 +694,7 @@ class Esphome extends utils.Adapter {
 			}
 
 		} catch (e) {
-			this.log.error(`ESP device error for ${host}`);
+			this.log.error(`ESP device error for ${host} | ${e} | ${e.stack}`);
 		}
 	}
 
@@ -672,6 +793,8 @@ class Esphome extends utils.Adapter {
 						// Check if state contains value
 						if (transitionLength) {
 							this.deviceInfo[host][entity.id].states.transitionLength = transitionLength.val;
+							// Run create state routine to ensure state is cached in memory
+							await this.stateSetCreate(`${this.deviceInfo[host].deviceName}.${entity.type}.${entity.id}.transitionLength`, `${stateName} of ${entity.config.name}`, transitionLength.val, `s`, writable);
 						} else { // Else just create it
 							await this.stateSetCreate(`${this.deviceInfo[host].deviceName}.${entity.type}.${entity.id}.transitionLength`, `${stateName} of ${entity.config.name}`, 0, `s`, writable);
 							this.deviceInfo[host][entity.id].states.transitionLength = 0;
@@ -948,6 +1071,8 @@ class Esphome extends utils.Adapter {
 	onUnload(callback) {
 		try {
 			this.log.debug(JSON.stringify(this.deviceInfo));
+
+			// Set all online states to false
 			for (const device in this.deviceInfo) {
 
 				// Ensure all known online states are set to false
@@ -962,9 +1087,12 @@ class Esphome extends utils.Adapter {
 					this.log.debug(`[onUnload] ${JSON.stringify(e)}`);
 				}
 			}
-			if (reconnectTimer) {
-				reconnectTimer = clearTimeout();
+
+			// Ensure all possible running timers are cleared
+			for (const timer in resetTimers) {
+				if (resetTimers[timer]) resetTimers[timer] = clearTimeout(resetTimers[timer]);
 			}
+
 			try {
 				if (dashboardProcess) {
 					dashboardProcess.kill('SIGTERM', {
@@ -1028,8 +1156,7 @@ class Esphome extends utils.Adapter {
 					} else {
 						this.log.info(`Valid IP address received`);
 						this.messageResponse[obj.message['device-ip']] = obj;
-						// const pass = this.decrypt(obj.message['device-pass']);
-						await this.connectDevices(obj.message['device-ip'], apiPass);
+						await this.connectDevices(obj.message['device-ip'], obj.message['device-pass'], obj.message['deviceEncryptionKey']);
 					}
 					break;
 			}
@@ -1079,6 +1206,17 @@ class Esphome extends utils.Adapter {
 		try {
 			if (state && state.ack === false) {
 				const device = id.split('.');
+
+				try {
+					// Verify if trigger is related to device-cleanup
+					if (id.split('.')[3] === 'deviceCleanup'){
+						await this.offlineDeviceCleanup();
+						return;
+					}
+				} catch (e) {
+					// Skip action
+				}
+
 				const deviceIP = this.deviceStateRelation[device[2]].ip;
 
 				// Handle Switch State
@@ -1226,13 +1364,84 @@ class Esphome extends utils.Adapter {
 				});
 
 				// Set online state to false, will be set to true at successfully connected
-				this.setState(`${_devices.rows[currDevice].id}.info._online`, {val: false, ack: true});
+				await this.stateSetCreate(`${_devices.rows[currDevice].id}.info._online`, `Online state`, false);
 			}
 
 		} catch (e) {
 			this.log.error(`[resetOnlineState] ${e}`);
 		}
 	}
+
+	async objectCleanup(ip){
+		try {
+			this.log.debug(`[objectCleanup] Starting channel and state cleanup for ${this.deviceInfo[ip].deviceName} | ${ip} | ${this.deviceInfo[ip].ip}`);
+
+			// Cancel cleanup operation in case device is not connected anymore
+			if (this.deviceInfo[ip].connectionError || !this.deviceInfo[ip].connected) return;
+
+			// Set parameters for object view to only include objects within adapter namespace
+			const params = {
+				startkey : `${this.namespace}.${this.deviceInfo[ip].deviceName}.`,
+				endkey : `${this.namespace}.\u9999`,
+			};
+
+			// Get all current channels
+			const _channels = await this.getObjectViewAsync('system', 'channel', params);
+			// List all found channels & compare with memory, delete unneeded channels
+			for (const currDevice in _channels.rows) {
+				// @ts-ignore
+				if (!this.deviceInfo[ip].adapterObjects.channels.includes(_channels.rows[currDevice].id)
+					&& _channels.rows[currDevice].id.split('.')[2] === this.deviceInfo[ip].deviceName){
+					this.log.debug(`[objectCleanup] Unknown Channel found, delete ${_channels.rows[currDevice].id}`);
+					await this.delObjectAsync(_channels.rows[currDevice].id, {recursive: true});
+				}
+			}
+
+			// Get all current states in adapter tree
+			const _states = await this.getObjectViewAsync('system', 'state', params);
+			// List all found states & compare with memory, delete unneeded states
+			for (const currDevice in _states.rows) {
+				if (!this.createdStatesDetails[_states.rows[currDevice].id.replace(`esphome.0.`, ``)]
+					&& _states.rows[currDevice].id.split('.')[2] === this.deviceInfo[ip].deviceName){
+					this.log.debug(`[objectCleanup] Unknown State found, delete ${_states.rows[currDevice].id}`);
+					// await this.delObjectAsync(_states.rows[currDevice].id);
+				}
+			}
+
+		} catch (e) {
+			this.log.error(`[objectCleanup] Fatal error ${e} | ${e.stack}`);
+		}
+	}
+
+	async offlineDeviceCleanup () {
+		this.log.info(`Offline Device cleanup started`);
+
+		try {
+
+			// Get an overview of all current devices known by adapter
+			const knownDevices = await this.getDevicesAsync();
+			console.log(`KnownDevices: ${knownDevices}`);
+
+			// Loop to all devices, check if online state = TRUE otherwise delete device
+			for (const device in knownDevices){
+
+				// Get online value
+				const online = await this.getStateAsync(`${knownDevices[device]._id}.info._online`);
+				if (!online || !online.val){
+					this.log.info(`Offline device ${knownDevices[device]._id.split('.')[2]} expected on ip ${knownDevices[device].native.ip} removed`);
+					await this.delObjectAsync(knownDevices[device]._id, {recursive: true});
+				}
+
+			}
+
+			if (!knownDevices) return; // exit function if no known device are detected
+			if (knownDevices.length > 0) this.log.info(`Try to contact ${knownDevices.length} known devices`);
+		} catch (e) {
+			this.log.error(`[offlineDeviceCleanup] Fatal error occurred, cannot cleanup offline devices ${e} | ${e.stack}`);
+
+		}
+	}
+
 }
 
 if (require.main !== module) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.esphome",
-  "version": "0.3.2",
+  "version": "0.4.1",
   "description": "Control your ESP8266/ESP32 with simple yet powerful configuration files created and managed by ESPHome",
   "author": {
     "name": "DutchmanNL",