From c2f6309080ae177afc794a0a75a145f035143f6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Mon, 10 Jun 2024 20:55:39 -0400
Subject: [PATCH 1/2] test: fix tests

---
 src/routes/api.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/api.js b/src/routes/api.js
index 7f4afdc801..0fe575a326 100644
--- a/src/routes/api.js
+++ b/src/routes/api.js
@@ -6,7 +6,7 @@ const uploadsController = require('../controllers/uploads');
 const helpers = require('./helpers');
 
 module.exports = function (app, middleware, controllers) {
-	const middlewares = [middleware.authenticateRequest];
+	const middlewares = [middleware.autoLocale, middleware.authenticateRequest];
 	const router = express.Router();
 	app.use('/api', router);
 

From 60b4bc662f29d9e72d122494a6950eac02846a0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Tue, 11 Jun 2024 11:53:19 -0400
Subject: [PATCH 2/2] feat: show connetion count on /info

---
 public/language/en-GB/admin/development/info.json | 3 ++-
 src/socket.io/admin/rooms.js                      | 2 ++
 src/views/admin/development/info.tpl              | 7 ++++---
 src/webserver.js                                  | 4 ++++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/public/language/en-GB/admin/development/info.json b/public/language/en-GB/admin/development/info.json
index 11202d9c3a..9834719daf 100644
--- a/public/language/en-GB/admin/development/info.json
+++ b/public/language/en-GB/admin/development/info.json
@@ -3,7 +3,7 @@
 	"ip": "IP <strong>%1</strong>",
 	"nodes-responded": "%1 nodes responded within %2ms!",
 	"host": "host",
-	"primary": "primary / run jobs",
+	"primary": "primary / jobs",
 	"pid": "pid",
 	"nodejs": "nodejs",
 	"online": "online",
@@ -19,6 +19,7 @@
 
 	"registered": "Registered",
 	"sockets": "Sockets",
+	"connection-count": "Connection Count",
 	"guests": "Guests",
 
 	"info": "Info"
diff --git a/src/socket.io/admin/rooms.js b/src/socket.io/admin/rooms.js
index c426d0c7d6..a8107edaa7 100644
--- a/src/socket.io/admin/rooms.js
+++ b/src/socket.io/admin/rooms.js
@@ -2,6 +2,7 @@
 
 const topics = require('../../topics');
 const io = require('..');
+const webserver = require('../../webserver');
 
 const totals = {};
 
@@ -94,6 +95,7 @@ SocketRooms.getLocalStats = function () {
 		onlineGuestCount: 0,
 		onlineRegisteredCount: 0,
 		socketCount: 0,
+		connectionCount: webserver.getConnectionCount(),
 		users: {
 			categories: 0,
 			recent: 0,
diff --git a/src/views/admin/development/info.tpl b/src/views/admin/development/info.tpl
index 7440729fab..281631bfb2 100644
--- a/src/views/admin/development/info.tpl
+++ b/src/views/admin/development/info.tpl
@@ -19,7 +19,7 @@
 						<td class="fw-bold">[[admin/development/info:process-memory]]</td>
 						<td class="fw-bold">[[admin/development/info:system-memory]]</td>
 						<td class="fw-bold">[[admin/development/info:load]]</td>
-						<td class="fw-bold">[[admin/development/info:uptime]]</td>
+						<td class="fw-bold text-end">[[admin/development/info:uptime]]</td>
 					</tr>
 				</thead>
 				<tbody class="text-xs">
@@ -34,7 +34,8 @@
 					<td>
 						<span title="[[admin/development/info:registered]]">{info.stats.onlineRegisteredCount}</span> /
 						<span title="[[admin/development/info:guests]]">{info.stats.onlineGuestCount}</span> /
-						<span title="[[admin/development/info:sockets]]">{info.stats.socketCount}</span>
+						<span title="[[admin/development/info:sockets]]">{info.stats.socketCount}</span> /
+						<span title="[[admin/development/info:connection-count]]">{info.stats.connectionCount}</span>
 					</td>
 					<td>{info.git.branch}@<a href="https://github.com/NodeBB/NodeBB/commit/{info.git.hash}" target="_blank">{info.git.hashShort}</a></td>
 					<td>{info.process.cpuUsage}%</td>
@@ -46,7 +47,7 @@
 						<span title="[[admin/development/info:total-memory-os]]">{info.os.totalmem} gb</span>
 					</td>
 					<td>{info.os.load}</td>
-					<td>{info.process.uptimeHumanReadable}</td>
+					<td class="text-end">{info.process.uptimeHumanReadable}</td>
 				</tr>
 				{{{ end }}}
 				</tbody>
diff --git a/src/webserver.js b/src/webserver.js
index 46455f104e..f492a0da02 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -76,6 +76,10 @@ exports.destroy = function (callback) {
 	}
 };
 
+exports.getConnectionCount = function () {
+	return Object.keys(connections).length;
+};
+
 exports.listen = async function () {
 	emailer.registerApp(app);
 	setupExpressApp(app);