Bump dependencies

JensForstmann · Jan 9, 2024 · e3bf1c0 · e3bf1c0
1 parent 9c48274
commit e3bf1c0
Show file tree

Hide file tree

Showing 18 changed files with 2,023 additions and 2,333 deletions.
diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -11,22 +11,22 @@
 		"start": "node ./dist/backend/src/index.js"
 	},
 	"dependencies": {
-		"@tsoa/runtime": "^5.0.0",
+		"@tsoa/runtime": "^6.0.0",
 		"express": "^4.18.2",
 		"short-uuid": "^4.2.2",
 		"steamid": "^2.0.0",
 		"typed-emitter": "^2.1.0",
-		"ws": "^8.14.2"
+		"ws": "^8.16.0"
 	},
 	"devDependencies": {
-		"@tsoa/cli": "^5.1.1",
-		"@types/debug": "^4.1.10",
-		"@types/express": "^4.17.20",
-		"@types/node": "^20.8.10",
-		"@types/steamid": "^2.0.2",
-		"@types/ws": "^8.5.8",
-		"nodemon": "^3.0.1",
-		"ts-node": "^10.9.1",
-		"typescript": "^5.2.2"
+		"@tsoa/cli": "^6.0.0",
+		"@types/debug": "^4.1.12",
+		"@types/express": "^4.17.21",
+		"@types/node": "^20.10.7",
+		"@types/steamid": "^2.0.3",
+		"@types/ws": "^8.5.10",
+		"nodemon": "^3.0.2",
+		"ts-node": "^10.9.2",
+		"typescript": "^5.3.3"
 	}
 }
diff --git a/backend/src/events.ts b/backend/src/events.ts
@@ -22,10 +22,10 @@ import {
 	TTeamString,
 } from '../../common';
 import * as Match from './match';
+import * as MatchService from './matchService';
 import { Settings } from './settings';
 import * as Storage from './storage';
 import * as WebSocket from './webSocket';
-import * as MatchService from './matchService';
 
 const STORAGE_EVENTS_PREFIX = 'events_';
 const STORAGE_EVENTS_SUFFIX = '.jsonl';
@@ -170,8 +170,8 @@ export const onMatchEnd = (match: Match.Match, wonMapsTeamA: number, wonMapsTeam
 			wonMapsTeamA === wonMapsTeamB
 				? null
 				: wonMapsTeamA > wonMapsTeamB
-				? match.data.teamA
-				: match.data.teamB,
+					? match.data.teamA
+					: match.data.teamB,
 		mapResults: match.data.matchMaps
 			.filter((map) => map.state === 'FINISHED')
 			.map((matchMap) => ({
@@ -182,8 +182,8 @@ export const onMatchEnd = (match: Match.Match, wonMapsTeamA: number, wonMapsTeam
 					matchMap.score.teamA === matchMap.score.teamB
 						? null
 						: matchMap.score.teamA > matchMap.score.teamB
-						? match.data.teamA
-						: match.data.teamB,
+							? match.data.teamA
+							: match.data.teamB,
 			})),
 	};
 	send(match, data);
@@ -209,8 +209,8 @@ export const onMapEnd = (match: Match.Match, matchMap: IMatchMap) => {
 			matchMap.score.teamA === matchMap.score.teamB
 				? null
 				: matchMap.score.teamA > matchMap.score.teamB
-				? match.data.teamA
-				: match.data.teamB,
+					? match.data.teamA
+					: match.data.teamB,
 	};
 	send(match, data);
 };

diff --git a/backend/src/gameServer.ts b/backend/src/gameServer.ts
@@ -88,7 +88,7 @@ export const getPlayers = async (match: Match.Match): Promise<IngamePlayer[]> =>
 				? {
 						userId: matcher[1],
 						name: matcher[2],
-				  }
+					}
 				: null;
 		})
 		.filter((player): player is IngamePlayer => player !== null);

diff --git a/backend/src/match.ts b/backend/src/match.ts
@@ -2,18 +2,18 @@ import { ValidateError } from '@tsoa/runtime';
 import { generate as shortUuid } from 'short-uuid';
 import { TMT_LOG_ADDRESS, VERSION } from '.';
 import {
-	escapeRconSayString,
-	escapeRconString,
-	getCurrentTeamSideAndRoundSwitch,
-	getOtherTeamAB,
 	IMatch,
 	IMatchCreateDto,
 	IMatchUpdateDto,
 	IPlayer,
 	ITeam,
-	sleep,
 	TTeamAB,
 	TTeamString,
+	escapeRconSayString,
+	escapeRconString,
+	getCurrentTeamSideAndRoundSwitch,
+	getOtherTeamAB,
+	sleep,
 } from '../../common';
 import { addChangeListener } from './changeListener';
 import * as commands from './commands';
@@ -297,7 +297,7 @@ const sayPeriodicMessage = async (match: Match) => {
 				} catch (err) {
 					match.log(`Error in sayPeriodicMessage: ${err}`);
 				}
-		  }, Settings.PERIODIC_MESSAGE_FREQUENCY);
+			}, Settings.PERIODIC_MESSAGE_FREQUENCY);
 
 	const sv_password = await getConfigVar(match, 'sv_password');
 	if (sv_password && sv_password !== match.data.serverPassword) {
@@ -878,7 +878,7 @@ export const onElectionFinished = async (match: Match) => {
 				? '(Knife)'
 				: `(CT: ${getTeamByAB(match, matchMap.startAsCtTeam).name}, T: ${
 						getTeamByAB(match, getOtherTeamAB(matchMap.startAsCtTeam)).name
-				  })`;
+					})`;
 			return `${matchMap.name} ${side}`;
 		})
 		.join(', ');
-Original file line number
+Diff line change
@@ Expand Up @@
     				? {
     						userId: matcher[1],
     						name: matcher[2],
-    				  }
+    					}
     				: null;
     		})
     		.filter((player): player is IngamePlayer => player !== null);
@@ Expand Down @@