nodejs-poolcontroller 8.0.0 → 8.0.2

package/controller/nixie/pumps/Pump.ts

@@ -65,7 +65,8 @@ export class NixiePumpCollection extends NixieEquipmentCollection<NixiePump> {
             for (let i = 0; i < pumps.length; i++) {
                 let pump = pumps.getItemByIndex(i);
                 if (pump.master === 1) {
-                    if (typeof this.find(elem => elem.id === pump.id) === 'undefined') {
+                    let p: NixiePump = this.find(elem => elem.id === pump.id) as NixiePump;
+                    if (typeof p === 'undefined') {
                         let type = sys.board.valueMaps.pumpTypes.getName(pump.type);
                         let npump = this.pumpFactory(pump);
                         logger.info(`Initializing Nixie Pump ${npump.id}-${pump.name}`);
@@ -81,7 +82,9 @@ export class NixiePumpCollection extends NixieEquipmentCollection<NixiePump> {
         try {
             for (let i = this.length - 1; i >= 0; i--) {
                 try {
-                    await this[i].closeAsync();
+                    try {
+                        await this[i].closeAsync();
+                    } catch (err) { logger.error(`Error attempting to close pump ${this[i].id}`); }
                     this.splice(i, 1);
                 } catch (err) { logger.error(`Error stopping Nixie Pump ${err}`); }
             }
@@ -101,14 +104,16 @@ export class NixiePumpCollection extends NixieEquipmentCollection<NixiePump> {
         try {
             let c: NixiePump = this.find(elem => elem.id === pump.id) as NixiePump;
             if (pump.master === 1) {
-                // if pump exists, close it so we can re-init 
+                // if pump exists, close it so we can re-init
                 // (EG if pump type changes, we need to setup a new instance of the pump)
                 if (typeof c !== 'undefined' && c.pump.type !== pump.type) {
                     await c.closeAsync();
+                    await this.deletePumpAsync(pump.id);
                     c = this.pumpFactory(pump);
+                    this.push(c);
                 }
-                logger.info(`Initializing Nixie Pump ${c.id}-${pump.name}`);
-                this.push(c);
+                logger.info(`Initializing Existing Nixie Pump ${c.id}-${pump.name}`);
+
             }
             return c;
         } catch (err) { return Promise.reject(logger.error(`Nixie Controller: initPumpAsync Error: ${err.message}`)); }
@@ -140,13 +145,21 @@ export class NixiePumpCollection extends NixieEquipmentCollection<NixiePump> {
         // loop through all pumps and update rates based on circuit changes
         // this would happen in <2s anyway based on pollAsync but this is immediate.
         for (let i = this.length - 1; i >= 0; i--) {
+            let pump = this[i] as NixiePump;
+            if (!pump.suspendPolling) setTimeoutSync(async () => { await pump.pollEquipmentAsync(); }, 100);
+            else {
+                pump.setTargetSpeed(state.pumps.getItemById(pump.id));
+            }
+            // RKS: 05-16-23 - Below backs up the processing.
+            /*
+             
             setTimeoutSync(async () => {
                 let pump = this[i] as NixiePump;
                 try {
                     if (!pump.closing) await pump.pollEquipmentAsync();
                 } catch (err) { }
             }, 100);
-
+            */
         }
     }
 }
@@ -157,7 +170,10 @@ export class NixiePump extends NixieEquipment {
     protected _targetSpeed: number;
     protected _suspendPolling = 0;
     public get suspendPolling(): boolean { return this._suspendPolling > 0; }
-    public set suspendPolling(val: boolean) { this._suspendPolling = Math.max(0, this._suspendPolling + (val ? 1 : -1)); }
+    public set suspendPolling(val: boolean) {
+        this._suspendPolling = Math.max(0, this._suspendPolling + (val ? 1 : -1));
+        if (this._suspendPolling > 1) console.log(`Suspend Polling ${this._suspendPolling}`);
+    }
     public closing = false;
     public async setServiceModeAsync() {
         let pstate = state.pumps.getItemById(this.pump.id);
@@ -192,7 +208,6 @@ export class NixiePump extends NixieEquipment {
     }
     public async setPumpAsync(data: any): Promise<InterfaceServerResponse> {
         try {
-
             this.pump.master = 1;
             // if (typeof data.isVirtual !== 'undefined') this.pump.isVirtual = data.isVirtual;
             this.pump.isActive = true;
@@ -226,7 +241,7 @@ export class NixiePump extends NixieEquipment {
                         case 'ds':
                         case 'sf':
                         case 'hwrly':
-                            c.units = 'undefined';
+                            c.units = undefined;
                             break;
                     }
                     if (isNaN(units)) units = typeof cd !== 'undefined' ? cd.units : sys.board.valueMaps.pumpUnits.getValue('rpm');
@@ -245,6 +260,7 @@ export class NixiePump extends NixieEquipment {
                         c.relay = relay;
                 }
             }
+            else data.circuits = [];
             this.pump.set(data); // Sets all the data back to the pump.  This also sets the relays should it exist on the data.
             let spump = state.pumps.getItemById(this.pump.id, true);
             spump.name = this.pump.name;
@@ -264,16 +280,19 @@ export class NixiePump extends NixieEquipment {
             // RSG 8-2022.  Refactored to add initasync.  With this.pollEquipmentAsync inside the
             // constructor we could get here before the pump is initialized.  The added check
             // for the 112 address prevented that previously, but now is just a final fail safe.
-            if (this.suspendPolling || this.closing || this.pump.address > 112) return;
             if (typeof this._pollTimer !== 'undefined' || this._pollTimer) clearTimeout(this._pollTimer);
             this._pollTimer = null;
-            // let success = false;
+            if (this.suspendPolling || this.closing || this.pump.address > 112) {
+                if (this.suspendPolling) logger.info(`Pump ${this.id} Polling Suspended`);
+                if (this.closing) logger.info(`Pump ${this.id} is closing`);
+                return;
+            }
             let pstate = state.pumps.getItemById(this.pump.id);
             this.setTargetSpeed(pstate);
             await this.setPumpStateAsync(pstate);
         }
         catch (err) { logger.error(`Nixie Error running pump sequence - ${err}`); }
-        finally { if (!this.closing) this._pollTimer = setTimeoutSync(async () => await self.pollEquipmentAsync(), this.pollingInterval || 2000); }
+        finally { if (!self.closing) this._pollTimer = setTimeoutSync(async () => await self.pollEquipmentAsync(), self.pollingInterval || 2000); }
     }
     private async checkHardwareStatusAsync(connectionId: string, deviceBinding: string) {
         try {
@@ -304,7 +323,7 @@ export class NixiePump extends NixieEquipment {
         catch (err) { logger.error(`Nixie Pump closeAsync: ${err.message}`); return Promise.reject(err); }
     }
     public logData(filename: string, data: any) { this.controlPanel.logData(filename, data); }
-    protected setTargetSpeed(pstate: PumpState) { };
+    public setTargetSpeed(pstate: PumpState) { };
     protected isBodyOn(bodyCode: number) {
         let assoc = sys.board.valueMaps.pumpBodies.transform(bodyCode);
         switch (assoc.name) {
@@ -555,27 +574,29 @@ export class NixiePumpRS485 extends NixiePump {
         finally { this.suspendPolling = false; }
     };
     protected async setDriveStateAsync(running: boolean = true) {
-        if (conn.isPortEnabled(this.pump.portId || 0)) {
-            let out = Outbound.create({
-                portId: this.pump.portId || 0,
-                protocol: Protocol.Pump,
-                dest: this.pump.address,
-                action: 6,
-                payload: running && this._targetSpeed > 0 ? [10] : [4],
-                retries: 1,
-                response: true
-            });
-            try {
-                await out.sendAsync();
+        try {
+            if (conn.isPortEnabled(this.pump.portId || 0)) {
+                let out = Outbound.create({
+                    portId: this.pump.portId || 0,
+                    protocol: Protocol.Pump,
+                    dest: this.pump.address,
+                    action: 6,
+                    payload: running && this._targetSpeed > 0 ? [10] : [4],
+                    retries: 1,
+                    response: true
+                });
+                try {
+                    await out.sendAsync();
+                }
+                catch (err) {
+                    logger.error(`Error sending setDriveState for ${this.pump.name}: ${err.message}`);
+                }
             }
-            catch (err) {
-                logger.error(`Error sending setDriveState for ${this.pump.name}: ${err.message}`);
+            else {
+                let pstate = state.pumps.getItemById(this.pump.id);
+                pstate.command = pstate.rpm > 0 || pstate.flow > 0 ? 10 : 0;
             }
-        }
-        else {
-            let pstate = state.pumps.getItemById(this.pump.id);
-            pstate.command = pstate.rpm > 0 || pstate.flow > 0 ? 10 : 0;
-        }
+        } catch (err) { logger.error(`Error setting driveState for ${this.pump.name}: ${err.message}`); }
     };
     protected async requestPumpStatusAsync() {
         if (conn.isPortEnabled(this.pump.portId || 0)) {
@@ -597,44 +618,48 @@ export class NixiePumpRS485 extends NixiePump {
         }
     };
     protected async setPumpToRemoteControlAsync(running: boolean = true) {
-        if (conn.isPortEnabled(this.pump.portId || 0)) {
-            let out = Outbound.create({
-                portId: this.pump.portId || 0,
-                protocol: Protocol.Pump,
-                dest: this.pump.address,
-                action: 4,
-                payload: running ? [255] : [0], // when stopAsync is called, pass false to return control to pump panel
-                retries: 1,
-                response: true
-            });
-            try {
-                await out.sendAsync();
-            }
-            catch (err) {
-                logger.error(`Error sending setPumpToRemoteControl for ${this.pump.name}: ${err.message}`);
+        try {
+            if (conn.isPortEnabled(this.pump.portId || 0)) {
+                let out = Outbound.create({
+                    portId: this.pump.portId || 0,
+                    protocol: Protocol.Pump,
+                    dest: this.pump.address,
+                    action: 4,
+                    payload: running ? [255] : [0], // when stopAsync is called, pass false to return control to pump panel
+                    retries: 1,
+                    response: true
+                });
+                try {
+                    await out.sendAsync();
+                }
+                catch (err) {
+                    logger.error(`Error sending setPumpToRemoteControl for ${this.pump.name}: ${err.message}`);
+                }
             }
-        }
+        } catch (err) { logger.error(`Error setting pump to Remote Control for ${this.pump.name}: ${err.message}`); }
     }
     protected async setPumpFeatureAsync(feature?: number) {
         // empty payload (possibly 0?, too) is no feature
         // 6: Feature 1
-        if (conn.isPortEnabled(this.pump.portId || 0)) {
-            let out = Outbound.create({
-                portId: this.pump.portId || 0,
-                protocol: Protocol.Pump,
-                dest: this.pump.address,
-                action: 5,
-                payload: typeof feature === 'undefined' ? [] : [feature],
-                retries: 2,
-                response: true
-            });
-            try {
-                await out.sendAsync();
-            }
-            catch (err) {
-                logger.error(`Error sending setPumpFeature for ${this.pump.name}: ${err.message}`);
+        try {
+            if (conn.isPortEnabled(this.pump.portId || 0)) {
+                let out = Outbound.create({
+                    portId: this.pump.portId || 0,
+                    protocol: Protocol.Pump,
+                    dest: this.pump.address,
+                    action: 5,
+                    payload: typeof feature === 'undefined' ? [] : [feature],
+                    retries: 2,
+                    response: true
+                });
+                try {
+                    await out.sendAsync();
+                }
+                catch (err) {
+                    logger.error(`Error sending setPumpFeature for ${this.pump.name}: ${err.message}`);
+                }
             }
-        }
+        } catch (err) { logger.error(`Error setting pump feature for ${this.pump.name}: ${err.message}`); }
     };
     protected async setPumpRPMAsync() {
         if (conn.isPortEnabled(this.pump.portId || 0)) {
@@ -691,7 +716,7 @@ export class NixiePumpRS485 extends NixiePump {
             //await this.setPumpFeature(); 
             //await this.setDriveStateAsync(false); 
             await this.setPumpToRemoteControlAsync(false);
-            // Make sure the polling timer is dead after we have closted this all off.  That way we do not
+            // Make sure the polling timer is dead after we have closed this all off.  That way we do not
             // have another process that revives it from the dead.
             if (typeof this._pollTimer !== 'undefined' || this._pollTimer) clearTimeout(this._pollTimer);
             this._pollTimer = null;
@@ -735,14 +760,38 @@ export class NixiePumpVF extends NixiePumpRS485 {
         if (this._targetSpeed !== 0) Math.min(Math.max(this.pump.minFlow, this._targetSpeed), this.pump.maxFlow);
         if (this._targetSpeed !== _newSpeed) logger.info(`NCP: Setting Pump ${this.pump.name} to ${_newSpeed} GPM.`);
     }
+    public async setPumpStateAsync(pstate: PumpState) {
+        // Don't poll while we are seting the state.
+        this.suspendPolling = true;
+        try {
+            let pt = sys.board.valueMaps.pumpTypes.get(this.pump.type);
+            if (state.mode === 0) {
+                // Since these process are async the closing flag can be set
+                // between calls.  We need to check it in between each call. // 4, 6, 5,  7
+                // When we are 0 then it sends 4[255], 6[4], 5[6]
+                // When we are not 0 then it sends 4[255], 6[10], 5[6], 1[flow]
+                if (!this.closing) await this.setPumpToRemoteControlAsync(); // Action 4
+                if (!this.closing) await this.setDriveStateAsync();         // Action 6
+                if (!this.closing) await this.setPumpFeatureAsync(this._targetSpeed > 0 ? 6 : undefined); // Action 5
+                if (!this.closing && this._targetSpeed > 0) await this.setPumpGPMAsync(); // Action 1
+                if (!this.closing) await setTimeout(200);
+                if (!this.closing) await this.requestPumpStatusAsync(); // Action 7
+            }
+            return new InterfaceServerResponse(200, 'Success');
+        }
+        catch (err) {
+            logger.error(`Error running pump sequence for ${this.pump.name}: ${err.message}`);
+            return Promise.reject(err);
+        }
+        finally { this.suspendPolling = false; }
+    };
 }
 export class NixiePumpVSF extends NixiePumpRS485 {
     public setTargetSpeed(pState: PumpState) {
         let _newSpeed = 0;
         let maxRPM = 0;
         let maxGPM = 0;
-        let flows = 0;
-        let speeds = 0;
+        let useFlow = false;
         if (!pState.pumpOnDelay) {
             let pumpCircuits = this.pump.circuits.get();
             let pt = sys.board.valueMaps.pumpTypes.get(this.pump.type);
@@ -750,13 +799,19 @@ export class NixiePumpVSF extends NixiePumpRS485 {
             // if there is a mix in the circuit array then they will not work.  In IntelliCenter if there is an RPM setting in the mix it will use RPM by converting
             // the GPM to RPM but if there is none then it will use GPM.
             let toRPM = (flowRate: number, minSpeed: number = 450, maxSpeed: number = 3450) => {
+                // eff = 114.4365
+                // gpm = 80
+                // speed = 2412
                 let eff = .03317 * maxSpeed;
-                let rpm = Math.min((flowRate * maxSpeed) / eff, maxSpeed);
+                let rpm = Math.min(Math.round((flowRate * maxSpeed) / eff), maxSpeed);
                 return rpm > 0 ? Math.max(rpm, minSpeed) : 0;
             };
             let toGPM = (speed: number, maxSpeed: number = 3450, minFlow: number = 15, maxFlow: number = 140) => {
+                // eff = 114.4365
+                // speed = 1100
+                // gpm = (114.4365 * 1100)/3450 = 36
                 let eff = .03317 * maxSpeed;
-                let gpm = Math.min((eff * speed) / maxSpeed, maxFlow);
+                let gpm = Math.min(Math.round((eff * speed) / maxSpeed), maxFlow);
                 return gpm > 0 ? Math.max(gpm, minFlow) : 0;
             }
             for (let i = 0; i < pumpCircuits.length; i++) {
@@ -764,23 +819,24 @@ export class NixiePumpVSF extends NixiePumpRS485 {
                 let pc = pumpCircuits[i];
                 if (circ.isOn) {
                     if (pc.units > 0) {
+                        let rpm = toRPM(pc.flow, pt.minSpeed, pt.MaxSpeed);
+                        if (rpm > maxRPM) useFlow = true;
                         maxGPM = Math.max(maxGPM, pc.flow);
-                        // Calculate an RPM from this flow.
-                        maxRPM = Math.max(maxGPM, toRPM(pc.flow, pt.minSpeed, pt.maxSpeed));
-                        flows++;
+                        rpm = Math.max(maxRPM, rpm);
                     }
                     else {
+                        let gpm = toGPM(pc.speed, pt.maxSpeed, pt.minFlow, pt.maxFlow);
+                        if (gpm > maxGPM) useFlow = false;
                         maxRPM = Math.max(maxRPM, pc.speed);
-                        maxGPM = Math.max(maxGPM, toGPM(pc.speed, pt.maxSpeed, pt.minFlow, pt.maxFlow));
-                        speeds++;
+                        maxGPM = Math.max(maxGPM, gpm);
                     }
                 }
             }
-            _newSpeed = speeds > 0 || flows === 0 ? maxRPM : maxGPM;
+            _newSpeed = useFlow ? maxGPM : maxRPM;
         }
         if (isNaN(_newSpeed)) _newSpeed = 0;
         // Send the flow message if it is flow and the rpm message if it is rpm.
-        if (this._targetSpeed !== _newSpeed) logger.info(`NCP: Setting Pump ${this.pump.name} to ${_newSpeed} ${flows > 0 ? 'GPM' : 'RPM'}.`);
+        if (this._targetSpeed !== _newSpeed) logger.info(`NCP: Setting Pump ${this.pump.name} to ${_newSpeed} ${useFlow ? 'GPM' : 'RPM'}.`);
         this._targetSpeed = _newSpeed;
     }
     protected async setPumpRPMAsync() {
@@ -846,7 +902,7 @@ export class NixiePumpHWVS extends NixiePumpRS485 {
         this._targetSpeed = 0;
         await this.setPumpRPMAsync();
     }
-    public async setDriveStateAsync(running: boolean = false) { }
+    public async setDriveStateAsync(running: boolean = false) { return Promise.resolve(); }
     public async setPumpStateAsync(pstate: PumpState) {
         // Don't poll while we are seting the state.
         this.suspendPolling = true;
@@ -865,29 +921,31 @@ export class NixiePumpHWVS extends NixiePumpRS485 {
     protected async requestPumpStatusAsync() { return Promise.resolve(); };
     protected setPumpFeatureAsync(feature?: number) { return Promise.resolve(); }
     protected async setPumpToRemoteControlAsync(running: boolean = true) {
-        // We do nothing on this pump to set it to remote control.  That is unless we are turning it off.
-        if (conn.isPortEnabled(this.pump.portId || 0)) {
-            if (!running) {
-                let out = Outbound.create({
-                    portId: this.pump.portId || 0,
-                    protocol: Protocol.Hayward,
-                    source: 12, // Use the broadcast address
-                    dest: this.pump.address,
-                    action: 1,
-                    payload: [0], // when stopAsync is called, pass false to return control to pump panel
-                    // payload: spump.virtualControllerStatus === sys.board.valueMaps.virtualControllerStatus.getValue('running') ? [255] : [0],
-                    retries: 1,
-                    response: Response.create({ protocol: Protocol.Hayward, action: 12, source: this.pump.address - 96 })
-                });
-                try {
-                    await out.sendAsync();
-                }
-                catch (err) {
-                    logger.error(`Error sending setPumpToRemoteControl for ${this.pump.name}: ${err.message}`);
+        try {
+            // We do nothing on this pump to set it to remote control.  That is unless we are turning it off.
+            if (conn.isPortEnabled(this.pump.portId || 0)) {
+                if (!running) {
+                    let out = Outbound.create({
+                        portId: this.pump.portId || 0,
+                        protocol: Protocol.Hayward,
+                        source: 12, // Use the broadcast address
+                        dest: this.pump.address,
+                        action: 1,
+                        payload: [0], // when stopAsync is called, pass false to return control to pump panel
+                        // payload: spump.virtualControllerStatus === sys.board.valueMaps.virtualControllerStatus.getValue('running') ? [255] : [0],
+                        retries: 1,
+                        response: Response.create({ protocol: Protocol.Hayward, action: 12, source: this.pump.address - 96 })
+                    });
+                    try {
+                        await out.sendAsync();
+                    }
+                    catch (err) {
+                        logger.error(`Error sending setPumpToRemoteControl for ${this.pump.name}: ${err.message}`);
 
+                    }
                 }
             }
-        }
+        } catch(err) { `Error sending setPumpToRemoteControl message for ${this.pump.name}: ${err.message}` };
     }
     protected async setPumpRPMAsync() {
         // Address 1