iobroker.zigbee2mqtt 3.0.0 → 3.0.2

package/README.md

@@ -22,6 +22,12 @@ This adapter allows to control the data points of the devices of a Zigbee2MQTT i
 [Adapter Documentation](https://github.com/arteck/ioBroker.zigbee2mqtt/blob/main/docs/wiki.md)
 
 ## Changelog
+### 3.0.2 (2025-01-06)
+-   (simateck) corr WebSocket connection
+
+### 3.0.1 (2025-01-04)
+-   (arteck) corr icon download
+
 ### 3.0.0 (2025-01-04)
 -   (arteck) adaptation z2m 2.x
 

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "zigbee2mqtt",
-    "version": "3.0.0",
+    "version": "3.0.2",
     "news": {
+      "3.0.2": {
+        "en": "corr WebSocket connection",
+        "de": "korr WebSocket Verbindung",
+        "ru": "гофровое соединение WebSocket",
+        "pt": "conexão da WebSocket",
+        "nl": "corr WebSocket-verbinding",
+        "fr": "corr Connexion WebSocket",
+        "it": "collegamento corr WebSocket",
+        "es": "corr WebSocket connection",
+        "pl": "połączenie corr WebSocket",
+        "uk": "корр WebSocket підключення",
+        "zh-cn": "corr WebSocket 连接"
+      },
+      "3.0.1": {
+        "en": "corr icon download",
+        "de": "corr icon herunterladen",
+        "ru": "скачать значок",
+        "pt": "corrimento ícone download",
+        "nl": "corr pictogramdownload",
+        "fr": "corr icon télécharger",
+        "it": "icona corr scaricare",
+        "es": "corr icono descargar",
+        "pl": "pobierz ikonę corr",
+        "uk": "cкачати ігру corr",
+        "zh-cn": "corr 图标下载"
+      },
       "3.0.0": {
         "en": "adaptation z2m 2.x",
         "de": "anpassung z2m 2.x",
@@ -67,19 +93,6 @@
         "pl": "naprawić ścieżkę ikon",
         "uk": "фіксувати шлях іконки",
         "zh-cn": "修补图标路径"
-      },
-      "2.13.7": {
-        "en": "core dependecy\nupdate dependecy\nEnable occupancy to be always updated if true",
-        "de": "kernabhängigkeit\naktualisierung abhängigkeit\nErmöglichen Sie die Belegung immer aktualisieren, wenn zutreffend",
-        "ru": "основополагающая зависимость\nобновление\nВозможность всегда обновляться, если это правда",
-        "pt": "dependência do núcleo\natualização\nPermite que a ocupação seja sempre atualizada se for verdade",
-        "nl": "core afhankelijkheid\nafhankelijkheid bijwerken\nDe bezetting wordt altijd bijgewerkt indien deze waar is",
-        "fr": "dépendance du noyau\nmettre à jour la dépendance\nActiver l'occupation pour être toujours mis à jour si vrai",
-        "it": "core dipendenza\naggiornamento dipendenza\nAbilitare l'occupazione di essere sempre aggiornato se vero",
-        "es": "dependencia básica\ndependencia de actualización\nActivar ocupación para ser siempre actualizada si es verdad",
-        "pl": "zasadnicza zależność\naktualizacja zależności\nWłącz zawsze aktualizację obłożenia, jeśli jest prawdziwe",
-        "uk": "сердечник\nоновлення залежності\nУвімкнути можливість постійно оновлюватися, якщо правда",
-        "zh-cn": "核心依赖性\n更新依赖性\n启用若为真则总是更新占用"
       }
     },
     "messages": [

package/lib/deviceController.js

@@ -251,11 +251,9 @@ class DeviceController {
                 }
             }
 
-            if (
-                !this.createCache[device.ieee_address] ||
-				this.createCache[device.ieee_address].name != deviceName ||
-				this.createCache[device.ieee_address].description != description
-            ) {
+            if (!this.createCache[device.ieee_address] ||
+		this.createCache[device.ieee_address].name != deviceName ||
+		this.createCache[device.ieee_address].description != description) {
                 const deviceObj = {
                     type: 'device',
                     common: {

package/lib/imageController.js

@@ -18,7 +18,7 @@ class ImageController {
         return deviceName ? deviceNameString.replace(/\u0000/g, '') : 'NA';
     }
 
-    getZ2mDeviceImage(device) {
+    getZ2mDeviceImageModelJPG(device) {
         if (device && device.definition && device.definition.model) {
             const icoString = `https://www.zigbee2mqtt.io/images/devices/${this.sanitizeZ2MDeviceName(device.definition.model)}.jpg`;
             // eslint-disable-next-line no-control-regex
@@ -26,55 +26,58 @@ class ImageController {
         }
     }
 
+    getZ2mDeviceImageModelPNG(device) {
+        if (device && device.definition && device.definition.model) {
+            const icoString = `https://www.zigbee2mqtt.io/images/devices/${this.sanitizeZ2MDeviceName(device.definition.model)}.png`;
+            // eslint-disable-next-line no-control-regex
+            return icoString.replace(/\u0000/g, '');
+        }
+    }
+
+
     getSlsDeviceImage(device) {
         if (device && device.model_id) {
-            const icoString = `https://slsys.github.io/Gateway/devices/png/${this.sanitizeModelIDForImageUrl(device.model_id)}.png`;
+            const icoString = `https://www.zigbee2mqtt.io/images/devices/${this.sanitizeModelIDForImageUrl(device.model_id)}.png`;
             // eslint-disable-next-line no-control-regex
             return icoString.replace(/\u0000/g, '');
         }
     }
 
     async getDeviceIcon(device) {
-        if (this.adapter.config.useDeviceIcons == false) {
-            return '';
-        }
+        if (!this.adapter.config.useDeviceIcons) return '';
 
-        const imageSize = this.adapter.config.deviceIconsSize;
+        const imageSize         = this.adapter.config.deviceIconsSize;
 
-        const z2mIconFileName = `${this.sanitizeZ2MDeviceName(device.definition.model)}.jpg`;
+        const z2mIconFileNameJPG = `${this.sanitizeZ2MDeviceName(device.definition.model)}.jpg`;
+        const z2mIconFileNamePNG = `${this.sanitizeZ2MDeviceName(device.definition.model)}.png`;
         const slsIconFileName = `${this.sanitizeModelIDForImageUrl(device.model_id)}.png`;
 
-        let icon;
-        let iconFileName;
-        // Check whether an image has already been downloaded from Z2M.
-        if (await this.adapter.fileExistsAsync(this.adapter.namespace, z2mIconFileName)) {
-            iconFileName = z2mIconFileName;
-        }
-        // Check whether an image has already been downloaded from SLSys.
-        else if (await this.adapter.fileExistsAsync(this.adapter.namespace, slsIconFileName)) {
-            iconFileName = slsIconFileName;
-        }
-        // If not donwload image
-        else {
-            let iconUrl = this.getSlsDeviceImage(device);
-
-            this.adapter.log.info(`Download image for device model: ${device.definition.model}`);
+        let iconFileName = await this.getExistingIconFileName(z2mIconFileNameJPG, z2mIconFileNamePNG, slsIconFileName);
 
-	    try {
-            	await this.downloadIcon(this.adapter, iconUrl, this.adapter.namespace);
-	    } catch (err) {
-                iconUrl = this.getZ2mDeviceImage(device);
-                await this.downloadIcon(this.adapter, iconUrl, this.adapter.namespace);
-	    }
+        if (!iconFileName) {
+            const iconUrls = [
+                this.getZ2mDeviceImageModelJPG(device),
+                this.getZ2mDeviceImageModelPNG(device),
+                this.getSlsDeviceImage(device)
+            ];
 
-            iconFileName = this.getFileNameWithExtension(iconUrl);
+            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}`);
+                }
+            }
         }
 
-        if ((await this.adapter.fileExistsAsync(this.adapter.namespace, iconFileName)) == false) {
+        if (!iconFileName) {
             this.adapter.log.warn(`No image for device model: ${device.definition.model} found!`);
             return '';
         }
 
+        let icon;
         try {
             // Load image from the Meta-Store
             icon = await this.adapter.readFileAsync(this.adapter.namespace, iconFileName);
@@ -122,6 +125,16 @@ class ImageController {
             adapter.log.warn(ex);
         }
     }
+    async getExistingIconFileName(z2mIconFileNameJPG, z2mIconFileNamePNG, slsIconFileName) {
+        if (await this.adapter.fileExistsAsync(this.adapter.namespace, z2mIconFileNameJPG)) {
+            return z2mIconFileNameJPG;
+        } else if (await this.adapter.fileExistsAsync(this.adapter.namespace, z2mIconFileNamePNG)) {
+            return z2mIconFileNamePNG;
+        } else if (await this.adapter.fileExistsAsync(this.adapter.namespace, slsIconFileName)) {
+            return slsIconFileName;
+        }
+        return null;
+    }
 }
 module.exports = {
     ImageController,

package/lib/websocketController.js

@@ -19,7 +19,7 @@ class WebsocketController {
                 wsURL += `?token=${this.adapter.config.wsToken}`;
             }
 
-            (wsClient = new WebSocket(wsURL)), { rejectUnauthorized: false };
+            wsClient = new WebSocket(wsURL, { rejectUnauthorized: false });
 
             wsClient.on('open', () => {
                 // Send ping to server

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee2mqtt",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "description": "Zigbee2MQTT adapter for ioBroker",
   "author": {
     "name": "Dennis Rathjen and Arthur Rupp",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.2.3",
-    "@iobroker/dm-utils": "^0.6.9",
+    "@iobroker/dm-utils": "^0.6.11",
     "aedes": "^0.51.3",
     "aedes-persistence-nedb": "^2.0.3",
     "mqtt": "^5.10.3",
@@ -40,11 +40,11 @@
     "@alcalzone/release-script-plugin-license": "^3.7.0",
     "@alcalzone/release-script-plugin-manual-review": "^3.7.0",
     "@iobroker/adapter-dev": "^1.3.0",
-    "@iobroker/testing": "^4.1.3",
+    "@iobroker/testing": "^5.0.0",
     "@tsconfig/node14": "^14.1.2",
     "@types/chai": "^4.3.5",
     "@types/chai-as-promised": "^8.0.1",
-    "@types/mocha": "^10.0.9",
+    "@types/mocha": "^10.0.10",
     "@types/node": "^22.10.3",
     "@types/node-schedule": "^2.1.7",
     "@types/proxyquire": "^1.3.31",
@@ -52,7 +52,7 @@
     "@types/sinon-chai": "^3.2.12",
     "chai": "^4.4.1",
     "chai-as-promised": "^8.0.1",
-    "eslint": "^9.16.0",
+    "eslint": "^9.17.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
     "mocha": "^11.0.1",