zigbee-herdsman-converters 14.0.378 → 14.0.379

package/devices/philips.js

@@ -29,6 +29,15 @@ const hueExtend = {
 };
 
 module.exports = [
+    {
+        zigbeeModel: ['LCX004'],
+        model: '929002994901',
+        vendor: 'Philips',
+        description: 'Hue gradient lightstrip',
+        meta: {turnsOffAtBrightness1: true},
+        extend: hueExtend.light_onoff_brightness_colortemp_color({colorTempRange: [153, 500]}),
+        ota: ota.zigbeeOTA,
+    },
     {
         zigbeeModel: ['929003047501'],
         model: '929003047501',

package/devices/tuya.js

@@ -162,7 +162,8 @@ module.exports = [
             {modelID: 'TS0505B', manufacturerName: '_TZ3210_0rn9qhnu'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3210_bicjqpg4'},
             {modelID: 'TS0505B', manufacturerName: '_TZ3000_cmaky9gq'},
-            {modelID: 'TS0505B', manufacturerName: '_TZ3000_tza2vjxx'}],
+            {modelID: 'TS0505B', manufacturerName: '_TZ3000_tza2vjxx'},
+            {modelID: 'TS0505B', manufacturerName: '_TZ3210_bfwvfyx1'}],
         model: 'TS0505B',
         vendor: 'TuYa',
         description: 'Zigbee RGB+CCT light',
@@ -177,6 +178,7 @@ module.exports = [
     {
         fingerprint: [{modelID: 'TS0503B', manufacturerName: '_TZ3000_i8l0nqdu'},
             {modelID: 'TS0503B', manufacturerName: '_TZ3210_a5fxguxr'},
+            {modelID: 'TS0503B', manufacturerName: '_TZ3210_778drfdt'},
             {modelID: 'TS0503B', manufacturerName: '_TZ3000_g5xawfcq'}],
         model: 'TS0503B',
         vendor: 'TuYa',
@@ -309,7 +311,8 @@ module.exports = [
         ],
     },
     {
-        fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3000_oiymh3qu'}],
+        fingerprint: [{modelID: 'TS011F', manufacturerName: '_TZ3000_oiymh3qu'},
+            {modelID: 'TS011F', manufacturerName: '_TZ3000_o1jzcxou'}],
         model: 'TS011F_socket_module',
         vendor: 'TuYa',
         description: 'Socket module',

package/lib/ota/zigbeeOTA.js

@@ -4,8 +4,10 @@ const common = require('./common');
 const axios = common.getAxios();
 const fs = require('fs');
 const URI = require('uri-js');
+const path = require('path');
 
-let overrideFileName = null;
+let overrideIndexFileName = null;
+let dataDir = null;
 
 /**
  * Helper functions
@@ -22,7 +24,7 @@ function isValidUrl(url) {
     return parsed.scheme === 'http' || parsed.scheme === 'https';
 }
 
-async function getFile(urlOrName) {
+async function getIndexFile(urlOrName) {
     if (isValidUrl(urlOrName)) {
         return (await axios.get(urlOrName)).data;
     }
@@ -30,14 +32,33 @@ async function getFile(urlOrName) {
     return JSON.parse(fs.readFileSync(urlOrName));
 }
 
+async function getFirmwareFile(image, logger) {
+    let urlOrName = image.url;
+
+    // First try to download firmware file with the URL provided
+    if (isValidUrl(urlOrName)) {
+        logger.debug(`ZigbeeOTA: downloading firmware image from ${urlOrName}`);
+        return await axios.get(urlOrName, {responseType: 'arraybuffer'});
+    }
+
+    // If the file name is not a full path, then treat it as a relative to the data directory
+    if (!path.isAbsolute(urlOrName) && dataDir) {
+        urlOrName = path.join(dataDir, urlOrName);
+    }
+
+    logger.debug(`ZigbeeOTA: getting local firmware file ${urlOrName}`);
+    return {data: fs.readFileSync(urlOrName)};
+}
+
+
 async function getIndex(logger) {
     const index = (await axios.get(url)).data;
 
     logger.debug(`ZigbeeOTA: downloaded main index`);
 
-    if (overrideFileName) {
-        logger.debug(`ZigbeeOTA: Loading override index ${overrideFileName}`);
-        const localIndex = await getFile(overrideFileName);
+    if (overrideIndexFileName) {
+        logger.debug(`ZigbeeOTA: Loading override index ${overrideIndexFileName}`);
+        const localIndex = await getIndexFile(overrideIndexFileName);
 
         // Resulting index will have overriden items first
         return localIndex.concat(index);
@@ -58,6 +79,7 @@ async function getImageMeta(current, logger, device) {
     // For this case additional identification through the modelId is done.
     // In the case of Tuya and Moes, additional identification is carried out through the manufacturerName.
     const image = images.find((i) => i.imageType === imageType && i.manufacturerCode === manufacturerCode &&
+        (!i.minFileVersion || current.fileVersion >= i.minFileVersion) || (!i.maxFileVersion || current.fileVersion <= i.maxFileVersion) ||
         (!i.modelId || i.modelId === modelId) && (!i.manufacturerName || i.manufacturerName.includes(manufacturerName)));
 
     assert(image !== undefined, `No image available for imageType '${imageType}'`);
@@ -78,7 +100,7 @@ async function isUpdateAvailable(device, logger, requestPayload=null) {
 }
 
 async function updateToLatest(device, logger, onProgress) {
-    return common.updateToLatest(device, logger, onProgress, common.getNewImage, getImageMeta);
+    return common.updateToLatest(device, logger, onProgress, common.getNewImage, getImageMeta, getFirmwareFile);
 }
 
 module.exports = {
@@ -86,6 +108,9 @@ module.exports = {
     isUpdateAvailable,
     updateToLatest,
     useIndexOverride: (indexFileName) => {
-        overrideFileName = indexFileName;
+        overrideIndexFileName = indexFileName;
+    },
+    setDataDir: (dir) => {
+        dataDir = dir;
     },
 };

package/npm-shrinkwrap.json

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

package/package.json

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