fosscord-server/pulls/858

1 files changed, 15 insertions, 4 deletions

diff --git a/gateway/src/events/Message.ts b/gateway/src/events/Message.ts
index b675afcd..83917690 100644
--- a/gateway/src/events/Message.ts
+++ b/gateway/src/events/Message.ts
@@ -3,7 +3,7 @@ import { WebSocket, Payload } from "@fosscord/gateway";
 var erlpack: any;
 try {
 	erlpack = require("@yukikaze-bot/erlpack");
-} catch (error) {}
+} catch (error) { }
 import OPCodeHandlers from "../opcodes";
 import { Tuple } from "lambert-server";
 import { check } from "../opcodes/instanceOf";
@@ -22,8 +22,19 @@ export async function Message(this: WebSocket, buffer: WS.Data) {
 
 	if (this.encoding === "etf" && buffer instanceof Buffer)
 		data = erlpack.unpack(buffer);
-	else if (this.encoding === "json" && typeof buffer === "string")
-		data = JSON.parse(buffer);
+	else if (this.encoding === "json" && buffer instanceof Buffer) {
+		if (this.inflate) {
+			try {
+				buffer = this.inflate.process(buffer) as any;
+			} catch {
+				buffer = buffer.toString() as any;
+			}
+		}
+		data = JSON.parse(buffer as string);
+	}
+	else if (typeof buffer == "string") {
+		data = JSON.parse(buffer as string);
+	}
 	else return;
 
 	check.call(this, PayloadSchema, data);
@@ -42,6 +53,6 @@ export async function Message(this: WebSocket, buffer: WS.Data) {
 	} catch (error) {
 		console.error(error);
 		// if (!this.CLOSED && this.CLOSING)
-			return this.close(CLOSECODES.Unknown_error);
+		return this.close(CLOSECODES.Unknown_error);
 	}
 }