pjandro/OmniRoute
1
0
Fork 0
mirror of https://github.com/diegosouzapw/OmniRoute.git synced 2026-08-24 16:12:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(relay): normalize bifrost errors, remap credential 404, fix analytics (#10797)

Browse Source 
Merged — the 5 pre-existing tests that broke from this PR's intentional 404→401 remap (single-model no-credentials) are now realigned to the new contract. Thanks!
This commit is contained in:
Diego Rodrigues de Sa e Souza
2026-08-20 06:37:02 -03:00
committed by GitHub
parent 3810a6c52c
commit bc6129bcb2
11 changed files with 422 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/app/api/v1/relay/chat/completions/route.ts
View File

@@ -10,7 +10,11 @@ import { CORS_HEADERS, handleCorsOptions } from "@/shared/utils/cors";
import { handleChat } from "@/sse/handlers/chat";
import { createInjectionGuard } from "@/middleware/promptInjectionGuard";
import { getRelayTokenByHash, checkRateLimit, recordRelayUsage } from "@/lib/db/relayProxies";
import { buildErrorBody } from "@omniroute/open-sse/utils/error";
import {
buildErrorBody,
parseUpstreamError,
sanitizeErrorMessage,
} from "@omniroute/open-sse/utils/error";
import {
checkIpRateLimit,
extractToken,
@@ -29,6 +33,7 @@ import {
import { getProviderPluginManifestEntryForModel } from "@omniroute/open-sse/config/providerPluginManifestRegistry.ts";
import { getProviderPluginManifestHeader } from "@omniroute/open-sse/config/providerPluginManifestUrl.ts";
import { finalizeReadableStream } from "./streamFinalizer";
import { stripStaleEncodingHeaders } from "@omniroute/open-sse/utils/upstreamResponseHeaders.ts";
import {
clearBifrostFailure,
getActiveBifrostCooldown,
@@ -108,6 +113,32 @@ async function forwardToBifrost(
headers.set("Content-Type", upstream.headers.get("Content-Type") ?? "application/json");
}
// Issue #1: Bifrost (or the upstream behind it) may return plain text or HTML
// on a non-OK status (e.g. 502 from a sidecar, "invalid character 'd'" style
// proxy errors). Forwarding `upstream.body` raw leaks non-JSON into a client
// that expects OpenAI-shaped JSON, producing client-side parse failures.
// Normalize any non-OK response through parseUpstreamError + buildErrorBody so
// the client always receives a valid JSON error. (Hard rule #12.)
if (!upstream.ok) {
const parsed = await parseUpstreamError(upstream, null);
const errorBody = buildErrorBody(
parsed.statusCode,
sanitizeErrorMessage(parsed.message),
parsed.responseBody
);
const errorHeaders = stripStaleEncodingHeaders(headers);
errorHeaders.set("Content-Type", "application/json");
if (parsed.retryAfterMs && parsed.retryAfterMs > 0) {
errorHeaders.set("Retry-After", String(Math.ceil(parsed.retryAfterMs / 1000)));
}
clearTimeout(tid);
recordUsage(token.id, request, startTime, clientIp, userAgent, "error", parsed.statusCode);
return new Response(JSON.stringify(errorBody), {
status: parsed.statusCode,
headers: errorHeaders,
});
}
if (wantsStream && upstream.body) {
const stream = finalizeReadableStream(upstream.body, (error) => {
clearTimeout(tid);
@@ -144,7 +175,8 @@ async function forwardToBifrost(
startTime,
clientIp,
userAgent,
upstream.status < 500 ? "success" : "error",
// upstream.ok is guaranteed true here (the !upstream.ok branch above returns early).
"success",
upstream.status
);