mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-09-19 13:23:50 +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.
75 lines
3.3 KiB
TypeScript
75 lines
3.3 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";
|
|
import { syncStandaloneExtraModules } from "../../../scripts/build/assembleStandalone.mjs";
|
|
|
|
const repoRoot = path.resolve(new URL(".", import.meta.url).pathname, "../../..");
|
|
|
|
/**
|
|
* Regression guard for #9451: the MITM `server.cjs` runs as a separate `node`
|
|
* child process in the Docker standalone bundle, so neither Next.js's
|
|
* file tracer nor the main server's import graph covers its dependencies.
|
|
* `EXTRA_MODULE_ENTRIES` must therefore ship every relative `require()` target
|
|
* of `server.cjs` AND every bare-specifier dynamic `import()` its `_internal/*.cjs`
|
|
* shims perform, or the MITM proxy crashes at boot with MODULE_NOT_FOUND.
|
|
*/
|
|
|
|
test("EXTRA_MODULE_ENTRIES ships every relative require() of MITM server.cjs (#9451)", async () => {
|
|
const serverSrc = fs.readFileSync(path.join(repoRoot, "src/mitm/server.cjs"), "utf8");
|
|
const relRequires = [...serverSrc.matchAll(/require\("\.\/([^"]+)"\)/g)].map((m) => m[1]);
|
|
assert.ok(relRequires.length > 0, "server.cjs has relative require() calls to check (sanity)");
|
|
|
|
const tmp = fs.mkdtempSync(path.join(os.tmpdir(), "mitm-bundle-"));
|
|
try {
|
|
await syncStandaloneExtraModules(repoRoot, fs.promises, { log() {} }, tmp);
|
|
for (const rel of relRequires) {
|
|
assert.ok(
|
|
fs.existsSync(path.join(tmp, "src/mitm", rel)),
|
|
`server.cjs requires ./src/mitm/${rel} but EXTRA_MODULE_ENTRIES does not ship it — MITM child crashes with MODULE_NOT_FOUND`
|
|
);
|
|
}
|
|
} finally {
|
|
fs.rmSync(tmp, { recursive: true, force: true });
|
|
}
|
|
});
|
|
|
|
test("EXTRA_MODULE_ENTRIES ships every dynamic import() of MITM _internal shims (#9451)", async () => {
|
|
const internalDir = path.join(repoRoot, "src/mitm/_internal");
|
|
const shimFiles = fs.readdirSync(internalDir).filter((f) => f.endsWith(".cjs"));
|
|
assert.ok(shimFiles.length > 0, "src/mitm/_internal has shim files to check (sanity)");
|
|
|
|
// Collect bare-specifier (non-relative, non-node:) dynamic imports across all shims.
|
|
const bareImports = new Set<string>();
|
|
for (const f of shimFiles) {
|
|
const src = fs.readFileSync(path.join(internalDir, f), "utf8");
|
|
for (const m of src.matchAll(/import\("([^"]+)"\)/g)) {
|
|
const spec = m[1];
|
|
if (spec.startsWith("node:") || spec.startsWith(".") || spec.startsWith("/")) continue;
|
|
bareImports.add(spec);
|
|
}
|
|
}
|
|
assert.ok(
|
|
bareImports.size > 0,
|
|
"MITM _internal shims have bare-specifier dynamic import() calls to check (sanity)"
|
|
);
|
|
|
|
const tmp = fs.mkdtempSync(path.join(os.tmpdir(), "mitm-bundle-imports-"));
|
|
try {
|
|
await syncStandaloneExtraModules(repoRoot, fs.promises, { log() {} }, tmp);
|
|
for (const spec of bareImports) {
|
|
// Bare specifiers resolve into node_modules/<name>; scoped packages live
|
|
// under node_modules/@scope/. For selfsigned (no nested subpath used at
|
|
// link time) it suffices to check the package directory is shipped.
|
|
const pkgDir = path.join(tmp, "node_modules", ...spec.split("/"));
|
|
assert.ok(
|
|
fs.existsSync(pkgDir),
|
|
`MITM _internal shim dynamic-imports "${spec}" but EXTRA_MODULE_ENTRIES does not ship it — MITM child crashes with MODULE_NOT_FOUND`
|
|
);
|
|
}
|
|
} finally {
|
|
fs.rmSync(tmp, { recursive: true, force: true });
|
|
}
|
|
});
|