[2.1.0] Changed connection count fetching to redis

Author: Ipmake

config.json

@@ -9,5 +9,9 @@
     "internal": {
         "host": "localhost",
         "port": 23500
+    },
+    "redis": {
+        "host": "127.0.0.1",
+        "port": 6380
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kocity-proxy",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "A simple auth proxy server for kocity",
   "main": "dist/index.js",
   "scripts": {
@@ -22,7 +22,8 @@
     "chalk": "^3.0.0",
     "express": "^4.18.2",
     "http-proxy": "^1.18.1",
-    "http-proxy-middleware": "^2.0.6"
+    "http-proxy-middleware": "^2.0.6",
+    "redis": "^4.6.7"
   },
   "devDependencies": {
     "@types/express": "^4.17.17",

src/config.ts

@@ -1,34 +1,39 @@
-import fs from "fs";
-
-import { config } from "./interfaces"
-
-const config = JSON.parse(fs.readFileSync("./config.json", "utf8"));
-
-const maxPlayers = process.env.MAX_PLAYERS || config.maxPlayers
-
-/**
- * This exports a default object that contains the configuration for the server.
- * The object contains the following properties:
- * - name: the name of the server, taken from the environment variable SERVER_NAME or the config file.
- * - authServer: the URL of the authentication server, taken from the environment variable AUTH_SERVER or the config file.
- * - publicAddr: the public address of the server, taken from the environment variable PUBLIC_ADDRESS or the config file.
- * - maxPlayers: the maximum number of players allowed on the server, taken from the environment variable MAX_PLAYERS or the config file.
- * - external: an object containing the following properties:
- *   - port: the port number for external connections, taken from the environment variable EXTERNAL_PORT or the config file.
- * - internal: an object containing the following properties:
- *   - host: the host name for internal connections, taken from the environment variable INTERNAL_HOST or the config file.
- *   - port: the port number for internal connections, taken from the environment variable INTERNAL_PORT or the config file.
- */
-export default {
-  name: process.env.SERVER_NAME || config.name,
-  authServer: process.env.AUTH_SERVER || config.authServer,
-  publicAddr: process.env.PUBLIC_ADDRESS || config.publicAddr,
-  maxPlayers: typeof maxPlayers != "number" ? parseInt(maxPlayers) : maxPlayers,
-  external: {
-    port: process.env.EXTERNAL_PORT || config.external.port,
-  },
-  internal: {
-    host: process.env.INTERNAL_HOST || config.internal.host,
-    port: process.env.INTERNAL_PORT || config.internal.port,
-  },
+import fs from "fs";
+
+import { config } from "./interfaces"
+
+const config = JSON.parse(fs.readFileSync("./config.json", "utf8"));
+
+const maxPlayers = process.env.MAX_PLAYERS || config.maxPlayers
+
+/**
+ * This exports a default object that contains the configuration for the server.
+ * The object contains the following properties:
+ * - name: the name of the server, taken from the environment variable SERVER_NAME or the config file.
+ * - authServer: the URL of the authentication server, taken from the environment variable AUTH_SERVER or the config file.
+ * - publicAddr: the public address of the server, taken from the environment variable PUBLIC_ADDRESS or the config file.
+ * - maxPlayers: the maximum number of players allowed on the server, taken from the environment variable MAX_PLAYERS or the config file.
+ * - external: an object containing the following properties:
+ *   - port: the port number for external connections, taken from the environment variable EXTERNAL_PORT or the config file.
+ * - internal: an object containing the following properties:
+ *   - host: the host name for internal connections, taken from the environment variable INTERNAL_HOST or the config file.
+ *   - port: the port number for internal connections, taken from the environment variable INTERNAL_PORT or the config file.
+ */
+export default {
+  name: process.env.SERVER_NAME || config.name,
+  authServer: process.env.AUTH_SERVER || config.authServer,
+  publicAddr: process.env.PUBLIC_ADDRESS || config.publicAddr,
+  maxPlayers: typeof maxPlayers != "number" ? parseInt(maxPlayers) : maxPlayers,
+  external: {
+    port: process.env.EXTERNAL_PORT || config.external.port,
+  },
+  internal: {
+    host: process.env.INTERNAL_HOST || config.internal.host,
+    port: process.env.INTERNAL_PORT || config.internal.port,
+  },
+  redis: {
+    host: process.env.REDIS_HOST || config.redis.host,
+    port: process.env.REDIS_PORT || config.redis.port,
+    password: process.env.REDIS_PASSWORD || config.redis.password || undefined,
+  },
 } as config

src/index.ts

@@ -2,9 +2,7 @@ import axios from 'axios';
 import express from 'express';
 import { createProxyMiddleware } from 'http-proxy-middleware';
 import config from './config';
-import chalk from 'chalk';
-import fs from 'fs';
-import os from 'os';
+import { createClient } from 'redis';
 
 import Logger from './logger.js'
 
@@ -14,24 +12,33 @@ const log = new Logger();
 
 if(config.name == "ServerName") log.warn("Please change the name in the config.json or via the environment (SERVER_NAME)");
 
+const redis = createClient({
+    socket: {
+        host: config.redis.host,
+        port: config.redis.port,
+    },
+    password: config.redis.password,
+});
+
+redis.connect().then(() => {
+    log.info("Connected to Redis");
+}).catch((err) => {
+    log.fatal("Failed to connect to Redis");
+    log.fatal(err.message);
+    log.fatal(err.stack ? err.stack.toString() : '');
+    process.exit(1);
+});
 
 const app = express();
 
 app.use(express.json());
 
 app.get('/stats/status', async (req, res) => {
-    log.info(`Status requested by ${req.ip}`);
-
     res.send({
         status: "OK",
         version: require('../package.json').version,
         uptime: process.uptime(),
-        connections: await new Promise((resolve, reject) => {
-            server.getConnections((err, connections) => {
-                if(err) return reject(err);
-                resolve(connections-1);
-            });
-        }),
+        connections: (await redis.KEYS('user:session:*')).length,
         maxConnections: config.maxPlayers,
     });
 });

src/interfaces.ts

@@ -23,6 +23,14 @@ export interface config {
         /** The port number for internal connections. */
         port: number, 
     },
+    redis: {
+        /** The host name for the Redis server. */
+        host: string,
+        /** The port number for the Redis server. */
+        port: number,
+        /** The password for the Redis server. */
+        password?: string,
+    }
 }
 
 

tsconfig.json

@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-        "target": "es5",
+        "target": "ESNext",
         "module": "NodeNext",
         "outDir": "dist",
         "strict": true,