zigbee-herdsman 0.40.2 → 0.41.0

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);
@@ -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]));
     }
 }

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

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

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

@@ -4,7 +4,6 @@ import * as Events from '../../events';
 import Adapter from '../../adapter';
 import { ZpiObject } from '../znp';
 import { ZclFrame, FrameType, Direction } from '../../../zcl';
-import { LoggerStub } from "../../../controller/logger-stub";
 import * as Models from "../../../models";
 declare class ZStackAdapter extends Adapter {
     private deviceAnnounceRouteDiscoveryDebouncers;
@@ -18,7 +17,7 @@ declare class ZStackAdapter extends Adapter {
     private interpanLock;
     private interpanEndpointRegistered;
     private waitress;
-    constructor(networkOptions: NetworkOptions, serialPortOptions: SerialPortOptions, backupPath: string, adapterOptions: AdapterOptions, logger?: LoggerStub);
+    constructor(networkOptions: NetworkOptions, serialPortOptions: SerialPortOptions, backupPath: string, adapterOptions: AdapterOptions);
     /**
      * Adapter methods
      */

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

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

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

@@ -34,11 +34,11 @@ const unpi_1 = require("../unpi");
 const zcl_1 = require("../../../zcl");
 const utils_1 = require("../../../utils");
 const Constants = __importStar(require("../constants"));
-const debug_1 = __importDefault(require("debug"));
 const debounce_1 = __importDefault(require("debounce"));
 const manager_1 = require("./manager");
 const assert_1 = __importDefault(require("assert"));
-const debug = (0, debug_1.default)("zigbee-herdsman:adapter:zStack:adapter");
+const logger_1 = require("../../../utils/logger");
+const NS = "zh:zstack";
 const Subsystem = unpi_1.Constants.Subsystem;
 const Type = unpi_1.Constants.Type;
 const { ZnpCommandStatus, AddressMode } = Constants.COMMON;
@@ -72,8 +72,8 @@ class ZStackAdapter extends adapter_1.default {
     interpanLock;
     interpanEndpointRegistered;
     waitress;
-    constructor(networkOptions, serialPortOptions, backupPath, adapterOptions, logger) {
-        super(networkOptions, serialPortOptions, backupPath, adapterOptions, logger);
+    constructor(networkOptions, serialPortOptions, backupPath, adapterOptions) {
+        super(networkOptions, serialPortOptions, backupPath, adapterOptions);
         this.znp = new znp_1.Znp(this.serialPortOptions.path, this.serialPortOptions.baudRate, this.serialPortOptions.rtscts);
         this.transactionID = 0;
         this.deviceAnnounceRouteDiscoveryDebouncers = new Map();
@@ -106,22 +106,22 @@ class ZStackAdapter extends adapter_1.default {
             this.version = (await this.znp.request(Subsystem.SYS, 'version', {})).payload;
         }
         catch (e) {
-            debug(`Failed to get zStack version, assuming 1.2`);
+            logger_1.logger.debug(`Failed to get zStack version, assuming 1.2`, NS);
             this.version = { "transportrev": 2, "product": 0, "majorrel": 2, "minorrel": 0, "maintrel": 0, "revision": "" };
         }
         const concurrent = this.adapterOptions && this.adapterOptions.concurrent ?
             this.adapterOptions.concurrent :
             (this.version.product === tstype_1.ZnpVersion.zStack3x0 ? 16 : 2);
-        debug(`Adapter concurrent: ${concurrent}`);
+        logger_1.logger.debug(`Adapter concurrent: ${concurrent}`, NS);
         this.queue = new utils_1.Queue(concurrent);
-        debug(`Detected znp version '${tstype_1.ZnpVersion[this.version.product]}' (${JSON.stringify(this.version)})`);
+        logger_1.logger.debug(`Detected znp version '${tstype_1.ZnpVersion[this.version.product]}' (${JSON.stringify(this.version)})`, NS);
         this.adapterManager = new manager_1.ZnpAdapterManager(this.znp, {
             backupPath: this.backupPath,
             version: this.version.product,
             greenPowerGroup: this.greenPowerGroup,
             networkOptions: this.networkOptions,
             adapterOptions: this.adapterOptions,
-        }, this.logger);
+        });
         const startResult = this.adapterManager.start();
         if (this.adapterOptions.disableLED) {
             // Wait a bit for adapter to startup, otherwise led doesn't disable (tested with CC2531)
@@ -222,7 +222,7 @@ class ZStackAdapter extends adapter_1.default {
          * NOTE: There are cases where multiple nwkAddrRsp are recevied with different network addresses,
          * this is currently not handled, the first nwkAddrRsp is taken.
          */
-        debug("Request network address of '%s'", ieeeAddr);
+        logger_1.logger.debug(`Request network address of '${ieeeAddr}'`, NS);
         const response = this.znp.waitFor(unpi_1.Constants.Type.AREQ, Subsystem.ZDO, 'nwkAddrRsp', { ieeeaddr: ieeeAddr });
         await this.znp.request(Subsystem.ZDO, 'nwkAddrReq', { ieeeaddr: ieeeAddr, reqtype: 0, startindex: 0 });
         const result = await response.start().promise;
@@ -235,7 +235,7 @@ class ZStackAdapter extends adapter_1.default {
         return this.version.product === tstype_1.ZnpVersion.zStack3x0 && parseInt(this.version.revision) >= 20201026;
     }
     async discoverRoute(networkAddress, wait = true) {
-        debug('Discovering route to %d', networkAddress);
+        logger_1.logger.debug(`Discovering route to ${networkAddress}`, NS);
         const payload = { dstAddr: networkAddress, options: 0, radius: Constants.AF.DEFAULT_RADIUS };
         await this.znp.request(Subsystem.ZDO, 'extRouteDisc', payload);
         if (wait) {
@@ -250,7 +250,7 @@ class ZStackAdapter extends adapter_1.default {
                 return result;
             }
             catch (error) {
-                debug(`Node descriptor request for '${networkAddress}' failed (${error}), retry`);
+                logger_1.logger.debug(`Node descriptor request for '${networkAddress}' failed (${error}), retry`, NS);
                 // Doing a route discovery after simple descriptor request fails makes it succeed sometimes.
                 // https://github.com/Koenkk/zigbee2mqtt/issues/3276
                 await this.discoverRoute(networkAddress);
@@ -313,7 +313,8 @@ class ZStackAdapter extends adapter_1.default {
         }, networkAddress);
     }
     async sendZclFrameToEndpointInternal(ieeeAddr, networkAddress, endpoint, sourceEndpoint, zclFrame, timeout, disableResponse, disableRecovery, responseAttempt, dataRequestAttempt, checkedNetworkAddress, discoveredRoute, assocRemove, assocRestore) {
-        debug('sendZclFrameToEndpointInternal %s:%i/%i (%i,%i,%i)', ieeeAddr, networkAddress, endpoint, responseAttempt, dataRequestAttempt, this.queue.count());
+        logger_1.logger.debug(`sendZclFrameToEndpointInternal ${ieeeAddr}:${networkAddress}/${endpoint} `
+            + `(${responseAttempt},${dataRequestAttempt},${this.queue.count()})`, NS);
         let response = null;
         const command = zclFrame.getCommand();
         if (command.hasOwnProperty('response') && disableResponse === false) {
@@ -325,7 +326,7 @@ class ZStackAdapter extends adapter_1.default {
         const dataConfirmResult = await this.dataRequest(networkAddress, endpoint, sourceEndpoint, zclFrame.Cluster.ID, Constants.AF.DEFAULT_RADIUS, zclFrame.toBuffer(), timeout);
         if (dataConfirmResult !== ZnpCommandStatus.SUCCESS) {
             // In case dataConfirm timesout (= null) or gives an error, try to recover
-            debug('Data confirm error (%s:%d,%d,%d)', ieeeAddr, networkAddress, dataConfirmResult, dataRequestAttempt);
+            logger_1.logger.debug(`Data confirm error (${ieeeAddr}:${networkAddress},${dataConfirmResult},${dataRequestAttempt})`, NS);
             if (response !== null)
                 response.cancel();
             /**
@@ -334,7 +335,7 @@ class ZStackAdapter extends adapter_1.default {
              * Re-add the device to the assoc table, otherwise we will never be able to reach it anymore.
              */
             if (assocRemove && assocRestore && this.supportsAssocAdd()) {
-                debug('assocAdd(%s)', assocRestore.ieeeadr);
+                logger_1.logger.debug(`assocAdd(${assocRestore.ieeeadr})`, NS);
                 await this.znp.request(Subsystem.UTIL, 'assocAdd', assocRestore);
                 assocRestore = null;
             }
@@ -387,7 +388,7 @@ class ZStackAdapter extends adapter_1.default {
                      * z-stack-firmware firmware version. In case it's not supported by the coordinator we will
                      * automatically timeout after 60000ms.
                      */
-                    debug('assocRemove(%s)', ieeeAddr);
+                    logger_1.logger.debug(`assocRemove(${ieeeAddr})`, NS);
                     await this.znp.request(Subsystem.UTIL, 'assocRemove', { ieeeadr: ieeeAddr });
                 }
                 else if (!discoveredRoute && dataRequestAttempt >= 1) {
@@ -400,19 +401,19 @@ class ZStackAdapter extends adapter_1.default {
                         checkedNetworkAddress = true;
                         const actualNetworkAddress = await this.requestNetworkAddress(ieeeAddr);
                         if (networkAddress !== actualNetworkAddress) {
-                            debug(`Failed because request was done with wrong network address`);
+                            logger_1.logger.debug(`Failed because request was done with wrong network address`, NS);
                             discoveredRoute = true;
                             networkAddress = actualNetworkAddress;
                             await this.discoverRoute(actualNetworkAddress);
                         }
                         else {
-                            debug('Network address did not change');
+                            logger_1.logger.debug('Network address did not change', NS);
                         }
                     }
                     catch { }
                 }
                 else {
-                    debug('Wait 2000ms');
+                    logger_1.logger.debug('Wait 2000ms', NS);
                     await (0, utils_1.Wait)(2000);
                 }
                 return this.sendZclFrameToEndpointInternal(ieeeAddr, networkAddress, endpoint, sourceEndpoint, zclFrame, timeout, disableResponse, disableRecovery, responseAttempt, dataRequestAttempt + 1, checkedNetworkAddress, discoveredRoute, assocRemove, assocRestore);
@@ -424,16 +425,16 @@ class ZStackAdapter extends adapter_1.default {
                 return result;
             }
             catch (error) {
-                debug('Response timeout (%s:%d,%d)', ieeeAddr, networkAddress, responseAttempt);
+                logger_1.logger.debug(`Response timeout (${ieeeAddr}:${networkAddress},${responseAttempt})`, NS);
                 if (responseAttempt < 1 && !disableRecovery) {
                     // No response could be because the radio of the end device is turned off:
                     // Sometimes the coordinator does not properly set the PENDING flag.
                     // Try to rewrite the device entry in the association table, this fixes it sometimes.
                     const match = await this.znp.request(Subsystem.UTIL, 'assocGetWithAddress', { extaddr: ieeeAddr, nwkaddr: networkAddress });
-                    debug(`Response timeout recovery: Node relation ${match.payload.noderelation} (${ieeeAddr} / ${match.payload.nwkaddr})`);
+                    logger_1.logger.debug(`Response timeout recovery: Node relation ${match.payload.noderelation} (${ieeeAddr} / ${match.payload.nwkaddr})`, NS);
                     if (this.supportsAssocAdd() && this.supportsAssocRemove() &&
                         match.payload.nwkaddr !== 0xFFFE && match.payload.noderelation == 1) {
-                        debug(`Response timeout recovery: Rewrite association table entry (${ieeeAddr})`);
+                        logger_1.logger.debug(`Response timeout recovery: Rewrite association table entry (${ieeeAddr})`, NS);
                         await this.znp.request(Subsystem.UTIL, 'assocRemove', { ieeeadr: ieeeAddr });
                         await this.znp.request(Subsystem.UTIL, 'assocAdd', { ieeeadr: ieeeAddr, nwkaddr: networkAddress, noderelation: match.payload.noderelation });
                     }
@@ -675,7 +676,7 @@ class ZStackAdapter extends adapter_1.default {
                 /* istanbul ignore else */
                 if (object.command === 'leaveInd') {
                     if (object.payload.rejoin) {
-                        debug(`Device leave: Got leave indication with rejoin=true, nothing to do`);
+                        logger_1.logger.debug(`Device leave: Got leave indication with rejoin=true, nothing to do`, NS);
                     }
                     else {
                         const payload = {