fix(gateway): close billing, limit, routing and translation gaps

Billing:
- Passthrough SSE streams now bill the usage the upstream reports.
  The gateway falls back to a request-size estimate only on a 2xx
  stream or a truncated JSON body.
- A unified stream that fails after it starts is estimated, not
  billed at zero.
- Billing uses the built-in LiteLLM price table and honours
  modelMeta free: true.
- Pricing entries are validated. Cost arithmetic rounds the total and
  saturates on overflow.
- Gemini thinking tokens count as completion tokens.

Limits and storage:
- A rejected request rolls back its counts on the other scopes, so one
  user cannot lock out a group.
- Redis EXPIRE replies are checked. Keys recreated without a TTL are
  repaired at once.
- A mutating pipeline is not retried after reply bytes arrive.
- History, model totals and target usage report a store outage.

Routing and translation:
- Discovered ids with a provider-like prefix are listed only in
  owner/id form, so listing and routing agree.
- Anthropic and Gemini discovery follows pagination.
- The developer role maps to system.
- stream_options.include_usage is honoured on translated streams.
- tool_choice none keeps tools when history holds tool blocks.
- refusal maps to content_filter. Data URI parameters are stripped.

Streaming, retry and failover:
- SSE accepts CR, LF and CRLF line ends. This closes a CR injection
  path.
- Retry-After is never jittered. A cancelled wait returns the
  context error.
- The watchdog timer stops at end of body.
- Oversized bodies return 413.
- A failed stream ends with an error event.
- Failover restores pre-existing headers. Client cancels do not count
  as provider successes.

Also: "admin" is a reserved provider name. metrics.path must start
with "/". Pricing warnings go to the right gateway instance. The admin
targets view sends access as null or [] so the two states differ.
Upstream organisation headers are stripped. The users-file reload
error is logged once per error. Dead code is removed, and test-only
helpers move to test files.

Claude-Session: https://claude.ai/code/session_01V5jYJNxpDFdJkyyExpADrv
This commit is contained in:
2026-09-23 09:44:31 +01:00
parent b3b8ae6ad5
commit 4c01c75276
62 changed files with 6064 additions and 1182 deletions
+43 -3
View File
@@ -491,6 +491,40 @@ func TestFailoverEligible(t *testing.T) {
}
}
// TestRequestHealthOutcome is the verify-core round-4 regression:
// errRequestBuildFailed must classify the same way context.Canceled and
// the translation errors already do — record=false (skip: this says
// nothing about the provider's own availability, requestHealthOutcome's
// own doc comment) — not success=true, which the pre-fix
// !failoverEligible(callErr) fallthrough produced (failoverEligible
// reports false for it for the OPPOSITE reason: retrying an identically
// malformed request wastes attempts, not because it is evidence the
// provider is healthy).
func TestRequestHealthOutcome(t *testing.T) {
t.Parallel()
tests := []struct {
err error
name string
wantSuccess bool
wantRecord bool
}{
{name: "nil error is a success", err: nil, wantSuccess: true, wantRecord: true},
{name: "500 records a failure", err: &providerHTTPError{status: http.StatusInternalServerError}, wantSuccess: false, wantRecord: true},
{name: "400 records a success (not eligible for failover, but the provider DID answer, so it is healthy)", err: &providerHTTPError{status: http.StatusBadRequest}, wantSuccess: true, wantRecord: true},
{name: "client canceled is skipped, not a success", err: fmt.Errorf("%w: %w", errUpstream, context.Canceled), wantSuccess: false, wantRecord: false},
{name: "request build failure is skipped, not a success", err: fmt.Errorf("%w: %w: build request", errUpstream, errRequestBuildFailed), wantSuccess: false, wantRecord: false},
{name: "translateError is skipped, not a success", err: &translateError{msg: "bad field"}, wantSuccess: false, wantRecord: false},
{name: "responseTranslationError is skipped, not a success", err: &responseTranslationError{err: errors.New("boom")}, wantSuccess: false, wantRecord: false},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
success, record := requestHealthOutcome(tt.err)
assert.Equal(t, tt.wantSuccess, success, "success")
assert.Equal(t, tt.wantRecord, record, "record")
})
}
}
func TestIsProviderNotFoundError(t *testing.T) {
t.Parallel()
assert.True(t, isProviderNotFoundError(&providerHTTPError{status: http.StatusNotFound}))
@@ -942,8 +976,13 @@ func TestHandleChat_Failover_400_DoesNotFallThrough(t *testing.T) {
// TestHandleChat_Failover_MidStream_DoesNotFailOver_NoCorruption is the
// regression test for THE HARD CONSTRAINT: once anything has reached the
// client, failover must never happen and the response must never be
// corrupted with a second envelope. Would FAIL if the loop checked
// failoverEligible before sw.wroteHeader.
// corrupted with a second, conflicting HTTP envelope — beta must never
// be called once alpha has started writing. Would FAIL if the loop
// checked failoverEligible before sw.wroteHeader. The response body DOES
// carry one trailing SSE error event (finding 15 fix, review-routes.md),
// which is not a second envelope in that sense — it is the in-stream
// terminal signal an OpenAI-compatible client expects, appended to
// alpha's own partial output, never beta's.
func TestHandleChat_Failover_MidStream_DoesNotFailOver_NoCorruption(t *testing.T) {
const firstChunk = "data: {\"id\":\"c1\",\"object\":\"chat.completion.chunk\",\"choices\":[{\"delta\":{\"content\":\"Hi\"}}]}\n\n"
@@ -976,8 +1015,9 @@ func TestHandleChat_Failover_MidStream_DoesNotFailOver_NoCorruption(t *testing.T
rec := httptest.NewRecorder()
h.ServeHTTP(rec, req)
const wantErrEvent = "data: {\"error\":{\"message\":\"upstream connection error\",\"type\":\"server_error\"}}\n\n"
assert.Equal(t, http.StatusOK, rec.Code, "headers already committed before the drop")
assert.Equal(t, firstChunk, rec.Body.String(), "no trailing envelope, no failover content appended")
assert.Equal(t, firstChunk+wantErrEvent, rec.Body.String(), "alpha's own partial output plus its own trailing error event, no failover content appended")
assert.Equal(t, int64(0), atomic.LoadInt64(&betaCalls), "beta must never be called once alpha has started writing")
}