@willieee802/zigbee-herdsman 0.49.4 → 0.50.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.github/dependabot.yml +0 -3
- package/.github/workflows/ci.yml +1 -2
- package/.github/workflows/release-please.yml +1 -1
- package/.github/workflows/typedoc.yaml +3 -3
- package/.release-please-manifest.json +1 -1
- package/CHANGELOG.md +143 -0
- package/biome.json +1 -1
- package/dist/adapter/adapter.d.ts +14 -1
- package/dist/adapter/adapter.d.ts.map +1 -1
- package/dist/adapter/adapter.js +17 -0
- package/dist/adapter/adapter.js.map +1 -1
- package/dist/adapter/adapterDiscovery.d.ts.map +1 -1
- package/dist/adapter/adapterDiscovery.js.map +1 -1
- package/dist/adapter/deconz/adapter/deconzAdapter.d.ts +1 -3
- package/dist/adapter/deconz/adapter/deconzAdapter.d.ts.map +1 -1
- package/dist/adapter/deconz/adapter/deconzAdapter.js +14 -29
- package/dist/adapter/deconz/adapter/deconzAdapter.js.map +1 -1
- package/dist/adapter/deconz/driver/constants.d.ts +1 -1
- package/dist/adapter/deconz/driver/constants.d.ts.map +1 -1
- package/dist/adapter/ember/adapter/emberAdapter.d.ts +1 -1
- package/dist/adapter/ember/adapter/emberAdapter.d.ts.map +1 -1
- package/dist/adapter/ember/adapter/emberAdapter.js +19 -10
- package/dist/adapter/ember/adapter/emberAdapter.js.map +1 -1
- package/dist/adapter/ember/adapter/oneWaitress.d.ts +2 -0
- package/dist/adapter/ember/adapter/oneWaitress.d.ts.map +1 -1
- package/dist/adapter/ember/adapter/oneWaitress.js +13 -5
- package/dist/adapter/ember/adapter/oneWaitress.js.map +1 -1
- package/dist/adapter/ezsp/adapter/ezspAdapter.d.ts +1 -3
- package/dist/adapter/ezsp/adapter/ezspAdapter.d.ts.map +1 -1
- package/dist/adapter/ezsp/adapter/ezspAdapter.js +17 -30
- package/dist/adapter/ezsp/adapter/ezspAdapter.js.map +1 -1
- package/dist/adapter/ezsp/driver/index.d.ts +1 -1
- package/dist/adapter/ezsp/driver/index.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/index.js +1 -1
- package/dist/adapter/ezsp/driver/index.js.map +1 -1
- package/dist/adapter/ezsp/driver/types/index.d.ts +1 -1
- package/dist/adapter/ezsp/driver/types/index.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/types/index.js +3 -3
- package/dist/adapter/ezsp/driver/types/index.js.map +1 -1
- package/dist/adapter/serialPort.d.ts.map +1 -1
- package/dist/adapter/serialPort.js +7 -0
- package/dist/adapter/serialPort.js.map +1 -1
- package/dist/adapter/z-stack/adapter/adapter-backup.js +1 -1
- package/dist/adapter/z-stack/adapter/adapter-backup.js.map +1 -1
- package/dist/adapter/z-stack/adapter/adapter-nv-memory.js +1 -1
- package/dist/adapter/z-stack/adapter/adapter-nv-memory.js.map +1 -1
- package/dist/adapter/z-stack/adapter/manager.d.ts.map +1 -1
- package/dist/adapter/z-stack/adapter/manager.js +12 -2
- package/dist/adapter/z-stack/adapter/manager.js.map +1 -1
- package/dist/adapter/z-stack/adapter/tstype.d.ts.map +1 -1
- package/dist/adapter/z-stack/adapter/zStackAdapter.d.ts +1 -3
- package/dist/adapter/z-stack/adapter/zStackAdapter.d.ts.map +1 -1
- package/dist/adapter/z-stack/adapter/zStackAdapter.js +20 -34
- package/dist/adapter/z-stack/adapter/zStackAdapter.js.map +1 -1
- package/dist/adapter/z-stack/constants/index.d.ts +1 -1
- package/dist/adapter/z-stack/constants/index.d.ts.map +1 -1
- package/dist/adapter/z-stack/constants/index.js +1 -1
- package/dist/adapter/z-stack/constants/index.js.map +1 -1
- package/dist/adapter/z-stack/unpi/constants.d.ts +1 -1
- package/dist/adapter/z-stack/unpi/constants.d.ts.map +1 -1
- package/dist/adapter/z-stack/unpi/constants.js +1 -1
- package/dist/adapter/z-stack/unpi/constants.js.map +1 -1
- package/dist/adapter/zboss/adapter/zbossAdapter.d.ts +7 -8
- package/dist/adapter/zboss/adapter/zbossAdapter.d.ts.map +1 -1
- package/dist/adapter/zboss/adapter/zbossAdapter.js +12 -30
- package/dist/adapter/zboss/adapter/zbossAdapter.js.map +1 -1
- package/dist/adapter/zboss/driver.d.ts.map +1 -1
- package/dist/adapter/zboss/driver.js +8 -1
- package/dist/adapter/zboss/driver.js.map +1 -1
- package/dist/adapter/zboss/uart.d.ts.map +1 -1
- package/dist/adapter/zboss/uart.js +14 -2
- package/dist/adapter/zboss/uart.js.map +1 -1
- package/dist/adapter/zigate/adapter/zigateAdapter.d.ts +1 -3
- package/dist/adapter/zigate/adapter/zigateAdapter.d.ts.map +1 -1
- package/dist/adapter/zigate/adapter/zigateAdapter.js +8 -29
- package/dist/adapter/zigate/adapter/zigateAdapter.js.map +1 -1
- package/dist/adapter/zoh/adapter/zohAdapter.d.ts +1 -3
- package/dist/adapter/zoh/adapter/zohAdapter.d.ts.map +1 -1
- package/dist/adapter/zoh/adapter/zohAdapter.js +18 -33
- package/dist/adapter/zoh/adapter/zohAdapter.js.map +1 -1
- package/dist/controller/controller.d.ts.map +1 -1
- package/dist/controller/controller.js +10 -2
- package/dist/controller/controller.js.map +1 -1
- package/dist/controller/greenPower.d.ts.map +1 -1
- package/dist/controller/greenPower.js +15 -9
- package/dist/controller/greenPower.js.map +1 -1
- package/dist/controller/helpers/ota.d.ts +4 -4
- package/dist/controller/helpers/ota.d.ts.map +1 -1
- package/dist/controller/helpers/ota.js +28 -9
- package/dist/controller/helpers/ota.js.map +1 -1
- package/dist/controller/helpers/zclFrameConverter.d.ts.map +1 -1
- package/dist/controller/helpers/zclFrameConverter.js +17 -16
- package/dist/controller/helpers/zclFrameConverter.js.map +1 -1
- package/dist/controller/model/device.d.ts +14 -3
- package/dist/controller/model/device.d.ts.map +1 -1
- package/dist/controller/model/device.js +155 -68
- package/dist/controller/model/device.js.map +1 -1
- package/dist/controller/model/endpoint.d.ts +7 -3
- package/dist/controller/model/endpoint.d.ts.map +1 -1
- package/dist/controller/model/endpoint.js +34 -21
- package/dist/controller/model/endpoint.js.map +1 -1
- package/dist/controller/model/group.js +4 -4
- package/dist/controller/model/group.js.map +1 -1
- package/dist/controller/touchlink.js +3 -3
- package/dist/controller/touchlink.js.map +1 -1
- package/dist/utils/timeService.js +2 -2
- package/dist/utils/timeService.js.map +1 -1
- package/dist/zspec/zcl/buffaloZcl.d.ts +3 -3
- package/dist/zspec/zcl/buffaloZcl.d.ts.map +1 -1
- package/dist/zspec/zcl/buffaloZcl.js +198 -96
- package/dist/zspec/zcl/buffaloZcl.js.map +1 -1
- package/dist/zspec/zcl/definition/cluster.d.ts +2 -2
- package/dist/zspec/zcl/definition/cluster.d.ts.map +1 -1
- package/dist/zspec/zcl/definition/cluster.js +2699 -2808
- package/dist/zspec/zcl/definition/cluster.js.map +1 -1
- package/dist/zspec/zcl/definition/clusters-types.d.ts +63 -1109
- package/dist/zspec/zcl/definition/clusters-types.d.ts.map +1 -1
- package/dist/zspec/zcl/definition/enums.d.ts +0 -1
- package/dist/zspec/zcl/definition/enums.d.ts.map +1 -1
- package/dist/zspec/zcl/definition/enums.js +0 -1
- package/dist/zspec/zcl/definition/enums.js.map +1 -1
- package/dist/zspec/zcl/definition/foundation.d.ts +306 -7
- package/dist/zspec/zcl/definition/foundation.d.ts.map +1 -1
- package/dist/zspec/zcl/definition/foundation.js +552 -207
- package/dist/zspec/zcl/definition/foundation.js.map +1 -1
- package/dist/zspec/zcl/definition/status.d.ts +21 -10
- package/dist/zspec/zcl/definition/status.d.ts.map +1 -1
- package/dist/zspec/zcl/definition/status.js +11 -0
- package/dist/zspec/zcl/definition/status.js.map +1 -1
- package/dist/zspec/zcl/definition/tstype.d.ts +57 -48
- package/dist/zspec/zcl/definition/tstype.d.ts.map +1 -1
- package/dist/zspec/zcl/utils.d.ts +7 -4
- package/dist/zspec/zcl/utils.d.ts.map +1 -1
- package/dist/zspec/zcl/utils.js +133 -240
- package/dist/zspec/zcl/utils.js.map +1 -1
- package/dist/zspec/zcl/zclFrame.d.ts +4 -4
- package/dist/zspec/zcl/zclFrame.d.ts.map +1 -1
- package/dist/zspec/zcl/zclFrame.js +19 -103
- package/dist/zspec/zcl/zclFrame.js.map +1 -1
- package/dist/zspec/zcl/zclStatusError.d.ts +1 -1
- package/dist/zspec/zcl/zclStatusError.d.ts.map +1 -1
- package/dist/zspec/zcl/zclStatusError.js +2 -2
- package/dist/zspec/zcl/zclStatusError.js.map +1 -1
- package/package.json +1 -1
- package/scripts/clusters-typegen.ts +44 -139
- package/src/adapter/adapter.ts +38 -3
- package/src/adapter/adapterDiscovery.ts +2 -1
- package/src/adapter/deconz/adapter/deconzAdapter.ts +24 -51
- package/src/adapter/deconz/driver/constants.ts +1 -1
- package/src/adapter/ember/adapter/emberAdapter.ts +23 -10
- package/src/adapter/ember/adapter/oneWaitress.ts +16 -6
- package/src/adapter/ezsp/adapter/ezspAdapter.ts +27 -48
- package/src/adapter/ezsp/driver/index.ts +1 -1
- package/src/adapter/ezsp/driver/types/index.ts +99 -99
- package/src/adapter/serialPort.ts +9 -0
- package/src/adapter/z-stack/adapter/adapter-backup.ts +1 -1
- package/src/adapter/z-stack/adapter/adapter-nv-memory.ts +1 -1
- package/src/adapter/z-stack/adapter/manager.ts +16 -2
- package/src/adapter/z-stack/adapter/tstype.ts +1 -0
- package/src/adapter/z-stack/adapter/zStackAdapter.ts +34 -81
- package/src/adapter/z-stack/constants/index.ts +1 -1
- package/src/adapter/z-stack/unpi/constants.ts +1 -1
- package/src/adapter/zboss/adapter/zbossAdapter.ts +23 -54
- package/src/adapter/zboss/driver.ts +8 -1
- package/src/adapter/zboss/uart.ts +14 -1
- package/src/adapter/zigate/adapter/zigateAdapter.ts +17 -48
- package/src/adapter/zoh/adapter/zohAdapter.ts +27 -50
- package/src/controller/controller.ts +12 -2
- package/src/controller/greenPower.ts +16 -9
- package/src/controller/helpers/ota.ts +37 -11
- package/src/controller/helpers/zclFrameConverter.ts +20 -17
- package/src/controller/model/device.ts +192 -79
- package/src/controller/model/endpoint.ts +36 -24
- package/src/controller/model/group.ts +4 -4
- package/src/controller/touchlink.ts +3 -3
- package/src/utils/timeService.ts +2 -2
- package/src/zspec/zcl/buffaloZcl.ts +226 -100
- package/src/zspec/zcl/definition/cluster.ts +2713 -2822
- package/src/zspec/zcl/definition/clusters-types.ts +80 -1135
- package/src/zspec/zcl/definition/enums.ts +0 -1
- package/src/zspec/zcl/definition/foundation.ts +703 -216
- package/src/zspec/zcl/definition/status.ts +22 -11
- package/src/zspec/zcl/definition/tstype.ts +59 -58
- package/src/zspec/zcl/utils.ts +137 -264
- package/src/zspec/zcl/zclFrame.ts +25 -130
- package/src/zspec/zcl/zclStatusError.ts +2 -2
- package/test/adapter/ember/emberAdapter.test.ts +191 -4
- package/test/adapter/ezsp/uart.test.ts +10 -10
- package/test/adapter/z-stack/adapter.test.ts +88 -32
- package/test/adapter/zoh/zohAdapter.test.ts +4 -4
- package/test/controller.test.ts +822 -248
- package/test/device-ota.test.ts +141 -16
- package/test/device.test.ts +731 -0
- package/test/requests.bench.ts +2 -0
- package/test/zcl.test.ts +70 -95
- package/test/zspec/zcl/buffalo.test.ts +251 -11
- package/test/zspec/zcl/foundation.test.ts +990 -0
- package/test/zspec/zcl/frame.test.ts +84 -69
- package/test/zspec/zcl/utils.test.ts +105 -81
- package/tsconfig.json +0 -1
- package/scripts/check-clusters-changes.ts +0 -328
- package/scripts/clusters-changes.log +0 -584
- package/scripts/utils.ts +0 -88
- package/scripts/zap-update-clusters-report.json +0 -303
- package/scripts/zap-update-clusters.ts +0 -1520
- package/scripts/zap-update-types.ts +0 -707
- package/scripts/zap-xml-clusters-overrides-data.ts +0 -52
- package/scripts/zap-xml-clusters-overrides.ts +0 -400
- package/scripts/zap-xml-types.ts +0 -146
package/.github/dependabot.yml
CHANGED
package/.github/workflows/ci.yml
CHANGED
|
@@ -19,11 +19,10 @@ jobs:
|
|
|
19
19
|
permissions:
|
|
20
20
|
id-token: write # for npm publish
|
|
21
21
|
actions: read # for Nerivec/action-ci-bench
|
|
22
|
-
pull-requests: write # for Nerivec/action-ci-bench
|
|
23
22
|
steps:
|
|
24
23
|
- uses: actions/checkout@v6
|
|
25
24
|
|
|
26
|
-
- uses: pnpm/action-setup@
|
|
25
|
+
- uses: pnpm/action-setup@v6
|
|
27
26
|
|
|
28
27
|
- uses: actions/setup-node@v6
|
|
29
28
|
with:
|
|
@@ -13,7 +13,7 @@ jobs:
|
|
|
13
13
|
contents: write
|
|
14
14
|
steps:
|
|
15
15
|
- uses: actions/checkout@v6
|
|
16
|
-
- uses: pnpm/action-setup@
|
|
16
|
+
- uses: pnpm/action-setup@v6
|
|
17
17
|
- uses: actions/setup-node@v6
|
|
18
18
|
with:
|
|
19
19
|
node-version: 24
|
|
@@ -26,7 +26,7 @@ jobs:
|
|
|
26
26
|
- name: Generate docs
|
|
27
27
|
run: typedoc --gitRevision "$(git describe --tag --abbrev=0)" --tsconfig tsconfig.json --excludePrivate --excludeProtected --excludeExternals --entryPointStrategy expand ./src --sourceLinkTemplate "https://github.com/Koenkk/zigbee-herdsman/blob/{gitRevision}/{path}#L{line}" -out typedoc
|
|
28
28
|
|
|
29
|
-
- uses: actions/upload-pages-artifact@
|
|
29
|
+
- uses: actions/upload-pages-artifact@v5
|
|
30
30
|
with:
|
|
31
31
|
name: github-pages
|
|
32
32
|
# typedoc "out" path
|
|
@@ -44,4 +44,4 @@ jobs:
|
|
|
44
44
|
steps:
|
|
45
45
|
- name: Deploy to GitHub Pages
|
|
46
46
|
id: deployment
|
|
47
|
-
uses: actions/deploy-pages@
|
|
47
|
+
uses: actions/deploy-pages@v5
|
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,148 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [10.3.0](https://github.com/Koenkk/zigbee-herdsman/compare/v10.2.0...v10.3.0) (2026-06-03)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### Features
|
|
7
|
+
|
|
8
|
+
* Add ability to abort running OTA ([#1759](https://github.com/Koenkk/zigbee-herdsman/issues/1759)) ([a70e57b](https://github.com/Koenkk/zigbee-herdsman/commit/a70e57b1aab60aa43e0d12a44643bbc5c6bd5694))
|
|
9
|
+
|
|
10
|
+
## [10.2.0](https://github.com/Koenkk/zigbee-herdsman/compare/v10.1.0...v10.2.0) (2026-06-02)
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
### Features
|
|
14
|
+
|
|
15
|
+
* Enable APS layer encryption for Zigbee Direct cluster operations ([#1762](https://github.com/Koenkk/zigbee-herdsman/issues/1762)) ([0ab26c0](https://github.com/Koenkk/zigbee-herdsman/commit/0ab26c06153030f98f49e0fd11b1f8a055b0fcf3))
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
### Bug Fixes
|
|
19
|
+
|
|
20
|
+
* defaultRsp matching for OTA ([#1771](https://github.com/Koenkk/zigbee-herdsman/issues/1771)) ([a4f4492](https://github.com/Koenkk/zigbee-herdsman/commit/a4f44922901ccc71bca802ff39fbb5cf87c897e2))
|
|
21
|
+
* **ignore:** bump @date-fns/tz from 1.4.1 to 1.5.0 in the minor-patch group ([#1764](https://github.com/Koenkk/zigbee-herdsman/issues/1764)) ([b1e1577](https://github.com/Koenkk/zigbee-herdsman/commit/b1e1577a74f4f521e2e89e95c037ec25e003ce6d))
|
|
22
|
+
* **ignore:** bump the minor-patch group with 2 updates ([#1766](https://github.com/Koenkk/zigbee-herdsman/issues/1766)) ([6b0b5c2](https://github.com/Koenkk/zigbee-herdsman/commit/6b0b5c2c384396f6107f7beff14968c58d25f64c))
|
|
23
|
+
* Zboss: keep onPackage active during inReset ([#1763](https://github.com/Koenkk/zigbee-herdsman/issues/1763)) ([fb2b2fe](https://github.com/Koenkk/zigbee-herdsman/commit/fb2b2fe411f7c4c5038244971ba3927d73d9cd85))
|
|
24
|
+
|
|
25
|
+
## [10.1.0](https://github.com/Koenkk/zigbee-herdsman/compare/v10.0.8...v10.1.0) (2026-05-17)
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
### Features
|
|
29
|
+
|
|
30
|
+
* add parsing for more GreenPower frames ([#1732](https://github.com/Koenkk/zigbee-herdsman/issues/1732)) ([3f8e4b4](https://github.com/Koenkk/zigbee-herdsman/commit/3f8e4b40ecf9709dc92a29d839380381125a0c04))
|
|
31
|
+
* add support for Zigbee Direct cluster ([#1761](https://github.com/Koenkk/zigbee-herdsman/issues/1761)) ([89e40f8](https://github.com/Koenkk/zigbee-herdsman/commit/89e40f830941fb40d47b879ee4f86081088557b4))
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
### Bug Fixes
|
|
35
|
+
|
|
36
|
+
* Fix uncaught error in device ZCL event ([#1755](https://github.com/Koenkk/zigbee-herdsman/issues/1755)) ([ffd9a89](https://github.com/Koenkk/zigbee-herdsman/commit/ffd9a896707a535cf7630ae294e8808d69973c6a))
|
|
37
|
+
* ignore default response during OTA blocks sending ([#1756](https://github.com/Koenkk/zigbee-herdsman/issues/1756)) ([2ff4428](https://github.com/Koenkk/zigbee-herdsman/commit/2ff44284975e04269e1060aa050e5384c2be1bec))
|
|
38
|
+
* **ignore:** bump the minor-patch group with 2 updates ([#1757](https://github.com/Koenkk/zigbee-herdsman/issues/1757)) ([594804a](https://github.com/Koenkk/zigbee-herdsman/commit/594804aed19b0a9e8f06fc151f991a61e17180dd))
|
|
39
|
+
|
|
40
|
+
## [10.0.8](https://github.com/Koenkk/zigbee-herdsman/compare/v10.0.7...v10.0.8) (2026-05-08)
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
### Bug Fixes
|
|
44
|
+
|
|
45
|
+
* **ignore:** bump @biomejs/biome from 2.4.11 to 2.4.12 in the minor-patch group ([#1747](https://github.com/Koenkk/zigbee-herdsman/issues/1747)) ([d8a467f](https://github.com/Koenkk/zigbee-herdsman/commit/d8a467fa345633ab4252e3e283abe2e7cfa64140))
|
|
46
|
+
* **ignore:** bump @biomejs/biome from 2.4.13 to 2.4.14 in the minor-patch group ([#1754](https://github.com/Koenkk/zigbee-herdsman/issues/1754)) ([ac05792](https://github.com/Koenkk/zigbee-herdsman/commit/ac057926458c6b199b50596d101825ef2be5d151))
|
|
47
|
+
* **ignore:** bump the minor-patch group with 2 updates ([#1750](https://github.com/Koenkk/zigbee-herdsman/issues/1750)) ([5ad1810](https://github.com/Koenkk/zigbee-herdsman/commit/5ad18102282f0581c35b6909caabf70cbf622134))
|
|
48
|
+
* MoveToLevel min and max ([#1752](https://github.com/Koenkk/zigbee-herdsman/issues/1752)) ([b7bf626](https://github.com/Koenkk/zigbee-herdsman/commit/b7bf6264d3f178fcbf53d02c2906b0fe52e941d8))
|
|
49
|
+
* Preserve genBasic attributes when re-read returns undefined ([#1753](https://github.com/Koenkk/zigbee-herdsman/issues/1753)) ([9ab49a1](https://github.com/Koenkk/zigbee-herdsman/commit/9ab49a1868899cf724c00e8faf077b588c2842d0))
|
|
50
|
+
|
|
51
|
+
## [10.0.7](https://github.com/Koenkk/zigbee-herdsman/compare/v10.0.6...v10.0.7) (2026-04-11)
|
|
52
|
+
|
|
53
|
+
|
|
54
|
+
### Bug Fixes
|
|
55
|
+
|
|
56
|
+
* **ignore:** bump @biomejs/biome from 2.4.10 to 2.4.11 in the minor-patch group ([#1740](https://github.com/Koenkk/zigbee-herdsman/issues/1740)) ([b613178](https://github.com/Koenkk/zigbee-herdsman/commit/b613178187b22d0550d2828dd7c7ca3c6baa4ab0))
|
|
57
|
+
* **ignore:** bump typescript from 5.9.2 to 6.0.2 ([#1739](https://github.com/Koenkk/zigbee-herdsman/issues/1739)) ([6eeaaee](https://github.com/Koenkk/zigbee-herdsman/commit/6eeaaeee313add4a123f8fb3b3d5a53eb7c2577e))
|
|
58
|
+
* Move Legrand and Tuya attributes from ZH to ZHC ([#1734](https://github.com/Koenkk/zigbee-herdsman/issues/1734)) ([9b9fb3b](https://github.com/Koenkk/zigbee-herdsman/commit/9b9fb3b5766d7a9f9dc6f38161208e919e5abd2e))
|
|
59
|
+
* Move Tuya specific attributes in lightingColorCtrl cluster from ZH to ZHC ([#1743](https://github.com/Koenkk/zigbee-herdsman/issues/1743)) ([8506a42](https://github.com/Koenkk/zigbee-herdsman/commit/8506a426587193344481497d886ee5c6f143b6c7))
|
|
60
|
+
|
|
61
|
+
## [10.0.6](https://github.com/Koenkk/zigbee-herdsman/compare/v10.0.5...v10.0.6) (2026-04-07)
|
|
62
|
+
|
|
63
|
+
|
|
64
|
+
### Bug Fixes
|
|
65
|
+
|
|
66
|
+
* `defaultRsp` command ID matching when sending ([#1720](https://github.com/Koenkk/zigbee-herdsman/issues/1720)) ([5ef90a5](https://github.com/Koenkk/zigbee-herdsman/commit/5ef90a5d59c35bdd00583abaa5da926e01405f1b))
|
|
67
|
+
* **ignore:** bump the minor-patch group across 1 directory with 2 updates ([#1735](https://github.com/Koenkk/zigbee-herdsman/issues/1735)) ([016961d](https://github.com/Koenkk/zigbee-herdsman/commit/016961d6882cc63708535ea1815c2367cf3806a3))
|
|
68
|
+
* Move custom attributes (fournoks) and command (plugwise) from ZH to ZHC ([#1726](https://github.com/Koenkk/zigbee-herdsman/issues/1726)) ([913f140](https://github.com/Koenkk/zigbee-herdsman/commit/913f140e76840cc0dabb57521b038ac9aee71c10))
|
|
69
|
+
* Move more custom attributes and commands from ZH to ZHC ([#1728](https://github.com/Koenkk/zigbee-herdsman/issues/1728)) ([4a3d508](https://github.com/Koenkk/zigbee-herdsman/commit/4a3d508e9de844079c664cbc85e90341d873ffc0))
|
|
70
|
+
* Proper `readRsp` & `defaultRsp` spec behavior ([#1716](https://github.com/Koenkk/zigbee-herdsman/issues/1716)) ([d127f9a](https://github.com/Koenkk/zigbee-herdsman/commit/d127f9a8347e071073236fcf56e1127dff94bf53))
|
|
71
|
+
* Set max illuminance measured value to 0xfffe ([#1736](https://github.com/Koenkk/zigbee-herdsman/issues/1736)) ([dbbb976](https://github.com/Koenkk/zigbee-herdsman/commit/dbbb976a0296fc4ea00444afee0abe6dd1f0390c))
|
|
72
|
+
|
|
73
|
+
## [10.0.5](https://github.com/Koenkk/zigbee-herdsman/compare/v10.0.4...v10.0.5) (2026-03-31)
|
|
74
|
+
|
|
75
|
+
|
|
76
|
+
### Bug Fixes
|
|
77
|
+
|
|
78
|
+
* Move "Tradfri" commands used in ZHC to ZHC / ikea.ts ([#1714](https://github.com/Koenkk/zigbee-herdsman/issues/1714)) ([599cd08](https://github.com/Koenkk/zigbee-herdsman/commit/599cd082d8e4470d6e49f59e1a0b84555bb22ec4))
|
|
79
|
+
* Move cluster attribute develcoAlarmOffDelay from ZH to ZHC ([#1725](https://github.com/Koenkk/zigbee-herdsman/issues/1725)) ([b224e13](https://github.com/Koenkk/zigbee-herdsman/commit/b224e134495333df8049691b00e47aeebd37366c))
|
|
80
|
+
* Move Sprut attributes from ZH to ZHC ([#1713](https://github.com/Koenkk/zigbee-herdsman/issues/1713)) ([5a1276e](https://github.com/Koenkk/zigbee-herdsman/commit/5a1276eeb0eb0142ea90da197ae21195e8456170))
|
|
81
|
+
* Move two Stelpro attributes in hvacThermostat from ZH to ZHC ([#1722](https://github.com/Koenkk/zigbee-herdsman/issues/1722)) ([9ad65bf](https://github.com/Koenkk/zigbee-herdsman/commit/9ad65bf5d57781d0e830d81fe0491ac94de7b469))
|
|
82
|
+
* Move Viessmann attributes from ZH to ZHC ([#1724](https://github.com/Koenkk/zigbee-herdsman/issues/1724)) ([3594433](https://github.com/Koenkk/zigbee-herdsman/commit/3594433a174705285bc52e56195340e999fd629b))
|
|
83
|
+
* Remove custom attributes and commands not used in ZHC ([#1723](https://github.com/Koenkk/zigbee-herdsman/issues/1723)) ([8527a0e](https://github.com/Koenkk/zigbee-herdsman/commit/8527a0eb2cfce28afb9cf2b694e77c82c8c7b988))
|
|
84
|
+
* Remove custom attributes/commandsResponses not used in ZHC ([#1715](https://github.com/Koenkk/zigbee-herdsman/issues/1715)) ([124640f](https://github.com/Koenkk/zigbee-herdsman/commit/124640f04379719441359d7a7deabd167aea7cfb))
|
|
85
|
+
|
|
86
|
+
## [10.0.4](https://github.com/Koenkk/zigbee-herdsman/compare/v10.0.3...v10.0.4) (2026-03-22)
|
|
87
|
+
|
|
88
|
+
|
|
89
|
+
### Bug Fixes
|
|
90
|
+
|
|
91
|
+
* Device onZclData optimizations ([#1711](https://github.com/Koenkk/zigbee-herdsman/issues/1711)) ([02cc145](https://github.com/Koenkk/zigbee-herdsman/commit/02cc145c9f192f3306385e3c65f61106c0787b5a))
|
|
92
|
+
* Move manuSpecificTuya2 and 3 from ZH to ZHC ([#1710](https://github.com/Koenkk/zigbee-herdsman/issues/1710)) ([6cada34](https://github.com/Koenkk/zigbee-herdsman/commit/6cada34f54b0e003e25e1a888f9857c4d0994f97))
|
|
93
|
+
|
|
94
|
+
## [10.0.3](https://github.com/Koenkk/zigbee-herdsman/compare/v10.0.2...v10.0.3) (2026-03-19)
|
|
95
|
+
|
|
96
|
+
|
|
97
|
+
### Bug Fixes
|
|
98
|
+
|
|
99
|
+
* better handling for ZCL default response ([#1694](https://github.com/Koenkk/zigbee-herdsman/issues/1694)) ([909bda4](https://github.com/Koenkk/zigbee-herdsman/commit/909bda49e130e257645416004f84bc4f6b2f9a70))
|
|
100
|
+
* **ignore:** better test replacement for 374f0a ([#1707](https://github.com/Koenkk/zigbee-herdsman/issues/1707)) ([527e7a4](https://github.com/Koenkk/zigbee-herdsman/commit/527e7a4a3471b1882cb2b266ce781229e46b3d6c))
|
|
101
|
+
* Move Danfoss custom attributes from ZH to ZHC ([#1709](https://github.com/Koenkk/zigbee-herdsman/issues/1709)) ([0a11cd0](https://github.com/Koenkk/zigbee-herdsman/commit/0a11cd0ca4d50a8e0d24e19c742caf25d21b86d5))
|
|
102
|
+
* Move OwonSeMetering attributes from ZH to ZHC ([#1708](https://github.com/Koenkk/zigbee-herdsman/issues/1708)) ([490a13e](https://github.com/Koenkk/zigbee-herdsman/commit/490a13e6e9d63fe0a54642f675ec4e642ddec86b))
|
|
103
|
+
* optimize ZCL foundation parse/write ([#1699](https://github.com/Koenkk/zigbee-herdsman/issues/1699)) ([0d19a7e](https://github.com/Koenkk/zigbee-herdsman/commit/0d19a7e6a82a3ff5b055e2d3a6770ff2ee9a1fd8))
|
|
104
|
+
* Remove Schneider Electric-specific attributes from ZH cluster definitions that are not utilized in ZHC ([#1703](https://github.com/Koenkk/zigbee-herdsman/issues/1703)) ([374f0ae](https://github.com/Koenkk/zigbee-herdsman/commit/374f0ae470945fd3c0eb6c6d3c307501ca8fd301))
|
|
105
|
+
|
|
106
|
+
## [10.0.2](https://github.com/Koenkk/zigbee-herdsman/compare/v10.0.1...v10.0.2) (2026-03-16)
|
|
107
|
+
|
|
108
|
+
|
|
109
|
+
### Bug Fixes
|
|
110
|
+
|
|
111
|
+
* Move "Develco metering cluster" to ZHC ([#1701](https://github.com/Koenkk/zigbee-herdsman/issues/1701)) ([d182569](https://github.com/Koenkk/zigbee-herdsman/commit/d1825698ee4c748cdeea18addda0b5f4138e159f))
|
|
112
|
+
* Move SchneiderWiser attributes from ZH to ZHC ([#1702](https://github.com/Koenkk/zigbee-herdsman/issues/1702)) ([7262b85](https://github.com/Koenkk/zigbee-herdsman/commit/7262b85671fad81f4ccba51d3a4fa968e722542b))
|
|
113
|
+
* Move SinopeHvacThermostat attributes from ZH to ZHC ([#1704](https://github.com/Koenkk/zigbee-herdsman/issues/1704)) ([ffa0691](https://github.com/Koenkk/zigbee-herdsman/commit/ffa06911e8db236d6c6d57cb8fd1f50ed2003019))
|
|
114
|
+
* Set serialport DTR_CONTROL_DISABLE on Windows ([#1674](https://github.com/Koenkk/zigbee-herdsman/issues/1674)) ([1f8f968](https://github.com/Koenkk/zigbee-herdsman/commit/1f8f968423d7b633588533a5f8f891b1e3ea8844))
|
|
115
|
+
* ZStack: don't require preconfigured key match on Z-Stack 3.x ([#1692](https://github.com/Koenkk/zigbee-herdsman/issues/1692)) ([1738575](https://github.com/Koenkk/zigbee-herdsman/commit/173857523d4a2cfb94692c2f4cc5f24c30bc7bf3))
|
|
116
|
+
|
|
117
|
+
## [10.0.1](https://github.com/Koenkk/zigbee-herdsman/compare/v10.0.0...v10.0.1) (2026-03-13)
|
|
118
|
+
|
|
119
|
+
|
|
120
|
+
### Bug Fixes
|
|
121
|
+
|
|
122
|
+
* **ignore:** bump the minor-patch group with 2 updates ([#1695](https://github.com/Koenkk/zigbee-herdsman/issues/1695)) ([f1160e4](https://github.com/Koenkk/zigbee-herdsman/commit/f1160e4ff340df9b47c2e36747e80c0f7e6fabb1))
|
|
123
|
+
* Move cluster manuSpecificProfalux1 from ZH to ZHC ([#1683](https://github.com/Koenkk/zigbee-herdsman/issues/1683)) ([bf3b1e3](https://github.com/Koenkk/zigbee-herdsman/commit/bf3b1e3f72e00b197741d622c50858b2194277f2))
|
|
124
|
+
* Move cluster manuSpecificSiglisZigfred from ZH to ZHC ([#1688](https://github.com/Koenkk/zigbee-herdsman/issues/1688)) ([7e89d22](https://github.com/Koenkk/zigbee-herdsman/commit/7e89d22f3703798acee01cda40fc965a8ad05db5))
|
|
125
|
+
* Move cluster manuSpecificSmartThingsArrivalSensor from ZH to ZHC ([#1690](https://github.com/Koenkk/zigbee-herdsman/issues/1690)) ([4519f2b](https://github.com/Koenkk/zigbee-herdsman/commit/4519f2b51be7881f600b0756091a6cd4df240c67))
|
|
126
|
+
* Move cluster zosungIRTransmit and cluster zosungIRControl from ZH to ZHC ([#1691](https://github.com/Koenkk/zigbee-herdsman/issues/1691)) ([00ef097](https://github.com/Koenkk/zigbee-herdsman/commit/00ef09785a530bfe8fb2b3388e624af7dd7b2f7b))
|
|
127
|
+
* Move manuSpecificLumi from ZH to ZHC ([#1687](https://github.com/Koenkk/zigbee-herdsman/issues/1687)) ([3b63933](https://github.com/Koenkk/zigbee-herdsman/commit/3b6393318fea7b5247763c0e44bd45ff1c2350c7))
|
|
128
|
+
* Move manuSpecificSinope from ZH to ZHC ([#1686](https://github.com/Koenkk/zigbee-herdsman/issues/1686)) ([8a4ce87](https://github.com/Koenkk/zigbee-herdsman/commit/8a4ce87e4f129be6f7c777ad010605e789473084))
|
|
129
|
+
* Move owonClearMetering from ZH to ZHC ([#1689](https://github.com/Koenkk/zigbee-herdsman/issues/1689)) ([8b918f7](https://github.com/Koenkk/zigbee-herdsman/commit/8b918f7a64e51317aede7581131ece9b8e03ff3f))
|
|
130
|
+
* Remove "schneiderHaElectrical" from ZH, attributes are not used in ZHC ([#1698](https://github.com/Koenkk/zigbee-herdsman/issues/1698)) ([d8aa1ab](https://github.com/Koenkk/zigbee-herdsman/commit/d8aa1ab54091dc9a671c8535f43b0412d1502fa5))
|
|
131
|
+
* Remove "schneiderSeMetering" from ZH, attributes are not used in ZHC ([#1697](https://github.com/Koenkk/zigbee-herdsman/issues/1697)) ([8d99fd2](https://github.com/Koenkk/zigbee-herdsman/commit/8d99fd2c020f679f268f2a9fae1c4bf4631d3eef))
|
|
132
|
+
* Remove Elko specific attributes from ZH (not used in ZHC) ([#1696](https://github.com/Koenkk/zigbee-herdsman/issues/1696)) ([647d0f9](https://github.com/Koenkk/zigbee-herdsman/commit/647d0f969183359f86462e2e89ce5b319b5f5671))
|
|
133
|
+
|
|
134
|
+
## [10.0.0](https://github.com/Koenkk/zigbee-herdsman/compare/v9.0.11...v10.0.0) (2026-03-09)
|
|
135
|
+
|
|
136
|
+
|
|
137
|
+
### ⚠ BREAKING CHANGES
|
|
138
|
+
|
|
139
|
+
* improve performance with ZCL clusters handling ([#1663](https://github.com/Koenkk/zigbee-herdsman/issues/1663))
|
|
140
|
+
|
|
141
|
+
### Bug Fixes
|
|
142
|
+
|
|
143
|
+
* improve performance with ZCL clusters handling ([#1663](https://github.com/Koenkk/zigbee-herdsman/issues/1663)) ([8356e5d](https://github.com/Koenkk/zigbee-herdsman/commit/8356e5d2c5efd9eb75a03e881ceeefeda8c93cb5))
|
|
144
|
+
* Move manuSpecificPhilips and manuSpecificPhilips2 from ZH to ZHC ([#1682](https://github.com/Koenkk/zigbee-herdsman/issues/1682)) ([e6f67ef](https://github.com/Koenkk/zigbee-herdsman/commit/e6f67ef5e5247c80cd6902011e6064b76cf888d9))
|
|
145
|
+
|
|
3
146
|
## [9.0.11](https://github.com/Koenkk/zigbee-herdsman/compare/v9.0.10...v9.0.11) (2026-03-03)
|
|
4
147
|
|
|
5
148
|
|
package/biome.json
CHANGED
|
@@ -7,6 +7,17 @@ import type * as ZdoTypes from "../zspec/zdo/definition/tstypes";
|
|
|
7
7
|
import type * as AdapterEvents from "./events";
|
|
8
8
|
import type * as TsType from "./tstype";
|
|
9
9
|
import { KonnextConfig } from "../controller/model/konnextConfig";
|
|
10
|
+
export interface ZclWaitressPayload extends AdapterEvents.ZclPayload {
|
|
11
|
+
header: NonNullable<AdapterEvents.ZclPayload["header"]>;
|
|
12
|
+
}
|
|
13
|
+
export interface ClusterWaitressMatcher {
|
|
14
|
+
address: number | string | undefined;
|
|
15
|
+
clusterId: number;
|
|
16
|
+
endpoint?: number;
|
|
17
|
+
commandId?: number;
|
|
18
|
+
defaultRspCommandId?: number;
|
|
19
|
+
transactionSequenceNumber?: number;
|
|
20
|
+
}
|
|
10
21
|
interface AdapterEventMap {
|
|
11
22
|
deviceJoined: [payload: AdapterEvents.DeviceJoinedPayload];
|
|
12
23
|
zclPayload: [payload: AdapterEvents.ZclPayload];
|
|
@@ -26,6 +37,8 @@ export declare abstract class Adapter extends events.EventEmitter<AdapterEventMa
|
|
|
26
37
|
* Utility
|
|
27
38
|
*/
|
|
28
39
|
static create(networkOptions: TsType.NetworkOptions, serialPortOptions: TsType.SerialPortOptions, backupPath: string, adapterOptions: TsType.AdapterOptions, konnextConfig: KonnextConfig): Promise<Adapter>;
|
|
40
|
+
static clusterWaitressTimeoutFormatter(matcher: ClusterWaitressMatcher, timeout: number): string;
|
|
41
|
+
static zclWaitressValidator(payload: ZclWaitressPayload, matcher: ClusterWaitressMatcher): boolean;
|
|
29
42
|
abstract start(): Promise<TsType.StartResult>;
|
|
30
43
|
abstract stop(): Promise<void>;
|
|
31
44
|
abstract getCoordinatorIEEE(): Promise<string>;
|
|
@@ -35,7 +48,7 @@ export declare abstract class Adapter extends events.EventEmitter<AdapterEventMa
|
|
|
35
48
|
abstract backup(ieeeAddressesInDatabase: string[]): Promise<Models.Backup>;
|
|
36
49
|
abstract getNetworkParameters(): Promise<TsType.NetworkParameters>;
|
|
37
50
|
abstract addInstallCode(ieeeAddress: string, key: Buffer, hashed: boolean): Promise<void>;
|
|
38
|
-
abstract waitFor(networkAddress: number
|
|
51
|
+
abstract waitFor(networkAddress: number, endpoint: number, frameType: Zcl.FrameType, direction: Zcl.Direction, transactionSequenceNumber: number | undefined, clusterId: number, commandId: number, defaultRspCommandId: number | undefined, timeout: number): {
|
|
39
52
|
promise: Promise<AdapterEvents.ZclPayload>;
|
|
40
53
|
cancel: () => void;
|
|
41
54
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/adapter/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,OAAO,KAAK,KAAK,MAAM,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AACpC,OAAO,KAAK,KAAK,GAAG,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,KAAK,QAAQ,MAAM,iCAAiC,CAAC;AAEjE,OAAO,KAAK,KAAK,aAAa,MAAM,UAAU,CAAC;AAC/C,OAAO,KAAK,KAAK,MAAM,MAAM,UAAU,CAAC;AACxC,OAAO,EAAC,aAAa,EAAC,MAAM,mCAAmC,CAAC;AAEhE,UAAU,eAAe;IACrB,YAAY,EAAE,CAAC,OAAO,EAAE,aAAa,CAAC,mBAAmB,CAAC,CAAC;IAC3D,UAAU,EAAE,CAAC,OAAO,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;IAChD,WAAW,EAAE,CAAC,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAC,kBAAkB,CAAC,CAAC;IAC/E,YAAY,EAAE,EAAE,CAAC;IACjB,WAAW,EAAE,CAAC,OAAO,EAAE,aAAa,CAAC,kBAAkB,CAAC,CAAC;CAC5D;AAED,8BAAsB,OAAQ,SAAQ,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC;IAC/D,qBAAqB,EAAE,OAAO,CAAC;IAC/B,cAAc,EAAE,GAAG,CAAC,gBAAgB,CAAC;IAC5C,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC,cAAc,CAAC;IAChD,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC,cAAc,CAAC;IAChD,SAAS,CAAC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,CAAC;IACtD,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC;IAE7B,SAAS,aACL,cAAc,EAAE,MAAM,CAAC,cAAc,EACrC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,EAC3C,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,CAAC,cAAc;IAWzC;;OAEG;WAEiB,MAAM,CACtB,cAAc,EAAE,MAAM,CAAC,cAAc,EACrC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,EAC3C,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,CAAC,cAAc,EACrC,aAAa,EAAE,aAAa,GAC7B,OAAO,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/adapter/adapter.ts"],"names":[],"mappings":"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"}
|
package/dist/adapter/adapter.js
CHANGED
|
@@ -104,6 +104,23 @@ class Adapter extends node_events_1.default.EventEmitter {
|
|
|
104
104
|
}
|
|
105
105
|
}
|
|
106
106
|
}
|
|
107
|
+
static clusterWaitressTimeoutFormatter(matcher, timeout) {
|
|
108
|
+
return `Timeout after ${timeout}ms [address=${matcher.address} endpoint=${matcher.endpoint} clusterId=${matcher.clusterId} cmdId=${matcher.commandId} tsn=${matcher.transactionSequenceNumber}]`;
|
|
109
|
+
}
|
|
110
|
+
static zclWaitressValidator(payload, matcher) {
|
|
111
|
+
const { header, address, clusterID, endpoint } = payload;
|
|
112
|
+
return (
|
|
113
|
+
// no sender in Touchlink
|
|
114
|
+
(matcher.address === undefined || address === matcher.address) &&
|
|
115
|
+
clusterID === matcher.clusterId &&
|
|
116
|
+
endpoint === matcher.endpoint &&
|
|
117
|
+
(matcher.transactionSequenceNumber === undefined || header.transactionSequenceNumber === matcher.transactionSequenceNumber) &&
|
|
118
|
+
(header.commandIdentifier === matcher.commandId ||
|
|
119
|
+
// defaultRsp
|
|
120
|
+
(header.frameControl.frameType === Zcl.FrameType.GLOBAL &&
|
|
121
|
+
header.commandIdentifier === 0x0b &&
|
|
122
|
+
(matcher.defaultRspCommandId === undefined || payload.data[payload.data.byteLength - 2] === matcher.defaultRspCommandId))));
|
|
123
|
+
}
|
|
107
124
|
}
|
|
108
125
|
exports.Adapter = Adapter;
|
|
109
126
|
exports.default = Adapter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/adapter/adapter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAiC;AAIjC,kDAAoC;AAGpC,yDAAmD;
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/adapter/adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapterDiscovery.d.ts","sourceRoot":"","sources":["../../src/adapter/adapterDiscovery.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"adapterDiscovery.d.ts","sourceRoot":"","sources":["../../src/adapter/adapterDiscovery.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,0BAA0B,CAAC;AAKvD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,GAAG,CAAC;AAE9B,OAAO,KAAK,EAAC,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAC,MAAM,UAAU,CAAC;AA+VrF,iBAAS,mBAAmB,CACxB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,qBAAqB,EAAE,EAChC,SAAS,EAAE,OAAO,EAClB,aAAa,EAAE,OAAO,GACvB,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,qBAAqB,CAAC,GAAG,SAAS,CAqEzF;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,GAAG,KAAK,CAAC,CA8B5G;AAED,wBAAgB,uBAAuB,CACnC,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,OAAO,GACnB,CAAC,sBAAsB,EAAE,WAAW,CAAC,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC,CAAC,GAAG,SAAS,CAwB3F;AAED,wBAAsB,cAAc,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAoCpH;AAaD,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAuCrF;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,iBAAiB,CAcxF;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,eAAe,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CA0CzG;AAED,KAAK,UAAU,GAAG,CAAC,MAAM,CAAC,iBAAiB,GAAG;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,CAAC,EAAE,CAAC;AAE9E;;GAEG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,UAAU,CAAC,CAqE1D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapterDiscovery.js","sourceRoot":"","sources":["../../src/adapter/adapterDiscovery.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"adapterDiscovery.js","sourceRoot":"","sources":["../../src/adapter/adapterDiscovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ export declare class DeconzAdapter extends Adapter {
|
|
|
24
24
|
getCoordinatorVersion(): Promise<CoordinatorVersion>;
|
|
25
25
|
addInstallCode(ieeeAddress: string, key: Buffer, hashed: boolean): Promise<void>;
|
|
26
26
|
reset(_type: "soft" | "hard"): Promise<void>;
|
|
27
|
-
waitFor(networkAddress: number
|
|
27
|
+
waitFor(networkAddress: number, endpoint: number, _frameType: Zcl.FrameType, _direction: Zcl.Direction, transactionSequenceNumber: number | undefined, clusterId: number, commandId: number, defaultRspCommandId: number | undefined, timeout: number): {
|
|
28
28
|
promise: Promise<Events.ZclPayload>;
|
|
29
29
|
cancel: () => void;
|
|
30
30
|
};
|
|
@@ -55,7 +55,5 @@ export declare class DeconzAdapter extends Adapter {
|
|
|
55
55
|
private checkWaitForDataRequestTimeouts;
|
|
56
56
|
private checkReceivedDataPayload;
|
|
57
57
|
private nextTransactionID;
|
|
58
|
-
private waitressTimeoutFormatter;
|
|
59
|
-
private waitressValidator;
|
|
60
58
|
}
|
|
61
59
|
//# sourceMappingURL=deconzAdapter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deconzAdapter.d.ts","sourceRoot":"","sources":["../../../../src/adapter/deconz/adapter/deconzAdapter.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,MAAM,iBAAiB,CAAC;AAK/C,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAC1C,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAC1C,OAAO,KAAK,KAAK,QAAQ,MAAM,uCAAuC,CAAC;AACvE,OAAO,
|
|
1
|
+
{"version":3,"file":"deconzAdapter.d.ts","sourceRoot":"","sources":["../../../../src/adapter/deconz/adapter/deconzAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -64,7 +64,7 @@ class DeconzAdapter extends adapter_1.default {
|
|
|
64
64
|
super(networkOptions, serialPortOptions, backupPath, adapterOptions);
|
|
65
65
|
this.hasZdoMessageOverhead = true;
|
|
66
66
|
this.manufacturerID = Zcl.ManufacturerCode.DRESDEN_ELEKTRONIK_INGENIEURTECHNIK_GMBH;
|
|
67
|
-
this.waitress = new utils_1.Waitress(
|
|
67
|
+
this.waitress = new utils_1.Waitress(adapter_1.default.zclWaitressValidator, adapter_1.default.clusterWaitressTimeoutFormatter);
|
|
68
68
|
const firmwareLog = [];
|
|
69
69
|
if (backupPath) {
|
|
70
70
|
// optional: get extra logs from the firmware (debug builds)
|
|
@@ -193,16 +193,8 @@ class DeconzAdapter extends adapter_1.default {
|
|
|
193
193
|
async reset(_type) {
|
|
194
194
|
return await Promise.reject(new Error("Reset is not supported"));
|
|
195
195
|
}
|
|
196
|
-
waitFor(networkAddress, endpoint,
|
|
197
|
-
const payload = {
|
|
198
|
-
address: networkAddress,
|
|
199
|
-
endpoint,
|
|
200
|
-
clusterID,
|
|
201
|
-
commandIdentifier,
|
|
202
|
-
frameType,
|
|
203
|
-
direction,
|
|
204
|
-
transactionSequenceNumber,
|
|
205
|
-
};
|
|
196
|
+
waitFor(networkAddress, endpoint, _frameType, _direction, transactionSequenceNumber, clusterId, commandId, defaultRspCommandId, timeout) {
|
|
197
|
+
const payload = { address: networkAddress, endpoint, clusterId, commandId, defaultRspCommandId, transactionSequenceNumber };
|
|
206
198
|
logger_1.logger.debug(() => `waitFor() called ${JSON.stringify(payload)}`, NS);
|
|
207
199
|
const waiter = this.waitress.waitFor(payload, timeout);
|
|
208
200
|
const cancel = () => this.waitress.remove(waiter.ID);
|
|
@@ -296,7 +288,11 @@ class DeconzAdapter extends adapter_1.default {
|
|
|
296
288
|
// TODO(mpi): Enable APS ACKs for tricky devices, maintain a list of those, or keep at least a few slots free for non APS ACK requests.
|
|
297
289
|
//const txOptions = 0x4; // 0x00 normal, 0x04 APS ACK
|
|
298
290
|
// TODO(mpi): Disable APS ACKs for now until we find a better solution to not block queues.
|
|
299
|
-
|
|
291
|
+
let txOptions = 0x00;
|
|
292
|
+
// Zigbee Direct cluster, enable APS layer encryption
|
|
293
|
+
if (zclFrame.cluster.ID === Zcl.Clusters.zigbeeDirectConfiguration.ID) {
|
|
294
|
+
txOptions |= 0x01;
|
|
295
|
+
}
|
|
300
296
|
const request = {
|
|
301
297
|
requestId: transactionID,
|
|
302
298
|
destAddrMode: constants_1.ApsAddressMode.Nwk,
|
|
@@ -568,7 +564,9 @@ class DeconzAdapter extends adapter_1.default {
|
|
|
568
564
|
wasBroadcast: true, // Take the codepath that doesn't require `gppNwkAddr` as its not present in the payload
|
|
569
565
|
destinationEndpoint: ZSpec.GP_ENDPOINT,
|
|
570
566
|
};
|
|
571
|
-
|
|
567
|
+
if (payload.header !== undefined) {
|
|
568
|
+
this.waitress.resolve(payload);
|
|
569
|
+
}
|
|
572
570
|
this.emit("zclPayload", payload);
|
|
573
571
|
}
|
|
574
572
|
checkWaitForDataRequestTimeouts() {
|
|
@@ -692,28 +690,15 @@ class DeconzAdapter extends adapter_1.default {
|
|
|
692
690
|
wasBroadcast: wasBroadCast,
|
|
693
691
|
destinationEndpoint: resp.destEndpoint,
|
|
694
692
|
};
|
|
695
|
-
|
|
693
|
+
if (payload.header !== undefined) {
|
|
694
|
+
this.waitress.resolve(payload);
|
|
695
|
+
}
|
|
696
696
|
this.emit("zclPayload", payload);
|
|
697
697
|
}
|
|
698
698
|
}
|
|
699
699
|
nextTransactionID() {
|
|
700
700
|
return this.driver.nextTransactionID();
|
|
701
701
|
}
|
|
702
|
-
waitressTimeoutFormatter(matcher, timeout) {
|
|
703
|
-
return (`Timeout - ${matcher.address} - ${matcher.endpoint}` +
|
|
704
|
-
` - ${matcher.transactionSequenceNumber} - ${matcher.clusterID}` +
|
|
705
|
-
` - ${matcher.commandIdentifier} after ${timeout}ms`);
|
|
706
|
-
}
|
|
707
|
-
waitressValidator(payload, matcher) {
|
|
708
|
-
return Boolean(payload.header &&
|
|
709
|
-
(!matcher.address || payload.address === matcher.address) &&
|
|
710
|
-
payload.endpoint === matcher.endpoint &&
|
|
711
|
-
(matcher.transactionSequenceNumber === undefined || payload.header.transactionSequenceNumber === matcher.transactionSequenceNumber) &&
|
|
712
|
-
payload.clusterID === matcher.clusterID &&
|
|
713
|
-
matcher.frameType === payload.header.frameControl.frameType &&
|
|
714
|
-
matcher.commandIdentifier === payload.header.commandIdentifier &&
|
|
715
|
-
matcher.direction === payload.header.frameControl.direction);
|
|
716
|
-
}
|
|
717
702
|
}
|
|
718
703
|
exports.DeconzAdapter = DeconzAdapter;
|
|
719
704
|
//# sourceMappingURL=deconzAdapter.js.map
|