mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-07-26 09:52:11 +03:00
`fetch()` always transparently decompresses the upstream body before exposing it via `.text()` or the stream reader, so forwarding the upstream `content-encoding` header (e.g. `gzip`) to the downstream OpenAI/Anthropic-compatible client makes the client attempt to gunzip plain text and fail with `ZlibError: incorrect header check`. Similarly, `content-length` becomes stale once we transform the response body (non-stream path repacks via `new Response()`; stream path re-streams through our SSE heartbeat / shape transforms), and `transfer-encoding` is owned by the Node/Next runtime, not us. This patch adds `open-sse/utils/upstreamResponseHeaders.ts` exporting: - `stripStaleEncodingHeaders(input: Headers)` — returns a new `Headers` with content-encoding, content-length, transfer-encoding removed (case-insensitive, does not mutate input). - `filterUpstreamResponseHeaderEntries(entries, extraToStrip)` — same semantics for the entries-array path used by the streaming response builder, plus user-supplied additional names (case-insensitive). - `STRIP_UPSTREAM_HEADER_NAMES` — the canonical set, exported for tests. `open-sse/handlers/chatCore.ts` now uses these helpers in two places: 1. Non-stream path (~L3211): replaces `new Headers(rawResult.response.headers)` with `stripStaleEncodingHeaders(...)` so the repacked Response below doesn't claim a stale encoding/length. 2. Stream path (~L4371): replaces an inline IIFE+filter that only removed `content-type` with `filterUpstreamResponseHeaderEntries(..., ["content-type"])` so the stale encoding/length are also stripped before we set our own `text/event-stream` content-type. Both call sites carry a comment explaining the underlying fetch decompression behavior. Tests ----- New `tests/unit/upstream-response-headers-strip.test.ts` adds 10 cases covering: lowercase strip, mixed-case strip, input non-mutation, empty input, default-set filter, case-insensitive extraToStrip, empty extraToStrip preservation, empty entries, mixed-case default names, and canonical set identity. Verified locally ---------------- - `npx eslint open-sse/utils/upstreamResponseHeaders.ts open-sse/handlers/chatCore.ts tests/unit/upstream-response-headers-strip.test.ts` — clean. - `npm run typecheck:core` — clean. - `node --import tsx/esm --test tests/unit/upstream-response-headers-strip.test.ts tests/unit/upstream-headers-sanitize.test.ts tests/unit/chatcore-sanitization.test.ts tests/unit/chat-route-edge-cases.test.ts tests/unit/chatcore-translation-paths.test.ts tests/unit/chatcore-compression-integration.test.ts` — 95/95 pass. - Full `npm run test:unit` / `test:coverage` deferred to upstream CI (122 test files, exceeds local timeout window).
113 lines
4.0 KiB
TypeScript
113 lines
4.0 KiB
TypeScript
import { test } from "node:test";
|
|
import assert from "node:assert/strict";
|
|
import {
|
|
stripStaleEncodingHeaders,
|
|
filterUpstreamResponseHeaderEntries,
|
|
STRIP_UPSTREAM_HEADER_NAMES,
|
|
} from "../../open-sse/utils/upstreamResponseHeaders.ts";
|
|
|
|
test("stripStaleEncodingHeaders: removes content-encoding/length/transfer-encoding (lowercase)", () => {
|
|
const input = new Headers({
|
|
"content-encoding": "gzip",
|
|
"content-length": "1234",
|
|
"transfer-encoding": "chunked",
|
|
"content-type": "application/json",
|
|
"x-request-id": "abc",
|
|
});
|
|
const out = stripStaleEncodingHeaders(input);
|
|
assert.strictEqual(out.get("content-encoding"), null);
|
|
assert.strictEqual(out.get("content-length"), null);
|
|
assert.strictEqual(out.get("transfer-encoding"), null);
|
|
assert.strictEqual(out.get("content-type"), "application/json");
|
|
assert.strictEqual(out.get("x-request-id"), "abc");
|
|
});
|
|
|
|
test("stripStaleEncodingHeaders: removes mixed-case header names (case-insensitive)", () => {
|
|
const input = new Headers({
|
|
"Content-Encoding": "gzip",
|
|
"Content-Length": "1234",
|
|
"Transfer-Encoding": "chunked",
|
|
"Content-Type": "text/plain",
|
|
});
|
|
const out = stripStaleEncodingHeaders(input);
|
|
assert.strictEqual(out.get("content-encoding"), null);
|
|
assert.strictEqual(out.get("content-length"), null);
|
|
assert.strictEqual(out.get("transfer-encoding"), null);
|
|
assert.strictEqual(out.get("content-type"), "text/plain");
|
|
});
|
|
|
|
test("stripStaleEncodingHeaders: does not mutate the input Headers", () => {
|
|
const input = new Headers({
|
|
"content-encoding": "gzip",
|
|
"content-type": "application/json",
|
|
});
|
|
const out = stripStaleEncodingHeaders(input);
|
|
assert.strictEqual(input.get("content-encoding"), "gzip");
|
|
assert.strictEqual(out.get("content-encoding"), null);
|
|
});
|
|
|
|
test("stripStaleEncodingHeaders: empty input returns empty Headers", () => {
|
|
const out = stripStaleEncodingHeaders(new Headers());
|
|
// Iterate to confirm no entries.
|
|
const entries: Array<[string, string]> = [];
|
|
out.forEach((v, k) => entries.push([k, v]));
|
|
assert.deepEqual(entries, []);
|
|
});
|
|
|
|
test("filterUpstreamResponseHeaderEntries: strips default header set", () => {
|
|
const entries: Array<[string, string]> = [
|
|
["content-encoding", "gzip"],
|
|
["content-length", "1234"],
|
|
["transfer-encoding", "chunked"],
|
|
["content-type", "application/json"],
|
|
["x-request-id", "abc"],
|
|
];
|
|
const out = filterUpstreamResponseHeaderEntries(entries);
|
|
assert.deepEqual(out, [
|
|
["content-type", "application/json"],
|
|
["x-request-id", "abc"],
|
|
]);
|
|
});
|
|
|
|
test("filterUpstreamResponseHeaderEntries: extraToStrip is case-insensitive", () => {
|
|
const entries: Array<[string, string]> = [
|
|
["Content-Type", "text/event-stream"],
|
|
["X-Request-Id", "abc"],
|
|
];
|
|
const out = filterUpstreamResponseHeaderEntries(entries, ["CONTENT-TYPE"]);
|
|
assert.deepEqual(out, [["X-Request-Id", "abc"]]);
|
|
});
|
|
|
|
test("filterUpstreamResponseHeaderEntries: empty extraToStrip preserves non-default headers", () => {
|
|
const entries: Array<[string, string]> = [
|
|
["content-type", "application/json"],
|
|
["x-custom", "value"],
|
|
];
|
|
const out = filterUpstreamResponseHeaderEntries(entries, []);
|
|
assert.deepEqual(out, [
|
|
["content-type", "application/json"],
|
|
["x-custom", "value"],
|
|
]);
|
|
});
|
|
|
|
test("filterUpstreamResponseHeaderEntries: empty input returns empty array", () => {
|
|
const out = filterUpstreamResponseHeaderEntries([]);
|
|
assert.deepEqual(out, []);
|
|
});
|
|
|
|
test("filterUpstreamResponseHeaderEntries: handles mixed-case default header names", () => {
|
|
const entries: Array<[string, string]> = [
|
|
["Content-Encoding", "gzip"],
|
|
["X-Custom", "v"],
|
|
];
|
|
const out = filterUpstreamResponseHeaderEntries(entries);
|
|
assert.deepEqual(out, [["X-Custom", "v"]]);
|
|
});
|
|
|
|
test("STRIP_UPSTREAM_HEADER_NAMES: contains expected three lowercase names", () => {
|
|
assert.strictEqual(STRIP_UPSTREAM_HEADER_NAMES.size, 3);
|
|
assert.ok(STRIP_UPSTREAM_HEADER_NAMES.has("content-encoding"));
|
|
assert.ok(STRIP_UPSTREAM_HEADER_NAMES.has("content-length"));
|
|
assert.ok(STRIP_UPSTREAM_HEADER_NAMES.has("transfer-encoding"));
|
|
});
|