@bakit/gateway 2.1.8 → 2.1.9

package/dist/index.js

@@ -7,7 +7,7 @@ import { fork } from 'child_process';
 import '@bakit/rest';
 
 // src/lib/shard.ts
-var INCOMPLETE_JSON_REGEX = /unexpected end|unterminated|unexpected eof|end of json/i, DEFAULT_SHARD_OPTIONS = {
+var DEFAULT_SHARD_OPTIONS = {
   gateway: {
     baseURL: "wss://gateway.discord.gg",
     version: 10
@@ -34,7 +34,7 @@ var INCOMPLETE_JSON_REGEX = /unexpected end|unterminated|unexpected eof|end of j
   Shutdown: 4
 };
 function createShard(options) {
-  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({
+  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,
@@ -66,11 +66,8 @@ function createShard(options) {
       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 = Buffer.alloc(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) => {
@@ -89,48 +86,46 @@ function createShard(options) {
     });
   }
   function onMessage(data) {
-    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;
-      }
+    if (!inflater) {
       try {
-        inflater.write(data);
-      } catch (err) {
-        self.emit("error", new Error(`Zlib inflation error: ${err instanceof Error ? err.message : String(err)}`)), ws?.terminate();
+        let text = data.toString(), payload = JSON.parse(text);
+        handlePayload(payload);
+      } catch (error) {
+        self.emit("error", error);
       }
-    }
-  }
-  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));
+    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;
       }
-      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);
+      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;
-        }
-        inflateBuffer = inflateBuffer.subarray(start);
-        return;
+        self.emit("error", error), decompressBuffer = [];
       }
-      start = newlinePos + 1;
     }
-    inflateBuffer = Buffer.alloc(0);
+  }
+  function isValidJSON(str) {
+    try {
+      return JSON.parse(str), !0;
+    } catch {
+      return false;
+    }
   }
   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.8",
+  "version": "2.1.9",
   "description": "Gateway manager for bakit framework",
   "type": "module",
   "exports": {