From 392c5104f409a3b51b91504b3f8db2ef81b13183 Mon Sep 17 00:00:00 2001
From: lllllllillllllillll
 <147879489+lllllllillllllillll@users.noreply.github.com>
Date: Sat, 25 Nov 2023 00:24:53 -0800
Subject: [PATCH] Add files via upload

---
 app.js            | 24 +++++++++++++-----------
 package-lock.json | 25 ++++++++++++++-----------
 package.json      |  2 +-
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/app.js b/app.js
index 66518b6..e9b782d 100644
--- a/app.js
+++ b/app.js
@@ -1,7 +1,17 @@
 const express = require("express");
-const session = require("express-session");
-const redis = require('connect-redis');
 const app = express();
+const session = require("express-session");
+const redis = require('redis');
+const RedisStore = require("connect-redis").default;
+const redisClient = redis.createClient({
+    url: "redis://DweebCache:6379",
+    password: process.env.REDIS_PASS,
+});
+redisClient.connect().catch(console.log);
+let redisStore = new RedisStore({
+    client: redisClient,
+});
+
 const routes = require("./routes");
 
 const { serverStats, containerList, containerStats, containerAction } = require('./functions/system_information');
@@ -10,16 +20,8 @@ const { RefreshSites } = require('./controllers/site_actions');
 let sent_list, clicked;
 app.locals.site_list = '';
 
-const redisClient = require('redis').createClient({
-    url: 'redis://DweebCache:6379',
-    password: process.env.REDIS_PASS,
-    legacyMode:true
-});
-redisClient.connect().catch(console.log);
-const RedisStore = redis(session);
-
 const sessionMiddleware = session({
-    store:new RedisStore({client:redisClient}),
+    store: redisStore,
     secret: "keyboard cat", 
     resave: false, 
     saveUninitialized: false, 
diff --git a/package-lock.json b/package-lock.json
index 58e6071..ceee248 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "bcrypt": "^5.1.0",
         "child_process": "^1.0.2",
-        "connect-redis": "^6.1.3",
+        "connect-redis": "^7.1.0",
         "dockerode": "^4.0.0",
         "dockerode-compose": "^1.4.0",
         "ejs": "^3.1.9",
@@ -173,9 +173,9 @@
       "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g=="
     },
     "node_modules/@types/node": {
-      "version": "20.9.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.4.tgz",
-      "integrity": "sha512-wmyg8HUhcn6ACjsn8oKYjkN/zUzQeNtMy44weTJSM6p4MMzEOuKbA3OjJ267uPCOW7Xex9dyrNTful8XTQYoDA==",
+      "version": "20.10.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.0.tgz",
+      "integrity": "sha512-D0WfRmU9TQ8I9PFx9Yc+EBHw+vSpIub4IDvQivcp26PtPrdMGAq5SDcpXEo/epqa/DXotVpekHiLNTg3iaKXBQ==",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -565,11 +565,14 @@
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
     },
     "node_modules/connect-redis": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/connect-redis/-/connect-redis-6.1.3.tgz",
-      "integrity": "sha512-aaNluLlAn/3JPxRwdzw7lhvEoU6Enb+d83xnokUNhC9dktqBoawKWL+WuxinxvBLTz6q9vReTnUDnUslaz74aw==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/connect-redis/-/connect-redis-7.1.0.tgz",
+      "integrity": "sha512-UaqO1EirWjON2ENsyau7N5lbkrdYBpS6mYlXSeff/OYXsd6EGZ+SXSmNPoljL2PSua8fgjAEaldSA73PMZQ9Eg==",
       "engines": {
-        "node": ">=12"
+        "node": ">=16"
+      },
+      "peerDependencies": {
+        "express-session": ">=1"
       }
     },
     "node_modules/console-control-strings": {
@@ -2403,9 +2406,9 @@
       }
     },
     "node_modules/systeminformation": {
-      "version": "5.21.17",
-      "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.21.17.tgz",
-      "integrity": "sha512-JZYRCbIjk3WuBV59A9/rTla2rROX+aAJ9uo2Z1dI+bjieORcukClN8rlM1zE9NYKpULSbaGc+KKct/870lO0DA==",
+      "version": "5.21.18",
+      "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.21.18.tgz",
+      "integrity": "sha512-PEoWd95nI5170rvIk4fagLH0SmzwfGt18w0+ex1Ljb2bSXvDs9PQdLNexMazL5L6Pzd6wxlpoWUAjX+hNRKN7g==",
       "os": [
         "darwin",
         "linux",
diff --git a/package.json b/package.json
index 41d539f..768113d 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "bcrypt": "^5.1.0",
     "child_process": "^1.0.2",
-    "connect-redis": "^6.1.3",
+    "connect-redis": "^7.1.0",
     "dockerode": "^4.0.0",
     "dockerode-compose": "^1.4.0",
     "ejs": "^3.1.9",