@kb-labs/gateway-app 2.118.0 → 2.118.1

package/dist/index.js

@@ -2697,17 +2697,48 @@ function pumpBidirectional(client, upstream, logger) {
   const pending = [];
   let upstreamOpen = false;
   let closed = false;
-  const closeBoth = (code, reason) => {
+  const startedAt = Date.now();
+  let clientToUpstreamMessages = 0;
+  let upstreamToClientMessages = 0;
+  let clientToUpstreamBytes = 0;
+  let upstreamToClientBytes = 0;
+  let droppedMessages = 0;
+  const byteLength = (data) => {
+    if (typeof data === "string") {
+      return Buffer.byteLength(data);
+    }
+    if (Buffer.isBuffer(data)) {
+      return data.byteLength;
+    }
+    if (data instanceof ArrayBuffer) {
+      return data.byteLength;
+    }
+    return data.reduce((total, chunk) => total + chunk.byteLength, 0);
+  };
+  const closeBoth = (code, reason, closeReason = "peer_closed") => {
     if (closed) {
       return;
     }
     closed = true;
     safeClose(client, code, reason);
     safeClose(upstream, code, reason);
+    logger.info("Gateway WebSocket relay closed", {
+      event: "websocket.relay.closed",
+      closeReason,
+      closeCode: code,
+      durationMs: Date.now() - startedAt,
+      clientToUpstreamMessages,
+      upstreamToClientMessages,
+      clientToUpstreamBytes,
+      upstreamToClientBytes,
+      droppedMessages
+    });
   };
   client.on("message", (data, isBinary) => {
     if (upstreamOpen && upstream.readyState === OPEN) {
       upstream.send(data, { binary: isBinary });
+      clientToUpstreamMessages += 1;
+      clientToUpstreamBytes += byteLength(data);
     } else {
       pending.push({ data, binary: isBinary });
     }
@@ -2717,6 +2748,10 @@ function pumpBidirectional(client, upstream, logger) {
     for (const frame of pending) {
       if (upstream.readyState === OPEN) {
         upstream.send(frame.data, { binary: frame.binary });
+        clientToUpstreamMessages += 1;
+        clientToUpstreamBytes += byteLength(frame.data);
+      } else {
+        droppedMessages += 1;
       }
     }
     pending.length = 0;
@@ -2724,6 +2759,10 @@ function pumpBidirectional(client, upstream, logger) {
   upstream.on("message", (data, isBinary) => {
     if (client.readyState === OPEN) {
       client.send(data, { binary: isBinary });
+      upstreamToClientMessages += 1;
+      upstreamToClientBytes += byteLength(data);
+    } else {
+      droppedMessages += 1;
     }
   });
   upstream.on("close", (code, reason) => {
@@ -2734,11 +2773,11 @@ function pumpBidirectional(client, upstream, logger) {
   });
   upstream.on("error", (err) => {
     logger.warn("Upstream WS error", { error: err.message });
-    closeBoth(1011);
+    closeBoth(1011, void 0, "upstream_error");
   });
   client.on("error", (err) => {
     logger.warn("Client WS error", { error: err.message });
-    closeBoth(1011);
+    closeBoth(1011, void 0, "client_error");
   });
 }
 
@@ -2796,8 +2835,21 @@ function attachGatewayWs(server, cache, jwtConfig, logger, hostRegistry, socketW
       const { search } = new URL(req.url ?? "/", "http://localhost");
       const upstreamUrl = buildUpstreamWsUrl(socketUpstream, pathname, search);
       wss.handleUpgrade(req, socket, head, (clientWs) => {
-        const upstreamWs = new WebSocket(upstreamUrl, { headers: forwardWsHeaders(req) });
-        pumpBidirectional(clientWs, upstreamWs, logger);
+        const requestId = typeof req.headers["x-request-id"] === "string" ? req.headers["x-request-id"] : randomUUID();
+        const traceId = typeof req.headers["x-trace-id"] === "string" ? req.headers["x-trace-id"] : randomUUID();
+        const connectionId = randomUUID();
+        const connectionLogger = logger.child({
+          requestId,
+          traceId,
+          "network.transport": "websocket",
+          "network.connection_id": connectionId,
+          "http.route": pathname
+        }) ?? logger;
+        connectionLogger.info("Gateway WebSocket relay opened", { event: "websocket.relay.opened" });
+        const upstreamWs = new WebSocket(upstreamUrl, {
+          headers: { ...forwardWsHeaders(req), "x-request-id": requestId, "x-trace-id": traceId }
+        });
+        pumpBidirectional(clientWs, upstreamWs, connectionLogger);
       });
       return;
     }