mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-08-23 15:42:12 +03:00
⭐5 — Provider x-search de primeira classe (SuperGrok/xAI x_search) em POST /v1/search e MCP omniroute_x_search. Fallback de credenciais xai-oauth→xao→xai; distinto de web search e do X Developer MCP. Reconciliado com o release tip (que já incluía #10981 "skip catalog-default SearXNG" deste mesmo lote): merge trouxe 5 conflitos reais de contagem gerada (llm.txt/README.md/AGENTS.md/PROVIDER_REFERENCE.md/SVGs/46 mirrors i18n, todos verificados como bump puro 347→348, sem perda de conteúdo do HEAD) + 1 conflito real de mergeable=CONFLICTING. Durante a validação, os 3 testes novos de SearXNG expuseram um bug real de interação com #10981: `isUnconfiguredLoopbackSearchProvider()` checava o baseUrl ESTÁTICO do catálogo em vez do baseUrl efetivo (após override de `provider_options.baseUrl` ou `providerSpecificData.baseUrl` da conexão), então QUALQUER request a searxng-search — mesmo com override customizado — era rejeitado como se fosse o default não-configurado. Corrigido em `open-sse/handlers/search.ts` (resolve o baseUrl efetivo via `resolveSearchBaseUrl()` antes do skip-check, tanto para o provider primário quanto o alternate). Um teste do próprio #10988 que assumia o comportamento pré-#10981 (default localhost:8888 sempre atendido) foi atualizado para refletir o comportamento já mesclado e intencional (503 quando não configurado). Validação completa: typecheck limpo, 70/70 testes unit (search-route/search-registry/x-search-provider/searxng-loopback-default), 24/24 vitest MCP, 14/14 integration (search-providers-catalog), lint limpo nos arquivos tocados, docs-counts-sync OK (2 drifts soft pré-existentes, não relacionados), gates estáticos (file-size/complexity/cognitive/dead-code/changelog) todos OK.
136 lines
5.1 KiB
TypeScript
136 lines
5.1 KiB
TypeScript
/**
|
|
* #7993 — "OpenCode Free" is served by TWO distinct provider identities that
|
|
* are never unified: the no-auth "opencode" provider (NOAUTH_PROVIDERS —
|
|
* the id the NoAuthAccountCard UI writes fingerprints + accountProxies onto
|
|
* via a `provider_connections` row) and the "opencode-zen" APIKEY_PROVIDERS
|
|
* gateway (anonymousFallback: true, resolved from the canonical
|
|
* "opencode/<model>" prefix via the #2901 alias override in
|
|
* open-sse/services/model.ts).
|
|
*
|
|
* Before the fix, `getProviderCredentials("opencode-zen")` fell through to
|
|
* `maybeSyntheticNoAuthFallback("opencode-zen", ...)`, which hydrated
|
|
* `providerSpecificData` by querying `provider_connections` filtered by
|
|
* `provider === "opencode-zen"` — a DIFFERENT id than the one the user's
|
|
* connection row is saved under ("opencode") — so the assigned proxy was
|
|
* silently dropped and the request egressed direct.
|
|
*/
|
|
import test from "node:test";
|
|
import assert from "node:assert/strict";
|
|
import fs from "node:fs";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
import net from "node:net";
|
|
|
|
const TEST_DATA_DIR = fs.mkdtempSync(path.join(os.tmpdir(), "omniroute-7993-noauth-proxy-"));
|
|
process.env.DATA_DIR = TEST_DATA_DIR;
|
|
|
|
const core = await import("../../src/lib/db/core.ts");
|
|
const { getProviderCredentials } = await import("../../src/sse/services/auth.ts");
|
|
const { createProviderConnection } = await import("../../src/lib/db/providers.ts");
|
|
const { OpencodeExecutor } = await import("../../open-sse/executors/opencode.ts");
|
|
const { resolveProxyForRequest } = await import("../../open-sse/utils/proxyFetch.ts");
|
|
|
|
const log = { debug() {}, info() {}, warn() {}, error() {} };
|
|
const FINGERPRINT = "cccccccccccccccccccccccccccccccc";
|
|
|
|
let proxyServer: net.Server;
|
|
let proxyPort = 0;
|
|
|
|
function listen(server: net.Server): Promise<number> {
|
|
return new Promise((resolve) => {
|
|
server.listen(0, "127.0.0.1", () => {
|
|
resolve((server.address() as net.AddressInfo).port);
|
|
});
|
|
});
|
|
}
|
|
|
|
test.before(async () => {
|
|
proxyServer = net.createServer((s) => s.destroy());
|
|
proxyPort = await listen(proxyServer);
|
|
|
|
// Mirror exactly what the NoAuthAccountCard UI writes: a `provider_connections`
|
|
// row filed under the no-auth id "opencode" (NOT "opencode-zen"), carrying the
|
|
// configured account proxy.
|
|
await createProviderConnection({
|
|
provider: "opencode",
|
|
authType: "no-auth",
|
|
name: "opencode-noauth-account",
|
|
isActive: true,
|
|
providerSpecificData: {
|
|
fingerprints: [FINGERPRINT],
|
|
accountProxies: [
|
|
{
|
|
fingerprint: FINGERPRINT,
|
|
proxy: { type: "http", host: "127.0.0.1", port: proxyPort },
|
|
},
|
|
],
|
|
},
|
|
});
|
|
});
|
|
|
|
test.after(() => {
|
|
proxyServer?.close();
|
|
core.resetDbInstance();
|
|
fs.rmSync(TEST_DATA_DIR, { recursive: true, force: true });
|
|
});
|
|
|
|
test("#7993 getProviderCredentials('opencode-zen') hydrates the proxy saved under the sibling 'opencode' connection", async () => {
|
|
const creds = (await getProviderCredentials("opencode-zen")) as {
|
|
connectionId?: string;
|
|
providerSpecificData?: { fingerprints?: unknown; accountProxies?: unknown };
|
|
} | null;
|
|
|
|
assert.ok(creds, "opencode-zen must resolve to credentials");
|
|
assert.ok(
|
|
creds!.connectionId === "noauth" ||
|
|
(typeof creds!.connectionId === "string" && creds!.connectionId.length > 0),
|
|
`expected synthetic noauth or the sibling opencode connection id, got ${creds!.connectionId}`
|
|
);
|
|
const psd = creds!.providerSpecificData || {};
|
|
assert.ok(
|
|
Array.isArray(psd.fingerprints) && psd.fingerprints.length === 1,
|
|
`expected the sibling opencode connection's fingerprints to be hydrated, got ${JSON.stringify(psd)}`
|
|
);
|
|
assert.ok(
|
|
Array.isArray(psd.accountProxies) && psd.accountProxies.length === 1,
|
|
`expected the sibling opencode connection's accountProxies to be hydrated, got ${JSON.stringify(psd)}`
|
|
);
|
|
});
|
|
|
|
test("#7993 a canonical 'opencode/<model>' resolved combo/catalog target egresses through the assigned proxy, not direct", async () => {
|
|
const creds = await getProviderCredentials("opencode-zen");
|
|
|
|
const exec = new OpencodeExecutor("opencode-zen");
|
|
let observedSource: string | null = null;
|
|
const originalFetch = globalThis.fetch;
|
|
globalThis.fetch = (async (input: unknown) => {
|
|
const url =
|
|
typeof input === "string" ? input : (input as { url?: string })?.url || String(input);
|
|
observedSource = resolveProxyForRequest(url).source;
|
|
return new Response(JSON.stringify({ ok: true }), {
|
|
status: 200,
|
|
headers: { "Content-Type": "application/json" },
|
|
});
|
|
}) as typeof globalThis.fetch;
|
|
|
|
try {
|
|
const result = await exec.execute({
|
|
model: "deepseek-v4-flash-free",
|
|
body: { messages: [{ role: "user", content: "hi" }], stream: false },
|
|
stream: false,
|
|
signal: null,
|
|
credentials: creds as never,
|
|
log,
|
|
});
|
|
assert.strictEqual((result as { response: Response }).response.status, 200);
|
|
} finally {
|
|
globalThis.fetch = originalFetch;
|
|
}
|
|
|
|
assert.strictEqual(
|
|
observedSource,
|
|
"context",
|
|
`combo/catalog-path ('opencode-zen') must ALSO egress through the assigned proxy — got source=${observedSource}, expected 'context'`
|
|
);
|
|
});
|