From 7ec25c2b0ef13f8f3d44e23ec8068e04b8e40c5f Mon Sep 17 00:00:00 2001 From: Pierpaolo Follia Date: Fri, 16 Aug 2024 16:47:32 +0200 Subject: [PATCH] Update herdsmann (#284) * Update herdsmann to x.15 * Update herdsman-converters to 15.132.0 * Update herdsman to 0.26.1 * Update herdsman-converters to v16.0.0 * Small Fixes * Bump version * Fix tests * Updated config.yml * jest junit * review cicd config --- .circleci/config.yml | 19 ++- package.json | 7 +- src/__tests__/test.db | 6 +- .../ui/components/devices/device-bindings.tsx | 8 +- src/zigbee/zig-bee-client.ts | 2 +- src/zigbee/zigBee-controller.ts | 2 +- yarn.lock | 140 +++++++++--------- 7 files changed, 98 insertions(+), 86 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 844b9b24..9e5606e7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,17 +1,20 @@ version: 2.1 orbs: - node: circleci/node@1.1.6 + node: circleci/node@5.0.2 jobs: build-and-test: - executor: - name: node/default + executor: node/default steps: - checkout - - node/with-cache: - steps: - - run: yarn install - - run: yarn test + - node/install-packages: + pkg-manager: yarn + - run: + command: yarn build + name: Build app + - run: + command: yarn test + name: Run tests workflows: build-and-test: jobs: - - build-and-test \ No newline at end of file + - build-and-test diff --git a/package.json b/package.json index ed0f4b09..a6f31ac9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "homebridge-zigbee-nt", - "version": "2.6.0", + "version": "2.6.1", "description": "ZigBee New Technology Platform plugin for HomeBridge", "main": "dist/index.js", "targets": { @@ -75,8 +75,8 @@ "uri-js": "4.4.1", "winston": "3.3.3", "ws": "^7.5.0", - "zigbee-herdsman": "0.14.117", - "zigbee-herdsman-converters": "14.0.694" + "zigbee-herdsman": "0.55.5", + "zigbee-herdsman-converters": "16.0.0" }, "devDependencies": { "@emotion/eslint-plugin": "^11.2.0", @@ -108,6 +108,7 @@ "http-proxy-middleware": "^1.0.6", "husky": "^7.0.4", "jest": "^27.4.4", + "jest-junit": "^16.0.0", "nock": "^12.0.2", "node-forge": "^1.0.0", "parcel": "2.6.2", diff --git a/src/__tests__/test.db b/src/__tests__/test.db index 2773ef80..ba54e07f 100644 --- a/src/__tests__/test.db +++ b/src/__tests__/test.db @@ -1,5 +1,5 @@ -{"id":1,"type":"EndDevice","ieeeAddr":"0x00158d00047b5957","nwkAddr":56475,"manufId":4151,"manufName":"LUMI","powerSource":"Battery","modelId":"lumi.weather","epList":[1],"endpoints":{"1":{"profId":260,"epId":1,"devId":770,"inClusterList":[0,3,65535,1026,1027,1029],"outClusterList":[0,4,65535],"clusters":{"genBasic":{"attributes":{"65281":{"1":2995,"4":424,"5":5,"6":[0,1],"10":44475,"100":2984,"101":7225,"102":101438},"manufacturerName":"LUMI","powerSource":3,"zclVersion":1,"stackVersion":2,"modelId":"lumi.weather","appVersion":5,"dateCode":"20191205","swBuildId":"3000-0001"}},"msTemperatureMeasurement":{"attributes":{"measuredValue":2916}},"msRelativeHumidity":{"attributes":{"measuredValue":7635}},"msPressureMeasurement":{"attributes":{"16":10145,"20":-1,"measuredValue":1014}}},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":5,"stackVersion":2,"dateCode":"20191205","swBuildId":"3000-0001","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1594221551831,"defaultSendRequestWhen":"immediate"} -{"id":2,"type":"EndDevice","ieeeAddr":"0x14b457fffec8d738","nwkAddr":21286,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Battery","modelId":"TRADFRI on/off switch","epList":[1],"endpoints":{"1":{"profId":260,"epId":1,"devId":2080,"inClusterList":[0,1,3,9,32,4096,64636],"outClusterList":[3,4,6,8,25,258,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI on/off switch","manufacturerName":"IKEA of Sweden","powerSource":3,"zclVersion":3,"appVersion":34,"stackVersion":98,"hwVersion":1,"dateCode":"20190410","swBuildId":"2.2.008"}}},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":34,"stackVersion":98,"hwVersion":1,"dateCode":"20190410","swBuildId":"2.2.008","zclVersion":3,"interviewCompleted":true,"meta":{},"lastSeen":1593802671178,"defaultSendRequestWhen":"immediate"} +{"id":1,"type":"EndDevice","ieeeAddr":"0x00158d00047b5957","nwkAddr":56475,"manufId":4151,"manufName":"LUMI","powerSource":"Battery","modelId":"lumi.weather","epList":[1],"endpoints":{"1":{"profId":260,"epId":1,"devId":770,"inClusterList":[0,3,65535,1026,1027,1029],"outClusterList":[0,4,65535],"clusters":{"genBasic":{"attributes":{"65281":{"1":2995,"4":424,"5":5,"6":[0,1],"10":44475,"100":2984,"101":7225,"102":101438},"manufacturerName":"LUMI","powerSource":3,"zclVersion":1,"stackVersion":2,"modelId":"lumi.weather","appVersion":5,"dateCode":"20191205","swBuildId":"3000-0001"}},"msTemperatureMeasurement":{"attributes":{"measuredValue":2916}},"msRelativeHumidity":{"attributes":{"measuredValue":7635}},"msPressureMeasurement":{"attributes":{"16":10145,"20":-1,"measuredValue":1014}}},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":5,"stackVersion":2,"dateCode":"20191205","swBuildId":"3000-0001","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1594221551831} +{"id":2,"type":"EndDevice","ieeeAddr":"0x14b457fffec8d738","nwkAddr":21286,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Battery","modelId":"TRADFRI on/off switch","epList":[1],"endpoints":{"1":{"profId":260,"epId":1,"devId":2080,"inClusterList":[0,1,3,9,32,4096,64636],"outClusterList":[3,4,6,8,25,258,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI on/off switch","manufacturerName":"IKEA of Sweden","powerSource":3,"zclVersion":3,"appVersion":34,"stackVersion":98,"hwVersion":1,"dateCode":"20190410","swBuildId":"2.2.008"}}},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":34,"stackVersion":98,"hwVersion":1,"dateCode":"20190410","swBuildId":"2.2.008","zclVersion":3,"interviewCompleted":true,"meta":{},"lastSeen":1593802671178} {"id":3,"type":"Router","ieeeAddr":"0x00124b001f79d7f0","nwkAddr":44526,"manufId":0,"manufName":"GLEDOPTO","powerSource":"Mains (single phase)","modelId":"GL-C-009","epList":[11,13],"endpoints":{"11":{"profId":49246,"epId":11,"devId":256,"inClusterList":[0,3,4,5,6,8,768],"outClusterList":[],"clusters":{"genBasic":{"attributes":{"modelId":"GL-C-009","manufacturerName":"GLEDOPTO","powerSource":1,"zclVersion":1,"appVersion":1,"stackVersion":2,"hwVersion":1,"dateCode":"20131206","swBuildId":"1.0.8"}}},"binds":[],"configuredReportings":[],"meta":{}},"13":{"profId":49246,"epId":13,"devId":256,"inClusterList":[4096],"outClusterList":[4096],"clusters":{},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":1,"stackVersion":2,"hwVersion":1,"dateCode":"20131206","swBuildId":"1.0.8","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1593706063667} {"id":4,"type":"Router","ieeeAddr":"0x0017880106ef252d","nwkAddr":57101,"manufId":4107,"manufName":"Philips","powerSource":"Mains (single phase)","modelId":"LCT015","epList":[11,242],"endpoints":{"11":{"profId":49246,"epId":11,"devId":528,"inClusterList":[0,3,4,5,6,8,768,4096,64513],"outClusterList":[25],"clusters":{"genBasic":{"attributes":{"modelId":"LCT015","manufacturerName":"Philips","powerSource":1,"zclVersion":1,"appVersion":2,"stackVersion":1,"hwVersion":2,"dateCode":"20170908","swBuildId":"1.29.0_r21169"}},"genLevelCtrl":{"attributes":{"currentLevel":254}},"lightingColorCtrl":{"attributes":{"colorTemperature":467,"currentX":33655,"currentY":24190}},"genOnOff":{"attributes":{"onOff":1}}},"binds":[],"configuredReportings":[],"meta":{}},"242":{"profId":41440,"epId":242,"devId":97,"inClusterList":[33],"outClusterList":[33],"clusters":{},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":2,"stackVersion":1,"hwVersion":2,"dateCode":"20170908","swBuildId":"1.29.0_r21169","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1610475042638} {"id":5,"type":"Router","ieeeAddr":"0x0017880108206ff6","nwkAddr":12051,"manufId":4107,"manufName":"Philips","powerSource":"Mains (single phase)","modelId":"LWA001","epList":[11,242],"endpoints":{"11":{"profId":260,"epId":11,"devId":257,"inClusterList":[0,3,4,5,6,8,4096,64514],"outClusterList":[25],"clusters":{"genBasic":{"attributes":{"modelId":"LWA001","manufacturerName":"Philips","powerSource":1,"zclVersion":2,"appVersion":2,"stackVersion":1,"hwVersion":1,"dateCode":"20200124","swBuildId":"1.65.9_hB3217DF4"}},"genLevelCtrl":{"attributes":{"currentLevel":254}},"genOnOff":{"attributes":{"onOff":0}}},"binds":[],"configuredReportings":[],"meta":{}},"242":{"profId":41440,"epId":242,"devId":97,"inClusterList":[],"outClusterList":[33],"clusters":{},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":2,"stackVersion":1,"hwVersion":1,"dateCode":"20200124","swBuildId":"1.65.9_hB3217DF4","zclVersion":2,"interviewCompleted":true,"meta":{},"lastSeen":1610401986901} @@ -7,4 +7,4 @@ {"id":7,"type":"Group","groupID":901,"members":[],"meta":{}} {"id":8,"type":"Router","ieeeAddr":"0x84fd27fffe6fab53","nwkAddr":34504,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI Signal Repeater","epList":[11,13],"endpoints":{"11":{"profId":49246,"epId":11,"devId":256,"inClusterList":[0,3,4,5,6,8,768],"outClusterList":[],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI Signal Repeater","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":1,"stackVersion":2,"hwVersion":1,"dateCode":"20131206","swBuildId":"1.0.8"}}},"binds":[],"configuredReportings":[],"meta":{}},"13":{"profId":49246,"epId":13,"devId":256,"inClusterList":[4096],"outClusterList":[4096],"clusters":{},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":1,"stackVersion":2,"hwVersion":1,"dateCode":"20131206","swBuildId":"1.0.8","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1593706063667} {"id":9,"type":"Router","ieeeAddr":"0x14b457fffe4f77ca","nwkAddr":6060,"manufId":4476,"manufName":"IKEA of Sweden","powerSource":"Mains (single phase)","modelId":"TRADFRI bulb E27 CWS opal 600lm","epList":[1],"endpoints":{"1":{"profId":49246,"epId":1,"devId":512,"inClusterList":[0,3,4,5,6,8,768,2821,4096],"outClusterList":[5,25,32,4096],"clusters":{"genBasic":{"attributes":{"modelId":"TRADFRI bulb E27 CWS opal 600lm","manufacturerName":"IKEA of Sweden","powerSource":1,"zclVersion":1,"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20180410","swBuildId":"1.3.009"}},"lightingColorCtrl":{"attributes":{"colorCapabilities":8,"currentX":20103,"currentY":20743}},"genOnOff":{"attributes":{"onOff":0}},"genLevelCtrl":{"attributes":{"currentLevel":1}}},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":17,"stackVersion":87,"hwVersion":1,"dateCode":"20180410","swBuildId":"1.3.009","zclVersion":1,"interviewCompleted":true,"meta":{},"lastSeen":1631010389559} -{"id":10,"type":"EndDevice","ieeeAddr":"0x00124b0026b753c7","nwkAddr":49595,"manufId":4742,"manufName":"SONOFF","powerSource":"Mains (single phase)","modelId":"ZBMINI-L","epList":[11,242],"endpoints":{"11":{"profId":260,"epId":11,"devId":257,"inClusterList":[0,3,4,5,6,8,4096,64514],"outClusterList":[25],"clusters":{"genBasic":{"attributes":{"modelId":"LWA001","manufacturerName":"Philips","powerSource":1,"zclVersion":2,"appVersion":2,"stackVersion":1,"hwVersion":1,"dateCode":"20200124","swBuildId":"1.65.9_hB3217DF4"}},"genLevelCtrl":{"attributes":{"currentLevel":254}},"genOnOff":{"attributes":{"onOff":0}}},"binds":[],"configuredReportings":[],"meta":{}},"242":{"profId":41440,"epId":242,"devId":97,"inClusterList":[],"outClusterList":[33],"clusters":{},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":2,"stackVersion":1,"hwVersion":1,"dateCode":"20200124","swBuildId":"1.65.9_hB3217DF4","zclVersion":2,"interviewCompleted":true,"meta":{},"lastSeen":1610401986901,"defaultSendRequestWhen":"immediate"} \ No newline at end of file +{"id":10,"type":"EndDevice","ieeeAddr":"0x00124b0026b753c7","nwkAddr":49595,"manufId":4742,"manufName":"SONOFF","powerSource":"Mains (single phase)","modelId":"ZBMINI-L","epList":[11,242],"endpoints":{"11":{"profId":260,"epId":11,"devId":257,"inClusterList":[0,3,4,5,6,8,4096,64514],"outClusterList":[25],"clusters":{"genBasic":{"attributes":{"modelId":"LWA001","manufacturerName":"Philips","powerSource":1,"zclVersion":2,"appVersion":2,"stackVersion":1,"hwVersion":1,"dateCode":"20200124","swBuildId":"1.65.9_hB3217DF4"}},"genLevelCtrl":{"attributes":{"currentLevel":254}},"genOnOff":{"attributes":{"onOff":0}}},"binds":[],"configuredReportings":[],"meta":{}},"242":{"profId":41440,"epId":242,"devId":97,"inClusterList":[],"outClusterList":[33],"clusters":{},"binds":[],"configuredReportings":[],"meta":{}}},"appVersion":2,"stackVersion":1,"hwVersion":1,"dateCode":"20200124","swBuildId":"1.65.9_hB3217DF4","zclVersion":2,"interviewCompleted":true,"meta":{},"lastSeen":1610401986901} \ No newline at end of file diff --git a/src/web/ui/components/devices/device-bindings.tsx b/src/web/ui/components/devices/device-bindings.tsx index 8861868e..465760b5 100644 --- a/src/web/ui/components/devices/device-bindings.tsx +++ b/src/web/ui/components/devices/device-bindings.tsx @@ -9,7 +9,7 @@ import { renderSpinner } from '../common'; import { CoordinatorResponse, CoordinatorService } from '../../actions/coordinator'; import { COORDINATOR_QUERY_KEY } from '../../coordinator'; import { GroupResponse, GroupsServices } from '../../actions/groups'; -import { getCluster } from 'zigbee-herdsman/dist/zcl/utils'; +import { getCluster } from 'zigbee-herdsman/dist/zspec/zcl/utils'; interface Props { device: DeviceModel; @@ -41,7 +41,7 @@ function DestDeviceSelect(props: DeviceSelectProps) { const [value, setValue] = React.useState(props.selected) return ( - setValue(event.target.value)}> + setValue(event.target.value)}> {props.allDevices.map(d => { return () @@ -61,7 +61,7 @@ function DestGroupSelect(props: GroupSelectProps) { const [value, setValue] = React.useState(props.selected) return ( - setValue(parseInt(event.target.value))}> + setValue(parseInt(event.target.value))}> {props.allGroups.map(g => { return () @@ -155,4 +155,4 @@ export function DeviceBindings(props: Props) { )} ) -} \ No newline at end of file +} diff --git a/src/zigbee/zig-bee-client.ts b/src/zigbee/zig-bee-client.ts index 7a144bc8..c7ae2764 100644 --- a/src/zigbee/zig-bee-client.ts +++ b/src/zigbee/zig-bee-client.ts @@ -515,7 +515,7 @@ export class ZigBeeClient { hasOTA(device: Device): boolean { const zigBeeEntity = this.zigBee.resolveEntity(device); - return !!zigBeeEntity?.definition.ota; + return !!zigBeeEntity?.definition?.ota; } private async bindOrUnbind( diff --git a/src/zigbee/zigBee-controller.ts b/src/zigbee/zigBee-controller.ts index 1921c515..de35d351 100644 --- a/src/zigbee/zigBee-controller.ts +++ b/src/zigbee/zigBee-controller.ts @@ -81,7 +81,7 @@ export class ZigBeeController { }, databasePath: config.databasePath, databaseBackupPath: `${config.databasePath}.${Date.now()}`, - acceptJoiningDeviceHandler: (ieeeAddr) => this.acceptJoiningDeviceHandler(ieeeAddr), + acceptJoiningDeviceHandler: (ieeeAddr: string) => this.acceptJoiningDeviceHandler(ieeeAddr), backupPath: null, adapter: { disableLED: false }, network: { diff --git a/yarn.lock b/yarn.lock index 5e6719c1..92523ce4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1788,7 +1788,7 @@ "@serialport/bindings-interface" "^1.2.1" debug "^4.3.3" -"@serialport/bindings-cpp@12.0.1": +"@serialport/bindings-cpp@12.0.1", "@serialport/bindings-cpp@^12.0.1": version "12.0.1" resolved "https://registry.yarnpkg.com/@serialport/bindings-cpp/-/bindings-cpp-12.0.1.tgz#b7588a8b3e124e7679622ce980a7d8528e9f36a3" integrity sha512-r2XOwY2dDvbW7dKqSPIk2gzsr6M6Qpe9+/Ngs94fNaNlcTRCV02PfaoDmRgcubpNVVcLATlxSxPTIDw12dbKOg== @@ -1799,17 +1799,6 @@ node-addon-api "7.0.0" node-gyp-build "4.6.0" -"@serialport/bindings-cpp@^11.0.1": - version "11.0.3" - resolved "https://registry.yarnpkg.com/@serialport/bindings-cpp/-/bindings-cpp-11.0.3.tgz#ab4d4826ef657e326b6c99d6b8a113d834378a93" - integrity sha512-xgNDJ7pHHZCJMoDsEH+D8q5CV+V3RGN4/jLEG9SQ7q6kh+o03axV0l/upPHZ0HW4tTXpGgqPIGbXOTrD4RGQQA== - dependencies: - "@serialport/bindings-interface" "1.2.2" - "@serialport/parser-readline" "11.0.0" - debug "4.3.4" - node-addon-api "6.1.0" - node-gyp-build "4.6.0" - "@serialport/bindings-interface@1.2.2", "@serialport/bindings-interface@^1.2.1": version "1.2.2" resolved "https://registry.yarnpkg.com/@serialport/bindings-interface/-/bindings-interface-1.2.2.tgz#c4ae9c1c85e26b02293f62f37435478d90baa460" @@ -1830,16 +1819,11 @@ resolved "https://registry.yarnpkg.com/@serialport/parser-delimiter/-/parser-delimiter-11.0.0.tgz#e830c6bb49723d4446131277dc3243b502d09388" integrity sha512-aZLJhlRTjSmEwllLG7S4J8s8ctRAS0cbvCpO87smLvl3e4BgzbVgF6Z6zaJd3Aji2uSiYgfedCdNc4L6W+1E2g== -"@serialport/parser-delimiter@12.0.0": +"@serialport/parser-delimiter@12.0.0", "@serialport/parser-delimiter@^12.0.0": version "12.0.0" resolved "https://registry.yarnpkg.com/@serialport/parser-delimiter/-/parser-delimiter-12.0.0.tgz#43d3687f982829cc9b48ee0b21f2de80d0f19778" integrity sha512-gu26tVt5lQoybhorLTPsH2j2LnX3AOP2x/34+DUSTNaUTzu2fBXw+isVjQJpUBFWu6aeQRZw5bJol5X9Gxjblw== -"@serialport/parser-delimiter@^11.0.0": - version "11.0.1" - resolved "https://registry.yarnpkg.com/@serialport/parser-delimiter/-/parser-delimiter-11.0.1.tgz#c0bcc24d8060c6b352cbe6003ebe95671ad32221" - integrity sha512-NAsYa3OFt2xEnj/+0BRkQP2qkRNbXBPEq6uFJEdNdzcTSF+BTRXkoIRrWBq3N6koovPqW6lnbxc/iJYe5AX/2Q== - "@serialport/parser-inter-byte-timeout@12.0.0": version "12.0.0" resolved "https://registry.yarnpkg.com/@serialport/parser-inter-byte-timeout/-/parser-inter-byte-timeout-12.0.0.tgz#1436f36fac92c950d290744e8ce56b2273a61d08" @@ -1884,7 +1868,7 @@ resolved "https://registry.yarnpkg.com/@serialport/parser-spacepacket/-/parser-spacepacket-12.0.0.tgz#347e34b0221f29eb252ebd341a0acfff920ad814" integrity sha512-dozONxhPC/78pntuxpz/NOtVps8qIc/UZzdc/LuPvVsqCoJXiRxOg6ZtCP/W58iibJDKPZPAWPGYeZt9DJxI+Q== -"@serialport/stream@12.0.0": +"@serialport/stream@12.0.0", "@serialport/stream@^12.0.0": version "12.0.0" resolved "https://registry.yarnpkg.com/@serialport/stream/-/stream-12.0.0.tgz#047f97f780d92ddfc04303cb625e0f7e5a01a2bf" integrity sha512-9On64rhzuqKdOQyiYLYv2lQOh3TZU/D3+IWCR5gk0alPel2nwpp4YwDEGiUBfrQZEdQ6xww0PWkzqth4wqwX3Q== @@ -1892,14 +1876,6 @@ "@serialport/bindings-interface" "1.2.2" debug "4.3.4" -"@serialport/stream@^11.0.0": - version "11.0.1" - resolved "https://registry.yarnpkg.com/@serialport/stream/-/stream-11.0.1.tgz#ed40c66d517cfebf7185cd9c37ba0a08e76f88b2" - integrity sha512-6pjyKRg8MQuvhGfg36+PF7K5eGNQcEswCSiAg1UPilqqFS8X1QnaiSCn5UFp/hCN+pAtlFjkOi0ztvtmSI7n4g== - dependencies: - "@serialport/bindings-interface" "1.2.2" - debug "4.3.4" - "@sinonjs/commons@^1.7.0": version "1.8.3" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" @@ -2391,6 +2367,13 @@ agent-base@6, agent-base@^6.0.2: dependencies: debug "4" +agent-base@^7.0.2: + version "7.1.1" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317" + integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA== + dependencies: + debug "^4.3.4" + agentkeepalive@^4.1.3: version "4.1.4" resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.1.4.tgz#d928028a4862cb11718e55227872e842a44c945b" @@ -2671,10 +2654,10 @@ axios@0.21.1: dependencies: follow-redirects "^1.10.0" -axios@^1.2.1: - version "1.7.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621" - integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw== +axios@^1.6.2: + version "1.7.3" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.3.tgz#a1125f2faf702bc8e8f2104ec3a76fab40257d85" + integrity sha512-Ar7ND9pU99eJ9GpoGQKhKf58GpUOgnzuaB7ueNQ5BMi0p+LZ5oaEnfF999fAArcTIBwXTCHAmGcHOZJaWPq9Nw== dependencies: follow-redirects "^1.15.6" form-data "^4.0.0" @@ -2873,7 +2856,7 @@ bonjour-hap@~3.6.3: multicast-dns "^7.2.3" multicast-dns-service-types "^1.1.0" -bonjour-service@^1.1.1: +bonjour-service@^1.1.1, bonjour-service@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.2.1.tgz#eb41b3085183df3321da1264719fbada12478d02" integrity sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw== @@ -3570,10 +3553,10 @@ dayjs@1.10.5: resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.5.tgz#5600df4548fc2453b3f163ebb2abbe965ccfb986" integrity sha512-BUFis41ikLz+65iH6LHQCDm4YPMj5r1YFLdupPIyM4SGcXMmtiLQ7U37i+hGS8urIuqe7I/ou3IS1jVc4nbN4g== -debounce@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5" - integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug== +debounce@^2.0.0, debounce@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/debounce/-/debounce-2.1.0.tgz#eab25eaf254b848fcfccffbde75bdaa44842caa3" + integrity sha512-OkL3+0pPWCqoBc/nhO9u6TIQNTK44fnBnzuVtJAbp13Naxw9R6u21x+8tVTka87AhDZ3htqZ2pSSsZl9fqL2Wg== debug@2.6.9, debug@^2.2.0: version "2.6.9" @@ -5190,12 +5173,12 @@ https-proxy-agent@^5.0.0: agent-base "6" debug "4" -https-proxy-agent@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" - integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== +https-proxy-agent@^7.0.2: + version "7.0.5" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz#9e8b5013873299e11fab6fd548405da2d6c602b2" + integrity sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw== dependencies: - agent-base "6" + agent-base "^7.0.2" debug "4" human-signals@^1.1.1: @@ -5915,6 +5898,16 @@ jest-jasmine2@^27.4.4: pretty-format "^27.4.2" throat "^6.0.1" +jest-junit@^16.0.0: + version "16.0.0" + resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-16.0.0.tgz#d838e8c561cf9fdd7eb54f63020777eee4136785" + integrity sha512-A94mmw6NfJab4Fg/BlvVOUXzXgF0XIH6EmTgJ5NDPp4xoKq0Kr7sErb+4Xs9nZvu58pJojz5RFGpqnZYJTrRfQ== + dependencies: + mkdirp "^1.0.4" + strip-ansi "^6.0.1" + uuid "^8.3.2" + xml "^1.0.1" + jest-leak-detector@^27.4.2: version "27.4.2" resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.4.2.tgz#7fc3120893a7a911c553f3f2bdff9faa4454abbb" @@ -7094,11 +7087,6 @@ nock@^12.0.2: lodash "^4.17.13" propagate "^2.0.0" -node-addon-api@6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76" - integrity sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA== - node-addon-api@7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.0.0.tgz#8136add2f510997b3b94814f4af1cce0b0e3962e" @@ -9164,7 +9152,7 @@ table@^6.0.9: string-width "^4.2.3" strip-ansi "^6.0.1" -tar-stream@^3.0.0: +tar-stream@^3.1.6: version "3.1.7" resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-3.1.7.tgz#24b3fb5eabada19fe7338ed6d26e5f7c482e792b" integrity sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ== @@ -9602,7 +9590,7 @@ uuid@^3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== -uuid@^8.0.0: +uuid@^8.0.0, uuid@^8.3.2: version "8.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== @@ -9881,6 +9869,11 @@ xml2js@^0.4.17: sax ">=0.6.0" xmlbuilder "~11.0.0" +xml@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5" + integrity sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw== + xmlbuilder@~11.0.0: version "11.0.1" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" @@ -10026,27 +10019,42 @@ yocto-queue@^0.1.0: resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== -zigbee-herdsman-converters@14.0.694: - version "14.0.694" - resolved "https://registry.yarnpkg.com/zigbee-herdsman-converters/-/zigbee-herdsman-converters-14.0.694.tgz#df0f6c91df7fcf8f01110d94f5d9a1ccbb69df39" - integrity sha512-gjeOUrtMaeMPOq8524LB61gyGXeuPOcg6Q3fqapAS3/8uSWOJEQpDPDEamXKcq1W0WykUuu0BKlUxMH/ZiSqxQ== +zigbee-herdsman-converters@16.0.0: + version "16.0.0" + resolved "https://registry.yarnpkg.com/zigbee-herdsman-converters/-/zigbee-herdsman-converters-16.0.0.tgz#b7e38508f75e65d960997edac1cca629d3aeef8a" + integrity sha512-V/zSd6W6kaZ/SC2cqONJzOKluQkdkZAgltVga01+OrkkHw1RxyTaJyK7f+ZSV5OTWrTmsO8N1ll+Cj26ziyp8Q== dependencies: - axios "^1.2.1" + axios "^1.6.2" buffer-crc32 "^0.2.13" - https-proxy-agent "^5.0.1" - tar-stream "^3.0.0" - zigbee-herdsman "^0.14.81" - -zigbee-herdsman@0.14.117, zigbee-herdsman@^0.14.81: - version "0.14.117" - resolved "https://registry.yarnpkg.com/zigbee-herdsman/-/zigbee-herdsman-0.14.117.tgz#2d5df15ef6ebe6009d9505efa48eca532dfcb622" - integrity sha512-xydcDKu/hbgxiuOFR138+jVDAEWE4X1YgbYRRz/IGPA4xknXCBB6Wmh1vr8VEqmLkSE9o+0Vqt45aG3Hof9lew== - dependencies: - "@serialport/bindings-cpp" "^11.0.1" - "@serialport/parser-delimiter" "^11.0.0" - "@serialport/stream" "^11.0.0" + https-proxy-agent "^7.0.2" + tar-stream "^3.1.6" + zigbee-herdsman "^0.25.1" + +zigbee-herdsman@0.55.5: + version "0.55.5" + resolved "https://registry.yarnpkg.com/zigbee-herdsman/-/zigbee-herdsman-0.55.5.tgz#343b22a4c947d47164b2aa766e8c00cf6c7b955d" + integrity sha512-8UG2UhPgSOd5vGO2cpFobMR3ruumqFcJkT1Dhl7KrYLSVayVQTffJN+z3mVbIPokuQcepbZrMerCOEr1WrHF9w== + dependencies: + "@serialport/bindings-cpp" "^12.0.1" + "@serialport/parser-delimiter" "^12.0.0" + "@serialport/stream" "^12.0.0" + bonjour-service "^1.2.1" + debounce "^2.1.0" + fast-deep-equal "^3.1.3" + mixin-deep "^2.0.1" + mz "^2.7.0" + slip "^1.0.2" + +zigbee-herdsman@^0.25.1: + version "0.25.3" + resolved "https://registry.yarnpkg.com/zigbee-herdsman/-/zigbee-herdsman-0.25.3.tgz#08be49c000fafca01e0635fe0a05c352920696cd" + integrity sha512-FGi/XjqAbWP38URhoXZlsXr8IJ/a1RlHOmETyESjoI3umEPaMYNTN2EEfc6Btq4k05xHJd06KAPG0Yyn7OtiUw== + dependencies: + "@serialport/bindings-cpp" "^12.0.1" + "@serialport/parser-delimiter" "^12.0.0" + "@serialport/stream" "^12.0.0" bonjour-service "^1.1.1" - debounce "^1.2.1" + debounce "^2.0.0" debug "^4.3.4" fast-deep-equal "^3.1.3" mixin-deep "^2.0.1"