mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-09-13 18:32:12 +03:00
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.
131 lines
4.4 KiB
TypeScript
131 lines
4.4 KiB
TypeScript
import test from "node:test";
|
|
import assert from "node:assert/strict";
|
|
import { spawnSync } from "node:child_process";
|
|
import fs from "node:fs";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
import { fileURLToPath } from "node:url";
|
|
|
|
const ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..", "..");
|
|
const BIN = path.join(ROOT, "bin", "omniroute.mjs");
|
|
|
|
function layout() {
|
|
const tmp = fs.mkdtempSync(path.join(os.tmpdir(), "omniroute-cli-env-collision-"));
|
|
const home = path.join(tmp, "home");
|
|
const dataDir = path.join(tmp, "data");
|
|
const cwd = path.join(tmp, "cwd");
|
|
const appDataDir =
|
|
process.platform === "win32"
|
|
? path.join(tmp, "appdata", "omniroute")
|
|
: path.join(home, ".omniroute");
|
|
fs.mkdirSync(dataDir, { recursive: true });
|
|
fs.mkdirSync(appDataDir, { recursive: true });
|
|
fs.mkdirSync(cwd, { recursive: true });
|
|
return { tmp, home, dataDir, cwd };
|
|
}
|
|
|
|
function runCli(
|
|
{ tmp, home, dataDir, cwd }: ReturnType<typeof layout>,
|
|
extraEnv: Record<string, string> = {}
|
|
) {
|
|
const cleanEnv = { ...process.env };
|
|
for (const key of ["OMNIROUTE_BASE_URL", "PORT", "STORAGE_ENCRYPTION_KEY"]) {
|
|
delete cleanEnv[key];
|
|
}
|
|
return spawnSync("node", [BIN, "env", "show", "--json"], {
|
|
cwd,
|
|
env: {
|
|
...cleanEnv,
|
|
DATA_DIR: dataDir,
|
|
HOME: home,
|
|
USERPROFILE: home,
|
|
APPDATA: path.join(tmp, "appdata"),
|
|
CI: "1",
|
|
OMNIROUTE_CLI_SKIP_REPO_ENV: "1",
|
|
OMNIROUTE_NO_UPDATE_NOTIFIER: "1",
|
|
...extraEnv,
|
|
},
|
|
encoding: "utf-8",
|
|
timeout: 60_000,
|
|
});
|
|
}
|
|
|
|
test("a key masked by an earlier .env is named, with both files and without its value", () => {
|
|
const dirs = layout();
|
|
try {
|
|
fs.writeFileSync(
|
|
path.join(dirs.dataDir, ".env"),
|
|
"OMNIROUTE_BASE_URL=https://data.example/v1\n"
|
|
);
|
|
fs.writeFileSync(path.join(dirs.cwd, ".env"), "OMNIROUTE_BASE_URL=https://cwd.example/v1\n");
|
|
|
|
const stderr = runCli(dirs).stderr ?? "";
|
|
|
|
assert.match(stderr, /OMNIROUTE_BASE_URL/);
|
|
assert.ok(stderr.includes(path.join(dirs.cwd, ".env")), `ignored file named: ${stderr}`);
|
|
assert.ok(stderr.includes(path.join(dirs.dataDir, ".env")), `winning file named: ${stderr}`);
|
|
assert.ok(!stderr.includes("cwd.example"), "the ignored value must never be printed");
|
|
assert.ok(!stderr.includes("data.example"), "the winning value must never be printed");
|
|
} finally {
|
|
fs.rmSync(dirs.tmp, { recursive: true, force: true });
|
|
}
|
|
});
|
|
|
|
test("a key each file declares once says nothing", () => {
|
|
const dirs = layout();
|
|
try {
|
|
fs.writeFileSync(
|
|
path.join(dirs.dataDir, ".env"),
|
|
"OMNIROUTE_BASE_URL=https://data.example/v1\n"
|
|
);
|
|
fs.writeFileSync(path.join(dirs.cwd, ".env"), "PORT=34567\n");
|
|
|
|
const stderr = runCli(dirs).stderr ?? "";
|
|
assert.ok(!/OMNIROUTE_BASE_URL|PORT/.test(stderr), `nothing to report: ${stderr}`);
|
|
} finally {
|
|
fs.rmSync(dirs.tmp, { recursive: true, force: true });
|
|
}
|
|
});
|
|
|
|
test("a key the environment already set is reported too — that is #6194", () => {
|
|
const dirs = layout();
|
|
try {
|
|
fs.writeFileSync(
|
|
path.join(dirs.dataDir, ".env"),
|
|
"OMNIROUTE_BASE_URL=https://data.example/v1\n"
|
|
);
|
|
|
|
const stderr = runCli(dirs, { OMNIROUTE_BASE_URL: "https://shell.example/v1" }).stderr ?? "";
|
|
|
|
assert.match(stderr, /OMNIROUTE_BASE_URL/);
|
|
assert.ok(stderr.includes(path.join(dirs.dataDir, ".env")), `inert file named: ${stderr}`);
|
|
assert.match(stderr, /environment/);
|
|
assert.ok(!stderr.includes("shell.example"), "the winning value must never be printed");
|
|
assert.ok(!stderr.includes("data.example"), "the ignored value must never be printed");
|
|
} finally {
|
|
fs.rmSync(dirs.tmp, { recursive: true, force: true });
|
|
}
|
|
});
|
|
|
|
test("an unreadable .env is reported instead of being swallowed", () => {
|
|
const dirs = layout();
|
|
try {
|
|
// A directory named `.env` passes existsSync and makes readFileSync throw
|
|
// EISDIR for any user, root included — unlike chmod 000.
|
|
fs.mkdirSync(path.join(dirs.cwd, ".env"), { recursive: true });
|
|
fs.writeFileSync(
|
|
path.join(dirs.dataDir, ".env"),
|
|
"OMNIROUTE_BASE_URL=https://data.example/v1\n"
|
|
);
|
|
|
|
const result = runCli(dirs);
|
|
assert.equal(result.status, 0, "an unreadable .env must stay non-fatal");
|
|
assert.ok(
|
|
(result.stderr ?? "").includes(path.join(dirs.cwd, ".env")),
|
|
`the unreadable file should be named: ${result.stderr}`
|
|
);
|
|
} finally {
|
|
fs.rmSync(dirs.tmp, { recursive: true, force: true });
|
|
}
|
|
});
|