@bakit/gateway 2.1.7 → 2.1.9

package/dist/index.js

@@ -7,7 +7,7 @@ import { fork } from 'child_process';
 import '@bakit/rest';
 
 // src/lib/shard.ts
-var ZLIB_FLUSH = Buffer.from([0, 0, 255, 255]), DEFAULT_SHARD_OPTIONS = {
+var DEFAULT_SHARD_OPTIONS = {
   gateway: {
     baseURL: "wss://gateway.discord.gg",
     version: 10
@@ -34,7 +34,7 @@ var ZLIB_FLUSH = Buffer.from([0, 0, 255, 255]), DEFAULT_SHARD_OPTIONS = {
   Shutdown: 4
 };
 function createShard(options) {
-  let resolvedOptions = { ...DEFAULT_SHARD_OPTIONS, ...options }, state = ShardState.Idle, strategy = ShardStrategy.Unknown, ws, resumeGatewayURL, inflater, inflateBuffer, zlibBuffer, sessionId, lastSequence, lastHeartbeatSent = -1, lastHeartbeatAcknowledged = -1, missedHeartbeats = 0, reconnectTimeout, heartbeatTimeout, heartbeatInterval, self = attachEventBus({
+  let resolvedOptions = { ...DEFAULT_SHARD_OPTIONS, ...options }, textDecoder = new TextDecoder(), state = ShardState.Idle, strategy = ShardStrategy.Unknown, ws, resumeGatewayURL, inflater, decompressBuffer = [], sessionId, lastSequence, lastHeartbeatSent = -1, lastHeartbeatAcknowledged = -1, missedHeartbeats = 0, reconnectTimeout, heartbeatTimeout, heartbeatInterval, self = attachEventBus({
     send,
     connect,
     disconnect,
@@ -60,29 +60,14 @@ function createShard(options) {
     let { gateway } = resolvedOptions, baseURL = isResumable() && resumeGatewayURL ? resumeGatewayURL : gateway.baseURL, url = new URL(baseURL);
     url.searchParams.set("v", gateway.version.toString()), url.searchParams.set("encoding", "json"), url.searchParams.set("compress", "zlib-stream"), ws = new WebSocket(url.toString(), {
       perMessageDeflate: false
-    }), inflateBuffer = Buffer.alloc(0), zlibBuffer = Buffer.alloc(0), inflater = createInflate({
+    }), inflater = createInflate({
       flush: constants.Z_SYNC_FLUSH
-    }), inflater.on("data", (chunk) => {
-      if (inflateBuffer) {
-        if (inflateBuffer = Buffer.concat([inflateBuffer, chunk]), inflateBuffer.length > 10 * 1024 * 1024) {
-          self.emit("error", new Error("Inflate buffer overflow")), ws?.terminate();
-          return;
-        }
-        try {
-          let text = inflateBuffer.toString("utf8"), payload = JSON.parse(text);
-          inflateBuffer = Buffer.alloc(0), handlePayload(payload);
-        } catch (err) {
-          if (err instanceof SyntaxError)
-            return;
-          inflateBuffer = Buffer.alloc(0), self.emit("error", err);
-        }
-      }
-    }), inflater.on("error", (err) => {
+    }), inflater.on("data", onInflate), inflater.on("error", (err) => {
       self.emit("error", err), ws?.terminate();
     }), ws.on("message", onMessage), ws.on("close", onClose), ws.on("error", (err) => self.emit("error", err));
   }
   function cleanup() {
-    heartbeatInterval && (clearInterval(heartbeatInterval), heartbeatInterval = void 0), heartbeatTimeout && (clearTimeout(heartbeatTimeout), heartbeatTimeout = void 0), reconnectTimeout && (clearTimeout(reconnectTimeout), reconnectTimeout = void 0), inflater && (inflater.destroy(), inflater = void 0), inflateBuffer = void 0, zlibBuffer = void 0, ws && (ws.readyState !== WebSocket.CLOSED && ws.terminate(), ws.removeAllListeners(), ws = void 0), missedHeartbeats = 0, lastHeartbeatSent = -1, lastHeartbeatAcknowledged = -1;
+    heartbeatInterval && (clearInterval(heartbeatInterval), heartbeatInterval = void 0), heartbeatTimeout && (clearTimeout(heartbeatTimeout), heartbeatTimeout = void 0), reconnectTimeout && (clearTimeout(reconnectTimeout), reconnectTimeout = void 0), inflater && (inflater.destroy(), inflater = void 0), ws && (ws.readyState !== WebSocket.CLOSED && ws.terminate(), ws.removeAllListeners(), ws = void 0), decompressBuffer = [], missedHeartbeats = 0, lastHeartbeatSent = -1, lastHeartbeatAcknowledged = -1;
   }
   function connect() {
     return new Promise((resolve) => {
@@ -101,12 +86,45 @@ function createShard(options) {
     });
   }
   function onMessage(data) {
-    if (!(!(data instanceof Buffer) || !zlibBuffer)) {
-      if (data.length > 8 * 1024 * 1024) {
-        ws?.terminate();
+    if (!inflater) {
+      try {
+        let text = data.toString(), payload = JSON.parse(text);
+        handlePayload(payload);
+      } catch (error) {
+        self.emit("error", error);
+      }
+      return;
+    }
+    let buffer;
+    Buffer.isBuffer(data) ? buffer = data : Array.isArray(data) ? buffer = Buffer.concat(data) : data instanceof ArrayBuffer ? buffer = Buffer.from(data) : buffer = Buffer.from(String(data));
+    let hasSyncFlush = buffer.length >= 4 && buffer[buffer.length - 4] === 0 && buffer[buffer.length - 3] === 0 && buffer[buffer.length - 2] === 255 && buffer[buffer.length - 1] === 255;
+    inflater.write(buffer, (writeError) => {
+      if (writeError) {
+        self.emit("error", writeError);
         return;
       }
-      zlibBuffer = Buffer.concat([zlibBuffer, data]), !(zlibBuffer.length < 4 || !zlibBuffer.subarray(zlibBuffer.length - 4).equals(ZLIB_FLUSH)) && (inflater?.write(zlibBuffer), zlibBuffer = Buffer.alloc(0));
+      hasSyncFlush && inflater?.flush(constants.Z_SYNC_FLUSH);
+    });
+  }
+  function onInflate(chunk) {
+    decompressBuffer.push(chunk);
+    try {
+      let fullBuffer = Buffer.concat(decompressBuffer), text = textDecoder.decode(fullBuffer), payload = JSON.parse(text);
+      handlePayload(payload), decompressBuffer = [];
+    } catch (error) {
+      if (error instanceof SyntaxError) {
+        let fullBuffer = Buffer.concat(decompressBuffer), text = textDecoder.decode(fullBuffer);
+        if (text.includes("{") && !isValidJSON(text))
+          return;
+        self.emit("error", error), decompressBuffer = [];
+      }
+    }
+  }
+  function isValidJSON(str) {
+    try {
+      return JSON.parse(str), !0;
+    } catch {
+      return false;
     }
   }
   function onClose(code) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bakit/gateway",
-  "version": "2.1.7",
+  "version": "2.1.9",
   "description": "Gateway manager for bakit framework",
   "type": "module",
   "exports": {