iobroker.zigbee2mqtt 3.0.5 → 3.0.7

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "zigbee2mqtt",
-    "version": "3.0.5",
+    "version": "3.0.7",
     "news": {
+      "3.0.7": {
+        "en": "fix jsconconf",
+        "de": "fix jsconf",
+        "ru": "исправить jsconconf",
+        "pt": "corrigir jsconconf",
+        "nl": "jsconconf repareren",
+        "fr": "corriger jsconconf",
+        "it": "correzione jsconconf",
+        "es": "jsconf",
+        "pl": "fix jsconconf",
+        "uk": "закріпити jsconconf",
+        "zh-cn": "修复 jsconconconf"
+      },
+      "3.0.6": {
+        "en": "settings restructure\nfix icon not found message",
+        "de": "einstellungen restrukturieren\nsymbol nicht gefunden",
+        "ru": "реструктуризация настроек\nисправить иконку не найдено сообщение",
+        "pt": "reestruturação de configurações\ncorrigir ícone não encontrado mensagem",
+        "nl": "instellingen herstructureren\npictogram niet gevonden bericht herstellen",
+        "fr": "restructuration des paramètres\ncorrection icône non trouvée message",
+        "it": "installazione\nfix icona non trovato messaggio",
+        "es": "configuración de reestructuración\nfijar icono no encontrado mensaje",
+        "pl": "restrukturyzacja ustawień\nnie znaleziono ikony",
+        "uk": "реструктуризація параметрів\nне знайдено повідомлення",
+        "zh-cn": "设置调整\n未找到消息的修复图标"
+      },
       "3.0.5": {
         "en": "add additional folder for some devices (like smoke detector)\nstate.js cleanup\nset available State to true if device message include last_seen status",
         "de": "zusätzliche ordner für einige geräte hinzufügen (wie rauchmelder)\nstate.js cleanup\neingestellt verfügbar Zustand, um wahr zu sein, wenn die Gerätenachricht last_seen status enthält",
@@ -67,32 +93,6 @@
         "pl": "pobierz ikonę corr",
         "uk": "cкачати ігру corr",
         "zh-cn": "corr 图标下载"
-      },
-      "3.0.0": {
-        "en": "adaptation z2m 2.x",
-        "de": "anpassung z2m 2.x",
-        "ru": "адаптация z2m 2.x",
-        "pt": "adaptação z2m 2.x",
-        "nl": "aanpassing z2m 2.x",
-        "fr": "adaptation z2m 2.x",
-        "it": "adattamento z2m 2.x",
-        "es": "adaptación z2m 2.x",
-        "pl": "adaptacja z2m 2.x",
-        "uk": "адаптація z2m 2.x",
-        "zh-cn": "适应z2m 2.x"
-      },
-      "2.13.11": {
-        "en": "corr package.json",
-        "de": "korr paket.json",
-        "ru": "коррек-пакет.json",
-        "pt": "corr pacote.json",
-        "nl": "corr package.json",
-        "fr": "c'est ce qu'il a dit",
-        "it": "pacchetto corr.json",
-        "es": "corr package.json",
-        "pl": "corr package.json",
-        "uk": "english, українська, français..",
-        "zh-cn": "corr 软件包.json"
       }
     },
     "messages": [
@@ -226,10 +226,9 @@
     ],
     "globalDependencies": [
       {
-        "admin": ">=6.6.14"
+        "admin": ">=7.4.10"
       }
-    ],
-    "installedFrom": "iobroker.zigbee2mqtt@3.0.4"
+    ]
   },
   "native": {
     "connectionType": "ws",

package/lib/imageController.js

@@ -53,6 +53,7 @@ class ImageController {
         const slsIconFileName = `${this.sanitizeModelIDForImageUrl(device.model_id)}.png`;
 
         let iconFileName = await this.getExistingIconFileName(z2mIconFileNameJPG, z2mIconFileNamePNG, slsIconFileName);
+        let iconFound = true;
 
         if (!iconFileName) {
             const iconUrls = [
@@ -63,30 +64,29 @@ class ImageController {
 
             for (const iconUrl of iconUrls) {
                 try {
-                    await this.downloadIcon(this.adapter, iconUrl, this.adapter.namespace);
-                    iconFileName = this.getFileNameWithExtension(iconUrl);
-                    break;
-                } catch (err) {
-                    this.adapter.log.warn(`Failed to download image from ${iconUrl}`);
+                    iconFound = await this.downloadIcon(this.adapter, iconUrl, this.adapter.namespace);
+                    if (iconFound) {
+                        iconFileName = this.getFileNameWithExtension(iconUrl);
+                        break;
+                    }
+                } catch (ex) {
+                    //  check next pic
                 }
             }
         }
 
-        if (!iconFileName) {
-            this.adapter.log.warn(`No image for device model: ${device.definition.model} found!`);
+        if (!iconFound) {
+            this.adapter.log.warn(`Failed to download image for device model: ${device.definition.model} - ${device.definition.description}`);
             return '';
-        }
-
-        let icon;
-        try {
+        } else {
             // Load image from the Meta-Store
-            icon = await this.adapter.readFileAsync(this.adapter.namespace, iconFileName);
+            const icon = await this.adapter.readFileAsync(this.adapter.namespace, iconFileName);
             // Load Image Metadata
             const origIconMeta = await sharp(icon.file).metadata();
             // Check whether the image needs to be resized
             if (
                 (origIconMeta.height && origIconMeta.height > imageSize) ||
-				(origIconMeta.width && origIconMeta.width > imageSize)
+                (origIconMeta.width && origIconMeta.width > imageSize)
             ) {
                 // Resize image to 28x28 pixel
                 this.adapter.log.info(
@@ -103,12 +103,10 @@ class ImageController {
                 // Replace the original image with the resize image.
                 await this.adapter.writeFileAsync(this.adapter.namespace, iconFileName, icon.file);
             }
-        } catch (error) {
-            this.adapter.log.warn(error);
-            return '';
+
+            // Create and output Base64
+            return `data:image/png;base64,${icon.file.toString('base64')}`;
         }
-        // Create and output Base64
-        return `data:image/png;base64,${icon.file.toString('base64')}`;
     }
     getFileNameWithExtension(url) {
         const path = new URL(url).pathname;
@@ -121,8 +119,10 @@ class ImageController {
         try {
             const res = await axios.get(url, { responseType: 'arraybuffer' });
             await adapter.writeFileAsync(namespace, this.getFileNameWithExtension(url), res.data);
+            return true;
         } catch (ex) {
-            adapter.log.warn(ex);
+            //adapter.log.warn(ex);
+            return false;
         }
     }
     async getExistingIconFileName(z2mIconFileNameJPG, z2mIconFileNamePNG, slsIconFileName) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee2mqtt",
-  "version": "3.0.5",
+  "version": "3.0.7",
   "description": "Zigbee2MQTT adapter for ioBroker",
   "author": {
     "name": "Dennis Rathjen and Arthur Rupp",
@@ -25,14 +25,14 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.2.3",
-    "@iobroker/dm-utils": "^1.0.9",
+    "@iobroker/dm-utils": "^1.0.10",
     "aedes": "^0.51.3",
     "aedes-persistence-nedb": "^2.0.3",
     "mqtt": "^5.10.4",
     "net": "^1.0.2",
     "node-schedule": "^2.1.1",
     "sharp": "^0.33.5",
-    "ws": "^8.16.0"
+    "ws": "^8.18.2"
   },
   "devDependencies": {
     "@alcalzone/release-script": "^3.8.0",
@@ -42,10 +42,10 @@
     "@iobroker/adapter-dev": "^1.4.0",
     "@iobroker/testing": "^5.0.4",
     "@tsconfig/node14": "^14.1.3",
-    "@types/chai": "^5.2.1",
+    "@types/chai": "^5.2.2",
     "@types/chai-as-promised": "^8.0.2",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^22.15.3",
+    "@types/node": "^22.15.29",
     "@types/node-schedule": "^2.1.7",
     "@types/proxyquire": "^1.3.31",
     "@types/sinon": "^17.0.3",
@@ -53,7 +53,7 @@
     "chai": "^5.2.0",
     "chai-as-promised": "^8.0.1",
     "eslint": "^9.25.1",
-    "eslint-config-prettier": "^10.1.1",
+    "eslint-config-prettier": "^10.1.5",
     "eslint-plugin-prettier": "^5.2.3",
     "mocha": "^11.0.1",
     "prettier": "^3.5.3",