@bakit/gateway 2.1.6 → 2.1.8

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 INCOMPLETE_JSON_REGEX = /unexpected end|unterminated|unexpected eof|end of json/i, 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 }, state = ShardState.Idle, strategy = ShardStrategy.Unknown, ws, resumeGatewayURL, inflater, inflateBuffer = Buffer.alloc(0), sessionId, lastSequence, lastHeartbeatSent = -1, lastHeartbeatAcknowledged = -1, missedHeartbeats = 0, reconnectTimeout, heartbeatTimeout, heartbeatInterval, self = attachEventBus({
     send,
     connect,
     disconnect,
@@ -60,27 +60,17 @@ 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) {
-          err instanceof SyntaxError || (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 isJSONIncomplete(err) {
+    return err instanceof Error && INCOMPLETE_JSON_REGEX.test(err.message);
+  }
   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), inflateBuffer = Buffer.alloc(0), ws && (ws.readyState !== WebSocket.CLOSED && ws.terminate(), ws.removeAllListeners(), ws = void 0), missedHeartbeats = 0, lastHeartbeatSent = -1, lastHeartbeatAcknowledged = -1;
   }
   function connect() {
     return new Promise((resolve) => {
@@ -99,13 +89,48 @@ function createShard(options) {
     });
   }
   function onMessage(data) {
-    if (!(!(data instanceof Buffer) || !zlibBuffer)) {
-      if (data.length > 8 * 1024 * 1024) {
-        ws?.terminate();
+    if (!(!(data instanceof Buffer) || !inflater)) {
+      if (data.length > 4 * 1024 * 1024) {
+        self.emit("error", new Error(`Compressed payload too large: ${data.length} bytes`)), ws?.terminate();
+        return;
+      }
+      try {
+        inflater.write(data);
+      } catch (err) {
+        self.emit("error", new Error(`Zlib inflation error: ${err instanceof Error ? err.message : String(err)}`)), ws?.terminate();
+      }
+    }
+  }
+  function onInflate(chunk) {
+    if (inflateBuffer = Buffer.concat([inflateBuffer, chunk]), inflateBuffer.length > 8 * 1024 * 1024) {
+      self.emit("error", new Error("Decompressed buffer overflow (8MB limit)")), ws?.terminate();
+      return;
+    }
+    let start = 0;
+    for (; start < inflateBuffer.length; ) {
+      let newlinePos = inflateBuffer.indexOf(10, start);
+      if (newlinePos === -1) {
+        start > 0 && (inflateBuffer = inflateBuffer.subarray(start));
+        return;
+      }
+      let messageSlice = inflateBuffer.subarray(start, newlinePos);
+      try {
+        let payload = JSON.parse(messageSlice.toString("utf8"));
+        handlePayload(payload);
+      } catch (err) {
+        if (!isJSONIncomplete(err)) {
+          self.emit(
+            "error",
+            new Error(`Failed to parse gateway payload: ${err instanceof Error ? err.message : String(err)}`)
+          ), inflateBuffer = Buffer.alloc(0);
+          return;
+        }
+        inflateBuffer = inflateBuffer.subarray(start);
         return;
       }
-      zlibBuffer = Buffer.concat([zlibBuffer, data]), !(zlibBuffer.length < 4 || !zlibBuffer.subarray(zlibBuffer.length - 4).equals(ZLIB_FLUSH)) && (inflater?.write(zlibBuffer), zlibBuffer = Buffer.alloc(0));
+      start = newlinePos + 1;
     }
+    inflateBuffer = Buffer.alloc(0);
   }
   function onClose(code) {
     if (cleanup(), state = ShardState.Disconnected, self.emit("disconnect", code), strategy === ShardStrategy.Shutdown) {

package/package.json

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