zigbee-herdsman 0.40.2 → 0.41.0

package/dist/adapter/deconz/adapter/deconzAdapter.js

@@ -26,15 +26,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const debug_1 = __importDefault(require("debug"));
 const adapter_1 = __importDefault(require("../../adapter"));
-const debug = (0, debug_1.default)("zigbee-herdsman:deconz:adapter");
 const driver_1 = __importDefault(require("../driver/driver"));
 const zcl_1 = require("../../../zcl");
 const Events = __importStar(require("../../events"));
 const frameParser_1 = __importDefault(require("../driver/frameParser"));
 const utils_1 = require("../../../utils");
 const constants_1 = __importDefault(require("../driver/constants"));
+const logger_1 = require("../../../utils/logger");
+const NS = 'zh:deconz';
 var frameParser = require('../driver/frameParser');
 ;
 class DeconzAdapter extends adapter_1.default {
@@ -47,8 +47,8 @@ class DeconzAdapter extends adapter_1.default {
     fwVersion;
     waitress;
     TX_OPTIONS = 0x00; // No APS ACKS
-    constructor(networkOptions, serialPortOptions, backupPath, adapterOptions, logger) {
-        super(networkOptions, serialPortOptions, backupPath, adapterOptions, logger);
+    constructor(networkOptions, serialPortOptions, backupPath, adapterOptions) {
+        super(networkOptions, serialPortOptions, backupPath, adapterOptions);
         const concurrent = this.adapterOptions && this.adapterOptions.concurrent ?
             this.adapterOptions.concurrent : 2;
         // TODO: https://github.com/Koenkk/zigbee2mqtt/issues/4884#issuecomment-728903121
@@ -138,11 +138,11 @@ class DeconzAdapter extends adapter_1.default {
                 this.joinPermitted = true;
             }
             await this.driver.writeParameterRequest(constants_1.default.PARAM.Network.PERMIT_JOIN, seconds);
-            debug("PERMIT_JOIN - " + seconds + " seconds");
+            logger_1.logger.debug("PERMIT_JOIN - " + seconds + " seconds", NS);
         }
         catch (error) {
             const msg = "PERMIT_JOIN FAILED - " + error;
-            debug(msg);
+            logger_1.logger.debug(msg, NS);
             // try again
             this.permitJoin(seconds, networkAddress);
             //return Promise.reject(new Error(msg)); // do not reject
@@ -173,7 +173,7 @@ class DeconzAdapter extends adapter_1.default {
                 return { type: type, meta: meta };
             }
             catch (error) {
-                debug("Get coordinator version Error: " + error);
+                logger_1.logger.debug("Get coordinator version Error: " + error, NS);
             }
         }
     }
@@ -243,12 +243,12 @@ class DeconzAdapter extends adapter_1.default {
                         counter = 0;
                     }
                 }
-                debug("LQI RESPONSE - addr: 0x" + networkAddress.toString(16) + " status: " + response.status + " read " + (response.tableListCount + response.startIndex) + "/" + response.tableEntrys + " entrys");
+                logger_1.logger.debug("LQI RESPONSE - addr: 0x" + networkAddress.toString(16) + " status: " + response.status + " read " + (response.tableListCount + response.startIndex) + "/" + response.tableEntrys + " entrys", NS);
                 return response;
             }
             catch (error) {
                 const msg = "LQI REQUEST FAILED - addr: 0x" + networkAddress.toString(16) + " " + error;
-                debug(msg);
+                logger_1.logger.debug(msg, NS);
                 return Promise.reject(new Error(msg));
             }
         };
@@ -327,12 +327,12 @@ class DeconzAdapter extends adapter_1.default {
                         counter = 0;
                     }
                 }
-                debug("ROUTING_TABLE RESPONSE - addr: 0x" + networkAddress.toString(16) + " status: " + response.status + " read " + (response.tableListCount + response.startIndex) + "/" + response.tableEntrys + " entrys");
+                logger_1.logger.debug("ROUTING_TABLE RESPONSE - addr: 0x" + networkAddress.toString(16) + " status: " + response.status + " read " + (response.tableListCount + response.startIndex) + "/" + response.tableEntrys + " entrys", NS);
                 return response;
             }
             catch (error) {
                 const msg = "ROUTING_TABLE REQUEST FAILED - addr: 0x" + networkAddress.toString(16) + " " + error;
-                debug(msg);
+                logger_1.logger.debug(msg, NS);
                 return Promise.reject(new Error(msg));
             }
         };
@@ -374,12 +374,12 @@ class DeconzAdapter extends adapter_1.default {
             const logicaltype = (data[4] & 7);
             const type = (logicaltype === 1) ? 'Router' : (logicaltype === 2) ? 'EndDevice' : (logicaltype === 0) ? 'Coordinator' : 'Unknown';
             const manufacturer = buf.readUInt16LE(7);
-            debug("RECEIVING NODE_DESCRIPTOR - addr: 0x" + networkAddress.toString(16) + " type: " + type + " manufacturer: 0x" + manufacturer.toString(16));
+            logger_1.logger.debug("RECEIVING NODE_DESCRIPTOR - addr: 0x" + networkAddress.toString(16) + " type: " + type + " manufacturer: 0x" + manufacturer.toString(16), NS);
             return { manufacturerCode: manufacturer, type };
         }
         catch (error) {
             const msg = "RECEIVING NODE_DESCRIPTOR FAILED - addr: 0x" + networkAddress.toString(16) + " " + error;
-            debug(msg);
+            logger_1.logger.debug(msg, NS);
             return Promise.reject(new Error(msg));
         }
     }
@@ -413,12 +413,12 @@ class DeconzAdapter extends adapter_1.default {
             for (let i = 5; i < (epCount + 5); i++) {
                 epList.push(buf.readUInt8(i));
             }
-            debug("ACTIVE_ENDPOINTS - addr: 0x" + networkAddress.toString(16) + " EP list: " + epList);
+            logger_1.logger.debug("ACTIVE_ENDPOINTS - addr: 0x" + networkAddress.toString(16) + " EP list: " + epList, NS);
             return { endpoints: epList };
         }
         catch (error) {
             const msg = "READING ACTIVE_ENDPOINTS FAILED - addr: 0x" + networkAddress.toString(16) + " " + error;
-            debug(msg);
+            logger_1.logger.debug(msg, NS);
             return Promise.reject(new Error(msg));
         }
     }
@@ -468,17 +468,17 @@ class DeconzAdapter extends adapter_1.default {
                 inputClusters: inClusters,
                 outputClusters: outClusters
             };
-            debug("RECEIVING SIMPLE_DESCRIPTOR - addr: 0x" + networkAddress.toString(16) + " EP:" + simpleDesc.endpointID + " inClusters: " + inClusters + " outClusters: " + outClusters);
+            logger_1.logger.debug("RECEIVING SIMPLE_DESCRIPTOR - addr: 0x" + networkAddress.toString(16) + " EP:" + simpleDesc.endpointID + " inClusters: " + inClusters + " outClusters: " + outClusters, NS);
             return simpleDesc;
         }
         catch (error) {
             const msg = "RECEIVING SIMPLE_DESCRIPTOR FAILED - addr: 0x" + networkAddress.toString(16) + " " + error;
-            debug(msg);
+            logger_1.logger.debug(msg, NS);
             return Promise.reject(new Error(msg));
         }
     }
     async checkCoordinatorSimpleDescriptor(skip) {
-        debug("checking coordinator simple descriptor");
+        logger_1.logger.debug("checking coordinator simple descriptor", NS);
         var simpleDesc = null;
         if (skip === false) {
             try {
@@ -490,14 +490,14 @@ class DeconzAdapter extends adapter_1.default {
                 this.checkCoordinatorSimpleDescriptor(false);
                 return;
             }
-            debug("EP: " + simpleDesc.endpointID);
-            debug("profile ID: " + simpleDesc.profileID);
-            debug("device ID: " + simpleDesc.deviceID);
+            logger_1.logger.debug("EP: " + simpleDesc.endpointID, NS);
+            logger_1.logger.debug("profile ID: " + simpleDesc.profileID, NS);
+            logger_1.logger.debug("device ID: " + simpleDesc.deviceID, NS);
             for (let i = 0; i < simpleDesc.inputClusters.length; i++) {
-                debug("input cluster: 0x" + simpleDesc.inputClusters[i].toString(16));
+                logger_1.logger.debug("input cluster: 0x" + simpleDesc.inputClusters[i].toString(16), NS);
             }
             for (let o = 0; o < simpleDesc.outputClusters.length; o++) {
-                debug("output cluster: 0x" + simpleDesc.outputClusters[o].toString(16));
+                logger_1.logger.debug("output cluster: 0x" + simpleDesc.outputClusters[o].toString(16), NS);
             }
             let ok = true;
             if (simpleDesc.endpointID === 0x1) {
@@ -505,7 +505,7 @@ class DeconzAdapter extends adapter_1.default {
                     !simpleDesc.inputClusters.includes(0x19) || !simpleDesc.inputClusters.includes(0x0501) ||
                     !simpleDesc.outputClusters.includes(0x01) || !simpleDesc.outputClusters.includes(0x20) || !simpleDesc.outputClusters.includes(0x500) ||
                     !simpleDesc.outputClusters.includes(0x502)) {
-                    debug("missing cluster");
+                    logger_1.logger.debug("missing cluster", NS);
                     ok = false;
                 }
                 if (ok === true) {
@@ -513,18 +513,18 @@ class DeconzAdapter extends adapter_1.default {
                 }
             }
         }
-        debug("setting new simple descriptor");
+        logger_1.logger.debug("setting new simple descriptor", NS);
         try { //[ sd1   ep    proId       devId       vers  #inCl iCl1        iCl2        iCl3        iCl4        iCl5        #outC oCl1        oCl2        oCl3        oCl4      ]
             const sd = [0x00, 0x01, 0x04, 0x01, 0x05, 0x00, 0x01, 0x05, 0x00, 0x00, 0x00, 0x06, 0x0A, 0x00, 0x19, 0x00, 0x01, 0x05, 0x04, 0x01, 0x00, 0x20, 0x00, 0x00, 0x05, 0x02, 0x05];
             const sd1 = sd.reverse();
             await this.driver.writeParameterRequest(constants_1.default.PARAM.STK.Endpoint, sd1);
         }
         catch (error) {
-            debug("error setting simple descriptor - try again");
+            logger_1.logger.debug("error setting simple descriptor - try again", NS);
             this.checkCoordinatorSimpleDescriptor(true);
             return;
         }
-        debug("success setting simple descriptor");
+        logger_1.logger.debug("success setting simple descriptor", NS);
     }
     waitFor(networkAddress, endpoint, frameType, direction, transactionSequenceNumber, clusterID, commandIdentifier, timeout) {
         const payload = {
@@ -539,8 +539,8 @@ class DeconzAdapter extends adapter_1.default {
         const transactionID = this.nextTransactionID();
         const request = {};
         let pay = zclFrame.toBuffer();
-        //console.log("zclFramte.toBuffer:");
-        //console.log(pay);
+        //logger.info("zclFramte.toBuffer:", NS);
+        //logger.info(pay, NS);
         request.requestId = transactionID;
         request.destAddrMode = constants_1.default.PARAM.addressMode.NWK_ADDR;
         request.destAddr16 = networkAddress;
@@ -556,16 +556,16 @@ class DeconzAdapter extends adapter_1.default {
         const command = zclFrame.getCommand();
         this.driver.enqueueSendDataRequest(request)
             .then(result => {
-            debug(`sendZclFrameToEndpoint - message send with transSeq Nr.: ${zclFrame.Header.transactionSequenceNumber}`);
-            debug(command.hasOwnProperty('response') + ", " + zclFrame.Header.frameControl.disableDefaultResponse + ", " + disableResponse + ", " + request.timeout);
+            logger_1.logger.debug(`sendZclFrameToEndpoint - message send with transSeq Nr.: ${zclFrame.Header.transactionSequenceNumber}`, NS);
+            logger_1.logger.debug(command.hasOwnProperty('response') + ", " + zclFrame.Header.frameControl.disableDefaultResponse + ", " + disableResponse + ", " + request.timeout, NS);
             if (!command.hasOwnProperty('response') || zclFrame.Header.frameControl.disableDefaultResponse || !disableResponse) {
-                debug(`resolve request (${zclFrame.Header.transactionSequenceNumber})`);
+                logger_1.logger.debug(`resolve request (${zclFrame.Header.transactionSequenceNumber})`, NS);
                 return Promise.resolve();
             }
         })
             .catch(error => {
-            debug(`sendZclFrameToEndpoint ERROR (${zclFrame.Header.transactionSequenceNumber})`);
-            debug(error);
+            logger_1.logger.debug(`sendZclFrameToEndpoint ERROR (${zclFrame.Header.transactionSequenceNumber})`, NS);
+            logger_1.logger.debug(error, NS);
             //return Promise.reject(new Error("sendZclFrameToEndpoint ERROR " + error));
         });
         try {
@@ -586,11 +586,11 @@ class DeconzAdapter extends adapter_1.default {
                     wasBroadcast: data.srcAddrMode === 0x01 || data.srcAddrMode === 0xF,
                     destinationEndpoint: data.destEndpoint,
                 };
-                debug(`response received (${zclFrame.Header.transactionSequenceNumber})`);
+                logger_1.logger.debug(`response received (${zclFrame.Header.transactionSequenceNumber})`, NS);
                 return response;
             }
             else {
-                debug(`no response expected (${zclFrame.Header.transactionSequenceNumber})`);
+                logger_1.logger.debug(`no response expected (${zclFrame.Header.transactionSequenceNumber})`, NS);
                 return null;
             }
         }
@@ -602,10 +602,10 @@ class DeconzAdapter extends adapter_1.default {
         const transactionID = this.nextTransactionID();
         const request = {};
         let pay = zclFrame.toBuffer();
-        debug("zclFrame to group - zclFrame.payload:");
-        debug(zclFrame.Payload);
-        //console.log("zclFramte.toBuffer:");
-        //console.log(pay);
+        logger_1.logger.debug("zclFrame to group - zclFrame.payload:", NS);
+        logger_1.logger.debug(zclFrame.Payload, NS);
+        //logger.info("zclFramte.toBuffer:", NS);
+        //logger.info(pay, NS);
         request.requestId = transactionID;
         request.destAddrMode = constants_1.default.PARAM.addressMode.GROUP_ADDR;
         request.destAddr16 = groupID;
@@ -617,11 +617,11 @@ class DeconzAdapter extends adapter_1.default {
         request.txOptions = 0;
         request.radius = constants_1.default.PARAM.txRadius.UNLIMITED;
         try {
-            debug(`sendZclFrameToGroup - message send`);
+            logger_1.logger.debug(`sendZclFrameToGroup - message send`, NS);
             return this.driver.enqueueSendDataRequest(request);
         }
         catch (error) {
-            //debug(`sendZclFrameToGroup ERROR: ${error}`);
+            //logger.debug(`sendZclFrameToGroup ERROR: ${error}`, NS);
             throw new Error(error);
         }
     }
@@ -629,8 +629,8 @@ class DeconzAdapter extends adapter_1.default {
         const transactionID = this.nextTransactionID();
         const request = {};
         let pay = zclFrame.toBuffer();
-        debug("zclFrame to all - zclFrame.payload:");
-        debug(zclFrame.Payload);
+        logger_1.logger.debug("zclFrame to all - zclFrame.payload:", NS);
+        logger_1.logger.debug(zclFrame.Payload, NS);
         request.requestId = transactionID;
         request.destAddrMode = constants_1.default.PARAM.addressMode.NWK_ADDR;
         request.destAddr16 = 0xFFFD;
@@ -643,11 +643,11 @@ class DeconzAdapter extends adapter_1.default {
         request.txOptions = 0;
         request.radius = constants_1.default.PARAM.txRadius.UNLIMITED;
         try {
-            debug(`sendZclFrameToAll - message send`);
+            logger_1.logger.debug(`sendZclFrameToAll - message send`, NS);
             return this.driver.enqueueSendDataRequest(request);
         }
         catch (error) {
-            //debug(`sendZclFrameToAll ERROR: ${error}`);
+            //logger.debug(`sendZclFrameToAll ERROR: ${error}`, NS);
             throw new Error(error);
         }
     }
@@ -684,13 +684,13 @@ class DeconzAdapter extends adapter_1.default {
         try {
             const d = await this.waitForData(destinationNetworkAddress, 0, 0x8021);
             const data = d.asduPayload;
-            debug("BIND RESPONSE - addr: 0x" + destinationNetworkAddress.toString(16) + " status: " + data[1]);
+            logger_1.logger.debug("BIND RESPONSE - addr: 0x" + destinationNetworkAddress.toString(16) + " status: " + data[1], NS);
             if (data[1] !== 0) {
                 throw new Error("status: " + data[1]);
             }
         }
         catch (error) {
-            debug("BIND FAILED - addr: 0x" + destinationNetworkAddress.toString(16) + " " + error);
+            logger_1.logger.debug("BIND FAILED - addr: 0x" + destinationNetworkAddress.toString(16) + " " + error, NS);
             throw new Error(error);
         }
     }
@@ -727,13 +727,13 @@ class DeconzAdapter extends adapter_1.default {
         try {
             const d = await this.waitForData(destinationNetworkAddress, 0, 0x8022);
             const data = d.asduPayload;
-            debug("UNBIND RESPONSE - addr: 0x" + destinationNetworkAddress.toString(16) + " status: " + data[1]);
+            logger_1.logger.debug("UNBIND RESPONSE - addr: 0x" + destinationNetworkAddress.toString(16) + " status: " + data[1], NS);
             if (data[1] !== 0) {
                 throw new Error("status: " + data[1]);
             }
         }
         catch (error) {
-            debug("UNBIND FAILED - addr: 0x" + destinationNetworkAddress.toString(16) + " " + error);
+            logger_1.logger.debug("UNBIND FAILED - addr: 0x" + destinationNetworkAddress.toString(16) + " " + error, NS);
             throw new Error(error);
         }
     }
@@ -761,7 +761,7 @@ class DeconzAdapter extends adapter_1.default {
         try {
             const d = await this.waitForData(networkAddress, 0, 0x8034);
             const data = d.asduPayload;
-            debug("REMOVE_DEVICE - addr: 0x" + networkAddress.toString(16) + " status: " + data[1]);
+            logger_1.logger.debug("REMOVE_DEVICE - addr: 0x" + networkAddress.toString(16) + " status: " + data[1], NS);
             const payload = {
                 networkAddress: networkAddress,
                 ieeeAddr: ieeeAddr,
@@ -772,7 +772,7 @@ class DeconzAdapter extends adapter_1.default {
             this.emit(Events.Events.deviceLeave, payload);
         }
         catch (error) {
-            debug("REMOVE_DEVICE FAILED - addr: 0x" + networkAddress.toString(16) + " " + error);
+            logger_1.logger.debug("REMOVE_DEVICE FAILED - addr: 0x" + networkAddress.toString(16) + " " + error, NS);
             throw new Error(error);
         }
     }
@@ -791,7 +791,7 @@ class DeconzAdapter extends adapter_1.default {
             let networkKey = await this.driver.readParameterRequest(constants_1.default.PARAM.Network.NETWORK_KEY);
             // check current channel against configuration.yaml
             if (this.networkOptions.channelList[0] !== channel) {
-                debug("Channel in configuration.yaml (" + this.networkOptions.channelList[0] + ") differs from current channel (" + channel + "). Changing channel.");
+                logger_1.logger.debug("Channel in configuration.yaml (" + this.networkOptions.channelList[0] + ") differs from current channel (" + channel + "). Changing channel.", NS);
                 let setChannelMask = 0;
                 switch (this.networkOptions.channelList[0]) {
                     case 11:
@@ -851,43 +851,43 @@ class DeconzAdapter extends adapter_1.default {
                     changed = true;
                 }
                 catch (error) {
-                    debug("Could not set channel: " + error);
+                    logger_1.logger.debug("Could not set channel: " + error, NS);
                 }
             }
             // check current panid against configuration.yaml
             if (this.networkOptions.panID !== panid) {
-                debug("panid in configuration.yaml (" + this.networkOptions.panID + ") differs from current panid (" + panid + "). Changing panid.");
+                logger_1.logger.debug("panid in configuration.yaml (" + this.networkOptions.panID + ") differs from current panid (" + panid + "). Changing panid.", NS);
                 try {
                     await this.driver.writeParameterRequest(constants_1.default.PARAM.Network.PAN_ID, this.networkOptions.panID);
                     await this.sleep(500);
                     changed = true;
                 }
                 catch (error) {
-                    debug("Could not set panid: " + error);
+                    logger_1.logger.debug("Could not set panid: " + error, NS);
                 }
             }
             // check current extended_panid against configuration.yaml
             if (this.driver.generalArrayToString(this.networkOptions.extendedPanID, 8) !== expanid) {
-                debug("extended panid in configuration.yaml (" + this.driver.macAddrArrayToString(this.networkOptions.extendedPanID) + ") differs from current extended panid (" + expanid + "). Changing extended panid.");
+                logger_1.logger.debug("extended panid in configuration.yaml (" + this.driver.macAddrArrayToString(this.networkOptions.extendedPanID) + ") differs from current extended panid (" + expanid + "). Changing extended panid.", NS);
                 try {
                     await this.driver.writeParameterRequest(constants_1.default.PARAM.Network.APS_EXT_PAN_ID, this.networkOptions.extendedPanID);
                     await this.sleep(500);
                     changed = true;
                 }
                 catch (error) {
-                    debug("Could not set extended panid: " + error);
+                    logger_1.logger.debug("Could not set extended panid: " + error, NS);
                 }
             }
             // check current network key against configuration.yaml
             if (this.driver.generalArrayToString(this.networkOptions.networkKey, 16) !== networkKey) {
-                debug("network key in configuration.yaml (hidden) differs from current network key (" + networkKey + "). Changing network key.");
+                logger_1.logger.debug("network key in configuration.yaml (hidden) differs from current network key (" + networkKey + "). Changing network key.", NS);
                 try {
                     await this.driver.writeParameterRequest(constants_1.default.PARAM.Network.NETWORK_KEY, this.networkOptions.networkKey);
                     await this.sleep(500);
                     changed = true;
                 }
                 catch (error) {
-                    debug("Could not set network key: " + error);
+                    logger_1.logger.debug("Could not set network key: " + error, NS);
                 }
             }
             if (changed) {
@@ -908,7 +908,7 @@ class DeconzAdapter extends adapter_1.default {
         }
         catch (error) {
             const msg = "get network parameters Error:" + error;
-            debug(msg);
+            logger_1.logger.debug(msg, NS);
             return Promise.reject(new Error(msg));
         }
     }
@@ -984,7 +984,7 @@ class DeconzAdapter extends adapter_1.default {
                     frame = zcl_1.ZclFrame.fromBuffer(resp.clusterId, Buffer.from(resp.asduPayload));
                 }
                 catch (error) {
-                    debug("could not parse zclFrame: " + error);
+                    logger_1.logger.debug("could not parse zclFrame: " + error, NS);
                 }
             }
         }
@@ -995,13 +995,13 @@ class DeconzAdapter extends adapter_1.default {
                 req.profileId === resp.profileId) {
                 if (frame !== null && req.transactionSequenceNumber !== null && req.transactionSequenceNumber !== undefined) {
                     if (req.transactionSequenceNumber === frame.Header.transactionSequenceNumber) {
-                        debug("resolve data request with transSeq Nr.: " + req.transactionSequenceNumber);
+                        logger_1.logger.debug("resolve data request with transSeq Nr.: " + req.transactionSequenceNumber, NS);
                         this.openRequestsQueue.splice(i, 1);
                         req.resolve(resp);
                     }
                 }
                 else {
-                    debug("resolve data request without a transSeq Nr.");
+                    logger_1.logger.debug("resolve data request without a transSeq Nr.", NS);
                     this.openRequestsQueue.splice(i, 1);
                     req.resolve(resp);
                 }
@@ -1010,7 +1010,7 @@ class DeconzAdapter extends adapter_1.default {
             // Default timeout: 60 seconds.
             // Comparison is negated to prevent orphans when invalid timeout is entered (resulting in NaN).
             if (!((now - req.ts) <= (req.timeout ?? 60000))) {
-                //debug("Timeout for request in openRequestsQueue addr: " + req.addr.toString(16) + " clusterId: " + req.clusterId.toString(16) + " profileId: " + req.profileId.toString(16));
+                //logger.debug("Timeout for request in openRequestsQueue addr: " + req.addr.toString(16) + " clusterId: " + req.clusterId.toString(16) + " profileId: " + req.profileId.toString(16), NS);
                 //remove from busyQueue
                 this.openRequestsQueue.splice(i, 1);
                 req.reject("waiting for response TIMEOUT");