iobroker.zigbee2mqtt 3.0.9 → 3.0.13

package/lib/utils.js

@@ -1,5 +1,7 @@
 /**
  * Converts a bulb level of range [0...254] to an adapter level of range [0...100]
+ *
+ * @param bulbLevel
  */
 function bulbLevelToAdapterLevel(bulbLevel) {
     // Convert from bulb levels [0...254] to adapter levels [0...100]:
@@ -19,14 +21,16 @@ function bulbLevelToAdapterLevel(bulbLevel) {
     if (bulbLevel >= 2) {
         // Perform linear mapping of range [2...254] to [1...100]
         return Math.round(((bulbLevel - 2) * 99) / 252) + 1;
-    } else {
+    } 
         // The bulb is considered off. Even a bulb level of "1" is considered as off.
         return 0;
-    } // else
+     // else
 }
 
 /**
  * Converts an adapter level of range [0...100] to a bulb level of range [0...254]
+ *
+ * @param adapterLevel
  */
 function adapterLevelToBulbLevel(adapterLevel) {
     // Convert from adapter levels [0...100] to bulb levels [0...254].
@@ -35,13 +39,17 @@ function adapterLevelToBulbLevel(adapterLevel) {
     if (adapterLevel) {
         // Perform linear mapping of range [1...100] to [2...254]
         return Math.round(((adapterLevel - 1) * 252) / 99) + 2;
-    } else {
+    } 
         // Switch the bulb off. Some bulbs need "0" (IKEA), others "1" (HUE), and according to the
         // ZigBee docs "1" is the "minimum possible level"... we choose "0" here which seems to work.
         return 0;
-    } // else
+     // else
 }
 
+/**
+ *
+ * @param ba
+ */
 function bytesArrayToWordArray(ba) {
     const wa = [];
     for (let i = 0; i < ba.length; i++) {
@@ -52,6 +60,10 @@ function bytesArrayToWordArray(ba) {
 
 // If the value is greater than 1000, kelvin is assumed.
 // If smaller, it is assumed to be mired.
+/**
+ *
+ * @param t
+ */
 function toMired(t) {
     let miredValue = t;
     if (t > 1000) {
@@ -60,12 +72,19 @@ function toMired(t) {
     return miredValue;
 }
 
+/**
+ *
+ * @param t
+ */
 function miredKelvinConversion(t) {
     return Math.round(1000000 / t);
 }
 
 /**
  * Converts a decimal number to a hex string with zero-padding
+ *
+ * @param decimal
+ * @param padding
  */
 function decimalToHex(decimal, padding) {
     let hex = Number(decimal).toString(16);
@@ -78,32 +97,60 @@ function decimalToHex(decimal, padding) {
     return hex;
 }
 
+/**
+ *
+ * @param adapterDevId
+ */
 function getZbId(adapterDevId) {
     const idx = adapterDevId.indexOf('group');
-    if (idx > 0) return adapterDevId.substr(idx + 6);
-    return '0x' + adapterDevId.split('.')[2];
+    if (idx > 0) {
+return adapterDevId.substr(idx + 6);
+}
+    return `0x${  adapterDevId.split('.')[2]}`;
 }
 
+/**
+ *
+ * @param adapter
+ * @param id
+ */
 function getAdId(adapter, id) {
-    return adapter.namespace + '.' + id.split('.')[2]; // iobroker device id
+    return `${adapter.namespace  }.${  id.split('.')[2]}`; // iobroker device id
 }
 
+/**
+ *
+ * @param array
+ */
 function clearArray(array) {
     while (array.length > 0) {
         array.pop();
     }
 }
 
+/**
+ *
+ * @param source
+ * @param target
+ */
 function moveArray(source, target) {
     while (source.length > 0) {
         target.push(source.shift());
     }
 }
 
+/**
+ *
+ * @param item
+ */
 function isObject(item) {
     return typeof item === 'object' && !Array.isArray(item) && item !== null;
 }
 
+/**
+ *
+ * @param item
+ */
 function isJson(item) {
     let value = typeof item !== 'string' ? JSON.stringify(item) : item;
     try {

package/lib/websocketController.js

@@ -6,11 +6,21 @@ let ping;
 let pingTimeout;
 let autoRestartTimeout;
 
+/**
+ *
+ */
 class WebsocketController {
+    /**
+     *
+     * @param adapter
+     */
     constructor(adapter) {
         this.adapter = adapter;
     }
 
+    /**
+     *
+     */
     initWsClient() {
         try {
             let wsURL = `${this.adapter.config.wsScheme}://${this.adapter.config.wsServerIP}:${this.adapter.config.wsServerPort}/api`;
@@ -53,6 +63,10 @@ class WebsocketController {
         }
     }
 
+    /**
+     *
+     * @param message
+     */
     send(message) {
         if (wsClient.readyState !== WebSocket.OPEN) {
             this.adapter.log.warn('Cannot set State, no websocket connection to Zigbee2MQTT!');
@@ -61,6 +75,9 @@ class WebsocketController {
         wsClient.send(message);
     }
 
+    /**
+     *
+     */
     sendPingToServer() {
         //this.logDebug('Send ping to server');
         wsClient.ping();
@@ -69,6 +86,9 @@ class WebsocketController {
         }, wsHeartbeatIntervall);
     }
 
+    /**
+     *
+     */
     wsHeartbeat() {
         clearTimeout(pingTimeout);
         pingTimeout = setTimeout(() => {
@@ -77,6 +97,9 @@ class WebsocketController {
         }, wsHeartbeatIntervall + 3000);
     }
 
+    /**
+     *
+     */
     async autoRestart() {
         this.adapter.log.warn(`Start try again in ${restartTimeout / 1000} seconds...`);
         autoRestartTimeout = setTimeout(() => {
@@ -84,12 +107,18 @@ class WebsocketController {
         }, restartTimeout);
     }
 
+    /**
+     *
+     */
     closeConnection() {
         if (wsClient && wsClient.readyState !== WebSocket.CLOSED) {
             wsClient.close();
         }
     }
 
+    /**
+     *
+     */
     async allTimerClear() {
         clearTimeout(pingTimeout);
         clearTimeout(ping);

package/lib/z2mController.js

@@ -1,4 +1,14 @@
+/**
+ *
+ */
 class Z2mController {
+    /**
+     *
+     * @param adapter
+     * @param deviceCache
+     * @param groupCache
+     * @param logCustomizations
+     */
     constructor(adapter, deviceCache, groupCache, logCustomizations) {
         this.adapter = adapter;
         this.groupCache = groupCache;
@@ -6,6 +16,11 @@ class Z2mController {
         this.logCustomizations = logCustomizations;
     }
 
+    /**
+     *
+     * @param id
+     * @param state
+     */
     async createZ2MMessage(id, state) {
         const splitedID = id.split('.');
         if (splitedID.length < 4) {
@@ -114,6 +129,10 @@ class Z2mController {
         return controlObj;
     }
 
+    /**
+     *
+     * @param messageObj
+     */
     async proxyZ2MLogs(messageObj) {
         const logMessage = messageObj.payload.message;
         if (this.logCustomizations.logfilter.some((x) => logMessage.includes(x))) {

package/main.js

@@ -68,8 +68,7 @@ class Zigbee2mqtt extends core.Adapter {
         }
 
         const logfilterState = await this.getStateAsync('info.logfilter');
-        if (logfilterState && logfilterState.val) {
-            // @ts-ignore
+        if (logfilterState && logfilterState.val) {            
             logCustomizations.logfilter = String(logfilterState.val)
                 .split(';')
                 .filter((x) => x); // filter removes empty strings here
@@ -111,9 +110,8 @@ class Zigbee2mqtt extends core.Adapter {
                     `mqtt://${this.config.externalMqttServerIP}:${this.config.externalMqttServerPort}`,
                     mqttClientOptions
                 );
-            }
+            } else {
             // Internal MQTT-Server
-            else {
                 mqttServerController = new MqttServerController(this);
                 await mqttServerController.createMQTTServer();
                 await this.delay(1500);
@@ -137,9 +135,8 @@ class Zigbee2mqtt extends core.Adapter {
                 const newMessage = `{"payload":${payload.toString() == '' ? '"null"' : payload.toString()},"topic":"${topic.slice(topic.search('/') + 1)}"}`;
                 this.messageParse(newMessage);
             });
-        }
+        }  else if (this.config.connectionType == 'ws') {
         // Websocket
-        else if (this.config.connectionType == 'ws') {
             if (this.config.wsServerIP == '') {
                 this.log.warn('Please configure the Websoket connection!');
                 return;
@@ -316,9 +313,8 @@ class Zigbee2mqtt extends core.Adapter {
             } catch (e) {
                 this.log.error(e);
             }
-        }
+        } else if (this.config.connectionType == 'ws') {
         // Websocket
-        else if (this.config.connectionType == 'ws') {
             try {
                 if (websocketController) {
                     websocketController.closeConnection();
@@ -352,6 +348,8 @@ class Zigbee2mqtt extends core.Adapter {
             this.log.error(e);
         }
 
+        this.setState('info.connection', false, true);
+
         callback();
     }
 
@@ -382,8 +380,8 @@ class Zigbee2mqtt extends core.Adapter {
 if (require.main !== module) {
     // Export the constructor in compact mode
     /**
-	 * @param {Partial<core.AdapterOptions>} [options={}]
-	 */
+     * @param {Partial<core.AdapterOptions>} [options]
+     */
     module.exports = (options) => new Zigbee2mqtt(options);
 } else {
     // otherwise start the instance directly

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee2mqtt",
-  "version": "3.0.9",
+  "version": "3.0.13",
   "description": "Zigbee2MQTT adapter for ioBroker",
   "author": {
     "name": "Dennis Rathjen and Arthur Rupp",
@@ -24,43 +24,28 @@
     "node": ">= 20"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^3.2.3",
+    "@iobroker/adapter-core": "^3.3.2",
     "@iobroker/dm-utils": "^1.0.10",
     "aedes": "^0.51.3",
     "aedes-persistence-nedb": "^2.0.3",
-    "mqtt": "^5.10.4",
+    "mqtt": "^5.14.1",
     "net": "^1.0.2",
     "node-schedule": "^2.1.1",
-    "sharp": "^0.33.5",
-    "ws": "^8.18.2"
+    "sharp": "^0.34.5",
+    "ws": "^8.18.3"
   },
   "devDependencies": {
-    "@alcalzone/release-script": "^3.8.0",
-    "@alcalzone/release-script-plugin-iobroker": "^3.7.0",
-    "@alcalzone/release-script-plugin-license": "^3.7.0",
-    "@alcalzone/release-script-plugin-manual-review": "^3.7.0",
-    "@iobroker/adapter-dev": "^1.4.0",
-    "@iobroker/testing": "^5.0.4",
-    "@tsconfig/node14": "^14.1.3",
-    "@types/chai": "^5.2.2",
-    "@types/chai-as-promised": "^8.0.2",
-    "@types/mocha": "^10.0.10",
-    "@types/node": "^22.15.29",
-    "@types/node-schedule": "^2.1.7",
-    "@types/proxyquire": "^1.3.31",
-    "@types/sinon": "^17.0.3",
-    "@types/sinon-chai": "^4.0.0",
-    "chai": "^5.2.0",
-    "chai-as-promised": "^8.0.1",
-    "eslint": "^9.25.1",
-    "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-prettier": "^5.2.3",
-    "mocha": "^11.0.1",
-    "prettier": "^3.5.3",
-    "proxyquire": "^2.1.3",
-    "sinon": "^19.0.2",
-    "sinon-chai": "^4.0.0",
-    "typescript": "~5.8.2"
+    "@alcalzone/release-script": "^5.0.0",
+    "@alcalzone/release-script-plugin-iobroker": "^4.0.0",
+    "@alcalzone/release-script-plugin-license": "^4.0.0",
+    "@alcalzone/release-script-plugin-manual-review": "^4.0.0",
+    "@iobroker/adapter-dev": "^1.5.0",
+    "@iobroker/testing": "^5.2.2",
+    "@iobroker/eslint-config": "^2.1.0",
+    "@tsconfig/node14": "^14.1.8",
+    "@types/node": "^25.0.3",
+    "@types/node-schedule": "^2.1.8",
+    "typescript": "~5.9.2"
   },
   "main": "main.js",
   "files": [