zigbee-herdsman 0.51.0 → 0.53.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/workflows/ci.yml +4 -2
- package/.prettierrc +9 -0
- package/.release-please-manifest.json +1 -1
- package/CHANGELOG.md +25 -0
- package/dist/adapter/adapter.d.ts +4 -4
- package/dist/adapter/adapter.d.ts.map +1 -1
- package/dist/adapter/adapter.js +8 -13
- package/dist/adapter/adapter.js.map +1 -1
- package/dist/adapter/deconz/adapter/deconzAdapter.d.ts +1 -1
- package/dist/adapter/deconz/adapter/deconzAdapter.d.ts.map +1 -1
- package/dist/adapter/deconz/adapter/deconzAdapter.js +249 -155
- package/dist/adapter/deconz/adapter/deconzAdapter.js.map +1 -1
- package/dist/adapter/deconz/adapter/index.d.ts +1 -1
- package/dist/adapter/deconz/adapter/index.d.ts.map +1 -1
- package/dist/adapter/deconz/adapter/index.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/deconz/driver/constants.js +7 -7
- package/dist/adapter/deconz/driver/constants.js.map +1 -1
- package/dist/adapter/deconz/driver/driver.d.ts.map +1 -1
- package/dist/adapter/deconz/driver/driver.js +92 -60
- package/dist/adapter/deconz/driver/driver.js.map +1 -1
- package/dist/adapter/deconz/driver/frameParser.d.ts.map +1 -1
- package/dist/adapter/deconz/driver/frameParser.js +55 -46
- package/dist/adapter/deconz/driver/frameParser.js.map +1 -1
- package/dist/adapter/deconz/driver/parser.js +1 -1
- package/dist/adapter/ember/adapter/emberAdapter.d.ts +5 -5
- package/dist/adapter/ember/adapter/emberAdapter.d.ts.map +1 -1
- package/dist/adapter/ember/adapter/emberAdapter.js +803 -955
- package/dist/adapter/ember/adapter/emberAdapter.js.map +1 -1
- package/dist/adapter/ember/adapter/endpoints.d.ts.map +1 -1
- package/dist/adapter/ember/adapter/endpoints.js +4 -2
- package/dist/adapter/ember/adapter/endpoints.js.map +1 -1
- package/dist/adapter/ember/adapter/oneWaitress.d.ts +2 -2
- package/dist/adapter/ember/adapter/oneWaitress.d.ts.map +1 -1
- package/dist/adapter/ember/adapter/oneWaitress.js +16 -16
- package/dist/adapter/ember/adapter/oneWaitress.js.map +1 -1
- package/dist/adapter/ember/adapter/tokensManager.d.ts +3 -3
- package/dist/adapter/ember/adapter/tokensManager.d.ts.map +1 -1
- package/dist/adapter/ember/adapter/tokensManager.js +86 -85
- package/dist/adapter/ember/adapter/tokensManager.js.map +1 -1
- package/dist/adapter/ember/consts.d.ts.map +1 -1
- package/dist/adapter/ember/consts.js +27 -27
- package/dist/adapter/ember/consts.js.map +1 -1
- package/dist/adapter/ember/enums.d.ts +2 -2
- package/dist/adapter/ember/enums.d.ts.map +1 -1
- package/dist/adapter/ember/enums.js +8 -50
- package/dist/adapter/ember/enums.js.map +1 -1
- package/dist/adapter/ember/ezsp/buffalo.d.ts +4 -4
- package/dist/adapter/ember/ezsp/buffalo.d.ts.map +1 -1
- package/dist/adapter/ember/ezsp/buffalo.js +35 -34
- package/dist/adapter/ember/ezsp/buffalo.js.map +1 -1
- package/dist/adapter/ember/ezsp/consts.d.ts.map +1 -1
- package/dist/adapter/ember/ezsp/consts.js +4 -4
- package/dist/adapter/ember/ezsp/consts.js.map +1 -1
- package/dist/adapter/ember/ezsp/enums.d.ts.map +1 -1
- package/dist/adapter/ember/ezsp/enums.js +0 -2
- package/dist/adapter/ember/ezsp/enums.js.map +1 -1
- package/dist/adapter/ember/ezsp/ezsp.d.ts +23 -20
- package/dist/adapter/ember/ezsp/ezsp.d.ts.map +1 -1
- package/dist/adapter/ember/ezsp/ezsp.js +1146 -1141
- package/dist/adapter/ember/ezsp/ezsp.js.map +1 -1
- package/dist/adapter/ember/ezspError.d.ts +1 -1
- package/dist/adapter/ember/ezspError.d.ts.map +1 -1
- package/dist/adapter/ember/ezspError.js.map +1 -1
- package/dist/adapter/ember/types.d.ts +2 -1
- package/dist/adapter/ember/types.d.ts.map +1 -1
- package/dist/adapter/ember/uart/ash.d.ts +5 -5
- package/dist/adapter/ember/uart/ash.d.ts.map +1 -1
- package/dist/adapter/ember/uart/ash.js +66 -65
- package/dist/adapter/ember/uart/ash.js.map +1 -1
- package/dist/adapter/ember/uart/consts.d.ts.map +1 -1
- package/dist/adapter/ember/uart/consts.js +9 -9
- package/dist/adapter/ember/uart/consts.js.map +1 -1
- package/dist/adapter/ember/uart/enums.d.ts.map +1 -1
- package/dist/adapter/ember/uart/parser.d.ts +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.map +1 -1
- package/dist/adapter/ember/uart/queues.js +1 -1
- package/dist/adapter/ember/uart/queues.js.map +1 -1
- package/dist/adapter/ember/uart/writer.d.ts +1 -1
- package/dist/adapter/ember/uart/writer.d.ts.map +1 -1
- package/dist/adapter/ember/uart/writer.js +2 -3
- package/dist/adapter/ember/uart/writer.js.map +1 -1
- package/dist/adapter/ember/utils/initters.d.ts +2 -2
- package/dist/adapter/ember/utils/initters.d.ts.map +1 -1
- package/dist/adapter/ember/utils/initters.js +1 -0
- package/dist/adapter/ember/utils/initters.js.map +1 -1
- package/dist/adapter/ember/utils/math.d.ts.map +1 -1
- package/dist/adapter/ember/utils/math.js +11 -11
- package/dist/adapter/ember/utils/math.js.map +1 -1
- package/dist/adapter/events.d.ts +1 -1
- package/dist/adapter/events.d.ts.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 +11 -10
- package/dist/adapter/ezsp/adapter/backup.js.map +1 -1
- package/dist/adapter/ezsp/adapter/ezspAdapter.d.ts +4 -4
- package/dist/adapter/ezsp/adapter/ezspAdapter.d.ts.map +1 -1
- package/dist/adapter/ezsp/adapter/ezspAdapter.js +74 -41
- package/dist/adapter/ezsp/adapter/ezspAdapter.js.map +1 -1
- package/dist/adapter/ezsp/adapter/index.d.ts +1 -1
- package/dist/adapter/ezsp/adapter/index.d.ts.map +1 -1
- package/dist/adapter/ezsp/adapter/index.js.map +1 -1
- package/dist/adapter/ezsp/driver/commands.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/commands.js +452 -452
- package/dist/adapter/ezsp/driver/commands.js.map +1 -1
- package/dist/adapter/ezsp/driver/consts.js +4 -4
- package/dist/adapter/ezsp/driver/consts.js.map +1 -1
- package/dist/adapter/ezsp/driver/driver.d.ts +5 -5
- package/dist/adapter/ezsp/driver/driver.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/driver.js +82 -82
- 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 +58 -58
- package/dist/adapter/ezsp/driver/ezsp.js.map +1 -1
- package/dist/adapter/ezsp/driver/frame.js +9 -9
- package/dist/adapter/ezsp/driver/frame.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 +2 -2
- 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 +1 -1
- package/dist/adapter/ezsp/driver/multicast.js.map +1 -1
- package/dist/adapter/ezsp/driver/parser.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/parser.js +1 -1
- 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 +5 -5
- package/dist/adapter/ezsp/driver/types/basic.js.map +1 -1
- package/dist/adapter/ezsp/driver/types/index.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/types/index.js.map +1 -1
- package/dist/adapter/ezsp/driver/types/named.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/types/named.js +236 -234
- 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 +5 -3
- package/dist/adapter/ezsp/driver/types/struct.js.map +1 -1
- package/dist/adapter/ezsp/driver/uart.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/uart.js +8 -8
- package/dist/adapter/ezsp/driver/uart.js.map +1 -1
- package/dist/adapter/ezsp/driver/utils/index.d.ts +1 -1
- package/dist/adapter/ezsp/driver/utils/index.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/utils/index.js +12 -11
- 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 +6 -7
- package/dist/adapter/ezsp/driver/writer.js.map +1 -1
- package/dist/adapter/index.d.ts +2 -2
- package/dist/adapter/index.d.ts.map +1 -1
- package/dist/adapter/index.js +2 -2
- package/dist/adapter/index.js.map +1 -1
- package/dist/adapter/serialPort.d.ts +1 -1
- package/dist/adapter/serialPort.d.ts.map +1 -1
- package/dist/adapter/serialPort.js +1 -1
- package/dist/adapter/serialPort.js.map +1 -1
- package/dist/adapter/serialPortUtils.js +1 -1
- package/dist/adapter/serialPortUtils.js.map +1 -1
- package/dist/adapter/socketPortUtils.js +3 -3
- package/dist/adapter/tstype.d.ts +1 -1
- package/dist/adapter/tstype.d.ts.map +1 -1
- package/dist/adapter/z-stack/adapter/adapter-backup.d.ts +3 -3
- package/dist/adapter/z-stack/adapter/adapter-backup.d.ts.map +1 -1
- package/dist/adapter/z-stack/adapter/adapter-backup.js +101 -86
- package/dist/adapter/z-stack/adapter/adapter-backup.js.map +1 -1
- package/dist/adapter/z-stack/adapter/adapter-nv-memory.d.ts +10 -10
- package/dist/adapter/z-stack/adapter/adapter-nv-memory.d.ts.map +1 -1
- package/dist/adapter/z-stack/adapter/adapter-nv-memory.js +30 -24
- package/dist/adapter/z-stack/adapter/adapter-nv-memory.js.map +1 -1
- package/dist/adapter/z-stack/adapter/endpoints.d.ts.map +1 -1
- package/dist/adapter/z-stack/adapter/endpoints.js +4 -4
- package/dist/adapter/z-stack/adapter/endpoints.js.map +1 -1
- package/dist/adapter/z-stack/adapter/index.d.ts +1 -1
- package/dist/adapter/z-stack/adapter/index.d.ts.map +1 -1
- package/dist/adapter/z-stack/adapter/index.js.map +1 -1
- package/dist/adapter/z-stack/adapter/manager.d.ts +5 -5
- package/dist/adapter/z-stack/adapter/manager.d.ts.map +1 -1
- package/dist/adapter/z-stack/adapter/manager.js +90 -81
- package/dist/adapter/z-stack/adapter/manager.js.map +1 -1
- package/dist/adapter/z-stack/adapter/tstype.d.ts +1 -1
- package/dist/adapter/z-stack/adapter/tstype.d.ts.map +1 -1
- package/dist/adapter/z-stack/adapter/zStackAdapter.d.ts +5 -5
- package/dist/adapter/z-stack/adapter/zStackAdapter.d.ts.map +1 -1
- package/dist/adapter/z-stack/adapter/zStackAdapter.js +72 -57
- package/dist/adapter/z-stack/adapter/zStackAdapter.js.map +1 -1
- package/dist/adapter/z-stack/constants/af.js +5 -5
- package/dist/adapter/z-stack/constants/af.js.map +1 -1
- package/dist/adapter/z-stack/constants/dbg.js +2 -2
- package/dist/adapter/z-stack/constants/index.d.ts +2 -2
- package/dist/adapter/z-stack/constants/index.d.ts.map +1 -1
- package/dist/adapter/z-stack/constants/index.js +2 -2
- package/dist/adapter/z-stack/constants/index.js.map +1 -1
- package/dist/adapter/z-stack/constants/mac.js +11 -11
- package/dist/adapter/z-stack/constants/sapi.js +4 -4
- package/dist/adapter/z-stack/constants/sys.js +11 -11
- package/dist/adapter/z-stack/constants/util.js +11 -11
- package/dist/adapter/z-stack/constants/utils.d.ts.map +1 -1
- package/dist/adapter/z-stack/constants/utils.js +3 -3
- package/dist/adapter/z-stack/constants/utils.js.map +1 -1
- package/dist/adapter/z-stack/constants/zdo.js +13 -13
- package/dist/adapter/z-stack/models/index.d.ts +1 -1
- package/dist/adapter/z-stack/models/startup-options.d.ts +2 -2
- package/dist/adapter/z-stack/structs/entries/address-manager-entry.d.ts +1 -1
- package/dist/adapter/z-stack/structs/entries/address-manager-entry.js +4 -4
- 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 +2 -2
- 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 +4 -7
- 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.d.ts +1 -1
- package/dist/adapter/z-stack/structs/entries/aps-link-key-data-entry.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/aps-link-key-data-entry.js +1 -5
- 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 +2 -2
- 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 +3 -6
- 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.d.ts +1 -1
- package/dist/adapter/z-stack/structs/entries/aps-tc-link-key-entry.js +6 -6
- package/dist/adapter/z-stack/structs/entries/aps-tc-link-key-table.d.ts +2 -2
- 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 +3 -6
- 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.d.ts +1 -1
- package/dist/adapter/z-stack/structs/entries/channel-list.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/channel-list.js +1 -3
- 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 +2 -2
- package/dist/adapter/z-stack/structs/entries/has-configured.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/index.d.ts +16 -16
- 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 +50 -50
- 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 +1 -4
- 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 +1 -3
- package/dist/adapter/z-stack/structs/entries/nwk-key.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/nwk-pan-id.d.ts +1 -1
- package/dist/adapter/z-stack/structs/entries/nwk-pan-id.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/nwk-pan-id.js +1 -3
- 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.d.ts +1 -1
- package/dist/adapter/z-stack/structs/entries/nwk-sec-material-descriptor-entry.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/entries/nwk-sec-material-descriptor-entry.js +3 -3
- 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 +2 -2
- 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 +3 -6
- 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.d.ts +1 -1
- package/dist/adapter/z-stack/structs/entries/security-manager-entry.js +4 -4
- package/dist/adapter/z-stack/structs/entries/security-manager-table.d.ts +2 -2
- 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 +3 -7
- package/dist/adapter/z-stack/structs/entries/security-manager-table.js.map +1 -1
- package/dist/adapter/z-stack/structs/index.d.ts +4 -4
- package/dist/adapter/z-stack/structs/serializable-memory-object.d.ts +1 -1
- package/dist/adapter/z-stack/structs/struct.d.ts +6 -6
- package/dist/adapter/z-stack/structs/struct.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/struct.js +53 -52
- package/dist/adapter/z-stack/structs/struct.js.map +1 -1
- package/dist/adapter/z-stack/structs/table.d.ts +3 -3
- package/dist/adapter/z-stack/structs/table.d.ts.map +1 -1
- package/dist/adapter/z-stack/structs/table.js +16 -16
- package/dist/adapter/z-stack/structs/table.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/z-stack/unpi/frame.d.ts.map +1 -1
- package/dist/adapter/z-stack/unpi/frame.js +5 -6
- package/dist/adapter/z-stack/unpi/frame.js.map +1 -1
- package/dist/adapter/z-stack/unpi/index.d.ts +4 -4
- package/dist/adapter/z-stack/unpi/index.d.ts.map +1 -1
- package/dist/adapter/z-stack/unpi/index.js +6 -6
- package/dist/adapter/z-stack/unpi/index.js.map +1 -1
- package/dist/adapter/z-stack/unpi/parser.d.ts.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/unpi/writer.d.ts.map +1 -1
- package/dist/adapter/z-stack/unpi/writer.js.map +1 -1
- package/dist/adapter/z-stack/utils/channel-list.d.ts.map +1 -1
- package/dist/adapter/z-stack/utils/channel-list.js +5 -2
- package/dist/adapter/z-stack/utils/channel-list.js.map +1 -1
- package/dist/adapter/z-stack/utils/index.d.ts +2 -2
- package/dist/adapter/z-stack/utils/network-options.d.ts +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 -1
- package/dist/adapter/z-stack/utils/network-options.js.map +1 -1
- package/dist/adapter/z-stack/znp/buffaloZnp.d.ts.map +1 -1
- package/dist/adapter/z-stack/znp/buffaloZnp.js +8 -8
- package/dist/adapter/z-stack/znp/buffaloZnp.js.map +1 -1
- package/dist/adapter/z-stack/znp/definition.d.ts.map +1 -1
- package/dist/adapter/z-stack/znp/definition.js +200 -592
- package/dist/adapter/z-stack/znp/definition.js.map +1 -1
- package/dist/adapter/z-stack/znp/index.d.ts +1 -1
- package/dist/adapter/z-stack/znp/index.d.ts.map +1 -1
- package/dist/adapter/z-stack/znp/index.js.map +1 -1
- package/dist/adapter/z-stack/znp/parameterType.d.ts.map +1 -1
- package/dist/adapter/z-stack/znp/parameterType.js.map +1 -1
- package/dist/adapter/z-stack/znp/tstype.d.ts.map +1 -1
- package/dist/adapter/z-stack/znp/znp.d.ts +3 -3
- package/dist/adapter/z-stack/znp/znp.d.ts.map +1 -1
- package/dist/adapter/z-stack/znp/znp.js +12 -15
- package/dist/adapter/z-stack/znp/znp.js.map +1 -1
- package/dist/adapter/z-stack/znp/zpiObject.d.ts +1 -1
- package/dist/adapter/z-stack/znp/zpiObject.d.ts.map +1 -1
- package/dist/adapter/z-stack/znp/zpiObject.js +17 -9
- package/dist/adapter/z-stack/znp/zpiObject.js.map +1 -1
- package/dist/adapter/zigate/adapter/index.d.ts.map +1 -1
- package/dist/adapter/zigate/adapter/index.js.map +1 -1
- package/dist/adapter/zigate/adapter/zigateAdapter.d.ts +1 -1
- package/dist/adapter/zigate/adapter/zigateAdapter.d.ts.map +1 -1
- package/dist/adapter/zigate/adapter/zigateAdapter.js +88 -92
- package/dist/adapter/zigate/adapter/zigateAdapter.js.map +1 -1
- package/dist/adapter/zigate/driver/buffaloZiGate.js.map +1 -1
- package/dist/adapter/zigate/driver/commandType.d.ts +2 -2
- package/dist/adapter/zigate/driver/commandType.d.ts.map +1 -1
- package/dist/adapter/zigate/driver/commandType.js +72 -80
- package/dist/adapter/zigate/driver/commandType.js.map +1 -1
- package/dist/adapter/zigate/driver/constants.d.ts +9 -9
- package/dist/adapter/zigate/driver/constants.d.ts.map +1 -1
- package/dist/adapter/zigate/driver/constants.js +11 -65
- 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 +3 -15
- package/dist/adapter/zigate/driver/frame.js.map +1 -1
- package/dist/adapter/zigate/driver/messageType.d.ts +1 -1
- package/dist/adapter/zigate/driver/messageType.d.ts.map +1 -1
- package/dist/adapter/zigate/driver/messageType.js +29 -30
- package/dist/adapter/zigate/driver/messageType.js.map +1 -1
- package/dist/adapter/zigate/driver/parameterType.d.ts.map +1 -1
- package/dist/adapter/zigate/driver/parameterType.js.map +1 -1
- package/dist/adapter/zigate/driver/ziGateObject.d.ts +2 -2
- package/dist/adapter/zigate/driver/ziGateObject.d.ts.map +1 -1
- package/dist/adapter/zigate/driver/ziGateObject.js +11 -5
- package/dist/adapter/zigate/driver/ziGateObject.js.map +1 -1
- package/dist/adapter/zigate/driver/zigate.d.ts +5 -5
- package/dist/adapter/zigate/driver/zigate.d.ts.map +1 -1
- package/dist/adapter/zigate/driver/zigate.js +12 -12
- package/dist/adapter/zigate/driver/zigate.js.map +1 -1
- package/dist/buffalo/buffalo.d.ts +1 -1
- package/dist/buffalo/buffalo.d.ts.map +1 -1
- package/dist/buffalo/buffalo.js +1 -1
- package/dist/buffalo/buffalo.js.map +1 -1
- package/dist/controller/controller.d.ts.map +1 -1
- package/dist/controller/controller.js +34 -33
- package/dist/controller/controller.js.map +1 -1
- package/dist/controller/database.d.ts.map +1 -1
- package/dist/controller/database.js +6 -2
- package/dist/controller/database.js.map +1 -1
- package/dist/controller/events.d.ts +3 -3
- package/dist/controller/events.d.ts.map +1 -1
- package/dist/controller/greenPower.d.ts +1 -1
- package/dist/controller/greenPower.d.ts.map +1 -1
- package/dist/controller/greenPower.js +15 -17
- package/dist/controller/greenPower.js.map +1 -1
- package/dist/controller/helpers/index.d.ts +1 -1
- package/dist/controller/helpers/index.d.ts.map +1 -1
- package/dist/controller/helpers/index.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 +7 -10
- 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 +2 -3
- package/dist/controller/helpers/requestQueue.js.map +1 -1
- package/dist/controller/helpers/zclFrameConverter.d.ts +1 -1
- 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 +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 +3 -3
- package/dist/controller/model/device.d.ts.map +1 -1
- package/dist/controller/model/device.js +247 -94
- package/dist/controller/model/device.js.map +1 -1
- package/dist/controller/model/endpoint.d.ts +4 -4
- package/dist/controller/model/endpoint.d.ts.map +1 -1
- package/dist/controller/model/endpoint.js +45 -31
- package/dist/controller/model/endpoint.js.map +1 -1
- package/dist/controller/model/entity.d.ts +2 -2
- package/dist/controller/model/entity.d.ts.map +1 -1
- package/dist/controller/model/entity.js.map +1 -1
- package/dist/controller/model/group.d.ts +2 -2
- package/dist/controller/model/group.d.ts.map +1 -1
- package/dist/controller/model/group.js +8 -6
- package/dist/controller/model/group.js.map +1 -1
- package/dist/controller/model/index.d.ts +1 -1
- package/dist/controller/model/index.d.ts.map +1 -1
- package/dist/controller/model/index.js.map +1 -1
- package/dist/controller/touchlink.d.ts.map +1 -1
- package/dist/controller/touchlink.js +2 -2
- package/dist/controller/touchlink.js.map +1 -1
- package/dist/controller/tstype.d.ts.map +1 -1
- package/dist/controller/tstype.js +0 -1
- package/dist/controller/tstype.js.map +1 -1
- package/dist/models/backup-storage-legacy.d.ts +4 -4
- package/dist/models/backup-storage-legacy.d.ts.map +1 -1
- package/dist/models/backup-storage-unified.d.ts +1 -1
- package/dist/models/backup.d.ts +2 -2
- package/dist/models/index.d.ts +4 -4
- package/dist/utils/backup.d.ts +1 -1
- package/dist/utils/backup.d.ts.map +1 -1
- package/dist/utils/backup.js +71 -58
- package/dist/utils/backup.js.map +1 -1
- package/dist/utils/index.d.ts +6 -6
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +10 -10
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/isNumberArray.js +1 -1
- package/dist/utils/isNumberArray.js.map +1 -1
- package/dist/utils/queue.js +1 -1
- package/dist/utils/queue.js.map +1 -1
- package/dist/utils/waitress.d.ts.map +1 -1
- package/dist/utils/waitress.js +2 -2
- package/dist/utils/waitress.js.map +1 -1
- package/dist/zspec/consts.d.ts +1 -1
- package/dist/zspec/consts.d.ts.map +1 -1
- package/dist/zspec/consts.js +16 -16
- package/dist/zspec/consts.js.map +1 -1
- package/dist/zspec/enums.js +0 -1
- package/dist/zspec/enums.js.map +1 -1
- package/dist/zspec/utils.d.ts.map +1 -1
- package/dist/zspec/utils.js +5 -3
- package/dist/zspec/utils.js.map +1 -1
- package/dist/zspec/zcl/buffaloZcl.d.ts +2 -2
- package/dist/zspec/zcl/buffaloZcl.d.ts.map +1 -1
- package/dist/zspec/zcl/buffaloZcl.js +44 -51
- 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 +284 -380
- package/dist/zspec/zcl/definition/cluster.js.map +1 -1
- package/dist/zspec/zcl/definition/consts.js +10 -10
- package/dist/zspec/zcl/definition/consts.js.map +1 -1
- package/dist/zspec/zcl/definition/enums.d.ts.map +1 -1
- package/dist/zspec/zcl/definition/enums.js.map +1 -1
- package/dist/zspec/zcl/definition/foundation.d.ts +1 -1
- package/dist/zspec/zcl/definition/foundation.d.ts.map +1 -1
- package/dist/zspec/zcl/definition/foundation.js +51 -22
- package/dist/zspec/zcl/definition/foundation.js.map +1 -1
- package/dist/zspec/zcl/definition/manufacturerCode.js +0 -1
- package/dist/zspec/zcl/definition/manufacturerCode.js.map +1 -1
- package/dist/zspec/zcl/definition/status.d.ts.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/definition/tstype.js +0 -1
- package/dist/zspec/zcl/definition/tstype.js.map +1 -1
- package/dist/zspec/zcl/utils.d.ts.map +1 -1
- package/dist/zspec/zcl/utils.js +59 -19
- package/dist/zspec/zcl/utils.js.map +1 -1
- package/dist/zspec/zcl/zclFrame.d.ts +1 -1
- package/dist/zspec/zcl/zclFrame.d.ts.map +1 -1
- package/dist/zspec/zcl/zclFrame.js +14 -15
- package/dist/zspec/zcl/zclFrame.js.map +1 -1
- package/dist/zspec/zcl/zclHeader.d.ts +1 -1
- package/dist/zspec/zcl/zclHeader.d.ts.map +1 -1
- package/dist/zspec/zcl/zclHeader.js +7 -7
- package/dist/zspec/zcl/zclHeader.js.map +1 -1
- package/dist/zspec/zcl/zclStatusError.d.ts.map +1 -1
- package/dist/zspec/zcl/zclStatusError.js.map +1 -1
- package/dist/zspec/zdo/buffaloZdo.d.ts +3 -3
- package/dist/zspec/zdo/buffaloZdo.d.ts.map +1 -1
- package/dist/zspec/zdo/buffaloZdo.js +92 -92
- package/dist/zspec/zdo/buffaloZdo.js.map +1 -1
- package/dist/zspec/zdo/definition/clusters.d.ts.map +1 -1
- package/dist/zspec/zdo/definition/clusters.js +0 -1
- package/dist/zspec/zdo/definition/clusters.js.map +1 -1
- package/dist/zspec/zdo/definition/consts.d.ts.map +1 -1
- package/dist/zspec/zdo/definition/consts.js.map +1 -1
- package/dist/zspec/zdo/definition/enums.d.ts.map +1 -1
- package/dist/zspec/zdo/definition/enums.js +0 -5
- package/dist/zspec/zdo/definition/enums.js.map +1 -1
- package/dist/zspec/zdo/definition/status.d.ts.map +1 -1
- package/dist/zspec/zdo/definition/status.js +0 -1
- package/dist/zspec/zdo/definition/status.js.map +1 -1
- package/dist/zspec/zdo/definition/tstypes.d.ts +2 -2
- package/dist/zspec/zdo/definition/tstypes.d.ts.map +1 -1
- package/dist/zspec/zdo/utils.d.ts.map +1 -1
- package/dist/zspec/zdo/utils.js +14 -14
- package/dist/zspec/zdo/utils.js.map +1 -1
- package/dist/zspec/zdo/zdoStatusError.d.ts.map +1 -1
- package/dist/zspec/zdo/zdoStatusError.js.map +1 -1
- package/package.json +6 -1
- package/dist/adapter/ember/adapter/requestQueue.d.ts +0 -67
- package/dist/adapter/ember/adapter/requestQueue.d.ts.map +0 -1
- package/dist/adapter/ember/adapter/requestQueue.js +0 -159
- package/dist/adapter/ember/adapter/requestQueue.js.map +0 -1
|
@@ -26,35 +26,34 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
26
26
|
exports.Writer = void 0;
|
|
27
27
|
/* istanbul ignore file */
|
|
28
28
|
const stream = __importStar(require("stream"));
|
|
29
|
+
const logger_1 = require("../../../utils/logger");
|
|
29
30
|
const consts = __importStar(require("./consts"));
|
|
30
31
|
const utils_1 = require("./utils");
|
|
31
|
-
const logger_1 = require("../../../utils/logger");
|
|
32
32
|
const NS = 'zh:ezsp:uart';
|
|
33
33
|
class Writer extends stream.Readable {
|
|
34
34
|
writeBuffer(buffer) {
|
|
35
35
|
logger_1.logger.debug(`--> [${buffer.toString('hex')}]`, NS);
|
|
36
36
|
this.push(buffer);
|
|
37
37
|
}
|
|
38
|
-
_read() {
|
|
39
|
-
}
|
|
38
|
+
_read() { }
|
|
40
39
|
sendACK(ackNum) {
|
|
41
40
|
/* Construct a acknowledgement frame */
|
|
42
|
-
const ackFrame = this.makeFrame(
|
|
41
|
+
const ackFrame = this.makeFrame(0b10000000 | ackNum);
|
|
43
42
|
this.writeBuffer(ackFrame);
|
|
44
43
|
}
|
|
45
44
|
sendNAK(ackNum) {
|
|
46
45
|
/* Construct a negative acknowledgement frame */
|
|
47
|
-
const nakFrame = this.makeFrame(
|
|
46
|
+
const nakFrame = this.makeFrame(0b10100000 | ackNum);
|
|
48
47
|
this.writeBuffer(nakFrame);
|
|
49
48
|
}
|
|
50
49
|
sendReset() {
|
|
51
50
|
/* Construct a reset frame */
|
|
52
|
-
const rstFrame = Buffer.concat([Buffer.from([consts.CANCEL]), this.makeFrame(
|
|
51
|
+
const rstFrame = Buffer.concat([Buffer.from([consts.CANCEL]), this.makeFrame(0xc0)]);
|
|
53
52
|
this.writeBuffer(rstFrame);
|
|
54
53
|
}
|
|
55
54
|
sendData(data, seq, rxmit, ackSeq) {
|
|
56
55
|
/* Construct a data frame */
|
|
57
|
-
const control = (
|
|
56
|
+
const control = (seq << 4) | (rxmit << 3) | ackSeq;
|
|
58
57
|
const dataFrame = this.makeFrame(control, data);
|
|
59
58
|
this.writeBuffer(dataFrame);
|
|
60
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writer.js","sourceRoot":"","sources":["../../../../src/adapter/ezsp/driver/writer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0BAA0B;AAC1B,+CAAiC;
|
|
1
|
+
{"version":3,"file":"writer.js","sourceRoot":"","sources":["../../../../src/adapter/ezsp/driver/writer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0BAA0B;AAC1B,+CAAiC;AAEjC,kDAA6C;AAC7C,iDAAmC;AACnC,mCAAmC;AAEnC,MAAM,EAAE,GAAG,cAAc,CAAC;AAE1B,MAAa,MAAO,SAAQ,MAAM,CAAC,QAAQ;IAChC,WAAW,CAAC,MAAc;QAC7B,eAAM,CAAC,KAAK,CAAC,QAAQ,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACpD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC;IAEM,KAAK,KAAU,CAAC;IAEhB,OAAO,CAAC,MAAc;QACzB,uCAAuC;QACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,GAAG,MAAM,CAAC,CAAC;QACrD,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;IAEM,OAAO,CAAC,MAAc;QACzB,gDAAgD;QAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,GAAG,MAAM,CAAC,CAAC;QACrD,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;IAEM,SAAS;QACZ,6BAA6B;QAC7B,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACrF,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;IAEM,QAAQ,CAAC,IAAY,EAAE,GAAW,EAAE,KAAa,EAAE,MAAc;QACpE,4BAA4B;QAC5B,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC;QACnD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAChD,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,CAAC;IAEO,CAAC,KAAK,CAAC,MAAgB;QAC3B,mDAAmD;QACnD,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;YACxB,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACjC,MAAM,MAAM,CAAC,MAAM,CAAC;gBACpB,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC;YAC9B,CAAC;iBAAM,CAAC;gBACJ,MAAM,IAAI,CAAC;YACf,CAAC;QACL,CAAC;IACL,CAAC;IAEO,SAAS,CAAC,OAAe,EAAE,IAAa;QAC5C,uBAAuB;QACvB,MAAM,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;QACvC,MAAM,GAAG,GAAG,IAAA,kBAAU,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACnC,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;QACnB,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC;QACpB,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,CAAC;CACJ;AArDD,wBAqDC"}
|
package/dist/adapter/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/adapter/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/adapter/index.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AAEnC,OAAO,EAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAC,CAAC"}
|
package/dist/adapter/index.js
CHANGED
|
@@ -27,10 +27,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
exports.Events = exports.Adapter = exports.TsType = void 0;
|
|
30
|
-
const TsType = __importStar(require("./tstype"));
|
|
31
|
-
exports.TsType = TsType;
|
|
32
30
|
const adapter_1 = __importDefault(require("./adapter"));
|
|
33
31
|
exports.Adapter = adapter_1.default;
|
|
34
32
|
const Events = __importStar(require("./events"));
|
|
35
33
|
exports.Events = Events;
|
|
34
|
+
const TsType = __importStar(require("./tstype"));
|
|
35
|
+
exports.TsType = TsType;
|
|
36
36
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/adapter/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/adapter/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAgC;AAIhB,kBAJT,iBAAO,CAIS;AAHvB,iDAAmC;AAGV,wBAAM;AAF/B,iDAAmC;AAE3B,wBAAM"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ErrorCallback, SerialPortStream, StreamOptions } from '@serialport/stream';
|
|
2
1
|
import { AutoDetectTypes, OpenOptionsFromBinding } from '@serialport/bindings-cpp';
|
|
2
|
+
import { ErrorCallback, SerialPortStream, StreamOptions } from '@serialport/stream';
|
|
3
3
|
export type SerialPortOpenOptions<T extends AutoDetectTypes> = Omit<StreamOptions<T>, 'binding'> & OpenOptionsFromBinding<T>;
|
|
4
4
|
export declare class SerialPort<T extends AutoDetectTypes = AutoDetectTypes> extends SerialPortStream<T> {
|
|
5
5
|
static list: () => Promise<import("@serialport/bindings-interface").PortInfo[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serialPort.d.ts","sourceRoot":"","sources":["../../src/adapter/serialPort.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"serialPort.d.ts","sourceRoot":"","sources":["../../src/adapter/serialPort.ts"],"names":[],"mappings":"AAGA,OAAO,EAAa,eAAe,EAAE,sBAAsB,EAAC,MAAM,0BAA0B,CAAC;AAE7F,OAAO,EAAC,aAAa,EAAe,gBAAgB,EAAE,aAAa,EAAC,MAAM,oBAAoB,CAAC;AAI/F,MAAM,MAAM,qBAAqB,CAAC,CAAC,SAAS,eAAe,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC;AAE7H,qBAAa,UAAU,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IAC5F,MAAM,CAAC,IAAI,qEAAwB;IACnC,MAAM,CAAC,QAAQ,CAAC,OAAO,kBAAmB;gBAE9B,OAAO,EAAE,qBAAqB,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,aAAa;IAQ9D,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1B,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAM3B,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAM3B,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnC,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;CAK3C"}
|
|
@@ -4,9 +4,9 @@ exports.SerialPort = void 0;
|
|
|
4
4
|
/* istanbul ignore file */
|
|
5
5
|
/* eslint-disable max-len */
|
|
6
6
|
/* eslint-disable @typescript-eslint/semi */
|
|
7
|
+
const bindings_cpp_1 = require("@serialport/bindings-cpp");
|
|
7
8
|
// This file was copied from https://github.com/serialport/node-serialport/blob/master/packages/serialport/lib/serialport.ts.
|
|
8
9
|
const stream_1 = require("@serialport/stream");
|
|
9
|
-
const bindings_cpp_1 = require("@serialport/bindings-cpp");
|
|
10
10
|
const DetectedBinding = (0, bindings_cpp_1.autoDetect)();
|
|
11
11
|
class SerialPort extends stream_1.SerialPortStream {
|
|
12
12
|
static list = DetectedBinding.list;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serialPort.js","sourceRoot":"","sources":["../../src/adapter/serialPort.ts"],"names":[],"mappings":";;;AAAA,0BAA0B;AAC1B,4BAA4B;AAC5B,4CAA4C;AAC5C,6HAA6H;AAC7H,+CAA+F;
|
|
1
|
+
{"version":3,"file":"serialPort.js","sourceRoot":"","sources":["../../src/adapter/serialPort.ts"],"names":[],"mappings":";;;AAAA,0BAA0B;AAC1B,4BAA4B;AAC5B,4CAA4C;AAC5C,2DAA6F;AAC7F,6HAA6H;AAC7H,+CAA+F;AAE/F,MAAM,eAAe,GAAG,IAAA,yBAAU,GAAE,CAAC;AAIrC,MAAa,UAAwD,SAAQ,yBAAmB;IAC5F,MAAM,CAAC,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC;IACnC,MAAM,CAAU,OAAO,GAAG,eAAe,CAAC;IAE1C,YAAY,OAAiC,EAAE,YAA4B;QACvE,MAAM,IAAI,GAAmB;YACzB,OAAO,EAAE,eAAoB;YAC7B,GAAG,OAAO;SACb,CAAC;QACF,KAAK,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAC9B,CAAC;IAEM,KAAK,CAAC,SAAS;QAClB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAQ,EAAE;YACzC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,KAAK,CAAC,UAAU;QACnB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAQ,EAAE;YACzC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,KAAK,CAAC,UAAU;QACnB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAQ,EAAE;YACzC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,KAAK,CAAC,kBAAkB;QAC3B,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;IAC5B,CAAC;IAEM,KAAK,CAAC,QAAQ;QACjB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAQ,EAAE;YACzC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,OAAQ,EAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC9E,CAAC,CAAC,CAAC;IACP,CAAC;;AAvCL,gCAwCC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const serialPort_1 = require("./serialPort");
|
|
4
3
|
const utils_1 = require("../utils");
|
|
4
|
+
const serialPort_1 = require("./serialPort");
|
|
5
5
|
async function find(matchers) {
|
|
6
6
|
let devices = await serialPort_1.SerialPort.list();
|
|
7
7
|
devices = devices.filter((device) => matchers.find((matcher) => (0, utils_1.EqualsPartial)(device, matcher)) != null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serialPortUtils.js","sourceRoot":"","sources":["../../src/adapter/serialPortUtils.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"serialPortUtils.js","sourceRoot":"","sources":["../../src/adapter/serialPortUtils.ts"],"names":[],"mappings":";;AAAA,oCAAuC;AACvC,6CAAwC;AAQxC,KAAK,UAAU,IAAI,CAAC,QAAyB;IACzC,IAAI,OAAO,GAAG,MAAM,uBAAU,CAAC,IAAI,EAAE,CAAC;IACtC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,qBAAa,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC;IACzG,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAChD,CAAC;AAED,KAAK,UAAU,EAAE,CAAC,IAAY,EAAE,QAAyB;IACrD,MAAM,OAAO,GAAG,MAAM,uBAAU,CAAC,IAAI,EAAE,CAAC;IACxC,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IAC9D,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,qBAAa,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAI,IAAI,CAAC;AAC9E,CAAC;AAED,kBAAe,EAAC,EAAE,EAAE,IAAI,EAAC,CAAC"}
|
|
@@ -7,10 +7,10 @@ function isTcpPath(path) {
|
|
|
7
7
|
return regex.test(path);
|
|
8
8
|
}
|
|
9
9
|
function parseTcpPath(path) {
|
|
10
|
-
const str = path.replace(
|
|
10
|
+
const str = path.replace('tcp://', '');
|
|
11
11
|
return {
|
|
12
|
-
host: str.substring(0, str.indexOf(
|
|
13
|
-
port: Number(str.substring(str.indexOf(
|
|
12
|
+
host: str.substring(0, str.indexOf(':')),
|
|
13
|
+
port: Number(str.substring(str.indexOf(':') + 1)),
|
|
14
14
|
};
|
|
15
15
|
}
|
|
16
16
|
exports.default = { isTcpPath, parseTcpPath };
|
package/dist/adapter/tstype.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tstype.d.ts","sourceRoot":"","sources":["../../src/adapter/tstype.ts"],"names":[],"mappings":"AAAA,UAAU,cAAc;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,UAAU,iBAAiB;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;CACxE;AAED,UAAU,cAAc;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,OAAO,CAAC;IACpB,8CAA8C,CAAC,EAAE,OAAO,CAAC;CAC5D;AAED,UAAU,kBAAkB;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;KAAC,CAAC;CACxC;AAED,KAAK,UAAU,GAAG,aAAa,GAAG,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAC;AAErE,KAAK,WAAW,GAAG,SAAS,GAAG,OAAO,GAAG,UAAU,CAAC;AAEpD,UAAU,cAAc;IACpB,IAAI,EAAE,UAAU,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC5B;AAED,UAAU,eAAe;IACrB,SAAS,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,UAAU,WAAW;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,GAAG;IACT,SAAS,EAAE,WAAW,EAAE,CAAC;CAC5B;AAED,UAAU,iBAAiB;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,YAAY;IAClB,KAAK,EAAE,iBAAiB,EAAE,CAAC;CAC9B;AAED,UAAU,gBAAgB;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED,UAAU,WAAW;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE;QACP,EAAE,EAAE,MAAM,CAAC;QACX,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,EAAE,MAAM,EAAE,CAAC;QACxB,cAAc,EAAE,MAAM,EAAE,CAAC;KAC5B,EAAE,CAAC;CACP;AAED,UAAU,MAAM;IACZ,WAAW,EAAE,QAAQ,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAC;IAE5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,UAAU,iBAAiB;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,OAAO,EACH,iBAAiB,
|
|
1
|
+
{"version":3,"file":"tstype.d.ts","sourceRoot":"","sources":["../../src/adapter/tstype.ts"],"names":[],"mappings":"AAAA,UAAU,cAAc;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,UAAU,iBAAiB;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;CACxE;AAED,UAAU,cAAc;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,OAAO,CAAC;IACpB,8CAA8C,CAAC,EAAE,OAAO,CAAC;CAC5D;AAED,UAAU,kBAAkB;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;KAAC,CAAC;CACxC;AAED,KAAK,UAAU,GAAG,aAAa,GAAG,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAC;AAErE,KAAK,WAAW,GAAG,SAAS,GAAG,OAAO,GAAG,UAAU,CAAC;AAEpD,UAAU,cAAc;IACpB,IAAI,EAAE,UAAU,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC5B;AAED,UAAU,eAAe;IACrB,SAAS,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,UAAU,WAAW;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,GAAG;IACT,SAAS,EAAE,WAAW,EAAE,CAAC;CAC5B;AAED,UAAU,iBAAiB;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,YAAY;IAClB,KAAK,EAAE,iBAAiB,EAAE,CAAC;CAC9B;AAED,UAAU,gBAAgB;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED,UAAU,WAAW;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE;QACP,EAAE,EAAE,MAAM,CAAC;QACX,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,EAAE,MAAM,EAAE,CAAC;QACxB,cAAc,EAAE,MAAM,EAAE,CAAC;KAC5B,EAAE,CAAC;CACP;AAED,UAAU,MAAM;IACZ,WAAW,EAAE,QAAQ,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAC;IAE5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,UAAU,iBAAiB;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,OAAO,EACH,iBAAiB,EACjB,cAAc,EACd,WAAW,EACX,kBAAkB,EAClB,cAAc,EACd,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,GAAG,EACH,WAAW,EACX,YAAY,EACZ,MAAM,EACN,iBAAiB,EACjB,WAAW,EACX,iBAAiB,EACjB,cAAc,GACjB,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
3
|
-
import { AdapterNvMemory } from
|
|
1
|
+
import * as Models from '../../../models';
|
|
2
|
+
import { Znp } from '../znp';
|
|
3
|
+
import { AdapterNvMemory } from './adapter-nv-memory';
|
|
4
4
|
/**
|
|
5
5
|
* Class providing ZNP adapter backup and restore procedures based mostly on NV memory manipulation.
|
|
6
6
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter-backup.d.ts","sourceRoot":"","sources":["../../../../src/adapter/z-stack/adapter/adapter-backup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"adapter-backup.d.ts","sourceRoot":"","sources":["../../../../src/adapter/z-stack/adapter/adapter-backup.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAC;AAQ1C,OAAO,EAAC,GAAG,EAAC,MAAM,QAAQ,CAAC;AAC3B,OAAO,EAAC,eAAe,EAAC,MAAM,qBAAqB,CAAC;AAKpD;;GAEG;AACH,qBAAa,aAAa;IACtB,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,EAAE,CAAkB;IAC5B,OAAO,CAAC,WAAW,CAAS;gBAET,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM;IAM9D;;OAEG;IACU,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;IAwBtD;;OAEG;IACU,YAAY,CAAC,uBAAuB,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;IAyLpF;;;;OAIG;IACU,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmLhE;;;;;OAKG;YACW,iBAAiB;IAM/B;;;;OAIG;YACW,sBAAsB;IAQpC;;OAEG;YACW,uBAAuB;IAIrC;;;;OAIG;YACW,sBAAsB;IAQpC;;;;OAIG;YACW,YAAY;IAQ1B;;;;OAIG;YACW,+BAA+B;CAahD"}
|
|
@@ -24,15 +24,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.AdapterBackup = void 0;
|
|
27
|
-
|
|
28
|
-
const Utils = __importStar(require("../utils"));
|
|
29
|
-
const utils_1 = require("../../../utils");
|
|
27
|
+
/* eslint-disable max-len */
|
|
30
28
|
const mz_1 = require("mz");
|
|
29
|
+
const utils_1 = require("../../../utils");
|
|
30
|
+
const logger_1 = require("../../../utils/logger");
|
|
31
31
|
const common_1 = require("../constants/common");
|
|
32
|
+
const Structs = __importStar(require("../structs"));
|
|
33
|
+
const structs_1 = require("../structs");
|
|
32
34
|
const constants_1 = require("../unpi/constants");
|
|
35
|
+
const Utils = __importStar(require("../utils"));
|
|
33
36
|
const tstype_1 = require("./tstype");
|
|
34
|
-
const structs_1 = require("../structs");
|
|
35
|
-
const logger_1 = require("../../../utils/logger");
|
|
36
37
|
const NS = 'zh:zstack:backup';
|
|
37
38
|
/**
|
|
38
39
|
* Class providing ZNP adapter backup and restore procedures based mostly on NV memory manipulation.
|
|
@@ -63,42 +64,42 @@ class AdapterBackup {
|
|
|
63
64
|
catch (error) {
|
|
64
65
|
throw new Error('Coordinator backup is corrupted');
|
|
65
66
|
}
|
|
66
|
-
if (data.metadata?.format ===
|
|
67
|
+
if (data.metadata?.format === 'zigpy/open-coordinator-backup' && data.metadata?.version) {
|
|
67
68
|
if (data.metadata?.version !== 1) {
|
|
68
69
|
throw new Error(`Unsupported open coordinator backup version (version=${data.metadata?.version})`);
|
|
69
70
|
}
|
|
70
71
|
return utils_1.BackupUtils.fromUnifiedBackup(data);
|
|
71
72
|
}
|
|
72
|
-
else if (data.adapterType ===
|
|
73
|
+
else if (data.adapterType === 'zStack') {
|
|
73
74
|
return utils_1.BackupUtils.fromLegacyBackup(data);
|
|
74
75
|
}
|
|
75
76
|
else {
|
|
76
|
-
throw new Error(
|
|
77
|
+
throw new Error('Unknown backup format');
|
|
77
78
|
}
|
|
78
79
|
}
|
|
79
80
|
/**
|
|
80
81
|
* Creates a new backup from connected ZNP adapter and returns it in internal backup model format.
|
|
81
82
|
*/
|
|
82
83
|
async createBackup(ieeeAddressesInDatabase) {
|
|
83
|
-
logger_1.logger.debug(
|
|
84
|
+
logger_1.logger.debug('creating backup', NS);
|
|
84
85
|
const version = await this.getAdapterVersion();
|
|
85
86
|
/* get adapter ieee address */
|
|
86
|
-
const ieeeAddressResponse = await this.znp.request(constants_1.Subsystem.SYS,
|
|
87
|
-
if (!ieeeAddressResponse || !ieeeAddressResponse.payload.extaddress || !ieeeAddressResponse.payload.extaddress.startsWith(
|
|
88
|
-
throw new Error(
|
|
87
|
+
const ieeeAddressResponse = await this.znp.request(constants_1.Subsystem.SYS, 'getExtAddr', {});
|
|
88
|
+
if (!ieeeAddressResponse || !ieeeAddressResponse.payload.extaddress || !ieeeAddressResponse.payload.extaddress.startsWith('0x')) {
|
|
89
|
+
throw new Error('Failed to read adapter IEEE address');
|
|
89
90
|
}
|
|
90
|
-
const ieeeAddress = Buffer.from(ieeeAddressResponse.payload.extaddress.split(
|
|
91
|
-
logger_1.logger.debug(
|
|
91
|
+
const ieeeAddress = Buffer.from(ieeeAddressResponse.payload.extaddress.split('0x')[1], 'hex');
|
|
92
|
+
logger_1.logger.debug('fetched adapter ieee address', NS);
|
|
92
93
|
/* get adapter nib */
|
|
93
94
|
const nib = await this.nv.readItem(common_1.NvItemsIds.NIB, 0, Structs.nib);
|
|
94
95
|
if (!nib) {
|
|
95
|
-
throw new Error(
|
|
96
|
+
throw new Error('Cannot backup - adapter not commissioned');
|
|
96
97
|
}
|
|
97
|
-
logger_1.logger.debug(
|
|
98
|
+
logger_1.logger.debug('fetched adapter nib', NS);
|
|
98
99
|
/* get adapter active key information */
|
|
99
100
|
let activeKeyInfo;
|
|
100
101
|
if (version === tstype_1.ZnpVersion.zStack12) {
|
|
101
|
-
const key = Structs.nwkKey((await this.znp.request(constants_1.Subsystem.SAPI,
|
|
102
|
+
const key = Structs.nwkKey((await this.znp.request(constants_1.Subsystem.SAPI, 'readConfiguration', { configid: common_1.NvItemsIds.PRECFGKEY })).payload.value);
|
|
102
103
|
activeKeyInfo = Structs.nwkKeyDescriptor();
|
|
103
104
|
activeKeyInfo.key = key.key;
|
|
104
105
|
}
|
|
@@ -106,12 +107,12 @@ class AdapterBackup {
|
|
|
106
107
|
activeKeyInfo = await this.nv.readItem(common_1.NvItemsIds.NWK_ACTIVE_KEY_INFO, 0, Structs.nwkKeyDescriptor);
|
|
107
108
|
}
|
|
108
109
|
if (!activeKeyInfo) {
|
|
109
|
-
throw new Error(
|
|
110
|
+
throw new Error('Cannot backup - missing active key info');
|
|
110
111
|
}
|
|
111
|
-
logger_1.logger.debug(
|
|
112
|
+
logger_1.logger.debug('fetched adapter active key information', NS);
|
|
112
113
|
/* get adapter security data */
|
|
113
114
|
const preconfiguredKeyEnabled = await this.nv.readItem(common_1.NvItemsIds.PRECFGKEYS_ENABLE, 0);
|
|
114
|
-
logger_1.logger.debug(
|
|
115
|
+
logger_1.logger.debug('fetched adapter pre-configured key', NS);
|
|
115
116
|
const addressManagerTable = await this.getAddressManagerTable(version);
|
|
116
117
|
logger_1.logger.debug(`fetched adapter address manager table (capacity=${addressManagerTable?.capacity || 0}, used=${addressManagerTable?.usedCount || 0})`, NS);
|
|
117
118
|
const securityManagerTable = await this.getSecurityManagerTable();
|
|
@@ -119,7 +120,7 @@ class AdapterBackup {
|
|
|
119
120
|
const apsLinkKeyDataTable = await this.getApsLinkKeyDataTable(version);
|
|
120
121
|
logger_1.logger.debug(`fetched adapter aps link key data table (capacity=${apsLinkKeyDataTable?.usedCount || 0}, used=${apsLinkKeyDataTable?.usedCount || 0})`, NS);
|
|
121
122
|
const tclkSeed = version === tstype_1.ZnpVersion.zStack12 ? null : await this.nv.readItem(common_1.NvItemsIds.TCLK_SEED, 0, Structs.nwkKey);
|
|
122
|
-
logger_1.logger.debug(
|
|
123
|
+
logger_1.logger.debug('fetched adapter tclk seed', NS);
|
|
123
124
|
const tclkTable = await this.getTclkTable(version);
|
|
124
125
|
logger_1.logger.debug(`fetched adapter tclk table (capacity=${tclkTable?.usedCount || 0}, used=${tclkTable?.usedCount || 0})`, NS);
|
|
125
126
|
const secMaterialTable = await this.getNetworkSecurityMaterialTable(version);
|
|
@@ -147,66 +148,73 @@ class AdapterBackup {
|
|
|
147
148
|
const backup = {
|
|
148
149
|
znp: {
|
|
149
150
|
version: version,
|
|
150
|
-
trustCenterLinkKeySeed: tclkSeed?.key || undefined
|
|
151
|
+
trustCenterLinkKeySeed: tclkSeed?.key || undefined,
|
|
151
152
|
},
|
|
152
153
|
networkOptions: {
|
|
153
154
|
panId: nib.nwkPanId,
|
|
154
155
|
extendedPanId: nib.extendedPANID,
|
|
155
156
|
channelList: Utils.unpackChannelList(nib.channelList),
|
|
156
157
|
networkKey: activeKeyInfo.key,
|
|
157
|
-
networkKeyDistribute: preconfiguredKeyEnabled && preconfiguredKeyEnabled[0] === 0x01
|
|
158
|
+
networkKeyDistribute: preconfiguredKeyEnabled && preconfiguredKeyEnabled[0] === 0x01,
|
|
158
159
|
},
|
|
159
160
|
logicalChannel: nib.nwkLogicalChannel,
|
|
160
161
|
networkKeyInfo: {
|
|
161
162
|
sequenceNumber: activeKeyInfo.keySeqNum,
|
|
162
|
-
frameCounter: secMaterialDescriptor.FrameCounter
|
|
163
|
+
frameCounter: secMaterialDescriptor.FrameCounter,
|
|
163
164
|
},
|
|
164
165
|
securityLevel: nib.SecurityLevel,
|
|
165
166
|
networkUpdateId: nib.nwkUpdateId,
|
|
166
167
|
coordinatorIeeeAddress: ieeeAddress,
|
|
167
|
-
devices: addressManagerTable &&
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
/*
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
const sme = securityManagerTable.used.find(e => e.ami === ami);
|
|
175
|
-
if (sme) {
|
|
176
|
-
const apsKeyDataIndex = version === tstype_1.ZnpVersion.zStack30x ? sme.keyNvId - common_1.NvItemsIds.APS_LINK_KEY_DATA_START : sme.keyNvId;
|
|
177
|
-
const apsKeyData = apsLinkKeyDataTable.used[apsKeyDataIndex] || null;
|
|
178
|
-
if (apsKeyData) {
|
|
179
|
-
linkKeyInfo = {
|
|
180
|
-
key: apsKeyData.key,
|
|
181
|
-
rxCounter: apsKeyData.rxFrmCntr,
|
|
182
|
-
txCounter: apsKeyData.txFrmCntr
|
|
183
|
-
};
|
|
168
|
+
devices: (addressManagerTable &&
|
|
169
|
+
addressManagerTable.used
|
|
170
|
+
.map((ame, ami) => {
|
|
171
|
+
/* take all entries of assoc and/or security type */
|
|
172
|
+
if (!ame.isSet() || (ame.user & (structs_1.AddressManagerUser.Assoc | structs_1.AddressManagerUser.Security)) === 0) {
|
|
173
|
+
/* istanbul ignore next */
|
|
174
|
+
return null;
|
|
184
175
|
}
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
const
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
176
|
+
let linkKeyInfo = null;
|
|
177
|
+
const sme = securityManagerTable.used.find((e) => e.ami === ami);
|
|
178
|
+
if (sme) {
|
|
179
|
+
const apsKeyDataIndex = version === tstype_1.ZnpVersion.zStack30x ? sme.keyNvId - common_1.NvItemsIds.APS_LINK_KEY_DATA_START : sme.keyNvId;
|
|
180
|
+
const apsKeyData = apsLinkKeyDataTable.used[apsKeyDataIndex] || null;
|
|
181
|
+
if (apsKeyData) {
|
|
182
|
+
linkKeyInfo = {
|
|
183
|
+
key: apsKeyData.key,
|
|
184
|
+
rxCounter: apsKeyData.rxFrmCntr,
|
|
185
|
+
txCounter: apsKeyData.txFrmCntr,
|
|
186
|
+
};
|
|
195
187
|
}
|
|
196
|
-
linkKeyInfo = {
|
|
197
|
-
key: derivedKey,
|
|
198
|
-
rxCounter: tclkTableEntry.rxFrmCntr,
|
|
199
|
-
txCounter: tclkTableEntry.txFrmCntr
|
|
200
|
-
};
|
|
201
188
|
}
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
189
|
+
else {
|
|
190
|
+
const tclkTableEntry = tclkTable.used.find((e) => e.extAddr.equals(ame.extAddr));
|
|
191
|
+
if (tclkTableEntry) {
|
|
192
|
+
const rotatedSeed = Buffer.concat([
|
|
193
|
+
tclkSeed.key.slice(tclkTableEntry.SeedShift_IcIndex),
|
|
194
|
+
tclkSeed.key.slice(0, tclkTableEntry.SeedShift_IcIndex),
|
|
195
|
+
]);
|
|
196
|
+
const extAddrReversed = Buffer.from(ame.extAddr).reverse();
|
|
197
|
+
const extAddrRepeated = Buffer.concat([extAddrReversed, extAddrReversed]);
|
|
198
|
+
const derivedKey = Buffer.alloc(16);
|
|
199
|
+
for (let i = 0; i < 16; i++) {
|
|
200
|
+
derivedKey[i] = rotatedSeed[i] ^ extAddrRepeated[i];
|
|
201
|
+
}
|
|
202
|
+
linkKeyInfo = {
|
|
203
|
+
key: derivedKey,
|
|
204
|
+
rxCounter: tclkTableEntry.rxFrmCntr,
|
|
205
|
+
txCounter: tclkTableEntry.txFrmCntr,
|
|
206
|
+
};
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
return {
|
|
210
|
+
networkAddress: ame.nwkAddr,
|
|
211
|
+
ieeeAddress: ame.extAddr,
|
|
212
|
+
isDirectChild: (ame.user & structs_1.AddressManagerUser.Assoc) > 0,
|
|
213
|
+
linkKey: !linkKeyInfo ? undefined : linkKeyInfo,
|
|
214
|
+
};
|
|
215
|
+
})
|
|
216
|
+
.filter((e) => e)) ||
|
|
217
|
+
[],
|
|
210
218
|
};
|
|
211
219
|
try {
|
|
212
220
|
/**
|
|
@@ -217,7 +225,8 @@ class AdapterBackup {
|
|
|
217
225
|
* Below we don't remove any devices from the backup which have a linkkey and are still in the database (=ieeeAddressesInDatabase)
|
|
218
226
|
*/
|
|
219
227
|
const oldBackup = await this.getStoredBackup();
|
|
220
|
-
const missing = oldBackup.devices.filter((d) => d.linkKey &&
|
|
228
|
+
const missing = oldBackup.devices.filter((d) => d.linkKey &&
|
|
229
|
+
ieeeAddressesInDatabase.includes(`0x${d.ieeeAddress.toString('hex')}`) &&
|
|
221
230
|
!backup.devices.find((dd) => d.ieeeAddress.equals(dd.ieeeAddress)));
|
|
222
231
|
const missingStr = missing.map((d) => `0x${d.ieeeAddress.toString('hex')}`).join(', ');
|
|
223
232
|
logger_1.logger.debug(`Following devices with link key are missing from new backup but present in old backup and database, ` +
|
|
@@ -235,11 +244,11 @@ class AdapterBackup {
|
|
|
235
244
|
* @param backup Backup to restore to connected adapter.
|
|
236
245
|
*/
|
|
237
246
|
async restoreBackup(backup) {
|
|
238
|
-
logger_1.logger.debug(
|
|
247
|
+
logger_1.logger.debug('restoring backup', NS);
|
|
239
248
|
const version = await this.getAdapterVersion();
|
|
240
249
|
/* istanbul ignore next */
|
|
241
250
|
if (version === tstype_1.ZnpVersion.zStack12) {
|
|
242
|
-
throw new Error(
|
|
251
|
+
throw new Error('backup cannot be restored on Z-Stack 1.2 adapter');
|
|
243
252
|
}
|
|
244
253
|
/* fetch provisional NIB */
|
|
245
254
|
const nib = await this.nv.readItem(common_1.NvItemsIds.NIB, 0, Structs.nib);
|
|
@@ -298,7 +307,10 @@ class AdapterBackup {
|
|
|
298
307
|
}
|
|
299
308
|
let recoveredSeedShift = null;
|
|
300
309
|
for (let i = 0; i < 16; i++) {
|
|
301
|
-
const rotated = Buffer.concat([
|
|
310
|
+
const rotated = Buffer.concat([
|
|
311
|
+
recoveredKey.slice(recoveredKey.length - i, recoveredKey.length),
|
|
312
|
+
recoveredKey.slice(0, recoveredKey.length - i),
|
|
313
|
+
]);
|
|
302
314
|
if (rotated.equals(tclkSeed)) {
|
|
303
315
|
recoveredSeedShift = i;
|
|
304
316
|
break;
|
|
@@ -317,7 +329,7 @@ class AdapterBackup {
|
|
|
317
329
|
tclkEntry.rxFrmCntr = device.linkKey.rxCounter;
|
|
318
330
|
tclkEntry.txFrmCntr = device.linkKey.txCounter + 2500;
|
|
319
331
|
linkKeyProcessed = true;
|
|
320
|
-
logger_1.logger.debug(`successfully recovered link key for ${device.ieeeAddress.toString(
|
|
332
|
+
logger_1.logger.debug(`successfully recovered link key for ${device.ieeeAddress.toString('hex')} using tclk seed (shift=${recoveredSeedShift})`, NS);
|
|
321
333
|
}
|
|
322
334
|
}
|
|
323
335
|
/* attempt to create aps link key data entry */
|
|
@@ -335,10 +347,13 @@ class AdapterBackup {
|
|
|
335
347
|
throw new Error(`target adapter security manager table size insufficient (size=${securityManagerTable.capacity})`);
|
|
336
348
|
}
|
|
337
349
|
sme.ami = addressManagerTable.indexOf(ame);
|
|
338
|
-
sme.keyNvId =
|
|
350
|
+
sme.keyNvId =
|
|
351
|
+
version === tstype_1.ZnpVersion.zStack3x0
|
|
352
|
+
? apsLinkKeyDataTable.indexOf(apsKeyDataEntry)
|
|
353
|
+
: common_1.NvItemsIds.APS_LINK_KEY_DATA_START + apsLinkKeyDataTable.indexOf(apsKeyDataEntry);
|
|
339
354
|
sme.authenticationOption = structs_1.SecurityManagerAuthenticationOption.AuthenticatedCBCK;
|
|
340
355
|
linkKeyProcessed = true;
|
|
341
|
-
logger_1.logger.debug(`successfully recovered link key for ${device.ieeeAddress.toString(
|
|
356
|
+
logger_1.logger.debug(`successfully recovered link key for ${device.ieeeAddress.toString('hex')} using aps key data table`, NS);
|
|
342
357
|
}
|
|
343
358
|
}
|
|
344
359
|
}
|
|
@@ -356,14 +371,14 @@ class AdapterBackup {
|
|
|
356
371
|
}
|
|
357
372
|
/* write network security material table (nwk frame counters) */
|
|
358
373
|
if (version === tstype_1.ZnpVersion.zStack3x0) {
|
|
359
|
-
await this.nv.writeTable(
|
|
374
|
+
await this.nv.writeTable('extended', common_1.NvSystemIds.ZSTACK, common_1.NvItemsIds.EX_NWK_SEC_MATERIAL_TABLE, nwkSecurityMaterialTable);
|
|
360
375
|
}
|
|
361
376
|
else {
|
|
362
|
-
await this.nv.writeTable(
|
|
377
|
+
await this.nv.writeTable('legacy', common_1.NvItemsIds.LEGACY_NWK_SEC_MATERIAL_TABLE_START, nwkSecurityMaterialTable);
|
|
363
378
|
}
|
|
364
379
|
/* write address manager table */
|
|
365
380
|
if (version === tstype_1.ZnpVersion.zStack3x0) {
|
|
366
|
-
await this.nv.writeTable(
|
|
381
|
+
await this.nv.writeTable('extended', common_1.NvSystemIds.ZSTACK, common_1.NvItemsIds.ZCD_NV_EX_ADDRMGR, addressManagerTable);
|
|
367
382
|
}
|
|
368
383
|
else {
|
|
369
384
|
await this.nv.writeItem(common_1.NvItemsIds.ADDRMGR, addressManagerTable);
|
|
@@ -372,17 +387,17 @@ class AdapterBackup {
|
|
|
372
387
|
await this.nv.writeItem(common_1.NvItemsIds.APS_LINK_KEY_TABLE, securityManagerTable);
|
|
373
388
|
/* write aps link key data table */
|
|
374
389
|
if (version === tstype_1.ZnpVersion.zStack3x0) {
|
|
375
|
-
await this.nv.writeTable(
|
|
390
|
+
await this.nv.writeTable('extended', common_1.NvSystemIds.ZSTACK, common_1.NvItemsIds.ZCD_NV_EX_APS_KEY_DATA_TABLE, apsLinkKeyDataTable);
|
|
376
391
|
}
|
|
377
392
|
else {
|
|
378
|
-
await this.nv.writeTable(
|
|
393
|
+
await this.nv.writeTable('legacy', common_1.NvItemsIds.APS_LINK_KEY_DATA_START, apsLinkKeyDataTable);
|
|
379
394
|
}
|
|
380
395
|
/* write tclk table */
|
|
381
396
|
if (version === tstype_1.ZnpVersion.zStack3x0) {
|
|
382
|
-
await this.nv.writeTable(
|
|
397
|
+
await this.nv.writeTable('extended', common_1.NvSystemIds.ZSTACK, common_1.NvItemsIds.EX_TCLK_TABLE, tclkTable);
|
|
383
398
|
}
|
|
384
399
|
else {
|
|
385
|
-
await this.nv.writeTable(
|
|
400
|
+
await this.nv.writeTable('legacy', common_1.NvItemsIds.LEGACY_TCLK_TABLE_START, tclkTable);
|
|
386
401
|
}
|
|
387
402
|
}
|
|
388
403
|
/**
|
|
@@ -392,7 +407,7 @@ class AdapterBackup {
|
|
|
392
407
|
* and restore procedures are not supported.*
|
|
393
408
|
*/
|
|
394
409
|
async getAdapterVersion() {
|
|
395
|
-
const versionResponse = await this.znp.request(constants_1.Subsystem.SYS,
|
|
410
|
+
const versionResponse = await this.znp.request(constants_1.Subsystem.SYS, 'version', {});
|
|
396
411
|
const version = versionResponse.payload.product;
|
|
397
412
|
return version;
|
|
398
413
|
}
|
|
@@ -403,7 +418,7 @@ class AdapterBackup {
|
|
|
403
418
|
*/
|
|
404
419
|
async getAddressManagerTable(version) {
|
|
405
420
|
if (version === tstype_1.ZnpVersion.zStack3x0) {
|
|
406
|
-
return this.nv.readTable(
|
|
421
|
+
return this.nv.readTable('extended', common_1.NvSystemIds.ZSTACK, common_1.NvItemsIds.ZCD_NV_EX_ADDRMGR, undefined, Structs.addressManagerTable);
|
|
407
422
|
}
|
|
408
423
|
else {
|
|
409
424
|
return this.nv.readItem(common_1.NvItemsIds.ADDRMGR, 0, Structs.addressManagerTable);
|
|
@@ -422,10 +437,10 @@ class AdapterBackup {
|
|
|
422
437
|
*/
|
|
423
438
|
async getApsLinkKeyDataTable(version) {
|
|
424
439
|
if (version === tstype_1.ZnpVersion.zStack3x0) {
|
|
425
|
-
return this.nv.readTable(
|
|
440
|
+
return this.nv.readTable('extended', common_1.NvSystemIds.ZSTACK, common_1.NvItemsIds.ZCD_NV_EX_APS_KEY_DATA_TABLE, undefined, Structs.apsLinkKeyDataTable);
|
|
426
441
|
}
|
|
427
442
|
else {
|
|
428
|
-
return this.nv.readTable(
|
|
443
|
+
return this.nv.readTable('legacy', common_1.NvItemsIds.APS_LINK_KEY_DATA_START, 255, Structs.apsLinkKeyDataTable);
|
|
429
444
|
}
|
|
430
445
|
}
|
|
431
446
|
/**
|
|
@@ -435,10 +450,10 @@ class AdapterBackup {
|
|
|
435
450
|
*/
|
|
436
451
|
async getTclkTable(version) {
|
|
437
452
|
if (version === tstype_1.ZnpVersion.zStack3x0) {
|
|
438
|
-
return this.nv.readTable(
|
|
453
|
+
return this.nv.readTable('extended', common_1.NvSystemIds.ZSTACK, common_1.NvItemsIds.EX_TCLK_TABLE, undefined, Structs.apsTcLinkKeyTable);
|
|
439
454
|
}
|
|
440
455
|
else {
|
|
441
|
-
return this.nv.readTable(
|
|
456
|
+
return this.nv.readTable('legacy', common_1.NvItemsIds.LEGACY_TCLK_TABLE_START, 239, Structs.apsTcLinkKeyTable);
|
|
442
457
|
}
|
|
443
458
|
}
|
|
444
459
|
/**
|
|
@@ -448,10 +463,10 @@ class AdapterBackup {
|
|
|
448
463
|
*/
|
|
449
464
|
async getNetworkSecurityMaterialTable(version) {
|
|
450
465
|
if (version === tstype_1.ZnpVersion.zStack3x0) {
|
|
451
|
-
return this.nv.readTable(
|
|
466
|
+
return this.nv.readTable('extended', common_1.NvSystemIds.ZSTACK, common_1.NvItemsIds.EX_NWK_SEC_MATERIAL_TABLE, undefined, Structs.nwkSecMaterialDescriptorTable);
|
|
452
467
|
}
|
|
453
468
|
else {
|
|
454
|
-
return this.nv.readTable(
|
|
469
|
+
return this.nv.readTable('legacy', common_1.NvItemsIds.LEGACY_NWK_SEC_MATERIAL_TABLE_START, 12, Structs.nwkSecMaterialDescriptorTable);
|
|
455
470
|
}
|
|
456
471
|
}
|
|
457
472
|
}
|