nodejs-poolcontroller 7.7.0 → 8.0.1

package/controller/nixie/schedules/Schedule.ts

@@ -157,7 +157,7 @@ export class NixieSchedule extends NixieEquipment {
             let shouldBeOn = this.shouldBeOn(); // This should also set the validity for the schedule if there are errors.
             
             let manualPriorityActive: boolean = shouldBeOn ? sys.board.schedules.manualPriorityActive(ssched) : false;
-            console.log(`Processing schedule ${this.schedule.id} - ${circuit.name} : ShouldBeOn: ${shouldBeOn} ManualPriorityActive: ${manualPriorityActive} Running: ${this.running} Suspended: ${this.suspended} Resumed: ${this.resumed}`);
+            //console.log(`Processing schedule ${this.schedule.id} - ${circuit.name} : ShouldBeOn: ${shouldBeOn} ManualPriorityActive: ${manualPriorityActive} Running: ${this.running} Suspended: ${this.suspended} Resumed: ${this.resumed}`);
 
 
             // COND 1: The schedule should be on and the schedule is not yet on.
@@ -208,8 +208,14 @@ export class NixieSchedule extends NixieEquipment {
                     this.resumed = true;
                 }
                 this.suspended = !cstate.isOn;
-                ssched.isOn = cstate.isOn && !manualPriorityActive;
-                if (this.suspended && !cstate.isOn) ssched.manualPriorityActive = false;
+                if (manualPriorityActive){
+                    ssched.isOn = false;
+                    ssched.manualPriorityActive = true;
+                }
+                else {
+                    ssched.isOn = cstate.isOn;
+                    ssched.manualPriorityActive = false;  
+                }
             }
             // Our schedule has expired it is time to turn it off, but only if !manualPriorityActive.
             else if (!shouldBeOn) {

package/defaultConfig.json

@@ -1,10 +1,11 @@
 {
   "controller": {
     "comms": {
+      "type": "local",
       "portId": 0,
       "enabled": true,
       "rs485Port": "/dev/ttyUSB0",
-      "mockPort": false,
+      "mock": false,
       "netConnect": false,
       "netHost": "raspberrypi",
       "netPort": 9801,
@@ -14,9 +15,19 @@
         "dataBits": 8,
         "parity": "none",
         "stopBits": 1,
-        "flowControl": false,
+        "rtscts": false,
         "autoOpen": false,
         "lock": false
+      },
+      "netSettings": {
+        "allowHalfOpen": false,
+        "keepAlive": false,
+        "keepAliveInitialDelay": 5
+      },
+      "screenlogic": {
+        "connectionType": "local",
+        "systemName": "Pentair: 00-00-00",
+        "password": 1234
       }
     },
     "backups": {
@@ -29,7 +40,6 @@
       "njsPC":  true,
       "servers": []
     }
-
   },
   "web": {
     "servers": {
@@ -176,8 +186,11 @@
           "retain": true,
           "qos": 0,
           "changesOnly": true
+        },
+        "vars": {
+          "tempPrecision": 2,
+          "tempUnits": "@bind=sys.board.valueMaps.tempUnits.getName(state.temps.units);"
         }
-
       },
       "mqttAlt": {
         "name": "MQTTAlt",
@@ -197,6 +210,29 @@
           "changesOnly": true
         }
       },
+      "homeAssistant": {
+        "name": "Home Assistant",
+        "type": "mqtt",
+        "enabled": false,
+        "fileName": "homeassistant.json",
+        "globals": {},
+        "options": {
+          "protocol": "mqtt://",
+          "host": "192.168.0.1",
+          "port": 1883,
+          "username": "",
+          "password": "",
+          "selfSignedCertificate": false,
+          "retain": true,
+          "qos": 0,
+          "changesOnly": true
+        },
+        "vars": {
+          "_note": "hassTopic is the topic that HASS reads for configuration and should not be changed.  mqttTopic should match the topic in the MQTT binding (do not use MQTTAlt for HASS).",
+          "hassTopic": "homeassistant",
+          "mqttTopic": "@bind=(state.equipment.model).replace(' ','-').replace('/','').toLowerCase();"
+        }
+      },
       "rem": {
         "name": "Relay Equipment Manager",
         "type": "rem",
@@ -222,10 +258,15 @@
     }
   },
   "log": {
-    "packet": {
+    "screenlogic": {
       "enabled": false,
+      "logToConsole": false,
+      "logToFile": false
+    },
+    "packet": {
       "logToConsole": false,
       "logToFile": false,
+      "enabled": false,
       "filename": "packetLog",
       "invalid": true,
       "broadcast": {

package/logger/Logger.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
@@ -22,6 +23,7 @@ import { utils } from "../controller/Constants";
 import { Message } from '../controller/comms/messages/Messages';
 import { config } from '../config/Config';
 import { webApp } from '../web/Server';
+import { sl } from '../controller/comms/ScreenLogic';
 
 const extend = require("extend");
 
@@ -32,9 +34,11 @@ class Logger {
         this.captureForReplayBaseDir = path.join(process.cwd(), '/logs/', this.getLogTimestamp());
         /*         this.captureForReplayPath = path.join(this.captureForReplayBaseDir, '/packetCapture.json'); */
         this.pkts = [];
+        this.slMessages = [];
     }
     private cfg;
     private pkts: Message[];
+    private slMessages: any[];
     private pktPath: string;
     private consoleToFilePath: string;
     private transports: { console: winston.transports.ConsoleTransportInstance, file?: winston.transports.FileTransportInstance, consoleFile?: winston.transports.FileTransportInstance } = {
@@ -163,6 +167,25 @@ class Logger {
             else if (!msg.isValid) logger._logger.warn(msg.toLog());
         }
     }
+    public screenlogic(data: any){
+        if (logger.cfg.screenlogic.enabled || logger.cfg.app.captureForReplay){
+            if (logger.cfg.screenlogic.logToFile) {
+                logger.slMessages.push(data);
+                if (logger.slMessages.length > 5)
+                    logger.flushSLLogs();
+                else {
+                    // Attempt to ease up on the writes if we are logging a bunch of packets.
+                    if (logger.pktTimer) clearTimeout(logger.pktTimer);
+                    logger.pktTimer = setTimeout(logger.flushSLLogs, 1000);
+                }
+            }
+            webApp.emitToChannel('msgLogger', 'logMessage', data);
+
+        }
+        if (logger.cfg.screenlogic.logToConsole){
+            logger._logger.info(sl.toLog(data));
+        }
+    }
     public logAPI(apiReq:string){
         if (logger.cfg.app.captureForReplay){
             // TODO: buffer this
@@ -183,6 +206,7 @@ class Logger {
         var buf: string = '';
         if (logger.cfg.packet.enabled) {
             for (let i = 0; i < p.length; i++) {
+             
                 buf += (p[i].toLog() + os.EOL);
             }
             fs.appendFile(logger.pktPath, buf, function(err) {
@@ -190,14 +214,19 @@ class Logger {
             });
         }
         buf = '';
-        /*         if (logger.cfg.app.captureForReplay) {
-                    for (let i = 0; i < p.length; i++) {
-                        buf += (p[i].toReplay() + os.EOL);
-                    }
-                    fs.appendFile(logger.captureForReplayPath, buf, function (err) {
-                        if (err) logger.error('Error writing replay to %s: %s', logger.captureForReplayPath, err);
-                    });
-                } */
+    }
+    public flushSLLogs() {
+        var p: any[] = logger.slMessages.splice(0, logger.slMessages.length);
+        var buf: string = '';
+       
+            for (let i = 0; i < p.length; i++) {
+                buf += (p[i] + os.EOL);
+            }
+            fs.appendFile(logger.pktPath, buf, function(err) {
+                if (err) logger.error(`Error writing screenlogic message to ${logger.pktPath}: ${err.message}`);
+            });
+        
+        buf = '';
     }
     public setOptions(opts, c?: any) {
         c = typeof c === 'undefined' ? this.cfg : c;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nodejs-poolcontroller",
-    "version": "7.7.0",
+    "version": "8.0.1",
     "description": "nodejs-poolController",
     "main": "app.js",
     "author": {
@@ -12,6 +12,10 @@
         "type": "git",
         "url": "https://github.com/tagyoureit/nodejs-poolController.git"
     },
+    "engines": {
+        "npm": ">=7.0.0",
+        "node": ">=16.0.0"
+    },
     "scripts": {
         "start": "npm run build && node dist/app.js",
         "start:cached": "node dist/app.js",
@@ -19,16 +23,17 @@
         "watch": "tsc -w"
     },
     "dependencies": {
-        "@influxdata/influxdb-client": "^1.25.0",
+        "@influxdata/influxdb-client": "^1.32.0",
         "eslint-config-promise": "^2.0.2",
         "express": "^4.18.1",
         "extend": "^3.0.2",
         "jszip": "^3.9.1",
         "mqtt": "^4.3.7",
-        "multer": "^1.4.4",
+        "multer": "^1.4.5-lts.1",
         "multicast-dns": "^7.2.4",
+        "node-screenlogic": "^2.0.0",
         "node-ssdp": "^4.0.1",
-        "serialport": "^9.2.8",
+        "serialport": "^10.4.0",
         "socket.io": "^4.5.0",
         "socket.io-client": "^4.5.0",
         "source-map-support": "^0.5.21",
@@ -38,12 +43,11 @@
         "@types/express": "^4.17.13",
         "@types/extend": "^3.0.1",
         "@types/multer": "^1.4.7",
-        "@types/node": "^12.20.52",
-        "@typescript-eslint/eslint-plugin": "^5.23.0",
-        "@typescript-eslint/parser": "^5.23.0",
-        "eslint": "^8.15.0",
+        "@types/node": "^16.11.48",
+        "@typescript-eslint/eslint-plugin": "^5.33.0",
+        "@typescript-eslint/parser": "^5.33.0",
+        "eslint": "^8.21.0",
         "eslint-config-defaults": "^9.0.0",
-        "eslint-config-standard": "^16.0.3",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-node": "^11.1.0",
         "eslint-plugin-promise": "^6.0.0",