zigbee-herdsman-converters 14.0.388 → 14.0.389

package/converters/fromZigbee.js

@@ -4362,6 +4362,14 @@ const converters = {
         convert: (model, msg, publis, options, meta) => {
             // Don't use in production!
             // Used in: https://www.zigbee2mqtt.io/how_tos/how_to_support_new_tuya_devices.html
+            const getType = (datatype) => {
+                const entry = Object.entries(tuya.dataTypes).find(([typeName, typeId]) => typeId === datatype);
+                return (entry ? entry[0] : 'unknown');
+            };
+            const getAllDpIds = (dp) => {
+                const entries = Object.entries(tuya.dataPoints).filter(([dpName, dpId]) => dpId === dp);
+                return entries.map(([dpName, dpId]) => dpName);
+            };
             const getHex = (value) => {
                 let hex = value.toString(16);
                 if (hex.length < 2) {
@@ -4372,6 +4380,11 @@ const converters = {
             const now = Date.now().toString();
             let dataStr = '';
             for (const [i, dpValue] of msg.data.dpValues.entries()) {
+                const value = tuya.getDataValue(dpValue);
+                meta.logger.info(`zigbee-herdsman-converters:tuya_data_point_dump: Received DP #${
+                    dpValue.dp} from ${meta.device.ieeeAddr} with raw data '${JSON.stringify(dpValue)}': type='${msg.type}', datatype='${
+                    getType(dpValue.datatype)}', value='${value}', known DP# usage: ${JSON.stringify(getAllDpIds(dpValue.dp))}`);
+
                 dataStr +=
                     now + ' ' +
                     meta.device.ieeeAddr + ' ' +

package/lib/ota/common.js

@@ -385,9 +385,18 @@ async function updateToLatest(device, logger, onProgress, getNewImage, getImageM
 
                 endpoint.commandResponse('genOta', 'upgradeEndResponse', payload).then(
                     () => {
-                        logger.debug(`Update succeeded`);
+                        logger.debug(`Update succeeded, waiting for device announce`);
                         onProgress(100, null);
-                        resolve();
+
+                        let timer = null;
+                        const cb = () => {
+                            logger.debug('Got device announce or timed out, call resolve');
+                            clearInterval(timer);
+                            device.removeListener('deviceAnnounce', cb);
+                            resolve();
+                        };
+                        timer = setTimeout(cb, 120 * 1000); // timeout after 2 minutes
+                        device.once('deviceAnnounce', cb);
                     },
                     (e) => {
                         const message = `Upgrade end reponse failed (${e.message})`;

package/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "14.0.388",
+  "version": "14.0.389",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee-herdsman-converters",
-  "version": "14.0.388",
+  "version": "14.0.389",
   "description": "Collection of device converters to be used with zigbee-herdsman",
   "main": "index.js",
   "files": [