diff --git a/lib/extension/configure.ts b/lib/extension/configure.ts index 167efa0d..6af5a694 100644 --- a/lib/extension/configure.ts +++ b/lib/extension/configure.ts @@ -118,7 +118,7 @@ export default class Configure extends Extension { logger.info(`Configuring '${device.name}'`); try { - await device.definition.configure(device.zh, this.zigbee.firstCoordinatorEndpoint()); + await device.definition.configure(device.zh, this.zigbee.firstCoordinatorEndpoint(), device.definition); logger.info(`Successfully configured '${device.name}'`); device.zh.meta.configured = zhc.getConfigureKey(device.definition); device.zh.save(); diff --git a/package-lock.json b/package-lock.json index 3b622527..539d3aa6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "winston-transport": "^4.7.0", "ws": "^8.16.0", "zigbee-herdsman": "0.42.1", - "zigbee-herdsman-converters": "19.19.0", + "zigbee-herdsman-converters": "19.19.1", "zigbee2mqtt-frontend": "0.6.162" }, "bin": { @@ -9802,9 +9802,9 @@ } }, "node_modules/zigbee-herdsman-converters": { - "version": "19.19.0", - "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-19.19.0.tgz", - "integrity": "sha512-cwIwB+W2TW28SEafCgGzXGFhDsobYb/9gvMMZ7lYODJO7gZfYT67xUlFghKIzrbY6ejcV6b8nCJQ75IVNeaMPg==", + "version": "19.19.1", + "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-19.19.1.tgz", + "integrity": "sha512-w9iVzH6/l7Mnz/Ow/OJmjK+xLu/pdTp/97WAiIBVy5j3Wx0aVN/BnLiLvE+kaBP1GBVxsFLfKogRzhBOPWMoLQ==", "dependencies": { "axios": "^1.6.8", "buffer-crc32": "^1.0.0", diff --git a/package.json b/package.json index 50c8b900..0456a71b 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "winston-transport": "^4.7.0", "ws": "^8.16.0", "zigbee-herdsman": "0.42.1", - "zigbee-herdsman-converters": "19.19.0", + "zigbee-herdsman-converters": "19.19.1", "zigbee2mqtt-frontend": "0.6.162" }, "devDependencies": { diff --git a/test/bind.test.js b/test/bind.test.js index ad82741d..28046fa7 100644 --- a/test/bind.test.js +++ b/test/bind.test.js @@ -157,7 +157,7 @@ describe('Bind', () => { expect(target.configureReporting).toHaveBeenCalledWith("genOnOff",[{"attribute": "onOff", "maximumReportInterval": 0xFFFF, "minimumReportInterval": 0, "reportableChange": 0}]); expect(target.configureReporting).toHaveBeenCalledWith("genLevelCtrl",[{"attribute": "currentLevel", "maximumReportInterval": 0xFFFF, "minimumReportInterval": 5, "reportableChange": 1}]); expect(target.configureReporting).toHaveBeenCalledWith("lightingColorCtrl",[{"attribute":"colorTemperature","minimumReportInterval":5,"maximumReportInterval":0xFFFF,"reportableChange":1},{"attribute":"currentX","minimumReportInterval":5,"maximumReportInterval":0xFFFF,"reportableChange":1},{"attribute":"currentY","minimumReportInterval":5,"maximumReportInterval":0xFFFF,"reportableChange":1}]); - expect(zigbeeHerdsman.devices.bulb_color.meta.configured).toBe(1889700129); + expect(zigbeeHerdsman.devices.bulb_color.meta.configured).toBe(332242049); expect(MQTT.publish).toHaveBeenCalledWith( 'zigbee2mqtt/bridge/response/device/unbind', stringify({"data":{"from":"remote","to":"bulb_color","clusters":["genScenes","genOnOff","genLevelCtrl"],"failed":[]},"status":"ok"}), diff --git a/test/configure.test.js b/test/configure.test.js index ed896e2b..55bd1a67 100644 --- a/test/configure.test.js +++ b/test/configure.test.js @@ -24,7 +24,7 @@ describe('Configure', () => { const endpoint2 = device.getEndpoint(2); expect(endpoint2.write).toHaveBeenCalledTimes(1); expect(endpoint2.write).toHaveBeenCalledWith("genBasic", {"49": {"type": 25, "value": 11}}, {"disableDefaultResponse": true, "manufacturerCode": 4107}); - expect(device.meta.configured).toBe(1889700129); + expect(device.meta.configured).toBe(332242049); } const expectBulbConfigured = () => { diff --git a/test/logger.test.js b/test/logger.test.js index e7eae16b..eddc64d5 100644 --- a/test/logger.test.js +++ b/test/logger.test.js @@ -98,7 +98,6 @@ describe('Logger', () => { it('Logger should be console and file by default', () => { const logger = require('../lib/util/logger').default; const pipes = logger.winston._readableState.pipes; - console.log(pipes); expect(pipes.length).toBe(2); expect(pipes[0].constructor.name).toBe('Console'); expect(pipes[0].silent).toBe(false);