zigbee-herdsman 0.50.1 → 0.52.0

package/dist/adapter/ember/uart/ash.js

@@ -5,37 +5,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UartAsh = exports.AshEvents = void 0;
 /* istanbul ignore file */
-const stream_1 = require("stream");
 const net_1 = require("net");
-const socketPortUtils_1 = __importDefault(require("../../socketPortUtils"));
+const stream_1 = require("stream");
+const utils_1 = require("../../../utils");
+const logger_1 = require("../../../utils/logger");
 const serialPort_1 = require("../../serialPort");
-const consts_1 = require("./consts");
-const math_1 = require("../utils/math");
+const socketPortUtils_1 = __importDefault(require("../../socketPortUtils"));
 const enums_1 = require("../enums");
+const math_1 = require("../utils/math");
+const consts_1 = require("./consts");
 const enums_2 = require("./enums");
+const parser_1 = require("./parser");
 const queues_1 = require("./queues");
 const writer_1 = require("./writer");
-const parser_1 = require("./parser");
-const utils_1 = require("../../../utils");
-const logger_1 = require("../../../utils/logger");
 const NS = 'zh:ember:uart:ash';
 /** ASH get rflag in control byte */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-const ashGetRFlag = (ctrl) => ((ctrl & consts_1.ASH_RFLAG_MASK) >> consts_1.ASH_RFLAG_BIT);
+const ashGetRFlag = (ctrl) => (ctrl & consts_1.ASH_RFLAG_MASK) >> consts_1.ASH_RFLAG_BIT;
 /** ASH get nflag in control byte */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-const ashGetNFlag = (ctrl) => ((ctrl & consts_1.ASH_NFLAG_MASK) >> consts_1.ASH_NFLAG_BIT);
+const ashGetNFlag = (ctrl) => (ctrl & consts_1.ASH_NFLAG_MASK) >> consts_1.ASH_NFLAG_BIT;
 /** ASH get frmnum in control byte */
-const ashGetFrmNum = (ctrl) => ((ctrl & consts_1.ASH_FRMNUM_MASK) >> consts_1.ASH_FRMNUM_BIT);
+const ashGetFrmNum = (ctrl) => (ctrl & consts_1.ASH_FRMNUM_MASK) >> consts_1.ASH_FRMNUM_BIT;
 /** ASH get acknum in control byte */
-const ashGetACKNum = (ctrl) => ((ctrl & consts_1.ASH_ACKNUM_MASK) >> consts_1.ASH_ACKNUM_BIT);
-var AshEvents;
-(function (AshEvents) {
-    /** When the ASH protocol detects a fatal error (bubbles up to restart adapter). */
-    AshEvents["FATAL_ERROR"] = "fatalError";
-    /** When a frame has been parsed and queued in the rxQueue. */
-    AshEvents["FRAME"] = "frame";
-})(AshEvents || (exports.AshEvents = AshEvents = {}));
+const ashGetACKNum = (ctrl) => (ctrl & consts_1.ASH_ACKNUM_MASK) >> consts_1.ASH_ACKNUM_BIT;
 var SendState;
 (function (SendState) {
     SendState[SendState["IDLE"] = 0] = "IDLE";
@@ -87,6 +80,13 @@ const CONFIG_NR_HIGH_LIMIT = 12; // RX_FREE_HW
 const CONFIG_NR_TIME = 480;
 /** Read/write max bytes count at stream level */
 const CONFIG_HIGHWATER_MARK = 256;
+var AshEvents;
+(function (AshEvents) {
+    /** When the ASH protocol detects a fatal error (bubbles up to restart adapter). */
+    AshEvents["FATAL_ERROR"] = "fatalError";
+    /** When a frame has been parsed and queued in the rxQueue. */
+    AshEvents["FRAME"] = "frame";
+})(AshEvents || (exports.AshEvents = AshEvents = {}));
 /**
  * ASH Protocol handler.
  */
@@ -228,21 +228,21 @@ class UartAsh extends stream_1.EventEmitter {
      * - false - host and NCP cannot now exchange DATA frames
      */
     get connected() {
-        return ((this.flags & Flag.CONNECTED) !== 0);
+        return (this.flags & Flag.CONNECTED) !== 0;
     }
     /**
      * Has nothing to do...
      */
     get idle() {
-        return (!this.decodeInProgress // don't have a partial frame
+        return (!this.decodeInProgress && // don't have a partial frame
             // && (this.serial.readAvailable() === EzspStatus.NO_RX_DATA) // no rx data
-            && this.rxQueue.empty // no rx frames to process
-            && !this.ncpHasCallbacks // no pending callbacks
-            && (this.flags === Flag.CONNECTED) // no pending ACKs, NAKs, etc.
-            && (this.ackTx === this.frmRx) // do not need to send an ACK
-            && (this.ackRx === this.frmTx) // not waiting to receive an ACK
-            && (this.sendState === SendState.IDLE) // nothing being transmitted now
-            && this.txQueue.empty // nothing waiting to transmit
+            this.rxQueue.empty && // no rx frames to process
+            !this.ncpHasCallbacks && // no pending callbacks
+            this.flags === Flag.CONNECTED && // no pending ACKs, NAKs, etc.
+            this.ackTx === this.frmRx && // do not need to send an ACK
+            this.ackRx === this.frmTx && // not waiting to receive an ACK
+            this.sendState === SendState.IDLE && // nothing being transmitted now
+            this.txQueue.empty // nothing waiting to transmit
         // && this.serial.outputIsIdle()          // nothing in OS buffers or UART FIFO
         );
     }
@@ -271,14 +271,14 @@ class UartAsh extends stream_1.EventEmitter {
         this.encodeCount = 0;
         this.encodeState = 0;
         this.encodeEscFlag = false;
-        this.encodeCrc = 0xFFFF;
+        this.encodeCrc = 0xffff;
         this.txOffset = 0;
         // init to "start of frame" default
         this.decodeLen = 0;
         this.decodeByte1 = 0;
         this.decodeByte2 = 0;
         this.decodeFlip = 0;
-        this.decodeCrc = 0xFFFF;
+        this.decodeCrc = 0xffff;
         this.ncpError = enums_1.EzspStatus.NO_ERROR;
         this.hostError = enums_1.EzspStatus.NO_ERROR;
         this.sendState = SendState.IDLE;
@@ -329,12 +329,12 @@ class UartAsh extends stream_1.EventEmitter {
         this.reTxQueue.tail = null;
         this.txFree.link = null;
         for (let i = 0; i < consts_1.TX_POOL_BUFFERS; i++) {
-            this.txFree.freeBuffer(this.txPool[i] = new queues_1.EzspBuffer());
+            this.txFree.freeBuffer((this.txPool[i] = new queues_1.EzspBuffer()));
         }
         this.rxQueue.tail = null;
         this.rxFree.link = null;
         for (let i = 0; i < consts_1.EZSP_HOST_RX_POOL_SIZE; i++) {
-            this.rxFree.freeBuffer(this.rxPool[i] = new queues_1.EzspBuffer());
+            this.rxFree.freeBuffer((this.rxPool[i] = new queues_1.EzspBuffer()));
         }
     }
     /**
@@ -402,7 +402,7 @@ class UartAsh extends stream_1.EventEmitter {
                 this.socketPort.on('connect', () => {
                     logger_1.logger.debug(`Socket connected`, NS);
                 });
-                this.socketPort.on('ready', async () => {
+                this.socketPort.on('ready', () => {
                     logger_1.logger.info(`Socket ready`, NS);
                     this.socketPort.removeListener('error', openError);
                     this.socketPort.once('close', this.onPortClose.bind(this));
@@ -457,7 +457,8 @@ class UartAsh extends stream_1.EventEmitter {
             return;
         }
         const status = this.receiveFrame(buffer);
-        if ((status !== enums_1.EzspStatus.SUCCESS) && (status !== enums_1.EzspStatus.ASH_IN_PROGRESS) && (status !== enums_1.EzspStatus.NO_RX_DATA)) {
+        setImmediate(this.sendExec.bind(this)); // always trigger to cover all cases (also triggered in Ezsp layer when a DATA frame is emitted)
+        if (status !== enums_1.EzspStatus.SUCCESS && status !== enums_1.EzspStatus.ASH_IN_PROGRESS && status !== enums_1.EzspStatus.NO_RX_DATA) {
             logger_1.logger.error(`Error while parsing received frame, status=${enums_1.EzspStatus[status]}.`, NS);
             this.emit(AshEvents.FATAL_ERROR, enums_1.EzspStatus.HOST_FATAL_ERROR);
             return;
@@ -472,7 +473,7 @@ class UartAsh extends stream_1.EventEmitter {
      * - EzspStatus.ASH_NCP_FATAL_ERROR)
      */
     async start() {
-        if (!this.portOpen || (this.flags & Flag.CONNECTED)) {
+        if (!this.portOpen || this.flags & Flag.CONNECTED) {
             return enums_1.EzspStatus.ERROR_INVALID_CALL;
         }
         logger_1.logger.info(`======== ASH starting ========`, NS);
@@ -491,11 +492,11 @@ class UartAsh extends stream_1.EventEmitter {
         // NOTE: on average, this seems to take around 1000ms when successful
         for (let i = 0; i < CONFIG_TIME_RST; i += CONFIG_TIME_RST_CHECK) {
             this.sendExec();
-            if ((this.flags & Flag.CONNECTED)) {
+            if (this.flags & Flag.CONNECTED) {
                 logger_1.logger.info(`======== ASH started ========`, NS);
                 return enums_1.EzspStatus.SUCCESS;
             }
-            else if ((this.hostError !== enums_1.EzspStatus.NO_ERROR) || (this.ncpError !== enums_1.EzspStatus.NO_ERROR)) {
+            else if (this.hostError !== enums_1.EzspStatus.NO_ERROR || this.ncpError !== enums_1.EzspStatus.NO_ERROR) {
                 // don't wait for inevitable fail, bail early, let retry logic in EZSP layer do its thing
                 break;
             }
@@ -547,7 +548,7 @@ class UartAsh extends stream_1.EventEmitter {
         if (this.closing) {
             return enums_1.EzspStatus.ERROR_INVALID_CALL;
         }
-        logger_1.logger.info(`======== ASH NCP reset ========`, NS);
+        logger_1.logger.info(`======== ASH Adapter reset ========`, NS);
         this.initVariables();
         let status;
         // ask ncp to reset itself using RST frame
@@ -622,11 +623,12 @@ class UartAsh extends stream_1.EventEmitter {
         // Check for received acknowledgement timer expiry
         if (this.ackTimerHasExpired()) {
             if (this.flags & Flag.CONNECTED) {
-                const expectedFrm = ((this.flags & Flag.RETX) ? this.frmReTx : this.frmTx);
+                const reTx = this.flags & Flag.RETX;
+                const expectedFrm = reTx ? this.frmReTx : this.frmTx;
                 if (this.ackRx !== expectedFrm) {
                     this.counters.rxAckTimeouts += 1;
                     this.adjustAckPeriod(true);
-                    logger_1.logger.debug(`Timer expired waiting for ACK for ${expectedFrm}, current=${this.ackRx}`, NS);
+                    logger_1.logger.debug(`Timer expired waiting for ACK for ${reTx ? 'frmReTx' : 'frmTx'}=${expectedFrm}, ackRx=${this.ackRx}`, NS);
                     if (++this.timeouts >= consts_1.ASH_MAX_TIMEOUTS) {
                         this.hostDisconnect(enums_1.EzspStatus.ASH_ERROR_TIMEOUTS);
                         return;
@@ -689,12 +691,12 @@ class UartAsh extends stream_1.EventEmitter {
                         if (this.flags & Flag.NAK) {
                             this.txSHBuffer[0] = enums_2.AshFrameType.NAK + (this.frmRx << consts_1.ASH_ACKNUM_BIT);
                             this.flags &= ~(Flag.NRTX | Flag.NAK | Flag.ACK);
-                            logger_1.logger.debug(`---> [FRAME type=NAK frmRx=${this.frmRx}]`, NS);
+                            logger_1.logger.debug(`---> [FRAME type=NAK frmRx=${this.frmRx}](ackRx=${this.ackRx})`, NS);
                         }
                         else {
                             this.txSHBuffer[0] = enums_2.AshFrameType.ACK + (this.frmRx << consts_1.ASH_ACKNUM_BIT);
                             this.flags &= ~(Flag.NRTX | Flag.ACK);
-                            logger_1.logger.debug(`---> [FRAME type=ACK frmRx=${this.frmRx}]`, NS);
+                            logger_1.logger.debug(`---> [FRAME type=ACK frmRx=${this.frmRx}](ackRx=${this.ackRx})`, NS);
                         }
                         if (this.flags & Flag.NR) {
                             this.txSHBuffer[0] |= consts_1.ASH_NFLAG_MASK;
@@ -711,21 +713,21 @@ class UartAsh extends stream_1.EventEmitter {
                         len = buffer.len + 1;
                         this.txSHBuffer[0] = enums_2.AshFrameType.DATA | (this.frmReTx << consts_1.ASH_FRMNUM_BIT) | (this.frmRx << consts_1.ASH_ACKNUM_BIT) | consts_1.ASH_RFLAG_MASK;
                         this.sendState = SendState.RETX_DATA;
-                        logger_1.logger.debug(`---> [FRAME type=DATA_RETX frmReTx=${this.frmReTx} frmRx=${this.frmRx}]`, NS);
+                        logger_1.logger.debug(`---> [FRAME type=DATA_RETX frmReTx=${this.frmReTx} frmRx=${this.frmRx}](ackRx=${this.ackRx} frmTx=${this.frmTx})`, NS);
                     }
                     else if (this.ackTx != this.frmRx) {
                         // An ACK should be generated
                         this.flags |= Flag.ACK;
                         break;
                     }
-                    else if (!this.txQueue.empty && (0, math_1.withinRange)(this.ackRx, this.frmTx, (this.ackRx + CONFIG_TX_K - 1))) {
+                    else if (!this.txQueue.empty && (0, math_1.withinRange)(this.ackRx, this.frmTx, this.ackRx + CONFIG_TX_K - 1)) {
                         // Send a DATA frame if ready
                         buffer = this.txQueue.head;
                         len = buffer.len + 1;
-                        this.counters.txData += (len - 1);
+                        this.counters.txData += len - 1;
                         this.txSHBuffer[0] = enums_2.AshFrameType.DATA | (this.frmTx << consts_1.ASH_FRMNUM_BIT) | (this.frmRx << consts_1.ASH_ACKNUM_BIT);
                         this.sendState = SendState.TX_DATA;
-                        logger_1.logger.debug(`---> [FRAME type=DATA frmTx=${this.frmTx} frmRx=${this.frmRx}]`, NS);
+                        logger_1.logger.debug(`---> [FRAME type=DATA frmTx=${this.frmTx} frmRx=${this.frmRx}](ackRx=${this.ackRx})`, NS);
                     }
                     else {
                         // Otherwise there's nothing to send
@@ -739,7 +741,7 @@ class UartAsh extends stream_1.EventEmitter {
                     break;
                 case SendState.SHFRAME:
                     // sending short frame
-                    if (this.txOffset !== 0xFF) {
+                    if (this.txOffset !== 0xff) {
                         inByte = this.txSHBuffer[this.txOffset];
                         outByte = this.encodeByte(0, inByte);
                         this.writer.writeByte(outByte);
@@ -751,7 +753,7 @@ class UartAsh extends stream_1.EventEmitter {
                 case SendState.TX_DATA:
                 case SendState.RETX_DATA:
                     // sending OR resending data frame
-                    if (this.txOffset !== 0xFF) {
+                    if (this.txOffset !== 0xff) {
                         inByte = this.txOffset ? buffer.data[this.txOffset - 1] : this.txSHBuffer[0];
                         outByte = this.encodeByte(0, inByte);
                         this.writer.writeByte(outByte);
@@ -843,7 +845,7 @@ class UartAsh extends stream_1.EventEmitter {
         //    DATA frame, and not in the CONNECTED state
         //    not a DATA frame
         if (frameType === enums_2.AshFrameType.DATA) {
-            if (!(this.flags & Flag.CONNECTED) || (ashGetFrmNum(this.rxSHBuffer[0]) !== this.frmRx)) {
+            if (!(this.flags & Flag.CONNECTED) || ashGetFrmNum(this.rxSHBuffer[0]) !== this.frmRx) {
                 this.freeNonNullRxBuffer();
             }
         }
@@ -875,15 +877,15 @@ class UartAsh extends stream_1.EventEmitter {
                 return enums_1.EzspStatus.SUCCESS;
             }
             else if (frameType === enums_2.AshFrameType.ERROR) {
-                logger_1.logger.error(`Received ERROR from NCP while connecting, with code=${enums_2.NcpFailedCode[this.rxSHBuffer[2]]}.`, NS);
+                logger_1.logger.error(`Received ERROR from adapter while connecting, with code=${enums_2.NcpFailedCode[this.rxSHBuffer[2]]}.`, NS);
                 return this.ncpDisconnect(enums_1.EzspStatus.ASH_NCP_FATAL_ERROR);
             }
             return enums_1.EzspStatus.ASH_IN_PROGRESS;
         }
         // Connected - process the ackNum in ACK, NAK and DATA frames
-        if ((frameType === enums_2.AshFrameType.DATA) || (frameType === enums_2.AshFrameType.ACK) || (frameType === enums_2.AshFrameType.NAK)) {
+        if (frameType === enums_2.AshFrameType.DATA || frameType === enums_2.AshFrameType.ACK || frameType === enums_2.AshFrameType.NAK) {
             ackNum = ashGetACKNum(this.rxSHBuffer[0]);
-            logger_1.logger.debug(`<--- [FRAME type=${frameTypeStr} ackNum=${ackNum}]`, NS);
+            logger_1.logger.debug(`<--- [FRAME type=${frameTypeStr} ackNum=${ackNum}](ackRx=${this.ackRx} frmTx=${this.frmTx})`, NS);
             if (!(0, math_1.withinRange)(this.ackRx, ackNum, this.frmTx)) {
                 this.counters.rxBadAckNumber += 1;
                 logger_1.logger.debug(`<-x- [FRAME type=${frameTypeStr} ackNum=${ackNum}] Invalid ACK num; not within <${this.ackRx}-${this.frmTx}>`, NS);
@@ -914,7 +916,7 @@ class UartAsh extends stream_1.EventEmitter {
         switch (frameType) {
             case enums_2.AshFrameType.DATA:
                 frmNum = ashGetFrmNum(this.rxSHBuffer[0]);
-                const frameStr = `[FRAME type=${frameTypeStr} ackNum=${ackNum} frmNum=${frmNum}]`;
+                const frameStr = `[FRAME type=${frameTypeStr} ackNum=${ackNum} frmNum=${frmNum}](frmRx=${this.frmRx})`;
                 if (frmNum === this.frmRx) {
                     // is frame in sequence?
                     if (this.rxDataBuffer == null) {
@@ -934,9 +936,7 @@ class UartAsh extends stream_1.EventEmitter {
                     this.rxQueue.addTail(this.rxDataBuffer); // add frame to receive queue
                     logger_1.logger.debug(`<--- ${frameStr} Added to rxQueue`, NS);
                     this.counters.rxData += this.rxDataBuffer.len;
-                    setImmediate(() => {
-                        this.emit(AshEvents.FRAME);
-                    });
+                    setImmediate(() => this.emit(AshEvents.FRAME));
                     return enums_1.EzspStatus.SUCCESS;
                 }
                 else {
@@ -965,12 +965,12 @@ class UartAsh extends stream_1.EventEmitter {
                 break;
             case enums_2.AshFrameType.RSTACK:
                 // unexpected ncp reset
-                logger_1.logger.error(`Received unexpected reset from NCP, with reason=${enums_2.NcpFailedCode[this.rxSHBuffer[2]]}.`, NS);
+                logger_1.logger.error(`Received unexpected reset from adapter, with reason=${enums_2.NcpFailedCode[this.rxSHBuffer[2]]}.`, NS);
                 this.ncpError = enums_1.EzspStatus.ASH_NCP_FATAL_ERROR;
                 return this.hostDisconnect(enums_1.EzspStatus.ASH_ERROR_NCP_RESET);
             case enums_2.AshFrameType.ERROR:
                 // ncp error
-                logger_1.logger.error(`Received ERROR from NCP, with code=${enums_2.NcpFailedCode[this.rxSHBuffer[2]]}.`, NS);
+                logger_1.logger.error(`Received ERROR from adapter, with code=${enums_2.NcpFailedCode[this.rxSHBuffer[2]]}.`, NS);
                 return this.ncpDisconnect(enums_1.EzspStatus.ASH_NCP_FATAL_ERROR);
             case enums_2.AshFrameType.INVALID:
                 // reject invalid frames
@@ -985,9 +985,8 @@ class UartAsh extends stream_1.EventEmitter {
      * then send a NAK and set the reject condition.
      */
     rejectFrame() {
-        if (((this.rxSHBuffer[0] & consts_1.ASH_DFRAME_MASK) === enums_2.AshFrameType.DATA)
-            && ((this.flags & (Flag.REJ | Flag.CONNECTED)) === Flag.CONNECTED)) {
-            this.flags |= (Flag.REJ | Flag.NAK);
+        if ((this.rxSHBuffer[0] & consts_1.ASH_DFRAME_MASK) === enums_2.AshFrameType.DATA && (this.flags & (Flag.REJ | Flag.CONNECTED)) === Flag.CONNECTED) {
+            this.flags |= Flag.REJ | Flag.NAK;
         }
     }
     /**
@@ -1005,7 +1004,7 @@ class UartAsh extends stream_1.EventEmitter {
         }
         for (const inByte of buffer) {
             // 0xFF byte signals a callback is pending when between frames in synchronous (polled) callback mode.
-            if (!this.decodeInProgress && (inByte === consts_1.ASH_WAKE)) {
+            if (!this.decodeInProgress && inByte === consts_1.ASH_WAKE) {
                 if (this.ncpSleepEnabled) {
                     this.ncpHasCallbacks = true;
                 }
@@ -1017,7 +1016,7 @@ class UartAsh extends stream_1.EventEmitter {
             index = this.rxLen;
             [status, outByte, this.rxLen] = this.decodeByte(inByte, outByte, this.rxLen);
             // discard an invalid frame
-            if ((status !== enums_1.EzspStatus.ASH_IN_PROGRESS) && (status !== enums_1.EzspStatus.SUCCESS)) {
+            if (status !== enums_1.EzspStatus.ASH_IN_PROGRESS && status !== enums_1.EzspStatus.SUCCESS) {
                 this.freeNonNullRxBuffer();
                 break;
             }
@@ -1031,7 +1030,7 @@ class UartAsh extends stream_1.EventEmitter {
                     // if a longer DATA frame, allocate an EzspBuffer for it.
                     // (Note the control byte is always returned in shRxBuffer[0].
                     // Even if no buffer can be allocated, the control's ackNum must be processed.)
-                    if (this.rxLen === (consts_1.SH_RX_BUFFER_LEN + 1)) {
+                    if (this.rxLen === consts_1.SH_RX_BUFFER_LEN + 1) {
                         // alloc buffer, copy prior data
                         this.rxDataBuffer = this.rxFree.allocBuffer();
                         if (this.rxDataBuffer !== null) {
@@ -1078,10 +1077,10 @@ class UartAsh extends stream_1.EventEmitter {
      * If not already retransmitting, and there are unacked frames, start retransmitting after the last frame that was acked.
      */
     startRetransmission() {
-        if (!(this.flags & Flag.RETX) && (this.ackRx != this.frmTx)) {
+        if (!(this.flags & Flag.RETX) && this.ackRx != this.frmTx) {
             this.stopAckTimer();
             this.frmReTx = this.ackRx;
-            this.flags |= (Flag.RETX | Flag.CAN);
+            this.flags |= Flag.RETX | Flag.CAN;
         }
     }
     /**
@@ -1094,7 +1093,7 @@ class UartAsh extends stream_1.EventEmitter {
             // Set/clear NR flag based on the number of buffers free
             if (this.rxFree.length < CONFIG_NR_LOW_LIMIT) {
                 this.flags |= Flag.NR;
-                logger_1.logger.warning(`NOT READY - Signaling NCP`, NS);
+                logger_1.logger.warning(`NOT READY - Signaling adapter`, NS);
             }
             else if (this.rxFree.length > CONFIG_NR_HIGH_LIMIT) {
                 this.flags &= ~Flag.NR;
@@ -1129,7 +1128,7 @@ class UartAsh extends stream_1.EventEmitter {
     hostDisconnect(error) {
         this.flags = 0;
         this.hostError = error;
-        logger_1.logger.error(`ASH disconnected: ${enums_1.EzspStatus[error]} | NCP status: ${enums_1.EzspStatus[this.ncpError]}`, NS);
+        logger_1.logger.error(`ASH disconnected: ${enums_1.EzspStatus[error]} | Adapter status: ${enums_1.EzspStatus[this.ncpError]}`, NS);
         return enums_1.EzspStatus.HOST_FATAL_ERROR;
     }
     /**
@@ -1140,7 +1139,7 @@ class UartAsh extends stream_1.EventEmitter {
     ncpDisconnect(error) {
         this.flags = 0;
         this.ncpError = error;
-        logger_1.logger.error(`ASH disconnected | NCP status: ${enums_1.EzspStatus[this.ncpError]}`, NS);
+        logger_1.logger.error(`ASH disconnected | Adapter status: ${enums_1.EzspStatus[this.ncpError]}`, NS);
         return enums_1.EzspStatus.ASH_NCP_FATAL_ERROR;
     }
     /**
@@ -1175,7 +1174,7 @@ class UartAsh extends stream_1.EventEmitter {
         while (len--) {
             // *buf++ ^= seed;
             buf[outIdx++] ^= seed;
-            seed = (seed & 1) ? ((seed >> 1) ^ consts_1.LFSR_POLY) : (seed >> 1);
+            seed = seed & 1 ? (seed >> 1) ^ consts_1.LFSR_POLY : seed >> 1;
         }
         return seed;
     }
@@ -1233,7 +1232,7 @@ class UartAsh extends stream_1.EventEmitter {
             this.txOffset = 0;
             this.encodeState = 0;
             this.encodeEscFlag = false;
-            this.encodeCrc = 0xFFFF;
+            this.encodeCrc = 0xffff;
         }
         // was an escape last time?
         if (this.encodeEscFlag) {
@@ -1260,9 +1259,9 @@ class UartAsh extends stream_1.EventEmitter {
         else if (this.encodeState === 2) {
             // CRC low byte
             this.encodeState = 3;
-            return this.encodeStuffByte(this.encodeCrc & 0xFF);
+            return this.encodeStuffByte(this.encodeCrc & 0xff);
         }
-        this.txOffset = 0xFF;
+        this.txOffset = 0xff;
         return enums_2.AshReservedByte.FLAG;
     }
     /**
@@ -1303,7 +1302,7 @@ class UartAsh extends stream_1.EventEmitter {
             this.decodeByte1 = 0;
             this.decodeByte2 = 0;
             this.decodeFlip = 0;
-            this.decodeCrc = 0xFFFF;
+            this.decodeCrc = 0xffff;
         }
         switch (byte) {
             case enums_2.AshReservedByte.FLAG:
@@ -1313,10 +1312,10 @@ class UartAsh extends stream_1.EventEmitter {
                     this.decodeFlip = 0; // ignore isolated data escape between flags
                     break;
                 }
-                else if (this.decodeLen === 0xFF) {
+                else if (this.decodeLen === 0xff) {
                     status = enums_1.EzspStatus.ASH_COMM_ERROR;
                 }
-                else if (this.decodeCrc !== ((this.decodeByte2 << 8) + this.decodeByte1)) {
+                else if (this.decodeCrc !== (this.decodeByte2 << 8) + this.decodeByte1) {
                     status = enums_1.EzspStatus.ASH_BAD_CRC;
                 }
                 else if (this.decodeLen < consts_1.ASH_MIN_FRAME_WITH_CRC_LEN) {
@@ -1339,7 +1338,7 @@ class UartAsh extends stream_1.EventEmitter {
                 break;
             case enums_2.AshReservedByte.SUBSTITUTE:
                 // discard remainder of frame
-                this.decodeLen = 0xFF; // special value flags low level comm error
+                this.decodeLen = 0xff; // special value flags low level comm error
                 break;
             case enums_2.AshReservedByte.XON:
             case enums_2.AshReservedByte.XOFF:
@@ -1372,7 +1371,7 @@ class UartAsh extends stream_1.EventEmitter {
                 this.decodeByte1 = byte;
                 break;
         }
-        this.decodeInProgress = (status === enums_1.EzspStatus.ASH_IN_PROGRESS);
+        this.decodeInProgress = status === enums_1.EzspStatus.ASH_IN_PROGRESS;
         return [status, inByte, inLen];
     }
     /**
@@ -1383,7 +1382,7 @@ class UartAsh extends stream_1.EventEmitter {
      * On the NCP, if this times out the NCP resumes sending callbacks.
      */
     startNrTimer() {
-        this.nrTimer = (Date.now() + CONFIG_NR_TIME);
+        this.nrTimer = Date.now() + CONFIG_NR_TIME;
     }
     /**
      * Stop Not Ready timer (set to 0).
@@ -1398,11 +1397,11 @@ class UartAsh extends stream_1.EventEmitter {
      */
     nrTimerHasExpired() {
         if (this.nrTimer) {
-            if ((Date.now() - this.nrTimer) >= 0) {
+            if (Date.now() - this.nrTimer >= 0) {
                 this.nrTimer = 0;
             }
         }
-        return (!this.nrTimer);
+        return !this.nrTimer;
     }
     /**
      * Indicates whether or not Not Ready timer is currently running.
@@ -1456,7 +1455,7 @@ class UartAsh extends stream_1.EventEmitter {
             temp = (temp << 3) - temp;
             temp += lastAckTime << 2;
             temp >>= 3;
-            this.ackPeriod = (temp & 0xFFFF);
+            this.ackPeriod = temp & 0xffff;
         }
         // keep ackPeriod within limits
         if (this.ackPeriod > CONFIG_ACK_TIME_MAX) {
@@ -1491,7 +1490,7 @@ class UartAsh extends stream_1.EventEmitter {
             return false;
         }
         // return ((halCommonGetInt16uMillisecondTick() - this.ackTimer) >= this.ackPeriod);
-        return ((Date.now() - this.ackTimer) >= this.ackPeriod);
+        return Date.now() - this.ackTimer >= this.ackPeriod;
     }
     /**
      * Indicates whether or not ACK Timer is currently running (!= 0).