diff options
| author | Madeline <46743919+MaddyUnderStars@users.noreply.github.com> | 2022-09-11 21:48:48 +1000 |
|---|---|---|
| committer | Madeline <46743919+MaddyUnderStars@users.noreply.github.com> | 2022-09-11 21:48:48 +1000 |
| commit | 27439073754c4189fae92fcaf4016d03193b98c2 (patch) | |
| tree | 4bb5c032c0c3e7402eae9340455297141907f265 | |
| parent | Added missing props to ChannelModifySchema (diff) | |
| download | server-27439073754c4189fae92fcaf4016d03193b98c2.tar.xz | |
Trash ip logging
| -rw-r--r-- | gateway/src/events/Connection.ts | 4 | ||||
| -rw-r--r-- | gateway/src/opcodes/Identify.ts | 4 | ||||
| -rw-r--r-- | gateway/src/util/WebSocket.ts | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/gateway/src/events/Connection.ts b/gateway/src/events/Connection.ts index af897ed7..bed3cf44 100644 --- a/gateway/src/events/Connection.ts +++ b/gateway/src/events/Connection.ts @@ -26,12 +26,14 @@ export async function Connection( const forwardedFor = Config.get().security.forwadedFor; const ipAddress = forwardedFor ? request.headers[forwardedFor] as string : request.socket.remoteAddress; + socket.ipAddress = ipAddress; + try { // @ts-ignore socket.on("close", Close); // @ts-ignore socket.on("message", Message); - console.log(`[Gateway] New connection from ${ipAddress}, total ${this.clients.size}`); + console.log(`[Gateway] New connection from ${socket.ipAddress}, total ${this.clients.size}`); const { searchParams } = new URL(`http://localhost${request.url}`); // @ts-ignore diff --git a/gateway/src/opcodes/Identify.ts b/gateway/src/opcodes/Identify.ts index 57c45d1f..bd36e052 100644 --- a/gateway/src/opcodes/Identify.ts +++ b/gateway/src/opcodes/Identify.ts @@ -237,7 +237,7 @@ export async function onIdentify(this: WebSocket, data: Payload) { const d: ReadyEventData = { v: 8, - application, + application: application ?? undefined, user: privateUser, user_settings: user.settings, // @ts-ignore @@ -296,4 +296,6 @@ export async function onIdentify(this: WebSocket, data: Payload) { //TODO send VOICE_STATE_UPDATE to let the client know if another device is already connected to a voice channel await setupListener.call(this); + + console.log(`${this.ipAddress} identified as ${d.user.id}`) } diff --git a/gateway/src/util/WebSocket.ts b/gateway/src/util/WebSocket.ts index 1ca90340..7ac277a8 100644 --- a/gateway/src/util/WebSocket.ts +++ b/gateway/src/util/WebSocket.ts @@ -8,6 +8,7 @@ export interface WebSocket extends WS { session_id: string; encoding: "etf" | "json"; compress?: "zlib-stream"; + ipAddress?: string; shard_count?: bigint; shard_id?: bigint; deflate?: Deflate; |