mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-08-26 17:12:27 +03:00
65e81158ab
Landed with the design call resolved per the owner's pick — **option 1**: the synced store is now endpoint-agnostic (persistDiscoveredModels and managedModelImport no longer drop non-chat models at write time), and chat selectability moved to read time (auto-pool expansion in autoStrategy applies filterChatSelectableModels; the models-route projection already had its chatOnly filter). Your discovery test now passes end-to-end (3/3): /api/show capabilities persist per connection and image/embedding requests route through the advertising host. Reconciliation notes: conflicted areas merged onto the current tip (adobe discovery import, requestedModel preflight signature, resolvedProvider fast-path coexists with the synced-route override — explicit resolution wins); carried base-red drains (#10055 memoization, #11071 test variants) dropped as already-landed; the managed-model-import exclusion test was propagated to the new contract (image/video models persist; the read filter still hides them from chat pickers — pinned by a new assertion). Full battery: 205/206 focused (the one red is a confirmed periodic-timer timing flake on the loaded devbox — 20/20 isolated), autoCombo vitest 30/30, combo suites 46/46, gates + typecheck clean. Thank you @yourspraveen — the capability probe + routing design was right; it just needed the store contract opened up. Fixes #11087.
88 lines
2.8 KiB
TypeScript
88 lines
2.8 KiB
TypeScript
import test from "node:test";
|
|
import assert from "node:assert/strict";
|
|
|
|
const rlm = await import("../../open-sse/services/rateLimitManager.ts");
|
|
const { enableRateLimitProtection, withRateLimit, __resetRateLimitManagerForTests } = rlm;
|
|
|
|
test.beforeEach(async () => {
|
|
await __resetRateLimitManagerForTests();
|
|
});
|
|
|
|
test("withRateLimit works without abort signal (backward compat)", async () => {
|
|
enableRateLimitProtection("test-queue-1");
|
|
const result = await withRateLimit("openai", "test-queue-1", "gpt-4", async () => "ok");
|
|
assert.equal(result, "ok");
|
|
});
|
|
|
|
test("withRateLimit works with AbortSignal", async () => {
|
|
enableRateLimitProtection("test-queue-2");
|
|
const ac = new AbortController();
|
|
const result = await withRateLimit(
|
|
"openai",
|
|
"test-queue-2",
|
|
"gpt-4",
|
|
async () => "ok",
|
|
ac.signal
|
|
);
|
|
assert.equal(result, "ok");
|
|
ac.abort();
|
|
});
|
|
|
|
test("multiple sequential withRateLimit calls work", async () => {
|
|
enableRateLimitProtection("test-queue-3");
|
|
const results = await Promise.all([
|
|
withRateLimit("openai", "test-queue-3", "gpt-4", async () => "a"),
|
|
withRateLimit("openai", "test-queue-3", "gpt-4", async () => "b"),
|
|
]);
|
|
assert.deepEqual(results.sort(), ["a", "b"]);
|
|
});
|
|
|
|
test("abort signal rejection does not leak as unhandledRejection", async () => {
|
|
// Simulate the combo-per-model-timeout scenario: abort signal fires while
|
|
// fn is running inside Bottleneck's limiter. The abortPromise rejects and
|
|
// wins Promise.race, but fn's eventual rejection must be silently caught
|
|
// (not surface as unhandledRejection).
|
|
enableRateLimitProtection("test-queue-abort");
|
|
|
|
let unhandledRejectionFired = false;
|
|
const handler = (reason: unknown) => {
|
|
if (reason instanceof Error && reason.message === "combo-per-model-timeout") {
|
|
unhandledRejectionFired = true;
|
|
}
|
|
};
|
|
process.on("unhandledRejection", handler);
|
|
|
|
const ac = new AbortController();
|
|
const err = new Error("combo-per-model-timeout");
|
|
|
|
// Schedule a slow function, then abort mid-flight.
|
|
const promise = withRateLimit(
|
|
"openai",
|
|
"test-queue-abort",
|
|
"gpt-4",
|
|
async () => {
|
|
// Simulate work that respects the abort signal (like a fetch).
|
|
await new Promise((r) => setTimeout(r, 200));
|
|
throw err;
|
|
},
|
|
ac.signal
|
|
);
|
|
|
|
// Abort quickly so abortPromise wins the race.
|
|
setTimeout(() => ac.abort(err), 10);
|
|
|
|
// The withRateLimit call itself should reject (from abortPromise).
|
|
await assert.rejects(promise, (e: Error) => e.message === "combo-per-model-timeout");
|
|
|
|
// Give Bottleneck time to finish the orphaned job and let any
|
|
// unhandledRejection fire.
|
|
await new Promise((r) => setTimeout(r, 500));
|
|
|
|
process.removeListener("unhandledRejection", handler);
|
|
assert.equal(
|
|
unhandledRejectionFired,
|
|
false,
|
|
"fn rejection after abort must be silently caught, not leak as unhandledRejection"
|
|
);
|
|
});
|