mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-07-26 09:52:11 +03:00
* perf: extract recharts into dynamic import wrappers
Bundle recharts behind next/dynamic boundaries to prevent its
large module graph from being included in the initial JS payload.
- CostOverviewTab.tsx → dynamic(() => import('./components/CostCharts'))
- ProviderUtilizationTab.tsx → dynamic(() => import('./components/ProviderCharts'))
- BurnRateChart.tsx → dynamic(() => import('./components/BurnRateChartInner'))
- Created 3 wrapper files with 'use client' and all recharts imports
Reduces initial bundle by ~35 kB (recharts + dependencies).
* perf: add pagination (limit/offset) to apiKeys, combos, providers, provider-nodes
Add optional limit/offset parameters to DB list functions and their
API route handlers. All list functions now return { items, total } when
called with parameters; backward compatible when called without args.
Affected modules:
- lib/db/apiKeys.ts - listApiKeys, getApiKeysByGroup
- lib/db/combos.ts - listCombos
- lib/db/providers.ts - listProviders, getProvidersByGroup
- lib/db/providers/nodes.ts - listProviderNodes, getProviderNodesByGroup
- Corresponding API routes pass through query params
Reduces memory pressure on large datasets by returning one page at a time.
* perf: add pagination (limit/offset) to webhooks, proxies, modelComboMappings, playgroundPresets
Add optional limit/offset parameters to DB list functions and their
API route handlers for the remaining data modules.
Affected modules:
- lib/db/webhooks.ts - getWebhooks returns { webhooks, total }
- lib/db/proxies.ts - listProxies
- lib/db/modelComboMappings.ts - listMappings
- lib/db/playgroundPresets.ts - listPresets
- Corresponding API routes pass through query params
- Re-exports updated: lib/localDb.ts, models/index.ts
Backward compatible: calling without args returns all rows.
* perf: batch pool building and add pagination to quotaPools
Replace per-pool N+1 queries with batch-loading pattern.
- Added batchBuildPools(rows) — collects all pool IDs, does 2 batch
queries (allocations + connections) instead of 2N individual queries
- getPoolsByGroup and listPools now use batchBuildPools
- Added optional limit/offset pagination params
- Fixed SQLite OFFSET-syntax bug: only emit OFFSET when LIMIT also present
- Added quota-pools.test.ts with 10 tests covering pagination edge cases,
batch loading, and the offset-without-limit guard
Reduces pool-page query count from 2N+1 to 3 (constant).
* perf: replace manual offset/limit parsing with Zod paginationSchema in combos GET handler
* fix: replace manual Number()/parseInt pagination with paginationSchema
Endpoints: model-combo-mappings, playground/presets, provider-nodes.
Uses existing Zod schema with z.coerce.number() for proper validation.
* chore: bump proxies.ts frozen baseline 1177->1208 for perf/api-pagination
PR #7046 backward-compatible pagination refactor grew proxies.ts
by +31 lines (1177->1208). Entries return plain array when no
pagination params provided, {items,total} when pagination requested.
* fix(db): finish listProxies()/getWebhooks() pagination shape migration
The pagination refactor changed listProxies(), listPools(),
getModelComboMappings(), listPlaygroundPresets() and getWebhooks() to
return a paginated envelope ({ items, total } / { webhooks, total })
instead of a bare array, but left three real production callers and
several tests on the old array-shaped API:
- src/lib/proxyEgress.ts (validateProxyPool default listProxies impl)
iterated the envelope directly -> "is not iterable" at runtime, hit
by /api/settings/proxies/egress (no injected deps).
- src/lib/proxyHealth/scheduler.ts (sweep()) read proxies.length on the
envelope (undefined), so the health-check sweep silently processed
zero proxies every run.
- open-sse/utils/proxyFallback.ts (getProxyCandidates()) iterated the
envelope inside a try/catch that swallowed the resulting TypeError,
so every user-configured proxy silently vanished from the fallback
candidate list.
Also fixes two TS2558/TS2339 typecheck errors in proxies.ts/webhooks.ts
(db.prepare<T>() generic not supported by this DB wrapper — cast the
query result instead, matching the existing pattern in both files) and
trims one blank re-export separator line in localDb.ts to stay within
the frozen file-size ratchet after 4 new *Count() exports.
Updates the pre-existing unit tests that called the changed functions
directly (db-quota-pools, quota-groups-migration, quota-pool-connections,
quota-pool-delete-prune, db-webhooks, model-combo-mappings-db,
db-playground-presets, db-proxies-crud, proxy-batch-routes-5918,
proxy-registry, error-message-sanitization) to destructure the new
envelope shape instead of treating the result as an array.
Implements the small, well-scoped performance-mark/measure
instrumentation ("omni-pipeline-start"/"omni-pipeline-end"/"omni-pipeline")
that tests/unit/chatcore-streaming-pipeline.test.ts already asserted for
assembleStreamingPipeline() but that had no corresponding source change.
Adds three new regression tests (TDD: each reproduces its bug against
the pre-fix code before the corresponding fix, then passes) covering
the three real production callers above:
tests/unit/proxy-egress-validate-pool-default.test.ts,
tests/unit/proxy-health-scheduler-listproxies-shape.test.ts,
tests/unit/proxy-fallback-candidates-listproxies-shape.test.ts.
Co-authored-by: diegosouzapw <diegosouza.pw@gmail.com>
* fix: resolve rebase conflict in proxies.ts — keep hasBlockingProxyAssignment but drop duplicate extraction leftovers
- Removed duplicate resolveScopePoolInternal, resolveProxyForConnectionFromRegistry,
resolveProxyForScopeFromRegistry already extracted to proxies/rotation.ts
- Removed duplicate hasBlockingProxyAssignment function body already re-exported from proxies/guards.ts
- Removed duplicate PROXY_ALIVE_PREDICATE import
- All typechecks and 45 affected tests pass
* fix(test): account for _reorderConnections in pagination test expectedOrder
createProviderConnection calls _reorderConnections after every insert
which reassigns priorities sequentially. The test was assuming creation
order determines priority order, leading to incorrect expected results.
Fix: query the DB after all inserts and use the actual priority order.
Also removes debug console.log from getRawProviderConnections.
* chore: remove debug tmp-*.mjs files left in PR branch
* test(proxy): migrate the dedup test to the paginated listProxies() shape
#7046 changed listProxies() to return { items, total }, and updated every
production caller plus three of the four test files — tests/unit/proxy-bulk-import-dedup-7594.test.ts
was missed, so its four `listed.length` assertions read `undefined` and the
file went red on the merge train (it passes on the pure release tip).
Test-only: destructure `{ items: listed }` at the four callsites. Verified
proxyEgress.ts needs no change — its local deps shim already unwraps .items,
and tests/unit/proxy-egress-validate-pool-default.test.ts guards exactly that.
Co-authored-by: diegosouzapw <8016841+diegosouzapw@users.noreply.github.com>
---------
Co-authored-by: oyi77 <oyi77@users.noreply.github.com>
Co-authored-by: diegosouzapw <diegosouza.pw@gmail.com>
Co-authored-by: diegosouzapw <8016841+diegosouzapw@users.noreply.github.com>
195 lines
8.0 KiB
TypeScript
195 lines
8.0 KiB
TypeScript
/**
|
|
* tests/unit/quota-pool-delete-prune.test.ts
|
|
*
|
|
* Fix: deletePool should prune its id from every api_key's allowed_quotas JSON array.
|
|
*
|
|
* Coverage:
|
|
* 1. Create a pool, assign it to a key's allowed_quotas → deletePool → key's
|
|
* allowed_quotas no longer contains that pool id.
|
|
* 2. Unrelated pool ids in allowed_quotas are untouched.
|
|
* 3. Key whose allowed_quotas doesn't contain the deleted pool id → unchanged.
|
|
* 4. Key with empty allowed_quotas stays empty after delete.
|
|
* 5. Multiple keys all pruned simultaneously.
|
|
* 6. deletePool still returns true/false correctly.
|
|
* 7. Pool row and allocation rows are gone after delete (regression guard).
|
|
*/
|
|
|
|
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";
|
|
|
|
// ── DB harness (same pattern as quota-exclusivity-reconcile.test.ts) ─────────
|
|
const TEST_DATA_DIR = fs.mkdtempSync(path.join(os.tmpdir(), "omniroute-pool-delete-prune-"));
|
|
process.env.DATA_DIR = TEST_DATA_DIR;
|
|
process.env.API_KEY_SECRET =
|
|
process.env.API_KEY_SECRET || "delete-prune-test-secret-32chars!!";
|
|
|
|
const core = await import("../../src/lib/db/core.ts");
|
|
const poolsDb = await import("../../src/lib/db/quotaPools.ts");
|
|
const apiKeysDb = await import("../../src/lib/db/apiKeys.ts");
|
|
|
|
async function resetStorage() {
|
|
core.resetDbInstance();
|
|
apiKeysDb.resetApiKeyState();
|
|
for (let attempt = 0; attempt < 10; attempt++) {
|
|
try {
|
|
if (fs.existsSync(TEST_DATA_DIR)) {
|
|
fs.rmSync(TEST_DATA_DIR, { recursive: true, force: true });
|
|
}
|
|
break;
|
|
} catch (err: any) {
|
|
if ((err?.code === "EBUSY" || err?.code === "EPERM") && attempt < 9) {
|
|
await new Promise((resolve) => setTimeout(resolve, 50 * (attempt + 1)));
|
|
} else {
|
|
throw err;
|
|
}
|
|
}
|
|
}
|
|
fs.mkdirSync(TEST_DATA_DIR, { recursive: true });
|
|
}
|
|
|
|
test.beforeEach(async () => {
|
|
await resetStorage();
|
|
});
|
|
|
|
test.after(async () => {
|
|
core.resetDbInstance();
|
|
fs.rmSync(TEST_DATA_DIR, { recursive: true, force: true });
|
|
});
|
|
|
|
// ── Helper: get allowed_quotas for a key by id from DB ───────────────────────
|
|
function getAllowedQuotasById(keyId: string): string[] {
|
|
const db = core.getDbInstance();
|
|
const row = (db as any)
|
|
.prepare("SELECT allowed_quotas FROM api_keys WHERE id = ?")
|
|
.get(keyId) as { allowed_quotas: string } | undefined;
|
|
if (!row) return [];
|
|
try {
|
|
const parsed = JSON.parse(row.allowed_quotas ?? "[]");
|
|
return Array.isArray(parsed) ? parsed : [];
|
|
} catch {
|
|
return [];
|
|
}
|
|
}
|
|
|
|
// ── 1. Basic prune: deletePool removes pool id from key's allowed_quotas ──────
|
|
|
|
test("deletePool prunes its id from api_key allowed_quotas", async () => {
|
|
const pool = poolsDb.createPool({ connectionId: "conn-prune-1", name: "Prune Pool 1" });
|
|
const keyObj = await apiKeysDb.createApiKey("Prune Key 1", "machine-prune-1");
|
|
await apiKeysDb.updateApiKeyPermissions(keyObj.id, { allowedQuotas: [pool.id] });
|
|
|
|
// Sanity: pool id is there before delete
|
|
const before = getAllowedQuotasById(keyObj.id);
|
|
assert.ok(before.includes(pool.id), `pool.id should be in allowed_quotas before delete`);
|
|
|
|
poolsDb.deletePool(pool.id);
|
|
|
|
const after = getAllowedQuotasById(keyObj.id);
|
|
assert.ok(!after.includes(pool.id), `pool.id should NOT be in allowed_quotas after delete`);
|
|
});
|
|
|
|
// ── 2. Unrelated pool ids are preserved ───────────────────────────────────────
|
|
|
|
test("deletePool preserves unrelated pool ids in allowed_quotas", async () => {
|
|
const poolToDelete = poolsDb.createPool({ connectionId: "conn-prune-2a", name: "Delete Me" });
|
|
const otherPool = poolsDb.createPool({ connectionId: "conn-prune-2b", name: "Keep Me" });
|
|
const unrelatedId = "unrelated-pool-id-xyz";
|
|
|
|
const keyObj = await apiKeysDb.createApiKey("Prune Key 2", "machine-prune-2");
|
|
await apiKeysDb.updateApiKeyPermissions(keyObj.id, {
|
|
allowedQuotas: [poolToDelete.id, otherPool.id, unrelatedId],
|
|
});
|
|
|
|
poolsDb.deletePool(poolToDelete.id);
|
|
|
|
const after = getAllowedQuotasById(keyObj.id);
|
|
assert.ok(!after.includes(poolToDelete.id), "deleted pool id should be removed");
|
|
assert.ok(after.includes(otherPool.id), "other pool id should remain");
|
|
assert.ok(after.includes(unrelatedId), "unrelated id should remain");
|
|
});
|
|
|
|
// ── 3. Keys without the pool id are unchanged ─────────────────────────────────
|
|
|
|
test("deletePool does not modify keys that don't reference the deleted pool", async () => {
|
|
const poolToDelete = poolsDb.createPool({ connectionId: "conn-prune-3a", name: "Target" });
|
|
const otherPool = poolsDb.createPool({ connectionId: "conn-prune-3b", name: "Other" });
|
|
|
|
const keyObj = await apiKeysDb.createApiKey("Prune Key 3", "machine-prune-3");
|
|
// This key only references otherPool, not poolToDelete
|
|
await apiKeysDb.updateApiKeyPermissions(keyObj.id, { allowedQuotas: [otherPool.id] });
|
|
|
|
poolsDb.deletePool(poolToDelete.id);
|
|
|
|
const after = getAllowedQuotasById(keyObj.id);
|
|
assert.deepEqual(after, [otherPool.id], "key referencing only other pool should be unchanged");
|
|
});
|
|
|
|
// ── 4. Key with empty allowed_quotas remains empty ───────────────────────────
|
|
|
|
test("deletePool: key with empty allowed_quotas stays empty", async () => {
|
|
const pool = poolsDb.createPool({ connectionId: "conn-prune-4", name: "Empty Test" });
|
|
const keyObj = await apiKeysDb.createApiKey("Prune Key 4", "machine-prune-4");
|
|
// Don't set allowedQuotas — default is []
|
|
|
|
poolsDb.deletePool(pool.id);
|
|
|
|
const after = getAllowedQuotasById(keyObj.id);
|
|
assert.deepEqual(after, [], "empty allowed_quotas should remain empty after delete");
|
|
});
|
|
|
|
// ── 5. Multiple keys: all pruned simultaneously ───────────────────────────────
|
|
|
|
test("deletePool prunes pool id from ALL keys that reference it", async () => {
|
|
const pool = poolsDb.createPool({ connectionId: "conn-prune-5", name: "Multi Key Pool" });
|
|
|
|
const keys = await Promise.all([
|
|
apiKeysDb.createApiKey("Prune Multi 1", "machine-pm-1"),
|
|
apiKeysDb.createApiKey("Prune Multi 2", "machine-pm-2"),
|
|
apiKeysDb.createApiKey("Prune Multi 3", "machine-pm-3"),
|
|
]);
|
|
|
|
const otherPoolId = "other-pool-id-static";
|
|
for (const k of keys) {
|
|
await apiKeysDb.updateApiKeyPermissions(k.id, { allowedQuotas: [pool.id, otherPoolId] });
|
|
}
|
|
|
|
poolsDb.deletePool(pool.id);
|
|
|
|
for (const k of keys) {
|
|
const after = getAllowedQuotasById(k.id);
|
|
assert.ok(!after.includes(pool.id), `${k.name}: pool.id should be pruned`);
|
|
assert.ok(after.includes(otherPoolId), `${k.name}: other-pool-id should remain`);
|
|
}
|
|
});
|
|
|
|
// ── 6. deletePool still returns true/false correctly ─────────────────────────
|
|
|
|
test("deletePool returns true for existing pool, false for non-existent", () => {
|
|
const pool = poolsDb.createPool({ connectionId: "conn-ret-1", name: "Return Test" });
|
|
assert.equal(poolsDb.deletePool(pool.id), true, "should return true for existing pool");
|
|
assert.equal(poolsDb.deletePool(pool.id), false, "should return false for already-deleted pool");
|
|
assert.equal(poolsDb.deletePool("nonexistent-id"), false, "should return false for unknown id");
|
|
});
|
|
|
|
// ── 7. Pool row and allocation rows are gone after delete (regression guard) ──
|
|
|
|
test("deletePool removes pool and allocation rows from DB", () => {
|
|
const pool = poolsDb.createPool({
|
|
connectionId: "conn-reg-1",
|
|
name: "Regression Pool",
|
|
allocations: [{ apiKeyId: "key-reg-1", weight: 50, policy: "hard" }],
|
|
});
|
|
|
|
poolsDb.deletePool(pool.id);
|
|
|
|
assert.equal(poolsDb.getPool(pool.id), null, "getPool should return null after delete");
|
|
const { items: allPools } = poolsDb.listPools();
|
|
assert.ok(
|
|
!allPools.some((p) => p.id === pool.id),
|
|
"listPools should not contain the deleted pool"
|
|
);
|
|
});
|