nodejs-poolcontroller 8.1.2 → 8.4.0

package/package.json

@@ -1,60 +1,58 @@
-{
-    "name": "nodejs-poolcontroller",
-    "version": "8.1.2",
-    "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": "^2.0.0",
-        "node-ssdp": "^4.0.1",
-        "serialport": "^11.0.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"
-    }
-}
+{
+    "name": "nodejs-poolcontroller",
+    "version": "8.4.0",
+    "description": "nodejs-poolController",
+    "main": "app.js",
+    "author": {
+        "name": "Russell Goldin",
+        "name2": "Robert Strouse"
+    },
+    "license": "AGPL-3.0-only",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/tagyoureit/nodejs-poolController.git"
+    },
+    "engines": {
+        "npm": ">=8.0.0",
+        "node": ">=20.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.35.0",
+        "eslint-config-promise": "^2.0.2",
+        "express": "^4.21.2",
+        "extend": "^3.0.2",
+        "jszip": "^3.9.1",
+        "mqtt": "^4.3.8",
+        "multer": "^2.0.2",
+        "multicast-dns": "^7.2.4",
+        "node-screenlogic": "^2.1.1",
+        "node-ssdp": "^4.0.1",
+        "serialport": "^11.0.1",
+        "socket.io": "^4.8.1",
+        "socket.io-client": "^4.8.1",
+        "source-map-support": "^0.5.21",
+        "winston": "^3.17.0"
+    },
+    "devDependencies": {
+        "@types/express": "^4.17.23",
+        "@types/extend": "^3.0.4",
+        "@types/node": "^20.19.17",
+        "@typescript-eslint/eslint-plugin": "^5.62.0",
+        "@typescript-eslint/parser": "^5.62.0",
+        "eslint": "^8.57.1",
+        "eslint-config-defaults": "^9.0.0",
+        "eslint-plugin-import": "^2.32.0",
+        "eslint-plugin-node": "^11.1.0",
+        "eslint-plugin-promise": "^6.6.0",
+        "grunt": "^1.5.3",
+        "grunt-banner": "^0.6.0",
+        "ts-node": "^10.9.2",
+        "typescript": "^4.9.5"
+    }
+}

package/sendSocket.js

@@ -1,32 +1,32 @@
-// Import Socket.IO client
-const io = require('socket.io-client');
-
-// Connect to the server
-const socket = io('http://localhost:4200');
-
-// Event handler for successful connection
-socket.on('connect', () => {
-    console.log('Connected to server.');
-
-    // Emit data to the server
-    socket.emit('message', 'Hello, server!');
-    socket.emit('echo', `testing 123`);
-    socket.on('echo', (string)=>{
-      console.log(string);
-    })
-    //const hexData = "02 10 01 01 14 00 03 10 02 10 01 01 14 00 03 10 02 10 01 01 14 00 03 10 02 10 02 01 80 20 00 00 00 00 00 00 b5 00 03 10 02 10 03 01 20 20 6f 50 6c 6f 54 20 6d 65 20 70 37 20 5f 34 20 46 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 07 00 10 d6 10 03 01 02 00 01 10 14 10 03 01 02 00 01 10 14 10 03 01 02 00 01 10 14";
-    const hexData = "10 02 01 80 20 00 00 00 00 00 00 b5 00 03 10 02 10 03";
-    const formattedHexData = hexData.split(' ').map(hex => parseInt(hex, 16));
-    //socket.emit('rawbytes', Buffer.from([1, 2, 3]));
-    socket.emit('rawbytes', formattedHexData);
-});
-
-// Event handler for receiving data from the server
-socket.on('message', (data) => {
-    console.log('Received from server:', data);
-});
-
-// Event handler for disconnection
-socket.on('disconnect', () => {
-    console.log('Disconnected from server.');
-});
+// Import Socket.IO client
+const io = require('socket.io-client');
+
+// Connect to the server
+const socket = io('http://localhost:4200');
+
+// Event handler for successful connection
+socket.on('connect', () => {
+    console.log('Connected to server.');
+
+    // Emit data to the server
+    socket.emit('message', 'Hello, server!');
+    socket.emit('echo', `testing 123`);
+    socket.on('echo', (string)=>{
+      console.log(string);
+    })
+    //const hexData = "02 10 01 01 14 00 03 10 02 10 01 01 14 00 03 10 02 10 01 01 14 00 03 10 02 10 02 01 80 20 00 00 00 00 00 00 b5 00 03 10 02 10 03 01 20 20 6f 50 6c 6f 54 20 6d 65 20 70 37 20 5f 34 20 46 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 07 00 10 d6 10 03 01 02 00 01 10 14 10 03 01 02 00 01 10 14 10 03 01 02 00 01 10 14";
+    const hexData = "10 02 01 80 20 00 00 00 00 00 00 b5 00 03 10 02 10 03";
+    const formattedHexData = hexData.split(' ').map(hex => parseInt(hex, 16));
+    //socket.emit('rawbytes', Buffer.from([1, 2, 3]));
+    socket.emit('rawbytes', formattedHexData);
+});
+
+// Event handler for receiving data from the server
+socket.on('message', (data) => {
+    console.log('Received from server:', data);
+});
+
+// Event handler for disconnection
+socket.on('disconnect', () => {
+    console.log('Disconnected from server.');
+});

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"
+    ]
+}

package/types/express-multer.d.ts

@@ -0,0 +1,32 @@
+/**
+ * Express Request augmentation for multer 2.x single/multiple file uploads.
+ * Added because our tsconfig include patterns did not pick up multer's
+ * automatic merging of Request.file / Request.files.
+ */
+import 'express';
+// Minimal subset of Multer's File definition; adjust if needed.
+interface MulterFile {
+  fieldname: string;
+  originalname: string;
+  encoding: string;
+  mimetype: string;
+  size: number;
+  buffer: Buffer;
+  destination?: string;
+  filename?: string;
+  path?: string;
+  stream?: NodeJS.ReadableStream;
+}
+
+declare global {
+  namespace Express {
+    interface Request {
+      /** Populated by multer single(field) */
+      file?: MulterFile;
+      /** Populated by multer array(field)/fields()/any() */
+      files?: MulterFile[] | { [fieldname: string]: MulterFile[] };
+    }
+  }
+}
+
+export {};