From 82a5e74db3c7e7535b0537100be9e3bd07de58c2 Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Thu, 12 Mar 2026 10:19:37 -0400
Subject: [PATCH] Gateway: count preauth frame bytes accurately

---
 src/gateway/server.preauth-hardening.test.ts        | 4 ++--
 src/gateway/server/ws-connection/message-handler.ts | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/gateway/server.preauth-hardening.test.ts b/src/gateway/server.preauth-hardening.test.ts
index de0d2dbdabd..853a4490a91 100644
--- a/src/gateway/server.preauth-hardening.test.ts
+++ b/src/gateway/server.preauth-hardening.test.ts
@@ -1,5 +1,5 @@
 import { afterEach, describe, expect, it } from "vitest";
-import { DEFAULT_HANDSHAKE_TIMEOUT_MS, MAX_PREAUTH_PAYLOAD_BYTES } from "./server-constants.js";
+import { MAX_PREAUTH_PAYLOAD_BYTES } from "./server-constants.js";
 import { createGatewaySuiteHarness, readConnectChallengeNonce } from "./test-helpers.server.js";
 
 let cleanupEnv: Array<() => void> = [];
@@ -34,7 +34,7 @@ describe("gateway pre-auth hardening", () => {
       });
       expect(close.code).toBe(1000);
       expect(close.elapsedMs).toBeGreaterThanOrEqual(150);
-      expect(close.elapsedMs).toBeLessThan(DEFAULT_HANDSHAKE_TIMEOUT_MS);
+      expect(close.elapsedMs).toBeLessThan(400);
     } finally {
       await harness.close();
     }
diff --git a/src/gateway/server/ws-connection/message-handler.ts b/src/gateway/server/ws-connection/message-handler.ts
index 0c71ee9dfe8..022ea9e5bb1 100644
--- a/src/gateway/server/ws-connection/message-handler.ts
+++ b/src/gateway/server/ws-connection/message-handler.ts
@@ -1271,7 +1271,6 @@ function getRawDataByteLength(data: unknown): number {
   }
   return Buffer.byteLength(String(data));
 }
-
 function setSocketMaxPayload(socket: WebSocket, maxPayload: number): void {
   const receiver = (socket as { _receiver?: { _maxPayload?: number } })._receiver;
   if (receiver) {