mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-08-08 00:02:20 +03:00
`BaseExecutor.buildHeaders(credentials, stream?, clientHeaders?, model?, health?)` was shadowed in three executors by same-named helpers with unrelated signatures: hailuo-web private buildHeaders(token: string, yy: string) lmarena protected buildHeaders(_model: string, credentials: unknown, _body: unknown) qwen-web private buildHeaders(token: string, cookieHeader: string, chatId?: string) Name collisions, not overrides — each reported TS2416. They are renamed to `buildStreamHeaders` / `buildRequestHeaders` / `buildApiHeaders`; the two lmarena test files that called the helper directly are updated with them. Worth stating precisely, because the shadow sat on a live dispatch path without being a live bug: `BaseExecutor.countTokens()` calls `this.buildHeaders(credentials, false)`, and all three inherit `countTokens()`. It is unreachable today only because `buildCountTokensUrl()` returns null unless `config.format === "claude"` and the URL carries `/messages` — hailuo-web and qwen-web set no format, lmarena sets `"openai"` — so `countTokens()` returns at the guard above. Latent, not live; one `format` change away from passing a credentials object where a token string is expected. Two more, surfaced by clearing the above: * `lmarena` declared `buildUrl` and `transformRequest` `protected` while both are public on BaseExecutor (TS2415 — a subclass may widen visibility, never narrow it). Both were masked behind the buildHeaders TS2416 and appeared one at a time as it cleared. Runtime is unaffected; JavaScript has no member visibility. * `GithubExecutor.refreshCredentials` had no declared return type, so TypeScript inferred the union of its four literal returns. `GheCopilotExecutor` legitimately overrides it with a wider `providerSpecificData` (it also records the enterprise proxy URL) and no `expiresIn`, which is not assignable to that inferred union. Declared as `RefreshedCopilotCredentials | null` — same shape of fix as #8489, on a different method. Validation: full tsc error-set diff against the base config — 335 -> 331, zero new errors (line-number-agnostic). `typecheck:core` clean; the 15 existing test files importing a touched executor pass, including lmarena's 44 across the two updated files. `plan3-p0.test.ts` fails identically with and without this change (it reads the developer's real ~/.omniroute DB rather than a test-scoped DATA_DIR). The new test pins that the inherited method is no longer shadowed — verified to fail on the base, where all three prototypes still carry their own `buildHeaders` — and that the `countTokens()` early return which kept it harmless still holds.
226 lines
7.0 KiB
TypeScript
226 lines
7.0 KiB
TypeScript
/**
|
|
* LMArenaExecutor — Arena (formerly LMArena) web-session provider.
|
|
*
|
|
* Routes requests through arena.ai create-evaluation with session cookies.
|
|
* Upstream sits behind Cloudflare; traffic goes through tls-client-node Chrome
|
|
* impersonation (see services/lmarenaTlsClient.ts).
|
|
*
|
|
* Helpers: open-sse/executors/lmarena/{cookie,models,stream,response}.ts
|
|
*/
|
|
import { v7 as uuidv7 } from "uuid";
|
|
import { BaseExecutor, type ExecuteInput } from "./base.ts";
|
|
import { tlsFetchLMArena, TlsClientUnavailableError } from "../services/lmarenaTlsClient.ts";
|
|
import { readLMArenaCookie, reconstructLMArenaCookie } from "./lmarena/cookie.ts";
|
|
import {
|
|
LMARENA_STREAM_URL,
|
|
LMARENA_USER_AGENT,
|
|
buildLmarenaBrowserHeaders,
|
|
markLMArenaCatalogModelDead,
|
|
normalizeLMArenaModelsForCatalog,
|
|
parseLMArenaInitialModels,
|
|
pickLMArenaModelId,
|
|
resolveLMArenaModelId,
|
|
type LMArenaModelMetadata,
|
|
} from "./lmarena/models.ts";
|
|
import { formatArenaPrompt, parseArenaSSE } from "./lmarena/stream.ts";
|
|
import {
|
|
buildArenaUpstreamHttpResponse,
|
|
createOpenAIArenaStream,
|
|
handleNonStreamingArenaResponse,
|
|
mapFailedTlsResult,
|
|
mapNetworkError,
|
|
mapTlsUnavailable,
|
|
missingCookieResult,
|
|
} from "./lmarena/response.ts";
|
|
|
|
export {
|
|
reconstructLMArenaCookie,
|
|
normalizeLMArenaModelsForCatalog,
|
|
parseLMArenaInitialModels,
|
|
pickLMArenaModelId,
|
|
parseArenaSSE,
|
|
markLMArenaCatalogModelDead,
|
|
LMARENA_USER_AGENT,
|
|
};
|
|
export { clearLMArenaDeadCatalogModels } from "./lmarena/models.ts";
|
|
export type { LMArenaModelMetadata };
|
|
|
|
interface OpenAIMessage {
|
|
role?: string;
|
|
content?: unknown;
|
|
}
|
|
|
|
/** Optional browser-issued reCAPTCHA v3 token (operator-supplied). */
|
|
function readRecaptchaToken(credentials: unknown, body: unknown): string | null {
|
|
const fromObj = (v: unknown): string | null => {
|
|
if (!v || typeof v !== "object") return null;
|
|
const rec = v as Record<string, unknown>;
|
|
const direct = rec.recaptchaV3Token ?? rec.recaptchaToken;
|
|
if (typeof direct === "string" && direct.trim()) return direct.trim();
|
|
const psd = rec.providerSpecificData;
|
|
if (psd && typeof psd === "object") {
|
|
const nested = psd as Record<string, unknown>;
|
|
const t = nested.recaptchaV3Token ?? nested.recaptchaToken;
|
|
if (typeof t === "string" && t.trim()) return t.trim();
|
|
}
|
|
return null;
|
|
};
|
|
return fromObj(credentials) ?? fromObj(body);
|
|
}
|
|
|
|
export class LMArenaExecutor extends BaseExecutor {
|
|
constructor(providerConfig = {}) {
|
|
super("lmarena", { format: "openai", ...providerConfig });
|
|
}
|
|
|
|
// Public to match BaseExecutor.buildUrl — a subclass may widen visibility but not
|
|
// narrow it. This was masked behind the buildHeaders TS2416 until that one cleared.
|
|
buildUrl(_model: string, _credentials: unknown): string {
|
|
return LMARENA_STREAM_URL;
|
|
}
|
|
|
|
protected buildRequestHeaders(
|
|
_model: string,
|
|
credentials: unknown,
|
|
_body: unknown
|
|
): Record<string, string> {
|
|
const cookie = readLMArenaCookie(credentials);
|
|
const headers = buildLmarenaBrowserHeaders({
|
|
"Content-Type": "application/json",
|
|
Accept: "text/event-stream",
|
|
});
|
|
if (cookie) headers.Cookie = cookie;
|
|
return headers;
|
|
}
|
|
|
|
transformRequest(body: unknown, model: string, credentials?: unknown): unknown {
|
|
const openaiBody = body && typeof body === "object" ? (body as Record<string, unknown>) : {};
|
|
const messages = Array.isArray(openaiBody.messages)
|
|
? (openaiBody.messages as OpenAIMessage[])
|
|
: [];
|
|
return {
|
|
id: uuidv7(),
|
|
mode: "direct-battle",
|
|
modelAId: model,
|
|
userMessageId: uuidv7(),
|
|
modelAMessageId: uuidv7(),
|
|
userMessage: {
|
|
content: formatArenaPrompt(messages),
|
|
experimental_attachments: [],
|
|
metadata: {},
|
|
},
|
|
modality: "chat",
|
|
recaptchaV3Token: readRecaptchaToken(credentials, body),
|
|
};
|
|
}
|
|
|
|
async execute(input: ExecuteInput) {
|
|
const { model, body, stream, credentials, signal, log } = input;
|
|
const url = this.buildUrl(model, credentials);
|
|
const headers = this.buildRequestHeaders(model, credentials, body);
|
|
const cookie = readLMArenaCookie(credentials);
|
|
|
|
if (!cookie) {
|
|
return missingCookieResult(url, headers, this.transformRequest(body, model, credentials));
|
|
}
|
|
|
|
const arenaModelId = await resolveLMArenaModelId(model, log);
|
|
const transformedBody = this.transformRequest(body, arenaModelId, credentials) as Record<
|
|
string,
|
|
unknown
|
|
>;
|
|
|
|
log?.info?.(
|
|
"LMArenaExecutor",
|
|
arenaModelId === model
|
|
? `Executing request for model: ${model}`
|
|
: `Executing request for model: ${model} (${arenaModelId})`
|
|
);
|
|
|
|
try {
|
|
return await this.dispatchTls(url, headers, transformedBody, {
|
|
model,
|
|
arenaModelId,
|
|
stream: !!stream,
|
|
signal,
|
|
log,
|
|
});
|
|
} catch (error) {
|
|
if (error instanceof TlsClientUnavailableError) {
|
|
log?.error?.("LMArenaExecutor", `TLS client unavailable: ${error.message}`);
|
|
return mapTlsUnavailable(error, url, headers, transformedBody);
|
|
}
|
|
const message = error instanceof Error ? error.message : String(error);
|
|
log?.error?.("LMArenaExecutor", `Request failed: ${message}`);
|
|
return mapNetworkError(message, url, headers, transformedBody);
|
|
}
|
|
}
|
|
|
|
private async dispatchTls(
|
|
url: string,
|
|
headers: Record<string, string>,
|
|
transformedBody: Record<string, unknown>,
|
|
ctx: {
|
|
model: string;
|
|
arenaModelId: string;
|
|
stream: boolean;
|
|
signal?: AbortSignal;
|
|
log?: ExecuteInput["log"];
|
|
}
|
|
) {
|
|
const tlsResult = await tlsFetchLMArena(url, {
|
|
method: "POST",
|
|
headers,
|
|
body: JSON.stringify(transformedBody),
|
|
signal: ctx.signal,
|
|
stream: ctx.stream,
|
|
streamEofSymbol: "__OMNIROUTE_LMARENA_EOF_NEVER__",
|
|
});
|
|
|
|
const failed = mapFailedTlsResult({
|
|
status: tlsResult.status,
|
|
text: tlsResult.text,
|
|
hasRecaptcha: transformedBody.recaptchaV3Token != null,
|
|
model: ctx.model,
|
|
arenaModelId: ctx.arenaModelId,
|
|
url,
|
|
headers,
|
|
transformedBody,
|
|
});
|
|
if (failed) return failed;
|
|
|
|
const upstream = buildArenaUpstreamHttpResponse({
|
|
stream: ctx.stream,
|
|
status: tlsResult.status,
|
|
text: tlsResult.text,
|
|
body: tlsResult.body,
|
|
});
|
|
|
|
const response = ctx.stream
|
|
? await this.handleStreamingResponse(upstream, ctx.model, ctx.signal, ctx.log)
|
|
: await handleNonStreamingArenaResponse(upstream, ctx.model);
|
|
|
|
return { response, url, headers, transformedBody };
|
|
}
|
|
|
|
private async handleStreamingResponse(
|
|
response: Response,
|
|
model: string,
|
|
signal?: AbortSignal,
|
|
log?: ExecuteInput["log"]
|
|
): Promise<Response> {
|
|
const reader = response.body?.getReader();
|
|
if (!reader) throw new Error("No response body for streaming");
|
|
|
|
const out = createOpenAIArenaStream({ reader, model, signal, log });
|
|
return new Response(out, {
|
|
status: 200,
|
|
headers: {
|
|
"Content-Type": "text/event-stream",
|
|
"Cache-Control": "no-cache",
|
|
Connection: "keep-alive",
|
|
},
|
|
});
|
|
}
|
|
}
|