mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-09-21 06:12:17 +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 all landed together already). Conflicts resolved: - `src/shared/constants/providerRetirement.ts`: add/add conflict — combined `felo-web`/`felo` (already-merged) with `qwen-web`/`qw` into one `RUNTIME_RETIRED_PROVIDER_IDS` set, kept both `assertRuntimeProviderAvailable`/`assertRuntimeModelProviderAvailable` helpers. - `open-sse/config/providers/registry/minimax/web/index.ts`: modify/delete — kept deleted (file is hailuo-web's registry entry, already retired by #11691; this PR's own change to it was just a comment reword on a since-removed target). - `open-sse/executors/index.ts`, `executorProxy.ts`, `virtualFactory.ts`, `autoStrategy.ts`, `model.ts`, `chat.ts`, `chatHelpers.ts`, `auth.ts`, `src/lib/db/providers.ts`, `reservedProviderPrefixes.ts`: combined the Designer + Runtime (Felo + Qwen) retirement guard calls at each shared chokepoint — compute-once-then-OR pattern, consistent with the prior Designer+Felo combination. - `src/shared/constants/providers/web-cookie.ts`, `tests/snapshots/provider/translate-path.json`, `tests/snapshots/executors/executor-map.json`: both sides had inserted a different retired provider (qwen-web vs. already-retired raycast/hailuo-web) at the same dict position — resolved by dropping both. `executor-map.json`'s `keyCount` recomputed to 135 (matches actual merged `entries`). - `tests/unit/chatcore-executor-proxy.test.ts`, `tests/unit/provider-node-reserved-prefix.test.ts`: split into independent Felo/Qwen test blocks (established pattern for coexisting retirement-mechanism tests); recomputed `RESERVED_PREFIX_COUNT` to 398 (Designer+Felo+Qwen tombstones on top of the post-#11691 REGISTRY, verified via direct module evaluation, not hand-derived). - `config/quality/test-masking-allowlist.json`: additive merge of Qwen's `_deletedWithReplacement` entries alongside Designer's. - `README.md` + all `docs/i18n/*/README.md` mirrors, `docs/getting-started/FREE-TIERS-GUIDE.md`, `docs/reference/FREE_TIERS.md`, `docs/diagrams/free-tier-budget.svg`, `docs/screenshots/free-tier-budget-card.svg`: recomputed the free-tier catalog counts (447 entries / 440 active / 7 discontinued) from the actual merged `freeModelCatalog.data.ts`, regenerated the budget-card SVG via its real generator (`scripts/research/gen-budget-card-svg.mjs`), and dropped the retired Qwen quick-start row / QWEN MODELS section from every i18n README (identical unlocalized block across all 34 locales). - Also fixed a duplicate-import merge artifact in `src/lib/db/providers.ts` (`isRuntimeRetiredProviderId` imported twice) caught by `typecheck:core`, and rebaselined `file-size-baseline.json` for the combined retirement-guard growth (`virtualFactory.ts` +3, with justification). Focused suite green (345/345 across executor-proxy, reserved-prefix, migration-167, qwen-web-retirement, virtual-auto-combo, web-cookie/session, executor-map-golden and siblings), plus `typecheck:core` and `check-file-size`/`check-changelog-integrity` clean. Thanks for the provenance-hold retirement work — appreciated.
201 lines
7.5 KiB
TypeScript
201 lines
7.5 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"));
|
|
});
|