zigbee-herdsman 0.55.5 → 0.56.2
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/workflows/typedoc.yaml +38 -0
- package/.github/workflows/update_deps.yml +1 -1
- package/.prettierrc +18 -1
- package/.release-please-manifest.json +1 -1
- package/CHANGELOG.md +31 -0
- package/README.md +1 -1
- package/dist/adapter/adapter.d.ts +16 -8
- package/dist/adapter/adapter.d.ts.map +1 -1
- package/dist/adapter/adapter.js +5 -3
- package/dist/adapter/adapter.js.map +1 -1
- package/dist/adapter/deconz/adapter/deconzAdapter.d.ts +11 -11
- package/dist/adapter/deconz/adapter/deconzAdapter.d.ts.map +1 -1
- package/dist/adapter/deconz/adapter/deconzAdapter.js +103 -106
- package/dist/adapter/deconz/adapter/deconzAdapter.js.map +1 -1
- package/dist/adapter/deconz/adapter/index.d.ts.map +1 -1
- package/dist/adapter/deconz/adapter/index.js +0 -2
- package/dist/adapter/deconz/adapter/index.js.map +1 -1
- package/dist/adapter/deconz/driver/driver.d.ts +13 -13
- package/dist/adapter/deconz/driver/driver.d.ts.map +1 -1
- package/dist/adapter/deconz/driver/driver.js +126 -128
- package/dist/adapter/deconz/driver/driver.js.map +1 -1
- package/dist/adapter/deconz/driver/frame.d.ts.map +1 -1
- package/dist/adapter/deconz/driver/frame.js +1 -1
- package/dist/adapter/deconz/driver/frame.js.map +1 -1
- package/dist/adapter/deconz/driver/frameParser.d.ts +3 -1
- package/dist/adapter/deconz/driver/frameParser.d.ts.map +1 -1
- package/dist/adapter/deconz/driver/frameParser.js +52 -40
- package/dist/adapter/deconz/driver/frameParser.js.map +1 -1
- package/dist/adapter/deconz/driver/parser.d.ts +3 -4
- package/dist/adapter/deconz/driver/parser.d.ts.map +1 -1
- package/dist/adapter/deconz/driver/parser.js +4 -29
- package/dist/adapter/deconz/driver/parser.js.map +1 -1
- package/dist/adapter/deconz/driver/writer.d.ts.map +1 -1
- package/dist/adapter/deconz/driver/writer.js +2 -2
- package/dist/adapter/deconz/driver/writer.js.map +1 -1
- package/dist/adapter/ember/adapter/emberAdapter.d.ts +11 -21
- package/dist/adapter/ember/adapter/emberAdapter.d.ts.map +1 -1
- package/dist/adapter/ember/adapter/emberAdapter.js +77 -123
- package/dist/adapter/ember/adapter/emberAdapter.js.map +1 -1
- package/dist/adapter/ember/adapter/oneWaitress.d.ts.map +1 -1
- package/dist/adapter/ember/adapter/oneWaitress.js +6 -3
- package/dist/adapter/ember/adapter/oneWaitress.js.map +1 -1
- package/dist/adapter/ember/adapter/tokensManager.d.ts +1 -1
- package/dist/adapter/ember/adapter/tokensManager.d.ts.map +1 -1
- package/dist/adapter/ember/adapter/tokensManager.js +3 -3
- package/dist/adapter/ember/adapter/tokensManager.js.map +1 -1
- package/dist/adapter/ember/enums.d.ts +22 -0
- package/dist/adapter/ember/enums.d.ts.map +1 -1
- package/dist/adapter/ember/enums.js +24 -1
- package/dist/adapter/ember/enums.js.map +1 -1
- package/dist/adapter/ember/ezsp/buffalo.d.ts +1 -3
- package/dist/adapter/ember/ezsp/buffalo.d.ts.map +1 -1
- package/dist/adapter/ember/ezsp/buffalo.js +16 -37
- package/dist/adapter/ember/ezsp/buffalo.js.map +1 -1
- package/dist/adapter/ember/ezsp/ezsp.d.ts +25 -41
- package/dist/adapter/ember/ezsp/ezsp.d.ts.map +1 -1
- package/dist/adapter/ember/ezsp/ezsp.js +67 -72
- package/dist/adapter/ember/ezsp/ezsp.js.map +1 -1
- package/dist/adapter/ember/types.d.ts +16 -23
- package/dist/adapter/ember/types.d.ts.map +1 -1
- package/dist/adapter/ember/uart/ash.d.ts +6 -22
- package/dist/adapter/ember/uart/ash.d.ts.map +1 -1
- package/dist/adapter/ember/uart/ash.js +100 -117
- package/dist/adapter/ember/uart/ash.js.map +1 -1
- package/dist/adapter/ember/uart/parser.d.ts.map +1 -1
- package/dist/adapter/ember/uart/parser.js +1 -1
- package/dist/adapter/ember/uart/parser.js.map +1 -1
- package/dist/adapter/ember/uart/queues.d.ts +9 -9
- package/dist/adapter/ember/uart/queues.d.ts.map +1 -1
- package/dist/adapter/ember/uart/queues.js +27 -26
- package/dist/adapter/ember/uart/queues.js.map +1 -1
- package/dist/adapter/ember/uart/writer.d.ts.map +1 -1
- package/dist/adapter/ember/uart/writer.js +1 -1
- package/dist/adapter/ember/uart/writer.js.map +1 -1
- package/dist/adapter/ember/utils/initters.d.ts.map +1 -1
- package/dist/adapter/ember/utils/initters.js +1 -1
- package/dist/adapter/ember/utils/initters.js.map +1 -1
- package/dist/adapter/events.d.ts +1 -9
- package/dist/adapter/events.d.ts.map +1 -1
- package/dist/adapter/events.js +0 -10
- package/dist/adapter/events.js.map +1 -1
- package/dist/adapter/ezsp/adapter/backup.d.ts +1 -1
- package/dist/adapter/ezsp/adapter/backup.d.ts.map +1 -1
- package/dist/adapter/ezsp/adapter/backup.js +33 -10
- package/dist/adapter/ezsp/adapter/backup.js.map +1 -1
- package/dist/adapter/ezsp/adapter/ezspAdapter.d.ts +7 -7
- package/dist/adapter/ezsp/adapter/ezspAdapter.d.ts.map +1 -1
- package/dist/adapter/ezsp/adapter/ezspAdapter.js +35 -45
- package/dist/adapter/ezsp/adapter/ezspAdapter.js.map +1 -1
- package/dist/adapter/ezsp/adapter/index.d.ts.map +1 -1
- package/dist/adapter/ezsp/adapter/index.js +0 -2
- package/dist/adapter/ezsp/adapter/index.js.map +1 -1
- package/dist/adapter/ezsp/driver/commands.d.ts +2 -2
- package/dist/adapter/ezsp/driver/commands.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/commands.js +112 -112
- package/dist/adapter/ezsp/driver/commands.js.map +1 -1
- package/dist/adapter/ezsp/driver/driver.d.ts +2 -3
- package/dist/adapter/ezsp/driver/driver.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/driver.js +21 -13
- package/dist/adapter/ezsp/driver/driver.js.map +1 -1
- package/dist/adapter/ezsp/driver/ezsp.d.ts +3 -3
- package/dist/adapter/ezsp/driver/ezsp.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/ezsp.js +8 -10
- package/dist/adapter/ezsp/driver/ezsp.js.map +1 -1
- package/dist/adapter/ezsp/driver/frame.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/frame.js +1 -1
- package/dist/adapter/ezsp/driver/frame.js.map +1 -1
- package/dist/adapter/ezsp/driver/index.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/index.js +0 -1
- package/dist/adapter/ezsp/driver/index.js.map +1 -1
- package/dist/adapter/ezsp/driver/multicast.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/multicast.js +3 -3
- package/dist/adapter/ezsp/driver/multicast.js.map +1 -1
- package/dist/adapter/ezsp/driver/parser.d.ts +1 -2
- package/dist/adapter/ezsp/driver/parser.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/parser.js +3 -9
- package/dist/adapter/ezsp/driver/parser.js.map +1 -1
- package/dist/adapter/ezsp/driver/types/basic.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/types/basic.js +0 -1
- package/dist/adapter/ezsp/driver/types/basic.js.map +1 -1
- package/dist/adapter/ezsp/driver/types/index.d.ts +4 -4
- package/dist/adapter/ezsp/driver/types/index.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/types/index.js +85 -86
- package/dist/adapter/ezsp/driver/types/index.js.map +1 -1
- package/dist/adapter/ezsp/driver/types/named.js +1 -3
- package/dist/adapter/ezsp/driver/types/named.js.map +1 -1
- package/dist/adapter/ezsp/driver/types/struct.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/types/struct.js +63 -3
- package/dist/adapter/ezsp/driver/types/struct.js.map +1 -1
- package/dist/adapter/ezsp/driver/uart.d.ts +2 -3
- package/dist/adapter/ezsp/driver/uart.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/uart.js +9 -13
- package/dist/adapter/ezsp/driver/uart.js.map +1 -1
- package/dist/adapter/ezsp/driver/utils/crc16ccitt.d.ts +3 -1
- package/dist/adapter/ezsp/driver/utils/crc16ccitt.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/utils/crc16ccitt.js +1 -2
- package/dist/adapter/ezsp/driver/utils/crc16ccitt.js.map +1 -1
- package/dist/adapter/ezsp/driver/utils/index.d.ts +1 -15
- package/dist/adapter/ezsp/driver/utils/index.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/utils/index.js +2 -41
- package/dist/adapter/ezsp/driver/utils/index.js.map +1 -1
- package/dist/adapter/ezsp/driver/writer.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/writer.js +1 -1
- package/dist/adapter/ezsp/driver/writer.js.map +1 -1
- package/dist/adapter/serialPort.d.ts +7 -2
- package/dist/adapter/serialPort.d.ts.map +1 -1
- package/dist/adapter/serialPort.js +6 -2
- package/dist/adapter/serialPort.js.map +1 -1
- package/dist/adapter/z-stack/adapter/adapter-backup.d.ts +1 -1
- package/dist/adapter/z-stack/adapter/adapter-backup.d.ts.map +1 -1
- package/dist/adapter/z-stack/adapter/adapter-backup.js +28 -21
- package/dist/adapter/z-stack/adapter/adapter-backup.js.map +1 -1
- package/dist/adapter/z-stack/adapter/adapter-nv-memory.d.ts +1 -1
- package/dist/adapter/z-stack/adapter/adapter-nv-memory.d.ts.map +1 -1
- package/dist/adapter/z-stack/adapter/adapter-nv-memory.js +27 -14
- 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 +10 -10
- package/dist/adapter/z-stack/adapter/manager.js.map +1 -1
- package/dist/adapter/z-stack/adapter/zStackAdapter.d.ts +7 -7
- package/dist/adapter/z-stack/adapter/zStackAdapter.d.ts.map +1 -1
- package/dist/adapter/z-stack/adapter/zStackAdapter.js +40 -31
- package/dist/adapter/z-stack/adapter/zStackAdapter.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/address-manager-entry.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/address-manager-entry.js +1 -3
- package/dist/adapter/z-stack/structs/entries/address-manager-entry.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/address-manager-table.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/address-manager-table.js +5 -0
- package/dist/adapter/z-stack/structs/entries/address-manager-table.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/aps-link-key-data-entry.js +1 -2
- package/dist/adapter/z-stack/structs/entries/aps-link-key-data-entry.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/aps-link-key-data-table.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/aps-link-key-data-table.js +5 -0
- package/dist/adapter/z-stack/structs/entries/aps-link-key-data-table.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/aps-tc-link-key-entry.js +1 -2
- package/dist/adapter/z-stack/structs/entries/aps-tc-link-key-entry.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/aps-tc-link-key-table.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/aps-tc-link-key-table.js +5 -0
- package/dist/adapter/z-stack/structs/entries/aps-tc-link-key-table.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/channel-list.js +1 -2
- package/dist/adapter/z-stack/structs/entries/channel-list.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/has-configured.d.ts +1 -1
- package/dist/adapter/z-stack/structs/entries/has-configured.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/has-configured.js +12 -6
- package/dist/adapter/z-stack/structs/entries/has-configured.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/nib.d.ts +1 -1
- package/dist/adapter/z-stack/structs/entries/nib.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/nib.js +6 -2
- package/dist/adapter/z-stack/structs/entries/nib.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/nwk-key-descriptor.d.ts +1 -1
- package/dist/adapter/z-stack/structs/entries/nwk-key-descriptor.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/nwk-key-descriptor.js +9 -3
- package/dist/adapter/z-stack/structs/entries/nwk-key-descriptor.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/nwk-key.d.ts +1 -1
- package/dist/adapter/z-stack/structs/entries/nwk-key.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/nwk-key.js +9 -3
- package/dist/adapter/z-stack/structs/entries/nwk-key.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/nwk-pan-id.js +1 -2
- package/dist/adapter/z-stack/structs/entries/nwk-pan-id.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/nwk-sec-material-descriptor-entry.js +1 -2
- package/dist/adapter/z-stack/structs/entries/nwk-sec-material-descriptor-entry.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/nwk-sec-material-descriptor-table.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/nwk-sec-material-descriptor-table.js +5 -0
- package/dist/adapter/z-stack/structs/entries/nwk-sec-material-descriptor-table.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/security-manager-entry.js +1 -2
- package/dist/adapter/z-stack/structs/entries/security-manager-entry.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/security-manager-table.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/security-manager-table.js +5 -0
- package/dist/adapter/z-stack/structs/entries/security-manager-table.js.map +1 -1
- package/dist/adapter/z-stack/structs/struct.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/struct.js +16 -4
- package/dist/adapter/z-stack/structs/struct.js.map +1 -1
- package/dist/adapter/z-stack/structs/table.d.ts +1 -1
- package/dist/adapter/z-stack/structs/table.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/table.js +17 -13
- package/dist/adapter/z-stack/structs/table.js.map +1 -1
- package/dist/adapter/z-stack/unpi/frame.d.ts +3 -3
- package/dist/adapter/z-stack/unpi/frame.d.ts.map +1 -1
- package/dist/adapter/z-stack/unpi/frame.js +1 -1
- package/dist/adapter/z-stack/unpi/frame.js.map +1 -1
- package/dist/adapter/z-stack/unpi/parser.js +1 -1
- package/dist/adapter/z-stack/unpi/parser.js.map +1 -1
- package/dist/adapter/z-stack/utils/network-options.d.ts.map +1 -1
- package/dist/adapter/z-stack/utils/network-options.js +1 -2
- package/dist/adapter/z-stack/utils/network-options.js.map +1 -1
- package/dist/adapter/z-stack/znp/znp.d.ts +5 -6
- package/dist/adapter/z-stack/znp/znp.d.ts.map +1 -1
- package/dist/adapter/z-stack/znp/znp.js +21 -28
- package/dist/adapter/z-stack/znp/znp.js.map +1 -1
- package/dist/adapter/z-stack/znp/zpiObject.d.ts.map +1 -1
- package/dist/adapter/z-stack/znp/zpiObject.js +2 -2
- package/dist/adapter/z-stack/znp/zpiObject.js.map +1 -1
- package/dist/adapter/zigate/adapter/index.js +1 -2
- package/dist/adapter/zigate/adapter/index.js.map +1 -1
- package/dist/adapter/zigate/adapter/zigateAdapter.d.ts +9 -9
- package/dist/adapter/zigate/adapter/zigateAdapter.d.ts.map +1 -1
- package/dist/adapter/zigate/adapter/zigateAdapter.js +92 -118
- package/dist/adapter/zigate/adapter/zigateAdapter.js.map +1 -1
- package/dist/adapter/zigate/driver/buffaloZiGate.d.ts +1 -1
- package/dist/adapter/zigate/driver/buffaloZiGate.d.ts.map +1 -1
- package/dist/adapter/zigate/driver/buffaloZiGate.js +4 -4
- package/dist/adapter/zigate/driver/buffaloZiGate.js.map +1 -1
- package/dist/adapter/zigate/driver/commandType.d.ts.map +1 -1
- package/dist/adapter/zigate/driver/commandType.js +3 -2
- package/dist/adapter/zigate/driver/commandType.js.map +1 -1
- package/dist/adapter/zigate/driver/constants.d.ts +7 -1
- package/dist/adapter/zigate/driver/constants.d.ts.map +1 -1
- package/dist/adapter/zigate/driver/constants.js +1 -2
- package/dist/adapter/zigate/driver/constants.js.map +1 -1
- package/dist/adapter/zigate/driver/frame.d.ts.map +1 -1
- package/dist/adapter/zigate/driver/frame.js +2 -3
- package/dist/adapter/zigate/driver/frame.js.map +1 -1
- package/dist/adapter/zigate/driver/messageType.d.ts.map +1 -1
- package/dist/adapter/zigate/driver/messageType.js +1 -2
- package/dist/adapter/zigate/driver/messageType.js.map +1 -1
- package/dist/adapter/zigate/driver/ziGateObject.d.ts +5 -5
- package/dist/adapter/zigate/driver/ziGateObject.d.ts.map +1 -1
- package/dist/adapter/zigate/driver/ziGateObject.js +9 -10
- package/dist/adapter/zigate/driver/ziGateObject.js.map +1 -1
- package/dist/adapter/zigate/driver/zigate.d.ts +7 -10
- package/dist/adapter/zigate/driver/zigate.d.ts.map +1 -1
- package/dist/adapter/zigate/driver/zigate.js +35 -40
- package/dist/adapter/zigate/driver/zigate.js.map +1 -1
- package/dist/controller/controller.d.ts +18 -6
- package/dist/controller/controller.d.ts.map +1 -1
- package/dist/controller/controller.js +95 -103
- package/dist/controller/controller.js.map +1 -1
- package/dist/controller/events.d.ts +2 -13
- package/dist/controller/events.d.ts.map +1 -1
- package/dist/controller/events.js +0 -13
- package/dist/controller/events.js.map +1 -1
- package/dist/controller/greenPower.d.ts +6 -2
- package/dist/controller/greenPower.d.ts.map +1 -1
- package/dist/controller/greenPower.js +26 -16
- package/dist/controller/greenPower.js.map +1 -1
- package/dist/controller/helpers/request.d.ts +1 -1
- package/dist/controller/helpers/request.d.ts.map +1 -1
- package/dist/controller/helpers/request.js.map +1 -1
- package/dist/controller/helpers/requestQueue.d.ts.map +1 -1
- package/dist/controller/helpers/requestQueue.js +1 -1
- package/dist/controller/helpers/requestQueue.js.map +1 -1
- package/dist/controller/helpers/zclFrameConverter.d.ts +2 -2
- package/dist/controller/helpers/zclFrameConverter.d.ts.map +1 -1
- package/dist/controller/helpers/zclFrameConverter.js.map +1 -1
- package/dist/controller/index.d.ts.map +1 -1
- package/dist/controller/index.js.map +1 -1
- package/dist/controller/model/device.d.ts +31 -29
- package/dist/controller/model/device.d.ts.map +1 -1
- package/dist/controller/model/device.js +42 -30
- package/dist/controller/model/device.js.map +1 -1
- package/dist/controller/model/endpoint.d.ts +5 -2
- package/dist/controller/model/endpoint.d.ts.map +1 -1
- package/dist/controller/model/endpoint.js +96 -97
- package/dist/controller/model/endpoint.js.map +1 -1
- package/dist/controller/model/entity.d.ts +5 -3
- package/dist/controller/model/entity.d.ts.map +1 -1
- package/dist/controller/model/entity.js +2 -2
- package/dist/controller/model/entity.js.map +1 -1
- package/dist/controller/model/group.d.ts +1 -0
- package/dist/controller/model/group.d.ts.map +1 -1
- package/dist/controller/model/group.js +36 -28
- package/dist/controller/model/group.js.map +1 -1
- package/dist/controller/touchlink.d.ts.map +1 -1
- package/dist/controller/touchlink.js +6 -5
- package/dist/controller/touchlink.js.map +1 -1
- package/dist/controller/tstype.d.ts +1 -4
- package/dist/controller/tstype.d.ts.map +1 -1
- package/dist/controller/tstype.js +0 -5
- package/dist/controller/tstype.js.map +1 -1
- package/dist/models/backup-storage-unified.d.ts +2 -2
- package/dist/models/backup-storage-unified.d.ts.map +1 -1
- package/dist/models/backup.d.ts +1 -1
- package/dist/models/backup.d.ts.map +1 -1
- package/dist/utils/backup.d.ts.map +1 -1
- package/dist/utils/backup.js +22 -55
- package/dist/utils/backup.js.map +1 -1
- package/dist/utils/index.d.ts +2 -3
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +3 -5
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/logger.d.ts +1 -1
- package/dist/utils/logger.d.ts.map +1 -1
- package/dist/utils/queue.d.ts.map +1 -1
- package/dist/utils/queue.js +8 -8
- package/dist/utils/queue.js.map +1 -1
- package/dist/utils/realpathSync.d.ts.map +1 -1
- package/dist/utils/realpathSync.js +1 -1
- package/dist/utils/realpathSync.js.map +1 -1
- package/dist/utils/utils.d.ts +5 -0
- package/dist/utils/utils.d.ts.map +1 -0
- package/dist/utils/utils.js +24 -0
- package/dist/utils/utils.js.map +1 -0
- package/dist/zspec/consts.d.ts +1 -0
- package/dist/zspec/consts.d.ts.map +1 -1
- package/dist/zspec/consts.js +2 -1
- package/dist/zspec/consts.js.map +1 -1
- package/dist/zspec/index.js +0 -10
- package/dist/zspec/index.js.map +1 -1
- package/dist/zspec/utils.d.ts.map +1 -1
- package/dist/zspec/utils.js +7 -1
- package/dist/zspec/utils.js.map +1 -1
- package/dist/zspec/zcl/buffaloZcl.js +13 -13
- package/dist/zspec/zcl/buffaloZcl.js.map +1 -1
- package/dist/zspec/zcl/definition/cluster.d.ts.map +1 -1
- package/dist/zspec/zcl/definition/cluster.js +1 -1
- package/dist/zspec/zcl/definition/cluster.js.map +1 -1
- package/dist/zspec/zcl/definition/foundation.d.ts.map +1 -1
- package/dist/zspec/zcl/definition/foundation.js +1 -1
- package/dist/zspec/zcl/definition/foundation.js.map +1 -1
- package/dist/zspec/zcl/definition/tstype.d.ts +1 -1
- package/dist/zspec/zcl/definition/tstype.d.ts.map +1 -1
- package/dist/zspec/zcl/utils.d.ts +1 -1
- package/dist/zspec/zcl/utils.d.ts.map +1 -1
- package/dist/zspec/zcl/utils.js +21 -20
- 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 +10 -17
- package/dist/zspec/zcl/zclFrame.js.map +1 -1
- package/dist/zspec/zcl/zclHeader.d.ts +2 -2
- package/dist/zspec/zcl/zclHeader.d.ts.map +1 -1
- package/dist/zspec/zcl/zclHeader.js +3 -3
- package/dist/zspec/zcl/zclHeader.js.map +1 -1
- package/dist/zspec/zdo/buffaloZdo.d.ts +2 -2
- package/dist/zspec/zdo/buffaloZdo.d.ts.map +1 -1
- package/dist/zspec/zdo/buffaloZdo.js +12 -8
- package/dist/zspec/zdo/buffaloZdo.js.map +1 -1
- package/dist/zspec/zdo/definition/tstypes.d.ts +1 -1
- package/dist/zspec/zdo/definition/tstypes.d.ts.map +1 -1
- package/eslint.config.mjs +32 -0
- package/package.json +12 -10
- package/tsconfig.json +1 -0
- package/.eslintignore +0 -3
- package/dist/utils/assertString.d.ts +0 -3
- package/dist/utils/assertString.d.ts.map +0 -1
- package/dist/utils/assertString.js +0 -9
- package/dist/utils/assertString.js.map +0 -1
- package/dist/utils/isNumberArray.d.ts +0 -3
- package/dist/utils/isNumberArray.d.ts.map +0 -1
- package/dist/utils/isNumberArray.js +0 -7
- package/dist/utils/isNumberArray.js.map +0 -1
|
@@ -24,7 +24,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.ZnpAdapterManager = void 0;
|
|
27
|
-
/* eslint-disable max-len */
|
|
28
27
|
const crypto = __importStar(require("crypto"));
|
|
29
28
|
const utils_1 = require("../../../utils");
|
|
30
29
|
const logger_1 = require("../../../utils/logger");
|
|
@@ -48,6 +47,7 @@ class ZnpAdapterManager {
|
|
|
48
47
|
backup;
|
|
49
48
|
znp;
|
|
50
49
|
options;
|
|
50
|
+
// @ts-expect-error initialized in `start()`
|
|
51
51
|
nwkOptions;
|
|
52
52
|
constructor(znp, options) {
|
|
53
53
|
this.znp = znp;
|
|
@@ -117,7 +117,7 @@ class ZnpAdapterManager {
|
|
|
117
117
|
const hasConfigured = await this.nv.readItem(hasConfiguredNvId, 0, Structs.hasConfigured);
|
|
118
118
|
const nib = await this.nv.readItem(common_1.NvItemsIds.NIB, 0, Structs.nib);
|
|
119
119
|
const preconfiguredKey = this.options.version === tstype_1.ZnpVersion.zStack12
|
|
120
|
-
? Structs.nwkKey((await this.znp.
|
|
120
|
+
? Structs.nwkKey((await this.znp.requestWithReply(constants_1.Subsystem.SAPI, 'readConfiguration', { configid: common_1.NvItemsIds.PRECFGKEY })).payload.value)
|
|
121
121
|
: await this.nv.readItem(common_1.NvItemsIds.PRECFGKEY, 0, Structs.nwkKey);
|
|
122
122
|
let activeKeyInfo = await this.nv.readItem(common_1.NvItemsIds.NWK_ACTIVE_KEY_INFO, 0, Structs.nwkKeyDescriptor);
|
|
123
123
|
let alternateKeyInfo = await this.nv.readItem(common_1.NvItemsIds.NWK_ALTERN_KEY_INFO, 0, Structs.nwkKeyDescriptor);
|
|
@@ -247,11 +247,11 @@ class ZnpAdapterManager {
|
|
|
247
247
|
* Internal method to perform regular adapter startup in coordinator mode.
|
|
248
248
|
*/
|
|
249
249
|
async beginStartup() {
|
|
250
|
-
const deviceInfo = await this.znp.
|
|
250
|
+
const deviceInfo = await this.znp.requestWithReply(constants_1.Subsystem.UTIL, 'getDeviceInfo', {});
|
|
251
251
|
if (deviceInfo.payload.devicestate !== common_1.DevStates.ZB_COORD) {
|
|
252
252
|
logger_1.logger.debug('starting adapter as coordinator', NS);
|
|
253
253
|
const started = this.znp.waitFor(UnpiConstants.Type.AREQ, constants_1.Subsystem.ZDO, 'stateChangeInd', { state: 9 }, 60000);
|
|
254
|
-
await this.znp.request(constants_1.Subsystem.ZDO, 'startupFromApp', { startdelay: 100 },
|
|
254
|
+
await this.znp.request(constants_1.Subsystem.ZDO, 'startupFromApp', { startdelay: 100 }, undefined, undefined, [
|
|
255
255
|
common_1.ZnpCommandStatus.SUCCESS,
|
|
256
256
|
common_1.ZnpCommandStatus.FAILURE,
|
|
257
257
|
]);
|
|
@@ -329,7 +329,7 @@ class ZnpAdapterManager {
|
|
|
329
329
|
await started.start().promise;
|
|
330
330
|
}
|
|
331
331
|
catch (error) {
|
|
332
|
-
throw new Error(`network commissioning timed out - most likely network with the same panId or extendedPanId already exists nearby (${error.
|
|
332
|
+
throw new Error(`network commissioning timed out - most likely network with the same panId or extendedPanId already exists nearby (${error.stack})`);
|
|
333
333
|
}
|
|
334
334
|
}
|
|
335
335
|
else {
|
|
@@ -339,7 +339,7 @@ class ZnpAdapterManager {
|
|
|
339
339
|
/* wait for NIB to settle (takes different amount of time of different platforms */
|
|
340
340
|
logger_1.logger.debug('waiting for NIB to settle', NS);
|
|
341
341
|
let reads = 0;
|
|
342
|
-
let nib
|
|
342
|
+
let nib;
|
|
343
343
|
do {
|
|
344
344
|
await (0, utils_1.Wait)(3000);
|
|
345
345
|
nib = await this.nv.readItem(common_1.NvItemsIds.NIB, 0, Structs.nib);
|
|
@@ -349,7 +349,7 @@ class ZnpAdapterManager {
|
|
|
349
349
|
throw new Error(`network commissioning failed - timed out waiting for nib to settle`);
|
|
350
350
|
}
|
|
351
351
|
/* validate provisioned PAN ID */
|
|
352
|
-
const extNwkInfo = await this.znp.
|
|
352
|
+
const extNwkInfo = await this.znp.requestWithReply(constants_1.Subsystem.ZDO, 'extNwkInfo', {});
|
|
353
353
|
if (extNwkInfo.payload.panid !== nwkOptions.panId && failOnCollision) {
|
|
354
354
|
throw new Error(`network commissioning failed - panId collision detected (expected=${nwkOptions.panId}, actual=${extNwkInfo.payload.panid})`);
|
|
355
355
|
}
|
|
@@ -421,7 +421,7 @@ class ZnpAdapterManager {
|
|
|
421
421
|
* @param group Target group index.
|
|
422
422
|
*/
|
|
423
423
|
async addToGroup(endpoint, group) {
|
|
424
|
-
const result = await this.znp.
|
|
424
|
+
const result = await this.znp.requestWithReply(5, 'extFindGroup', { endpoint, groupid: group }, undefined, undefined, [
|
|
425
425
|
common_1.ZnpCommandStatus.SUCCESS,
|
|
426
426
|
common_1.ZnpCommandStatus.FAILURE,
|
|
427
427
|
]);
|
|
@@ -463,10 +463,10 @@ class ZnpAdapterManager {
|
|
|
463
463
|
panId: options.panID,
|
|
464
464
|
extendedPanId: Buffer.from(options.extendedPanID),
|
|
465
465
|
networkKey: Buffer.from(options.networkKey),
|
|
466
|
-
networkKeyDistribute: options.networkKeyDistribute,
|
|
466
|
+
networkKeyDistribute: Boolean(options.networkKeyDistribute),
|
|
467
467
|
};
|
|
468
468
|
if (parsed.extendedPanId.equals(Buffer.alloc(8, 0xdd))) {
|
|
469
|
-
const adapterIeeeAddressResponse = await this.znp.
|
|
469
|
+
const adapterIeeeAddressResponse = await this.znp.requestWithReply(constants_1.Subsystem.SYS, 'getExtAddr', {});
|
|
470
470
|
parsed.extendedPanId = Buffer.from(adapterIeeeAddressResponse.payload.extaddress.split('0x')[1], 'hex');
|
|
471
471
|
parsed.hasDefaultExtendedPanId = true;
|
|
472
472
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../../src/adapter/z-stack/adapter/manager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../../src/adapter/z-stack/adapter/manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { BroadcastAddress } from '../../../zspec/enums';
|
|
|
3
3
|
import * as Zcl from '../../../zspec/zcl';
|
|
4
4
|
import Adapter from '../../adapter';
|
|
5
5
|
import * as Events from '../../events';
|
|
6
|
-
import {
|
|
6
|
+
import { ActiveEndpoints, AdapterOptions, Coordinator, CoordinatorVersion, LQI, NetworkOptions, NetworkParameters, NodeDescriptor, RoutingTable, SerialPortOptions, SimpleDescriptor, StartResult } from '../../tstype';
|
|
7
7
|
import { ZpiObject } from '../znp';
|
|
8
8
|
declare class ZStackAdapter extends Adapter {
|
|
9
9
|
private deviceAnnounceRouteDiscoveryDebouncers;
|
|
@@ -13,7 +13,7 @@ declare class ZStackAdapter extends Adapter {
|
|
|
13
13
|
private version;
|
|
14
14
|
private closing;
|
|
15
15
|
private queue;
|
|
16
|
-
private supportsLED
|
|
16
|
+
private supportsLED?;
|
|
17
17
|
private interpanLock;
|
|
18
18
|
private interpanEndpointRegistered;
|
|
19
19
|
private waitress;
|
|
@@ -24,9 +24,9 @@ declare class ZStackAdapter extends Adapter {
|
|
|
24
24
|
start(): Promise<StartResult>;
|
|
25
25
|
stop(): Promise<void>;
|
|
26
26
|
static isValidPath(path: string): Promise<boolean>;
|
|
27
|
-
static autoDetectPath(): Promise<string>;
|
|
27
|
+
static autoDetectPath(): Promise<string | undefined>;
|
|
28
28
|
getCoordinator(): Promise<Coordinator>;
|
|
29
|
-
permitJoin(seconds: number, networkAddress
|
|
29
|
+
permitJoin(seconds: number, networkAddress?: number): Promise<void>;
|
|
30
30
|
getCoordinatorVersion(): Promise<CoordinatorVersion>;
|
|
31
31
|
reset(type: 'soft' | 'hard'): Promise<void>;
|
|
32
32
|
private setLED;
|
|
@@ -38,7 +38,7 @@ declare class ZStackAdapter extends Adapter {
|
|
|
38
38
|
private nodeDescriptorInternal;
|
|
39
39
|
activeEndpoints(networkAddress: number): Promise<ActiveEndpoints>;
|
|
40
40
|
simpleDescriptor(networkAddress: number, endpointID: number): Promise<SimpleDescriptor>;
|
|
41
|
-
sendZclFrameToEndpoint(ieeeAddr: string, networkAddress: number, endpoint: number, zclFrame: Zcl.Frame, timeout: number, disableResponse: boolean, disableRecovery: boolean, sourceEndpoint?: number): Promise<Events.ZclPayload>;
|
|
41
|
+
sendZclFrameToEndpoint(ieeeAddr: string, networkAddress: number, endpoint: number, zclFrame: Zcl.Frame, timeout: number, disableResponse: boolean, disableRecovery: boolean, sourceEndpoint?: number): Promise<Events.ZclPayload | void>;
|
|
42
42
|
private sendZclFrameToEndpointInternal;
|
|
43
43
|
sendZclFrameToGroup(groupID: number, zclFrame: Zcl.Frame, sourceEndpoint?: number): Promise<void>;
|
|
44
44
|
sendZclFrameToAll(endpoint: number, zclFrame: Zcl.Frame, sourceEndpoint: number, destination: BroadcastAddress): Promise<void>;
|
|
@@ -46,7 +46,7 @@ declare class ZStackAdapter extends Adapter {
|
|
|
46
46
|
routingTable(networkAddress: number): Promise<RoutingTable>;
|
|
47
47
|
addInstallCode(ieeeAddress: string, key: Buffer): Promise<void>;
|
|
48
48
|
bind(destinationNetworkAddress: number, sourceIeeeAddress: string, sourceEndpoint: number, clusterID: number, destinationAddressOrGroup: string | number, type: 'endpoint' | 'group', destinationEndpoint?: number): Promise<void>;
|
|
49
|
-
unbind(destinationNetworkAddress: number, sourceIeeeAddress: string, sourceEndpoint: number, clusterID: number, destinationAddressOrGroup: string | number, type: 'endpoint' | 'group', destinationEndpoint
|
|
49
|
+
unbind(destinationNetworkAddress: number, sourceIeeeAddress: string, sourceEndpoint: number, clusterID: number, destinationAddressOrGroup: string | number, type: 'endpoint' | 'group', destinationEndpoint?: number): Promise<void>;
|
|
50
50
|
private bindInternal;
|
|
51
51
|
removeDevice(networkAddress: number, ieeeAddr: string): Promise<void>;
|
|
52
52
|
/**
|
|
@@ -65,7 +65,7 @@ declare class ZStackAdapter extends Adapter {
|
|
|
65
65
|
setTransmitPower(value: number): Promise<void>;
|
|
66
66
|
private waitForAreqZdo;
|
|
67
67
|
private waitForInternal;
|
|
68
|
-
waitFor(networkAddress: number, endpoint: number, frameType: Zcl.FrameType, direction: Zcl.Direction, transactionSequenceNumber: number, clusterID: number, commandIdentifier: number, timeout: number): {
|
|
68
|
+
waitFor(networkAddress: number | undefined, endpoint: number, frameType: Zcl.FrameType, direction: Zcl.Direction, transactionSequenceNumber: number | undefined, clusterID: number, commandIdentifier: number, timeout: number): {
|
|
69
69
|
promise: Promise<Events.ZclPayload>;
|
|
70
70
|
cancel: () => void;
|
|
71
71
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zStackAdapter.d.ts","sourceRoot":"","sources":["../../../../src/adapter/z-stack/adapter/zStackAdapter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"zStackAdapter.d.ts","sourceRoot":"","sources":["../../../../src/adapter/z-stack/adapter/zStackAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,6 @@ const logger_1 = require("../../../utils/logger");
|
|
|
33
33
|
const Zcl = __importStar(require("../../../zspec/zcl"));
|
|
34
34
|
const zdo_1 = require("../../../zspec/zdo");
|
|
35
35
|
const adapter_1 = __importDefault(require("../../adapter"));
|
|
36
|
-
const Events = __importStar(require("../../events"));
|
|
37
36
|
const Constants = __importStar(require("../constants"));
|
|
38
37
|
const unpi_1 = require("../unpi");
|
|
39
38
|
const znp_1 = require("../znp");
|
|
@@ -64,12 +63,15 @@ class DataConfirmError extends Error {
|
|
|
64
63
|
class ZStackAdapter extends adapter_1.default {
|
|
65
64
|
deviceAnnounceRouteDiscoveryDebouncers;
|
|
66
65
|
znp;
|
|
66
|
+
// @ts-expect-error initialized in `start`
|
|
67
67
|
adapterManager;
|
|
68
68
|
transactionID;
|
|
69
|
+
// @ts-expect-error initialized in `start`
|
|
69
70
|
version;
|
|
70
71
|
closing;
|
|
72
|
+
// @ts-expect-error initialized in `start`
|
|
71
73
|
queue;
|
|
72
|
-
supportsLED
|
|
74
|
+
supportsLED;
|
|
73
75
|
interpanLock;
|
|
74
76
|
interpanEndpointRegistered;
|
|
75
77
|
waitress;
|
|
@@ -104,7 +106,7 @@ class ZStackAdapter extends adapter_1.default {
|
|
|
104
106
|
}
|
|
105
107
|
// Old firmware did not support version, assume it's Z-Stack 1.2 for now.
|
|
106
108
|
try {
|
|
107
|
-
this.version = (await this.znp.
|
|
109
|
+
this.version = (await this.znp.requestWithReply(Subsystem.SYS, 'version', {})).payload;
|
|
108
110
|
}
|
|
109
111
|
catch {
|
|
110
112
|
logger_1.logger.debug(`Failed to get zStack version, assuming 1.2`, NS);
|
|
@@ -152,7 +154,7 @@ class ZStackAdapter extends adapter_1.default {
|
|
|
152
154
|
const activeEpRsp = this.waitForAreqZdo('activeEpRsp');
|
|
153
155
|
await this.znp.request(Subsystem.ZDO, 'activeEpReq', { dstaddr: 0, nwkaddrofinterest: 0 }, activeEpRsp.ID);
|
|
154
156
|
const activeEp = await activeEpRsp.start();
|
|
155
|
-
const deviceInfo = await this.znp.
|
|
157
|
+
const deviceInfo = await this.znp.requestWithReply(Subsystem.UTIL, 'getDeviceInfo', {});
|
|
156
158
|
const endpoints = [];
|
|
157
159
|
for (const endpoint of activeEp.payload.activeeplist) {
|
|
158
160
|
const simpleDescRsp = this.waitForAreqZdo('simpleDescRsp', { endpoint });
|
|
@@ -175,7 +177,7 @@ class ZStackAdapter extends adapter_1.default {
|
|
|
175
177
|
});
|
|
176
178
|
}
|
|
177
179
|
async permitJoin(seconds, networkAddress) {
|
|
178
|
-
const addrmode = networkAddress ===
|
|
180
|
+
const addrmode = networkAddress === undefined ? 0x0f : 0x02;
|
|
179
181
|
const dstaddr = networkAddress || 0xfffc;
|
|
180
182
|
await this.queue.execute(async () => {
|
|
181
183
|
this.checkInterpanLock();
|
|
@@ -196,7 +198,7 @@ class ZStackAdapter extends adapter_1.default {
|
|
|
196
198
|
}
|
|
197
199
|
}
|
|
198
200
|
async setLED(action) {
|
|
199
|
-
if (this.supportsLED ==
|
|
201
|
+
if (this.supportsLED == undefined) {
|
|
200
202
|
// Only zStack3x0 with 20210430 and greater support LED
|
|
201
203
|
const zStack3x0 = this.version.product === tstype_1.ZnpVersion.zStack3x0;
|
|
202
204
|
this.supportsLED = !zStack3x0 || (zStack3x0 && parseInt(this.version.revision) >= 20210430);
|
|
@@ -213,7 +215,7 @@ class ZStackAdapter extends adapter_1.default {
|
|
|
213
215
|
};
|
|
214
216
|
const payload = lookup[action];
|
|
215
217
|
if (payload) {
|
|
216
|
-
this.znp.request(Subsystem.UTIL, 'ledControl', payload,
|
|
218
|
+
this.znp.request(Subsystem.UTIL, 'ledControl', payload, undefined, 500).catch(() => {
|
|
217
219
|
// We cannot 100% correctly determine if an adapter supports LED. E.g. the zStack 1.2 20190608
|
|
218
220
|
// fw supports led on the CC2531 but not on the CC2530. Therefore if a led request fails never thrown
|
|
219
221
|
// an error but instead mark the led as unsupported.
|
|
@@ -315,7 +317,7 @@ class ZStackAdapter extends adapter_1.default {
|
|
|
315
317
|
async sendZclFrameToEndpoint(ieeeAddr, networkAddress, endpoint, zclFrame, timeout, disableResponse, disableRecovery, sourceEndpoint) {
|
|
316
318
|
return this.queue.execute(async () => {
|
|
317
319
|
this.checkInterpanLock();
|
|
318
|
-
return this.sendZclFrameToEndpointInternal(ieeeAddr, networkAddress, endpoint, sourceEndpoint || 1, zclFrame, timeout, disableResponse, disableRecovery, 0, 0, false, false, false,
|
|
320
|
+
return this.sendZclFrameToEndpointInternal(ieeeAddr, networkAddress, endpoint, sourceEndpoint || 1, zclFrame, timeout, disableResponse, disableRecovery, 0, 0, false, false, false, undefined);
|
|
319
321
|
}, networkAddress);
|
|
320
322
|
}
|
|
321
323
|
async sendZclFrameToEndpointInternal(ieeeAddr, networkAddress, endpoint, sourceEndpoint, zclFrame, timeout, disableResponse, disableRecovery, responseAttempt, dataRequestAttempt, checkedNetworkAddress, discoveredRoute, assocRemove, assocRestore) {
|
|
@@ -323,7 +325,7 @@ class ZStackAdapter extends adapter_1.default {
|
|
|
323
325
|
`(${responseAttempt},${dataRequestAttempt},${this.queue.count()})`, NS);
|
|
324
326
|
let response = null;
|
|
325
327
|
const command = zclFrame.command;
|
|
326
|
-
if (command.
|
|
328
|
+
if (command.response != undefined && disableResponse === false) {
|
|
327
329
|
response = this.waitForInternal(networkAddress, endpoint, zclFrame.header.frameControl.frameType, Zcl.Direction.SERVER_TO_CLIENT, zclFrame.header.transactionSequenceNumber, zclFrame.cluster.ID, command.response, timeout);
|
|
328
330
|
}
|
|
329
331
|
else if (!zclFrame.header.frameControl.disableDefaultResponse) {
|
|
@@ -343,7 +345,7 @@ class ZStackAdapter extends adapter_1.default {
|
|
|
343
345
|
if (assocRemove && assocRestore && this.supportsAssocAdd()) {
|
|
344
346
|
logger_1.logger.debug(`assocAdd(${assocRestore.ieeeadr})`, NS);
|
|
345
347
|
await this.znp.request(Subsystem.UTIL, 'assocAdd', assocRestore);
|
|
346
|
-
assocRestore =
|
|
348
|
+
assocRestore = undefined;
|
|
347
349
|
}
|
|
348
350
|
const recoverableErrors = [
|
|
349
351
|
ZnpCommandStatus.NWK_NO_ROUTE,
|
|
@@ -377,7 +379,10 @@ class ZStackAdapter extends adapter_1.default {
|
|
|
377
379
|
dataConfirmResult === ZnpCommandStatus.MAC_TRANSACTION_EXPIRED &&
|
|
378
380
|
dataRequestAttempt >= 1 &&
|
|
379
381
|
this.supportsAssocRemove()) {
|
|
380
|
-
const match = await this.znp.
|
|
382
|
+
const match = await this.znp.requestWithReply(Subsystem.UTIL, 'assocGetWithAddress', {
|
|
383
|
+
extaddr: ieeeAddr,
|
|
384
|
+
nwkaddr: networkAddress,
|
|
385
|
+
});
|
|
381
386
|
if (match.payload.nwkaddr !== 0xfffe && match.payload.noderelation !== 255) {
|
|
382
387
|
doAssocRemove = true;
|
|
383
388
|
assocRestore = { ieeeadr: ieeeAddr, nwkaddr: networkAddress, noderelation: match.payload.noderelation };
|
|
@@ -420,7 +425,9 @@ class ZStackAdapter extends adapter_1.default {
|
|
|
420
425
|
logger_1.logger.debug('Network address did not change', NS);
|
|
421
426
|
}
|
|
422
427
|
}
|
|
423
|
-
catch {
|
|
428
|
+
catch {
|
|
429
|
+
/* empty */
|
|
430
|
+
}
|
|
424
431
|
}
|
|
425
432
|
else {
|
|
426
433
|
logger_1.logger.debug('Wait 2000ms', NS);
|
|
@@ -440,7 +447,10 @@ class ZStackAdapter extends adapter_1.default {
|
|
|
440
447
|
// No response could be because the radio of the end device is turned off:
|
|
441
448
|
// Sometimes the coordinator does not properly set the PENDING flag.
|
|
442
449
|
// Try to rewrite the device entry in the association table, this fixes it sometimes.
|
|
443
|
-
const match = await this.znp.
|
|
450
|
+
const match = await this.znp.requestWithReply(Subsystem.UTIL, 'assocGetWithAddress', {
|
|
451
|
+
extaddr: ieeeAddr,
|
|
452
|
+
nwkaddr: networkAddress,
|
|
453
|
+
});
|
|
444
454
|
logger_1.logger.debug(`Response timeout recovery: Node relation ${match.payload.noderelation} (${ieeeAddr} / ${match.payload.nwkaddr})`, NS);
|
|
445
455
|
if (this.supportsAssocAdd() &&
|
|
446
456
|
this.supportsAssocRemove() &&
|
|
@@ -463,9 +473,6 @@ class ZStackAdapter extends adapter_1.default {
|
|
|
463
473
|
}
|
|
464
474
|
}
|
|
465
475
|
}
|
|
466
|
-
else {
|
|
467
|
-
return null;
|
|
468
|
-
}
|
|
469
476
|
}
|
|
470
477
|
async sendZclFrameToGroup(groupID, zclFrame, sourceEndpoint) {
|
|
471
478
|
return this.queue.execute(async () => {
|
|
@@ -605,7 +612,7 @@ class ZStackAdapter extends adapter_1.default {
|
|
|
605
612
|
*/
|
|
606
613
|
onZnpClose() {
|
|
607
614
|
if (!this.closing) {
|
|
608
|
-
this.emit(
|
|
615
|
+
this.emit('disconnected');
|
|
609
616
|
}
|
|
610
617
|
}
|
|
611
618
|
onZnpRecieved(object) {
|
|
@@ -618,7 +625,7 @@ class ZStackAdapter extends adapter_1.default {
|
|
|
618
625
|
networkAddress: object.payload.nwkaddr,
|
|
619
626
|
ieeeAddr: object.payload.extaddr,
|
|
620
627
|
};
|
|
621
|
-
this.emit(
|
|
628
|
+
this.emit('deviceJoined', payload);
|
|
622
629
|
}
|
|
623
630
|
else if (object.command === 'endDeviceAnnceInd') {
|
|
624
631
|
const payload = {
|
|
@@ -640,16 +647,18 @@ class ZStackAdapter extends adapter_1.default {
|
|
|
640
647
|
}, 60 * 1000, { immediate: true });
|
|
641
648
|
this.deviceAnnounceRouteDiscoveryDebouncers.set(payload.networkAddress, debouncer);
|
|
642
649
|
}
|
|
643
|
-
this.deviceAnnounceRouteDiscoveryDebouncers.get(payload.networkAddress)
|
|
650
|
+
const debouncer = this.deviceAnnounceRouteDiscoveryDebouncers.get(payload.networkAddress);
|
|
651
|
+
(0, assert_1.default)(debouncer);
|
|
652
|
+
debouncer();
|
|
644
653
|
}
|
|
645
|
-
this.emit(
|
|
654
|
+
this.emit('deviceAnnounce', payload);
|
|
646
655
|
}
|
|
647
656
|
else if (object.command === 'nwkAddrRsp') {
|
|
648
657
|
const payload = {
|
|
649
658
|
networkAddress: object.payload.nwkaddr,
|
|
650
659
|
ieeeAddr: object.payload.ieeeaddr,
|
|
651
660
|
};
|
|
652
|
-
this.emit(
|
|
661
|
+
this.emit('networkAddress', payload);
|
|
653
662
|
}
|
|
654
663
|
else if (object.command === 'concentratorIndCb') {
|
|
655
664
|
// Some routers may change short addresses and the announcement
|
|
@@ -666,7 +675,7 @@ class ZStackAdapter extends adapter_1.default {
|
|
|
666
675
|
networkAddress: object.payload.srcaddr,
|
|
667
676
|
ieeeAddr: object.payload.extaddr,
|
|
668
677
|
};
|
|
669
|
-
this.emit(
|
|
678
|
+
this.emit('networkAddress', payload);
|
|
670
679
|
}
|
|
671
680
|
else {
|
|
672
681
|
/* istanbul ignore else */
|
|
@@ -679,7 +688,7 @@ class ZStackAdapter extends adapter_1.default {
|
|
|
679
688
|
networkAddress: object.payload.srcaddr,
|
|
680
689
|
ieeeAddr: object.payload.extaddr,
|
|
681
690
|
};
|
|
682
|
-
this.emit(
|
|
691
|
+
this.emit('deviceLeave', payload);
|
|
683
692
|
}
|
|
684
693
|
}
|
|
685
694
|
}
|
|
@@ -701,13 +710,13 @@ class ZStackAdapter extends adapter_1.default {
|
|
|
701
710
|
destinationEndpoint: object.payload.dstendpoint,
|
|
702
711
|
};
|
|
703
712
|
this.waitress.resolve(payload);
|
|
704
|
-
this.emit(
|
|
713
|
+
this.emit('zclPayload', payload);
|
|
705
714
|
}
|
|
706
715
|
}
|
|
707
716
|
}
|
|
708
717
|
}
|
|
709
718
|
async getNetworkParameters() {
|
|
710
|
-
const result = await this.znp.
|
|
719
|
+
const result = await this.znp.requestWithReply(Subsystem.ZDO, 'extNwkInfo', {});
|
|
711
720
|
return {
|
|
712
721
|
panID: result.payload.panid,
|
|
713
722
|
extendedPanID: result.payload.extendedpanid,
|
|
@@ -739,10 +748,10 @@ class ZStackAdapter extends adapter_1.default {
|
|
|
739
748
|
async sendZclFrameInterPANBroadcast(zclFrame, timeout) {
|
|
740
749
|
return this.queue.execute(async () => {
|
|
741
750
|
const command = zclFrame.command;
|
|
742
|
-
if (
|
|
751
|
+
if (command.response == undefined) {
|
|
743
752
|
throw new Error(`Command '${command.name}' has no response, cannot wait for response`);
|
|
744
753
|
}
|
|
745
|
-
const response = this.waitForInternal(
|
|
754
|
+
const response = this.waitForInternal(undefined, 0xfe, zclFrame.header.frameControl.frameType, Zcl.Direction.SERVER_TO_CLIENT, undefined, zclFrame.cluster.ID, command.response, timeout);
|
|
746
755
|
try {
|
|
747
756
|
await this.dataRequestExtended(AddressMode.ADDR_16BIT, 0xffff, 0xfe, 0xffff, 12, zclFrame.cluster.ID, 30, zclFrame.toBuffer(), 10000, false);
|
|
748
757
|
}
|
|
@@ -851,7 +860,7 @@ class ZStackAdapter extends adapter_1.default {
|
|
|
851
860
|
}
|
|
852
861
|
async dataRequestExtended(addressMode, destinationAddressOrGroupID, destinationEndpoint, panID, sourceEndpoint, clusterID, radius, data, timeout, confirmation, attemptsLeft = 5) {
|
|
853
862
|
const transactionID = this.nextTransactionID();
|
|
854
|
-
const response = confirmation ? this.znp.waitFor(Type.AREQ, Subsystem.AF, 'dataConfirm', { transid: transactionID }, timeout) :
|
|
863
|
+
const response = confirmation ? this.znp.waitFor(Type.AREQ, Subsystem.AF, 'dataConfirm', { transid: transactionID }, timeout) : undefined;
|
|
855
864
|
await this.znp.request(Subsystem.AF, 'dataRequestExt', {
|
|
856
865
|
dstaddrmode: addressMode,
|
|
857
866
|
dstaddr: this.toAddressString(destinationAddressOrGroupID),
|
|
@@ -864,8 +873,8 @@ class ZStackAdapter extends adapter_1.default {
|
|
|
864
873
|
radius,
|
|
865
874
|
len: data.length,
|
|
866
875
|
data: data,
|
|
867
|
-
}, response
|
|
868
|
-
if (confirmation) {
|
|
876
|
+
}, response?.ID);
|
|
877
|
+
if (confirmation && response) {
|
|
869
878
|
const dataConfirm = await response.start().promise;
|
|
870
879
|
if (dataConfirm.payload.status !== ZnpCommandStatus.SUCCESS) {
|
|
871
880
|
if (attemptsLeft > 0 &&
|
|
@@ -911,7 +920,7 @@ class ZStackAdapter extends adapter_1.default {
|
|
|
911
920
|
` - ${matcher.commandIdentifier} after ${timeout}ms`);
|
|
912
921
|
}
|
|
913
922
|
waitressValidator(payload, matcher) {
|
|
914
|
-
return (payload.header &&
|
|
923
|
+
return Boolean(payload.header &&
|
|
915
924
|
(!matcher.address || payload.address === matcher.address) &&
|
|
916
925
|
payload.endpoint === matcher.endpoint &&
|
|
917
926
|
(!matcher.transactionSequenceNumber || payload.header.transactionSequenceNumber === matcher.transactionSequenceNumber) &&
|