nodejs-poolcontroller 7.4.0 → 7.5.1

package/controller/nixie/pumps/Pump.ts

@@ -335,15 +335,16 @@ export class NixiePumpRS485 extends NixiePump {
             let pt = sys.board.valueMaps.pumpTypes.get(this.pump.type);
             // Since these process are async the closing flag can be set
             // between calls.  We need to check it in between each call.
-            if (!this.closing) await this.setDriveStateAsync(pstate);
-            if (!this.closing) {
-                if (this._targetSpeed >= pt.minFlow && this._targetSpeed <= pt.maxFlow) await this.setPumpGPMAsync(pstate);
-                else if (this._targetSpeed >= pt.minSpeed && this._targetSpeed <= pt.maxSpeed) await this.setPumpRPMAsync(pstate);  
-            }
+            try { if (!this.closing) await this.setDriveStateAsync(); } catch (err) {}
+            try { if (!this.closing) {
+                if (this._targetSpeed >= pt.minFlow && this._targetSpeed <= pt.maxFlow) await this.setPumpGPMAsync();
+                else if (this._targetSpeed >= pt.minSpeed && this._targetSpeed <= pt.maxSpeed) await this.setPumpRPMAsync();  
+            } } catch (err) {}
            
-            if(!this.closing) await utils.sleep(2000);
-            if(!this.closing) await this.requestPumpStatus(pstate);
-            if(!this.closing) await this.setPumpToRemoteControl(pstate);
+            try { if(!this.closing) await this.setPumpFeature(6);  } catch (err) {};
+            try { if(!this.closing) await utils.sleep(1000); } catch (err) {};
+            try { if(!this.closing) await this.requestPumpStatus();  } catch (err) {};
+            try { if(!this.closing) await this.setPumpToRemoteControl();  } catch (err) {};
             return new InterfaceServerResponse(200, 'Success');
         }
         catch (err) {
@@ -353,7 +354,7 @@ export class NixiePumpRS485 extends NixiePump {
         finally { this.suspendPolling = false; }
     
     };
-    protected async setDriveStateAsync(pstate: PumpState, running: boolean = true) {
+    protected async setDriveStateAsync(running: boolean = true) {
         return new Promise<void>((resolve, reject) => {
             let out = Outbound.create({
                 protocol: Protocol.Pump,
@@ -373,7 +374,7 @@ export class NixiePumpRS485 extends NixiePump {
             conn.queueSendMessage(out);
         });
     };
-    protected async requestPumpStatus(pstate: PumpState) {
+    protected async requestPumpStatus() {
         return new Promise<void>((resolve, reject) => {
             let out = Outbound.create({
                 protocol: Protocol.Pump,
@@ -393,7 +394,7 @@ export class NixiePumpRS485 extends NixiePump {
             conn.queueSendMessage(out);
         })
     };
-    protected setPumpToRemoteControl(spump: PumpState, running: boolean = true) {
+    protected setPumpToRemoteControl(running: boolean = true) {
         return new Promise<void>((resolve, reject) => {
             let out = Outbound.create({
                 protocol: Protocol.Pump,
@@ -414,13 +415,15 @@ export class NixiePumpRS485 extends NixiePump {
             conn.queueSendMessage(out);
         });
     }
-    protected setPumpManual(pstate: PumpState) {
+    protected setPumpFeature(feature?: number) {
+        // empty payload (possibly 0?, too) is no feature
+        // 6: Feature 1
         return new Promise<void>((resolve, reject) => {
             let out = Outbound.create({
                 protocol: Protocol.Pump,
                 dest: this.pump.address,
                 action: 5,
-                payload: [],
+                payload: typeof feature === 'undefined' ? [] : [ feature ],
                 retries: 2,
                 repsonse: true,
                 onComplete: (err, msg: Outbound) => {
@@ -434,7 +437,7 @@ export class NixiePumpRS485 extends NixiePump {
             conn.queueSendMessage(out);
         });
     };
-    protected async setPumpRPMAsync(pstate: PumpState) {
+    protected async setPumpRPMAsync() {
         return new Promise<void>((resolve, reject) => {
             let out = Outbound.create({
                 protocol: Protocol.Pump,
@@ -455,14 +458,14 @@ export class NixiePumpRS485 extends NixiePump {
             conn.queueSendMessage(out);
         });
     };
-    protected async setPumpGPMAsync(pstate: PumpState) {
+    protected async setPumpGPMAsync() {
         // packet for vf; vsf will override
         return new Promise<void>((resolve, reject) => {
             let out = Outbound.create({
                 protocol: Protocol.Pump,
                 dest: this.pump.address,
-                action: 10,
-                payload: [1, 4, 2, 228, this._targetSpeed, 0],
+                action: 1,
+                payload: [2, 228, 0, this._targetSpeed],
                 retries: 1,
                 response: true,
                 onComplete: (err, msg) => {
@@ -484,10 +487,10 @@ export class NixiePumpRS485 extends NixiePump {
             this._pollTimer = null;
             let pstate = state.pumps.getItemById(this.pump.id);
             this._targetSpeed = 0;
-            try { await this.setDriveStateAsync(pstate, false); } catch (err) { logger.error(`Error closing pump ${this.pump.name}: ${err.message}`) }
-            try { await this.setPumpManual(pstate); } catch (err) { logger.error(`Error closing pump ${this.pump.name}: ${err.message}`) }
-            try { await this.setDriveStateAsync(pstate, false); } catch (err) { logger.error(`Error closing pump ${this.pump.name}: ${err.message}`) }
-            try { await this.setPumpToRemoteControl(pstate, false); } catch (err) { logger.error(`Error closing pump ${this.pump.name}: ${err.message}`) }
+            try { await this.setDriveStateAsync(false); } catch (err) { logger.error(`Error closing pump ${this.pump.name}: ${err.message}`) }
+            try { await this.setPumpFeature(); } catch (err) { logger.error(`Error closing pump ${this.pump.name}: ${err.message}`) }
+            try { await this.setDriveStateAsync(false); } catch (err) { logger.error(`Error closing pump ${this.pump.name}: ${err.message}`) }
+            try { await this.setPumpToRemoteControl(false); } catch (err) { logger.error(`Error closing pump ${this.pump.name}: ${err.message}`) }
             this.closing = true;
             // Make sure the polling timer is dead after we have closted this all off.  That way we do not
             // have another process that revives it from the dead.
@@ -574,14 +577,36 @@ export class NixiePumpVSF extends NixiePumpRS485 {
         if (this._targetSpeed !== _newSpeed) logger.info(`NCP: Setting Pump ${this.pump.name} to ${_newSpeed} ${flows > 0 ? 'GPM' : 'RPM'}.`);
         this._targetSpeed = _newSpeed;
     }
-    protected async setPumpGPMAsync(pstate: PumpState) {
-        // vsf payload; different from vf payload
+    protected async setPumpRPMAsync() {
+        // vsf action is 10 for rpm
         return new Promise<void>((resolve, reject) => {
             let out = Outbound.create({
                 protocol: Protocol.Pump,
                 dest: this.pump.address,
                 action: 10,
-                payload: [1, 4, 2, 196, this._targetSpeed, 0],
+                payload: [2, 196, Math.floor(this._targetSpeed / 256), this._targetSpeed % 256],
+                retries: 1,
+                // timeout: 250,
+                response: true,
+                onComplete: (err, msg) => {
+                    if (err) {
+                        logger.error(`Error sending setPumpRPMAsync for ${this.pump.name}: ${err.message}`);
+                        reject(err);
+                    }
+                    else resolve();
+                }
+            });
+            conn.queueSendMessage(out);
+        });
+    };
+    protected async setPumpGPMAsync() {
+        // vsf payload; different from vf payload
+        return new Promise<void>((resolve, reject) => {
+            let out = Outbound.create({
+                protocol: Protocol.Pump,
+                dest: this.pump.address,
+                action: 9,
+                payload: [2, 196, 0, this._targetSpeed],
                 retries: 1,
                 response: true,
                 onComplete: (err, msg) => {

package/controller/nixie/schedules/Schedule.ts

@@ -234,7 +234,7 @@ export class NixieSchedule extends NixieEquipment {
     }
     public logData(filename: string, data: any) { this.controlPanel.logData(filename, data); }
 }
-class NixieScheduleContext {
+class   NixieScheduleContext {
     constructor() {
 
     }

package/defaultConfig.json

@@ -17,7 +17,18 @@
         "autoOpen": false,
         "lock": false
       }
+    },
+    "backups": {
+      "automatic": false,
+      "interval": {
+        "days": 30,
+        "hours": 0
+      },
+      "keepCount": 5,
+      "njsPC":  true,
+      "servers": []
     }
+
   },
   "web": {
     "servers": {
@@ -52,6 +63,7 @@
     "interfaces": {
       "smartThings": {
         "name": "SmartThings",
+        "type": "rest",
         "enabled": false,
         "fileName": "smartThings-Hubitat.json",
         "globals": {},
@@ -62,6 +74,7 @@
       },
       "hubitat": {
         "name": "Hubitat",
+        "type": "rest",
         "enabled": false,
         "fileName": "smartThings-Hubitat.json",
         "globals": {},
@@ -72,6 +85,7 @@
       },
       "vera": {
         "name": "Vera",
+        "type": "rest",
         "enabled": false,
         "fileName": "vera.json",
         "vars": {
@@ -83,6 +97,7 @@
         }
       },
       "valveRelay": {
+        "type": "rest",
         "name": "Valve Relays",
         "enabled": false,
         "fileName": "valveRelays.json",

package/issue_template.md

@@ -33,7 +33,7 @@ Follow the instructions to complete a [packet capture](https://github.com/tagyou
  - Pump(s) manufacturer and model: [e.g. IntelliFlow 2 VST 011056]
  - Chlorinator: [e.g. iChlor, IntelliChlor-40]
  - Heater(s): [e.g. gas, solar, heatpump, ultratemp]
- - Chemical controller: [e.g. IntelliChem, homegrown]
+ - Chemical controller: [e.g. IntelliChem, Relay Equipment Manager (REM)]
  - Valves: [e.g. Intellivalve]
  - Any other relevant equipment:
 

package/logger/DataLogger.ts

@@ -29,8 +29,10 @@ export class DataLogger {
             }
             let arr: T[] = [];
             for (let i = 0; i < lines.length; i++) {
-                let entry = DataLogger.createEntry<T>(type, lines[i]);
-                arr.push(entry);
+                try {
+                    let entry = DataLogger.createEntry<T>(type, lines[i]);
+                    arr.push(entry);
+                } catch (err) { logger.error(`Skipping invalid dose history entry: ${err.message}`); }
             }
             return arr;
         } catch (err) { logger.error(err); }
@@ -47,6 +49,7 @@ export class DataLogger {
             let newLines = ['\r', '\n'];
             let arr: T[] = [];
             if (fs.existsSync(logPath)) {
+                console.log(`Reading logfile ${logPath}`);
                 // Alright what we have created here is a method to read the data from the end of 
                 // a log file in reverse order (tail) that works for all os implementations.  It is
                 // really dumb that this isn't part of the actual file processing.
@@ -81,15 +84,16 @@ export class DataLogger {
                                 // record then we shoud save off the line and read the next record.
                                 if (newLines.includes(char) || pos === 0) {
                                     if (chars.length > 0) {
-                                        let entry = DataLogger.createEntry<T>(type, chars.join(''));
-                                        if (typeof fn === 'function') {
-                                            let rc = fn(arr.length + 1, entry, arr);
-                                            console.log(rc);
-                                            if (rc === true) arr.push(entry);
-                                            else if (rc === false) break;
-                                        }
-                                        else
-                                            arr.push(entry);
+                                        try {
+                                            let entry = DataLogger.createEntry<T>(type, chars.join(''));
+                                            if (typeof fn === 'function') {
+                                                let rc = fn(arr.length + 1, entry, arr);
+                                                if (rc === true) arr.push(entry);
+                                                else if (rc === false) break;
+                                            }
+                                            else
+                                                arr.push(entry);
+                                        } catch (err) { logger.error(`Skipping invalid dose history entry: ${err.message}`); }
                                     }
                                     chars = [];
                                 }
@@ -142,14 +146,16 @@ export class DataLogger {
                                     // record then we shoud save off the line and read the next record.
                                     if (newLines.includes(char) || pos === 0) {
                                         if (chars.length > 0) {
-                                            let entry = DataLogger.createEntry<T>(type, chars.join(''));
-                                            if (typeof fn === 'function') {
-                                                let rc = fn(arr.length + 1, entry, arr);
-                                                if (rc === true) arr.push(entry);
-                                                else if (rc === false) break;
-                                            }
-                                            else
-                                                arr.push(entry);
+                                            try {
+                                                let entry = DataLogger.createEntry<T>(type, chars.join(''));
+                                                if (typeof fn === 'function') {
+                                                    let rc = fn(arr.length + 1, entry, arr);
+                                                    if (rc === true) arr.push(entry);
+                                                    else if (rc === false) break;
+                                                }
+                                                else
+                                                    arr.push(entry);
+                                            } catch (err) { logger.error(`Skipping invalid dose history entry: ${err.message}`); }
                                         }
                                         chars = [];
                                     }
@@ -276,7 +282,6 @@ export class DataLogger {
                                             let entry = DataLogger.createEntry<T>(type, chars.join(''));
                                             if (typeof fn === 'function') {
                                                 let rc = fn(arr.length + 1, entry, arr);
-                                                console.log(rc);
                                                 if (rc === true) arr.push(entry);
                                                 else if (rc === false) break;
                                             }
@@ -399,11 +404,21 @@ export class DataLoggerEntry {
         // Parse the data from the log entry if it exists.
         if (typeof entry === 'object') entry = JSON.stringify(entry);
         if (typeof entry === 'string') this.parse(entry);
+        else {
+            //console.log(`A DATALOGGER ENTRY DOES NOT HAVE A PROPER TYPE ${typeof entry} *************************************`);
+            //console.log(entry);
+        }
     }
-    public createInstance(entry?: string) { return new DataLoggerEntry(entry); }
+    public static createInstance(entry?: string) { return new DataLoggerEntry(entry); }
     public parse(entry: string) {
         let obj = typeof entry !== 'undefined' ? JSON.parse(entry, this.dateParser) : {};
-        extend(true, this, obj);
+        if (typeof entry === 'undefined') {
+            console.log(`A DATALOGGER ENTRY WAS NOT DEFINED *************************`);
+        }
+        else if (entry === '') {
+            console.log(`THE INCOMING DATALOGGER ENTRY WAS EMPTY ***************************`)
+        }
+        let o = extend(true, this, obj);
     }
     protected dateParser(key, value) {
         if (typeof value === 'string') {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nodejs-poolcontroller",
-    "version": "7.4.0",
+    "version": "7.5.1",
     "description": "nodejs-poolController",
     "main": "app.js",
     "author": {
@@ -25,6 +25,7 @@
         "extend": "^3.0.2",
         "jszip": "^3.7.1",
         "mqtt": "^4.2.8",
+        "multer": "^1.4.3",
         "multicast-dns": "^7.2.3",
         "node-ssdp": "^4.0.1",
         "serialport": "^9.2.1",
@@ -36,6 +37,7 @@
     "devDependencies": {
         "@types/express": "^4.17.13",
         "@types/extend": "^3.0.1",
+        "@types/multer": "^1.4.7",
         "@types/node": "^12.20.23",
         "@typescript-eslint/eslint-plugin": "^4.30.0",
         "@typescript-eslint/parser": "^4.30.0",