mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-08-26 17:12:27 +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.
62 lines
1.7 KiB
JavaScript
62 lines
1.7 KiB
JavaScript
/**
|
|
* Pure helpers for polling the embedded or remote OmniRoute server without
|
|
* importing the Electron main process.
|
|
*/
|
|
|
|
const DEFAULT_TIMEOUT_MS = 180000;
|
|
const DEFAULT_REQUEST_TIMEOUT_MS = 2000;
|
|
const DEFAULT_POLL_INTERVAL_MS = 500;
|
|
|
|
function buildReadinessUrl(baseUrl) {
|
|
return `${baseUrl.replace(/\/+$/, "")}/api/health/ping`;
|
|
}
|
|
|
|
async function waitForServer(url, timeoutMs = DEFAULT_TIMEOUT_MS, options = {}) {
|
|
const {
|
|
fetchFn = globalThis.fetch,
|
|
requestTimeoutMs = DEFAULT_REQUEST_TIMEOUT_MS,
|
|
pollIntervalMs = DEFAULT_POLL_INTERVAL_MS,
|
|
nowFn = Date.now,
|
|
sleepFn = (delayMs) => new Promise((resolve) => setTimeout(resolve, delayMs)),
|
|
warnFn = console.warn,
|
|
} = options;
|
|
|
|
const startedAt = nowFn();
|
|
while (nowFn() - startedAt < timeoutMs) {
|
|
const remainingMs = timeoutMs - (nowFn() - startedAt);
|
|
const attemptTimeoutMs = Math.max(1, Math.min(requestTimeoutMs, remainingMs));
|
|
const controller = new AbortController();
|
|
let timeoutId;
|
|
|
|
try {
|
|
const response = await Promise.race([
|
|
fetchFn(url, { signal: controller.signal }),
|
|
new Promise((resolve) => {
|
|
timeoutId = setTimeout(() => {
|
|
controller.abort();
|
|
resolve(null);
|
|
}, attemptTimeoutMs);
|
|
}),
|
|
]);
|
|
|
|
if (response?.ok) return true;
|
|
} catch {
|
|
/* server not ready yet */
|
|
} finally {
|
|
if (timeoutId !== undefined) clearTimeout(timeoutId);
|
|
}
|
|
|
|
const pollRemainingMs = timeoutMs - (nowFn() - startedAt);
|
|
if (pollRemainingMs <= 0) break;
|
|
await sleepFn(Math.min(pollIntervalMs, pollRemainingMs));
|
|
}
|
|
|
|
warnFn("[Electron] Server readiness timeout — showing window anyway");
|
|
return false;
|
|
}
|
|
|
|
module.exports = {
|
|
buildReadinessUrl,
|
|
waitForServer,
|
|
};
|