zigbee-herdsman 0.55.5 → 0.56.2

package/dist/controller/model/group.js

@@ -44,7 +44,8 @@ class Group extends entity_1.default {
     meta;
     // This lookup contains all groups that are queried from the database, this is to ensure that always
     // the same instance is returned.
-    static groups = null;
+    static groups = {};
+    static loadedFromDatabase = false;
     constructor(databaseID, groupID, members, meta) {
         super();
         this.databaseID = databaseID;
@@ -59,7 +60,8 @@ class Group extends entity_1.default {
      * Reset runtime lookups.
      */
     static resetCache() {
-        Group.groups = null;
+        Group.groups = {};
+        Group.loadedFromDatabase = false;
     }
     static fromDatabaseEntry(entry) {
         const members = new Set();
@@ -67,7 +69,10 @@ class Group extends entity_1.default {
             const device = device_1.default.byIeeeAddr(member.deviceIeeeAddr);
             if (device) {
                 const endpoint = device.getEndpoint(member.endpointID);
-                members.add(endpoint);
+                /* istanbul ignore else */
+                if (endpoint) {
+                    members.add(endpoint);
+                }
             }
         }
         return new Group(entry.id, entry.groupID, members, entry.meta);
@@ -80,12 +85,12 @@ class Group extends entity_1.default {
         return { id: this.databaseID, type: 'Group', groupID: this.groupID, members, meta: this.meta };
     }
     static loadFromDatabaseIfNecessary() {
-        if (!Group.groups) {
-            Group.groups = {};
+        if (!Group.loadedFromDatabase) {
             for (const entry of entity_1.default.database.getEntriesIterator(['Group'])) {
                 const group = Group.fromDatabaseEntry(entry);
                 Group.groups[group.groupID] = group;
             }
+            Group.loadedFromDatabase = true;
         }
     }
     static byGroupID(groupID) {
@@ -152,8 +157,8 @@ class Group extends entity_1.default {
      * Zigbee functions
      */
     async write(clusterKey, attributes, options) {
-        options = this.getOptionsWithDefaults(options, Zcl.Direction.CLIENT_TO_SERVER);
-        const cluster = Zcl.Utils.getCluster(clusterKey, null, {});
+        const optionsWithDefaults = this.getOptionsWithDefaults(options, Zcl.Direction.CLIENT_TO_SERVER);
+        const cluster = Zcl.Utils.getCluster(clusterKey, undefined, {});
         const payload = [];
         for (const [nameOrID, value] of Object.entries(attributes)) {
             if (cluster.hasAttribute(nameOrID)) {
@@ -167,60 +172,63 @@ class Group extends entity_1.default {
                 throw new Error(`Unknown attribute '${nameOrID}', specify either an existing attribute or a number`);
             }
         }
-        const log = `Write ${this.groupID} ${cluster.name}(${JSON.stringify(attributes)}, ${JSON.stringify(options)})`;
+        const log = `Write ${this.groupID} ${cluster.name}(${JSON.stringify(attributes)}, ${JSON.stringify(optionsWithDefaults)})`;
         logger_1.logger.debug(log, NS);
         try {
-            const frame = Zcl.Frame.create(Zcl.FrameType.GLOBAL, options.direction, true, options.manufacturerCode, options.transactionSequenceNumber ?? zclTransactionSequenceNumber_1.default.next(), 'write', cluster.ID, payload, {}, options.reservedBits);
-            await entity_1.default.adapter.sendZclFrameToGroup(this.groupID, frame, options.srcEndpoint);
+            const frame = Zcl.Frame.create(Zcl.FrameType.GLOBAL, optionsWithDefaults.direction, true, optionsWithDefaults.manufacturerCode, optionsWithDefaults.transactionSequenceNumber ?? zclTransactionSequenceNumber_1.default.next(), 'write', cluster.ID, payload, {}, optionsWithDefaults.reservedBits);
+            await entity_1.default.adapter.sendZclFrameToGroup(this.groupID, frame, optionsWithDefaults.srcEndpoint);
         }
         catch (error) {
-            error.message = `${log} failed (${error.message})`;
-            logger_1.logger.debug(error, NS);
+            const err = error;
+            err.message = `${log} failed (${err.message})`;
+            logger_1.logger.debug(err.stack, NS);
             throw error;
         }
     }
     async read(clusterKey, attributes, options) {
-        options = this.getOptionsWithDefaults(options, Zcl.Direction.CLIENT_TO_SERVER);
-        const cluster = Zcl.Utils.getCluster(clusterKey, null, {});
+        const optionsWithDefaults = this.getOptionsWithDefaults(options, Zcl.Direction.CLIENT_TO_SERVER);
+        const cluster = Zcl.Utils.getCluster(clusterKey, undefined, {});
         const payload = [];
         for (const attribute of attributes) {
             payload.push({ attrId: typeof attribute === 'number' ? attribute : cluster.getAttribute(attribute).ID });
         }
-        const frame = Zcl.Frame.create(Zcl.FrameType.GLOBAL, options.direction, true, options.manufacturerCode, options.transactionSequenceNumber ?? zclTransactionSequenceNumber_1.default.next(), 'read', cluster.ID, payload, {}, options.reservedBits);
-        const log = `Read ${this.groupID} ${cluster.name}(${JSON.stringify(attributes)}, ${JSON.stringify(options)})`;
+        const frame = Zcl.Frame.create(Zcl.FrameType.GLOBAL, optionsWithDefaults.direction, true, optionsWithDefaults.manufacturerCode, optionsWithDefaults.transactionSequenceNumber ?? zclTransactionSequenceNumber_1.default.next(), 'read', cluster.ID, payload, {}, optionsWithDefaults.reservedBits);
+        const log = `Read ${this.groupID} ${cluster.name}(${JSON.stringify(attributes)}, ${JSON.stringify(optionsWithDefaults)})`;
         logger_1.logger.debug(log, NS);
         try {
-            await entity_1.default.adapter.sendZclFrameToGroup(this.groupID, frame, options.srcEndpoint);
+            await entity_1.default.adapter.sendZclFrameToGroup(this.groupID, frame, optionsWithDefaults.srcEndpoint);
         }
         catch (error) {
-            error.message = `${log} failed (${error.message})`;
-            logger_1.logger.debug(error, NS);
+            const err = error;
+            err.message = `${log} failed (${err.message})`;
+            logger_1.logger.debug(err.stack, NS);
             throw error;
         }
     }
     async command(clusterKey, commandKey, payload, options) {
-        options = this.getOptionsWithDefaults(options, Zcl.Direction.CLIENT_TO_SERVER);
-        const cluster = Zcl.Utils.getCluster(clusterKey, null, {});
+        const optionsWithDefaults = this.getOptionsWithDefaults(options, Zcl.Direction.CLIENT_TO_SERVER);
+        const cluster = Zcl.Utils.getCluster(clusterKey, undefined, {});
         const command = cluster.getCommand(commandKey);
         const log = `Command ${this.groupID} ${cluster.name}.${command.name}(${JSON.stringify(payload)})`;
         logger_1.logger.debug(log, NS);
         try {
-            const frame = Zcl.Frame.create(Zcl.FrameType.SPECIFIC, options.direction, true, options.manufacturerCode, options.transactionSequenceNumber || zclTransactionSequenceNumber_1.default.next(), command.ID, cluster.ID, payload, {}, options.reservedBits);
-            await entity_1.default.adapter.sendZclFrameToGroup(this.groupID, frame, options.srcEndpoint);
+            const frame = Zcl.Frame.create(Zcl.FrameType.SPECIFIC, optionsWithDefaults.direction, true, optionsWithDefaults.manufacturerCode, optionsWithDefaults.transactionSequenceNumber || zclTransactionSequenceNumber_1.default.next(), command.ID, cluster.ID, payload, {}, optionsWithDefaults.reservedBits);
+            await entity_1.default.adapter.sendZclFrameToGroup(this.groupID, frame, optionsWithDefaults.srcEndpoint);
         }
         catch (error) {
-            error.message = `${log} failed (${error.message})`;
-            logger_1.logger.debug(error, NS);
+            const err = error;
+            err.message = `${log} failed (${err.message})`;
+            logger_1.logger.debug(err.stack, NS);
             throw error;
         }
     }
     getOptionsWithDefaults(options, direction) {
         return {
             direction,
-            srcEndpoint: null,
+            srcEndpoint: undefined,
             reservedBits: 0,
-            manufacturerCode: null,
-            transactionSequenceNumber: null,
+            manufacturerCode: undefined,
+            transactionSequenceNumber: undefined,
             ...(options || {}),
         };
     }

package/dist/controller/model/group.js.map

@@ -1 +1 @@
-{"version":3,"file":"group.js","sourceRoot":"","sources":["../../../src/controller/model/group.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA4B;AAE5B,+CAA0C;AAC1C,qDAAuC;AACvC,2GAAmF;AAEnF,sDAA8B;AAE9B,sDAA8B;AAE9B,MAAM,EAAE,GAAG,qBAAqB,CAAC;AAUjC,MAAM,KAAM,SAAQ,gBAAM;IACd,UAAU,CAAS;IACX,OAAO,CAAS;IACf,QAAQ,CAAgB;IACzC,IAAI,OAAO;QACP,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;IAClE,CAAC;IACD,6CAA6C;IAC7B,IAAI,CAAW;IAE/B,oGAAoG;IACpG,iCAAiC;IACzB,MAAM,CAAC,MAAM,GAAsC,IAAI,CAAC;IAEhE,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;IAEH;;OAEG;IACI,MAAM,CAAC,UAAU;QACpB,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;IACxB,CAAC;IAEO,MAAM,CAAC,iBAAiB,CAAC,KAAoB;QACjD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAY,CAAC;QAEpC,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;YACjC,MAAM,MAAM,GAAG,gBAAM,CAAC,UAAU,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;YAExD,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,GAA6B,EAAE,CAAC;QAE7C,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAChC,OAAO,CAAC,IAAI,CAAC,EAAC,cAAc,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,EAAC,CAAC,CAAC;QACvF,CAAC;QAED,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;YAElB,KAAK,MAAM,KAAK,IAAI,gBAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;gBAChE,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,CAAC,WAAW,CAAC,SAAqC;QAC5D,KAAK,CAAC,2BAA2B,EAAE,CAAC;QAEpC,KAAK,MAAM,QAAQ,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YAClC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAErC,0BAA0B;YAC1B,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;gBACjC,MAAM,KAAK,CAAC;YAChB,CAAC;QACL,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,MAAM,CAAC,OAAe;QAChC,IAAA,gBAAM,EAAC,OAAO,OAAO,KAAK,QAAQ,EAAE,0BAA0B,CAAC,CAAC;QAChE,wCAAwC;QACxC,0HAA0H;QAC1H,IAAA,gBAAM,EAAC,OAAO,IAAI,CAAC,EAAE,4BAA4B,CAAC,CAAC;QAEnD,KAAK,CAAC,2BAA2B,EAAE,CAAC;QAEpC,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,gBAAM,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,gBAAM,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,gBAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YACvC,gBAAM,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,GAAG,IAAI;QAC5B,gBAAM,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,CAAC,UAA2B,EAAE,UAAoB,EAAE,OAAiB;QACnF,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,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QAC3D,MAAM,OAAO,GAA8E,EAAE,CAAC;QAE9F,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,EAAE,CAAC;gBAClC,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,eAAM,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAEtB,IAAI,CAAC;YACD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,CAC1B,GAAG,CAAC,SAAS,CAAC,MAAM,EACpB,OAAO,CAAC,SAAS,EACjB,IAAI,EACJ,OAAO,CAAC,gBAAgB,EACxB,OAAO,CAAC,yBAAyB,IAAI,sCAA4B,CAAC,IAAI,EAAE,EACxE,OAAO,EACP,OAAO,CAAC,EAAE,EACV,OAAO,EACP,EAAE,EACF,OAAO,CAAC,YAAY,CACvB,CAAC;YAEF,MAAM,gBAAM,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,eAAM,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACxB,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,UAA2B,EAAE,UAA+B,EAAE,OAAiB;QAC7F,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,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAuB,EAAE,CAAC;QAEvC,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,KAAK,CAAC,MAAM,CAC1B,GAAG,CAAC,SAAS,CAAC,MAAM,EACpB,OAAO,CAAC,SAAS,EACjB,IAAI,EACJ,OAAO,CAAC,gBAAgB,EACxB,OAAO,CAAC,yBAAyB,IAAI,sCAA4B,CAAC,IAAI,EAAE,EACxE,MAAM,EACN,OAAO,CAAC,EAAE,EACV,OAAO,EACP,EAAE,EACF,OAAO,CAAC,YAAY,CACvB,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,eAAM,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAEtB,IAAI,CAAC;YACD,MAAM,gBAAM,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,eAAM,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACxB,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,UAA2B,EAAE,UAA2B,EAAE,OAAiB,EAAE,OAAiB;QAC/G,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,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QAC3D,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,eAAM,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAEtB,IAAI,CAAC;YACD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,CAC1B,GAAG,CAAC,SAAS,CAAC,QAAQ,EACtB,OAAO,CAAC,SAAS,EACjB,IAAI,EACJ,OAAO,CAAC,gBAAgB,EACxB,OAAO,CAAC,yBAAyB,IAAI,sCAA4B,CAAC,IAAI,EAAE,EACxE,OAAO,CAAC,EAAE,EACV,OAAO,CAAC,EAAE,EACV,OAAO,EACP,EAAE,EACF,OAAO,CAAC,YAAY,CACvB,CAAC;YAEF,MAAM,gBAAM,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,eAAM,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACxB,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;IAEO,sBAAsB,CAAC,OAAgB,EAAE,SAAwB;QACrE,OAAO;YACH,SAAS;YACT,WAAW,EAAE,IAAI;YACjB,YAAY,EAAE,CAAC;YACf,gBAAgB,EAAE,IAAI;YACtB,yBAAyB,EAAE,IAAI;YAC/B,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;SACrB,CAAC;IACN,CAAC;;AAGL,kBAAe,KAAK,CAAC"}
+{"version":3,"file":"group.js","sourceRoot":"","sources":["../../../src/controller/model/group.ts"],"names":[],"mappings":"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"}

package/dist/controller/touchlink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"touchlink.d.ts","sourceRoot":"","sources":["../../src/controller/touchlink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,YAAY,CAAC;AAQnC,cAAM,SAAS;IACX,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,MAAM,CAAU;gBAEL,OAAO,EAAE,OAAO;IAKnC,OAAO,CAAC,IAAI;IAQZ,OAAO,CAAC,iBAAiB;IAIZ,IAAI,IAAI,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAC,EAAE,CAAC;IA4BtD,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqB1D,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA0BjE,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC;IAwClD,OAAO,CAAC,sBAAsB;IAc9B,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,iCAAiC;CAa5C;AAED,eAAe,SAAS,CAAC"}
+{"version":3,"file":"touchlink.d.ts","sourceRoot":"","sources":["../../src/controller/touchlink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,YAAY,CAAC;AASnC,cAAM,SAAS;IACX,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,MAAM,CAAU;gBAEL,OAAO,EAAE,OAAO;IAKnC,OAAO,CAAC,IAAI;IAQZ,OAAO,CAAC,iBAAiB;IAIZ,IAAI,IAAI,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAC,EAAE,CAAC;IA4BtD,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqB1D,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA0BjE,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC;IAwClD,OAAO,CAAC,sBAAsB;IAc9B,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,iCAAiC;CAa5C;AAED,eAAe,SAAS,CAAC"}

package/dist/controller/touchlink.js

@@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../utils");
 const logger_1 = require("../utils/logger");
+const utils_2 = require("../utils/utils");
 const Zcl = __importStar(require("../zspec/zcl"));
 const NS = 'zh:controller:touchlink';
 const scanChannels = [11, 15, 20, 25, 12, 13, 14, 16, 17, 18, 19, 21, 22, 23, 24, 26];
@@ -55,7 +56,7 @@ class Touchlink {
                     // TODO: multiple responses are not handled yet.
                     const response = await this.adapter.sendZclFrameInterPANBroadcast(this.createScanRequestFrame(this.transactionNumber()), 500);
                     logger_1.logger.debug(`Got scan response on channel '${channel}' of '${response.address}'`, NS);
-                    (0, utils_1.AssertString)(response.address);
+                    (0, utils_2.assertString)(response.address);
                     result.push({ ieeeAddr: response.address, channel });
                 }
                 catch (error) {
@@ -119,7 +120,7 @@ class Touchlink {
                     const transaction = this.transactionNumber();
                     const response = await this.adapter.sendZclFrameInterPANBroadcast(this.createScanRequestFrame(transaction), 500);
                     logger_1.logger.debug(`Got scan response on channel '${channel}'`, NS);
-                    (0, utils_1.AssertString)(response.address);
+                    (0, utils_2.assertString)(response.address);
                     // Device answered (if not it will fall in the catch below),
                     // identify it (this will make e.g. the bulb flash)
                     logger_1.logger.debug(`Identifying`, NS);
@@ -144,13 +145,13 @@ class Touchlink {
         return done;
     }
     createScanRequestFrame(transaction) {
-        return Zcl.Frame.create(Zcl.FrameType.SPECIFIC, Zcl.Direction.CLIENT_TO_SERVER, true, null, 0, 'scanRequest', Zcl.Clusters.touchlink.ID, { transactionID: transaction, zigbeeInformation: 4, touchlinkInformation: 18 }, {});
+        return Zcl.Frame.create(Zcl.FrameType.SPECIFIC, Zcl.Direction.CLIENT_TO_SERVER, true, undefined, 0, 'scanRequest', Zcl.Clusters.touchlink.ID, { transactionID: transaction, zigbeeInformation: 4, touchlinkInformation: 18 }, {});
     }
     createIdentifyRequestFrame(transaction) {
-        return Zcl.Frame.create(Zcl.FrameType.SPECIFIC, Zcl.Direction.CLIENT_TO_SERVER, true, null, 0, 'identifyRequest', Zcl.Clusters.touchlink.ID, { transactionID: transaction, duration: 65535 }, {});
+        return Zcl.Frame.create(Zcl.FrameType.SPECIFIC, Zcl.Direction.CLIENT_TO_SERVER, true, undefined, 0, 'identifyRequest', Zcl.Clusters.touchlink.ID, { transactionID: transaction, duration: 65535 }, {});
     }
     createResetFactoryNewRequestFrame(transaction) {
-        return Zcl.Frame.create(Zcl.FrameType.SPECIFIC, Zcl.Direction.CLIENT_TO_SERVER, true, null, 0, 'resetToFactoryNew', Zcl.Clusters.touchlink.ID, { transactionID: transaction }, {});
+        return Zcl.Frame.create(Zcl.FrameType.SPECIFIC, Zcl.Direction.CLIENT_TO_SERVER, true, undefined, 0, 'resetToFactoryNew', Zcl.Clusters.touchlink.ID, { transactionID: transaction }, {});
     }
 }
 exports.default = Touchlink;

package/dist/controller/touchlink.js.map

@@ -1 +1 @@
-{"version":3,"file":"touchlink.js","sourceRoot":"","sources":["../../src/controller/touchlink.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"touchlink.js","sourceRoot":"","sources":["../../src/controller/touchlink.ts"],"names":[],"mappings":"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"}

package/dist/controller/tstype.d.ts

@@ -9,13 +9,10 @@ interface DatabaseEntry {
     type: EntityType;
     [s: string]: any;
 }
-declare enum GreenPowerEvents {
-    deviceJoined = "deviceJoined"
-}
 interface GreenPowerDeviceJoinedPayload {
     sourceID: number;
     deviceID: number;
     networkAddress: number;
 }
-export { KeyValue, DatabaseEntry, EntityType, DeviceType, GreenPowerEvents, GreenPowerDeviceJoinedPayload, SendPolicy };
+export { KeyValue, DatabaseEntry, EntityType, DeviceType, GreenPowerDeviceJoinedPayload, SendPolicy };
 //# sourceMappingURL=tstype.d.ts.map

package/dist/controller/tstype.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tstype.d.ts","sourceRoot":"","sources":["../../src/controller/tstype.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IAEd,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAkBD,KAAK,UAAU,GAAG,MAAM,GAAG,OAAO,GAAG,WAAW,GAAG,cAAc,GAAG,cAAc,GAAG,gBAAgB,CAAC;AACtG,KAAK,UAAU,GAAG,aAAa,GAAG,QAAQ,GAAG,WAAW,GAAG,SAAS,GAAG,YAAY,CAAC;AAEpF,KAAK,UAAU,GAAG,UAAU,GAAG,OAAO,CAAC;AAEvC,UAAU,aAAa;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,UAAU,CAAC;IAEjB,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,aAAK,gBAAgB;IACjB,YAAY,iBAAiB;CAChC;AAED,UAAU,6BAA6B;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;CAC1B;AAED,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAE,6BAA6B,EAAE,UAAU,EAAC,CAAC"}
+{"version":3,"file":"tstype.d.ts","sourceRoot":"","sources":["../../src/controller/tstype.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IAEd,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAkBD,KAAK,UAAU,GAAG,MAAM,GAAG,OAAO,GAAG,WAAW,GAAG,cAAc,GAAG,cAAc,GAAG,gBAAgB,CAAC;AACtG,KAAK,UAAU,GAAG,aAAa,GAAG,QAAQ,GAAG,WAAW,GAAG,SAAS,GAAG,YAAY,CAAC;AAEpF,KAAK,UAAU,GAAG,UAAU,GAAG,OAAO,CAAC;AAEvC,UAAU,aAAa;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,UAAU,CAAC;IAEjB,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,UAAU,6BAA6B;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;CAC1B;AAED,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,EAAE,6BAA6B,EAAE,UAAU,EAAC,CAAC"}

package/dist/controller/tstype.js

@@ -1,8 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GreenPowerEvents = void 0;
-var GreenPowerEvents;
-(function (GreenPowerEvents) {
-    GreenPowerEvents["deviceJoined"] = "deviceJoined";
-})(GreenPowerEvents || (exports.GreenPowerEvents = GreenPowerEvents = {}));
 //# sourceMappingURL=tstype.js.map

package/dist/controller/tstype.js.map

@@ -1 +1 @@
-{"version":3,"file":"tstype.js","sourceRoot":"","sources":["../../src/controller/tstype.ts"],"names":[],"mappings":";;;AAiCA,IAAK,gBAEJ;AAFD,WAAK,gBAAgB;IACjB,iDAA6B,CAAA;AACjC,CAAC,EAFI,gBAAgB,gCAAhB,gBAAgB,QAEpB"}
+{"version":3,"file":"tstype.js","sourceRoot":"","sources":["../../src/controller/tstype.ts"],"names":[],"mappings":""}

package/dist/models/backup-storage-unified.d.ts

@@ -13,7 +13,7 @@ export interface UnifiedBackupStorage {
             date: string;
             znpVersion?: number;
             ezspVersion?: number;
-            [key: string]: any;
+            [key: string]: unknown;
         };
     };
     stack_specific?: {
@@ -44,7 +44,7 @@ export interface UnifiedBackupStorage {
             key: string;
             rx_counter: number;
             tx_counter: number;
-        } | null;
+        } | undefined;
     }[];
 }
 //# sourceMappingURL=backup-storage-unified.d.ts.map

package/dist/models/backup-storage-unified.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backup-storage-unified.d.ts","sourceRoot":"","sources":["../../src/models/backup-storage-unified.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACjC,QAAQ,EAAE;QACN,MAAM,EAAE,+BAA+B,CAAC;QACxC,OAAO,EAAE,CAAC,CAAC;QACX,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE;YAEN,IAAI,EAAE,MAAM,CAAC;YACb,UAAU,CAAC,EAAE,MAAM,CAAC;YACpB,WAAW,CAAC,EAAE,MAAM,CAAC;YAGrB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;SACtB,CAAC;KACL,CAAC;IACF,cAAc,CAAC,EAAE;QACb,MAAM,CAAC,EAAE;YACL,SAAS,CAAC,EAAE,MAAM,CAAC;SACtB,CAAC;QACF,IAAI,CAAC,EAAE;YACH,WAAW,CAAC,EAAE,MAAM,CAAC;SACxB,CAAC;KACL,CAAC;IACF,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,WAAW,EAAE;QACT,GAAG,EAAE,MAAM,CAAC;QACZ,eAAe,EAAE,MAAM,CAAC;QACxB,aAAa,EAAE,MAAM,CAAC;KACzB,CAAC;IACF,OAAO,EAAE;QACL,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3B,YAAY,EAAE,MAAM,CAAC;QACrB,QAAQ,EAAE,OAAO,CAAC;QAClB,QAAQ,EAAE;YACN,GAAG,EAAE,MAAM,CAAC;YACZ,UAAU,EAAE,MAAM,CAAC;YACnB,UAAU,EAAE,MAAM,CAAC;SACtB,GAAG,IAAI,CAAC;KACZ,EAAE,CAAC;CACP"}
+{"version":3,"file":"backup-storage-unified.d.ts","sourceRoot":"","sources":["../../src/models/backup-storage-unified.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACjC,QAAQ,EAAE;QACN,MAAM,EAAE,+BAA+B,CAAC;QACxC,OAAO,EAAE,CAAC,CAAC;QACX,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE;YAEN,IAAI,EAAE,MAAM,CAAC;YACb,UAAU,CAAC,EAAE,MAAM,CAAC;YACpB,WAAW,CAAC,EAAE,MAAM,CAAC;YAErB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;SAC1B,CAAC;KACL,CAAC;IACF,cAAc,CAAC,EAAE;QACb,MAAM,CAAC,EAAE;YACL,SAAS,CAAC,EAAE,MAAM,CAAC;SACtB,CAAC;QACF,IAAI,CAAC,EAAE;YACH,WAAW,CAAC,EAAE,MAAM,CAAC;SACxB,CAAC;KACL,CAAC;IACF,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,WAAW,EAAE;QACT,GAAG,EAAE,MAAM,CAAC;QACZ,eAAe,EAAE,MAAM,CAAC;QACxB,aAAa,EAAE,MAAM,CAAC;KACzB,CAAC;IACF,OAAO,EAAE;QACL,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3B,YAAY,EAAE,MAAM,CAAC;QACrB,QAAQ,EAAE,OAAO,CAAC;QAClB,QAAQ,EAAE;YAAC,GAAG,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,MAAM,CAAA;SAAC,GAAG,SAAS,CAAC;KAC/E,EAAE,CAAC;CACP"}

package/dist/models/backup.d.ts

@@ -16,7 +16,7 @@ export interface Backup {
     networkUpdateId: number;
     coordinatorIeeeAddress: Buffer;
     devices: {
-        networkAddress: number;
+        networkAddress: number | null;
         ieeeAddress: Buffer;
         isDirectChild: boolean;
         linkKey?: {

package/dist/models/backup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backup.d.ts","sourceRoot":"","sources":["../../src/models/backup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,mCAAmC,CAAC;AAC7D,OAAO,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAEjD;;;;GAIG;AACH,MAAM,WAAW,MAAM;IACnB,cAAc,EAAE,cAAc,CAAC;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE;QACZ,cAAc,EAAE,MAAM,CAAC;QACvB,YAAY,EAAE,MAAM,CAAC;KACxB,CAAC;IACF,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,OAAO,EAAE;QACL,cAAc,EAAE,MAAM,CAAC;QACvB,WAAW,EAAE,MAAM,CAAC;QACpB,aAAa,EAAE,OAAO,CAAC;QACvB,OAAO,CAAC,EAAE;YACN,GAAG,EAAE,MAAM,CAAC;YACZ,SAAS,EAAE,MAAM,CAAC;YAClB,SAAS,EAAE,MAAM,CAAC;SACrB,CAAC;KACL,EAAE,CAAC;IACJ,GAAG,CAAC,EAAE;QACF,OAAO,CAAC,EAAE,UAAU,CAAC;QACrB,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACnC,CAAC;IACF,IAAI,CAAC,EAAE;QACH,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;KACxB,CAAC;CACL"}
+{"version":3,"file":"backup.d.ts","sourceRoot":"","sources":["../../src/models/backup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,mCAAmC,CAAC;AAC7D,OAAO,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAEjD;;;;GAIG;AACH,MAAM,WAAW,MAAM;IACnB,cAAc,EAAE,cAAc,CAAC;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE;QACZ,cAAc,EAAE,MAAM,CAAC;QACvB,YAAY,EAAE,MAAM,CAAC;KACxB,CAAC;IACF,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,OAAO,EAAE;QACL,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;QAC9B,WAAW,EAAE,MAAM,CAAC;QACpB,aAAa,EAAE,OAAO,CAAC;QACvB,OAAO,CAAC,EAAE;YACN,GAAG,EAAE,MAAM,CAAC;YACZ,SAAS,EAAE,MAAM,CAAC;YAClB,SAAS,EAAE,MAAM,CAAC;SACrB,CAAC;KACL,EAAE,CAAC;IACJ,GAAG,CAAC,EAAE;QACF,OAAO,CAAC,EAAE,UAAU,CAAC;QACrB,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACnC,CAAC;IACF,IAAI,CAAC,EAAE;QACH,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;KACxB,CAAC;CACL"}

package/dist/utils/backup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backup.d.ts","sourceRoot":"","sources":["../../src/utils/backup.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,MAAM,MAAM,WAAW,CAAC;AAEpC;;;;;GAKG;AACH,eAAO,MAAM,eAAe,WAAkB,MAAM,CAAC,MAAM,KAAG,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAuEhG,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,WAAY,MAAM,CAAC,oBAAoB,KAAG,MAAM,CAAC,MAwC9E,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,WAAY,MAAM,CAAC,mBAAmB,KAAG,MAAM,CAAC,MAqC5E,CAAC"}
+{"version":3,"file":"backup.d.ts","sourceRoot":"","sources":["../../src/utils/backup.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,MAAM,WAAW,CAAC;AAEpC;;;;;GAKG;AACH,eAAO,MAAM,eAAe,WAAkB,MAAM,CAAC,MAAM,KAAG,OAAO,CAAC,MAAM,CAAC,oBAAoB,CA0ChG,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,WAAY,MAAM,CAAC,oBAAoB,KAAG,MAAM,CAAC,MAqC9E,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,WAAY,MAAM,CAAC,mBAAmB,KAAG,MAAM,CAAC,MAsC5E,CAAC"}

package/dist/utils/backup.js

@@ -24,8 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fromLegacyBackup = exports.fromUnifiedBackup = exports.toUnifiedBackup = void 0;
-/* eslint-disable max-len */
-const mz_1 = require("mz");
+const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const ZStackStructs = __importStar(require("../adapter/z-stack/structs"));
 const ZStackUtils = __importStar(require("../adapter/z-stack/utils"));
@@ -36,9 +35,7 @@ const ZStackUtils = __importStar(require("../adapter/z-stack/utils"));
  * @param backup Backup to create unified backup format from.
  */
 const toUnifiedBackup = async (backup) => {
-    const panIdBuffer = Buffer.alloc(2);
-    panIdBuffer.writeUInt16BE(backup.networkOptions.panId);
-    const packageInfo = JSON.parse((await mz_1.fs.readFile(path.join(__dirname, '../../', 'package.json'))).toString());
+    const packageInfo = JSON.parse(fs.readFileSync(path.join(__dirname, '../../', 'package.json')).toString());
     /* istanbul ignore next */
     return {
         metadata: {
@@ -47,39 +44,19 @@ const toUnifiedBackup = async (backup) => {
             source: `${packageInfo.name}@${packageInfo.version}`,
             internal: {
                 date: new Date().toISOString(),
-                ...(backup.znp
-                    ? {
-                        znpVersion: [null, undefined].includes(backup.znp?.version) ? undefined : backup.znp?.version,
-                    }
-                    : undefined),
-                ...(backup.ezsp
-                    ? {
-                        ezspVersion: [null, undefined].includes(backup.ezsp?.version) ? undefined : backup.ezsp?.version,
-                    }
-                    : undefined),
+                ...(backup.znp ? { znpVersion: backup.znp?.version ?? undefined } : undefined),
+                ...(backup.ezsp ? { ezspVersion: backup.ezsp?.version ?? undefined } : undefined),
             },
         },
         stack_specific: {
-            ...(backup.znp
-                ? {
-                    zstack: {
-                        tclk_seed: backup.znp?.trustCenterLinkKeySeed?.toString('hex') || undefined,
-                    },
-                }
-                : undefined),
-            ...(backup.ezsp
-                ? {
-                    ezsp: {
-                        hashed_tclk: backup.ezsp?.hashed_tclk?.toString('hex') || undefined,
-                    },
-                }
-                : undefined),
+            ...(backup.znp ? { zstack: { tclk_seed: backup.znp?.trustCenterLinkKeySeed?.toString('hex') || undefined } } : undefined),
+            ...(backup.ezsp ? { ezsp: { hashed_tclk: backup.ezsp?.hashed_tclk?.toString('hex') || undefined } } : undefined),
         },
-        coordinator_ieee: backup.coordinatorIeeeAddress?.toString('hex') || null,
-        pan_id: panIdBuffer.toString('hex'),
+        coordinator_ieee: backup.coordinatorIeeeAddress.toString('hex'),
+        pan_id: backup.networkOptions.panId.toString(16),
         extended_pan_id: backup.networkOptions.extendedPanId.toString('hex'),
         nwk_update_id: backup.networkUpdateId || 0,
-        security_level: backup.securityLevel || null,
+        security_level: backup.securityLevel,
         channel: backup.logicalChannel,
         channel_mask: backup.networkOptions.channelList,
         network_key: {
@@ -88,19 +65,13 @@ const toUnifiedBackup = async (backup) => {
             frame_counter: backup.networkKeyInfo.frameCounter,
         },
         devices: backup.devices.map((device) => {
-            const nwkAddressBuffer = Buffer.alloc(2);
-            nwkAddressBuffer.writeUInt16BE(device.networkAddress);
             return {
-                nwk_address: nwkAddressBuffer.toString('hex'),
+                nwk_address: device.networkAddress !== null ? device.networkAddress.toString(16) : null,
                 ieee_address: device.ieeeAddress.toString('hex'),
                 is_child: device.isDirectChild,
-                link_key: !device.linkKey
-                    ? undefined
-                    : {
-                        key: device.linkKey.key.toString('hex'),
-                        rx_counter: device.linkKey.rxCounter,
-                        tx_counter: device.linkKey.txCounter,
-                    },
+                link_key: device.linkKey
+                    ? { key: device.linkKey.key.toString('hex'), rx_counter: device.linkKey.rxCounter, tx_counter: device.linkKey.txCounter }
+                    : undefined,
             };
         }),
     };
@@ -112,11 +83,11 @@ exports.toUnifiedBackup = toUnifiedBackup;
  * @param backup Unified format to convert to internal backup format.
  */
 const fromUnifiedBackup = (backup) => {
-    const tclkSeedString = backup.stack_specific?.zstack?.tclk_seed || null;
+    const tclkSeedString = backup.stack_specific?.zstack?.tclk_seed || undefined;
     /* istanbul ignore next */
     return {
         networkOptions: {
-            panId: Buffer.from(backup.pan_id, 'hex').readUInt16BE(),
+            panId: Number.parseInt(backup.pan_id, 16),
             extendedPanId: Buffer.from(backup.extended_pan_id, 'hex'),
             channelList: backup.channel_mask,
             networkKey: Buffer.from(backup.network_key.key, 'hex'),
@@ -127,20 +98,16 @@ const fromUnifiedBackup = (backup) => {
             sequenceNumber: backup.network_key.sequence_number,
             frameCounter: backup.network_key.frame_counter,
         },
-        coordinatorIeeeAddress: backup.coordinator_ieee ? Buffer.from(backup.coordinator_ieee, 'hex') : null,
-        securityLevel: backup.security_level || null,
-        networkUpdateId: backup.nwk_update_id || null,
+        coordinatorIeeeAddress: Buffer.from(backup.coordinator_ieee, 'hex'),
+        securityLevel: backup.security_level,
+        networkUpdateId: backup.nwk_update_id,
         devices: backup.devices.map((device) => ({
-            networkAddress: device.nwk_address ? Buffer.from(device.nwk_address, 'hex').readUInt16BE() : Buffer.from('fffe', 'hex').readUInt16BE(),
+            networkAddress: device.nwk_address ? Number.parseInt(device.nwk_address, 16) : null,
             ieeeAddress: Buffer.from(device.ieee_address, 'hex'),
             isDirectChild: typeof device.is_child === 'boolean' ? device.is_child : true,
-            linkKey: !device.link_key
-                ? undefined
-                : {
-                    key: Buffer.from(device.link_key.key, 'hex'),
-                    rxCounter: device.link_key.rx_counter,
-                    txCounter: device.link_key.tx_counter,
-                },
+            linkKey: device.link_key
+                ? { key: Buffer.from(device.link_key.key, 'hex'), rxCounter: device.link_key.rx_counter, txCounter: device.link_key.tx_counter }
+                : undefined,
         })),
         znp: {
             version: backup.metadata.internal?.znpVersion || undefined,

package/dist/utils/backup.js.map

@@ -1 +1 @@
-{"version":3,"file":"backup.js","sourceRoot":"","sources":["../../src/utils/backup.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"backup.js","sourceRoot":"","sources":["../../src/utils/backup.ts"],"names":[],"mappings":"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"}

package/dist/utils/index.d.ts

@@ -1,10 +1,9 @@
-import AssertString from './assertString';
 import * as BackupUtils from './backup';
 import EqualsPartial from './equalsPartial';
-import IsNumberArray from './isNumberArray';
 import Queue from './queue';
 import RealpathSync from './realpathSync';
+import * as Utils from './utils';
 import Wait from './wait';
 import Waitress from './waitress';
-export { Wait, IsNumberArray, Queue, Waitress, EqualsPartial, RealpathSync, AssertString, BackupUtils };
+export { Wait, Queue, Waitress, EqualsPartial, RealpathSync, BackupUtils, Utils };
 //# sourceMappingURL=index.d.ts.map

package/dist/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,WAAW,MAAM,UAAU,CAAC;AACxC,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,QAAQ,MAAM,YAAY,CAAC;AAElC,OAAO,EAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,WAAW,MAAM,UAAU,CAAC;AACxC,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,QAAQ,MAAM,YAAY,CAAC;AAElC,OAAO,EAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,WAAW,EAAE,KAAK,EAAC,CAAC"}

package/dist/utils/index.js

@@ -26,19 +26,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BackupUtils = exports.AssertString = exports.RealpathSync = exports.EqualsPartial = exports.Waitress = exports.Queue = exports.IsNumberArray = exports.Wait = void 0;
-const assertString_1 = __importDefault(require("./assertString"));
-exports.AssertString = assertString_1.default;
+exports.Utils = exports.BackupUtils = exports.RealpathSync = exports.EqualsPartial = exports.Waitress = exports.Queue = exports.Wait = void 0;
 const BackupUtils = __importStar(require("./backup"));
 exports.BackupUtils = BackupUtils;
 const equalsPartial_1 = __importDefault(require("./equalsPartial"));
 exports.EqualsPartial = equalsPartial_1.default;
-const isNumberArray_1 = __importDefault(require("./isNumberArray"));
-exports.IsNumberArray = isNumberArray_1.default;
 const queue_1 = __importDefault(require("./queue"));
 exports.Queue = queue_1.default;
 const realpathSync_1 = __importDefault(require("./realpathSync"));
 exports.RealpathSync = realpathSync_1.default;
+const Utils = __importStar(require("./utils"));
+exports.Utils = Utils;
 const wait_1 = __importDefault(require("./wait"));
 exports.Wait = wait_1.default;
 const waitress_1 = __importDefault(require("./waitress"));

package/dist/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kEAA0C;AASiC,uBATpE,sBAAY,CASoE;AARvF,sDAAwC;AAQiD,kCAAW;AAPpG,oEAA4C;AAOE,wBAPvC,uBAAa,CAOuC;AAN3D,oEAA4C;AAM9B,wBANP,uBAAa,CAMO;AAL3B,oDAA4B;AAKC,gBALtB,eAAK,CAKsB;AAJlC,kEAA0C;AAImB,uBAJtD,sBAAY,CAIsD;AAHzE,kDAA0B;AAGlB,eAHD,cAAI,CAGC;AAFZ,0DAAkC;AAEE,mBAF7B,kBAAQ,CAE6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAwC;AAQoB,kCAAW;AAPvE,oEAA4C;AAOb,wBAPxB,uBAAa,CAOwB;AAN5C,oDAA4B;AAMd,gBANP,eAAK,CAMO;AALnB,kEAA0C;AAKI,uBALvC,sBAAY,CAKuC;AAJ1D,+CAAiC;AAIwC,sBAAK;AAH9E,kDAA0B;AAGlB,eAHD,cAAI,CAGC;AAFZ,0DAAkC;AAEb,mBAFd,kBAAQ,CAEc"}

package/dist/utils/logger.d.ts

@@ -2,7 +2,7 @@ export interface Logger {
     debug: (message: string, namespace: string) => void;
     info: (message: string, namespace: string) => void;
     warning: (message: string, namespace: string) => void;
-    error: (message: string | Error, namespace: string) => void;
+    error: (message: string, namespace: string) => void;
 }
 export declare let logger: Logger;
 export declare function setLogger(l: Logger): void;

package/dist/utils/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,MAAM;IACnB,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACpD,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACnD,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACtD,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CAC/D;AAED,eAAO,IAAI,MAAM,EAAE,MAKlB,CAAC;AAEF,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAEzC"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,MAAM;IACnB,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACpD,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACnD,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACtD,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CACvD;AAED,eAAO,IAAI,MAAM,EAAE,MAKlB,CAAC;AAEF,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAEzC"}

package/dist/utils/queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../src/utils/queue.ts"],"names":[],"mappings":"AAMA,cAAM,KAAK;IACP,OAAO,CAAC,IAAI,CAAQ;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;gBAExB,UAAU,SAAI;IAKb,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,GAAE,MAAM,GAAG,MAAa,GAAG,OAAO,CAAC,CAAC,CAAC;IA0BxF,OAAO,CAAC,WAAW;IAQnB,OAAO,CAAC,OAAO;IAgBR,KAAK,IAAI,IAAI;IAIb,KAAK,IAAI,MAAM;CAGzB;AAED,eAAe,KAAK,CAAC"}
+{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../src/utils/queue.ts"],"names":[],"mappings":"AAMA,cAAM,KAAK;IACP,OAAO,CAAC,IAAI,CAAQ;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;gBAExB,UAAU,SAAI;IAKb,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IA2BlF,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,OAAO;IAgBR,KAAK,IAAI,IAAI;IAIb,KAAK,IAAI,MAAM;CAGzB;AAED,eAAe,KAAK,CAAC"}