Merge pull request #36 from Taraman17/dev

Initial support for CS2

Author: Taraman17

README.MD

@@ -1,50 +1,41 @@
-# CS:GO Server Control with a Nodejs-powered web-API (LINUX only)
-
-## Request for your opinion
-Please let me know, If I should work on the installation process:
-[Poll on Installation](https://github.com/Taraman17/nodejs-csgo-api/discussions/31)
+# CS2 Server Control with a Nodejs-powered web-API (LINUX only)
 
 ## Disclaimer
 The use of this software is at your own risk.
 It exposes control of your server and shell functions to the internet. Although I did everything to secure the API, any bugs may lead to security breaches on your server.
 I strongly adivise to use secure connections to prevent possible man-in-the-middle attacks.
 
-## NOTE:
-Release 1.0 changed structure of the code to enable further development.
-See below for changes.
-
-### Breaking changes:
-- Config logic has been separated from configClass - make sure to backup your config! You can copy the config part from the old file to the new "./config.js"
-- steam account used for updating the server has been deleted from the config - it has to go in your update-Script.
-- login code has been seperated from the api calls. New location is "http://{your-servers-address}:{your-port}/csgoapi/login" ISO "http://{your-servers-address}:{your-port}/csgoapi/v1.0/login"
+## CS2 Beta Info
+This is the intial beta release for CS2. It has the following changes to previous functionality
+- Changed Log-reception to http logs, since UDP is not supported anymore in new server. Unnecessary library source-log-receiver removed.
+- Maplist loading is still bugged in CS2 Server - therefore working with a static Maplist. Also this has to be loaded with the "relaodMaplist" endpoint.
+- Still working with the old CS_GO map-pictures, since the new ones are not yet available in the workshop
+- Went back to the original rcon-srcds library instead of my patched one, since the new server seems to behave more standard-like.
+- API calls are unchanged.
 
 ## Prerequisites
 - steam CLI
-- CS:GO dedicated server
-- NodeJS 13.X or higher
+- CS2 dedicated server
+- NodeJS 14.X or higher
 
 ## Install
 Download the nodejs-csgo-api-vX.X.zip and unpack.
 
 **OR**
 download the script files to and install the dependencies for nodejs
 ```console
-npm install --save srcds-log-receiver local-ip express express-session express-rate-limit cors passport passport-steam node-pty ws winston winston-daily-rotate-file
-```
-If you want to use http authentication, add
-```console
-npm install --save passport-http
+npm install
 ```
 
 ## Configuration
-The CS:GO Server must be configured to send logs to the local IP (not 127.0.0.1): on port 9871
+The CS:GO Server must be configured to send logs to the local IP (not 127.0.0.1): on port 8092 (or the one you specified in config.js)
 ```
 log on
 sv_logecho 1
 mp_logfile 1
 mp_logdetail 3
 mp_logmessages 1
-logaddress_add xxx.xxx.xxx.xxx:9871
+logaddress_add_http "http://xxx.xxx.xxx.xxx:8092"
 ```
 - Edit the settings in config.js. Most of them are explained in the sourcecode.
 - The API uses steam authentication which returns a Steam ID as URL (https://steamcommunity.com/openid/id/{steamid}). The last part is the SteamID64, which can be calculated from the other SteamID formats - various online tools are available. In the configuration, an array needs to be filled with the comma separated IDs of your intended admins as strings (e.g. ['{steamid-1}', '{steamid-2}'].

config.js

@@ -26,6 +26,8 @@
     "webSockets": false,
     // Port, the websocket is listening on.
     "socketPort": 8091,
+    // Port the Logreceiver listens on.
+    'logPort': 8092,
     // https settings
     "useHttps": false,
     // Optional: If you use https, add the path to the certificate files here.

modules/apiV10.js

@@ -384,11 +384,11 @@ router.get('/control/stop', (req, res) => {
 *     { "error": "Could not find csgo server process" }
 */
 router.get('/control/kill', (req, res) => {
-    exec('/bin/ps -a |grep srcds_linux', (error, stdout, stderr) => {
+    exec('/bin/ps -A |grep cs2', (error, stdout, stderr) => {
         if (error) {
             logger.error(`exec error: ${error}`);
             res.status(501).json({ "error": "Could not find csgo server process" });
-        } else if (stdout.match(/srcds_linux/) != null) {
+        } else if (stdout.match(/cs2/) != null) {
             let pid = stdout.split(/\s+/)[1];
             exec(`/bin/kill ${pid}`, (error, stdout, stderr) => {
                 if (error) {

modules/configClass.js

@@ -6,8 +6,8 @@ class config {
         this._userOptions = require('../config.js');
 
         this.screenCommand = `${this._userOptions.screen} -L -Logfile ${this._userOptions.screenLog} -dmS ${this._userOptions.screenName}`;
-        this.csgoCommand = `${this._userOptions.csgoDir}/srcds_run`;
-        this.csgoArgs = `-game csgo -console -usercon +sv_setsteamaccount ${this._userOptions.serverToken} ${this._userOptions.csgoOptionalArgs}`;
+        this.csgoCommand = `${this._userOptions.csgoDir}/cs2 -dedicated`;
+        this.csgoArgs = `-console -usercon +sv_setsteamaccount ${this._userOptions.serverToken} ${this._userOptions.csgoOptionalArgs}`;
     }
 
     get rconPass() {
@@ -47,6 +47,9 @@ class config {
     get socketPort() {
         return this._userOptions.socketPort;
     }
+    get logPort() {
+        return this._userOptions.logPort;
+    }
 
     get serverCommandline() {
         return `${this.screenCommand} ${this.csgoCommand} ${this.csgoArgs}`;

modules/logreceive.js

@@ -0,0 +1,117 @@
+const express = require('express');
+var router = express.Router();
+const { exec } = require('child_process');
+var controlEmitter = require('./controlEmitter.js');
+const logger = require('./logger.js');
+var serverInfo = require('./serverInfo.js');
+const sf = require('./sharedFunctions.js');
+var cfg = require('./configClass.js');
+
+router.post('/log', (req, res) => {
+    const data = req.body;
+    var logs = data.split(/\r\n|\r|\n/);
+
+    logs.forEach(line => {
+        if (line.length >= 20) {
+            // Start authentication, when not authenticated.
+            if ((line.indexOf('Log file started') != -1) && !serverInfo.serverState.authenticated) {
+                // Start of logfile
+                // L 08/13/2020 - 21:48:49: Log file started (file "logs/L000_000_000_000_27015_202008132148_000.log") (game "/home/user/csgo_ds/csgo") (version "7929")
+                logger.verbose('start authenticating RCON');
+                // Since authentication is a vital step for the API to work, we start it automatically
+                // once the server runs.
+                sf.authenticate().then((data) => {
+                    logger.verbose(`authentication ${data.authenticated}`);
+                }).catch((data) => {
+                    logger.verbose(`authentication ${data.authenticated}`);
+                });
+                if (cfg.script('logStart') != '') {
+                    exec(cfg.script('logStart'));
+                }
+            } else if (line.indexOf('Loading map ') != -1) {
+                // Start of map.
+                // L 10/13/2023 - 14:28:38: Loading map "de_anubis"
+                let rex = /Loading map \"(\S+)\"/g;
+                let matches = rex.exec(line);
+                let mapstring = matches[1];
+                mapstring = sf.cutMapName(mapstring);
+                serverInfo.map = mapstring;
+                // since 'started map' is also reported on server-start, only emit on mapchange.
+                if (serverInfo.serverState.operationPending == 'mapchange') {
+                    controlEmitter.emit('exec', 'mapchange', 'end');
+                }
+                logger.verbose(`Started map: ${mapstring}`);
+                serverInfo.clearPlayers();
+                serverInfo.newMatch();
+                if (cfg.script('mapStart') != '') {
+                    exec(cfg.script('mapStart'));
+                }
+            } else if (line.indexOf('World triggered "Match_Start" on') != -1) {
+                // Start of a new match.
+                // L 08/13/2020 - 21:49:26: World triggered "Match_Start" on "de_nuke"
+                logger.verbose('Detected match start.');
+                sf.queryMaxRounds();
+                serverInfo.newMatch();
+                let rex = /World triggered "Match_Start" on "(.+)"/
+                let matches = rex.exec(line)
+                serverInfo.map = matches[1];
+                if (cfg.script('matchStart') != '') {
+                    exec(cfg.script('matchStart'));
+                }
+            } else if (line.indexOf('World triggered "Round_Start"') != -1) {
+                // Start of round.
+                // L 08/13/2020 - 21:49:28: World triggered "Round_Start"
+                if (cfg.script('roundStart') != '') {
+                    exec(cfg.script('roundStart'));
+                }
+            } else if (/Team \"\S+\" scored/.test(line)) {
+                // Team scores at end of round.
+                // L 02/10/2019 - 21:31:15: Team "CT" scored "1" with "2" players
+                // L 02/10/2019 - 21:31:15: Team "TERRORIST" scored "1" with "2" players
+                rex = /Team \"(\S)\S+\" scored \"(\d+)\"/g;
+                let matches = rex.exec(line);
+                serverInfo.score = matches;
+            } else if (line.indexOf('World triggered "Round_End"') != -1) {
+                // End of round.
+                // L 08/13/2020 - 22:24:22: World triggered "Round_End"
+                if (cfg.script('roundEnd') != '') {
+                    exec(cfg.script('roundEnd'));
+                }
+            } else if (line.indexOf("Game Over:") != -1) {
+                // End of match.
+                // L 08/13/2020 - 22:24:22: Game Over: competitive 131399785 de_nuke score 16:9 after 35 min
+                if (cfg.script('matchEnd') != '') {
+                    exec(cfg.script('matchEnd'));
+                }
+            } else if (/\".+<\d+><\[U:\d:\d+\]>/.test(line)) {
+                // Player join or teamchange.
+                // L 10/12/2023 - 16:06:38: "[Klosser] Taraman<2><[U:1:12610374]><>" entered the game
+                // L 10/12/2023 - 18:57:47: "[Klosser] Taraman<2><[U:1:12610374]>" switched from team <Unassigned> to <CT>
+                // L 10/12/2023 - 18:59:25: "[Klosser] Taraman<2><[U:1:12610374]>" switched from team <TERRORIST> to <Spectator>
+                let rex = /\"(.+)<\d+><\[(U:\d+:\d+)\]><>\"/g;
+                let matches = rex.exec(line);
+                if (line.indexOf('entered the game') != -1) {
+                    serverInfo.addPlayer({ 'name': matches[1], 'steamID': matches[2] });
+                } else if (line.search(/disconnected \(reason/) != -1) {
+                    logger.debug(line);
+                    serverInfo.removePlayer(matches[2]);
+                } else if (line.indexOf('switched from team') != -1) {
+                    rex = /<\[(U:\d+:\d+)\]>.*switched from team <\S+> to <(\S+)>/g;
+                    matches = rex.exec(line);
+                    serverInfo.assignPlayer(matches[1], matches[2]);
+                }
+            } else if (line.indexOf('Log file closed') != -1) {
+                // end of current log file. (Usually on mapchange or server quit.)
+                // L 08/13/2020 - 22:25:00: Log file closed
+                logger.verbose('logfile closed!');
+                if (cfg.script('logEnd') != '') {
+                    exec(cfg.script('logEnd'));
+                }
+            }
+        }
+    });
+
+    res.status(200).send("Receiving logs");
+});
+
+module.exports = router;