Update discord.js to fix random message cache crashes

update other gateway deps too

Author: Nebual

game-api/gman-nginx.conf

@@ -6,10 +6,14 @@ server {
 	include snippets/ssl-params.conf;
 
 	root /var/www/html/gmanman/;
+	client_max_body_size 10M;
 
 	location / {
 		try_files $uri $uri/ =404;
 	}
+	location /gmanman/ {
+		rewrite ^/gmanman/(.*)$ /$1 break;
+	}
 	location /gateway/ {
 		rewrite ^/(?:[a-z\-]+)/?(.*)$ /$1 break;
 		proxy_set_header Host $host;

game-api/src/games/garrysmod.js

@@ -19,6 +19,7 @@ module.exports = class GarrysmodManager extends GenericDockerManager {
 			})
 			.catch(e => {
 				console.error("update error: ", e);
+				this.setStatus("stopped");
 			});
 	}
 	async getModsTodo() {}

game-setups/ark/docker-compose.yml

@@ -24,6 +24,7 @@ services:
     volumes:
       - ./volume:/ark
       - ./Saved:/ark/server/ShooterGame/Saved
+      - ./overrides/arkmanager:/usr/bin/arkmanager
     ports:
       - 7776:7776 # wat
       - 7776:7776/udp # wat

game-setups/barotrauma/docker-compose.yml

@@ -15,8 +15,6 @@ services:
             - '27015:27015/udp'
             - '27016:27016/udp'
         volumes:
+            - './volume/saves:/home/steam/.local/share/Daedalic Entertainment GmbH/Barotrauma/Multiplayer'
+            - './volume:/home/steam/barotrauma-dedicated'
             - './volume/Submarines:/home/steam/barotrauma-dedicated/Submarines/mounted'
-            - './volume/Mods:/home/steam/barotrauma-dedicated/Mods'
-            - './volume/serversettings.xml:/home/steam/barotrauma-dedicated/serversettings.xml'
-            - './volume/config_player.xml:/home/steam/barotrauma-dedicated/config_player.xml'
-            - './volume/saves:/home/steam/.local/share/Daedalic Entertainment GmbH/Barotrauma/Multiplayer'

game-setups/project-zomboid/docker-compose.yml

@@ -7,10 +7,10 @@ services:
     restart: unless-stopped
     environment:
       SERVER_NAME: "pzserver"
-      SERVER_PUBLIC_NAME: "Zombies!"
-      SERVER_PASSWORD: ""
-      ADMIN_PASSWORD: "admin-pass"
-      RCON_PASSWORD: "rcon-pass"
+      SERVER_PUBLIC_NAME: "Nebtown Zombie Apocalypse"
+      SERVER_PASSWORD: "candyland"
+      ADMIN_PASSWORD: "candyland"
+      RCON_PASSWORD: "candyland"
     ports:
       - "8766:8766/udp"
       - "8767:8767/udp"
@@ -19,3 +19,4 @@ services:
       - "27015:27015"
     volumes:
       - ./server-data:/server-data
+      - ./server-files:/server-files

gateway/package.json

@@ -8,20 +8,22 @@
     "local": "npm start"
   },
   "dependencies": {
-    "@discordjs/opus": "^0.4.0",
-    "axios": "^0.21.1",
+    "@discordjs/opus": "^0.7.0",
+    "@discordjs/voice": "^0.9.0",
+    "axios": "^0.26.1",
     "cors": "^2.8.5",
-    "discord.js": "^12.5.0",
-    "express": "^4.17.1",
-    "express-prettify": "^0.1.1",
+    "discord.js": "^13.6.0",
+    "express": "^4.17.3",
+    "express-prettify": "^0.1.2",
     "jsonwebtoken": "^8.5.1",
-    "jwks-rsa": "^1.12.0",
+    "jwks-rsa": "^2.0.5",
     "md5": "^2.3.0",
-    "minimist": "^1.2.5",
-    "moment": "^2.29.1",
-    "moment-timezone": "^0.5.32",
+    "minimist": "^1.2.6",
+    "moment": "^2.29.3",
+    "moment-timezone": "^0.5.34",
     "otplib": "^12.0.1",
+    "sodium": "^3.0.2",
     "ws": "^7.4.2",
-    "ytdl-core": "^4.4.5"
+    "ytdl-core": "^4.11.0"
   }
 }

gateway/src/cliArgs.js

@@ -4,7 +4,7 @@ const argv = require("minimist")(process.argv.slice(2), {
 
 function debugLog(...args) {
 	if (argv.v) {
-		console.log(...args);
+		console.log(new Date().toISOString(), ...args);
 	}
 }
 

gateway/src/lib/login.js

@@ -6,16 +6,15 @@ const googleJWKSClient = jwksClient({
 	jwksUri: "https://www.googleapis.com/oauth2/v3/certs",
 	cache: true,
 });
-function getGoogleJWTKey(header, callback) {
-	googleJWKSClient.getSigningKey(header.kid, function(err, key) {
-		if (err) {
-			console.log("failed getting Google JWT Key:", err);
-			callback(err);
-			return;
-		}
+async function getGoogleJWTKey(header, callback) {
+	try {
+		const key = await googleJWKSClient.getSigningKey(header.kid);
 		const signingKey = key.publicKey || key.rsaPublicKey;
 		callback(null, signingKey);
-	});
+	} catch (err) {
+		console.log("failed getting Google JWT Key:", err);
+		callback(err);
+	}
 }
 
 function verifyGoogleJWT(token) {

gateway/src/routes/bedtime.js

@@ -1,5 +1,12 @@
 const momentTz = require("moment-timezone");
 const ytdl = require("ytdl-core");
+const {
+	joinVoiceChannel,
+	VoiceConnectionStatus,
+	createAudioPlayer,
+	createAudioResource,
+	AudioPlayerStatus,
+} = require("@discordjs/voice");
 
 const { findMember, arrayRandom } = require("./discordUtil");
 
@@ -61,17 +68,28 @@ function processBedtime(memberId, playSound = false) {
 		return;
 	}
 	const member = bedtimes[memberId].member;
-	member.fetch().then(async member => {
+	member.fetch().then(async (member) => {
 		console.log("inside fetch", member, member.voice.channel);
 		if (member && member.voice.channel) {
-			const connection = await member.voice.channel.join();
-			const stream = connection.play(
-				ytdl(arrayRandom(bedtimeSounds), { filter: "audioonly" }),
-				{ volume: 0.5 }
-			);
-			stream.on("finish", () => {
-				member.voice.kick("Bedtime!");
-				connection.disconnect();
+			const connection = joinVoiceChannel({
+				channelId: member.voice.channelId,
+				guildId: member.guild.id,
+				adapterCreator: member.guild.voiceAdapterCreator,
+			});
+
+			connection.on(VoiceConnectionStatus.Ready, () => {
+				const player = createAudioPlayer();
+				const ytStream = ytdl(arrayRandom(bedtimeSounds), {
+					filter: "audioonly",
+				});
+				const resource = createAudioResource(ytStream, { inlineVolume: true });
+				resource.volume.setVolume(0.5);
+				connection.subscribe(player);
+				player.play(resource);
+				player.on(AudioPlayerStatus.Idle, () => {
+					member.voice.kick("Bedtime!");
+					connection.destroy();
+				});
 			});
 
 			bedtimes[memberId].reply(
@@ -93,7 +111,7 @@ function handleCommandBedtime(msg, bedtimeMatch) {
 	if (targetTime) {
 		msg.guild.members
 			.fetch({ query: nickSearch })
-			.then(guildMembers => {
+			.then((guildMembers) => {
 				const target = findMember(guildMembers, nickSearch);
 				if (target) {
 					const targetId = target.id;

gateway/src/routes/messages.js

@@ -6,7 +6,13 @@ const axios = require("axios");
 
 const ytdl = require("ytdl-core");
 const Discord = require("discord.js");
-const client = new Discord.Client();
+const {
+	joinVoiceChannel,
+	VoiceConnectionStatus,
+	createAudioPlayer,
+	createAudioResource,
+	AudioPlayerStatus,
+} = require("@discordjs/voice");
 
 const { debugLog, discordToken, discordChannel } = require("../cliArgs");
 const { findMember } = require("./discordUtil");
@@ -17,6 +23,13 @@ const {
 	handleCommandBedtimeClear,
 } = require("./bedtime");
 
+const client = new Discord.Client({
+	intents: [
+		Discord.Intents.FLAGS.GUILD_MESSAGES,
+		Discord.Intents.FLAGS.GUILD_VOICE_STATES,
+	],
+});
+
 /** @type TextChannel */
 let mainChannel;
 let channels = {};
@@ -55,7 +68,7 @@ async function getChannel(id) {
 	return channels[id];
 }
 
-client.on("message", async (msg) => {
+client.on("messageCreate", async (msg) => {
 	msg = /** @type Message */ msg;
 	if (msg.author.id === client.user.id) {
 		return;
@@ -99,13 +112,25 @@ client.on("message", async (msg) => {
 		const playMatch = msg.content.match(/\bplay \b(http.*youtu.*)\b/i);
 		if (playMatch) {
 			const url = playMatch[1];
-			if (msg.member.voice.channel) {
-				const connection = await msg.member.voice.channel.join();
-				const stream = connection.play(ytdl(url, { filter: "audioonly" }), {
-					volume: 0.5,
+			if (msg.member.voice.channelId) {
+				const connection = joinVoiceChannel({
+					channelId: msg.member.voice.channelId,
+					guildId: msg.member.guild.id,
+					adapterCreator: msg.member.guild.voiceAdapterCreator,
 				});
-				stream.on("finish", () => {
-					connection.disconnect();
+
+				connection.on(VoiceConnectionStatus.Ready, () => {
+					const player = createAudioPlayer();
+					const ytStream = ytdl(url, { filter: "audioonly" });
+					const resource = createAudioResource(ytStream, {
+						inlineVolume: true,
+					});
+					resource.volume.setVolume(0.5);
+					connection.subscribe(player);
+					player.play(resource);
+					player.on(AudioPlayerStatus.Idle, () => {
+						connection.destroy();
+					});
 				});
 			} else {
 				msg.reply(
@@ -215,7 +240,7 @@ async function sendMessage(nickname, message, channelId) {
 	const channel = channelId
 		? await getChannel(channelId)
 		: await getMainChannel();
-	debugLog(`Discord sending ${nickname}: ${message}`);
+	debugLog(`Discord sending ${nickname}: `, message);
 	if (!channel) {
 		console.warn("Discord: Not connected to channel", channelId);
 		return;
@@ -344,9 +369,13 @@ async function initPlayerStatusPoller(_knownGameApis) {
 					if (!gameMessageMeta[id]) {
 						gameMessageMeta[id] = {};
 					}
-					gameMessageMeta[id].message = await mainChannel.messages.fetch(
-						storedMessages[id]
-					);
+					try {
+						gameMessageMeta[id].message = await mainChannel.messages.fetch(
+							storedMessages[id]
+						);
+					} catch (e) {
+						console.warn("Discord: startup failed to read message", id, e);
+					}
 				})
 			);
 		}
@@ -355,18 +384,29 @@ async function initPlayerStatusPoller(_knownGameApis) {
 	}
 
 	setInterval(async () => {
-		await Promise.all(Object.values(knownGameApis).map(pollGameHealth));
-		await fs.promises.writeFile(
-			savedMessagesFilePath,
-			JSON.stringify(
-				Object.keys(gameMessageMeta).reduce((carry, id) => {
-					if (gameMessageMeta[id].message) {
-						carry[id] = gameMessageMeta[id].message.id;
-					}
-					return carry;
-				}, {})
-			)
-		);
+		try {
+			await Promise.all(Object.values(knownGameApis).map(pollGameHealth));
+		} catch (err) {
+			console.warn("Discord PlayerStatusPoller error: ", err.message);
+		}
+		try {
+			await fs.promises.writeFile(
+				savedMessagesFilePath,
+				JSON.stringify(
+					Object.keys(gameMessageMeta).reduce((carry, id) => {
+						if (gameMessageMeta[id].message) {
+							carry[id] = gameMessageMeta[id].message.id;
+						}
+						return carry;
+					}, {})
+				)
+			);
+		} catch (err) {
+			console.warn(
+				"Discord failed to write savedMessages error: ",
+				err.message
+			);
+		}
 	}, 8000);
 }