mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-08-13 10:43:43 +03:00
* fix(ci): clear base-reds on release/v3.8.50 (round 3) - CHANGELOG.md: restore the top [Unreleased] section dropped by the #10189 reconcile (docs-sync gate: first section must be Unreleased) - env-doc-sync: document CONDUCTOR_ORCHESTRATOR_TOKEN + CONDUCTOR_SPOKESPERSON_URL in .env.example/ENVIRONMENT.md; allowlist the CI-only GITHUB_STEP_SUMMARY and TS7_BASE_REF (ts7 ratchet signals); drop a stray merge artifact line - providers: restore the audited chatanywhere metadata entry that base-reds round 2 dropped together with its duplicate — the provider was half-wired (registry+endpoint without APIKEY metadata), which is what the wave3 test catches; re-pin providers-constants-split at the measured 228 - docs counts: 338 -> 339 (today's +2 void-ai/helixmind, -1 Puter) via gen:provider-reference + README/AGENTS/llm.txt/package.json/diagrams/i18n mirrors - file-size ratchet: annotated rebaseline for the two pre-existing drifts (ModelSelectModal 1138, gateways 1250) following the 2026-08-11 precedent Refs #9985 * fix(ci): base-reds round 3b — stale sibling tests + mode-pack weight contract - check-docs-counts-sync.test.ts: drop the imports/subtests of the four helpers #10196 removed from the gate script (readMcpFactsFromSource, listLocalizedDocs, makeRequiredCountsValidator, checkFreeTierInventory) — the new-API tests that #10196 added stay; the file now loads again under the node runner - quota-connection-recovery.test.ts: convert from vitest APIs to node:test — the file lives in tests/unit/*.test.ts (node-runner glob) and the vitest runtime crashes when imported outside vitest, killing the whole shard entry - modePacks.ts: re-normalize all six mode packs to sum 1.0 — #8940 added sessionAvailability: 0.05 to every pack without rebalancing (1.05 total); ratios preserved exactly (÷1.05), so post-normalizeScoringWeights behavior is unchanged; restores the declared sum-to-1.0 contract the 4235 test pins Refs #9985 * fix(ci): base-reds round 3c — vitest siblings, weights default, secrets FP, mutation tap - DistributeProxiesButton.test.tsx: wrap renders in NextIntlClientProvider — #9245 localized the component (useTranslations) and left the test without the intl context, failing all 14 cases - scoring.ts: re-normalize DEFAULT_WEIGHTS to sum 1.0 (same #8940 class as the mode packs — sessionAvailability added without rebalancing; ratios preserved) - .gitleaks.toml: generalize the kimi sponsor-banner localStorage-key allowlist to -v\d+ — #10200 bumped v1→v2 and the stale regex regressed the secrets ratchet with a false positive - stryker.conf.json: register 6 covering unit tests in tap.testFiles (4 modules) so their mutant kills count — unblocks check:mutation-test-coverage --strict Refs #9985 * fix(ci): base-reds round 3d — inspector factor gap, stale registry/gap tests, i18n key sync - comboScoringInspector: add cacheAffinity/sessionAvailability/connectionDensity to FACTOR_KEYS + the factor-key type — calculateScore() weighs them but the breakdown omitted them, so the explained contributions never summed to the reported score (inspector bug, red on the pure tip) - combo-scoring-inspector.test: make the explicit-weights override sum-neutral (±0.05 shift) so it stays valid for any DEFAULT_WEIGHTS values — the hardcoded override only summed to 1.0 against the pre-#8940 defaults, which is also why explicit weights silently fell back to 'default' on the tip - unorouter-registry.test: align to the canonical .com host (api.unorouter.ai 301-redirects there, verified live) and to wave4's live model discovery (passthrough, no static seed) — the .ai/auto-model expectations were stale - check-migration-numbering.test: 147 left KNOWN_GAPS when 147_api_keys_model_access_mode.sql landed — assert absent (same as 143) - i18n: sync-ui pass — 35,914 missing UI keys stamped as __MISSING__ placeholders across 42 locales (mechanical; greens the pt-BR key-presence integrity test; coverage pct unchanged by design — translation is a separate workstream) Refs #9985 * fix(ci): base-reds round 3e — 2 real defects + 14 stale sibling tests (waves A-E) Real defects fixed: - src/lib/db/apiKeys.ts: #9313's empty-allowlist early return bypassed the group permission check, silently disabling group deny rules (#8817) for every key without a per-key allowlist; fall-through restored, restricted+[] deny-all kept - open-sse/utils/proxyFetch.ts: #10032 re-appended the raw transport error to the propagated message, reintroducing the proxy user:password leak #9837 closed; new redactProxyDetailsInMessage() keeps the reason, redacts URL/credentials - .github/workflows/quality.yml: #10134 added the TS7 ratchet as a separate blocking step AFTER the aggregated gates — the exact #8542 masking mechanism; folded into the non-fail-fast loop (still blocking, still PR-only) ⚠️ CI edit, gate-strengthening — explicit owner sign-off requested on the PR - src/i18n/messages/ko.json: 3 machine-mistranslation regressions caught by the #8244 glossary checker (장애인→비활성화됨, 양말5://→socks5://, 비클로드→Claude가 아닌) Stale sibling tests aligned to deliberately-moved contracts (each cites its mover): request-log-detail-layout + -stream (#9245 intl provider), repro-8542 pin update, quality-rail-gate-membership (#10134 shape), agentSkills-routes 45→46 (#9058), cloudflare-ai-catalog-8717 (#8804 supersedes #8808), executor-xai (#9994), vision-bridge-claude-wire (#9463 minimax→openai), sse-auth forced-pin (#8893), tls-proxy-context (strengthened leak guards), rate-limit-local-error-classification (#9164/#9342), minimax-thinking-signature (#9463), codebuddy-cn (#9723 +1 test), github-copilot-custom-model (#9050), providers-g4f-batch3 (#9584), synced-capability-warmup (#9199, stricter), sidebar-tools-group (#8221), oauth-modal-grok-cli-paste (#9245); agentSkills/catalog.ts comment 45→46; file-size rebaseline for proxyFetch (+19, annotated) Refs #9985 * fix(ci): base-reds round 3f — waves F-J: 9 more real defects + stale sibling sweep Real production defects fixed (all red on the pure tip, each with its origin): - routeGuard.ts: #8949 accidentally DELETED the /api/providers/[id]/login local-only pattern — the route spawns a browser, so the loopback gate for a process-spawning route was gone (Hard Rules #15/#17); restored (314 guard tests green) - agentSkills generator: #9058's category dispatch gave the config category an empty body, wiping skills/config-codex-cli/SKILL.md at the #10131 sync; fixed + SKILL.md regenerated via the official generator - imageRegistry: #9982 broke same-provider bare aliasing (antigravity preview id sent upstream unresolved); new resolveSameProviderBareAlias() keeps the fal cross-provider fix intact - imageRegistry: #9982's prefix strip handed the bare nano-banana ids to fal-ai, violating the pinned 2026-07-31 operator decision (adobe-firefly owns them); fal entries made prefix-only (dispatch already re-prefixes) - mediaGeneration/fal.ts: the missing-credential 401 guard was lost when #10198 deleted the superseded falHandler — tests were hitting the live network - bottleneckPatch/rateLimitManager: #9041's merge clobbered #9604, resurrecting the Bottleneck v2.19.5 heartbeat bug (reservoir never refills); patched the library defect at the root and re-aligned chat-rate-limit-body-lock to the working reservoir contract - processSupervisor.mjs: #9761 regressed the Node spawn to bare "node" (the #9156 launchd bug) and dropped #9209's ipv4first args; both restored - openai-responses/pureHelpers: #9423's Agent null-sentinel was unreachable on the schemaless JSON-string path; gate extended - i18n en.json: #8222's regen reverted the #9976 unclosed-tag fix and #8559's combo-cooldown copy; #9038 shipped 40 t() calls with no messages (runtime MISSING_MESSAGE); all restored/added + official sync-ui stamps, and vi's zero-marker policy re-established via the sanctioned translation backend Stale sibling tests aligned (movers cited inline): chat-helpers (#9447), executor-antigravity (#9351), video-fal-grok (#9982), visionBridge (#9759), web-session-credentials (#8974), production-build-module-integrity (positive anchor added), agentSkills-generator/skillManifestsLint/skills-injection/ agentSkillTools-mcp/listCapabilities-a2a (#9058), memory-settings (#10010), model-catalog-policy-invalidation (#8906), model-alias-seed (#9485), reactive-context-compaction (#8949), combo-provider-wildcard (broken upsert helper), oauth-google-loopback (43-locale resurrected-key removal) Validation: 501/501 across the 47 touched test files; typecheck:core, lint, file-size, docs-sync all green. Refs #9985 * fix(ci): base-reds round 3g — wave K/L: 4 more real defects + stale alignments Real defects: - base/reasoningEffort.ts: the stale duplicate cherry-pick #9612 re-added the codex minimal→low rewrite that #9883 had deliberately removed (OMP minimal passthrough); block removed again - cursorImages.ts: #9840 wired prepareCursorImageForWire (sharp re-encode, fail-closed) into the SHARED resolveCursorImages, breaking zai-web and conol-web image uploads (HTTP 400 'undecodable'); new prepareForWire opt-out, Cursor default path unchanged (8 cursor suites green) - modelCapabilities/snapshot: catalog prepare still issued 323 per-model reads of model_context_overrides + max_input_tokens overrides, violating #9199's bulk-load contract; both now resolve from the snapshot single pass - v1-models-discovery-conformance: re-pinned to the bounded 30s SWR window (#9199/#10198) — the old 'stale-first regardless of age' contract is gone Stale tests aligned (movers cited inline): codex-tools-strict-default (#9828 redundant-oneOf strip), devin-providers (#9245 i18n), db-migrationrunner- constants-split (147→151 renumber #8228), gitlab-duo-oauth-setup (#9245), chatcore-extracted-modules (#9161 outbound-protocol keying) compression-api CI failures were cascade artifacts of codex-tools-strict-default failing in the same force-exit shard process — no own defect (171/171 local). Refs #9985 * fix(test): compression-api — register both describes before the runner starts The DATA_DIR setup + route/db top-level awaits sat BETWEEN the two describes; under --test-force-exit (the CI unit-runner flag) the process exits once the already-registered tests finish, so on slow CI machines the whole second describe died as 'Promise resolution is still pending' — the recurring CI-only shard-2 failure that never reproduced locally without the flag. Moved to the top of the file; 10/10 under --test-force-exit locally. Refs #9985 * fix(quality): freeze modelCapabilities.ts at 1006 (annotated) — snapshot routing growth Refs #9985 * fix(quality): move the modelCapabilities freeze into the frozen map (nested schema) Refs #9985 * fix(i18n): translate all 39,718 pending UI keys across 42 locales (owner-approved) Mass-translated every __MISSING__ placeholder via the official i18n:sync-ui --translate-markers pipeline (operator backend), restoring i18nUiCoverage to the 100 baseline (was 89.9 after the merge-storm UI landings + the 42 keys #9038 never shipped). Post-pass repairs, all caught by the existing gates: - glossary: retired renderings the machine reintroduced normalized again (提供商→提供者 zh-CN/zh-TW, 鏈接→連結, 文檔→文件, 調用→呼叫, 供應商→提供者, 響應→回應, 不活躍→未啟用 zh-TW; 클로드→Claude, 옴니루트→OmniRoute ko); DATA_DIR forbidden rendering avoided via 数据文件夹 rephrase - ICU integrity: 120 values with renamed/dropped {params} repaired (39 positional renames, 81 reset to the en source — functional over fluent) Validation: glossary/pt-BR/vi/deno-relay/settings-keys/value-drift/google- loopback suites 76/76; placeholder diff en×42 locales = 0; worst-locale coverage = 100.0%. Refs #9985 --------- Co-authored-by: backryun <bakryun0718@proton.me>
208 lines
7.8 KiB
JavaScript
208 lines
7.8 KiB
JavaScript
import { spawn } from "node:child_process";
|
|
import { dirname, join } from "node:path";
|
|
import { writePidFile, cleanupPidFile, killAllSubprocesses, isPidRunning } from "../utils/pid.mjs";
|
|
import {
|
|
RESTART_RESET_MS,
|
|
DEFAULT_MAX_RESTARTS,
|
|
shouldExitInsteadOfRestart,
|
|
computeRestartDelayMs,
|
|
waitUntilPortFree,
|
|
} from "./supervisorPolicy.mjs";
|
|
import { buildNodeRuntimeArgs } from "../../../scripts/build/runtime-env.mjs";
|
|
import { stopProcessGracefully } from "../../../src/shared/platform/windowsProcess.ts";
|
|
import {
|
|
isFatalInstrumentationHookFailure,
|
|
formatAndroidInstrumentationFailureHint,
|
|
} from "../utils/ensureAndroidCacheDir.mjs";
|
|
|
|
const CRASH_LOG_LINES = 50;
|
|
|
|
export class ServerSupervisor {
|
|
constructor({
|
|
serverPath,
|
|
env,
|
|
maxRestarts = DEFAULT_MAX_RESTARTS,
|
|
memoryLimit = 512,
|
|
onCrashCallback,
|
|
}) {
|
|
this.serverPath = serverPath;
|
|
this.env = env;
|
|
this.maxRestarts = maxRestarts;
|
|
this.memoryLimit = memoryLimit;
|
|
this.onCrashCallback = onCrashCallback;
|
|
this.restartCount = 0;
|
|
this.startedAt = 0;
|
|
this.crashLog = [];
|
|
this.child = null;
|
|
this.isShuttingDown = false;
|
|
this.instrumentationFailureHintPrinted = false;
|
|
}
|
|
|
|
start() {
|
|
this.startedAt = Date.now();
|
|
this.crashLog = [];
|
|
this.instrumentationFailureHintPrinted = false;
|
|
|
|
const showLog = process.env.OMNIROUTE_SHOW_LOG === "1";
|
|
// #6321: stdout used to be discarded (`"ignore"`) whenever `--log`/OMNIROUTE_SHOW_LOG
|
|
// wasn't set (the default) — any debug/pino output written to stdout vanished
|
|
// silently, so a boot that never becomes ready looked like a dead hang with zero
|
|
// output even at APP_LOG_LEVEL=debug. Pipe stdout too and buffer it alongside
|
|
// stderr so a readiness timeout can surface what the child actually printed.
|
|
// #9156: always spawn via process.execPath (absolute path to the running
|
|
// runtime — node or bun). Bare "node" is unresolvable under macOS launchd's
|
|
// minimal PATH; #9761's Bun ternary accidentally regressed the Node branch.
|
|
// Node args come from buildNodeRuntimeArgs (#9209 IPv4-first DNS + #5238
|
|
// heap flag handling); the Bun branch keeps #9761's polyfill preload —
|
|
// Bun does not accept the Node-only flags.
|
|
this.child = spawn(
|
|
process.execPath,
|
|
process.versions.bun
|
|
? [
|
|
"--preload",
|
|
join(dirname(this.serverPath), "open-sse/utils/setupPolyfill.ts"),
|
|
this.serverPath,
|
|
]
|
|
: buildNodeRuntimeArgs(process.env, this.memoryLimit, this.serverPath),
|
|
{
|
|
cwd: dirname(this.serverPath),
|
|
env: this.env,
|
|
stdio: showLog ? "inherit" : ["ignore", "pipe", "pipe"],
|
|
}
|
|
);
|
|
|
|
writePidFile("server", this.child.pid);
|
|
|
|
const bufferOutput = (data) => {
|
|
const text = data.toString();
|
|
const lines = text.split("\n").filter(Boolean);
|
|
this.crashLog.push(...lines);
|
|
if (this.crashLog.length > CRASH_LOG_LINES) {
|
|
this.crashLog = this.crashLog.slice(-CRASH_LOG_LINES);
|
|
}
|
|
// Surface Android/Termux instrumentation-hook failures even when --log is
|
|
// off (output is only buffered otherwise).
|
|
if (!this.instrumentationFailureHintPrinted && isFatalInstrumentationHookFailure(text)) {
|
|
this.instrumentationFailureHintPrinted = true;
|
|
process.stderr.write(
|
|
formatAndroidInstrumentationFailureHint(
|
|
this.env?.XDG_CACHE_HOME || process.env.XDG_CACHE_HOME
|
|
)
|
|
);
|
|
}
|
|
};
|
|
|
|
if (this.child.stdout) {
|
|
this.child.stdout.on("data", bufferOutput);
|
|
}
|
|
if (this.child.stderr) {
|
|
this.child.stderr.on("data", bufferOutput);
|
|
}
|
|
|
|
this.child.on("error", (err) => this.handleExit(-1, err));
|
|
this.child.on("exit", (code) => this.handleExit(code));
|
|
|
|
return this.child;
|
|
}
|
|
|
|
handleExit(code, err) {
|
|
// Node.js v24+ requires process.exit() to receive a number. Spawn-error events
|
|
// deliver err.code (a string like 'ENOENT') via the 'error' listener; normalise here.
|
|
const exitCode = typeof code === "number" ? code : null;
|
|
cleanupPidFile("server");
|
|
|
|
// #8091: the child's spawn 'error' listener passes `err` through as a second
|
|
// argument, but it used to be silently dropped — the user only ever saw the
|
|
// hardcoded "code=-1" with a permanently empty crash log, with no way to
|
|
// diagnose why the child never started (ENOENT/EACCES/bad path/etc.). Surface
|
|
// the real reason immediately, both on the console and in the crash-log buffer
|
|
// so `dumpCrashLog()` shows it too.
|
|
if (err) {
|
|
const detail = [
|
|
err.code && `code=${err.code}`,
|
|
err.syscall && `syscall=${err.syscall}`,
|
|
err.path && `path=${err.path}`,
|
|
err.message,
|
|
]
|
|
.filter(Boolean)
|
|
.join(" ");
|
|
const line = `⚠ Spawn error: ${detail || String(err)}`;
|
|
console.error(line);
|
|
this.crashLog.push(line);
|
|
}
|
|
|
|
// #4425: only exit on an intentional shutdown. A spontaneous code-0 exit (e.g. a
|
|
// systemd MemoryMax cgroup kill, which reports the process exited cleanly) is anomalous
|
|
// and must be restarted, not treated as a graceful stop that leaves the gateway dead.
|
|
if (shouldExitInsteadOfRestart(this.isShuttingDown)) {
|
|
process.exit(exitCode ?? 0);
|
|
return;
|
|
}
|
|
|
|
const aliveMs = Date.now() - this.startedAt;
|
|
if (aliveMs >= RESTART_RESET_MS) this.restartCount = 0;
|
|
|
|
if (this.restartCount >= this.maxRestarts) {
|
|
console.error(`\n⚠ Server crashed ${this.maxRestarts} times in <30s.`);
|
|
if (this.onCrashCallback) {
|
|
const action = this.onCrashCallback(this.crashLog);
|
|
if (action === "disable-mitm-and-retry") {
|
|
console.error("⚠ Disabling MITM and retrying...\n");
|
|
this.restartCount = 0;
|
|
this.start();
|
|
return;
|
|
}
|
|
}
|
|
this.dumpCrashLog();
|
|
process.exit(exitCode ?? 1);
|
|
return;
|
|
}
|
|
|
|
this.restartCount++;
|
|
const delay = computeRestartDelayMs(this.restartCount);
|
|
console.error(
|
|
`\n⚠ Server exited (code=${code ?? "?"}). Restarting in ${delay / 1000}s... (${this.restartCount}/${this.maxRestarts})`
|
|
);
|
|
if (this.crashLog.length) this.dumpCrashLog();
|
|
// #4425: after a crash the OS may not have released the listen socket yet — restarting
|
|
// immediately produced the EADDRINUSE cascade that exhausted the restart budget. Wait
|
|
// (bounded) for the port to free up before respawning.
|
|
setTimeout(async () => {
|
|
await waitUntilPortFree(process.env.PORT || 20128);
|
|
this.start();
|
|
}, delay);
|
|
}
|
|
|
|
// #6321: exposes the buffered stdout+stderr lines so a caller (e.g. a readiness
|
|
// timeout) can print what the child actually said instead of silence.
|
|
getRecentLog() {
|
|
return [...this.crashLog];
|
|
}
|
|
|
|
dumpCrashLog() {
|
|
console.error("\n--- Server crash log ---");
|
|
this.crashLog.forEach((l) => console.error(l));
|
|
console.error("--- End crash log ---\n");
|
|
}
|
|
|
|
stop() {
|
|
this.isShuttingDown = true;
|
|
if (this.child?.pid) {
|
|
// #8045: on win32, process.kill(pid, "SIGTERM") unconditionally force-terminates
|
|
// the target — it is never a real, interceptable signal there. The child already
|
|
// receives the real CTRL_C_EVENT/CTRL_CLOSE_EVENT independently (it shares the
|
|
// console) and runs its own async graceful shutdown (WAL checkpoint). Sending
|
|
// SIGTERM immediately on win32 races and beats that cleanup. Fire-and-forget:
|
|
// stop() itself stays sync so callers keep their existing control flow.
|
|
void stopProcessGracefully({ pid: this.child.pid, timeoutMs: 5000, isPidRunning });
|
|
}
|
|
killAllSubprocesses();
|
|
}
|
|
}
|
|
|
|
export function detectMitmCrash(crashLog) {
|
|
const text = crashLog.join("\n").toLowerCase();
|
|
const signals = ["mitm", "tls socket", "certificate", "hosts", "eaccess"];
|
|
return signals.filter((s) => text.includes(s)).length >= 2;
|
|
}
|