nodejs-poolcontroller 8.3.0 → 8.4.0

package/anslq25/pumps/MockPump.ts

@@ -1,84 +1,84 @@
-import { sys } from "../../controller/Equipment";
-import { PumpState, state } from "../../controller/State";
-import { Outbound } from "../../controller/comms/messages/Messages";
-import { conn } from "controller/comms/Comms";
-
-export class MockPump {
-  constructor(){}
-
-  public process(outboundMsg: Outbound){
-    let response: Outbound = Outbound.create({
-      portId: outboundMsg.portId,
-      protocol: outboundMsg.protocol
-    });
-
-    switch (outboundMsg.action){
-      case 7:
-        this.pumpStatus(outboundMsg, response);
-      default:
-        this.pumpAck(outboundMsg, response);
-    }
-  }
-
-  public pumpStatus(outboundMsg: Outbound, response: Outbound){
-    let pState:PumpState = state.pumps.getItemById(outboundMsg.dest - 96);
-    let pt = sys.board.valueMaps.pumpTypes.get(pState.type);
-    response.action = 7;
-    response.source = outboundMsg.dest;
-    response.dest = outboundMsg.source;
-    response.appendPayloadBytes(0, 15);
-    response.setPayloadByte(0, pState.command, 2);
-    response.setPayloadByte(1, pState.mode, 0);
-    response.setPayloadByte(2, pState.driveState, 2);
-    let watts = 0;
-    if (Math.max(pState.rpm, pState.flow) > 0){
-      if (pState.rpm > 0) watts = pState.rpm/pt.maxSpeed * 2000 + this.random(100);
-      else if (pState.flow > 0) watts = pState.flow/pt.maxFlow * 2000 + this.random(100);
-      else //ss, ds, etc
-      watts = 2000 + this.random(250);
-    }
-    response.setPayloadByte(3, Math.floor(watts / 256), 0);
-    response.setPayloadByte(4, watts % 256, 0);
-    response.setPayloadByte(5, Math.floor(pState.rpm / 256), 0);
-    response.setPayloadByte(6, pState.rpm % 256, 0);
-    response.setPayloadByte(7, pState.flow, 0);
-    response.setPayloadByte(8, pState.ppc, 0);
-    // 9, 10 = unknown
-    // 11, 12 = Status code; 
-    response.setPayloadByte(11, Math.floor(pState.status / 256), 0);
-    response.setPayloadByte(12, pState.status % 256, 1);
-    let time = new Date();
-    response.setPayloadByte(13, time.getHours() * 60);
-    response.setPayloadByte(14, time.getMinutes());
-    
-    conn.queueSendMessage(response);
-  }
-
-  public pumpAck(outboundMsg: Outbound, response: Outbound){
-    response.action = outboundMsg.action;
-    response.source = outboundMsg.dest;
-    response.dest = outboundMsg.source;
-    switch (outboundMsg.action){
-      case 1:
-      case 10: {
-        response.appendPayloadByte(outboundMsg.payload[2]);
-        response.appendPayloadByte(outboundMsg.payload[3]);
-        break;
-      }
-      default:    
-        response.appendPayloadByte(outboundMsg.payload[0]);
-      }
-    conn.queueSendMessage(response);
-  }
-
-  private random(bounds: number, onlyPositive: boolean = false){
-    let rand = Math.random() * bounds;
-    if (!onlyPositive) {
-      if (Math.random()<=.5) rand = rand * -1;
-    }
-    return rand;
-  }
-
-}
-
+import { sys } from "../../controller/Equipment";
+import { PumpState, state } from "../../controller/State";
+import { Outbound } from "../../controller/comms/messages/Messages";
+import { conn } from "controller/comms/Comms";
+
+export class MockPump {
+  constructor(){}
+
+  public process(outboundMsg: Outbound){
+    let response: Outbound = Outbound.create({
+      portId: outboundMsg.portId,
+      protocol: outboundMsg.protocol
+    });
+
+    switch (outboundMsg.action){
+      case 7:
+        this.pumpStatus(outboundMsg, response);
+      default:
+        this.pumpAck(outboundMsg, response);
+    }
+  }
+
+  public pumpStatus(outboundMsg: Outbound, response: Outbound){
+    let pState:PumpState = state.pumps.getItemById(outboundMsg.dest - 96);
+    let pt = sys.board.valueMaps.pumpTypes.get(pState.type);
+    response.action = 7;
+    response.source = outboundMsg.dest;
+    response.dest = outboundMsg.source;
+    response.appendPayloadBytes(0, 15);
+    response.setPayloadByte(0, pState.command, 2);
+    response.setPayloadByte(1, pState.mode, 0);
+    response.setPayloadByte(2, pState.driveState, 2);
+    let watts = 0;
+    if (Math.max(pState.rpm, pState.flow) > 0){
+      if (pState.rpm > 0) watts = pState.rpm/pt.maxSpeed * 2000 + this.random(100);
+      else if (pState.flow > 0) watts = pState.flow/pt.maxFlow * 2000 + this.random(100);
+      else //ss, ds, etc
+      watts = 2000 + this.random(250);
+    }
+    response.setPayloadByte(3, Math.floor(watts / 256), 0);
+    response.setPayloadByte(4, watts % 256, 0);
+    response.setPayloadByte(5, Math.floor(pState.rpm / 256), 0);
+    response.setPayloadByte(6, pState.rpm % 256, 0);
+    response.setPayloadByte(7, pState.flow, 0);
+    response.setPayloadByte(8, pState.ppc, 0);
+    // 9, 10 = unknown
+    // 11, 12 = Status code; 
+    response.setPayloadByte(11, Math.floor(pState.status / 256), 0);
+    response.setPayloadByte(12, pState.status % 256, 1);
+    let time = new Date();
+    response.setPayloadByte(13, time.getHours() * 60);
+    response.setPayloadByte(14, time.getMinutes());
+    
+    conn.queueSendMessage(response);
+  }
+
+  public pumpAck(outboundMsg: Outbound, response: Outbound){
+    response.action = outboundMsg.action;
+    response.source = outboundMsg.dest;
+    response.dest = outboundMsg.source;
+    switch (outboundMsg.action){
+      case 1:
+      case 10: {
+        response.appendPayloadByte(outboundMsg.payload[2]);
+        response.appendPayloadByte(outboundMsg.payload[3]);
+        break;
+      }
+      default:    
+        response.appendPayloadByte(outboundMsg.payload[0]);
+      }
+    conn.queueSendMessage(response);
+  }
+
+  private random(bounds: number, onlyPositive: boolean = false){
+    let rand = Math.random() * bounds;
+    if (!onlyPositive) {
+      if (Math.random()<=.5) rand = rand * -1;
+    }
+    return rand;
+  }
+
+}
+
 export var mockPump: MockPump = new MockPump();

package/app.ts

@@ -1,116 +1,116 @@
-/*  nodejs-poolController.  An application to control pool equipment.
-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
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// add source map support for .js to .ts files
-//require('source-map-support').install();
-import 'source-map-support/register';
-
-import { logger } from "./logger/Logger";
-import { config } from "./config/Config";
-import { conn } from "./controller/comms/Comms";
-import { sys } from "./controller/Equipment";
-
-import { state } from "./controller/State";
-import { webApp, REMInterfaceServer } from "./web/Server";
-import * as readline from 'readline';
-import { sl } from './controller/comms/ScreenLogic'
-
-export async function initAsync() {
-    try {
-        await config.init();
-        await logger.init();
-        await sys.init();
-        await state.init();
-        await webApp.init();
-        await conn.initAsync();
-        await sys.start();
-        await webApp.initAutoBackup();
-        await sl.openAsync();
-    } catch (err) { console.log(`Error Initializing nodejs-PoolController ${err.message}`);  }
-}
-
-export async function startPacketCapture(bResetLogs: boolean) {
-    try {
-        let log = config.getSection('log');
-        log.app.captureForReplay = true;
-        config.setSection('log', log);
-        logger.startCaptureForReplay(bResetLogs);
-        if (bResetLogs){
-            sys.resetSystem();
-        }
-        
-        // Start packet capture on the REM server
-        await REMInterfaceServer.startPacketCaptureOnRemServer();
-    }
-    catch (err) {
-        console.error(`Error starting replay: ${ err.message }`);
-    }
-}
-export async function stopPacketCaptureAsync() {
-    let log = config.getSection('log');
-    log.app.captureForReplay = false;
-    config.setSection('log', log);
-    
-    // Stop packet capture on the REM server and collect its logs
-    let remLogs = await REMInterfaceServer.stopPacketCaptureOnRemServer();
-    
-    // Pass REM logs to the logger for inclusion in the backup
-    return logger.stopCaptureForReplayAsync(remLogs);
-}
-export async function stopAsync(): Promise<void> {
-    try {
-        console.log('Shutting down open processes');
-        await webApp.stopAutoBackup();
-        await sys.stopAsync();
-        await state.stopAsync();
-        await conn.stopAsync();
-        await sl.closeAsync();
-        await webApp.stopAsync();
-        await config.updateAsync();
-        await logger.stopAsync();
-        // RKS: Uncomment below to see the shutdown process
-        //await new Promise<void>((resolve, reject) => { setTimeout(() => { resolve(); }, 20000); });
-    }
-    catch (err) {
-        console.error(`Error stopping processes: ${ err.message }`);
-    }
-    finally {
-        process.exit();
-    }
-}
-if (process.platform === 'win32') {
-    let rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    rl.on('SIGINT', async function () {
-        try { await stopAsync(); } catch (err) { console.log(`Error shutting down processes ${err.message}`); }
-    });
-}
-else {
-    process.stdin.resume();
-    process.on('SIGINT', async function () {
-        try { return await stopAsync(); } catch (err) { console.log(`Error shutting down processes ${err.message}`); }
-    });
-}
-if (typeof process === 'object') {
-    process.on('unhandledRejection', (error: Error, promise) => {
-        console.group('unhandled rejection');
-        console.error("== Node detected an unhandled rejection! ==");
-        console.error(error.message);
-        console.error(error.stack);
-        console.groupEnd();
-    });
-}
+/*  nodejs-poolController.  An application to control pool equipment.
+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
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// add source map support for .js to .ts files
+//require('source-map-support').install();
+import 'source-map-support/register';
+
+import { logger } from "./logger/Logger";
+import { config } from "./config/Config";
+import { conn } from "./controller/comms/Comms";
+import { sys } from "./controller/Equipment";
+
+import { state } from "./controller/State";
+import { webApp, REMInterfaceServer } from "./web/Server";
+import * as readline from 'readline';
+import { sl } from './controller/comms/ScreenLogic'
+
+export async function initAsync() {
+    try {
+        await config.init();
+        await logger.init();
+        await sys.init();
+        await state.init();
+        await webApp.init();
+        await conn.initAsync();
+        await sys.start();
+        await webApp.initAutoBackup();
+        await sl.openAsync();
+    } catch (err) { console.log(`Error Initializing nodejs-PoolController ${err.message}`);  }
+}
+
+export async function startPacketCapture(bResetLogs: boolean) {
+    try {
+        let log = config.getSection('log');
+        log.app.captureForReplay = true;
+        config.setSection('log', log);
+        logger.startCaptureForReplay(bResetLogs);
+        if (bResetLogs){
+            await sys.resetSystemAsync();
+        }
+        
+        // Start packet capture on the REM server
+        await REMInterfaceServer.startPacketCaptureOnRemServer();
+    }
+    catch (err) {
+        console.error(`Error starting replay: ${ err.message }`);
+    }
+}
+export async function stopPacketCaptureAsync() {
+    let log = config.getSection('log');
+    log.app.captureForReplay = false;
+    config.setSection('log', log);
+    
+    // Stop packet capture on the REM server and collect its logs
+    let remLogs = await REMInterfaceServer.stopPacketCaptureOnRemServer();
+    
+    // Pass REM logs to the logger for inclusion in the backup
+    return logger.stopCaptureForReplayAsync(remLogs);
+}
+export async function stopAsync(): Promise<void> {
+    try {
+        console.log('Shutting down open processes');
+        await webApp.stopAutoBackup();
+        await sys.stopAsync();
+        await state.stopAsync();
+        await conn.stopAsync();
+        await sl.closeAsync();
+        await webApp.stopAsync();
+        await config.updateAsync();
+        await logger.stopAsync();
+        // RKS: Uncomment below to see the shutdown process
+        //await new Promise<void>((resolve, reject) => { setTimeout(() => { resolve(); }, 20000); });
+    }
+    catch (err) {
+        console.error(`Error stopping processes: ${ err.message }`);
+    }
+    finally {
+        process.exit();
+    }
+}
+if (process.platform === 'win32') {
+    let rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    rl.on('SIGINT', async function () {
+        try { await stopAsync(); } catch (err) { console.log(`Error shutting down processes ${err.message}`); }
+    });
+}
+else {
+    process.stdin.resume();
+    process.on('SIGINT', async function () {
+        try { return await stopAsync(); } catch (err) { console.log(`Error shutting down processes ${err.message}`); }
+    });
+}
+if (typeof process === 'object') {
+    process.on('unhandledRejection', (error: Error, promise) => {
+        console.group('unhandled rejection');
+        console.error("== Node detected an unhandled rejection! ==");
+        console.error(error.message);
+        console.error(error.stack);
+        console.groupEnd();
+    });
+}
 ( async () => { await initAsync() })();