mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-09-18 04:42:30 +03:00
Rebased onto the current release/v3.8.51 tip as part of a combined provider-retirement/provenance merge batch (Designer Web, Felo Web, Runtime, GPL-derived removal, Qwen Web already landed). Large conflict set (this is the biggest PR in the batch — the common ChatGPT Web provider touches chat, images, count-tokens, session leases, and combos). Conflicts resolved: - `open-sse/config/providers/registry/chatgpt-web/*`, `open-sse/executors/chatgpt-web*`, `open-sse/handlers/imageGeneration/providers/chatgptWeb.ts`, and their tests: kept deleted, matching the PR's stated scope. - `open-sse/config/providers/registry/minimax/web/index.ts`, `open-sse/handlers/imageGeneration/providers/geminiWeb.ts`, `open-sse/executors/gemini-web.ts`'s stale image-mode branch: base-drift collisions against already-merged sibling retirements (#11691, #11708) — kept deleted / dropped the dead code, since this PR's own branch forked before those merged. - `src/shared/constants/reservedProviderPrefixes.ts`, `open-sse/executors/index.ts`, `executorProxy.ts`, `virtualFactory.ts`, `autoStrategy.ts`, `src/lib/db/providers.ts`, `src/sse/handlers/chat.ts`: combined the Designer + Runtime (Felo/Qwen) + common-ChatGPT-Web retirement guard calls at each shared chokepoint — compute-once-then-OR pattern, consistent with prior combinations in this batch. - `src/sse/services/model.ts` / `src/sse/handlers/chatHelpers.ts`: adopted this PR's new `getModelInfoOrRetirementResponse()` central wrapper (a real improvement over ad-hoc try/catch), and extended it to also catch the Designer + Runtime retirement errors it didn't originally cover, so the consolidation doesn't regress the other two mechanisms. - `src/app/api/v1/images/edits/route.ts`: this PR moved the retirement check earlier (before `enforceApiKeyPolicy`) but left the old later call+catch block in place from base drift — removed the now-redundant duplicate `resolveImageRouteModel()` call and merged the Designer catch into the earlier one. - `open-sse/config/imageRegistry.ts`, `tests/snapshots/executors/executor-map.json` (`keyCount` recomputed to 133), `tests/snapshots/provider/translate-path.json`: same "both sides inserted a different retired provider at the same slot" pattern — resolved by dropping both. - `tests/unit/chatcore-executor-proxy.test.ts`, `provider-node-reserved-prefix.test.ts`, `combo-auto-candidate-expansion.test.ts`, `messages-count-tokens-route.test.ts`, `virtual-auto-combo.test.ts`: split into independent per-mechanism test blocks (established pattern); `virtual-auto-combo.test.ts`'s old "includes cookie web-session providers" positive-inclusion test (which used chatgpt-web as its example) was retired along with the provider and replaced by this PR's negative-exclusion test for the same slot. - `docs/architecture/ARCHITECTURE.md`, `CODEBASE_DOCUMENTATION.md` (+ 4 i18n mirrors), `README.md`, `FREE-TIERS-GUIDE.md`, `docs/diagrams/free-tier-budget.svg`, `docs/screenshots/free-tier-budget-card.svg`, `docs/reference/PROVIDER_REFERENCE.md`: recomputed every stale count from the real merged state — 104 executors (`countFiles` gate logic), 351 providers (regenerated via `gen:provider-reference`), 152/351 `hasFree` entries, 445/438/7 free-tier catalog rows, 13 ToS-avoid providers, budget-card regenerated via its real generator script. One doc conflict (`oauth/` module list) needed picking HEAD's side specifically — theirs still listed the already-removed `raycast` module instead of the real `openference`. - `config/quality/test-masking-allowlist.json`: additive merge of the PR's 17 `_deletedWithReplacement` entries alongside the batch's existing ones (one real duplicate-key mistake in my first pass, caught and fixed via a `object_pairs_hook` duplicate-key check before finalizing). Also fixed two real, unrelated-to-my-merge issues surfaced by the focused suite: - `tests/unit/resolve-web-provider-host.test.ts`: the PR's own test had a typo — it asserted `perplexity-web`'s resolved host as `"perplexity.ai"`, but the provider's registered `website` is `"https://www.perplexity.ai"` and the resolver returns the URL's `host` verbatim (no www-stripping), so the correct value is `"www.perplexity.ai"` (consistent with the same test's own `url` assertion). - `tests/unit/hard-session-lease-bypass-inventory.test.ts`: this golden call-site inventory was already stale on the pristine post-#11713 tip (confirmed via a throwaway probe worktree) — `src/lib/db/providers.ts`'s 3 connection-fallback sites and a third `src/app/api/providers/route.ts` site were never added to the golden list by the earlier-merged #11698/#11720 PRs. Updated it to the real current inventory (dated inline comments explain each delta and which PR introduced it), plus this PR's own legitimate deltas (image-edits duplicate-call removal, `ChatGptWebExecutor.execute()` site removed). Focused suite green (433/433 across executor-proxy, reserved-prefix, hard-session-lease-bypass-inventory, resolve-web-provider-host, retirement/runtime-block/source-retirement/management-retirement/image-handler-retirement, migration-168, combo-auto-candidate-expansion, virtual-auto-combo, executor-map-golden and siblings), plus `typecheck:core`, `check-file-size`, and `check-changelog-integrity` clean. Thanks for the thorough provenance-hold retirement work — appreciated.
88 lines
2.9 KiB
TypeScript
88 lines
2.9 KiB
TypeScript
/**
|
|
* Regression tests for the proxy-leak fix in grokTlsClient.
|
|
*
|
|
* Bug context (#3180): tlsFetchGrok() built its native tls-client-node
|
|
* requestOptions without a `proxyUrl` field, so every grok-web call
|
|
* egressed with the bare host IP regardless of the dashboard proxy config
|
|
* or HTTP_PROXY / HTTPS_PROXY env vars (the koffi-loaded Go binary does not
|
|
* consult Go's `http.ProxyFromEnvironment`).
|
|
*
|
|
* These tests pin the resolution-order contract:
|
|
* 1. Per-call `options.proxyUrl` wins.
|
|
* 2. POSIX-standard HTTPS_PROXY / HTTP_PROXY / ALL_PROXY (and lowercase variants).
|
|
* 3. Otherwise undefined (no proxy).
|
|
*
|
|
* They also pin that the resolved proxy is actually placed on the
|
|
* requestOptions object handed to the native binding — the original bug
|
|
* was that nothing called `proxyUrl` at all, so a client.request spy that
|
|
* captures opts.proxyUrl is the right shape of regression.
|
|
*/
|
|
|
|
import { describe, it, beforeEach, afterEach, expect } from "vitest";
|
|
|
|
import { tlsFetchGrok, __setTlsFetchOverrideForTesting } from "../grokTlsClient.ts";
|
|
|
|
const PROXY_ENV_KEYS = [
|
|
"HTTPS_PROXY",
|
|
"https_proxy",
|
|
"HTTP_PROXY",
|
|
"http_proxy",
|
|
"ALL_PROXY",
|
|
"all_proxy",
|
|
] as const;
|
|
|
|
function clearProxyEnv(): Record<string, string | undefined> {
|
|
const saved: Record<string, string | undefined> = {};
|
|
for (const k of PROXY_ENV_KEYS) {
|
|
saved[k] = process.env[k];
|
|
delete process.env[k];
|
|
}
|
|
return saved;
|
|
}
|
|
|
|
function restoreProxyEnv(saved: Record<string, string | undefined>): void {
|
|
for (const k of PROXY_ENV_KEYS) {
|
|
if (saved[k] === undefined) delete process.env[k];
|
|
else process.env[k] = saved[k];
|
|
}
|
|
}
|
|
|
|
describe("grokTlsClient — proxy plumbing (#3180)", async () => {
|
|
let savedEnv: Record<string, string | undefined> = {};
|
|
|
|
beforeEach(() => {
|
|
savedEnv = clearProxyEnv();
|
|
});
|
|
|
|
afterEach(() => {
|
|
__setTlsFetchOverrideForTesting(null);
|
|
restoreProxyEnv(savedEnv);
|
|
});
|
|
|
|
it("per-call proxyUrl overrides everything", async () => {
|
|
process.env.HTTPS_PROXY = "http://env-https:0/";
|
|
|
|
let observedUrl: string | undefined;
|
|
let observedOpts: Record<string, unknown> = {};
|
|
__setTlsFetchOverrideForTesting(async (url, options) => {
|
|
observedUrl = url;
|
|
observedOpts = options as unknown as Record<string, unknown>;
|
|
return { status: 200, headers: new Headers(), text: "{}", body: null };
|
|
});
|
|
|
|
const r = await tlsFetchGrok("https://grok.com/rest/app-chat/conversations/new", {
|
|
method: "POST",
|
|
proxyUrl: "http://per-call:0/",
|
|
});
|
|
|
|
expect(r.status).toBe(200);
|
|
expect(observedUrl).toBe("https://grok.com/rest/app-chat/conversations/new");
|
|
expect((observedOpts as { proxyUrl?: string }).proxyUrl).toBe("http://per-call:0/");
|
|
});
|
|
|
|
it("TlsFetchOptions accepts proxyUrl typed as string", () => {
|
|
const opts: { proxyUrl?: string } = { proxyUrl: "http://x:0/" };
|
|
expect(opts.proxyUrl).toBe("http://x:0/");
|
|
});
|
|
});
|