zigbee-herdsman 0.28.0 → 0.29.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/.babelrc.js +0 -4
- package/.release-please-manifest.json +1 -1
- package/CHANGELOG.md +16 -0
- package/dist/adapter/adapter.js +21 -45
- package/dist/adapter/adapter.js.map +1 -1
- package/dist/adapter/deconz/adapter/deconzAdapter.js +76 -98
- package/dist/adapter/deconz/adapter/deconzAdapter.js.map +1 -1
- package/dist/adapter/deconz/adapter/index.js +2 -8
- package/dist/adapter/deconz/adapter/index.js.map +1 -1
- package/dist/adapter/deconz/driver/constants.js +1 -3
- package/dist/adapter/deconz/driver/constants.js.map +1 -1
- package/dist/adapter/deconz/driver/driver.js +77 -72
- package/dist/adapter/deconz/driver/driver.js.map +1 -1
- package/dist/adapter/deconz/driver/frame.js +1 -3
- package/dist/adapter/deconz/driver/frame.js.map +1 -1
- package/dist/adapter/deconz/driver/frameParser.js +36 -41
- package/dist/adapter/deconz/driver/frameParser.js.map +1 -1
- package/dist/adapter/deconz/driver/parser.js +8 -34
- package/dist/adapter/deconz/driver/parser.js.map +1 -1
- package/dist/adapter/deconz/driver/writer.js +6 -34
- package/dist/adapter/deconz/driver/writer.js.map +1 -1
- package/dist/adapter/events.js +2 -4
- package/dist/adapter/events.js.map +1 -1
- package/dist/adapter/ezsp/adapter/backup.js +10 -15
- package/dist/adapter/ezsp/adapter/backup.js.map +1 -1
- package/dist/adapter/ezsp/adapter/ezspAdapter.js +59 -81
- package/dist/adapter/ezsp/adapter/ezspAdapter.js.map +1 -1
- package/dist/adapter/ezsp/adapter/index.js +2 -8
- package/dist/adapter/ezsp/adapter/index.js.map +1 -1
- package/dist/adapter/ezsp/driver/commands.js +629 -628
- package/dist/adapter/ezsp/driver/commands.js.map +1 -1
- package/dist/adapter/ezsp/driver/consts.js +10 -13
- package/dist/adapter/ezsp/driver/consts.js.map +1 -1
- package/dist/adapter/ezsp/driver/driver.js +100 -96
- package/dist/adapter/ezsp/driver/driver.js.map +1 -1
- package/dist/adapter/ezsp/driver/ezsp.js +85 -104
- package/dist/adapter/ezsp/driver/ezsp.js.map +1 -1
- package/dist/adapter/ezsp/driver/index.js +3 -7
- package/dist/adapter/ezsp/driver/index.js.map +1 -1
- package/dist/adapter/ezsp/driver/multicast.js +17 -19
- package/dist/adapter/ezsp/driver/multicast.js.map +1 -1
- package/dist/adapter/ezsp/driver/parser.js +6 -35
- package/dist/adapter/ezsp/driver/parser.js.map +1 -1
- package/dist/adapter/ezsp/driver/types/basic.js +35 -57
- package/dist/adapter/ezsp/driver/types/basic.js.map +1 -1
- package/dist/adapter/ezsp/driver/types/index.js +12 -119
- package/dist/adapter/ezsp/driver/types/index.js.map +1 -1
- package/dist/adapter/ezsp/driver/types/named.js +1548 -1627
- package/dist/adapter/ezsp/driver/types/named.js.map +1 -1
- package/dist/adapter/ezsp/driver/types/struct.js +649 -668
- package/dist/adapter/ezsp/driver/types/struct.js.map +1 -1
- package/dist/adapter/ezsp/driver/uart.js +35 -57
- package/dist/adapter/ezsp/driver/uart.js.map +1 -1
- package/dist/adapter/ezsp/driver/utils/crc16ccitt.js +1 -3
- package/dist/adapter/ezsp/driver/utils/crc16ccitt.js.map +1 -1
- package/dist/adapter/ezsp/driver/utils/index.js +23 -27
- package/dist/adapter/ezsp/driver/utils/index.js.map +1 -1
- package/dist/adapter/ezsp/driver/writer.js +7 -37
- package/dist/adapter/ezsp/driver/writer.js.map +1 -1
- package/dist/adapter/index.js +4 -35
- package/dist/adapter/index.js.map +1 -1
- package/dist/adapter/serialPort.js +6 -10
- package/dist/adapter/serialPort.js.map +1 -1
- package/dist/adapter/serialPortUtils.js +7 -9
- package/dist/adapter/serialPortUtils.js.map +1 -1
- package/dist/adapter/socketPortUtils.js +1 -3
- package/dist/adapter/socketPortUtils.js.map +1 -1
- package/dist/adapter/tstype.js +1 -2
- package/dist/adapter/z-stack/adapter/adapter-backup.js +79 -108
- package/dist/adapter/z-stack/adapter/adapter-backup.js.map +1 -1
- package/dist/adapter/z-stack/adapter/adapter-nv-memory.js +23 -27
- package/dist/adapter/z-stack/adapter/adapter-nv-memory.js.map +1 -1
- package/dist/adapter/z-stack/adapter/endpoints.js +3 -29
- package/dist/adapter/z-stack/adapter/endpoints.js.map +1 -1
- package/dist/adapter/z-stack/adapter/index.js +2 -8
- package/dist/adapter/z-stack/adapter/index.js.map +1 -1
- package/dist/adapter/z-stack/adapter/manager.js +77 -102
- package/dist/adapter/z-stack/adapter/manager.js.map +1 -1
- package/dist/adapter/z-stack/adapter/tstype.js +2 -4
- package/dist/adapter/z-stack/adapter/tstype.js.map +1 -1
- package/dist/adapter/z-stack/adapter/zStackAdapter.js +62 -79
- package/dist/adapter/z-stack/adapter/zStackAdapter.js.map +1 -1
- package/dist/adapter/z-stack/constants/af.js +1 -3
- package/dist/adapter/z-stack/constants/af.js.map +1 -1
- package/dist/adapter/z-stack/constants/common.js +16 -19
- package/dist/adapter/z-stack/constants/common.js.map +1 -1
- package/dist/adapter/z-stack/constants/dbg.js +1 -3
- package/dist/adapter/z-stack/constants/dbg.js.map +1 -1
- package/dist/adapter/z-stack/constants/index.js +10 -47
- package/dist/adapter/z-stack/constants/index.js.map +1 -1
- package/dist/adapter/z-stack/constants/mac.js +1 -3
- package/dist/adapter/z-stack/constants/mac.js.map +1 -1
- package/dist/adapter/z-stack/constants/sapi.js +1 -3
- package/dist/adapter/z-stack/constants/sapi.js.map +1 -1
- package/dist/adapter/z-stack/constants/sys.js +1 -3
- package/dist/adapter/z-stack/constants/sys.js.map +1 -1
- package/dist/adapter/z-stack/constants/util.js +1 -3
- package/dist/adapter/z-stack/constants/util.js.map +1 -1
- package/dist/adapter/z-stack/constants/utils.js +3 -7
- package/dist/adapter/z-stack/constants/utils.js.map +1 -1
- package/dist/adapter/z-stack/constants/zdo.js +1 -3
- package/dist/adapter/z-stack/constants/zdo.js.map +1 -1
- package/dist/adapter/z-stack/models/index.js +1 -17
- package/dist/adapter/z-stack/models/index.js.map +1 -1
- package/dist/adapter/z-stack/models/startup-options.js +1 -2
- package/dist/adapter/z-stack/structs/entries/address-manager-entry.js +5 -9
- package/dist/adapter/z-stack/structs/entries/address-manager-entry.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/address-manager-table.js +5 -9
- 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 +3 -7
- 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.js +5 -9
- 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 +3 -7
- 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.js +5 -9
- 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 +2 -6
- package/dist/adapter/z-stack/structs/entries/channel-list.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/has-configured.js +2 -6
- package/dist/adapter/z-stack/structs/entries/has-configured.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/index.js +16 -32
- package/dist/adapter/z-stack/structs/entries/index.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/nib.js +6 -10
- package/dist/adapter/z-stack/structs/entries/nib.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/nwk-key-descriptor.js +2 -6
- package/dist/adapter/z-stack/structs/entries/nwk-key-descriptor.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/nwk-key.js +2 -6
- package/dist/adapter/z-stack/structs/entries/nwk-key.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/nwk-pan-id.js +2 -6
- 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 +2 -6
- 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.js +5 -9
- 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 +5 -9
- package/dist/adapter/z-stack/structs/entries/security-manager-entry.js.map +1 -1
- package/dist/adapter/z-stack/structs/entries/security-manager-table.js +6 -10
- package/dist/adapter/z-stack/structs/entries/security-manager-table.js.map +1 -1
- package/dist/adapter/z-stack/structs/index.js +4 -20
- package/dist/adapter/z-stack/structs/index.js.map +1 -1
- package/dist/adapter/z-stack/structs/serializable-memory-object.js +1 -2
- package/dist/adapter/z-stack/structs/struct.js +8 -11
- package/dist/adapter/z-stack/structs/struct.js.map +1 -1
- package/dist/adapter/z-stack/structs/table.js +7 -9
- package/dist/adapter/z-stack/structs/table.js.map +1 -1
- package/dist/adapter/z-stack/unpi/constants.js +3 -12
- package/dist/adapter/z-stack/unpi/constants.js.map +1 -1
- package/dist/adapter/z-stack/unpi/frame.js +13 -9
- package/dist/adapter/z-stack/unpi/frame.js.map +1 -1
- package/dist/adapter/z-stack/unpi/index.js +5 -37
- package/dist/adapter/z-stack/unpi/index.js.map +1 -1
- package/dist/adapter/z-stack/unpi/parser.js +13 -40
- package/dist/adapter/z-stack/unpi/parser.js.map +1 -1
- package/dist/adapter/z-stack/unpi/writer.js +4 -32
- package/dist/adapter/z-stack/unpi/writer.js.map +1 -1
- package/dist/adapter/z-stack/utils/channel-list.js +5 -11
- package/dist/adapter/z-stack/utils/channel-list.js.map +1 -1
- package/dist/adapter/z-stack/utils/index.js +2 -18
- package/dist/adapter/z-stack/utils/index.js.map +1 -1
- package/dist/adapter/z-stack/utils/network-options.js +3 -7
- package/dist/adapter/z-stack/utils/network-options.js.map +1 -1
- package/dist/adapter/z-stack/znp/buffaloZnp.js +3 -5
- package/dist/adapter/z-stack/znp/buffaloZnp.js.map +1 -1
- package/dist/adapter/z-stack/znp/definition.js +1280 -1285
- package/dist/adapter/z-stack/znp/definition.js.map +1 -1
- package/dist/adapter/z-stack/znp/index.js +3 -10
- package/dist/adapter/z-stack/znp/index.js.map +1 -1
- package/dist/adapter/z-stack/znp/parameterType.js +1 -3
- package/dist/adapter/z-stack/znp/parameterType.js.map +1 -1
- package/dist/adapter/z-stack/znp/tstype.js +1 -2
- package/dist/adapter/z-stack/znp/znp.js +64 -81
- package/dist/adapter/z-stack/znp/znp.js.map +1 -1
- package/dist/adapter/z-stack/znp/zpiObject.js +30 -29
- package/dist/adapter/z-stack/znp/zpiObject.js.map +1 -1
- package/dist/adapter/zigate/adapter/index.js +2 -8
- package/dist/adapter/zigate/adapter/index.js.map +1 -1
- package/dist/adapter/zigate/adapter/zigateAdapter.js +64 -87
- package/dist/adapter/zigate/adapter/zigateAdapter.js.map +1 -1
- package/dist/adapter/zigate/debug.js +3 -9
- package/dist/adapter/zigate/debug.js.map +1 -1
- package/dist/adapter/zigate/driver/buffaloZiGate.js +7 -9
- package/dist/adapter/zigate/driver/buffaloZiGate.js.map +1 -1
- package/dist/adapter/zigate/driver/commandType.js +45 -50
- package/dist/adapter/zigate/driver/commandType.js.map +1 -1
- package/dist/adapter/zigate/driver/constants.js +31 -34
- package/dist/adapter/zigate/driver/constants.js.map +1 -1
- package/dist/adapter/zigate/driver/frame.js +11 -14
- package/dist/adapter/zigate/driver/frame.js.map +1 -1
- package/dist/adapter/zigate/driver/messageType.js +27 -30
- package/dist/adapter/zigate/driver/messageType.js.map +1 -1
- package/dist/adapter/zigate/driver/parameterType.js +1 -3
- package/dist/adapter/zigate/driver/parameterType.js.map +1 -1
- package/dist/adapter/zigate/driver/ziGateObject.js +17 -18
- package/dist/adapter/zigate/driver/ziGateObject.js.map +1 -1
- package/dist/adapter/zigate/driver/zigate.js +55 -47
- package/dist/adapter/zigate/driver/zigate.js.map +1 -1
- package/dist/buffalo/buffalo.js +5 -5
- package/dist/buffalo/buffalo.js.map +1 -1
- package/dist/buffalo/index.js +3 -33
- package/dist/buffalo/index.js.map +1 -1
- package/dist/buffalo/tstype.js +1 -2
- package/dist/controller/controller.js +99 -110
- package/dist/controller/controller.js.map +1 -1
- package/dist/controller/database.js +13 -16
- package/dist/controller/database.js.map +1 -1
- package/dist/controller/events.js +2 -5
- package/dist/controller/events.js.map +1 -1
- package/dist/controller/greenPower.js +17 -44
- package/dist/controller/greenPower.js.map +1 -1
- package/dist/controller/helpers/index.js +2 -28
- package/dist/controller/helpers/index.js.map +1 -1
- package/dist/controller/helpers/request.js +38 -32
- package/dist/controller/helpers/request.js.map +1 -1
- package/dist/controller/helpers/requestQueue.js +8 -11
- package/dist/controller/helpers/requestQueue.js.map +1 -1
- package/dist/controller/helpers/zclFrameConverter.js +5 -13
- package/dist/controller/helpers/zclFrameConverter.js.map +1 -1
- package/dist/controller/helpers/zclTransactionSequenceNumber.js +2 -4
- package/dist/controller/helpers/zclTransactionSequenceNumber.js.map +1 -1
- package/dist/controller/index.js +5 -8
- package/dist/controller/index.js.map +1 -1
- package/dist/controller/logger-stub.js +1 -2
- package/dist/controller/model/device.js +86 -90
- package/dist/controller/model/device.js.map +1 -1
- package/dist/controller/model/endpoint.d.ts.map +1 -1
- package/dist/controller/model/endpoint.js +60 -79
- package/dist/controller/model/endpoint.js.map +1 -1
- package/dist/controller/model/entity.js +5 -10
- package/dist/controller/model/entity.js.map +1 -1
- package/dist/controller/model/group.js +32 -57
- package/dist/controller/model/group.js.map +1 -1
- package/dist/controller/model/index.js +5 -14
- package/dist/controller/model/index.js.map +1 -1
- package/dist/controller/touchlink.js +11 -37
- package/dist/controller/touchlink.js.map +1 -1
- package/dist/controller/tstype.js +2 -4
- package/dist/controller/tstype.js.map +1 -1
- package/dist/index.js +3 -33
- package/dist/index.js.map +1 -1
- package/dist/models/backup-storage-legacy.js +1 -2
- package/dist/models/backup-storage-unified.js +1 -2
- package/dist/models/backup.js +1 -2
- package/dist/models/index.js +4 -20
- package/dist/models/index.js.map +1 -1
- package/dist/models/network-options.js +1 -2
- package/dist/utils/assertString.js +1 -3
- package/dist/utils/assertString.js.map +1 -1
- package/dist/utils/backup.js +15 -46
- package/dist/utils/backup.js.map +1 -1
- package/dist/utils/equalsPartial.js +3 -8
- package/dist/utils/equalsPartial.js.map +1 -1
- package/dist/utils/index.js +9 -45
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/isNumberArray.js +1 -3
- package/dist/utils/isNumberArray.js.map +1 -1
- package/dist/utils/queue.js +3 -3
- package/dist/utils/queue.js.map +1 -1
- package/dist/utils/realpathSync.js +3 -8
- package/dist/utils/realpathSync.js.map +1 -1
- package/dist/utils/wait.js +1 -3
- package/dist/utils/wait.js.map +1 -1
- package/dist/utils/waitress.js +5 -3
- package/dist/utils/waitress.js.map +1 -1
- package/dist/zcl/buffaloZcl.js +17 -45
- package/dist/zcl/buffaloZcl.js.map +1 -1
- package/dist/zcl/definition/buffaloZclDataType.js +1 -3
- package/dist/zcl/definition/buffaloZclDataType.js.map +1 -1
- package/dist/zcl/definition/cluster.d.ts.map +1 -1
- package/dist/zcl/definition/cluster.js +2364 -2336
- package/dist/zcl/definition/cluster.js.map +1 -1
- package/dist/zcl/definition/dataType.js +1 -3
- package/dist/zcl/definition/dataType.js.map +1 -1
- package/dist/zcl/definition/direction.js +1 -3
- package/dist/zcl/definition/direction.js.map +1 -1
- package/dist/zcl/definition/endpointDeviceType.js +1 -3
- package/dist/zcl/definition/endpointDeviceType.js.map +1 -1
- package/dist/zcl/definition/foundation.js +53 -58
- package/dist/zcl/definition/foundation.js.map +1 -1
- package/dist/zcl/definition/frameControl.js +1 -2
- package/dist/zcl/definition/frameType.js +1 -3
- package/dist/zcl/definition/frameType.js.map +1 -1
- package/dist/zcl/definition/index.js +12 -51
- package/dist/zcl/definition/index.js.map +1 -1
- package/dist/zcl/definition/manufacturerCode.js +1 -3
- package/dist/zcl/definition/manufacturerCode.js.map +1 -1
- package/dist/zcl/definition/powerSource.js +1 -3
- package/dist/zcl/definition/powerSource.js.map +1 -1
- package/dist/zcl/definition/status.js +1 -3
- package/dist/zcl/definition/status.js.map +1 -1
- package/dist/zcl/definition/tstype.js +1 -2
- package/dist/zcl/index.js +14 -55
- package/dist/zcl/index.js.map +1 -1
- package/dist/zcl/tstype.js +2 -4
- package/dist/zcl/tstype.js.map +1 -1
- package/dist/zcl/utils.js +23 -29
- package/dist/zcl/utils.js.map +1 -1
- package/dist/zcl/zclFrame.js +46 -70
- package/dist/zcl/zclFrame.js.map +1 -1
- package/dist/zcl/zclHeader.js +1 -2
- package/dist/zcl/zclStatusError.js +4 -8
- package/dist/zcl/zclStatusError.js.map +1 -1
- package/package.json +1 -4
- package/tsconfig.json +4 -3
|
@@ -1,17 +1,15 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.AdapterNvMemory = void 0;
|
|
4
1
|
/* eslint-disable max-len */
|
|
5
|
-
|
|
6
|
-
|
|
2
|
+
import { NvItemsIds, ZnpCommandStatus } from "../constants/common";
|
|
3
|
+
import { Subsystem } from "../unpi/constants";
|
|
7
4
|
/**
|
|
8
5
|
* Adapter non-volatile memory instrumentation. This class provides interface to interact
|
|
9
6
|
* with ZNP adapter's NV memory. Provided functionality covers basic operations from reading,
|
|
10
7
|
* writing and deleting keys to extended table manipulation.
|
|
11
8
|
*/
|
|
12
|
-
class AdapterNvMemory {
|
|
9
|
+
export class AdapterNvMemory {
|
|
10
|
+
memoryAlignment = null;
|
|
11
|
+
znp;
|
|
13
12
|
constructor(znp) {
|
|
14
|
-
this.memoryAlignment = null;
|
|
15
13
|
this.znp = znp;
|
|
16
14
|
}
|
|
17
15
|
/**
|
|
@@ -19,28 +17,27 @@ class AdapterNvMemory {
|
|
|
19
17
|
*/
|
|
20
18
|
async init() {
|
|
21
19
|
/* use `ZCD_NV_NWKKEY` to determine if target platform uses memory alignment (length 21 = unaligned, length 24 = aligned) */
|
|
22
|
-
const rawNwkKey = await this.readItem(
|
|
20
|
+
const rawNwkKey = await this.readItem(NvItemsIds.NWKKEY);
|
|
23
21
|
this.memoryAlignment = rawNwkKey.length === 21 ? "unaligned" : "aligned";
|
|
24
22
|
}
|
|
25
23
|
async readItem(id, offset = 0, useStruct) {
|
|
26
|
-
var _a, _b, _c;
|
|
27
24
|
if (useStruct) {
|
|
28
25
|
this.checkMemoryAlignmentSetup();
|
|
29
26
|
}
|
|
30
|
-
const lengthResponse = await this.retry(() => this.znp.request(
|
|
31
|
-
if (!
|
|
27
|
+
const lengthResponse = await this.retry(() => this.znp.request(Subsystem.SYS, "osalNvLength", { id }));
|
|
28
|
+
if (!lengthResponse?.payload?.length || lengthResponse?.payload?.length === 0) {
|
|
32
29
|
return null;
|
|
33
30
|
}
|
|
34
31
|
const length = lengthResponse.payload.length;
|
|
35
32
|
const buffer = Buffer.alloc(length);
|
|
36
33
|
while (offset < length) {
|
|
37
|
-
const readResponse = await this.retry(() => this.znp.request(
|
|
34
|
+
const readResponse = await this.retry(() => this.znp.request(Subsystem.SYS, "osalNvReadExt", { id, offset }));
|
|
38
35
|
/* istanbul ignore next */
|
|
39
36
|
if (!readResponse) {
|
|
40
37
|
return null;
|
|
41
38
|
}
|
|
42
39
|
/* istanbul ignore next */
|
|
43
|
-
if (
|
|
40
|
+
if (readResponse.payload?.status !== 0) {
|
|
44
41
|
throw new Error(`Received non-success status while reading NV (id=${id}, offset=${offset}, status=${readResponse.payload.status})`);
|
|
45
42
|
}
|
|
46
43
|
buffer.set(readResponse.payload.value, offset);
|
|
@@ -64,7 +61,7 @@ class AdapterNvMemory {
|
|
|
64
61
|
async writeItem(id, data, offset = 0, autoInit = true) {
|
|
65
62
|
this.checkMemoryAlignmentSetup();
|
|
66
63
|
const buffer = Buffer.isBuffer(data) ? data : data.serialize(this.memoryAlignment);
|
|
67
|
-
const lengthResponse = await this.retry(() => this.znp.request(
|
|
64
|
+
const lengthResponse = await this.retry(() => this.znp.request(Subsystem.SYS, "osalNvLength", { id }));
|
|
68
65
|
const exists = lengthResponse.payload.length && lengthResponse.payload.length > 0;
|
|
69
66
|
/* istanbul ignore next */
|
|
70
67
|
if (!exists) {
|
|
@@ -72,9 +69,9 @@ class AdapterNvMemory {
|
|
|
72
69
|
if (!autoInit) {
|
|
73
70
|
throw new Error(`Cannot write NV memory item which does not exist (id=${id})`);
|
|
74
71
|
}
|
|
75
|
-
const initResponse = await this.retry(() => this.znp.request(
|
|
72
|
+
const initResponse = await this.retry(() => this.znp.request(Subsystem.SYS, "osalNvItemInit", { id, len: buffer.length, initlen: initLength, initvalue: buffer.slice(0, initLength) }, undefined, null, [ZnpCommandStatus.SUCCESS, ZnpCommandStatus.NV_ITEM_INITIALIZED]));
|
|
76
73
|
if (initResponse.payload.status !== 0x09) {
|
|
77
|
-
throw new Error(`Failed to initialize NV memory item (id=${id}, name=${
|
|
74
|
+
throw new Error(`Failed to initialize NV memory item (id=${id}, name=${NvItemsIds[id]}, len=${buffer.length}, status=${initResponse.payload.status})`);
|
|
78
75
|
}
|
|
79
76
|
}
|
|
80
77
|
let remaining = buffer.length;
|
|
@@ -83,7 +80,7 @@ class AdapterNvMemory {
|
|
|
83
80
|
const writeLength = remaining > 240 ? 240 : remaining;
|
|
84
81
|
const dataOffset = buffer.length - remaining;
|
|
85
82
|
const writeData = buffer.slice(dataOffset, dataOffset + writeLength);
|
|
86
|
-
const writeResponse = await this.retry(() => this.znp.request(
|
|
83
|
+
const writeResponse = await this.retry(() => this.znp.request(Subsystem.SYS, "osalNvWriteExt", { id, offset: dataOffset, len: writeLength, value: writeData }));
|
|
87
84
|
/* istanbul ignore next */
|
|
88
85
|
if (writeResponse.payload.status !== 0) {
|
|
89
86
|
throw new Error(`Received non-success status while writing NV (id=${id}, offset=${offset}, status=${writeResponse.payload.status})`);
|
|
@@ -112,12 +109,12 @@ class AdapterNvMemory {
|
|
|
112
109
|
*/
|
|
113
110
|
async deleteItem(id) {
|
|
114
111
|
this.checkMemoryAlignmentSetup();
|
|
115
|
-
const lengthResponse = await this.retry(() => this.znp.request(
|
|
112
|
+
const lengthResponse = await this.retry(() => this.znp.request(Subsystem.SYS, "osalNvLength", { id }));
|
|
116
113
|
const exists = lengthResponse.payload.length && lengthResponse.payload.length > 0;
|
|
117
114
|
/* istanbul ignore next */
|
|
118
115
|
if (exists) {
|
|
119
|
-
const deleteResponse = await this.retry(() => this.znp.request(
|
|
120
|
-
if (!deleteResponse || ![
|
|
116
|
+
const deleteResponse = await this.retry(() => this.znp.request(Subsystem.SYS, "osalNvDelete", { id, len: lengthResponse.payload.length }));
|
|
117
|
+
if (!deleteResponse || ![ZnpCommandStatus.SUCCESS, ZnpCommandStatus.NV_ITEM_INITIALIZED].includes(deleteResponse.payload.status)) {
|
|
121
118
|
/* istanbul ignore next */
|
|
122
119
|
throw new Error(`Received non-success status while deleting NV (id=${id}, status=${deleteResponse.payload.status})`);
|
|
123
120
|
}
|
|
@@ -125,10 +122,10 @@ class AdapterNvMemory {
|
|
|
125
122
|
}
|
|
126
123
|
async readExtendedTableEntry(sysId, id, subId, offset, useStruct) {
|
|
127
124
|
this.checkMemoryAlignmentSetup();
|
|
128
|
-
const lengthResponse = await this.retry(() => this.znp.request(
|
|
125
|
+
const lengthResponse = await this.retry(() => this.znp.request(Subsystem.SYS, "nvLength", { sysid: sysId, itemid: id, subid: subId }));
|
|
129
126
|
const exists = lengthResponse.payload.len && lengthResponse.payload.len > 0;
|
|
130
127
|
if (exists) {
|
|
131
|
-
const readResponse = await this.retry(() => this.znp.request(
|
|
128
|
+
const readResponse = await this.retry(() => this.znp.request(Subsystem.SYS, "nvRead", { sysid: sysId, itemid: id, subid: subId, offset: offset || 0, len: lengthResponse.payload.len }));
|
|
132
129
|
/* istanbul ignore next */
|
|
133
130
|
if (readResponse.payload.status !== 0) {
|
|
134
131
|
throw new Error(`Received non-success status while reading NV extended table entry (sysId=${sysId}, id=${id}, subId=${subId}, offset=${offset}, status=${readResponse.payload.status})`);
|
|
@@ -156,20 +153,20 @@ class AdapterNvMemory {
|
|
|
156
153
|
*/
|
|
157
154
|
async writeExtendedTableEntry(sysId, id, subId, data, offset, autoInit = true) {
|
|
158
155
|
this.checkMemoryAlignmentSetup();
|
|
159
|
-
const lengthResponse = await this.retry(() => this.znp.request(
|
|
156
|
+
const lengthResponse = await this.retry(() => this.znp.request(Subsystem.SYS, "nvLength", { sysid: sysId, itemid: id, subid: subId }));
|
|
160
157
|
const exists = lengthResponse.payload.len && lengthResponse.payload.len > 0;
|
|
161
158
|
/* istanbul ignore if */
|
|
162
159
|
if (!exists) {
|
|
163
160
|
if (!autoInit) {
|
|
164
161
|
throw new Error(`Cannot write NV memory extended table item which does not exist (sudId=${sysId}, id=${id}, subId=${subId})`);
|
|
165
162
|
}
|
|
166
|
-
const createResponse = await this.retry(() => this.znp.request(
|
|
167
|
-
if (!createResponse || createResponse.payload.status !==
|
|
163
|
+
const createResponse = await this.retry(() => this.znp.request(Subsystem.SYS, "nvCreate", { sysid: sysId, itemid: id, subid: subId, len: data.length }));
|
|
164
|
+
if (!createResponse || createResponse.payload.status !== ZnpCommandStatus.SUCCESS) {
|
|
168
165
|
/* istanbul ignore next */
|
|
169
166
|
throw new Error(`Failed to crate NV memory extended table item with status (sudId=${sysId}, id=${id}, subId=${subId})`);
|
|
170
167
|
}
|
|
171
168
|
}
|
|
172
|
-
const writeResponse = await this.retry(() => this.znp.request(
|
|
169
|
+
const writeResponse = await this.retry(() => this.znp.request(Subsystem.SYS, "nvWrite", { sysid: sysId, itemid: id, subid: subId, offset: offset || 0, len: data.length, value: data }));
|
|
173
170
|
/* istanbul ignore next */
|
|
174
171
|
if (writeResponse.payload.status !== 0) {
|
|
175
172
|
throw new Error(`Received non-success status while writing NV extended table idem (sudId=${sysId}, id=${id}, subId=${subId}, offset=${offset}, status=${writeResponse.payload.status})`);
|
|
@@ -255,5 +252,4 @@ class AdapterNvMemory {
|
|
|
255
252
|
}
|
|
256
253
|
}
|
|
257
254
|
}
|
|
258
|
-
exports.AdapterNvMemory = AdapterNvMemory;
|
|
259
255
|
//# sourceMappingURL=adapter-nv-memory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter-nv-memory.js","sourceRoot":"","sources":["../../../../src/adapter/z-stack/adapter/adapter-nv-memory.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"adapter-nv-memory.js","sourceRoot":"","sources":["../../../../src/adapter/z-stack/adapter/adapter-nv-memory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,31 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.Endpoints = void 0;
|
|
27
|
-
const Constants = __importStar(require("../constants"));
|
|
28
|
-
const Zcl = __importStar(require("../../../zcl"));
|
|
1
|
+
import * as Constants from '../constants';
|
|
2
|
+
import * as Zcl from '../../../zcl';
|
|
29
3
|
const EndpointDefaults = {
|
|
30
4
|
appdeviceid: 0x0005,
|
|
31
5
|
appdevver: 0,
|
|
@@ -35,7 +9,7 @@ const EndpointDefaults = {
|
|
|
35
9
|
appoutclusterlist: [],
|
|
36
10
|
latencyreq: Constants.AF.networkLatencyReq.NO_LATENCY_REQS,
|
|
37
11
|
};
|
|
38
|
-
|
|
12
|
+
export const Endpoints = [
|
|
39
13
|
{ ...EndpointDefaults, endpoint: 1, appprofid: 0x0104 },
|
|
40
14
|
{ ...EndpointDefaults, endpoint: 2, appprofid: 0x0101 },
|
|
41
15
|
// Required for https://github.com/Koenkk/zigbee-herdsman-converters/commit/d0fb06c2429171f327950484ea3dec80864637cc
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endpoints.js","sourceRoot":"","sources":["../../../../src/adapter/z-stack/adapter/endpoints.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"endpoints.js","sourceRoot":"","sources":["../../../../src/adapter/z-stack/adapter/endpoints.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,GAAG,MAAM,cAAc,CAAC;AAEpC,MAAM,gBAAgB,GAQlB;IACA,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,CAAC;IACZ,gBAAgB,EAAE,CAAC;IACnB,gBAAgB,EAAE,EAAE;IACpB,iBAAiB,EAAE,CAAC;IACpB,iBAAiB,EAAE,EAAE;IACrB,UAAU,EAAE,SAAS,CAAC,EAAE,CAAC,iBAAiB,CAAC,eAAe;CAC7D,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG;IACrB,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAC;IACrD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAC;IACrD,oHAAoH;IACpH,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAC;IACrD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAC;IACrD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAC;IACrD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAC;IACrD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAC;IACrD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,EAAC;IACtD;QACI,GAAG,gBAAgB;QACnB,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,MAAM;QACjB,WAAW,EAAE,MAAM;QACnB,iBAAiB,EAAE,CAAC;QACpB,iBAAiB,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;QAC7F,gBAAgB,EAAE,CAAC;QACnB,0EAA0E;QAC1E,gBAAgB,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;KAE9F;IACD,8DAA8D;IAC9D,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAC;IACxD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,EAAC;IACtD;QACI,GAAG,gBAAgB;QACnB,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,MAAM;QACjB,gBAAgB,EAAE,CAAC;QACnB,gBAAgB,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;KACxD;IACD,kHAAkH;IAClH,uEAAuE;IACvE,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,EAAC;IACtD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAC;CAC1D,CAAC"}
|
|
@@ -1,9 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.ZStackAdapter = void 0;
|
|
7
|
-
const zStackAdapter_1 = __importDefault(require("./zStackAdapter"));
|
|
8
|
-
exports.ZStackAdapter = zStackAdapter_1.default;
|
|
1
|
+
import ZStackAdapter from './zStackAdapter';
|
|
2
|
+
export { ZStackAdapter, };
|
|
9
3
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/adapter/z-stack/adapter/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/adapter/z-stack/adapter/index.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EACH,aAAa,GAChB,CAAC"}
|
|
@@ -1,60 +1,37 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
}
|
|
13
|
-
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
-
};
|
|
28
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.ZnpAdapterManager = void 0;
|
|
30
|
-
const debug_1 = __importDefault(require("debug"));
|
|
31
|
-
const tstype_1 = require("./tstype");
|
|
32
|
-
const common_1 = require("../constants/common");
|
|
33
|
-
const Structs = __importStar(require("../structs"));
|
|
34
|
-
const Utils = __importStar(require("../utils"));
|
|
35
|
-
const ZnpConstants = __importStar(require("../constants"));
|
|
36
|
-
const adapter_backup_1 = require("./adapter-backup");
|
|
37
|
-
const adapter_nv_memory_1 = require("./adapter-nv-memory");
|
|
38
|
-
const constants_1 = require("../unpi/constants");
|
|
39
|
-
const UnpiConstants = __importStar(require("../unpi/constants"));
|
|
40
|
-
const crypto = __importStar(require("crypto"));
|
|
41
|
-
const utils_1 = require("../../../utils");
|
|
42
|
-
const endpoints_1 = require("./endpoints");
|
|
1
|
+
import Debug from "debug";
|
|
2
|
+
import { ZnpVersion } from "./tstype";
|
|
3
|
+
import { DevStates, NvItemsIds, ZnpCommandStatus } from "../constants/common";
|
|
4
|
+
import * as Structs from "../structs";
|
|
5
|
+
import * as Utils from "../utils";
|
|
6
|
+
import * as ZnpConstants from "../constants";
|
|
7
|
+
import { AdapterBackup } from "./adapter-backup";
|
|
8
|
+
import { AdapterNvMemory } from "./adapter-nv-memory";
|
|
9
|
+
import { Subsystem } from "../unpi/constants";
|
|
10
|
+
import * as UnpiConstants from "../unpi/constants";
|
|
11
|
+
import * as crypto from "crypto";
|
|
12
|
+
import { Wait } from "../../../utils";
|
|
13
|
+
import { Endpoints } from "./endpoints";
|
|
43
14
|
/**
|
|
44
15
|
* ZNP Adapter Manager is responsible for handling adapter startup, network commissioning,
|
|
45
16
|
* configuration backup and restore.
|
|
46
17
|
*/
|
|
47
|
-
class ZnpAdapterManager {
|
|
18
|
+
export class ZnpAdapterManager {
|
|
19
|
+
nv;
|
|
20
|
+
backup;
|
|
21
|
+
znp;
|
|
22
|
+
options;
|
|
23
|
+
nwkOptions;
|
|
24
|
+
logger;
|
|
25
|
+
debug = {
|
|
26
|
+
startup: Debug("zigbee-herdsman:adapter:zStack:startup"),
|
|
27
|
+
strategy: Debug("zigbee-herdsman:adapter:zStack:startup:strategy"),
|
|
28
|
+
commissioning: Debug("zigbee-herdsman:adapter:zStack:startup:commissioning")
|
|
29
|
+
};
|
|
48
30
|
constructor(znp, options, logger) {
|
|
49
|
-
this.debug = {
|
|
50
|
-
startup: (0, debug_1.default)("zigbee-herdsman:adapter:zStack:startup"),
|
|
51
|
-
strategy: (0, debug_1.default)("zigbee-herdsman:adapter:zStack:startup:strategy"),
|
|
52
|
-
commissioning: (0, debug_1.default)("zigbee-herdsman:adapter:zStack:startup:commissioning")
|
|
53
|
-
};
|
|
54
31
|
this.znp = znp;
|
|
55
32
|
this.options = options;
|
|
56
|
-
this.nv = new
|
|
57
|
-
this.backup = new
|
|
33
|
+
this.nv = new AdapterNvMemory(this.znp);
|
|
34
|
+
this.backup = new AdapterBackup(this.znp, this.nv, this.options.backupPath);
|
|
58
35
|
this.logger = logger;
|
|
59
36
|
}
|
|
60
37
|
/**
|
|
@@ -77,7 +54,7 @@ class ZnpAdapterManager {
|
|
|
77
54
|
break;
|
|
78
55
|
}
|
|
79
56
|
case "restoreBackup": {
|
|
80
|
-
if (this.options.version ===
|
|
57
|
+
if (this.options.version === ZnpVersion.zStack12) {
|
|
81
58
|
this.debug.startup(`performing recommissioning instead of restore for z-stack 1.2`);
|
|
82
59
|
await this.beginCommissioning(this.nwkOptions);
|
|
83
60
|
await this.beginStartup();
|
|
@@ -89,8 +66,8 @@ class ZnpAdapterManager {
|
|
|
89
66
|
break;
|
|
90
67
|
}
|
|
91
68
|
case "startCommissioning": {
|
|
92
|
-
if (this.options.version ===
|
|
93
|
-
const hasConfigured = await this.nv.readItem(
|
|
69
|
+
if (this.options.version === ZnpVersion.zStack12) {
|
|
70
|
+
const hasConfigured = await this.nv.readItem(NvItemsIds.ZNP_HAS_CONFIGURED_ZSTACK1, 0, Structs.hasConfigured);
|
|
94
71
|
await this.beginCommissioning(this.nwkOptions);
|
|
95
72
|
await this.beginStartup();
|
|
96
73
|
result = hasConfigured && hasConfigured.isConfigured() ? "reset" : "restored";
|
|
@@ -115,16 +92,16 @@ class ZnpAdapterManager {
|
|
|
115
92
|
async determineStrategy() {
|
|
116
93
|
this.debug.strategy("determining znp startup strategy");
|
|
117
94
|
/* acquire data from adapter */
|
|
118
|
-
const hasConfiguredNvId = this.options.version ===
|
|
95
|
+
const hasConfiguredNvId = this.options.version === ZnpVersion.zStack12 ? NvItemsIds.ZNP_HAS_CONFIGURED_ZSTACK1 : NvItemsIds.ZNP_HAS_CONFIGURED_ZSTACK3;
|
|
119
96
|
const hasConfigured = await this.nv.readItem(hasConfiguredNvId, 0, Structs.hasConfigured);
|
|
120
|
-
const nib = await this.nv.readItem(
|
|
121
|
-
const preconfiguredKey = this.options.version ===
|
|
122
|
-
Structs.nwkKey((await this.znp.request(
|
|
123
|
-
await this.nv.readItem(
|
|
124
|
-
let activeKeyInfo = await this.nv.readItem(
|
|
125
|
-
let alternateKeyInfo = await this.nv.readItem(
|
|
97
|
+
const nib = await this.nv.readItem(NvItemsIds.NIB, 0, Structs.nib);
|
|
98
|
+
const preconfiguredKey = this.options.version === ZnpVersion.zStack12 ?
|
|
99
|
+
Structs.nwkKey((await this.znp.request(Subsystem.SAPI, "readConfiguration", { configid: NvItemsIds.PRECFGKEY })).payload.value) :
|
|
100
|
+
await this.nv.readItem(NvItemsIds.PRECFGKEY, 0, Structs.nwkKey);
|
|
101
|
+
let activeKeyInfo = await this.nv.readItem(NvItemsIds.NWK_ACTIVE_KEY_INFO, 0, Structs.nwkKeyDescriptor);
|
|
102
|
+
let alternateKeyInfo = await this.nv.readItem(NvItemsIds.NWK_ALTERN_KEY_INFO, 0, Structs.nwkKeyDescriptor);
|
|
126
103
|
/* Z-Stack 1.2 does not provide key info entries */
|
|
127
|
-
if (this.options.version ===
|
|
104
|
+
if (this.options.version === ZnpVersion.zStack12) {
|
|
128
105
|
activeKeyInfo = Structs.nwkKeyDescriptor();
|
|
129
106
|
activeKeyInfo.key = Buffer.from(preconfiguredKey.key);
|
|
130
107
|
alternateKeyInfo = Structs.nwkKeyDescriptor();
|
|
@@ -155,8 +132,7 @@ class ZnpAdapterManager {
|
|
|
155
132
|
const configMatchesBackup = (backup &&
|
|
156
133
|
Utils.compareNetworkOptions(this.nwkOptions, backup.networkOptions, true));
|
|
157
134
|
const checkRestoreVersionCompatibility = () => {
|
|
158
|
-
|
|
159
|
-
if (this.options.version === tstype_1.ZnpVersion.zStack12 && backup && ((_a = backup.znp) === null || _a === void 0 ? void 0 : _a.version) !== undefined && backup.znp.version !== tstype_1.ZnpVersion.zStack12) {
|
|
135
|
+
if (this.options.version === ZnpVersion.zStack12 && backup && backup.znp?.version !== undefined && backup.znp.version !== ZnpVersion.zStack12) {
|
|
160
136
|
throw new Error(`your backup is from newer platform version (Z-Stack 3.0.x+) and cannot be restored onto Z-Stack 1.2 adapter - please remove backup before proceeding`);
|
|
161
137
|
}
|
|
162
138
|
};
|
|
@@ -247,11 +223,11 @@ class ZnpAdapterManager {
|
|
|
247
223
|
* Internal method to perform regular adapter startup in coordinator mode.
|
|
248
224
|
*/
|
|
249
225
|
async beginStartup() {
|
|
250
|
-
const deviceInfo = await this.znp.request(
|
|
251
|
-
if (deviceInfo.payload.devicestate !==
|
|
226
|
+
const deviceInfo = await this.znp.request(Subsystem.UTIL, 'getDeviceInfo', {});
|
|
227
|
+
if (deviceInfo.payload.devicestate !== DevStates.ZB_COORD) {
|
|
252
228
|
this.debug.startup("starting adapter as coordinator");
|
|
253
|
-
const started = this.znp.waitFor(UnpiConstants.Type.AREQ,
|
|
254
|
-
await this.znp.request(
|
|
229
|
+
const started = this.znp.waitFor(UnpiConstants.Type.AREQ, Subsystem.ZDO, 'stateChangeInd', { state: 9 }, 60000);
|
|
230
|
+
await this.znp.request(Subsystem.ZDO, 'startupFromApp', { startdelay: 100 }, null, null, [ZnpCommandStatus.SUCCESS, ZnpCommandStatus.FAILURE]);
|
|
255
231
|
await started.start().promise;
|
|
256
232
|
this.debug.startup("adapter successfully started in coordinator mode");
|
|
257
233
|
}
|
|
@@ -290,7 +266,7 @@ class ZnpAdapterManager {
|
|
|
290
266
|
await this.updateCommissioningNvItems(this.nwkOptions);
|
|
291
267
|
/* settle & reset adapter */
|
|
292
268
|
this.debug.commissioning("giving adapter some time to settle");
|
|
293
|
-
await
|
|
269
|
+
await Wait(1000);
|
|
294
270
|
await this.resetAdapter();
|
|
295
271
|
/* startup with restored adapter */
|
|
296
272
|
await this.beginStartup();
|
|
@@ -310,18 +286,18 @@ class ZnpAdapterManager {
|
|
|
310
286
|
throw new Error(`network commissioning failed - cannot use pan id 65535`);
|
|
311
287
|
}
|
|
312
288
|
/* clear and reset the adapter */
|
|
313
|
-
await this.nv.deleteItem(
|
|
289
|
+
await this.nv.deleteItem(NvItemsIds.NIB);
|
|
314
290
|
await this.clearAdapter();
|
|
315
291
|
/* commission the network as per parameters */
|
|
316
292
|
await this.updateCommissioningNvItems(nwkOptions);
|
|
317
293
|
this.debug.commissioning("beginning network commissioning");
|
|
318
|
-
if ([
|
|
294
|
+
if ([ZnpVersion.zStack30x, ZnpVersion.zStack3x0].includes(this.options.version)) {
|
|
319
295
|
/* configure channel */
|
|
320
|
-
await this.znp.request(
|
|
321
|
-
await this.znp.request(
|
|
296
|
+
await this.znp.request(Subsystem.APP_CNF, "bdbSetChannel", { isPrimary: 0x1, channel: Utils.packChannelList(nwkOptions.channelList) });
|
|
297
|
+
await this.znp.request(Subsystem.APP_CNF, "bdbSetChannel", { isPrimary: 0x0, channel: 0x0 });
|
|
322
298
|
/* perform bdb commissioning */
|
|
323
|
-
const started = this.znp.waitFor(UnpiConstants.Type.AREQ,
|
|
324
|
-
await this.znp.request(
|
|
299
|
+
const started = this.znp.waitFor(UnpiConstants.Type.AREQ, Subsystem.ZDO, "stateChangeInd", { state: 9 }, 60000);
|
|
300
|
+
await this.znp.request(Subsystem.APP_CNF, 'bdbStartCommissioning', { mode: 0x04 });
|
|
325
301
|
try {
|
|
326
302
|
await started.start().promise;
|
|
327
303
|
}
|
|
@@ -338,15 +314,15 @@ class ZnpAdapterManager {
|
|
|
338
314
|
let reads = 0;
|
|
339
315
|
let nib = null;
|
|
340
316
|
do {
|
|
341
|
-
await
|
|
342
|
-
nib = await this.nv.readItem(
|
|
317
|
+
await Wait(3000);
|
|
318
|
+
nib = await this.nv.readItem(NvItemsIds.NIB, 0, Structs.nib);
|
|
343
319
|
reads++;
|
|
344
320
|
} while ((!nib || nib.nwkPanId === 65535 || nib.nwkLogicalChannel === 0) && reads < 10);
|
|
345
321
|
if (!nib || nib.nwkPanId === 65535 || nib.nwkLogicalChannel === 0) {
|
|
346
322
|
throw new Error(`network commissioning failed - timed out waiting for nib to settle`);
|
|
347
323
|
}
|
|
348
324
|
/* validate provisioned PAN ID */
|
|
349
|
-
const extNwkInfo = await this.znp.request(
|
|
325
|
+
const extNwkInfo = await this.znp.request(Subsystem.ZDO, 'extNwkInfo', {});
|
|
350
326
|
if (extNwkInfo.payload.panid !== nwkOptions.panId && failOnCollision) {
|
|
351
327
|
throw new Error(`network commissioning failed - panId collision detected (expected=${nwkOptions.panId}, actual=${extNwkInfo.payload.panid})`);
|
|
352
328
|
}
|
|
@@ -369,25 +345,25 @@ class ZnpAdapterManager {
|
|
|
369
345
|
channelList.channelList = Utils.packChannelList(options.channelList);
|
|
370
346
|
const extendedPanIdReversed = Buffer.from(options.extendedPanId).reverse();
|
|
371
347
|
this.debug.commissioning(`setting network commissioning parameters`);
|
|
372
|
-
await this.nv.updateItem(
|
|
373
|
-
await this.nv.updateItem(
|
|
374
|
-
await this.nv.updateItem(
|
|
375
|
-
await this.nv.updateItem(
|
|
376
|
-
await this.nv.updateItem(
|
|
377
|
-
await this.nv.updateItem(
|
|
378
|
-
await this.nv.updateItem(
|
|
348
|
+
await this.nv.updateItem(NvItemsIds.STARTUP_OPTION, Buffer.from([0x00]));
|
|
349
|
+
await this.nv.updateItem(NvItemsIds.LOGICAL_TYPE, Buffer.from([ZnpConstants.ZDO.deviceLogicalType.COORDINATOR]));
|
|
350
|
+
await this.nv.updateItem(NvItemsIds.ZDO_DIRECT_CB, Buffer.from([0x01]));
|
|
351
|
+
await this.nv.updateItem(NvItemsIds.CHANLIST, channelList.serialize());
|
|
352
|
+
await this.nv.updateItem(NvItemsIds.PANID, nwkPanId.serialize());
|
|
353
|
+
await this.nv.updateItem(NvItemsIds.EXTENDED_PAN_ID, extendedPanIdReversed);
|
|
354
|
+
await this.nv.updateItem(NvItemsIds.APS_USE_EXT_PANID, extendedPanIdReversed);
|
|
379
355
|
/* istanbul ignore next */
|
|
380
|
-
await this.nv.updateItem(
|
|
381
|
-
if ([
|
|
382
|
-
await this.nv.updateItem(
|
|
356
|
+
await this.nv.updateItem(NvItemsIds.PRECFGKEYS_ENABLE, Buffer.from([options.networkKeyDistribute ? 0x01 : 0x00]));
|
|
357
|
+
if ([ZnpVersion.zStack30x, ZnpVersion.zStack3x0].includes(this.options.version)) {
|
|
358
|
+
await this.nv.updateItem(NvItemsIds.PRECFGKEY, options.networkKey);
|
|
383
359
|
}
|
|
384
360
|
else {
|
|
385
|
-
await this.znp.request(
|
|
386
|
-
configid:
|
|
361
|
+
await this.znp.request(Subsystem.SAPI, "writeConfiguration", {
|
|
362
|
+
configid: NvItemsIds.PRECFGKEY,
|
|
387
363
|
len: options.networkKey.length,
|
|
388
364
|
value: options.networkKey
|
|
389
365
|
});
|
|
390
|
-
await this.nv.writeItem(
|
|
366
|
+
await this.nv.writeItem(NvItemsIds.LEGACY_TCLK_TABLE_START_12, Buffer.from([
|
|
391
367
|
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x5a, 0x69, 0x67, 0x42, 0x65, 0x65, 0x41, 0x6c,
|
|
392
368
|
0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x30, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
|
393
369
|
]));
|
|
@@ -397,16 +373,16 @@ class ZnpAdapterManager {
|
|
|
397
373
|
* Registers endpoints before beginning normal operation.
|
|
398
374
|
*/
|
|
399
375
|
async registerEndpoints() {
|
|
400
|
-
const activeEpResponse = this.znp.waitFor(UnpiConstants.Type.AREQ,
|
|
401
|
-
this.znp.request(
|
|
376
|
+
const activeEpResponse = this.znp.waitFor(UnpiConstants.Type.AREQ, Subsystem.ZDO, 'activeEpRsp');
|
|
377
|
+
this.znp.request(Subsystem.ZDO, 'activeEpReq', { dstaddr: 0, nwkaddrofinterest: 0 });
|
|
402
378
|
const activeEp = await activeEpResponse.start().promise;
|
|
403
|
-
for (const endpoint of
|
|
379
|
+
for (const endpoint of Endpoints) {
|
|
404
380
|
if (activeEp.payload.activeeplist.includes(endpoint.endpoint)) {
|
|
405
381
|
this.debug.startup(`endpoint '${endpoint.endpoint}' already registered`);
|
|
406
382
|
}
|
|
407
383
|
else {
|
|
408
384
|
this.debug.startup(`registering endpoint '${endpoint.endpoint}'`);
|
|
409
|
-
await this.znp.request(
|
|
385
|
+
await this.znp.request(Subsystem.AF, 'register', endpoint);
|
|
410
386
|
}
|
|
411
387
|
}
|
|
412
388
|
}
|
|
@@ -417,8 +393,8 @@ class ZnpAdapterManager {
|
|
|
417
393
|
* @param group Target group index.
|
|
418
394
|
*/
|
|
419
395
|
async addToGroup(endpoint, group) {
|
|
420
|
-
const result = await this.znp.request(5, 'extFindGroup', { endpoint, groupid: group }, null, null, [
|
|
421
|
-
if (result.payload.status ===
|
|
396
|
+
const result = await this.znp.request(5, 'extFindGroup', { endpoint, groupid: group }, null, null, [ZnpCommandStatus.SUCCESS, ZnpCommandStatus.FAILURE]);
|
|
397
|
+
if (result.payload.status === ZnpCommandStatus.FAILURE) {
|
|
422
398
|
await this.znp.request(5, 'extAddGroup', { endpoint, groupid: group, namelen: 0, groupname: [] });
|
|
423
399
|
}
|
|
424
400
|
}
|
|
@@ -427,7 +403,7 @@ class ZnpAdapterManager {
|
|
|
427
403
|
*/
|
|
428
404
|
async resetAdapter() {
|
|
429
405
|
this.debug.startup("adapter reset requested");
|
|
430
|
-
await this.znp.request(
|
|
406
|
+
await this.znp.request(Subsystem.SYS, 'resetReq', { type: ZnpConstants.SYS.resetType.SOFT });
|
|
431
407
|
this.debug.startup("adapter reset successful");
|
|
432
408
|
}
|
|
433
409
|
/**
|
|
@@ -435,9 +411,9 @@ class ZnpAdapterManager {
|
|
|
435
411
|
*/
|
|
436
412
|
async clearAdapter() {
|
|
437
413
|
this.debug.startup("clearing adapter using startup option 3");
|
|
438
|
-
await this.nv.writeItem(
|
|
414
|
+
await this.nv.writeItem(NvItemsIds.STARTUP_OPTION, Buffer.from([0x03]));
|
|
439
415
|
await this.resetAdapter();
|
|
440
|
-
await this.nv.writeItem(
|
|
416
|
+
await this.nv.writeItem(NvItemsIds.STARTUP_OPTION, Buffer.from([0x00]));
|
|
441
417
|
}
|
|
442
418
|
/**
|
|
443
419
|
* Transforms Z2M number-based network options to local Buffer-based options.
|
|
@@ -459,7 +435,7 @@ class ZnpAdapterManager {
|
|
|
459
435
|
networkKeyDistribute: options.networkKeyDistribute
|
|
460
436
|
};
|
|
461
437
|
if (parsed.extendedPanId.equals(Buffer.alloc(8, 0xdd))) {
|
|
462
|
-
const adapterIeeeAddressResponse = await this.znp.request(
|
|
438
|
+
const adapterIeeeAddressResponse = await this.znp.request(Subsystem.SYS, "getExtAddr", {});
|
|
463
439
|
parsed.extendedPanId = Buffer.from(adapterIeeeAddressResponse.payload.extaddress.split("0x")[1], "hex");
|
|
464
440
|
parsed.hasDefaultExtendedPanId = true;
|
|
465
441
|
}
|
|
@@ -470,8 +446,7 @@ class ZnpAdapterManager {
|
|
|
470
446
|
*/
|
|
471
447
|
async writeConfigurationFlag() {
|
|
472
448
|
this.debug.commissioning("writing configuration flag to adapter NV memory");
|
|
473
|
-
await this.nv.writeItem(this.options.version ===
|
|
449
|
+
await this.nv.writeItem(this.options.version === ZnpVersion.zStack12 ? NvItemsIds.ZNP_HAS_CONFIGURED_ZSTACK1 : NvItemsIds.ZNP_HAS_CONFIGURED_ZSTACK3, Buffer.from([0x55]));
|
|
474
450
|
}
|
|
475
451
|
}
|
|
476
|
-
exports.ZnpAdapterManager = ZnpAdapterManager;
|
|
477
452
|
//# sourceMappingURL=manager.js.map
|