Dev/post refactor fixes

.gitignore

@@ -17,3 +17,4 @@ build
 *.log.ansi
 *.tmp
 tmp/
+dump/

src/api/middlewares/Authentication.ts

@@ -1,6 +1,7 @@
 import { NextFunction, Request, Response } from "express";
 import { HTTPError } from "lambert-server";
 import { checkToken, Config, Rights } from "@fosscord/util";
+import * as Sentry from "@sentry/node";
 
 export const NO_AUTHORIZATION_ROUTES = [
 	// Authentication routes
@@ -63,6 +64,8 @@ export async function Authentication(
 	if (!req.headers.authorization)
 		return next(new HTTPError("Missing Authorization Header", 401));
 
+	Sentry.setUser({ id: req.user_id });
+
 	try {
 		const { jwtSecret } = Config.get().security;
 

src/gateway/events/Connection.ts

@@ -1,5 +1,5 @@
 import WS from "ws";
-import { WebSocket } from "@fosscord/gateway";
+import { genSessionId, WebSocket } from "@fosscord/gateway";
 import { Send } from "../util/Send";
 import { CLOSECODES, OPCODES } from "../util/Constants";
 import { setHeartbeat } from "../util/Heartbeat";
@@ -30,6 +30,10 @@ export async function Connection(
 
 	socket.ipAddress = ipAddress;
 
+
+	const session_id = genSessionId();
+	socket.session_id = session_id; //Set the session of the WebSocket object
+
 	try {
 		// @ts-ignore
 		socket.on("close", Close);

src/gateway/events/Message.ts

@@ -5,12 +5,14 @@ import WS from "ws";
 import { PayloadSchema } from "@fosscord/util";
 import * as Sentry from "@sentry/node";
 import BigIntJson from "json-bigint";
+import path from "path";
+import fs from "fs";
 const bigIntJson = BigIntJson({ storeAsString: true });
 
 var erlpack: any;
 try {
 	erlpack = require("@yukikaze-bot/erlpack");
-} catch (error) {}
+} catch (error) { }
 
 export async function Message(this: WebSocket, buffer: WS.Data) {
 	// TODO: compression
@@ -40,6 +42,17 @@ export async function Message(this: WebSocket, buffer: WS.Data) {
 
 	if (process.env.WS_VERBOSE)
 		console.log(`[Websocket] Incomming message: ${JSON.stringify(data)}`);
+	if (process.env.WS_DUMP) {
+		if (this.session_id) {
+			fs.mkdirSync(path.join("dump", this.session_id), { recursive: true });
+			fs.writeFileSync(path.join("dump", this.session_id, `${Date.now()}.in.json`), JSON.stringify(data, null, 2));
+		}
+		else {
+			fs.mkdirSync(path.join("dump", "unknown"), { recursive: true });
+			fs.writeFileSync(path.join("dump", "unknown", `${Date.now()}.in.json`), JSON.stringify(data, null, 2));
+			console.log("Unknown session id, dumping to unknown folder");
+		}
+	}
 
 	check.call(this, PayloadSchema, data);
 
@@ -55,13 +68,13 @@ export async function Message(this: WebSocket, buffer: WS.Data) {
 	const transaction =
 		data.op != 1
 			? Sentry.startTransaction({
-					op: OPCODES[data.op],
-					name: `GATEWAY ${OPCODES[data.op]}`,
-					data: {
-						...data.d,
-						token: data?.d?.token ? "[Redacted]" : undefined,
-					},
-			  })
+				op: OPCODES[data.op],
+				name: `GATEWAY ${OPCODES[data.op]}`,
+				data: {
+					...data.d,
+					token: data?.d?.token ? "[Redacted]" : undefined,
+				},
+			})
 			: undefined;
 
 	try {

src/gateway/opcodes/Identify.ts

@@ -55,9 +55,7 @@ export async function onIdentify(this: WebSocket, data: Payload) {
 		return this.close(CLOSECODES.Authentication_failed);
 	}
 	this.user_id = decoded.id;
-
-	const session_id = genSessionId();
-	this.session_id = session_id; //Set the session of the WebSocket object
+	let session_id = this.session_id;
 
 	const [user, read_states, members, recipients, session, application] =
 		await Promise.all([

src/gateway/util/Send.ts

@@ -7,8 +7,23 @@ try {
 	);
 }
 import { Payload, WebSocket } from "@fosscord/gateway";
+import fs from "fs";
+import path from "path";
 
 export function Send(socket: WebSocket, data: Payload) {
+	if (process.env.WS_VERBOSE) console.log(`[Websocket] Outgoing message: ${JSON.stringify(data)}`);
+	if (process.env.WS_DUMP) {
+		if(socket.session_id) {
+			fs.mkdirSync(path.join("dump", socket.session_id), { recursive: true });
+			fs.writeFileSync(path.join("dump", socket.session_id, `${Date.now()}.out.json`), JSON.stringify(data, null, 2));
+		}
+		else {
+			fs.mkdirSync(path.join("dump", "unknown"), { recursive: true });
+			fs.writeFileSync(path.join("dump", "unknown", `${Date.now()}.out.json`), JSON.stringify(data, null, 2));
+			console.log("Unknown session ID, dumping to unknown folder!");
+		}
+
+	}
 	let buffer: Buffer | string;
 	if (socket.encoding === "etf") buffer = erlpack.pack(data);
 	// TODO: encode circular object