nodejs-poolcontroller 7.6.1 → 8.0.0

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,56 +1,60 @@
-{
-    "name": "nodejs-poolcontroller",
-    "version": "7.6.1",
-    "description": "nodejs-poolController",
-    "main": "app.js",
-    "author": {
-        "name": "Russell Goldin",
-        "name2": "Robert Strouse"
-    },
-    "license": "GNU Affero General Public License v3.0",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/tagyoureit/nodejs-poolController.git"
-    },
-    "scripts": {
-        "start": "npm run build && node dist/app.js",
-        "start:cached": "node dist/app.js",
-        "build": "tsc",
-        "watch": "tsc -w"
-    },
-    "dependencies": {
-        "@influxdata/influxdb-client": "^1.22.0",
-        "eslint-config-promise": "^2.0.2",
-        "express": "^4.17.2",
-        "extend": "^3.0.2",
-        "jszip": "^3.7.1",
-        "mqtt": "^4.3.5",
-        "multer": "^1.4.4",
-        "multicast-dns": "^7.2.4",
-        "node-ssdp": "^4.0.1",
-        "serialport": "^9.2.8",
-        "socket.io": "^4.4.1",
-        "socket.io-client": "^4.4.1",
-        "source-map-support": "^0.5.21",
-        "winston": "^3.5.1"
-    },
-    "devDependencies": {
-        "@types/express": "^4.17.13",
-        "@types/extend": "^3.0.1",
-        "@types/multer": "^1.4.7",
-        "@types/node": "^12.20.43",
-        "@typescript-eslint/eslint-plugin": "^5.11.0",
-        "@typescript-eslint/parser": "^5.11.0",
-        "eslint": "^8.8.0",
-        "eslint-config-defaults": "^9.0.0",
-        "eslint-config-standard": "^16.0.3",
-        "eslint-plugin-import": "^2.25.4",
-        "eslint-plugin-node": "^11.1.0",
-        "eslint-plugin-promise": "^6.0.0",
-        "eslint-plugin-standard": "^5.0.0",
-        "grunt": "^1.4.1",
-        "grunt-banner": "^0.6.0",
-        "ts-node": "^10.5.0",
-        "typescript": "^4.5.5"
-    }
-}
+{
+    "name": "nodejs-poolcontroller",
+    "version": "8.0.0",
+    "description": "nodejs-poolController",
+    "main": "app.js",
+    "author": {
+        "name": "Russell Goldin",
+        "name2": "Robert Strouse"
+    },
+    "license": "GNU Affero General Public License v3.0",
+    "repository": {
+        "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",
+        "build": "tsc",
+        "watch": "tsc -w"
+    },
+    "dependencies": {
+        "@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.5-lts.1",
+        "multicast-dns": "^7.2.4",
+        "node-screenlogic": "^1.10.1",
+        "node-ssdp": "^4.0.1",
+        "serialport": "^10.4.0",
+        "socket.io": "^4.5.0",
+        "socket.io-client": "^4.5.0",
+        "source-map-support": "^0.5.21",
+        "winston": "^3.7.2"
+    },
+    "devDependencies": {
+        "@types/express": "^4.17.13",
+        "@types/extend": "^3.0.1",
+        "@types/multer": "^1.4.7",
+        "@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-plugin-import": "^2.26.0",
+        "eslint-plugin-node": "^11.1.0",
+        "eslint-plugin-promise": "^6.0.0",
+        "eslint-plugin-standard": "^5.0.0",
+        "grunt": "^1.5.3",
+        "grunt-banner": "^0.6.0",
+        "ts-node": "^10.7.0",
+        "typescript": "^4.6.4"
+    }
+}

package/tsconfig.json

@@ -1,25 +1,25 @@
-{
-    "compilerOptions": {
-        "baseUrl": ".",
-       // "paths": { "*": [ "@types/*" ] },
-        "target":"esnext",
-        "module":"commonjs",
-        "noImplicitAny": false,
-        "removeComments": true,
-        "preserveConstEnums": true,
-        "sourceMap": true,
-        "outDir": "dist",
-        "moduleResolution": "node",
-        "allowJs": false,
-        "allowSyntheticDefaultImports": false,
-        "esModuleInterop": false,
-        "jsx": "react"
-    },
-    "include": [
-        "web/**/*",
-        "logger/**/*",
-        "controller/**/*",
-        "config/**/*", 
-        "**/*.ts"
-    ]
-}
+{
+    "compilerOptions": {
+        "baseUrl": ".",
+       // "paths": { "*": [ "@types/*" ] },
+        "target":"esnext",
+        "module":"commonjs",
+        "noImplicitAny": false,
+        "removeComments": true,
+        "preserveConstEnums": true,
+        "sourceMap": true,
+        "outDir": "dist",
+        "moduleResolution": "node",
+        "allowJs": false,
+        "allowSyntheticDefaultImports": false,
+        "esModuleInterop": false,
+        "jsx": "react"
+    },
+    "include": [
+        "web/**/*",
+        "logger/**/*",
+        "controller/**/*",
+        "config/**/*", 
+        "**/*.ts"
+    ]
+}