mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-08-15 19:52:50 +03:00
* fix(quality): green release/v3.8.50 base-reds round 2 — gateways/conol/deepai corruption, migrations, docs, ratchets, dashboard-typecheck Base-red fix for issue #9985 after the 2026-08-11 merge storm (99 PRs). Real defects fixed: - gateways.ts: close regolo entry (was swallowing naga-ac + chatanywhere from #9421), drop stale duplicate chatanywhere entry (#9594) - conol-web + deepai registry: correct ../shared import depth + deepai executor:default - modelSelectModalHelpers: close isProviderModelHidden (#9011) - driverFactory.test.ts: restore eaten test-closing brace (#9173) - usageTracking: remove duplicate cache_* props - modelCapability{Overrides,ResolutionSnapshot,Capabilities}: max_token -> max_output_tokens (#9199 vs #8908) + test align - videoGeneration: drop duplicate handleFalVideoGeneration import (mediaGeneration/fal canonical, #9982) - responseSanitizer: cast input_tokens_details before .cached_tokens access - EditConnectionModal: missing alibaba code fields, hoist validationPsd, providerPageHelpers Badge variant union - FreeBudgetCard: t() -> labels.noApiKey - peerRouting + cliRuntime: ProcessEnv typing - image-combo.test.ts: type any -> unknown - fal.test.ts: moved to tests/unit/services (collected path) 14 tests green - remove duplicate 143_job_registry.sql (146 canonical), KNOWN_GAPS fix Docs/ratchets (owner-authorized rebaselines, annotated): - CHANGELOG 3.8.50 living section restored + 42 i18n mirrors - MCP-SERVER.md 104->105 tools + i18n - ENVIRONMENT.md/.env.example: ADOBE_FIREFLY_CHROME_HEADED + DEBUG_CLAUDE_NONSTREAM - fabricated-docs allowlist: TELEGRAM proposal env vars - file-size: 5 grown files + proxyFetch 1207->1220 - dead-code 230->248, codeql 2->9 (drift from merged PRs, not this PR) - untrack _tasks symlink; agent-skills-sync --apply (config-codex-cli) * fix(changelog): reformat two feature fragments to the bullet convention (#9239, #9490) * fix(quality): prune stale ESLint suppressions (base-red) * fix(quality): resolve open-sse type errors + catalog/build regressions (base-red round 3) Storm-merge splices repaired in the base-fix PR #10131: - doctor.ts: AppConfig missing brokerSocketPath - conol-web.ts: Buffer not assignable to BodyInit (Uint8Array) - tinycms.ts: TinyCmsExecutor.execute return matches BaseExecutor (response/url/transformedBody) - tinycmsSigner.ts: encodeInto never-narrowing guard + dead wasm URL fallback (Turbopack) - virtualFactory.ts: options slot for resolutionSnapshot - bottleneckPatch.ts: insufficient-overlap casts (as unknown as) - imageCombo.ts: narrow handleImageGeneration union result - browser-worker.ts: AppConfig + turn.capabilities splice - conolDiscovery.ts: getProviderOutboundGuard from Policy module - catalog.ts: drop removed SWR hooks (getCatalogStaleWhileRevalidateMs + accessors), CatalogCachePolicy -> inline settings, resolve 4-arg call - catalogCache.ts: remove dead inFlight/promise refs - chat.ts: add isProviderBreakerFailureStatus import - model-catalog-cache-swr-8728.test.ts: align to #9199 new API (policy injection removed) * fix(quality): align UI test fixtures to current component contracts (base-red vitest) - setup-wizard: provide required serverState prop (component gained it in a merged PR) - grok-device-oauth-modal: next-intl stub resolves grok flow keys to EN labels - provider-quota-widget: label now inline (PR #8916 removed AutoRefreshButtonLabel extraction) — test the widget - use-provider-connections-cursor-refresh + phase1f: match /api/providers?provider=<id> query form; hoist heavy dynamic imports to module scope (timeout flake) - home-topology: mock next/navigation useRouter (component added node-click navigation) - cooling/lobe/AutoComboCatalog: raise cold-import describe timeouts to 30-60s - request-logger-*: align to current detail-view contract * fix(search): guard params.token undefined in serper headers (typecheck base-red) * fix(search): guard token headers + non-null providerConfig (typecheck base-red) * fix(changelog): restore base CHANGELOGs eaten by merge auto-resolve (43 files) --------- Co-authored-by: diegosouzapw <diegosouzapw@users.noreply.github.com> Co-authored-by: backryun <bakryun0718@proton.me>
83 lines
3.5 KiB
TypeScript
83 lines
3.5 KiB
TypeScript
/**
|
|
* Monkey-patch for Bottleneck v2.19.5 doExpire bug.
|
|
*
|
|
* Bug (Job.js:162):
|
|
* `this._states.jobStatus(this.options.id === "RUNNING")`
|
|
* compares job ID to "RUNNING" (always false) instead of checking status.
|
|
* Should be: `this._states.jobStatus(this.options.id) === "RUNNING"`
|
|
*
|
|
* Impact: when a job's execution time exceeds `expiration`, doExpire fires but
|
|
* fails to advance the job from RUNNING to EXECUTING. The _assertStatus throws
|
|
* in a setTimeout (uncaught), and the job is permanently stuck in RUNNING state.
|
|
* Bottleneck's internal _running counter never decrements -> capacity leak.
|
|
*
|
|
* This patch intercepts Bottleneck's _run method to fix job.doExpire before
|
|
* the expiration timeout fires.
|
|
*/
|
|
|
|
import Bottleneck from "bottleneck";
|
|
|
|
/** Bottleneck Job instance (internal, not exported). */
|
|
interface BottleneckJob {
|
|
options: { id?: string; expiration?: number };
|
|
doExpire: (clearGlobalState: () => void, run: () => void, free: () => void) => void;
|
|
_states: { jobStatus: (id: string) => string | null; next: (id: string) => void };
|
|
}
|
|
|
|
let patched = false;
|
|
|
|
export function applyBottleneckDoExpirePatch(): void {
|
|
if (patched) return;
|
|
patched = true;
|
|
|
|
const proto = Bottleneck.prototype as unknown as Record<string, unknown>;
|
|
const originalRun = proto._run as
|
|
((index: string, job: BottleneckJob, wait: number) => unknown) | undefined;
|
|
if (typeof originalRun !== "function") {
|
|
console.warn("[bottleneck-patch] _run not found on prototype, patch skipped");
|
|
return;
|
|
}
|
|
|
|
proto._run = function patchedRun(this: unknown, index: string, job: BottleneckJob, wait: number) {
|
|
// Patch job.doExpire BEFORE calling originalRun.
|
|
// originalRun passes job.doExpire to setTimeout by reference -- once captured,
|
|
// reassigning the property later has no effect on the queued timer callback.
|
|
//
|
|
// Guard: _run is called twice for jobs with wait > 0 (first with the delay,
|
|
// then with wait=0 when the timer fires). Without the flag, fixedDoExpire
|
|
// would wrap itself recursively on the second call.
|
|
if (typeof job?.doExpire === "function" && !(job as unknown as Record<string, unknown>)._doExpirePatched) {
|
|
(job as unknown as Record<string, unknown>)._doExpirePatched = true;
|
|
const originalDoExpire = job.doExpire.bind(job);
|
|
// Bottleneck registers the job in _states under options.id (Job.js
|
|
// states.start(this.options.id)); a bare `job.id` does not exist and
|
|
// reading it makes the RUNNING check below always miss. options.id is
|
|
// stable on the job and is the key the state machine uses.
|
|
const jobId = job.options.id;
|
|
|
|
job.doExpire = function fixedDoExpire(
|
|
clearGlobalState: () => void,
|
|
run: () => void,
|
|
free: () => void
|
|
) {
|
|
// Fix: check job status, not compare ID to string "RUNNING"
|
|
const states = job._states;
|
|
const currentStatus = states?.jobStatus?.(jobId);
|
|
if (currentStatus === "RUNNING") {
|
|
states?.next?.(jobId);
|
|
console.warn(
|
|
`[bottleneck-patch] doExpire bug triggered: job ${jobId} stuck in RUNNING, ` +
|
|
`advanced to EXECUTING before expiry. This is the Bottleneck v2.19.5 capacity leak.`
|
|
);
|
|
}
|
|
return originalDoExpire(clearGlobalState, run, free);
|
|
};
|
|
}
|
|
|
|
// Now call original _run which captures the (now-patched) job.doExpire.
|
|
return originalRun.call(this, index, job, wait);
|
|
};
|
|
|
|
console.log("[bottleneck-patch] Applied doExpire fix for Bottleneck v2.19.5");
|
|
}
|