mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-09-13 18:32:12 +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.
218 lines
8.0 KiB
TypeScript
218 lines
8.0 KiB
TypeScript
// tests/unit/chatcore-executor-proxy.test.ts
|
|
// Characterization of resolveExecutorWithProxy — the upstream-proxy executor resolver extracted from
|
|
// handleChatCore (chatCore god-file decomposition, #3501). Exercises the REAL config path through a
|
|
// temp DB: disabled/native → the provider's own executor; cliproxyapi → the passthrough executor;
|
|
// fallback → a distinct wrapper that owns its own execute(). The wrapper's retry behaviour is not
|
|
// invoked here (it would hit the network); the existing cliproxyapi-fallback-wiring.test.ts covers
|
|
// the surrounding wiring.
|
|
import { test, before, after, beforeEach } from "node:test";
|
|
import assert from "node:assert/strict";
|
|
import fs from "node:fs";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
|
|
const testDataDir = fs.mkdtempSync(path.join(os.tmpdir(), "omni-executor-proxy-test-"));
|
|
process.env.DATA_DIR = testDataDir;
|
|
|
|
// Dynamic imports AFTER DATA_DIR is set so core.ts picks up the temp path.
|
|
const coreDb = await import("../../src/lib/db/core.ts");
|
|
const upstreamProxyDb = await import("../../src/lib/db/upstreamProxy.ts");
|
|
const { resolveExecutorWithProxy } =
|
|
await import("../../open-sse/handlers/chatCore/executorProxy.ts");
|
|
const { getExecutor } = await import("../../open-sse/executors/index.ts");
|
|
const { clearUpstreamProxyConfigCache } =
|
|
await import("../../open-sse/handlers/chatCore/comboContextCache.ts");
|
|
|
|
before(async () => {
|
|
await coreDb.ensureDbInitialized();
|
|
});
|
|
|
|
beforeEach(() => {
|
|
clearUpstreamProxyConfigCache();
|
|
});
|
|
|
|
after(() => {
|
|
coreDb.resetDbInstance();
|
|
fs.rmSync(testDataDir, { recursive: true, force: true });
|
|
});
|
|
|
|
test("no config (disabled by default) returns the provider's own executor", async () => {
|
|
clearUpstreamProxyConfigCache("openai");
|
|
const exec = await resolveExecutorWithProxy("openai");
|
|
assert.equal(exec, await getExecutor("openai"));
|
|
});
|
|
|
|
test("mode 'native' returns the provider's own executor", async () => {
|
|
await upstreamProxyDb.upsertUpstreamProxyConfig({
|
|
providerId: "openai",
|
|
mode: "native",
|
|
enabled: true,
|
|
});
|
|
clearUpstreamProxyConfigCache("openai");
|
|
const exec = await resolveExecutorWithProxy("openai");
|
|
assert.equal(exec, await getExecutor("openai"));
|
|
});
|
|
|
|
test("mode 'cliproxyapi' returns the CLIProxyAPI passthrough executor", async () => {
|
|
await upstreamProxyDb.upsertUpstreamProxyConfig({
|
|
providerId: "anthropic",
|
|
mode: "cliproxyapi",
|
|
enabled: true,
|
|
});
|
|
clearUpstreamProxyConfigCache("anthropic");
|
|
const exec = await resolveExecutorWithProxy("anthropic");
|
|
assert.equal(exec, await getExecutor("cliproxyapi"));
|
|
});
|
|
|
|
test("mode 'fallback' returns a distinct wrapper owning its own execute()", async () => {
|
|
await upstreamProxyDb.upsertUpstreamProxyConfig({
|
|
providerId: "openai",
|
|
mode: "fallback",
|
|
enabled: true,
|
|
});
|
|
clearUpstreamProxyConfigCache("openai");
|
|
const exec = await resolveExecutorWithProxy("openai");
|
|
assert.notEqual(exec, await getExecutor("openai"));
|
|
assert.notEqual(exec, await getExecutor("cliproxyapi"));
|
|
assert.equal(typeof exec.execute, "function");
|
|
});
|
|
|
|
// === Per-connection routing override (#6339) ===
|
|
// The resolved connection's providerSpecificData.cliproxyapiMode === "claude-native"
|
|
// opts THIS connection into the CLIProxyAPI executor regardless of the provider-level
|
|
// upstream_proxy_config mode. Precedence: connection override > provider mode > default.
|
|
|
|
test("connection override 'claude-native' selects CLIProxyAPI even when provider mode is native", async () => {
|
|
await upstreamProxyDb.upsertUpstreamProxyConfig({
|
|
providerId: "openai",
|
|
mode: "native",
|
|
enabled: true,
|
|
});
|
|
clearUpstreamProxyConfigCache("openai");
|
|
const exec = await resolveExecutorWithProxy("openai", undefined, {
|
|
cliproxyapiMode: "claude-native",
|
|
});
|
|
assert.equal(exec, await getExecutor("cliproxyapi"));
|
|
});
|
|
|
|
test("connection override 'claude-native' selects CLIProxyAPI even with no provider config (default)", async () => {
|
|
clearUpstreamProxyConfigCache("anthropic");
|
|
const exec = await resolveExecutorWithProxy("anthropic", undefined, {
|
|
cliproxyapiMode: "claude-native",
|
|
});
|
|
assert.equal(exec, await getExecutor("cliproxyapi"));
|
|
});
|
|
|
|
test("no connection override + provider mode native → native executor (unchanged)", async () => {
|
|
await upstreamProxyDb.upsertUpstreamProxyConfig({
|
|
providerId: "openai",
|
|
mode: "native",
|
|
enabled: true,
|
|
});
|
|
clearUpstreamProxyConfigCache("openai");
|
|
const exec = await resolveExecutorWithProxy("openai", undefined, {
|
|
someOtherField: "x",
|
|
});
|
|
assert.equal(exec, await getExecutor("openai"));
|
|
});
|
|
|
|
test("connection override absent (undefined providerSpecificData) preserves default behaviour", async () => {
|
|
clearUpstreamProxyConfigCache("openai");
|
|
const exec = await resolveExecutorWithProxy("openai");
|
|
assert.equal(exec, await getExecutor("openai"));
|
|
});
|
|
|
|
test("connection override wins over provider mode 'fallback'", async () => {
|
|
await upstreamProxyDb.upsertUpstreamProxyConfig({
|
|
providerId: "openai",
|
|
mode: "fallback",
|
|
enabled: true,
|
|
});
|
|
clearUpstreamProxyConfigCache("openai");
|
|
const exec = await resolveExecutorWithProxy("openai", undefined, {
|
|
cliproxyapiMode: "claude-native",
|
|
});
|
|
// Connection override short-circuits to the passthrough executor, not the fallback wrapper.
|
|
assert.equal(exec, await getExecutor("cliproxyapi"));
|
|
});
|
|
|
|
test("connection proxy overrides cannot bypass Microsoft Designer retirement", async () => {
|
|
for (const providerId of ["microsoft-designer-web", " MSDESIGNER\t"]) {
|
|
for (const providerSpecificData of [
|
|
{ cliproxyapiMode: "claude-native" },
|
|
{ darioMode: "claude-native" },
|
|
]) {
|
|
await assert.rejects(
|
|
() => resolveExecutorWithProxy(providerId, undefined, providerSpecificData),
|
|
(error: unknown) => {
|
|
assert.ok(error instanceof Error);
|
|
assert.equal((error as Error & { status?: number }).status, 410);
|
|
assert.equal(error.message, "Provider has been retired from OmniRoute runtime.");
|
|
return true;
|
|
}
|
|
);
|
|
}
|
|
}
|
|
});
|
|
|
|
test("retired Felo ids cannot bypass the tombstone through a connection proxy", async () => {
|
|
for (const providerId of ["felo-web", "felo", " FeLo-Web ", "\tFELO\n"]) {
|
|
await assert.rejects(
|
|
resolveExecutorWithProxy(providerId, undefined, {
|
|
cliproxyapiMode: "claude-native",
|
|
}),
|
|
(error: unknown) => {
|
|
const typed = error as Error & { code?: string; status?: number };
|
|
assert.equal(typed.code, "PROVIDER_RETIRED");
|
|
assert.equal(typed.status, 410);
|
|
assert.match(typed.message, /retired/i);
|
|
return true;
|
|
}
|
|
);
|
|
}
|
|
|
|
const openAi = await resolveExecutorWithProxy("openai", undefined, {
|
|
cliproxyapiMode: "claude-native",
|
|
});
|
|
assert.equal(openAi, await getExecutor("cliproxyapi"));
|
|
});
|
|
|
|
test("retired Qwen Web ids cannot bypass the tombstone through a connection proxy", async () => {
|
|
for (const providerId of ["qwen-web", "qw", " QwEn-WeB ", "\tQW\n"]) {
|
|
await assert.rejects(
|
|
resolveExecutorWithProxy(providerId, undefined, {
|
|
cliproxyapiMode: "claude-native",
|
|
}),
|
|
(error: unknown) => {
|
|
const typed = error as Error & { code?: string; status?: number };
|
|
assert.equal(typed.code, "PROVIDER_RETIRED");
|
|
assert.equal(typed.status, 410);
|
|
assert.match(typed.message, /retired/i);
|
|
return true;
|
|
}
|
|
);
|
|
}
|
|
|
|
const qwenCloud = await resolveExecutorWithProxy("qwen-cloud", undefined, {
|
|
cliproxyapiMode: "claude-native",
|
|
});
|
|
assert.equal(qwenCloud, await getExecutor("cliproxyapi"));
|
|
});
|
|
|
|
test("retired common ChatGPT Web cannot bypass retirement through proxy overrides", async () => {
|
|
for (const providerId of ["chatgpt-web", "cgpt-web"]) {
|
|
await assert.rejects(
|
|
() =>
|
|
resolveExecutorWithProxy(providerId, undefined, {
|
|
cliproxyapiMode: "claude-native",
|
|
}),
|
|
(error: unknown) => {
|
|
const typed = error as Error & { code?: string; status?: number };
|
|
assert.equal(typed.code, "PROVIDER_RETIRED");
|
|
assert.equal(typed.status, 410);
|
|
return true;
|
|
}
|
|
);
|
|
}
|
|
});
|