@willieee802/zigbee-herdsman 0.34.3 → 0.48.1

package/dist/adapter/z-stack/adapter/adapter-backup.js

@@ -22,13 +22,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdapterBackup = void 0;
-/* eslint-disable max-len */
-const debug_1 = __importDefault(require("debug"));
 const Structs = __importStar(require("../structs"));
 const Utils = __importStar(require("../utils"));
 const utils_1 = require("../../../utils");
@@ -37,6 +32,8 @@ const common_1 = require("../constants/common");
 const constants_1 = require("../unpi/constants");
 const tstype_1 = require("./tstype");
 const structs_1 = require("../structs");
+const logger_1 = require("../../../utils/logger");
+const NS = 'zh:zstack:backup';
 /**
  * Class providing ZNP adapter backup and restore procedures based mostly on NV memory manipulation.
  */
@@ -44,7 +41,6 @@ class AdapterBackup {
     znp;
     nv;
     defaultPath;
-    debug = (0, debug_1.default)("zigbee-herdsman:adapter:zStack:startup:backup");
     constructor(znp, nv, path) {
         this.znp = znp;
         this.nv = nv;
@@ -84,7 +80,7 @@ class AdapterBackup {
      * Creates a new backup from connected ZNP adapter and returns it in internal backup model format.
      */
     async createBackup(ieeeAddressesInDatabase) {
-        this.debug("creating backup");
+        logger_1.logger.debug("creating backup", NS);
         const version = await this.getAdapterVersion();
         /* get adapter ieee address */
         const ieeeAddressResponse = await this.znp.request(constants_1.Subsystem.SYS, "getExtAddr", {});
@@ -92,13 +88,13 @@ class AdapterBackup {
             throw new Error("Failed to read adapter IEEE address");
         }
         const ieeeAddress = Buffer.from(ieeeAddressResponse.payload.extaddress.split("0x")[1], "hex");
-        this.debug("fetched adapter ieee address");
+        logger_1.logger.debug("fetched adapter ieee address", NS);
         /* get adapter nib */
         const nib = await this.nv.readItem(common_1.NvItemsIds.NIB, 0, Structs.nib);
         if (!nib) {
             throw new Error("Cannot backup - adapter not commissioned");
         }
-        this.debug("fetched adapter nib");
+        logger_1.logger.debug("fetched adapter nib", NS);
         /* get adapter active key information */
         let activeKeyInfo;
         if (version === tstype_1.ZnpVersion.zStack12) {
@@ -112,22 +108,22 @@ class AdapterBackup {
         if (!activeKeyInfo) {
             throw new Error("Cannot backup - missing active key info");
         }
-        this.debug("fetched adapter active key information");
+        logger_1.logger.debug("fetched adapter active key information", NS);
         /* get adapter security data */
         const preconfiguredKeyEnabled = await this.nv.readItem(common_1.NvItemsIds.PRECFGKEYS_ENABLE, 0);
-        this.debug("fetched adapter pre-configured key");
+        logger_1.logger.debug("fetched adapter pre-configured key", NS);
         const addressManagerTable = await this.getAddressManagerTable(version);
-        this.debug(`fetched adapter address manager table (capacity=${addressManagerTable?.capacity || 0}, used=${addressManagerTable?.usedCount || 0})`);
+        logger_1.logger.debug(`fetched adapter address manager table (capacity=${addressManagerTable?.capacity || 0}, used=${addressManagerTable?.usedCount || 0})`, NS);
         const securityManagerTable = await this.getSecurityManagerTable();
-        this.debug(`fetched adapter security manager table (capacity=${securityManagerTable?.usedCount || 0}, used=${securityManagerTable?.usedCount || 0})`);
+        logger_1.logger.debug(`fetched adapter security manager table (capacity=${securityManagerTable?.usedCount || 0}, used=${securityManagerTable?.usedCount || 0})`, NS);
         const apsLinkKeyDataTable = await this.getApsLinkKeyDataTable(version);
-        this.debug(`fetched adapter aps link key data table (capacity=${apsLinkKeyDataTable?.usedCount || 0}, used=${apsLinkKeyDataTable?.usedCount || 0})`);
+        logger_1.logger.debug(`fetched adapter aps link key data table (capacity=${apsLinkKeyDataTable?.usedCount || 0}, used=${apsLinkKeyDataTable?.usedCount || 0})`, NS);
         const tclkSeed = version === tstype_1.ZnpVersion.zStack12 ? null : await this.nv.readItem(common_1.NvItemsIds.TCLK_SEED, 0, Structs.nwkKey);
-        this.debug("fetched adapter tclk seed");
+        logger_1.logger.debug("fetched adapter tclk seed", NS);
         const tclkTable = await this.getTclkTable(version);
-        this.debug(`fetched adapter tclk table (capacity=${tclkTable?.usedCount || 0}, used=${tclkTable?.usedCount || 0})`);
+        logger_1.logger.debug(`fetched adapter tclk table (capacity=${tclkTable?.usedCount || 0}, used=${tclkTable?.usedCount || 0})`, NS);
         const secMaterialTable = await this.getNetworkSecurityMaterialTable(version);
-        this.debug(`fetched adapter network security material table (capacity=${secMaterialTable?.usedCount || 0}, used=${secMaterialTable?.usedCount || 0})`);
+        logger_1.logger.debug(`fetched adapter network security material table (capacity=${secMaterialTable?.usedCount || 0}, used=${secMaterialTable?.usedCount || 0})`, NS);
         /* examine network security material table */
         const genericExtendedPanId = Buffer.alloc(8, 0xff);
         let secMaterialDescriptor = null;
@@ -224,12 +220,12 @@ class AdapterBackup {
             const missing = oldBackup.devices.filter((d) => d.linkKey && ieeeAddressesInDatabase.includes(`0x${d.ieeeAddress.toString("hex")}`) &&
                 !backup.devices.find((dd) => d.ieeeAddress.equals(dd.ieeeAddress)));
             const missingStr = missing.map((d) => `0x${d.ieeeAddress.toString('hex')}`).join(', ');
-            this.debug(`Following devices with link key are missing from new backup but present in old backup and database, ` +
-                `adding them back: ${missingStr}`);
+            logger_1.logger.debug(`Following devices with link key are missing from new backup but present in old backup and database, ` +
+                `adding them back: ${missingStr}`, NS);
             backup.devices = [...backup.devices, ...missing];
         }
         catch (error) {
-            this.debug(`Failed to read old backup, not checking for missing routers: ${error}`);
+            logger_1.logger.debug(`Failed to read old backup, not checking for missing routers: ${error}`, NS);
         }
         return backup;
     }
@@ -239,7 +235,7 @@ class AdapterBackup {
      * @param backup Backup to restore to connected adapter.
      */
     async restoreBackup(backup) {
-        this.debug("restoring backup");
+        logger_1.logger.debug("restoring backup", NS);
         const version = await this.getAdapterVersion();
         /* istanbul ignore next */
         if (version === tstype_1.ZnpVersion.zStack12) {
@@ -264,12 +260,12 @@ class AdapterBackup {
         const currentApsLinkKeyDataTable = await this.getApsLinkKeyDataTable(version);
         const currentTclkTable = await this.getTclkTable(version);
         const currentNwkSecMaterialTable = await this.getNetworkSecurityMaterialTable(version);
-        this.debug(`got target adapter table sizes:`);
-        this.debug(` - address manager table: ${currentAddressManagerTable.capacity}`);
-        this.debug(` - security manager table: ${currentSecurityManagerTable.capacity}`);
-        this.debug(` - aps link key data table: ${currentApsLinkKeyDataTable.capacity}`);
-        this.debug(` - tclk table: ${currentTclkTable.capacity}`);
-        this.debug(` - network security material table: ${currentNwkSecMaterialTable.capacity}`);
+        logger_1.logger.debug(`got target adapter table sizes:`, NS);
+        logger_1.logger.debug(` - address manager table: ${currentAddressManagerTable.capacity}`, NS);
+        logger_1.logger.debug(` - security manager table: ${currentSecurityManagerTable.capacity}`, NS);
+        logger_1.logger.debug(` - aps link key data table: ${currentApsLinkKeyDataTable.capacity}`, NS);
+        logger_1.logger.debug(` - tclk table: ${currentTclkTable.capacity}`, NS);
+        logger_1.logger.debug(` - network security material table: ${currentNwkSecMaterialTable.capacity}`, NS);
         /* prepare table structures */
         const addressManagerTable = Structs.addressManagerTable(currentAddressManagerTable.capacity);
         const securityManagerTable = Structs.securityManagerTable(currentSecurityManagerTable.capacity);
@@ -321,7 +317,7 @@ class AdapterBackup {
                         tclkEntry.rxFrmCntr = device.linkKey.rxCounter;
                         tclkEntry.txFrmCntr = device.linkKey.txCounter + 2500;
                         linkKeyProcessed = true;
-                        this.debug(`successfully recovered link key for ${device.ieeeAddress.toString("hex")} using tclk seed (shift=${recoveredSeedShift})`);
+                        logger_1.logger.debug(`successfully recovered link key for ${device.ieeeAddress.toString("hex")} using tclk seed (shift=${recoveredSeedShift})`, NS);
                     }
                 }
                 /* attempt to create aps link key data entry */
@@ -342,7 +338,7 @@ class AdapterBackup {
                     sme.keyNvId = version === tstype_1.ZnpVersion.zStack3x0 ? apsLinkKeyDataTable.indexOf(apsKeyDataEntry) : common_1.NvItemsIds.APS_LINK_KEY_DATA_START + apsLinkKeyDataTable.indexOf(apsKeyDataEntry);
                     sme.authenticationOption = structs_1.SecurityManagerAuthenticationOption.AuthenticatedCBCK;
                     linkKeyProcessed = true;
-                    this.debug(`successfully recovered link key for ${device.ieeeAddress.toString("hex")} using aps key data table`);
+                    logger_1.logger.debug(`successfully recovered link key for ${device.ieeeAddress.toString("hex")} using aps key data table`, NS);
                 }
             }
         }

package/dist/adapter/z-stack/adapter/adapter-backup.js.map

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

package/dist/adapter/z-stack/adapter/endpoints.js

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Endpoints = void 0;
 const Constants = __importStar(require("../constants"));
-const Zcl = __importStar(require("../../../zcl"));
+const cluster_1 = require("../../../zspec/zcl/definition/cluster");
 const EndpointDefaults = {
     appdeviceid: 0x0005,
     appdevver: 0,
@@ -51,10 +51,10 @@ exports.Endpoints = [
         appprofid: 0x0104,
         appdeviceid: 0x0400,
         appnumoutclusters: 2,
-        appoutclusterlist: [Zcl.Utils.getCluster('ssIasZone').ID, Zcl.Utils.getCluster('ssIasWd').ID],
+        appoutclusterlist: [cluster_1.Clusters.ssIasZone.ID, cluster_1.Clusters.ssIasWd.ID],
         appnuminclusters: 2,
         // genTime required for https://github.com/Koenkk/zigbee2mqtt/issues/10816
-        appinclusterlist: [Zcl.Utils.getCluster('ssIasAce').ID, Zcl.Utils.getCluster('genTime').ID]
+        appinclusterlist: [cluster_1.Clusters.ssIasAce.ID, cluster_1.Clusters.genTime.ID]
     },
     // TERNCY: https://github.com/Koenkk/zigbee-herdsman/issues/82
     { ...EndpointDefaults, endpoint: 0x6E, appprofid: 0x0104 },
@@ -64,7 +64,7 @@ exports.Endpoints = [
         endpoint: 13,
         appprofid: 0x0104,
         appnuminclusters: 1,
-        appinclusterlist: [Zcl.Utils.getCluster('genOta').ID]
+        appinclusterlist: [cluster_1.Clusters.genOta.ID]
     },
     // Insta/Jung/Gira: OTA fallback EP (since it's buggy in firmware 10023202 when it tries to find a matching EP for
     // OTA - it queries for ZLL profile, but then contacts with HA profile)

package/dist/adapter/z-stack/adapter/endpoints.js.map

@@ -1 +1 @@
-{"version":3,"file":"endpoints.js","sourceRoot":"","sources":["../../../../src/adapter/z-stack/adapter/endpoints.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA0C;AAC1C,kDAAoC;AAEpC,MAAM,gBAAgB,GAQlB;IACA,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,CAAC;IACZ,gBAAgB,EAAE,CAAC;IACnB,gBAAgB,EAAE,EAAE;IACpB,iBAAiB,EAAE,CAAC;IACpB,iBAAiB,EAAE,EAAE;IACrB,UAAU,EAAE,SAAS,CAAC,EAAE,CAAC,iBAAiB,CAAC,eAAe;CAC7D,CAAC;AAEW,QAAA,SAAS,GAAG;IACrB,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAC;IACrD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAC;IACrD,oHAAoH;IACpH,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAC;IACrD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAC;IACrD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAC;IACrD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAC;IACrD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAC;IACrD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,EAAC;IACtD;QACI,GAAG,gBAAgB;QACnB,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,MAAM;QACjB,WAAW,EAAE,MAAM;QACnB,iBAAiB,EAAE,CAAC;QACpB,iBAAiB,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;QAC7F,gBAAgB,EAAE,CAAC;QACnB,0EAA0E;QAC1E,gBAAgB,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;KAE9F;IACD,8DAA8D;IAC9D,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAC;IACxD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,EAAC;IACtD;QACI,GAAG,gBAAgB;QACnB,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,MAAM;QACjB,gBAAgB,EAAE,CAAC;QACnB,gBAAgB,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;KACxD;IACD,kHAAkH;IAClH,uEAAuE;IACvE,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,EAAC;IACtD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAC;CAC1D,CAAC"}
+{"version":3,"file":"endpoints.js","sourceRoot":"","sources":["../../../../src/adapter/z-stack/adapter/endpoints.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA0C;AAC1C,mEAA+D;AAE/D,MAAM,gBAAgB,GAQlB;IACA,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,CAAC;IACZ,gBAAgB,EAAE,CAAC;IACnB,gBAAgB,EAAE,EAAE;IACpB,iBAAiB,EAAE,CAAC;IACpB,iBAAiB,EAAE,EAAE;IACrB,UAAU,EAAE,SAAS,CAAC,EAAE,CAAC,iBAAiB,CAAC,eAAe;CAC7D,CAAC;AAEW,QAAA,SAAS,GAAG;IACrB,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAC;IACrD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAC;IACrD,oHAAoH;IACpH,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAC;IACrD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAC;IACrD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAC;IACrD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAC;IACrD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAC;IACrD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,EAAC;IACtD;QACI,GAAG,gBAAgB;QACnB,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,MAAM;QACjB,WAAW,EAAE,MAAM;QACnB,iBAAiB,EAAE,CAAC;QACpB,iBAAiB,EAAE,CAAC,kBAAQ,CAAC,SAAS,CAAC,EAAE,EAAE,kBAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/D,gBAAgB,EAAE,CAAC;QACnB,0EAA0E;QAC1E,gBAAgB,EAAE,CAAC,kBAAQ,CAAC,QAAQ,CAAC,EAAE,EAAE,kBAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;KAEhE;IACD,8DAA8D;IAC9D,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAC;IACxD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,EAAC;IACtD;QACI,GAAG,gBAAgB;QACnB,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,MAAM;QACjB,gBAAgB,EAAE,CAAC;QACnB,gBAAgB,EAAE,CAAC,kBAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;KACzC;IACD,kHAAkH;IAClH,uEAAuE;IACvE,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,EAAC;IACtD,EAAC,GAAG,gBAAgB,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAC;CAC1D,CAAC"}

package/dist/adapter/z-stack/adapter/manager.d.ts

@@ -3,7 +3,6 @@ import { TsType } from "../../";
 import * as ZStackModels from "../models";
 import { AdapterBackup } from "./adapter-backup";
 import { AdapterNvMemory } from "./adapter-nv-memory";
-import { LoggerStub } from "../../../controller/logger-stub";
 /**
  * ZNP Adapter Manager is responsible for handling adapter startup, network commissioning,
  * configuration backup and restore.
@@ -14,9 +13,7 @@ export declare class ZnpAdapterManager {
     private znp;
     private options;
     private nwkOptions;
-    private logger;
-    private debug;
-    constructor(znp: Znp, options: ZStackModels.StartupOptions, logger: LoggerStub);
+    constructor(znp: Znp, options: ZStackModels.StartupOptions);
     /**
      * Performs ZNP adapter startup. After this method returns the adapter is configured, endpoints are registered
      * and network is ready to process frames.

package/dist/adapter/z-stack/adapter/manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../../src/adapter/z-stack/adapter/manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAC,MAAM,QAAQ,CAAC;AAG3B,OAAO,EAAC,MAAM,EAAC,MAAM,QAAQ,CAAC;AAI9B,OAAO,KAAK,YAAY,MAAM,WAAW,CAAC;AAG1C,OAAO,EAAC,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAC,eAAe,EAAC,MAAM,qBAAqB,CAAC;AAMpD,OAAO,EAAC,UAAU,EAAC,MAAM,iCAAiC,CAAC;AAO3D;;;GAGG;AACH,qBAAa,iBAAiB;IAEnB,EAAE,EAAE,eAAe,CAAC;IACpB,MAAM,EAAE,aAAa,CAAC;IAE7B,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,OAAO,CAA8B;IAC7C,OAAO,CAAC,UAAU,CAAwB;IAC1C,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,KAAK,CAIX;gBAEiB,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU;IAQrF;;;OAGG;IACU,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC;IAmDjD;;;OAGG;YACW,iBAAiB;IA8I/B;;OAEG;YACW,YAAY;IAa1B;;OAEG;YACW,YAAY;IA2C1B;;;;;;;OAOG;YACW,kBAAkB;IAyDhC;;;;;OAKG;YACW,0BAA0B;IAyCxC;;OAEG;YACW,iBAAiB;IAgB/B;;;;;OAKG;YACW,UAAU;IAOxB;;OAEG;YACW,YAAY;IAM1B;;OAEG;YACW,YAAY;IAO1B;;;;;;;OAOG;YACW,yBAAyB;IAoBvC;;OAEG;YACW,sBAAsB;CAIvC"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../../src/adapter/z-stack/adapter/manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAC,MAAM,QAAQ,CAAC;AAE3B,OAAO,EAAC,MAAM,EAAC,MAAM,QAAQ,CAAC;AAI9B,OAAO,KAAK,YAAY,MAAM,WAAW,CAAC;AAG1C,OAAO,EAAC,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAC,eAAe,EAAC,MAAM,qBAAqB,CAAC;AAepD;;;GAGG;AACH,qBAAa,iBAAiB;IAEnB,EAAE,EAAE,eAAe,CAAC;IACpB,MAAM,EAAE,aAAa,CAAC;IAE7B,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,OAAO,CAA8B;IAC7C,OAAO,CAAC,UAAU,CAAwB;gBAEvB,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,CAAC,cAAc;IAOjE;;;OAGG;IACU,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC;IAmDjD;;;OAGG;YACW,iBAAiB;IA8I/B;;OAEG;YACW,YAAY;IAa1B;;OAEG;YACW,YAAY;IA2C1B;;;;;;;OAOG;YACW,kBAAkB;IAyDhC;;;;;OAKG;YACW,0BAA0B;IAyCxC;;OAEG;YACW,iBAAiB;IAgB/B;;;;;OAKG;YACW,UAAU;IAOxB;;OAEG;YACW,YAAY;IAM1B;;OAEG;YACW,YAAY;IAO1B;;;;;;;OAOG;YACW,yBAAyB;IAoBvC;;OAEG;YACW,sBAAsB;CAIvC"}

package/dist/adapter/z-stack/adapter/manager.js

@@ -22,12 +22,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZnpAdapterManager = void 0;
-const debug_1 = __importDefault(require("debug"));
 const tstype_1 = require("./tstype");
 const common_1 = require("../constants/common");
 const Structs = __importStar(require("../structs"));
@@ -40,6 +36,8 @@ const UnpiConstants = __importStar(require("../unpi/constants"));
 const crypto = __importStar(require("crypto"));
 const utils_1 = require("../../../utils");
 const endpoints_1 = require("./endpoints");
+const logger_1 = require("../../../utils/logger");
+const NS = 'zh:adapter:zstack:manager';
 /**
  * ZNP Adapter Manager is responsible for handling adapter startup, network commissioning,
  * configuration backup and restore.
@@ -50,30 +48,23 @@ class ZnpAdapterManager {
     znp;
     options;
     nwkOptions;
-    logger;
-    debug = {
-        startup: (0, debug_1.default)("zigbee-herdsman:adapter:zStack:startup"),
-        strategy: (0, debug_1.default)("zigbee-herdsman:adapter:zStack:startup:strategy"),
-        commissioning: (0, debug_1.default)("zigbee-herdsman:adapter:zStack:startup:commissioning")
-    };
-    constructor(znp, options, logger) {
+    constructor(znp, options) {
         this.znp = znp;
         this.options = options;
         this.nv = new adapter_nv_memory_1.AdapterNvMemory(this.znp);
         this.backup = new adapter_backup_1.AdapterBackup(this.znp, this.nv, this.options.backupPath);
-        this.logger = logger;
     }
     /**
      * Performs ZNP adapter startup. After this method returns the adapter is configured, endpoints are registered
      * and network is ready to process frames.
      */
     async start() {
-        this.debug.startup(`beginning znp startup`);
+        logger_1.logger.debug(`beginning znp startup`, NS);
         this.nwkOptions = await this.parseConfigNetworkOptions(this.options.networkOptions);
         await this.nv.init();
         /* determine startup strategy */
         const strategy = await this.determineStrategy();
-        this.debug.startup(`determined startup strategy: ${strategy}`);
+        logger_1.logger.debug(`determined startup strategy: ${strategy}`, NS);
         /* perform coordinator startup based on determined strategy */
         let result;
         switch (strategy) {
@@ -84,7 +75,7 @@ class ZnpAdapterManager {
             }
             case "restoreBackup": {
                 if (this.options.version === tstype_1.ZnpVersion.zStack12) {
-                    this.debug.startup(`performing recommissioning instead of restore for z-stack 1.2`);
+                    logger_1.logger.debug(`performing recommissioning instead of restore for z-stack 1.2`, NS);
                     await this.beginCommissioning(this.nwkOptions);
                     await this.beginStartup();
                 }
@@ -119,7 +110,7 @@ class ZnpAdapterManager {
      * [this GitHub issue comment](https://github.com/Koenkk/zigbee-herdsman/issues/286#issuecomment-761029689).
      */
     async determineStrategy() {
-        this.debug.strategy("determining znp startup strategy");
+        logger_1.logger.debug("determining znp startup strategy", NS);
         /* acquire data from adapter */
         const hasConfiguredNvId = this.options.version === tstype_1.ZnpVersion.zStack12 ? common_1.NvItemsIds.ZNP_HAS_CONFIGURED_ZSTACK1 : common_1.NvItemsIds.ZNP_HAS_CONFIGURED_ZSTACK3;
         const hasConfigured = await this.nv.readItem(hasConfiguredNvId, 0, Structs.hasConfigured);
@@ -142,7 +133,7 @@ class ZnpAdapterManager {
         const isExtendedPanIdReversed = nib && this.nwkOptions.extendedPanId.equals(Buffer.from(nib.extendedPANID).reverse());
         /* istanbul ignore next */
         const configMatchesAdapter = (nib &&
-            Utils.compareChannelLists(this.nwkOptions.channelList, nib.channelList) &&
+            Utils.compareChannelLists(this.nwkOptions.channelList, nib.channelList) && // TODO: remove?
             this.nwkOptions.panId === nib.nwkPanId &&
             (this.nwkOptions.extendedPanId.equals(nib.extendedPANID) ||
                 /* exception for migration from previous code-base */
@@ -168,56 +159,56 @@ class ZnpAdapterManager {
         /* Determine startup strategy */
         if (!hasConfigured || !hasConfigured.isConfigured() || !nib) {
             /* Adapter is not configured or not commissioned */
-            this.debug.strategy("(stage-1) adapter is not configured / not commissioned");
+            logger_1.logger.debug("(stage-1) adapter is not configured / not commissioned", NS);
             if (configMatchesBackup) {
                 /* Adapter backup is available and matches configuration */
-                this.debug.strategy("(stage-2) configuration matches backup");
+                logger_1.logger.debug("(stage-2) configuration matches backup", NS);
                 checkRestoreVersionCompatibility();
                 return "restoreBackup";
             }
             else {
                 /* Adapter backup is either not available or does not match configuration */
                 if (!backup) {
-                    this.debug.strategy("(stage-2) adapter backup does not exist");
+                    logger_1.logger.debug("(stage-2) adapter backup does not exist", NS);
                 }
                 else {
-                    this.debug.strategy("(stage-2) configuration does not match backup");
+                    logger_1.logger.debug("(stage-2) configuration does not match backup", NS);
                 }
                 return "startCommissioning";
             }
         }
         else {
             /* Adapter is configured and commissioned */
-            this.debug.strategy("(stage-1) adapter is configured");
+            logger_1.logger.debug("(stage-1) adapter is configured", NS);
             if (configMatchesAdapter) {
                 /* Warn if EPID is reversed (backward-compat) */
                 if (isExtendedPanIdReversed) {
-                    this.debug.strategy("(stage-2) extended pan id is reversed");
-                    this.logger.warn(`Extended PAN ID is reversed (expected=${this.nwkOptions.extendedPanId.toString("hex")}, actual=${nib.extendedPANID.toString("hex")})`);
+                    logger_1.logger.debug("(stage-2) extended pan id is reversed", NS);
+                    logger_1.logger.warning(`Extended PAN ID is reversed (expected=${this.nwkOptions.extendedPanId.toString("hex")}, actual=${nib.extendedPANID.toString("hex")})`, NS);
                 }
                 /* Configuration matches adapter state - regular startup */
-                this.debug.strategy("(stage-2) adapter state matches configuration");
+                logger_1.logger.debug("(stage-2) adapter state matches configuration", NS);
                 return "startup";
             }
             else {
                 /* Configuration does not match adapter state */
-                this.debug.strategy("(stage-2) adapter state does not match configuration");
+                logger_1.logger.debug("(stage-2) adapter state does not match configuration", NS);
                 if (backup) {
                     /* Backup is present */
-                    this.debug.strategy("(stage-3) got adapter backup");
+                    logger_1.logger.debug("(stage-3) got adapter backup", NS);
                     if (backupMatchesAdapter) {
                         /* Backup matches adapter state */
-                        this.debug.strategy("(stage-4) adapter state matches backup");
-                        this.logger.error(`Configuration is not consistent with adapter state/backup!`);
-                        this.logger.error(`- PAN ID: configured=${this.nwkOptions.panId}, adapter=${nib.nwkPanId}`);
-                        this.logger.error(`- Extended PAN ID: configured=${this.nwkOptions.extendedPanId.toString("hex")}, adapter=${nib.extendedPANID.toString("hex")}`);
-                        this.logger.error(`- Network Key: configured=${this.nwkOptions.networkKey.toString("hex")}, adapter=${activeKeyInfo.key.toString("hex")}`);
-                        this.logger.error(`- Channel List: configured=${this.nwkOptions.channelList.toString()}, adapter=${Utils.unpackChannelList(nib.channelList).toString()}`);
-                        this.logger.error(`Please update configuration to prevent further issues.`);
-                        this.logger.error(`If you wish to re-commission your network, please remove coordinator backup at ${this.options.backupPath}.`);
-                        this.logger.error(`Re-commissioning your network will require re-pairing of all devices!`);
+                        logger_1.logger.debug("(stage-4) adapter state matches backup", NS);
+                        logger_1.logger.error(`Configuration is not consistent with adapter state/backup!`, NS);
+                        logger_1.logger.error(`- PAN ID: configured=${this.nwkOptions.panId}, adapter=${nib.nwkPanId}`, NS);
+                        logger_1.logger.error(`- Extended PAN ID: configured=${this.nwkOptions.extendedPanId.toString("hex")}, adapter=${nib.extendedPANID.toString("hex")}`, NS);
+                        logger_1.logger.error(`- Network Key: configured=${this.nwkOptions.networkKey.toString("hex")}, adapter=${activeKeyInfo.key.toString("hex")}`, NS);
+                        logger_1.logger.error(`- Channel List: configured=${this.nwkOptions.channelList.toString()}, adapter=${Utils.unpackChannelList(nib.channelList).toString()}`, NS);
+                        logger_1.logger.error(`Please update configuration to prevent further issues.`, NS);
+                        logger_1.logger.error(`If you wish to re-commission your network, please remove coordinator backup at ${this.options.backupPath}.`, NS);
+                        logger_1.logger.error(`Re-commissioning your network will require re-pairing of all devices!`, NS);
                         if (this.options.adapterOptions.forceStartWithInconsistentAdapterConfiguration) {
-                            this.logger.error(`Running despite adapter configuration mismatch as configured. Please update the adapter to compatible firmware and recreate your network as soon as possible.`);
+                            logger_1.logger.error(`Running despite adapter configuration mismatch as configured. Please update the adapter to compatible firmware and recreate your network as soon as possible.`, NS);
                             return "startup";
                         }
                         else {
@@ -226,23 +217,23 @@ class ZnpAdapterManager {
                     }
                     else {
                         /* Backup does not match adapter state */
-                        this.debug.strategy("(stage-4) adapter state does not match backup");
+                        logger_1.logger.debug("(stage-4) adapter state does not match backup", NS);
                         if (configMatchesBackup) {
                             /* Adapter backup matches configuration */
-                            this.debug.strategy("(stage-5) adapter backup matches configuration");
+                            logger_1.logger.debug("(stage-5) adapter backup matches configuration", NS);
                             checkRestoreVersionCompatibility();
                             return "restoreBackup";
                         }
                         else {
                             /* Adapter backup does not match configuration */
-                            this.debug.strategy("(stage-5) adapter backup does not match configuration");
+                            logger_1.logger.debug("(stage-5) adapter backup does not match configuration", NS);
                             return "startCommissioning";
                         }
                     }
                 }
                 else {
                     /* Configuration mismatches adapter and no backup is available */
-                    this.debug.strategy("(stage-3) configuration-adapter mismatch (no backup)");
+                    logger_1.logger.debug("(stage-3) configuration-adapter mismatch (no backup)", NS);
                     return "startCommissioning";
                 }
             }
@@ -254,14 +245,14 @@ class ZnpAdapterManager {
     async beginStartup() {
         const deviceInfo = await this.znp.request(constants_1.Subsystem.UTIL, 'getDeviceInfo', {});
         if (deviceInfo.payload.devicestate !== common_1.DevStates.ZB_COORD) {
-            this.debug.startup("starting adapter as coordinator");
+            logger_1.logger.debug("starting adapter as coordinator", NS);
             const started = this.znp.waitFor(UnpiConstants.Type.AREQ, constants_1.Subsystem.ZDO, 'stateChangeInd', { state: 9 }, 60000);
             await this.znp.request(constants_1.Subsystem.ZDO, 'startupFromApp', { startdelay: 100 }, null, null, [common_1.ZnpCommandStatus.SUCCESS, common_1.ZnpCommandStatus.FAILURE]);
             await started.start().promise;
-            this.debug.startup("adapter successfully started in coordinator mode");
+            logger_1.logger.debug("adapter successfully started in coordinator mode", NS);
         }
         else {
-            this.debug.startup("adapter is already running in coordinator mode");
+            logger_1.logger.debug("adapter is already running in coordinator mode", NS);
         }
     }
     /**
@@ -282,19 +273,19 @@ class ZnpAdapterManager {
             networkKeyDistribute: false
         };
         /* commission provisioning network */
-        this.debug.commissioning("commissioning random provisioning network:");
-        this.debug.commissioning(` - panId: ${provisioningNwkOptions.panId}`);
-        this.debug.commissioning(` - extendedPanId: ${provisioningNwkOptions.extendedPanId.toString("hex")}`);
-        this.debug.commissioning(` - channelList: ${provisioningNwkOptions.channelList.join(", ")}`);
-        this.debug.commissioning(` - networkKey: ${provisioningNwkOptions.networkKey.toString("hex")}`);
-        this.debug.commissioning(` - networkKeyDistribute: ${provisioningNwkOptions.networkKeyDistribute}`);
+        logger_1.logger.debug("commissioning random provisioning network:", NS);
+        logger_1.logger.debug(` - panId: ${provisioningNwkOptions.panId}`, NS);
+        logger_1.logger.debug(` - extendedPanId: ${provisioningNwkOptions.extendedPanId.toString("hex")}`, NS);
+        logger_1.logger.debug(` - channelList: ${provisioningNwkOptions.channelList.join(", ")}`, NS);
+        logger_1.logger.debug(` - networkKey: ${provisioningNwkOptions.networkKey.toString("hex")}`, NS);
+        logger_1.logger.debug(` - networkKeyDistribute: ${provisioningNwkOptions.networkKeyDistribute}`, NS);
         await this.beginCommissioning(provisioningNwkOptions, false, false);
         /* perform NV restore */
         await this.backup.restoreBackup(backup);
         /* update commissioning NV items with desired nwk configuration */
         await this.updateCommissioningNvItems(this.nwkOptions);
         /* settle & reset adapter */
-        this.debug.commissioning("giving adapter some time to settle");
+        logger_1.logger.debug("giving adapter some time to settle", NS);
         await (0, utils_1.Wait)(1000);
         await this.resetAdapter();
         /* startup with restored adapter */
@@ -319,7 +310,7 @@ class ZnpAdapterManager {
         await this.clearAdapter();
         /* commission the network as per parameters */
         await this.updateCommissioningNvItems(nwkOptions);
-        this.debug.commissioning("beginning network commissioning");
+        logger_1.logger.debug("beginning network commissioning", NS);
         if ([tstype_1.ZnpVersion.zStack30x, tstype_1.ZnpVersion.zStack3x0].includes(this.options.version)) {
             /* configure channel */
             await this.znp.request(constants_1.Subsystem.APP_CNF, "bdbSetChannel", { isPrimary: 0x1, channel: Utils.packChannelList(nwkOptions.channelList) });
@@ -339,7 +330,7 @@ class ZnpAdapterManager {
             await this.beginStartup();
         }
         /* wait for NIB to settle (takes different amount of time of different platforms */
-        this.debug.commissioning("waiting for NIB to settle");
+        logger_1.logger.debug("waiting for NIB to settle", NS);
         let reads = 0;
         let nib = null;
         do {
@@ -355,7 +346,7 @@ class ZnpAdapterManager {
         if (extNwkInfo.payload.panid !== nwkOptions.panId && failOnCollision) {
             throw new Error(`network commissioning failed - panId collision detected (expected=${nwkOptions.panId}, actual=${extNwkInfo.payload.panid})`);
         }
-        this.debug.commissioning("network commissioned");
+        logger_1.logger.debug("network commissioned", NS);
         /* write configuration flag */
         if (writeConfiguredFlag) {
             await this.writeConfigurationFlag();
@@ -373,7 +364,7 @@ class ZnpAdapterManager {
         const channelList = Structs.channelList();
         channelList.channelList = Utils.packChannelList(options.channelList);
         const extendedPanIdReversed = Buffer.from(options.extendedPanId).reverse();
-        this.debug.commissioning(`setting network commissioning parameters`);
+        logger_1.logger.debug(`setting network commissioning parameters`, NS);
         await this.nv.updateItem(common_1.NvItemsIds.STARTUP_OPTION, Buffer.from([0x00]));
         await this.nv.updateItem(common_1.NvItemsIds.LOGICAL_TYPE, Buffer.from([ZnpConstants.ZDO.deviceLogicalType.COORDINATOR]));
         await this.nv.updateItem(common_1.NvItemsIds.ZDO_DIRECT_CB, Buffer.from([0x01]));
@@ -408,10 +399,10 @@ class ZnpAdapterManager {
         const activeEp = await activeEpResponse.start().promise;
         for (const endpoint of endpoints_1.Endpoints) {
             if (activeEp.payload.activeeplist.includes(endpoint.endpoint)) {
-                this.debug.startup(`endpoint '${endpoint.endpoint}' already registered`);
+                logger_1.logger.debug(`endpoint '${endpoint.endpoint}' already registered`, NS);
             }
             else {
-                this.debug.startup(`registering endpoint '${endpoint.endpoint}'`);
+                logger_1.logger.debug(`registering endpoint '${endpoint.endpoint}'`, NS);
                 await this.znp.request(constants_1.Subsystem.AF, 'register', endpoint);
             }
         }
@@ -432,15 +423,15 @@ class ZnpAdapterManager {
      * Internal method to reset the adapter.
      */
     async resetAdapter() {
-        this.debug.startup("adapter reset requested");
+        logger_1.logger.debug("adapter reset requested", NS);
         await this.znp.request(constants_1.Subsystem.SYS, 'resetReq', { type: ZnpConstants.SYS.resetType.SOFT });
-        this.debug.startup("adapter reset successful");
+        logger_1.logger.debug("adapter reset successful", NS);
     }
     /**
      * Internal method to reset adapter config and data.
      */
     async clearAdapter() {
-        this.debug.startup("clearing adapter using startup option 3");
+        logger_1.logger.debug("clearing adapter using startup option 3", NS);
         await this.nv.writeItem(common_1.NvItemsIds.STARTUP_OPTION, Buffer.from([0x03]));
         await this.resetAdapter();
         await this.nv.writeItem(common_1.NvItemsIds.STARTUP_OPTION, Buffer.from([0x00]));
@@ -475,7 +466,7 @@ class ZnpAdapterManager {
      * Writes ZNP `hasConfigured` flag to NV memory. This flag indicates the adapter has been configured.
      */
     async writeConfigurationFlag() {
-        this.debug.commissioning("writing configuration flag to adapter NV memory");
+        logger_1.logger.debug("writing configuration flag to adapter NV memory", NS);
         await this.nv.writeItem(this.options.version === tstype_1.ZnpVersion.zStack12 ? common_1.NvItemsIds.ZNP_HAS_CONFIGURED_ZSTACK1 : common_1.NvItemsIds.ZNP_HAS_CONFIGURED_ZSTACK3, Buffer.from([0x55]));
     }
 }