ldrouter 1.11.17 → 1.13.1

package/dist/server/upstream/client.js

@@ -2,6 +2,7 @@
 import { decryptSecret, decryptCustomHeaders } from '../auth/crypto.js';
 import { GatewayError } from '../errors.js';
 import { buildHeaders, stripSlash } from '../providers/index.js';
+import { debugUpstream, errorLine, formatError, truncate } from '../logging/debug.js';
 export function providerToUpstreamConfig(p) {
     let apiKey;
     let customHeaders;
@@ -34,7 +35,7 @@ export function providerToUpstreamConfig(p) {
         totalTimeoutMs: p.totalTimeoutMs,
     };
 }
-export async function callUpstreamNonStreaming(cfg, url, payload) {
+export async function callUpstreamNonStreaming(cfg, url, payload, requestId = '-') {
     const ctl = new AbortController();
     const timer = setTimeout(() => ctl.abort(), cfg.totalTimeoutMs);
     const start = Date.now();
@@ -47,6 +48,7 @@ export async function callUpstreamNonStreaming(cfg, url, payload) {
         });
         const text = await res.text();
         const ttft = Date.now() - start;
+        logUpstreamResponse(requestId, res.status, res.statusText, res.headers, ttft, text);
         return {
             status: res.status,
             ok: res.ok,
@@ -58,6 +60,7 @@ export async function callUpstreamNonStreaming(cfg, url, payload) {
     }
     catch (e) {
         const err = e;
+        errorLine(requestId, 'UPSTREAM FETCH ERROR', [`url=${url}`, `afterMs=${Date.now() - start}`, ...formatError(e)]);
         if (err.name === 'AbortError') {
             throw new GatewayError('timeout_error', 'Upstream request timed out', { status: 504, cause: e });
         }
@@ -73,11 +76,28 @@ export function extractUpstreamRequestId(headers) {
     }
     return headers['x-request-id'] ?? headers['request-id'] ?? headers['x-amzn-requestid'] ?? null;
 }
+/** docs/13 §14: upstream response summary (sanitized headers) + error body for non-2xx. */
+function logUpstreamResponse(requestId, status, statusText, headers, durationMs, body) {
+    const h = (name) => headers.get(name) ?? undefined;
+    debugUpstream(requestId, 'UPSTREAM RESPONSE', [
+        `status=${status}`,
+        `statusText=${statusText}`,
+        `content-type=${h('content-type') ?? 'undefined'}`,
+        `content-length=${h('content-length') ?? 'undefined'}`,
+        `transfer-encoding=${h('transfer-encoding') ?? 'undefined'}`,
+        `server=${h('server') ?? 'undefined'}`,
+        `durationToHeadersMs=${durationMs}`,
+        `upstreamRequestId=${extractUpstreamRequestId(headers) ?? 'null'}`,
+    ]);
+    if (status < 200 || status >= 300) {
+        errorLine(requestId, 'UPSTREAM ERROR BODY', [truncate(body, 4000)]);
+    }
+}
 /**
  * Call upstream with SSE streaming. Invokes onChunk for each SSE event.
  * Returns a promise resolving when the stream completes or rejects on failure.
  */
-export async function callUpstreamStreaming(cfg, url, payload, onChunk) {
+export async function callUpstreamStreaming(cfg, url, payload, onChunk, requestId = '-') {
     const ctl = new AbortController();
     const totalTimer = setTimeout(() => ctl.abort(), cfg.totalTimeoutMs);
     const start = Date.now();
@@ -98,8 +118,10 @@ export async function callUpstreamStreaming(cfg, url, payload, onChunk) {
         });
         if (!res.ok || !res.body) {
             const text = await res.text();
+            logUpstreamResponse(requestId, res.status, res.statusText, res.headers, Date.now() - start, text);
             throw new UpstreamHttpError(res.status, text, extractUpstreamRequestId(res.headers));
         }
+        logUpstreamResponse(requestId, res.status, res.statusText, res.headers, Date.now() - start, '');
         // First-token watchdog
         firstTokenTimer = setTimeout(() => ctl.abort(), cfg.firstTokenTimeoutMs);
         resetIdle();
@@ -161,6 +183,12 @@ export async function callUpstreamStreaming(cfg, url, payload, onChunk) {
             throw new GatewayError('upstream_error', `Upstream HTTP ${e.status}: ${e.bodyExcerpt}`, { status: 502, cause: e });
         }
         const err = e;
+        errorLine(requestId, 'UPSTREAM FETCH ERROR', [
+            `url=${url}`,
+            `afterMs=${Date.now() - start}`,
+            `ttftKnown=${ttft !== null}`,
+            ...formatError(e),
+        ]);
         if (err.name === 'AbortError') {
             if (ttft === null && firstTokenTimer) {
                 throw new GatewayError('timeout_error', 'Upstream first token timeout', { status: 504, cause: e });