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,43 +1,23 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
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
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
-
};
|
|
28
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
const entity_1 = __importDefault(require("./entity"));
|
|
30
|
-
const zclTransactionSequenceNumber_1 = __importDefault(require("../helpers/zclTransactionSequenceNumber"));
|
|
31
|
-
const Zcl = __importStar(require("../../zcl"));
|
|
32
|
-
const device_1 = __importDefault(require("./device"));
|
|
33
|
-
const assert_1 = __importDefault(require("assert"));
|
|
34
|
-
const debug_1 = __importDefault(require("debug"));
|
|
1
|
+
import Entity from './entity';
|
|
2
|
+
import ZclTransactionSequenceNumber from '../helpers/zclTransactionSequenceNumber';
|
|
3
|
+
import * as Zcl from '../../zcl';
|
|
4
|
+
import Device from './device';
|
|
5
|
+
import assert from 'assert';
|
|
6
|
+
import Debug from "debug";
|
|
35
7
|
const debug = {
|
|
36
|
-
info: (
|
|
37
|
-
error: (
|
|
8
|
+
info: Debug('zigbee-herdsman:controller:group'),
|
|
9
|
+
error: Debug('zigbee-herdsman:controller:group'),
|
|
38
10
|
};
|
|
39
|
-
class Group extends
|
|
11
|
+
class Group extends Entity {
|
|
12
|
+
databaseID;
|
|
13
|
+
groupID;
|
|
14
|
+
_members;
|
|
40
15
|
get members() { return Array.from(this._members).filter((e) => e.getDevice()); }
|
|
16
|
+
// Can be used by applications to store data.
|
|
17
|
+
meta;
|
|
18
|
+
// This lookup contains all groups that are queried from the database, this is to ensure that always
|
|
19
|
+
// the same instance is returned.
|
|
20
|
+
static groups = null;
|
|
41
21
|
constructor(databaseID, groupID, members, meta) {
|
|
42
22
|
super();
|
|
43
23
|
this.databaseID = databaseID;
|
|
@@ -51,7 +31,7 @@ class Group extends entity_1.default {
|
|
|
51
31
|
static fromDatabaseEntry(entry) {
|
|
52
32
|
const members = new Set();
|
|
53
33
|
for (const member of entry.members) {
|
|
54
|
-
const device =
|
|
34
|
+
const device = Device.byIeeeAddr(member.deviceIeeeAddr);
|
|
55
35
|
if (device) {
|
|
56
36
|
const endpoint = device.getEndpoint(member.endpointID);
|
|
57
37
|
members.add(endpoint);
|
|
@@ -68,7 +48,7 @@ class Group extends entity_1.default {
|
|
|
68
48
|
static loadFromDatabaseIfNecessary() {
|
|
69
49
|
if (!Group.groups) {
|
|
70
50
|
Group.groups = {};
|
|
71
|
-
const entries =
|
|
51
|
+
const entries = Entity.database.getEntries(['Group']);
|
|
72
52
|
for (const entry of entries) {
|
|
73
53
|
const group = Group.fromDatabaseEntry(entry);
|
|
74
54
|
Group.groups[group.groupID] = group;
|
|
@@ -84,14 +64,14 @@ class Group extends entity_1.default {
|
|
|
84
64
|
return Object.values(Group.groups);
|
|
85
65
|
}
|
|
86
66
|
static create(groupID) {
|
|
87
|
-
(
|
|
67
|
+
assert(typeof groupID === 'number', 'GroupID must be a number');
|
|
88
68
|
Group.loadFromDatabaseIfNecessary();
|
|
89
69
|
if (Group.groups[groupID]) {
|
|
90
70
|
throw new Error(`Group with groupID '${groupID}' already exists`);
|
|
91
71
|
}
|
|
92
|
-
const databaseID =
|
|
72
|
+
const databaseID = Entity.database.newID();
|
|
93
73
|
const group = new Group(databaseID, groupID, new Set(), {});
|
|
94
|
-
|
|
74
|
+
Entity.database.insert(group.toDatabaseRecord());
|
|
95
75
|
Group.groups[group.groupID] = group;
|
|
96
76
|
return group;
|
|
97
77
|
}
|
|
@@ -103,13 +83,13 @@ class Group extends entity_1.default {
|
|
|
103
83
|
}
|
|
104
84
|
removeFromDatabase() {
|
|
105
85
|
Group.loadFromDatabaseIfNecessary();
|
|
106
|
-
if (
|
|
107
|
-
|
|
86
|
+
if (Entity.database.has(this.databaseID)) {
|
|
87
|
+
Entity.database.remove(this.databaseID);
|
|
108
88
|
}
|
|
109
89
|
delete Group.groups[this.groupID];
|
|
110
90
|
}
|
|
111
91
|
save(writeDatabase = true) {
|
|
112
|
-
|
|
92
|
+
Entity.database.update(this.toDatabaseRecord(), writeDatabase);
|
|
113
93
|
}
|
|
114
94
|
addMember(endpoint) {
|
|
115
95
|
this._members.add(endpoint);
|
|
@@ -126,7 +106,6 @@ class Group extends entity_1.default {
|
|
|
126
106
|
* Zigbee functions
|
|
127
107
|
*/
|
|
128
108
|
async write(clusterKey, attributes, options) {
|
|
129
|
-
var _a;
|
|
130
109
|
options = this.getOptionsWithDefaults(options, Zcl.Direction.CLIENT_TO_SERVER);
|
|
131
110
|
const cluster = Zcl.Utils.getCluster(clusterKey);
|
|
132
111
|
const payload = [];
|
|
@@ -145,8 +124,8 @@ class Group extends entity_1.default {
|
|
|
145
124
|
const log = `Write ${this.groupID} ${cluster.name}(${JSON.stringify(attributes)}, ${JSON.stringify(options)})`;
|
|
146
125
|
debug.info(log);
|
|
147
126
|
try {
|
|
148
|
-
const frame = Zcl.ZclFrame.create(Zcl.FrameType.GLOBAL, options.direction, true, options.manufacturerCode,
|
|
149
|
-
await
|
|
127
|
+
const frame = Zcl.ZclFrame.create(Zcl.FrameType.GLOBAL, options.direction, true, options.manufacturerCode, options.transactionSequenceNumber ?? ZclTransactionSequenceNumber.next(), 'write', cluster.ID, payload, options.reservedBits);
|
|
128
|
+
await Entity.adapter.sendZclFrameToGroup(this.groupID, frame, options.srcEndpoint);
|
|
150
129
|
}
|
|
151
130
|
catch (error) {
|
|
152
131
|
error.message = `${log} failed (${error.message})`;
|
|
@@ -155,18 +134,17 @@ class Group extends entity_1.default {
|
|
|
155
134
|
}
|
|
156
135
|
}
|
|
157
136
|
async read(clusterKey, attributes, options) {
|
|
158
|
-
var _a;
|
|
159
137
|
options = this.getOptionsWithDefaults(options, Zcl.Direction.CLIENT_TO_SERVER);
|
|
160
138
|
const cluster = Zcl.Utils.getCluster(clusterKey);
|
|
161
139
|
const payload = [];
|
|
162
140
|
for (const attribute of attributes) {
|
|
163
141
|
payload.push({ attrId: typeof attribute === 'number' ? attribute : cluster.getAttribute(attribute).ID });
|
|
164
142
|
}
|
|
165
|
-
const frame = Zcl.ZclFrame.create(Zcl.FrameType.GLOBAL, options.direction, true, options.manufacturerCode,
|
|
143
|
+
const frame = Zcl.ZclFrame.create(Zcl.FrameType.GLOBAL, options.direction, true, options.manufacturerCode, options.transactionSequenceNumber ?? ZclTransactionSequenceNumber.next(), 'read', cluster.ID, payload, options.reservedBits);
|
|
166
144
|
const log = `Read ${this.groupID} ${cluster.name}(${JSON.stringify(attributes)}, ${JSON.stringify(options)})`;
|
|
167
145
|
debug.info(log);
|
|
168
146
|
try {
|
|
169
|
-
await
|
|
147
|
+
await Entity.adapter.sendZclFrameToGroup(this.groupID, frame, options.srcEndpoint);
|
|
170
148
|
}
|
|
171
149
|
catch (error) {
|
|
172
150
|
error.message = `${log} failed (${error.message})`;
|
|
@@ -181,8 +159,8 @@ class Group extends entity_1.default {
|
|
|
181
159
|
const log = `Command ${this.groupID} ${cluster.name}.${command.name}(${JSON.stringify(payload)})`;
|
|
182
160
|
debug.info(log);
|
|
183
161
|
try {
|
|
184
|
-
const frame = Zcl.ZclFrame.create(Zcl.FrameType.SPECIFIC, options.direction, true, options.manufacturerCode, options.transactionSequenceNumber ||
|
|
185
|
-
await
|
|
162
|
+
const frame = Zcl.ZclFrame.create(Zcl.FrameType.SPECIFIC, options.direction, true, options.manufacturerCode, options.transactionSequenceNumber || ZclTransactionSequenceNumber.next(), command.ID, cluster.ID, payload, options.reservedBits);
|
|
163
|
+
await Entity.adapter.sendZclFrameToGroup(this.groupID, frame, options.srcEndpoint);
|
|
186
164
|
}
|
|
187
165
|
catch (error) {
|
|
188
166
|
error.message = `${log} failed (${error.message})`;
|
|
@@ -202,8 +180,5 @@ class Group extends entity_1.default {
|
|
|
202
180
|
};
|
|
203
181
|
}
|
|
204
182
|
}
|
|
205
|
-
|
|
206
|
-
// the same instance is returned.
|
|
207
|
-
Group.groups = null;
|
|
208
|
-
exports.default = Group;
|
|
183
|
+
export default Group;
|
|
209
184
|
//# sourceMappingURL=group.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"group.js","sourceRoot":"","sources":["../../../src/controller/model/group.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"group.js","sourceRoot":"","sources":["../../../src/controller/model/group.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,4BAA4B,MAAM,yCAAyC,CAAC;AACnF,OAAO,KAAK,GAAG,MAAM,WAAW,CAAC;AAEjC,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,KAAK,GAAG;IACV,IAAI,EAAE,KAAK,CAAC,kCAAkC,CAAC;IAC/C,KAAK,EAAE,KAAK,CAAC,kCAAkC,CAAC;CACnD,CAAC;AAUF,MAAM,KAAM,SAAQ,MAAM;IACd,UAAU,CAAS;IACX,OAAO,CAAS;IACf,QAAQ,CAAgB;IACzC,IAAI,OAAO,KAAgB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAA,CAAC;IAC1F,6CAA6C;IAC7B,IAAI,CAAW;IAE/B,oGAAoG;IACpG,iCAAiC;IACzB,MAAM,CAAC,MAAM,GAA+B,IAAI,CAAC;IAEzD,YAAoB,UAAkB,EAAE,OAAe,EAAE,OAAsB,EAAE,IAAc;QAC3F,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAED;;OAEG;IAEK,MAAM,CAAC,iBAAiB,CAAC,KAAoB;QACjD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAY,CAAC;QACpC,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;YACjC,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;YACxD,IAAI,MAAM,EAAE,CAAC;gBACT,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;gBACvD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC1B,CAAC;QACL,CAAC;QAED,OAAO,IAAI,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IACnE,CAAC;IAEO,gBAAgB;QACpB,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACpD,OAAO,EAAC,cAAc,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,EAAC,CAAC;QAChF,CAAC,CAAC,CAAC;QAEH,OAAO,EAAC,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAC,CAAC;IACjG,CAAC;IAEO,MAAM,CAAC,2BAA2B;QACtC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAChB,KAAK,CAAC,MAAM,GAAG,EAAE,CAAC;YAClB,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACtD,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAC1B,MAAM,KAAK,GAAG,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBAC7C,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;YACxC,CAAC;QACL,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,OAAe;QACnC,KAAK,CAAC,2BAA2B,EAAE,CAAC;QACpC,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAEM,MAAM,CAAC,GAAG;QACb,KAAK,CAAC,2BAA2B,EAAE,CAAC;QACpC,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAEM,MAAM,CAAC,MAAM,CAAC,OAAe;QAChC,MAAM,CAAC,OAAO,OAAO,KAAK,QAAQ,EAAE,0BAA0B,CAAC,CAAC;QAChE,KAAK,CAAC,2BAA2B,EAAE,CAAC;QACpC,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,uBAAuB,OAAO,kBAAkB,CAAC,CAAC;QACtE,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QAC3C,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;QAC5D,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAEjD,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;QACpC,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,KAAK,CAAC,iBAAiB;QAC1B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnC,MAAM,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC;QAED,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC9B,CAAC;IAEM,kBAAkB;QACrB,KAAK,CAAC,2BAA2B,EAAE,CAAC;QAEpC,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YACvC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC5C,CAAC;QAED,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAEM,IAAI,CAAC,aAAa,GAAC,IAAI;QAC1B,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,aAAa,CAAC,CAAC;IACnE,CAAC;IAEM,SAAS,CAAC,QAAkB;QAC/B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC5B,IAAI,CAAC,IAAI,EAAE,CAAC;IAChB,CAAC;IAEM,YAAY,CAAC,QAAkB;QAClC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC/B,IAAI,CAAC,IAAI,EAAE,CAAC;IAChB,CAAC;IAEM,SAAS,CAAC,QAAkB;QAC/B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;IAED;;OAEG;IAEI,KAAK,CAAC,KAAK,CACd,UAA2B,EAAE,UAAoB,EAAE,OAAiB;QAEpE,OAAO,GAAG,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAC/E,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACjD,MAAM,OAAO,GAA6E,EAAE,CAAC;QAC7F,KAAK,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YACzD,IAAI,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACjC,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;gBACjD,OAAO,CAAC,IAAI,CAAC,EAAC,MAAM,EAAE,SAAS,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,IAAI,EAAC,CAAC,CAAC;YACpF,CAAC;iBAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAC,CAAC;gBACjC,OAAO,CAAC,IAAI,CAAC,EAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAC,CAAC,CAAC;YAC1F,CAAC;iBAAM,CAAC;gBACJ,MAAM,IAAI,KAAK,CAAC,sBAAsB,QAAQ,qDAAqD,CAAC,CAAC;YACzG,CAAC;QACL,CAAC;QAED,MAAM,GAAG,GAAG,SAAS,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC;QAC/G,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEhB,IAAI,CAAC;YACD,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,MAAM,CAC7B,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,EAAE,IAAI,EAC7C,OAAO,CAAC,gBAAgB,EAAE,OAAO,CAAC,yBAAyB,IAAI,4BAA4B,CAAC,IAAI,EAAE,EAClG,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,YAAY,CACrD,CAAC;YACF,MAAM,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACvF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,KAAK,CAAC,OAAO,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,OAAO,GAAG,CAAC;YACnD,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC3B,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,IAAI,CACb,UAA2B,EAAE,UAA+B,EAAE,OAAiB;QAE/E,OAAO,GAAG,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAC/E,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACjD,MAAM,OAAO,GAAuB,EAAE,CAAC;QACvC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACjC,OAAO,CAAC,IAAI,CAAC,EAAC,MAAM,EAAE,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,EAAC,CAAC,CAAC;QAC3G,CAAC;QAED,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,MAAM,CAC7B,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,EAAE,IAAI,EAC7C,OAAO,CAAC,gBAAgB,EAAE,OAAO,CAAC,yBAAyB,IAAI,4BAA4B,CAAC,IAAI,EAAE,EAAE,MAAM,EAC1G,OAAO,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,YAAY,CAC5C,CAAC;QAEF,MAAM,GAAG,GAAG,QAAQ,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC;QAC9G,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEhB,IAAI,CAAC;YACD,MAAM,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACvF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,KAAK,CAAC,OAAO,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,OAAO,GAAG,CAAC;YACnD,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC3B,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,OAAO,CAChB,UAA2B,EAAE,UAA2B,EAAE,OAAiB,EAAE,OAAiB;QAE9F,OAAO,GAAG,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAC/E,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACjD,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAE/C,MAAM,GAAG,GAAG,WAAW,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC;QAClG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEhB,IAAI,CAAC;YACD,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,MAAM,CAC7B,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,gBAAgB,EACzE,OAAO,CAAC,yBAAyB,IAAI,4BAA4B,CAAC,IAAI,EAAE,EACxE,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,YAAY,CACxD,CAAC;YACF,MAAM,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACvF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,KAAK,CAAC,OAAO,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,OAAO,GAAG,CAAC;YACnD,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC3B,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;IAEO,sBAAsB,CAC1B,OAAgB,EAAE,SAAwB;QAE1C,MAAM,eAAe,GAAG,OAAO,IAAI,EAAE,CAAC;QACtC,OAAO;YACH,SAAS;YACT,WAAW,EAAE,IAAI;YACjB,YAAY,EAAE,CAAC;YACf,gBAAgB,EAAE,IAAI;YACtB,yBAAyB,EAAE,IAAI;YAC/B,GAAG,eAAe;SACrB,CAAC;IACN,CAAC;;AAGL,eAAe,KAAK,CAAC"}
|
|
@@ -1,15 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
exports.Group = exports.Entity = exports.Endpoint = exports.Device = void 0;
|
|
7
|
-
const device_1 = __importDefault(require("./device"));
|
|
8
|
-
exports.Device = device_1.default;
|
|
9
|
-
const endpoint_1 = __importDefault(require("./endpoint"));
|
|
10
|
-
exports.Endpoint = endpoint_1.default;
|
|
11
|
-
const entity_1 = __importDefault(require("./entity"));
|
|
12
|
-
exports.Entity = entity_1.default;
|
|
13
|
-
const group_1 = __importDefault(require("./group"));
|
|
14
|
-
exports.Group = group_1.default;
|
|
1
|
+
import Device from './device';
|
|
2
|
+
import Endpoint from './endpoint';
|
|
3
|
+
import Entity from './entity';
|
|
4
|
+
import Group from './group';
|
|
5
|
+
export { Device, Endpoint, Entity, Group, };
|
|
15
6
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/controller/model/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/controller/model/index.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,KAAK,MAAM,SAAS,CAAC;AAE5B,OAAO,EACH,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,GAClC,CAAC"}
|
|
@@ -1,37 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
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
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
-
};
|
|
28
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
const Zcl = __importStar(require("../zcl"));
|
|
30
|
-
const utils_1 = require("../utils");
|
|
31
|
-
const debug_1 = __importDefault(require("debug"));
|
|
32
|
-
const debug = (0, debug_1.default)('zigbee-herdsman:controller:touchlink');
|
|
1
|
+
import * as Zcl from '../zcl';
|
|
2
|
+
import { Wait, AssertString } from '../utils';
|
|
3
|
+
import Debug from "debug";
|
|
4
|
+
const debug = Debug('zigbee-herdsman:controller:touchlink');
|
|
33
5
|
const scanChannels = [11, 15, 20, 25, 12, 13, 14, 16, 17, 18, 19, 21, 22, 23, 24, 26];
|
|
34
6
|
class Touchlink {
|
|
7
|
+
adapter;
|
|
8
|
+
locked;
|
|
35
9
|
constructor(adapter) {
|
|
36
10
|
this.adapter = adapter;
|
|
37
11
|
this.locked = false;
|
|
@@ -56,7 +30,7 @@ class Touchlink {
|
|
|
56
30
|
// TODO: multiple responses are not handled yet.
|
|
57
31
|
const response = await this.adapter.sendZclFrameInterPANBroadcast(this.createScanRequestFrame(this.transactionNumber()), 500);
|
|
58
32
|
debug(`Got scan response on channel '${channel}' of '${response.address}'`);
|
|
59
|
-
|
|
33
|
+
AssertString(response.address);
|
|
60
34
|
result.push({ ieeeAddr: response.address, channel });
|
|
61
35
|
}
|
|
62
36
|
catch (error) {
|
|
@@ -98,7 +72,7 @@ class Touchlink {
|
|
|
98
72
|
debug(`Got scan response on channel '${channel}'`);
|
|
99
73
|
debug(`Identifying '${ieeeAddr}'`);
|
|
100
74
|
await this.adapter.sendZclFrameInterPANToIeeeAddr(this.createIdentifyRequestFrame(transaction), ieeeAddr);
|
|
101
|
-
await
|
|
75
|
+
await Wait(2000);
|
|
102
76
|
debug(`Reset to factory new '${ieeeAddr}'`);
|
|
103
77
|
await this.adapter.sendZclFrameInterPANToIeeeAddr(this.createResetFactoryNewRequestFrame(transaction), ieeeAddr);
|
|
104
78
|
}
|
|
@@ -120,12 +94,12 @@ class Touchlink {
|
|
|
120
94
|
const transaction = this.transactionNumber();
|
|
121
95
|
const response = await this.adapter.sendZclFrameInterPANBroadcast(this.createScanRequestFrame(transaction), 500);
|
|
122
96
|
debug(`Got scan response on channel '${channel}'`);
|
|
123
|
-
|
|
97
|
+
AssertString(response.address);
|
|
124
98
|
// Device answered (if not it will fall in the catch below),
|
|
125
99
|
// identify it (this will make e.g. the bulb flash)
|
|
126
100
|
debug(`Identifying`);
|
|
127
101
|
await this.adapter.sendZclFrameInterPANToIeeeAddr(this.createIdentifyRequestFrame(transaction), response.address);
|
|
128
|
-
await
|
|
102
|
+
await Wait(2000);
|
|
129
103
|
debug(`Reset to factory new`);
|
|
130
104
|
await this.adapter.sendZclFrameInterPANToIeeeAddr(this.createResetFactoryNewRequestFrame(transaction), response.address);
|
|
131
105
|
done = true;
|
|
@@ -154,5 +128,5 @@ class Touchlink {
|
|
|
154
128
|
return Zcl.ZclFrame.create(Zcl.FrameType.SPECIFIC, Zcl.Direction.CLIENT_TO_SERVER, true, null, 0, 'resetToFactoryNew', Zcl.Utils.getCluster('touchlink').ID, { transactionID: transaction });
|
|
155
129
|
}
|
|
156
130
|
}
|
|
157
|
-
|
|
131
|
+
export default Touchlink;
|
|
158
132
|
//# sourceMappingURL=touchlink.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"touchlink.js","sourceRoot":"","sources":["../../src/controller/touchlink.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"touchlink.js","sourceRoot":"","sources":["../../src/controller/touchlink.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.GreenPowerEvents = void 0;
|
|
4
1
|
;
|
|
5
2
|
var GreenPowerEvents;
|
|
6
3
|
(function (GreenPowerEvents) {
|
|
7
4
|
GreenPowerEvents["deviceJoined"] = "deviceJoined";
|
|
8
|
-
})(GreenPowerEvents || (
|
|
5
|
+
})(GreenPowerEvents || (GreenPowerEvents = {}));
|
|
6
|
+
export { GreenPowerEvents };
|
|
9
7
|
//# sourceMappingURL=tstype.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tstype.js","sourceRoot":"","sources":["../../src/controller/tstype.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tstype.js","sourceRoot":"","sources":["../../src/controller/tstype.ts"],"names":[],"mappings":"AACqC,CAAC;AA+BtC,IAAK,gBAEJ;AAFD,WAAK,gBAAgB;IACjB,iDAA6B,CAAA;AACjC,CAAC,EAFI,gBAAgB,KAAhB,gBAAgB,QAEpB;AAQD,OAAO,EAC8C,gBAAgB,EAEpE,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,34 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
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
|
-
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.Controller = exports.Zcl = void 0;
|
|
30
|
-
const controller_1 = __importDefault(require("./controller/controller"));
|
|
31
|
-
exports.Controller = controller_1.default;
|
|
32
|
-
const Zcl = __importStar(require("./zcl"));
|
|
33
|
-
exports.Zcl = Zcl;
|
|
1
|
+
import Controller from './controller/controller';
|
|
2
|
+
import * as Zcl from './zcl';
|
|
3
|
+
export { Zcl, Controller };
|
|
34
4
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,yBAAyB,CAAC;AACjD,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAE7B,OAAO,EAAC,GAAG,EAAE,UAAU,EAAC,CAAC"}
|
package/dist/models/backup.js
CHANGED
package/dist/models/index.js
CHANGED
|
@@ -1,21 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
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 __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./backup"), exports);
|
|
18
|
-
__exportStar(require("./backup-storage-legacy"), exports);
|
|
19
|
-
__exportStar(require("./backup-storage-unified"), exports);
|
|
20
|
-
__exportStar(require("./network-options"), exports);
|
|
1
|
+
export * from "./backup";
|
|
2
|
+
export * from "./backup-storage-legacy";
|
|
3
|
+
export * from "./backup-storage-unified";
|
|
4
|
+
export * from "./network-options";
|
|
21
5
|
//# sourceMappingURL=index.js.map
|
package/dist/models/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/models/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/models/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
1
|
function assertString(input) {
|
|
4
2
|
if (typeof input !== 'string') {
|
|
5
3
|
throw new Error('Input must be a string!');
|
|
6
4
|
}
|
|
7
5
|
}
|
|
8
|
-
|
|
6
|
+
export default assertString;
|
|
9
7
|
//# sourceMappingURL=assertString.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assertString.js","sourceRoot":"","sources":["../../src/utils/assertString.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"assertString.js","sourceRoot":"","sources":["../../src/utils/assertString.ts"],"names":[],"mappings":"AAAA,SAAS,YAAY,CAAC,KAAc;IAChC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;AACL,CAAC;AAED,eAAe,YAAY,CAAC"}
|
package/dist/utils/backup.js
CHANGED
|
@@ -1,44 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
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.fromLegacyBackup = exports.fromUnifiedBackup = exports.toUnifiedBackup = void 0;
|
|
27
|
-
const ZStackStructs = __importStar(require("../adapter/z-stack/structs"));
|
|
28
|
-
const ZStackUtils = __importStar(require("../adapter/z-stack/utils"));
|
|
29
|
-
const mz_1 = require("mz");
|
|
30
|
-
const path = __importStar(require("path"));
|
|
1
|
+
import * as ZStackStructs from "../adapter/z-stack/structs";
|
|
2
|
+
import * as ZStackUtils from "../adapter/z-stack/utils";
|
|
3
|
+
import { fs } from "mz";
|
|
4
|
+
import * as path from "path";
|
|
31
5
|
/**
|
|
32
6
|
* Converts internal backup format to unified backup storage format as described by
|
|
33
7
|
* [zigpy/open-coordinator-backup](https://github.com/zigpy/open-coordinator-backup).
|
|
34
8
|
*
|
|
35
9
|
* @param backup Backup to create unified backup format from.
|
|
36
10
|
*/
|
|
37
|
-
const toUnifiedBackup = async (backup) => {
|
|
38
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
11
|
+
export const toUnifiedBackup = async (backup) => {
|
|
39
12
|
const panIdBuffer = Buffer.alloc(2);
|
|
40
13
|
panIdBuffer.writeUInt16BE(backup.networkOptions.panId);
|
|
41
|
-
const packageInfo = JSON.parse((await
|
|
14
|
+
const packageInfo = JSON.parse((await fs.readFile(path.join(__dirname, "../../", "package.json"))).toString());
|
|
42
15
|
/* istanbul ignore next */
|
|
43
16
|
return {
|
|
44
17
|
metadata: {
|
|
@@ -48,26 +21,26 @@ const toUnifiedBackup = async (backup) => {
|
|
|
48
21
|
internal: {
|
|
49
22
|
date: new Date().toISOString(),
|
|
50
23
|
...(backup.znp) ? {
|
|
51
|
-
znpVersion: [null, undefined].includes(
|
|
24
|
+
znpVersion: [null, undefined].includes(backup.znp?.version) ? undefined : backup.znp?.version
|
|
52
25
|
} : undefined,
|
|
53
26
|
...(backup.ezsp) ? {
|
|
54
|
-
ezspVersion: [null, undefined].includes(
|
|
27
|
+
ezspVersion: [null, undefined].includes(backup.ezsp?.version) ? undefined : backup.ezsp?.version
|
|
55
28
|
} : undefined,
|
|
56
29
|
}
|
|
57
30
|
},
|
|
58
31
|
stack_specific: {
|
|
59
32
|
...(backup.znp) ? {
|
|
60
33
|
zstack: {
|
|
61
|
-
tclk_seed:
|
|
34
|
+
tclk_seed: backup.znp?.trustCenterLinkKeySeed?.toString("hex") || undefined
|
|
62
35
|
}
|
|
63
36
|
} : undefined,
|
|
64
37
|
...(backup.ezsp) ? {
|
|
65
38
|
ezsp: {
|
|
66
|
-
hashed_tclk:
|
|
39
|
+
hashed_tclk: backup.ezsp?.hashed_tclk?.toString("hex") || undefined
|
|
67
40
|
}
|
|
68
41
|
} : undefined
|
|
69
42
|
},
|
|
70
|
-
coordinator_ieee:
|
|
43
|
+
coordinator_ieee: backup.coordinatorIeeeAddress?.toString("hex") || null,
|
|
71
44
|
pan_id: panIdBuffer.toString("hex"),
|
|
72
45
|
extended_pan_id: backup.networkOptions.extendedPanId.toString("hex"),
|
|
73
46
|
nwk_update_id: backup.networkUpdateId || 0,
|
|
@@ -95,15 +68,13 @@ const toUnifiedBackup = async (backup) => {
|
|
|
95
68
|
}),
|
|
96
69
|
};
|
|
97
70
|
};
|
|
98
|
-
exports.toUnifiedBackup = toUnifiedBackup;
|
|
99
71
|
/**
|
|
100
72
|
* Converts unified backup storage format to internal backup format.
|
|
101
73
|
*
|
|
102
74
|
* @param backup Unified format to convert to internal backup format.
|
|
103
75
|
*/
|
|
104
|
-
const fromUnifiedBackup = (backup) => {
|
|
105
|
-
|
|
106
|
-
const tclkSeedString = ((_b = (_a = backup.stack_specific) === null || _a === void 0 ? void 0 : _a.zstack) === null || _b === void 0 ? void 0 : _b.tclk_seed) || null;
|
|
76
|
+
export const fromUnifiedBackup = (backup) => {
|
|
77
|
+
const tclkSeedString = backup.stack_specific?.zstack?.tclk_seed || null;
|
|
107
78
|
/* istanbul ignore next */
|
|
108
79
|
return {
|
|
109
80
|
networkOptions: {
|
|
@@ -132,18 +103,17 @@ const fromUnifiedBackup = (backup) => {
|
|
|
132
103
|
}
|
|
133
104
|
})),
|
|
134
105
|
znp: {
|
|
135
|
-
version:
|
|
106
|
+
version: backup.metadata.internal?.znpVersion || undefined,
|
|
136
107
|
trustCenterLinkKeySeed: tclkSeedString ? Buffer.from(tclkSeedString, "hex") : undefined,
|
|
137
108
|
}
|
|
138
109
|
};
|
|
139
110
|
};
|
|
140
|
-
exports.fromUnifiedBackup = fromUnifiedBackup;
|
|
141
111
|
/**
|
|
142
112
|
* Converts legacy Zigbee2MQTT format to internal backup format.
|
|
143
113
|
*
|
|
144
114
|
* @param backup Legacy format to convert.
|
|
145
115
|
*/
|
|
146
|
-
const fromLegacyBackup = (backup) => {
|
|
116
|
+
export const fromLegacyBackup = (backup) => {
|
|
147
117
|
if (!backup.data.ZCD_NV_NIB) {
|
|
148
118
|
throw new Error("Backup corrupted - missing NIB");
|
|
149
119
|
}
|
|
@@ -184,5 +154,4 @@ const fromLegacyBackup = (backup) => {
|
|
|
184
154
|
devices: []
|
|
185
155
|
};
|
|
186
156
|
};
|
|
187
|
-
exports.fromLegacyBackup = fromLegacyBackup;
|
|
188
157
|
//# sourceMappingURL=backup.js.map
|