diff --git a/gateway/src/events/Close.ts b/gateway/src/events/Close.ts
index 5b7c512c..40d9a6f7 100644
--- a/gateway/src/events/Close.ts
+++ b/gateway/src/events/Close.ts
@@ -13,6 +13,7 @@ export async function Close(this: WebSocket, code: number, reason: string) {
if (this.heartbeatTimeout) clearTimeout(this.heartbeatTimeout);
if (this.readyTimeout) clearTimeout(this.readyTimeout);
this.deflate?.close();
+ this.inflate?.close();
this.removeAllListeners();
if (this.session_id) {
diff --git a/gateway/src/events/Connection.ts b/gateway/src/events/Connection.ts
index 2d41b7a3..af897ed7 100644
--- a/gateway/src/events/Connection.ts
+++ b/gateway/src/events/Connection.ts
@@ -6,7 +6,7 @@ import { setHeartbeat } from "../util/Heartbeat";
import { IncomingMessage } from "http";
import { Close } from "./Close";
import { Message } from "./Message";
-import { createDeflate } from "zlib";
+import { Deflate, Inflate } from "fast-zlib";
import { URL } from "url";
import { Config } from "@fosscord/util";
var erlpack: any;
@@ -45,7 +45,6 @@ export async function Connection(
return socket.close(CLOSECODES.Decode_error);
}
- // @ts-ignore
socket.version = Number(searchParams.get("version")) || 8;
if (socket.version != 8)
return socket.close(CLOSECODES.Invalid_API_version);
@@ -55,8 +54,8 @@ export async function Connection(
if (socket.compress) {
if (socket.compress !== "zlib-stream")
return socket.close(CLOSECODES.Decode_error);
- socket.deflate = createDeflate({ chunkSize: 65535 });
- socket.deflate.on("data", (chunk) => socket.send(chunk));
+ socket.deflate = new Deflate();
+ socket.inflate = new Inflate();
}
socket.events = {};
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);
}
}
|
