nodejs-poolcontroller 7.7.0 → 8.0.1

package/controller/comms/messages/Messages.ts

@@ -1,5 +1,6 @@
 /*  nodejs-poolController.  An application to control pool equipment.
-Copyright (C) 2016, 2017, 2018, 2019, 2020.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
+Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022.  
+Russell Goldin, tagyoureit.  russ.goldin@gmail.com
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as
@@ -42,8 +43,10 @@ import { TouchScheduleCommands } from "controller/boards/EasyTouchBoard";
 import { IntelliValveStateMessage } from "./status/IntelliValveStateMessage";
 import { IntelliChemStateMessage } from "./status/IntelliChemStateMessage";
 import { OutboundMessageError } from "../../Errors";
-import { prototype } from "events";
+import { conn } from "../Comms"
 import extend = require("extend");
+import { MessagesMock } from "../../../anslq25/MessagesMock";
+
 export enum Direction {
     In = 'in',
     Out = 'out'
@@ -70,7 +73,10 @@ export class Message {
     private _id: number = -1;
     // Fields
     private static _messageId: number = 0;
-    public static get nextMessageId(): number { return this._messageId < 80000 ? ++this._messageId : this._messageId = 0; }
+    public static get nextMessageId(): number { 
+        let i = this._messageId < 80000 ? ++this._messageId : this._messageId = 0;
+        logger.debug(`Assigning message id ${i}`)
+        return i; }
     public portId = 0; // This will be the target or source port for the message.  If this is from or to an Aux RS485 port the value will be > 0.
     public timestamp: Date = new Date();
     public direction: Direction = Direction.In;
@@ -85,18 +91,19 @@ export class Message {
     public set id(val: number) { this._id = val; }
     public isValid: boolean = true;
     public scope: string;
+    public isClone: boolean;
     // Properties
     public get isComplete(): boolean { return this._complete; }
     public get sub(): number { return this.header.length > 1 ? this.header[1] : -1; }
     public get dest(): number {
         if (this.header.length > 2) {
             if (this.protocol === Protocol.Chlorinator || this.protocol === Protocol.AquaLink) {
-                return this.header.length > 2 ? (this.header[2] >= 80 ? this.header[2] - 79 : 0) : -1;
+                return this.header.length > 2 ? (this.header[2] >= 80 ? this.header[2] : 0) : -1;
             }
             else if (this.protocol === Protocol.Hayward) {
                 //            src   act   dest             
                 //0x10, 0x02, 0x00, 0x0C, 0x00, 0x00, 0x2D, 0x02, 0x36, 0x00, 0x83, 0x10, 0x03 -- Response from pump
-                return this.header.length > 4 ? this.header[4] : -1;
+                return this.header.length > 4 ? this.header[2] : -1;
             }
             else return this.header.length > 2 ? this.header[2] : -1;
         }
@@ -104,7 +111,7 @@ export class Message {
     }
     public get source(): number {
         if (this.protocol === Protocol.Chlorinator) {
-            return this.header.length > 2 ? (this.header[2] >= 80 ? 0 : 1) : -1;
+            return this.header.length > 2 ? (this.header[2] >= 80 ? 0 : this.header[2]) : -1;
             // have to assume incoming packets with header[2] >= 80 (sent to a chlorinator)
             // are from controller (0);
             // likewise, if the destination is 0 (controller) we
@@ -119,19 +126,20 @@ export class Message {
             //            src   act   dest             
             //0x10, 0x02, 0x00, 0x0C, 0x00, 0x00, 0x2D, 0x02, 0x36, 0x00, 0x83, 0x10, 0x03 -- Response from pump
             //0x10, 0x02, 0x0C, 0x01, 0x02, 0x2D, 0x00, 0x4E, 0x10, 0x03 -- Command to AUX2 Pump
-            return this.header.length > 2 ? this.header[2] : -1;
+            return this.header.length > 4 ? this.header[4] : -1;
         }
         if (this.header.length > 3) return this.header[3];
         else return -1;
     }
     public get action(): number {
         // The action byte is actually the 4th byte in the header the destination address is the 5th byte.
-        if (this.protocol === Protocol.Chlorinator || this.protocol === Protocol.AquaLink) return this.header.length > 3 ? this.header[3] : -1;
+        if (this.protocol === Protocol.Chlorinator ||
+            this.protocol === Protocol.AquaLink) return this.header.length > 3 ? this.header[3] : -1;
         else if (this.protocol === Protocol.Hayward) {
             //            src   act   dest             
             //0x10, 0x02, 0x00, 0x0C, 0x00, 0x00, 0x2D, 0x02, 0x36, 0x00, 0x83, 0x10, 0x03 -- Response from pump
             //0x10, 0x02, 0x0C, 0x01, 0x02, 0x2D, 0x00, 0x4E, 0x10, 0x03 -- Command to AUX2 Pump
-            this.header.length > 3 ? this.header[3] : -1;
+            return this.header.length > 3 ? this.header[3] || this.header[2] : -1;
         }
         if (this.header.length > 4) return this.header[4];
         else return -1;
@@ -164,7 +172,59 @@ export class Message {
         return pkt;
     }
     public toLog(): string {
-        return `{"port":${this.portId},"id":${ this.id },"valid":${ this.isValid },"dir":"${this.direction}","proto":"${this.protocol}","pkt":[${JSON.stringify(this.padding)},${JSON.stringify(this.preamble)}, ${JSON.stringify(this.header)}, ${JSON.stringify(this.payload)},${JSON.stringify(this.term)}],"ts":"${Timestamp.toISOLocal(this.timestamp)}"}`;
+        return `{"port":${this.portId},"id":${this.id},"valid":${this.isValid},"dir":"${this.direction}","proto":"${this.protocol}","pkt":[${JSON.stringify(this.padding)},${JSON.stringify(this.preamble)}, ${JSON.stringify(this.header)}, ${JSON.stringify(this.payload)},${JSON.stringify(this.term)}],"ts":"${Timestamp.toISOLocal(this.timestamp)}"}`;
+    }
+    public static convertOutboundToInbound(out: Outbound): Inbound {
+        let inbound = new Inbound();
+        inbound.portId = out.portId;
+        // inbound.id = Message.nextMessageId;
+        inbound.protocol = out.protocol;
+        inbound.scope = out.scope;
+        inbound.preamble = out.preamble;
+        inbound.padding = out.padding;
+        inbound.header = out.header;
+        inbound.payload = [...out.payload];
+        inbound.term = out.term;
+        inbound.portId = out.portId;
+        return inbound;
+    }
+    public static convertInboundToOutbound(inbound: Inbound): Outbound {
+        let out = new Outbound(
+            inbound.protocol,
+            inbound.source,
+            inbound.dest,
+            inbound.action,
+            inbound.payload,
+        );
+        out.scope = inbound.scope;
+        out.preamble = inbound.preamble;
+        out.padding = inbound.padding;
+        out.header = inbound.header;
+        out.term = inbound.term;
+        out.portId = inbound.portId;
+        return out;
+    }
+    public clone(): Inbound | Outbound {
+        let msg;
+        if (this instanceof Inbound) {
+            msg = new Inbound();
+            msg.id = Message.nextMessageId;
+            msg.scope = this.scope;
+            msg.preamble = this.preamble;
+            msg.padding = this.padding;
+            msg.payload = [...this.payload];
+            msg.header = this.header;
+            msg.term = this.term;
+            msg.portId = this.portId;
+        }
+        else {
+            msg = new Outbound(
+                this.protocol, this.source, this.dest, this.action, [...this.payload], 
+            );
+            msg.portId = this.portId;
+            msg.scope = this.scope;
+        }
+        return msg;
     }
 }
 export class Inbound extends Message {
@@ -194,7 +254,7 @@ export class Inbound extends Message {
     }
     public toLog() {
         if (this.responseFor.length > 0)
-            return `{"port":${this.portId || 0},"id":${this.id},"valid":${this.isValid},"dir":"${ this.direction }","proto":"${ this.protocol }","for":${JSON.stringify(this.responseFor)},"pkt":[${JSON.stringify(this.padding)},${JSON.stringify(this.preamble)},${JSON.stringify(this.header)},${JSON.stringify(this.payload)},${JSON.stringify(this.term)}],"ts": "${ Timestamp.toISOLocal(this.timestamp) }"}`;
+            return `{"port":${this.portId || 0},"id":${this.id},"valid":${this.isValid},"dir":"${this.direction}","proto":"${this.protocol}","for":${JSON.stringify(this.responseFor)},"pkt":[${JSON.stringify(this.padding)},${JSON.stringify(this.preamble)},${JSON.stringify(this.header)},${JSON.stringify(this.payload)},${JSON.stringify(this.term)}],"ts": "${Timestamp.toISOLocal(this.timestamp)}"}`;
         return `{"port":${this.portId || 0},"id":${this.id},"valid":${this.isValid},"dir":"${this.direction}","proto":"${this.protocol}","pkt":[${JSON.stringify(this.padding)},${JSON.stringify(this.preamble)},${JSON.stringify(this.header)},${JSON.stringify(this.payload)},${JSON.stringify(this.term)}],"ts": "${Timestamp.toISOLocal(this.timestamp)}"}`;
     }
     private testChlorHeader(bytes: number[], ndx: number): boolean {
@@ -202,22 +262,74 @@ export class Inbound extends Message {
         // prev been detected as chlor packets;
         // valid chlor packets should have 16,2,0 or 16,2,[80-96];
         // this should reduce the number of false chlor packets
-        return (ndx + 3 < bytes.length && bytes[ndx] === 16 && bytes[ndx + 1] === 2 && (bytes[ndx + 2] === 0 || (bytes[ndx + 2] >= 80 && bytes[ndx + 2] <= 96)))
+        // For any of these 16,2 type headers we need at least 5 bytes to determine the routing.
+        //63,15,16,2,29,9,36,0,0,0,0,0,16,0,32,0,0,2,0,75,75,32,241,80,85,24,241,16,16,48,245,69,45,100,186,16,2,80,17,0,115,16,3
+        if (bytes.length > ndx + 4) {
+            if (bytes[ndx] === 16 && bytes[ndx + 1] === 2) {
+                let dst = bytes[ndx + 2];
+                let act = bytes[ndx + 3];
+                // For now the dst byte will always be 0 or 80.
+                if (![0, 16, 80, 81, 82, 83].includes(dst)) {
+                    //logger.info(`Sensed chlorinator header but the dst byte is ${dst}`);
+                    return false;
+                }
+                else if (dst === 0 && [1, 18, 3].includes(act))
+                    return true;
+                else if (![0, 17, 19, 20, 21, 22].includes(act)) {
+                    //logger.info(`Sensed out chlorinator header but the dst byte is ${dst} ${act} ${JSON.stringify(bytes)}`);
+                    return false;
+                }
+                return true;
+            }
+        }
+        return false;
     }
     private testAquaLinkHeader(bytes: number[], ndx: number): boolean {
-        return (sys.controllerType === 'aqualink' && ndx + 3 < bytes.length && bytes[ndx] === 16 && bytes[ndx + 1] === 2);
+        if (bytes.length > ndx + 4 && sys.controllerType === 'aqualink') {
+            if (bytes[ndx] === 16 && bytes[ndx + 1] === 2) {
+                return true;
+            }
+        }
+        return false;
     }
     private testHaywardHeader(bytes: number[], ndx: number): boolean {
         //0x10, 0x02, 0x0C, 0x01, 0x00, 0x2D, 0x00, 0x4C, 0x10, 0x03 -- Command to pump
+        //[16,2,12,1,0]
         //0x10, 0x02, 0x0C, 0x01, 0x00, 0x2D, 0x00, 0x4C, 0x10, 0x03 -- Command to Filter Pump
+        //[16,2,12,1,0]
         //0x10, 0x02, 0x0C, 0x01, 0x02, 0x2D, 0x00, 0x4E, 0x10, 0x03 -- Command to AUX2 Pump
+        //[16,2,12,1,2]
         //            src   act   dest             
         //0x10, 0x02, 0x00, 0x0C, 0x00, 0x00, 0x2D, 0x02, 0x36, 0x00, 0x83, 0x10, 0x03 -- Response from pump
-        return (sys.controllerType === 'nixie' && ndx + 4 < bytes.length && bytes[ndx] === 16 && bytes[ndx + 1] === 2 && (bytes[ndx + 2] === 12 && bytes[ndx + 3] === 12));
+        //[16,2,0,12,0] --> Response
+        //[16,2,0,12,0]
+        if (bytes.length > ndx + 4) {
+            if (sys.controllerType === 'aqualink') return false;
+            if (bytes[ndx] === 16 && bytes[ndx + 1] === 2) {
+                let dst = bytes[ndx + 3];
+                let src = bytes[ndx + 2];
+                if (dst === 12 || src === 12) return true;
+            }
+        }
+        return false;
+    }
+    private testBroadcastHeader(bytes: number[], ndx: number): boolean {
+        // We are looking for [255,0,255,165]
+        if (bytes.length > ndx + 3) {
+            if (bytes[ndx] === 255 && bytes[ndx + 1] === 0 && bytes[ndx + 2] === 255 && bytes[ndx + 3] === 165) return true;
+            return false;
+        }
+        //return ndx < bytes.length - 3 && bytes[ndx] === 255 && bytes[ndx + 1] === 0 && bytes[ndx + 2] === 255 && bytes[ndx + 3] === 165;
+        return false;
+    }
+    private testUnidentifiedHeader(bytes: number[], ndx: number): boolean {
+        if (bytes.length > ndx + 3) {
+            if (bytes[ndx] === 255 && bytes[ndx + 1] === 0 && bytes[ndx + 2] === 255 && bytes[ndx + 3] !== 165) return true;
+            return false;
+        }
+        //return ndx < bytes.length - 3 && bytes[ndx] === 255 && bytes[ndx + 1] === 0 && bytes[ndx + 2] === 255 && bytes[ndx + 3] !== 165;
+        return false;
     }
-
-    private testBroadcastHeader(bytes: number[], ndx: number): boolean { return ndx < bytes.length - 3 && bytes[ndx] === 255 && bytes[ndx + 1] === 0 && bytes[ndx + 2] === 255 && bytes[ndx + 3] === 165; }
-    private testUnidentifiedHeader(bytes: number[], ndx: number): boolean { return ndx < bytes.length - 3 && bytes[ndx] === 255 && bytes[ndx + 1] === 0 && bytes[ndx + 2] === 255 && bytes[ndx + 3] !== 165; }
     private testChlorTerm(bytes: number[], ndx: number): boolean { return ndx + 2 < bytes.length && bytes[ndx + 1] === 16 && bytes[ndx + 2] === 3; }
     private testAquaLinkTerm(bytes: number[], ndx: number): boolean { return ndx + 2 < bytes.length && bytes[ndx + 1] === 16 && bytes[ndx + 2] === 3; }
     private testHaywardTerm(bytes: number[], ndx: number): boolean { return ndx + 3 < bytes.length && bytes[ndx + 2] === 16 && bytes[ndx + 3] === 3; }
@@ -255,10 +367,11 @@ export class Inbound extends Message {
         //return this.padding.length + this.preamble.length;
     }
     public readPacket(bytes: number[]): number {
+        //logger.info(`BYTES: ${JSON.stringify(bytes)}`);
         var ndx = this.readHeader(bytes, 0);
         if (this.isValid && this.header.length > 0) ndx = this.readPayload(bytes, ndx);
         if (this.isValid && this.header.length > 0) ndx = this.readChecksum(bytes, ndx);
-        //if (this.isComplete && !this.isValid) return this.rewind(bytes, ndx);
+        if (this.isComplete && !this.isValid) return this.rewind(bytes, ndx);
         return ndx;
     }
     public mergeBytes(bytes) {
@@ -271,30 +384,40 @@ export class Inbound extends Message {
     }
     public readHeader(bytes: number[], ndx: number): number {
         // start over to include the padding bytes.
+        //if (this.protocol !== Protocol.Unknown) {
+        //    logger.warn(`${this.protocol} resulted in an empty message header ${JSON.stringify(this.header)}`);
+        //}
         let ndxStart = ndx;
-        while (ndx < bytes.length) {
-            if (this.testChlorHeader(bytes, ndx)) {
-                this.protocol = Protocol.Chlorinator;
-                break;
-            }
-            if (this.testAquaLinkHeader(bytes, ndx)) {
-                this.protocol = Protocol.AquaLink;
-                break;
-            }
-            if (this.testHaywardHeader(bytes, ndx)) {
-                this.protocol = Protocol.Hayward;
-                break;
-            }
-            if (this.testBroadcastHeader(bytes, ndx)) {
-                this.protocol = Protocol.Broadcast;
-                break;
-            }
-            else if (this.testUnidentifiedHeader(bytes, ndx)) {
-                this.protocol = Protocol.Unidentified;
-                break;
+        // RKS: 05-30-22 -- OMG we have not been dealing with short headers.  As a result it was restarting
+        // the header process even after it had identified it.
+        if (this.protocol === Protocol.Unknown) {
+            while (ndx < bytes.length) {
+                if (this.testBroadcastHeader(bytes, ndx)) {
+                    this.protocol = Protocol.Broadcast;
+                    break;
+                }
+                if (this.testUnidentifiedHeader(bytes, ndx)) {
+                    this.protocol = Protocol.Unidentified;
+                    break;
+                }
+                if (this.testChlorHeader(bytes, ndx)) {
+                    this.protocol = Protocol.Chlorinator;
+                    break;
+                }
+                if (this.testAquaLinkHeader(bytes, ndx)) {
+                    this.protocol = Protocol.AquaLink;
+                    break;
+                }
+                if (this.testHaywardHeader(bytes, ndx)) {
+                    this.protocol = Protocol.Hayward;
+                    break;
+                }
+                this.padding.push(bytes[ndx++]);
             }
-            this.padding.push(bytes[ndx++]);
         }
+        // When the code above finds a protocol, ndx will be at the start of that
+        // header.  If it is not identified then it will rewind to the initial
+        // start position until we get more bytes.  This is the default case below.
         let ndxHeader = ndx;
         switch (this.protocol) {
             case Protocol.Pump:
@@ -309,11 +432,11 @@ export class Inbound extends Message {
                     // We actually don't have a complete header yet so just return.
                     // we will pick it up next go around.
                     // logger.debug(`We have an incoming message but the serial port hasn't given a complete header. [${this.padding}][${this.preamble}][${this.header}]`);
+                    //logger.info(`We don't have a complete header ${JSON.stringify(this.header)}`);
                     this.preamble = [];
                     this.header = [];
                     return ndxHeader;
                 }
-
                 if (this.source >= 96 && this.source <= 111) this.protocol = Protocol.Pump;
                 else if (this.dest >= 96 && this.dest <= 111) this.protocol = Protocol.Pump;
                 else if (this.source >= 112 && this.source <= 127) this.protocol = Protocol.Heater;
@@ -323,7 +446,7 @@ export class Inbound extends Message {
                 else if (this.source == 12 || this.dest == 12) this.protocol = Protocol.IntelliValve;
                 if (this.datalen > 75) {
                     //this.isValid = false;
-                    logger.debug(`Broadcast length ${this.datalen} exceeded 75bytes for ${this.protocol} message. Message rewound ${this.header}`);
+                    logger.debug(`Broadcast length ${this.datalen} exceeded 75 bytes for ${this.protocol} message. Message rewound ${this.header}`);
                     this.padding.push(...this.preamble);
                     this.padding.push(...this.header.slice(0, 1));
                     this.preamble = [];
@@ -352,11 +475,11 @@ export class Inbound extends Message {
                 }
                 break;
             case Protocol.Hayward:
-                ndx = this.pushBytes(this.header, bytes, ndx, 4);
+                ndx = this.pushBytes(this.header, bytes, ndx, 5);
                 if (this.header.length < 4) {
                     // We actually don't have a complete header yet so just return.
                     // we will pick it up next go around.
-                    logger.debug(`We have an incoming AquaLink message but the serial port hasn't given a complete header. [${this.padding}][${this.preamble}][${this.header}]`);
+                    logger.debug(`We have an incoming Hayward message but the serial port hasn't given a complete header. [${this.padding}][${this.preamble}][${this.header}]`);
                     this.preamble = [];
                     this.header = [];
                     return ndxHeader;
@@ -401,7 +524,11 @@ export class Inbound extends Message {
             case Protocol.IntelliValve:
             case Protocol.Heater:
             case Protocol.Unidentified:
-                if (this.datalen - this.payload.length <= 0) return ndx; // We don't need any more payload.
+                if (this.datalen - this.payload.length <= 0) {
+                    let buff = bytes.slice(ndx - 1);
+                    //logger.info(`We don't need any more payload ${this.datalen - this.payload.length} ${ndx} ${JSON.stringify(buff)};`);
+                    return ndx; // We don't need any more payload.
+                }
                 ndx = this.pushBytes(this.payload, bytes, ndx, this.datalen - this.payload.length);
                 break;
             case Protocol.Chlorinator:
@@ -586,7 +713,16 @@ export class Inbound extends Message {
                         PumpMessage.process(this);
                         break;
                     case 30:
-                        if (sys.controllerType !== ControllerType.Unknown) OptionsMessage.process(this);
+                        switch (sys.controllerType) {
+                            case ControllerType.Unknown:
+                                break;
+                            case ControllerType.SunTouch:
+                                ScheduleMessage.processSunTouch(this);
+                                break;
+                            default:
+                                OptionsMessage.process(this);
+                                break;
+                        }
                         break;
                     case 22:
                     case 32:
@@ -629,6 +765,9 @@ export class Inbound extends Message {
                     case 147:
                         IntellichemMessage.process(this);
                         break;
+                    case 136:
+                        ExternalMessage.processTouchSetHeatMode(this);
+                        break;
                     default:
                         if (this.action === 109 && this.payload[1] === 3) break;
                         if (this.source === 17 && this.payload[0] === 109) break;
@@ -639,6 +778,13 @@ export class Inbound extends Message {
         }
     }
     public process() {
+        let port = conn.findPortById(this.portId);
+        if (this.portId === sys.anslq25.portId) {
+            return MessagesMock.process(this);
+        }
+        if (port.mock && port.hasAssignedEquipment()){
+            return MessagesMock.process(this);
+        }
         switch (this.protocol) {
             case Protocol.Broadcast:
                 this.processBroadcast();
@@ -674,18 +820,38 @@ class OutboundCommon extends Message {
     public set sub(val: number) { if (this.protocol !== Protocol.Chlorinator && this.protocol !== Protocol.AquaLink) this.header[1] = val; }
     public get sub() { return super.sub; }
     public set dest(val: number) {
-        if (this.protocol === Protocol.Chlorinator) this.header[2] = val + 79;
+        if (this.protocol === Protocol.Chlorinator) this.header[2] = val;
         else if (this.protocol === Protocol.Hayward) this.header[4] = val;
         else this.header[2] = val;
     }
     public get dest() { return super.dest; }
     public set source(val: number) {
-        if (this.protocol === Protocol.Hayward) this.header[2] = val;
-        else if (this.protocol !== Protocol.Chlorinator) this.header[3] = val;
+        switch (this.protocol) {
+            case Protocol.Chlorinator:
+                break;
+            case Protocol.Hayward:
+                this.header[3] = val;
+                break;
+            default:
+                this.header[3] = val;
+                break;
+        }
+        //if (this.protocol === Protocol.Hayward) this.header[2] = val;
+        //else if (this.protocol !== Protocol.Chlorinator) this.header[3] = val;
     }
     public get source() { return super.source; }
     public set action(val: number) {
-        (this.protocol !== Protocol.Chlorinator && this.protocol !== Protocol.Hayward) ? this.header[4] = val : this.header[3] = val;
+        switch (this.protocol) {
+            case Protocol.Chlorinator:
+                this.header[3] = val;
+                break;
+            case Protocol.Hayward:
+                this.header[2] = val;
+                break;
+            default:
+                this.header[4] = val;
+                break;
+        }
     }
     public get action() { return super.action; }
     public set datalen(val: number) { if (this.protocol !== Protocol.Chlorinator && this.protocol !== Protocol.Hayward) this.header[5] = val; }
@@ -705,16 +871,13 @@ class OutboundCommon extends Message {
             case Protocol.Unidentified:
             case Protocol.IntelliChem:
             case Protocol.Heater:
+            case Protocol.Hayward:
                 this.chkHi = Math.floor(sum / 256);
                 this.chkLo = (sum - (super.chkHi * 256));
                 break;
             case Protocol.AquaLink:
             case Protocol.Chlorinator:
-                this.term[0] = sum;
-                break;
-            case Protocol.Hayward:
-                this.chkHi = Math.floor(sum / 256);
-                this.chkLo = (sum - (super.chkHi * 256));
+                this.term[0] = sum % 256;
                 break;
         }
     }
@@ -790,7 +953,9 @@ export class Outbound extends OutboundCommon {
     public static createMessage(action: number, payload: number[], retries?: number, response?: Response | boolean): Outbound {
         return new Outbound(Protocol.Broadcast, sys.board.commandSourceAddress || Message.pluginAddress, sys.board.commandDestAddress || 16, action, payload, retries, response);
     }
-
+    public async sendAsync() {
+        return conn.queueSendMessageAsync(this);
+    }
     // Fields
     public retries: number = 0;
     public tries: number = 0;
@@ -883,11 +1048,11 @@ export class Outbound extends OutboundCommon {
         if (typeof s === 'undefined') s = def;
         let l = typeof len === 'undefined' ? s.length : len;
         let buf = [];
-        for (let i = 0; i < l; l++) {
-            if (i < l) buf.push(s.charCodeAt(i));
-            else buf.push(i);
+        for (let i = 0; i < l; i++) {
+            if (i < s.length) buf.push(s.charCodeAt(i));
+            else buf.push(0);
         }
-        this.payload.splice(start, 0, ...buf);
+        this.payload.splice(start, l, ...buf);
         return this;
     }
     public toPacket(): number[] {
@@ -900,6 +1065,20 @@ export class Outbound extends OutboundCommon {
         pkt.push.apply(pkt, this.term);
         return pkt;
     }
+    public processMock(){
+        // When the port is a mock port, we are no longer sending an
+        // outbound message but converting it to an inbound and
+        // skipping the actual send/receive part of the comms.
+        let inbound = Message.convertOutboundToInbound(this);
+        let port = conn.findPortById(this.portId);
+        if (port.hasAssignedEquipment() || this.portId === sys.anslq25.portId){
+            MessagesMock.process(inbound);
+        }
+        else {
+            inbound.process();
+        }
+    
+    }
 }
 export class Ack extends Outbound {
     constructor(byte: number) {
@@ -951,7 +1130,10 @@ export class Response extends OutboundCommon {
         try {
             if (typeof this.responseBool === 'boolean' && this.responseBool) bresp = this.evalResponse(msgIn, msgOut);
             else return bresp;
-            if (bresp === true && typeof msgOut !== 'undefined') msgIn.responseFor.push(msgOut.id);
+            if (bresp === true && typeof msgOut !== 'undefined') {
+                msgIn.responseFor.push(msgOut.id);
+                logger.silly(`Message in ${msgIn.id} is a response for message out ${msgOut.id}`);
+            }
             return bresp;
         }
         catch (err) { }

package/controller/comms/messages/config/ChlorinatorMessage.ts

@@ -1,5 +1,6 @@
 /*  nodejs-poolController.  An application to control pool equipment.
-Copyright (C) 2016, 2017, 2018, 2019, 2020.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
+Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022.  
+Russell Goldin, tagyoureit.  russ.goldin@gmail.com
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as
@@ -28,7 +29,7 @@ export class ChlorinatorMessage {
                 for (let i = 0; i < 4 && i + 30 < msg.payload.length; i++) {
                     let isActive = msg.extractPayloadByte(i + 22) === 1;
                     chlor = sys.chlorinators.getItemById(chlorId);
-                    //if (chlor.master !== 0) continue; // RSG: probably never need this.  See Touch chlor below.
+                    if (chlor.master !== 0) continue; // RSG: probably never need this.  See Touch chlor below.
                     if (isActive) {
                         chlor = sys.chlorinators.getItemById(chlorId, true);
                         let schlor = state.chlorinators.getItemById(chlor.id, true);
@@ -85,7 +86,7 @@ export class ChlorinatorMessage {
                 // chlorinator.  These should be 0 anyway.
                 schlor.spaSetpoint = chlor.spaSetpoint = msg.extractPayloadByte(0) >> 1;
                 schlor.poolSetpoint = chlor.poolSetpoint = msg.extractPayloadByte(1);
-                chlor.address = chlor.id + 79;
+                chlor.address = msg.dest;
                 schlor.body = chlor.body = sys.equipment.maxBodies >= 1 || sys.equipment.shared === true ? 32 : 0;
             }
             if (typeof chlor.name === 'undefined') schlor.name = chlor.name = msg.extractPayloadString(6, 16);

package/controller/comms/messages/config/CircuitGroupMessage.ts

@@ -1,5 +1,6 @@
 /*  nodejs-poolController.  An application to control pool equipment.
-Copyright (C) 2016, 2017, 2018, 2019, 2020.  Russell Goldin, tagyoureit.  russ.goldin@gmail.com
+Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022.  
+Russell Goldin, tagyoureit.  russ.goldin@gmail.com
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as
@@ -113,7 +114,8 @@ export class CircuitGroupMessage {
             group.nameId = sgroup.nameId = feature.nameId;
             group.type = sgroup.type = sys.board.valueMaps.circuitGroupTypes.getValue('circuit'); 
             group.isActive = _isActive;
-            if (typeof group.showInFeatures === 'undefined') sgroup.showInFeatures = group.showInFeatures = true;
+            if (typeof group.showInFeatures === 'undefined') group.showInFeatures = true;
+            sgroup.showInFeatures = group.showInFeatures;
             let circuits: CircuitGroupCircuitCollection = group.circuits;
             for (let byte = 1; byte <= 7; byte++){
                 let offByte = msg.extractPayloadByte(byte);
@@ -189,6 +191,7 @@ export class CircuitGroupMessage {
             group.isActive = sgroup.isActive = true;
             if (typeof group.showInFeatures === 'undefined') group.showInFeatures = true;
             sgroup.type = group.type;
+            sgroup.showInFeatures = group.showInFeatures;
         }
         state.emitEquipmentChanges();
         msg.isProcessed = true;