nodejs-poolcontroller 8.4.0 → 8.4.1

package/controller/boards/NixieBoard.ts

@@ -33,6 +33,9 @@ const addrsPentairPump = Object.freeze([96, 97, 98, 99, 100, 101, 102, 103, 104,
 const addrsRegalModbusPump = Object.freeze(
     Array.from({ length: ((0xF7 - 0x15) / 2) + 1 }, (_, i) => 0x15 + i * 2)  // Odd numbers fro 0x15 through 0xF7
   );
+const addrsNeptuneModbusPump = Object.freeze(
+    Array.from({ length: 247 }, (_, i) => i + 1) // Modbus slave IDs 1..247
+);
 
 
 export class NixieBoard extends SystemBoard {
@@ -91,6 +94,7 @@ export class NixieBoard extends SystemBoard {
             [7, { name: 'hwrly', desc: 'Hayward Relay VS', hasAddress: false, maxCircuits: 8, maxRelays: 4, maxSpeeds: 8, relays: [{ id: 1, name: 'Step #1' }, { id: 2, name: 'Step #2'}, { id: 3, name: 'Step #3' }, { id: 4, name: 'Pump On' }], addresses: [] }],
             [100, { name: 'sf', desc: 'SuperFlo VS', hasAddress: false, maxCircuits: 8, maxRelays: 4, equipmentMaster: 1, maxSpeeds: 4, relays: [{ id: 1, name: 'Program #1' }, { id: 2, name: 'Program #2' }, { id: 3, name: 'Program #3' }, { id: 4, name: 'Program #4' }], addresses: [] }],
             [200, { name: 'regalmodbus', desc: 'Regal Modbus', minSpeed: 450, maxSpeed: 3450, maxCircuits: 8, hasAddress: true, addresses: addrsRegalModbusPump}],
+            [201, { name: 'neptunemodbus', desc: 'Neptune Modbus', minSpeed: 450, maxSpeed: 3450, maxCircuits: 8, hasAddress: true, addresses: addrsNeptuneModbusPump }],
         ]);
         // RSG - same as systemBoard definition; can delete.
         this.valueMaps.heatModes = new byteValueMap([
@@ -249,7 +253,7 @@ export class NixieBoard extends SystemBoard {
             [64, { name: 'violet', desc: 'Violet', types: ['watercolors'], sequence: 9 }],
             [65, { name: 'slowcolorsplash', desc: 'Slow Color Splash', types: ['watercolors'], sequence: 10 }],
             [66, { name: 'fastcolorsplash', desc: 'Fast Color Splash', types: ['watercolors'], sequence: 11 }],
-            [67, { name: 'americathebeautiful', desc: 'America the Beautiful', types: ['watercolors'], sequence: 12 }],
+            [67, { name: 'americathebeautiful', desc: 'America Beautiful', types: ['watercolors'], sequence: 12 }],
             [68, { name: 'fattuesday', desc: 'Fat Tuesday', types: ['watercolors'], sequence: 13 }],
             [69, { name: 'discotech', desc: 'Disco Tech', types: ['watercolors'], sequence: 14 }],
             [255, { name: 'none', desc: 'None' }]
@@ -1111,9 +1115,7 @@ export class NixieCircuitCommands extends CircuitCommands {
         return arr;
     }
     public getCircuitFunctions() {
-        let cf = sys.board.valueMaps.circuitFunctions.toArray();
-        if (!sys.equipment.shared) cf = cf.filter(x => { return x.name !== 'spillway' && x.name !== 'spadrain' });
-        return cf;
+        return super.getCircuitFunctions();
     }
     public getCircuitNames() {
         return [...sys.board.valueMaps.circuitNames.toArray(), ...sys.board.valueMaps.customNames.toArray()];
@@ -1133,6 +1135,7 @@ export class NixieCircuitCommands extends CircuitCommands {
             if (data.name) circuit.name = scircuit.name = data.name;
             else if (!circuit.name && !data.name) circuit.name = scircuit.name = Circuit.getIdName(id);
             if (typeof data.type !== 'undefined' || typeof circuit.type === 'undefined') circuit.type = scircuit.type = parseInt(data.type, 10) || 0;
+            this.assertSinglePoolSpaType(id, circuit.type);
             if (typeof data.freeze !== 'undefined' || typeof circuit.freeze === 'undefined') circuit.freeze = utils.makeBool(data.freeze) || false;
             if (typeof data.showInFeatures !== 'undefined' || typeof data.showInFeatures === 'undefined') circuit.showInFeatures = scircuit.showInFeatures = utils.makeBool(data.showInFeatures);
             if (typeof data.dontStop !== 'undefined' && utils.makeBool(data.dontStop) === true) data.eggTimer = 1440;

package/controller/boards/SunTouchBoard.ts

@@ -354,6 +354,7 @@ class SunTouchCircuitCommands extends TouchCircuitCommands {
                 return circ;
             }
             let typeByte = parseInt(data.type, 10) || circuit.type || sys.board.valueMaps.circuitFunctions.getValue('generic');
+            this.assertSinglePoolSpaType(id, typeByte);
             let nameByte = circuit.nameId; // You cannot change the Name Id in SunTouch.
             if (typeof data.nameId !== 'undefined') nameByte = data.nameId;
             let mappedId = id;

package/controller/boards/SystemBoard.ts

@@ -1149,7 +1149,10 @@ export class SystemCommands extends BoardCommands {
         let tzOffsetObj = state.time.calcTZOffset();
         if (sys.general.options.clockSource === 'server' || typeof sys.general.location.timeZone === 'undefined') {
             let tzs = sys.board.valueMaps.timeZones.toArray();
-            sys.general.location.timeZone = tzs.find(tz => tz.utcOffset === tzOffsetObj.tzOffset).val;
+            let tzMatch = tzs.find(tz => tz.utcOffset === tzOffsetObj.tzOffset);
+            // Some environments can report offsets that are not present in the map.
+            // Keep the current value instead of throwing when no map entry exists.
+            if (typeof tzMatch !== 'undefined') sys.general.location.timeZone = tzMatch.val;
         }
         if (sys.general.options.clockSource === 'server' || typeof sys.general.options.adjustDST === 'undefined') {
             sys.general.options.adjustDST = tzOffsetObj.adjustDST;
@@ -2627,6 +2630,9 @@ export class CircuitCommands extends BoardCommands {
         circ.level = level;
         return Promise.resolve(circ as ICircuitState);
     }
+    public setLightColorAsync(id: number, color: { red: number; green: number; blue: number }): Promise<ICircuitState> {
+        return Promise.reject(new InvalidOperationError(`Light color control is not supported for circuit ${id}`, 'setLightColorAsync'));
+    }
     public getCircuitReferences(includeCircuits?: boolean, includeFeatures?: boolean, includeVirtual?: boolean, includeGroups?: boolean) {
         let arrRefs = [];
         if (includeCircuits) {
@@ -2679,9 +2685,32 @@ export class CircuitCommands extends BoardCommands {
     public getCircuitFunctions() {
         let cf = sys.board.valueMaps.circuitFunctions.toArray();
         if (!sys.equipment.shared) cf = cf.filter(x => { return x.name !== 'spillway' && x.name !== 'spadrain' });
+        const poolType = sys.board.valueMaps.circuitFunctions.findItem('pool');
+        const spaType = sys.board.valueMaps.circuitFunctions.findItem('spa');
+        if (typeof poolType !== 'undefined') {
+            const hasPool = typeof sys.circuits.find(elem => elem.isActive !== false && elem.type === poolType.val) !== 'undefined';
+            if (hasPool) cf = cf.filter(x => x.name !== 'pool');
+        }
+        if (typeof spaType !== 'undefined') {
+            const hasSpa = typeof sys.circuits.find(elem => elem.isActive !== false && elem.type === spaType.val) !== 'undefined';
+            if (hasSpa) cf = cf.filter(x => x.name !== 'spa');
+        }
         return cf;
     }
     public getCircuitNames() { return [...sys.board.valueMaps.circuitNames.toArray(), ...sys.board.valueMaps.customNames.toArray()]; }
+    protected assertSinglePoolSpaType(id: number, type: number): void {
+        if (isNaN(type)) return;
+        const poolType = sys.board.valueMaps.circuitFunctions.findItem('pool');
+        const spaType = sys.board.valueMaps.circuitFunctions.findItem('spa');
+        let typeName: string;
+        if (typeof poolType !== 'undefined' && type === poolType.val) typeName = 'pool';
+        else if (typeof spaType !== 'undefined' && type === spaType.val) typeName = 'spa';
+        if (typeof typeName === 'undefined') return;
+        const dup = sys.circuits.find(elem => elem.isActive !== false && elem.id !== id && elem.type === type);
+        if (typeof dup !== 'undefined') {
+            throw new InvalidEquipmentDataError(`Only one ${typeName} circuit type is allowed. Circuit ${dup.id}-${dup.name} is already configured as ${typeName}.`, 'Circuit', type);
+        }
+    }
     public async setCircuitAsync(data: any, send: boolean = true): Promise<ICircuit> {
         try {
             let id = parseInt(data.id, 10);
@@ -2716,6 +2745,7 @@ export class CircuitCommands extends BoardCommands {
                 }
                 if (id === 6) circuit.type = sys.board.valueMaps.circuitFunctions.getValue('pool');
                 if (id === 1 && sys.equipment.shared) circuit.type = sys.board.valueMaps.circuitFunctions.getValue('spa');
+                this.assertSinglePoolSpaType(id, circuit.type);
                 if (typeof data.freeze !== 'undefined' || typeof circuit.freeze === 'undefined') circuit.freeze = utils.makeBool(data.freeze) || false;
                 if (typeof data.showInFeatures !== 'undefined' || typeof data.showInFeatures === 'undefined') circuit.showInFeatures = scircuit.showInFeatures = utils.makeBool(data.showInFeatures);
                 if (typeof data.dontStop !== 'undefined' && utils.makeBool(data.dontStop) === true) data.eggTimer = 1440;
@@ -4032,7 +4062,7 @@ export class HeaterCommands extends BoardCommands {
     public updateHeaterServices() {
         let htypes = sys.board.heaters.getInstalledHeaterTypes();
         let solarInstalled = htypes.solar > 0;
-        let heatPumpInstalled = htypes.heatpump > 0;
+        let heatPumpInstalled = htypes.heatpump > 0 || htypes.ultratemp > 0;
         let gasHeaterInstalled = htypes.gas > 0;
         if (sys.heaters.length > 0) sys.board.valueMaps.heatSources = new byteValueMap([[0, { name: 'off', desc: 'Off' }]]);
         if (gasHeaterInstalled) sys.board.valueMaps.heatSources.set(3, { name: 'heater', desc: 'Heater' });
@@ -4223,6 +4253,9 @@ export class HeaterCommands extends BoardCommands {
                     // so that if we have a heater preference set up then we do not have to evaluate the other heater.
                     let heaterTypes = sys.board.valueMaps.heaterTypes;
                     bodyHeaters.sort((a, b) => {
+                        // Sort master=1 (NCP-controlled) heaters before master=0 (OCP-controlled)
+                        // so directly controlled heaters get priority over OCP ghosts.
+                        if (a.master !== b.master) return b.master - a.master;
                         if (heaterTypes.transform(a.type).hasPreference) return -1;
                         else if (heaterTypes.transform(b.type).hasPreference) return 1;
                         return 0;
@@ -4300,11 +4333,11 @@ export class HeaterCommands extends BoardCommands {
                                         // This is the default operation on IntelliCenter and it appears to simply not start on the setpoint.  We can do better
                                         // than this by heating 1 degree past the setpoint then applying this rule for 30 minutes.  This allows for a more
                                         // responsive heater.
-                                        // 
+                                        //
                                         // For Ultratemp we need to determine whether the differential temp
                                         // is within range.  The other thing that needs to be calculated here is
                                         // whether Ultratemp can effeciently heat the pool.
-                                        if (mode === 'ultratemp' || mode === 'ultratemppref') {
+                                        if (mode === 'ultratemp' || mode === 'ultratemppref' || mode === 'heatpump' || mode === 'heatpumppref') {
                                             if (hstate.isOn) {
                                                 // For the preference mode we will try to reach the setpoint for a period of time then
                                                 // switch over to the gas heater.  Our algorithm for this is to check the rate of
@@ -5046,6 +5079,8 @@ export class ChemControllerCommands extends BoardCommands {
                 if (t.hasAddress) chem.address = address;
             }
             chem.isActive = true;
+            // IntelliChem standalone polling is only valid when Nixie is the controller.
+            if (t.name === 'intellichem' && sys.controllerType !== ControllerType.Nixie) data.intellichemStandalone = false;
             // So here is the thing.  If you have an OCP then the IntelliChem must be controlled by that.
             // the messages on the bus will talk back to the OCP so if you do not do this mayhem will ensue.
             if (t.name === 'intellichem') {

package/controller/comms/Comms.ts

@@ -1165,18 +1165,24 @@ export class RS485Port {
         // triggers that cause the outbound message may come at the same time that another controller makes a call.
         var i = this._outBuffer.length - 1;
         while (i >= 0) {
-            let out = this._outBuffer[i--];
-            if (typeof out === 'undefined') continue;
+            const out = this._outBuffer[i];
+            if (typeof out === 'undefined') {
+                i--;
+                continue;
+            }
             let resp = out.response;
             // RG - added check for msgOut because the *Touch chlor packet 153 adds an status packet 217
             // but if it is the only packet on the queue the outbound will have been cleared out already.
-            if (out.requiresResponse && msgOut !== null) {
+            if (out.requiresResponse && typeof msgOut !== 'undefined' && msgOut !== null) {
                 if (resp instanceof Response && resp.isResponse(msgIn, out) && (typeof out.scope === 'undefined' || out.scope === msgOut.scope)) {
                     resp.message = msgIn;
                     if (typeof (resp.callback) === 'function' && resp.callback) callback = resp.callback;
                     this._outBuffer.splice(i, 1);
+                    // Resolve any async sender whose queued duplicate was satisfied by this inbound response.
+                    if (typeof out.onComplete === 'function') out.onComplete(undefined, msgIn);
                 }
             }
+            i--;
         }
         // RKS: This callback is important because we are managing queues. The position of this callback
         // occurs after all things related to the message have been processed including removal of subsequent

package/controller/comms/messages/Messages.ts

@@ -43,6 +43,7 @@ import { TouchScheduleCommands } from "controller/boards/EasyTouchBoard";
 import { IntelliValveStateMessage } from "./status/IntelliValveStateMessage";
 import { IntelliChemStateMessage } from "./status/IntelliChemStateMessage";
 import { RegalModbusStateMessage } from "./status/RegalModbusStateMessage";
+import { NeptuneModbusStateMessage } from "./status/NeptuneModbusStateMessage";
 import { OutboundMessageError } from "../../Errors";
 import { conn } from "../Comms"
 import extend = require("extend");
@@ -63,7 +64,8 @@ export enum Protocol {
     AquaLink = 'aqualink',
     Hayward = 'hayward',
     Unidentified = 'unidentified',
-    RegalModbus = 'regalmodbus'
+    RegalModbus = 'regalmodbus',
+    NeptuneModbus = 'neptunemodbus'
 }
 export class Message {
     constructor() { }
@@ -110,6 +112,9 @@ export class Message {
             else if (this.protocol === Protocol.RegalModbus) {
                 return this.header.length > 0 ? this.header[0] : -1;
             }
+            else if (this.protocol === Protocol.NeptuneModbus) {
+                return this.header.length > 0 ? this.header[0] : -1;
+            }
             else return this.header.length > 2 ? this.header[2] : -1;
         }
         else return -1;
@@ -137,6 +142,10 @@ export class Message {
             // No source address in RegalModbus.
             return -1;
         }
+        else if (this.protocol === Protocol.NeptuneModbus) {
+            // No source address in Neptune Modbus RTU messages.
+            return -1;
+        }
         if (this.header.length > 3) return this.header[3];
         else return -1;
     }
@@ -153,6 +162,9 @@ export class Message {
         else if (this.protocol === Protocol.RegalModbus) {
             return this.header.length > 1 ? this.header[1]: -1;
         }
+        else if (this.protocol === Protocol.NeptuneModbus) {
+            return this.header.length > 1 ? this.header[1] : -1;
+        }
         else if (this.header.length > 4) return this.header[4];
         else return -1;
         if (this.header.length > 4) return this.header[4];
@@ -199,6 +211,21 @@ export class Message {
                     return 0;
             }
         }
+        else if (this.protocol === Protocol.NeptuneModbus) {
+            let action = this.action;
+            if (action === 0x03 || action === 0x04) {
+                // Payload format: [byteCount, data...]
+                return this.payload.length > 0 ? this.payload[0] + 1 : -1;
+            }
+            if (action === 0x06 || action === 0x08 || action === 0x10) {
+                // Write single / diagnostics / write multiple response: addrHi, addrLo, val/qtyHi, val/qtyLo
+                return 4;
+            }
+            if ((action & 0x80) === 0x80) {
+                // Modbus exception response: one-byte exception code.
+                return 1;
+            }
+        }
         return this.header.length > 5 ? this.header[5] : -1;
     }
     public get chkHi(): number { return this.protocol === Protocol.Chlorinator || this.protocol === Protocol.AquaLink ? 0 : this.term.length > 0 ? this.term[0] : -1; }
@@ -315,6 +342,12 @@ export class Inbound extends Message {
                 const crcReceived = (this.chkLo << 8) | this.chkHi;
                 return crcComputed === crcReceived;
             }
+            case Protocol.NeptuneModbus: {
+                const data = this.header.concat(this.payload);
+                const crcComputed = computeCRC16(data);
+                const crcReceived = (this.chkLo << 8) | this.chkHi;
+                return crcComputed === crcReceived;
+            }
             default:
                 return (this.chkHi * 256) + this.chkLo === this.checksum;
         }
@@ -365,12 +398,47 @@ export class Inbound extends Message {
             // logger.debug('Testing RegalModbus header', bytes, addr, func, ack, acceptableAcks.includes(ack));
             // logger.debug(`Current bytes: ${JSON.stringify(bytes)}`);
 
-            if (addr >= 0x15 && addr <= 0xF7 && func >= 0x00 && func <= 0x7F && acceptableAcks.includes(ack)) {
+            if (addr >= 0x15 && addr <= 0xF7 && func >= 0x00 && func <= 0x7F && acceptableAcks.includes(ack) &&
+                this.isAddressForPumpType(addr, 'regalmodbus', ['neptunemodbus'])) {
                 return true;
             }
         }
         return false;
     }
+    private isAddressForPumpType(address: number, pumpTypeName: string, peerPumpTypes: string[] = []): boolean {
+        let hasTargetType = false;
+        let hasPeerType = false;
+        for (let i = 0; i < sys.pumps.length; i++) {
+            const pump = sys.pumps.getItemByIndex(i);
+            const typeName = sys.board.valueMaps.pumpTypes.getName(pump.type);
+            if (typeName === pumpTypeName) {
+                hasTargetType = true;
+                if (pump.address === address) return true;
+            }
+            else if (peerPumpTypes.includes(typeName)) {
+                hasPeerType = true;
+            }
+        }
+        if (hasTargetType) return false;
+        if (hasPeerType) return false;
+        // If neither protocol type is configured yet, allow detection.
+        return true;
+    }
+    private testNeptuneModbusHeader(bytes: number[], ndx: number): boolean {
+        // Neptune Modbus RTU: address, function, payload..., crcLo, crcHi
+        if (bytes.length > ndx + 4 && sys.controllerType === 'nixie') {
+            const addr = bytes[ndx];
+            const func = bytes[ndx + 1];
+            const supportedFuncs = [0x03, 0x04, 0x06, 0x08, 0x10, 0x83, 0x84, 0x86, 0x88, 0x90];
+            if (addr < 1 || addr > 247) return false;
+            if (!supportedFuncs.includes(func)) return false;
+            if (!this.isAddressForPumpType(addr, 'neptunemodbus', ['regalmodbus'])) return false;
+            // For read responses, byte count must be reasonable.
+            if ((func === 0x03 || func === 0x04) && bytes[ndx + 2] > 250) return false;
+            return true;
+        }
+        return false;
+    }
     private testAquaLinkHeader(bytes: number[], ndx: number): boolean {
         if (bytes.length > ndx + 4 && sys.controllerType === 'aqualink') {
             if (bytes[ndx] === 16 && bytes[ndx + 1] === 2) {
@@ -499,6 +567,11 @@ export class Inbound extends Message {
                     this.protocol = Protocol.Hayward;
                     break;
                 }
+                if (this.testNeptuneModbusHeader(bytes, ndx)) {
+                    this.protocol = Protocol.NeptuneModbus;
+                    logger.debug(`NeptuneModbus header detected. ${JSON.stringify(bytes)}`);
+                    break;
+                }
                 if (this.testRegalModbusHeader(bytes, ndx)) {
                     this.protocol = Protocol.RegalModbus;
                     logger.debug(`RegalModbus header detected. ${JSON.stringify(bytes)}`);
@@ -599,6 +672,15 @@ export class Inbound extends Message {
                     return ndxHeader;
                 }
                 break;
+            case Protocol.NeptuneModbus:
+                ndx = this.pushBytes(this.header, bytes, ndx, 2);
+                if (this.header.length < 2) {
+                    logger.debug(`We have an incoming NeptuneModbus message but the serial port hasn't given a complete header. [${this.padding}][${this.preamble}][${this.header}]`);
+                    this.preamble = [];
+                    this.header = [];
+                    return ndxHeader;
+                }
+                break;
             default:
                 // We didn't get a message signature. don't do anything with it.
                 ndx = ndxStart;
@@ -681,6 +763,44 @@ export class Inbound extends Message {
                     }
                 }
                 break;
+            case Protocol.NeptuneModbus: {
+                // Neptune Modbus RTU: [addr, fn][payload][crcLo, crcHi]
+                const functionCode = this.action;
+                if (functionCode === 0x03 || functionCode === 0x04) {
+                    // Read response payload: [byteCount, data...]
+                    if (this.payload.length === 0 && ndx < bytes.length - 2) {
+                        this.payload.push(bytes[ndx++]);
+                    }
+                    const byteCount = this.payload[0];
+                    if (typeof byteCount !== 'undefined') {
+                        if (byteCount > 250) {
+                            this.isValid = false;
+                            logger.debug(`NeptuneModbus message marked invalid due to unreasonable byteCount ${byteCount}`);
+                            break;
+                        }
+                        ndx = this.pushBytes(this.payload, bytes, ndx, (byteCount + 1) - this.payload.length);
+                    }
+                }
+                else if (functionCode === 0x06 || functionCode === 0x08 || functionCode === 0x10) {
+                    // Echo response payload: 4 bytes.
+                    ndx = this.pushBytes(this.payload, bytes, ndx, 4 - this.payload.length);
+                }
+                else if ((functionCode & 0x80) === 0x80) {
+                    // Exception response payload: one-byte code.
+                    ndx = this.pushBytes(this.payload, bytes, ndx, 1 - this.payload.length);
+                }
+                else {
+                    while (ndx + 3 <= bytes.length) {
+                        this.payload.push(bytes[ndx++]);
+                        if (this.payload.length > 253) {
+                            this.isValid = false;
+                            logger.debug(`NeptuneModbus message marked invalid due to payload more than 253 bytes`);
+                            break;
+                        }
+                    }
+                }
+                break;
+            }
 
         }
         return ndx;
@@ -695,10 +815,11 @@ export class Inbound extends Message {
             case Protocol.IntelliChem:
             case Protocol.Heater:
             case Protocol.RegalModbus:
+            case Protocol.NeptuneModbus:
             case Protocol.Unidentified:
                 // If we don't have enough bytes to make the terminator then continue on and
                 // hope we get them on the next go around.
-                if (this.payload.length >= this.datalen && ndx + 2 <= bytes.length) {
+                if (this.datalen >= 0 && this.payload.length >= this.datalen && ndx + 2 <= bytes.length) {
                     this._complete = true;
                     ndx = this.pushBytes(this.term, bytes, ndx, 2);
                     this.isValid = this.isValidChecksum();
@@ -762,7 +883,13 @@ export class Inbound extends Message {
             case ControllerType.IntelliCenter:
                 switch (this.action) {
                     case 1: // ACK
-                        VersionMessage.processAction168Ack(this);
+                        // v3.004+ piggyback: only route ACKs we care about (168/184) into a single handler
+                        // to avoid doing extra work on every ACK frame.
+                        if (this.payload.length === 1 && (this.payload[0] === 168 || this.payload[0] === 184)) {
+                            VersionMessage.processActionAck(this);
+                        } else {
+                            this.isProcessed = true;
+                        }
                         break;
                     case 2:
                     case 204:
@@ -922,12 +1049,15 @@ 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);
+        const isReplay = this.scope === 'replay';
+        if (!isReplay) {
+            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:
@@ -957,6 +1087,9 @@ export class Inbound extends Message {
             case Protocol.RegalModbus:
                 RegalModbusStateMessage.process(this);
                 break;
+            case Protocol.NeptuneModbus:
+                NeptuneModbusStateMessage.process(this);
+                break;
             default:
                 logger.debug(`Unprocessed Message ${this.toPacket()}`)
                 break;
@@ -970,6 +1103,7 @@ class OutboundCommon extends Message {
         if (this.protocol === Protocol.Chlorinator) this.header[2] = val;
         else if (this.protocol === Protocol.Hayward) this.header[4] = val;
         else if (this.protocol === Protocol.RegalModbus) this.header[0] = val;
+        else if (this.protocol === Protocol.NeptuneModbus) this.header[0] = val;
         else this.header[2] = val;
     }
     public get dest() { return super.dest; }
@@ -982,6 +1116,8 @@ class OutboundCommon extends Message {
                 break;
             case Protocol.RegalModbus:
                 break;
+            case Protocol.NeptuneModbus:
+                break;
             default:
                 this.header[3] = val;
                 break;
@@ -1001,6 +1137,9 @@ class OutboundCommon extends Message {
             case Protocol.RegalModbus:
                 this.header[1] = val;
                 break;
+            case Protocol.NeptuneModbus:
+                this.header[1] = val;
+                break;
             default:
                 this.header[4] = val;
                 break;
@@ -1008,7 +1147,7 @@ class OutboundCommon extends Message {
     }
     public get action() { return super.action; }
     public set datalen(val: number) { 
-        if (this.protocol !== Protocol.Chlorinator && this.protocol !== Protocol.Hayward && this.protocol !== Protocol.RegalModbus) {
+        if (this.protocol !== Protocol.Chlorinator && this.protocol !== Protocol.Hayward && this.protocol !== Protocol.RegalModbus && this.protocol !== Protocol.NeptuneModbus) {
             this.header[5] = val; 
         }
     }
@@ -1046,6 +1185,13 @@ class OutboundCommon extends Message {
                 this.chkLo = (crc >> 8) & 0xFF;
                 this.chkHi = crc & 0xFF;
                 break;
+            case Protocol.NeptuneModbus:
+                // Modbus RTU CRC16 (LSB-first on the wire).
+                let modbusData: number[] = this.header.concat(this.payload);
+                const modbusCrc: number = computeCRC16(modbusData);
+                this.chkLo = (modbusCrc >> 8) & 0xFF;
+                this.chkHi = modbusCrc & 0xFF;
+                break;
         }
     }
 }
@@ -1081,6 +1227,10 @@ export class Outbound extends OutboundCommon {
         else if (proto === Protocol.RegalModbus) {
             this.header.push.apply(this.header, [this.dest, this.action, 0x20]);
         }
+        else if (proto === Protocol.NeptuneModbus) {
+            this.header.push.apply(this.header, [this.dest, this.action]);
+            this.term.push.apply(this.term, [0, 0]);
+        }
         this.scope = scope;
         this.source = source;
         this.dest = dest;
@@ -1177,6 +1327,14 @@ export class Outbound extends OutboundCommon {
         if (ndx + 1 < this.payload.length) this.payload[ndx + 1] = b1;
         return this;
     }
+    public setPayloadIntBE(ndx: number, value: number, def?: number) {
+        if (typeof value === 'undefined' || isNaN(value)) value = def;
+        let b1 = Math.floor(value / 256);
+        let b0 = value - (b1 * 256);
+        if (ndx < this.payload.length) this.payload[ndx] = b1;
+        if (ndx + 1 < this.payload.length) this.payload[ndx + 1] = b0;
+        return this;
+    }
     public appendPayloadInt(value: number, def?: number) {
         if (typeof value === 'undefined' || isNaN(value)) value = def;
         let b1 = Math.floor(value / 256);
@@ -1185,6 +1343,14 @@ export class Outbound extends OutboundCommon {
         this.payload.push(b1);
         return this;
     }
+    public appendPayloadIntBE(value: number, def?: number) {
+        if (typeof value === 'undefined' || isNaN(value)) value = def;
+        let b1 = Math.floor(value / 256);
+        let b0 = value - (b1 * 256);
+        this.payload.push(b1);
+        this.payload.push(b0);
+        return this;
+    }
     public insertPayloadInt(ndx: number, value: number, def?: number) {
         if (typeof value === 'undefined' || isNaN(value)) value = def;
         let b1 = Math.floor(value / 256);
@@ -1317,19 +1483,26 @@ export class Response extends OutboundCommon {
         if (msgIn.protocol !== msgOut.protocol) { return false; }
         if (typeof msgIn === 'undefined') { return false; } // getting here on msg send failure
 
-        // if these properties were set on the Response (this) object via creation,
-        // then use the passed in values.  Otherwise, use the msgIn/msgOut matching rules        
-        // IntelliCenter config queue uses (action,payload-prefix) matching for Action 30 responses.
-        // Keep this stricter prefix matching scoped to IntelliCenter to avoid unintended effects on other controllers.
-        if (this.action > 0 && sys.controllerType === ControllerType.IntelliCenter) {
-            if (this.action !== msgIn.action) return false;
-            // If no payload prefix is provided, action match is sufficient (e.g. v3 Action 30 with empty payload).
-            if (this.payload.length === 0) return true;
-            if (msgIn.payload.length < this.payload.length) return false;
-            for (let i = 0; i < this.payload.length; i++) {
-                if (this.payload[i] !== msgIn.payload[i]) return false;
-            }
-            return true;
+        // If these properties were set on the Response (this) object via creation,
+        // then use the passed in values. Otherwise, use the msgIn/msgOut matching rules.
+        //
+        // NOTE: IntelliCenter response matching is handled in the IntelliCenter-specific block below
+        // to keep the logic in one place.
+        if (msgOut.protocol === Protocol.Heater) {
+            // Heater protocol: request action 114 → response action 115, etc.
+            // Verify response comes from the heater we addressed.
+            if (msgIn.source !== msgOut.dest || (msgIn.dest !== msgOut.source && msgIn.dest !== 16)) { return false; }
+            if (this.action > 0 && this.action === msgIn.action) return true;
+            return false;
+        }
+        //
+        // Restore Response-level action matching for non-IntelliCenter protocols (e.g., Hayward).
+        // The Hayward Outbound action getter has a known index mismatch (reads source instead of action),
+        // so we use the Response object's action which stores it correctly in header[4].
+        // See: https://github.com/tagyoureit/nodejs-poolController/issues/1098
+        if (sys.controllerType !== ControllerType.IntelliCenter && this.action > 0) {
+            if (this.action === msgIn.action) return true;
+            else return false;
         }
         else if (msgOut.protocol === Protocol.Pump) {
             switch (msgIn.action) {
@@ -1358,6 +1531,13 @@ export class Response extends OutboundCommon {
             if (msgIn.action === msgOut.action && msgIn.header[2] === 0x10) return true;
             return false;
         }
+        else if (msgIn.protocol === Protocol.NeptuneModbus) {
+            // Neptune Modbus: match by address and function code; allow exception responses (fn | 0x80).
+            if (msgIn.dest !== msgOut.dest) return false;
+            if (msgIn.action === msgOut.action) return true;
+            if (msgIn.action === (msgOut.action | 0x80)) return true;
+            return false;
+        }
         else if (msgIn.protocol === Protocol.Chlorinator) {
             switch (msgIn.action) {
                 case 1:
@@ -1404,6 +1584,20 @@ export class Response extends OutboundCommon {
         }
         else if (sys.controllerType === ControllerType.IntelliCenter) {
             // intellicenter packets
+            // IntelliCenter config queue uses (action,payload-prefix) matching for Action 30 responses.
+            // Keep this scoped to IntelliCenter to avoid unintended effects on other controllers.
+            if (sys.equipment.isIntellicenterV3 && this.action > 0) {
+                if (this.action !== msgIn.action) return false;
+                // If a destination was specified on the Response, enforce it (critical for v3 unicast flows).
+                if (this.dest >= 0 && msgIn.dest !== this.dest) return false;
+                // If no payload prefix is provided, action match is sufficient (e.g. v3 Action 30 with empty payload).
+                if (this.payload.length === 0) return true;
+                if (msgIn.payload.length < this.payload.length) return false;
+                for (let i = 0; i < this.payload.length; i++) {
+                    if (msgIn.payload[i] !== this.payload[i]) return false;
+                }
+                return true;
+            }
             if (this.dest >= 0 && msgIn.dest !== this.dest) return false;
             for (let i = 0; i < this.payload.length; i++) {
                 if (i > msgIn.payload.length - 1)