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>
343 lines
11 KiB
TypeScript
343 lines
11 KiB
TypeScript
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";
|
|
|
|
const TEST_DATA_DIR = fs.mkdtempSync(path.join(os.tmpdir(), "omniroute-db-proxies-"));
|
|
process.env.DATA_DIR = TEST_DATA_DIR;
|
|
|
|
const core = await import("../../src/lib/db/core.ts");
|
|
const providersDb = await import("../../src/lib/db/providers.ts");
|
|
const proxiesDb = await import("../../src/lib/db/proxies.ts");
|
|
|
|
async function resetStorage() {
|
|
core.resetDbInstance();
|
|
|
|
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 (error: any) {
|
|
if ((error?.code === "EBUSY" || error?.code === "EPERM") && attempt < 9) {
|
|
await new Promise((resolve) => setTimeout(resolve, 50 * (attempt + 1)));
|
|
} else {
|
|
throw error;
|
|
}
|
|
}
|
|
}
|
|
|
|
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 });
|
|
});
|
|
|
|
test("proxy CRUD redacts secrets by default and preserves stored credentials when omitted", async () => {
|
|
const created = await proxiesDb.createProxy({
|
|
name: "Primary Proxy",
|
|
type: "http",
|
|
host: "proxy.local",
|
|
port: 8080,
|
|
username: "user-a",
|
|
password: "pass-a",
|
|
region: "sa-east-1",
|
|
source: "dashboard-custom",
|
|
});
|
|
|
|
assert.equal(created.username, "***");
|
|
assert.equal(created.password, "***");
|
|
assert.equal(created.source, "dashboard-custom");
|
|
|
|
const withSecrets = await proxiesDb.getProxyById(created.id, { includeSecrets: true });
|
|
const updated = await proxiesDb.updateProxy(created.id, {
|
|
host: "proxy-updated.local",
|
|
notes: "updated",
|
|
});
|
|
const updatedWithSecrets = await proxiesDb.getProxyById(created.id, { includeSecrets: true });
|
|
const { items: listed } = await proxiesDb.listProxies();
|
|
|
|
assert.equal(withSecrets.username, "user-a");
|
|
assert.equal(withSecrets.password, "pass-a");
|
|
assert.equal(updated.host, "proxy-updated.local");
|
|
assert.equal(updated.notes, "updated");
|
|
assert.equal(updatedWithSecrets.username, "user-a");
|
|
assert.equal(updatedWithSecrets.password, "pass-a");
|
|
assert.equal(updatedWithSecrets.source, "dashboard-custom");
|
|
assert.equal(listed.length, 1);
|
|
assert.equal(listed[0].username, "***");
|
|
assert.equal(listed[0].password, "***");
|
|
assert.equal(listed[0].source, "dashboard-custom");
|
|
});
|
|
|
|
test("proxy CRUD clears stored credentials when blanks are explicitly provided", async () => {
|
|
const created = await proxiesDb.createProxy({
|
|
name: "Clearable Proxy",
|
|
type: "http",
|
|
host: "clearable.local",
|
|
port: 8080,
|
|
username: "user-a",
|
|
password: "pass-a",
|
|
});
|
|
|
|
const updated = await proxiesDb.updateProxy(created.id, {
|
|
username: "",
|
|
password: "",
|
|
});
|
|
const updatedWithSecrets = await proxiesDb.getProxyById(created.id, { includeSecrets: true });
|
|
const { items: listed } = await proxiesDb.listProxies();
|
|
|
|
assert.equal(updated.username, "");
|
|
assert.equal(updated.password, "");
|
|
assert.equal(updatedWithSecrets.username, "");
|
|
assert.equal(updatedWithSecrets.password, "");
|
|
assert.equal(listed[0].username, "");
|
|
assert.equal(listed[0].password, "");
|
|
});
|
|
|
|
test("proxy assignments resolve by account, provider and global scope", async () => {
|
|
const connection = await providersDb.createProviderConnection({
|
|
provider: "openai",
|
|
authType: "apikey",
|
|
name: "Proxy Target",
|
|
apiKey: "sk-proxy",
|
|
});
|
|
const globalProxy = await proxiesDb.createProxy({
|
|
name: "Global",
|
|
type: "http",
|
|
host: "global.local",
|
|
port: 8080,
|
|
});
|
|
const providerProxy = await proxiesDb.createProxy({
|
|
name: "Provider",
|
|
type: "https",
|
|
host: "provider.local",
|
|
port: 443,
|
|
});
|
|
const accountProxy = await proxiesDb.createProxy({
|
|
name: "Account",
|
|
type: "socks5",
|
|
host: "account.local",
|
|
port: 1080,
|
|
});
|
|
|
|
await proxiesDb.assignProxyToScope("global", null, globalProxy.id);
|
|
await proxiesDb.assignProxyToScope("provider", "openai", providerProxy.id);
|
|
|
|
const providerResolved = await proxiesDb.resolveProxyForProvider("openai");
|
|
const beforeAccount = await proxiesDb.resolveProxyForConnectionFromRegistry(
|
|
(connection as any).id
|
|
);
|
|
|
|
await proxiesDb.assignProxyToScope("key", (connection as any).id, accountProxy.id);
|
|
|
|
const assignmentsForAccountProxy = await proxiesDb.getProxyAssignments({
|
|
proxyId: accountProxy.id,
|
|
});
|
|
const accountResolved = await proxiesDb.resolveProxyForConnectionFromRegistry(
|
|
(connection as any).id
|
|
);
|
|
const usage = await proxiesDb.getProxyWhereUsed(accountProxy.id);
|
|
|
|
assert.equal(providerResolved.host, "provider.local");
|
|
assert.equal(beforeAccount.level, "provider");
|
|
assert.equal(assignmentsForAccountProxy.length, 1);
|
|
assert.equal(assignmentsForAccountProxy[0].scope, "account");
|
|
assert.equal(accountResolved.level, "account");
|
|
assert.equal(accountResolved.proxy.host, "account.local");
|
|
assert.equal(usage.count, 1);
|
|
});
|
|
|
|
test("bulk assignment deduplicates scope ids and reports failures for missing proxies", async () => {
|
|
const first = await providersDb.createProviderConnection({
|
|
provider: "openai",
|
|
authType: "apikey",
|
|
name: "Bulk One",
|
|
apiKey: "sk-bulk-1",
|
|
});
|
|
const second = await providersDb.createProviderConnection({
|
|
provider: "openai",
|
|
authType: "apikey",
|
|
name: "Bulk Two",
|
|
apiKey: "sk-bulk-2",
|
|
});
|
|
const proxy = await proxiesDb.createProxy({
|
|
name: "Bulk Proxy",
|
|
type: "http",
|
|
host: "bulk.local",
|
|
port: 8080,
|
|
});
|
|
|
|
const success = await proxiesDb.bulkAssignProxyToScope(
|
|
"account",
|
|
[first.id, second.id, first.id, " "],
|
|
proxy.id
|
|
);
|
|
const failure = await proxiesDb.bulkAssignProxyToScope(
|
|
"account",
|
|
[first.id, second.id],
|
|
"missing-proxy"
|
|
);
|
|
|
|
assert.equal(success.updated, 2);
|
|
assert.deepEqual(success.failed, []);
|
|
assert.equal(failure.updated, 0);
|
|
assert.equal(failure.failed.length, 2);
|
|
assert.match(failure.failed[0].reason, /Proxy not found/);
|
|
});
|
|
|
|
test("proxy health stats aggregate proxy_logs and force delete removes assignments", async () => {
|
|
const proxy = await proxiesDb.createProxy({
|
|
name: "Stats Proxy",
|
|
type: "http",
|
|
host: "stats.local",
|
|
port: 8080,
|
|
});
|
|
|
|
await proxiesDb.assignProxyToScope("global", null, proxy.id);
|
|
|
|
const db = core.getDbInstance();
|
|
const now = new Date().toISOString();
|
|
const insertLog = db.prepare(`
|
|
INSERT INTO proxy_logs (
|
|
id, timestamp, status, proxy_type, proxy_host, proxy_port, latency_ms
|
|
) VALUES (?, ?, ?, ?, ?, ?, ?)
|
|
`);
|
|
insertLog.run("proxy-log-1", now, "success", "http", "stats.local", 8080, 100);
|
|
insertLog.run("proxy-log-2", now, "error", "http", "stats.local", 8080, 250);
|
|
insertLog.run("proxy-log-3", now, "timeout", "http", "stats.local", 8080, 400);
|
|
|
|
const stats = await proxiesDb.getProxyHealthStats({ hours: 2 });
|
|
|
|
assert.deepEqual(stats[0], {
|
|
proxyId: proxy.id,
|
|
name: "Stats Proxy",
|
|
type: "http",
|
|
host: "stats.local",
|
|
port: 8080,
|
|
totalRequests: 3,
|
|
successCount: 1,
|
|
errorCount: 1,
|
|
timeoutCount: 1,
|
|
successRate: 33.33,
|
|
avgLatencyMs: 250,
|
|
lastSeenAt: now,
|
|
});
|
|
|
|
assert.equal(await proxiesDb.deleteProxyById(proxy.id, { force: true }), true);
|
|
assert.equal((await proxiesDb.getProxyAssignments()).length, 0);
|
|
assert.equal(await proxiesDb.getProxyById(proxy.id), null);
|
|
});
|
|
|
|
test("assignProxyToScope normalizes key scope, supports removal, and blocks deleting in-use proxies", async () => {
|
|
const connection = await providersDb.createProviderConnection({
|
|
provider: "openai",
|
|
authType: "apikey",
|
|
name: "Assigned Account",
|
|
apiKey: "sk-assigned",
|
|
});
|
|
const proxy = await proxiesDb.createProxy({
|
|
name: "Assigned Proxy",
|
|
type: "http",
|
|
host: "assigned.local",
|
|
port: 8080,
|
|
});
|
|
|
|
const assignment = await proxiesDb.assignProxyToScope("key", (connection as any).id, proxy.id);
|
|
|
|
assert.equal(assignment.scope, "account");
|
|
assert.equal((await proxiesDb.getProxyAssignments({ scope: "key" })).length, 1);
|
|
|
|
await assert.rejects(
|
|
() => proxiesDb.deleteProxyById(proxy.id),
|
|
/Remove assignments first or use force=true/
|
|
);
|
|
|
|
const removed = await proxiesDb.assignProxyToScope("key", (connection as any).id, null);
|
|
|
|
assert.equal(removed, null);
|
|
assert.equal((await proxiesDb.getProxyAssignments({ scope: "account" })).length, 0);
|
|
assert.equal(await proxiesDb.deleteProxyById(proxy.id), true);
|
|
});
|
|
|
|
test("legacy proxy config migrates into the registry and subsequent runs can be skipped", async () => {
|
|
const db = core.getDbInstance();
|
|
|
|
db.prepare("INSERT INTO key_value (namespace, key, value) VALUES (?, ?, ?)").run(
|
|
"proxyConfig",
|
|
"global",
|
|
JSON.stringify("http://global-user:global-pass@global.local:8080")
|
|
);
|
|
db.prepare("INSERT INTO key_value (namespace, key, value) VALUES (?, ?, ?)").run(
|
|
"proxyConfig",
|
|
"providers",
|
|
JSON.stringify({
|
|
openai: "https://provider.local:8443",
|
|
broken: "not a proxy url",
|
|
})
|
|
);
|
|
db.prepare("INSERT INTO key_value (namespace, key, value) VALUES (?, ?, ?)").run(
|
|
"proxyConfig",
|
|
"combos",
|
|
JSON.stringify({
|
|
"combo-1": {
|
|
type: "socks5",
|
|
host: "combo.local",
|
|
port: 1080,
|
|
},
|
|
})
|
|
);
|
|
db.prepare("INSERT INTO key_value (namespace, key, value) VALUES (?, ?, ?)").run(
|
|
"proxyConfig",
|
|
"keys",
|
|
JSON.stringify({
|
|
"conn-1": {
|
|
type: "http",
|
|
host: "account.local",
|
|
port: 9000,
|
|
},
|
|
})
|
|
);
|
|
|
|
const migrated = await proxiesDb.migrateLegacyProxyConfigToRegistry();
|
|
const assignments = await proxiesDb.getProxyAssignments();
|
|
const { items: proxies } = await proxiesDb.listProxies({ includeSecrets: true });
|
|
const skipped = await proxiesDb.migrateLegacyProxyConfigToRegistry();
|
|
|
|
assert.equal(migrated.skipped, false);
|
|
assert.equal(migrated.migrated, 4);
|
|
assert.equal(proxies.length, 4);
|
|
assert.equal(assignments.length, 4);
|
|
assert.equal(skipped.skipped, true);
|
|
assert.equal(skipped.reason, "registry_not_empty");
|
|
});
|
|
|
|
test("provider resolution falls back to the global assignment and health stats stay nullable without logs", async () => {
|
|
const globalProxy = await proxiesDb.createProxy({
|
|
name: "Global Only",
|
|
type: "http",
|
|
host: "fallback.local",
|
|
port: 8080,
|
|
});
|
|
|
|
await proxiesDb.assignProxyToScope("global", null, globalProxy.id);
|
|
|
|
const resolved = await proxiesDb.resolveProxyForProvider("missing-provider");
|
|
const stats = await proxiesDb.getProxyHealthStats({ hours: 24 * 400 });
|
|
|
|
assert.equal(resolved.host, "fallback.local");
|
|
assert.equal(stats[0].proxyId, globalProxy.id);
|
|
assert.equal(stats[0].totalRequests, 0);
|
|
assert.equal(stats[0].successRate, null);
|
|
assert.equal(stats[0].avgLatencyMs, null);
|
|
assert.equal((await proxiesDb.resolveProxyForProvider("openai")).host, "fallback.local");
|
|
});
|