From 50b7607f7781b18e9cd0f97b119dd557943180a3 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sun, 15 Feb 2026 05:38:42 +0000
Subject: [PATCH] refactor(gateway): dedupe ws log meta formatting

---
 src/gateway/ws-log.ts | 73 +++++++++++++------------------------------
 1 file changed, 22 insertions(+), 51 deletions(-)

diff --git a/src/gateway/ws-log.ts b/src/gateway/ws-log.ts
index d75986c756d..9e2dfdbe4b5 100644
--- a/src/gateway/ws-log.ts
+++ b/src/gateway/ws-log.ts
@@ -25,6 +25,25 @@ const wsInflightOptimized = new Map<string, number>();
 const wsInflightSince = new Map<string, number>();
 const wsLog = createSubsystemLogger("gateway/ws");
 
+const WS_META_SKIP_KEYS = new Set(["connId", "id", "method", "ok", "event"]);
+
+function collectWsRestMeta(meta?: Record<string, unknown>): string[] {
+  const restMeta: string[] = [];
+  if (!meta) {
+    return restMeta;
+  }
+  for (const [key, value] of Object.entries(meta)) {
+    if (value === undefined) {
+      continue;
+    }
+    if (WS_META_SKIP_KEYS.has(key)) {
+      continue;
+    }
+    restMeta.push(`${chalk.dim(key)}=${formatForLog(value)}`);
+  }
+  return restMeta;
+}
+
 export function shouldLogWs(): boolean {
   return shouldLogSubsystemToConsole("gateway/ws");
 }
@@ -252,24 +271,7 @@ export function logWs(direction: "in" | "out", kind: string, meta?: Record<strin
 
   const durationToken = typeof durationMs === "number" ? chalk.dim(`${durationMs}ms`) : undefined;
 
-  const restMeta: string[] = [];
-  if (meta) {
-    for (const [key, value] of Object.entries(meta)) {
-      if (value === undefined) {
-        continue;
-      }
-      if (key === "connId" || key === "id") {
-        continue;
-      }
-      if (key === "method" || key === "ok") {
-        continue;
-      }
-      if (key === "event") {
-        continue;
-      }
-      restMeta.push(`${chalk.dim(key)}=${formatForLog(value)}`);
-    }
-  }
+  const restMeta = collectWsRestMeta(meta);
 
   const trailing: string[] = [];
   if (connId) {
@@ -336,21 +338,7 @@ function logWsOptimized(direction: "in" | "out", kind: string, meta?: Record<str
     ok === undefined ? undefined : ok ? chalk.greenBright("✓") : chalk.redBright("✗");
   const durationToken = typeof durationMs === "number" ? chalk.dim(`${durationMs}ms`) : undefined;
 
-  const restMeta: string[] = [];
-  if (meta) {
-    for (const [key, value] of Object.entries(meta)) {
-      if (value === undefined) {
-        continue;
-      }
-      if (key === "connId" || key === "id") {
-        continue;
-      }
-      if (key === "method" || key === "ok") {
-        continue;
-      }
-      restMeta.push(`${chalk.dim(key)}=${formatForLog(value)}`);
-    }
-  }
+  const restMeta = collectWsRestMeta(meta);
 
   const tokens = [
     `${chalk.yellowBright("⇄")} ${chalk.bold("res")}`,
@@ -417,24 +405,7 @@ function logWsCompact(direction: "in" | "out", kind: string, meta?: Record<strin
         ? chalk.bold(meta.event)
         : undefined;
 
-  const restMeta: string[] = [];
-  if (meta) {
-    for (const [key, value] of Object.entries(meta)) {
-      if (value === undefined) {
-        continue;
-      }
-      if (key === "connId" || key === "id") {
-        continue;
-      }
-      if (key === "method" || key === "ok") {
-        continue;
-      }
-      if (key === "event") {
-        continue;
-      }
-      restMeta.push(`${chalk.dim(key)}=${formatForLog(value)}`);
-    }
-  }
+  const restMeta = collectWsRestMeta(meta);
 
   const trailing: string[] = [];
   if (connId && connId !== wsLastCompactConnId) {