nodejs-poolcontroller 8.1.1 → 8.3.0

package/package.json

@@ -1,20 +1,20 @@
 {
     "name": "nodejs-poolcontroller",
-    "version": "8.1.1",
+    "version": "8.3.0",
     "description": "nodejs-poolController",
     "main": "app.js",
     "author": {
         "name": "Russell Goldin",
         "name2": "Robert Strouse"
     },
-    "license": "GNU Affero General Public License v3.0",
+    "license": "AGPL-3.0-only",
     "repository": {
         "type": "git",
         "url": "https://github.com/tagyoureit/nodejs-poolController.git"
     },
     "engines": {
-        "npm": ">=7.0.0",
-        "node": ">=16.0.0"
+        "npm": ">=8.0.0",
+        "node": ">=20.0.0"
     },
     "scripts": {
         "start": "npm run build && node dist/app.js",
@@ -23,38 +23,36 @@
         "watch": "tsc -w"
     },
     "dependencies": {
-        "@influxdata/influxdb-client": "^1.32.0",
+        "@influxdata/influxdb-client": "^1.35.0",
         "eslint-config-promise": "^2.0.2",
-        "express": "^4.18.1",
+        "express": "^4.21.2",
         "extend": "^3.0.2",
         "jszip": "^3.9.1",
-        "mqtt": "^4.3.7",
-        "multer": "^1.4.5-lts.1",
+        "mqtt": "^4.3.8",
+        "multer": "^2.0.2",
         "multicast-dns": "^7.2.4",
-        "node-screenlogic": "^2.0.0",
+        "node-screenlogic": "^2.1.1",
         "node-ssdp": "^4.0.1",
-        "serialport": "^11.0.0",
-        "socket.io": "^4.5.0",
-        "socket.io-client": "^4.5.0",
+        "serialport": "^11.0.1",
+        "socket.io": "^4.8.1",
+        "socket.io-client": "^4.8.1",
         "source-map-support": "^0.5.21",
-        "winston": "^3.7.2"
+        "winston": "^3.17.0"
     },
     "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",
+        "@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.26.0",
+        "eslint-plugin-import": "^2.32.0",
         "eslint-plugin-node": "^11.1.0",
-        "eslint-plugin-promise": "^6.0.0",
-        "eslint-plugin-standard": "^5.0.0",
+        "eslint-plugin-promise": "^6.6.0",
         "grunt": "^1.5.3",
         "grunt-banner": "^0.6.0",
-        "ts-node": "^10.7.0",
-        "typescript": "^4.6.4"
+        "ts-node": "^10.9.2",
+        "typescript": "^4.9.5"
     }
 }

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 {};

package/.github/workflows/docker-publish-njsPC-linux.yml

@@ -1,50 +0,0 @@
-name: Publish Docker Image - Ubuntu
-
-on:
-  push:
-    branches:
-      - master
-    tags:
-      - "v*.*.*"
-  workflow_dispatch:
-    
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          # list of Docker images to use as base name for tags
-          images: |
-            tagyoureit/njspc          
-          # generate Docker tags based on the following events/attributes
-          tags: |
-            type=schedule
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push combined Docker image
-        uses: docker/build-push-action@v6
-        with:
-          push: true
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}