mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-09-07 15:32:10 +03:00
Rebased onto the current release/v3.8.51 tip as part of a combined provider-retirement/provenance merge batch (Designer Web, Felo Web, Runtime, GPL-derived removal, Qwen Web already landed). Large conflict set (this is the biggest PR in the batch — the common ChatGPT Web provider touches chat, images, count-tokens, session leases, and combos). Conflicts resolved: - `open-sse/config/providers/registry/chatgpt-web/*`, `open-sse/executors/chatgpt-web*`, `open-sse/handlers/imageGeneration/providers/chatgptWeb.ts`, and their tests: kept deleted, matching the PR's stated scope. - `open-sse/config/providers/registry/minimax/web/index.ts`, `open-sse/handlers/imageGeneration/providers/geminiWeb.ts`, `open-sse/executors/gemini-web.ts`'s stale image-mode branch: base-drift collisions against already-merged sibling retirements (#11691, #11708) — kept deleted / dropped the dead code, since this PR's own branch forked before those merged. - `src/shared/constants/reservedProviderPrefixes.ts`, `open-sse/executors/index.ts`, `executorProxy.ts`, `virtualFactory.ts`, `autoStrategy.ts`, `src/lib/db/providers.ts`, `src/sse/handlers/chat.ts`: combined the Designer + Runtime (Felo/Qwen) + common-ChatGPT-Web retirement guard calls at each shared chokepoint — compute-once-then-OR pattern, consistent with prior combinations in this batch. - `src/sse/services/model.ts` / `src/sse/handlers/chatHelpers.ts`: adopted this PR's new `getModelInfoOrRetirementResponse()` central wrapper (a real improvement over ad-hoc try/catch), and extended it to also catch the Designer + Runtime retirement errors it didn't originally cover, so the consolidation doesn't regress the other two mechanisms. - `src/app/api/v1/images/edits/route.ts`: this PR moved the retirement check earlier (before `enforceApiKeyPolicy`) but left the old later call+catch block in place from base drift — removed the now-redundant duplicate `resolveImageRouteModel()` call and merged the Designer catch into the earlier one. - `open-sse/config/imageRegistry.ts`, `tests/snapshots/executors/executor-map.json` (`keyCount` recomputed to 133), `tests/snapshots/provider/translate-path.json`: same "both sides inserted a different retired provider at the same slot" pattern — resolved by dropping both. - `tests/unit/chatcore-executor-proxy.test.ts`, `provider-node-reserved-prefix.test.ts`, `combo-auto-candidate-expansion.test.ts`, `messages-count-tokens-route.test.ts`, `virtual-auto-combo.test.ts`: split into independent per-mechanism test blocks (established pattern); `virtual-auto-combo.test.ts`'s old "includes cookie web-session providers" positive-inclusion test (which used chatgpt-web as its example) was retired along with the provider and replaced by this PR's negative-exclusion test for the same slot. - `docs/architecture/ARCHITECTURE.md`, `CODEBASE_DOCUMENTATION.md` (+ 4 i18n mirrors), `README.md`, `FREE-TIERS-GUIDE.md`, `docs/diagrams/free-tier-budget.svg`, `docs/screenshots/free-tier-budget-card.svg`, `docs/reference/PROVIDER_REFERENCE.md`: recomputed every stale count from the real merged state — 104 executors (`countFiles` gate logic), 351 providers (regenerated via `gen:provider-reference`), 152/351 `hasFree` entries, 445/438/7 free-tier catalog rows, 13 ToS-avoid providers, budget-card regenerated via its real generator script. One doc conflict (`oauth/` module list) needed picking HEAD's side specifically — theirs still listed the already-removed `raycast` module instead of the real `openference`. - `config/quality/test-masking-allowlist.json`: additive merge of the PR's 17 `_deletedWithReplacement` entries alongside the batch's existing ones (one real duplicate-key mistake in my first pass, caught and fixed via a `object_pairs_hook` duplicate-key check before finalizing). Also fixed two real, unrelated-to-my-merge issues surfaced by the focused suite: - `tests/unit/resolve-web-provider-host.test.ts`: the PR's own test had a typo — it asserted `perplexity-web`'s resolved host as `"perplexity.ai"`, but the provider's registered `website` is `"https://www.perplexity.ai"` and the resolver returns the URL's `host` verbatim (no www-stripping), so the correct value is `"www.perplexity.ai"` (consistent with the same test's own `url` assertion). - `tests/unit/hard-session-lease-bypass-inventory.test.ts`: this golden call-site inventory was already stale on the pristine post-#11713 tip (confirmed via a throwaway probe worktree) — `src/lib/db/providers.ts`'s 3 connection-fallback sites and a third `src/app/api/providers/route.ts` site were never added to the golden list by the earlier-merged #11698/#11720 PRs. Updated it to the real current inventory (dated inline comments explain each delta and which PR introduced it), plus this PR's own legitimate deltas (image-edits duplicate-call removal, `ChatGptWebExecutor.execute()` site removed). Focused suite green (433/433 across executor-proxy, reserved-prefix, hard-session-lease-bypass-inventory, resolve-web-provider-host, retirement/runtime-block/source-retirement/management-retirement/image-handler-retirement, migration-168, combo-auto-candidate-expansion, virtual-auto-combo, executor-map-golden and siblings), plus `typecheck:core`, `check-file-size`, and `check-changelog-integrity` clean. Thanks for the thorough provenance-hold retirement work — appreciated.
149 lines
5.4 KiB
JavaScript
149 lines
5.4 KiB
JavaScript
#!/usr/bin/env node
|
|
|
|
/**
|
|
* tls-client-node postinstall repair (#7802).
|
|
*
|
|
* tls-client-node's own postinstall.js fetches a platform-specific native
|
|
* binary (.so/.dylib/.dll) from the bogdanfinn/tls-client GitHub Releases
|
|
* API. That script is blocked by `npm ci --ignore-scripts` (the Dockerfile
|
|
* builder stage runs with scripts disabled for supply-chain hygiene) and,
|
|
* even when it does run, silently no-ops on a rate-limited/failed GitHub API
|
|
* call instead of raising — so `node_modules/tls-client-node/bin/` can end
|
|
* up empty with no visible signal until the first live request throws
|
|
* TlsClientUnavailableError (claude-web/grok-web/lmarena/
|
|
* perplexity-web all share this transport).
|
|
*
|
|
* This module:
|
|
* 1. Copies an already-fetched root `bin/` into the standalone
|
|
* `dist/node_modules/tls-client-node/bin/` bundle (same pattern as
|
|
* fixWreqJsBinary), so the published npm package works even though its
|
|
* own `files` allowlist never ships the binary.
|
|
* 2. When the root `bin/` is empty (--ignore-scripts blocked it, or a
|
|
* transient GitHub rate-limit ate the first attempt), retries the
|
|
* module's own postinstall.js with exponential backoff instead of
|
|
* giving up on the first failure.
|
|
*
|
|
* Best-effort throughout: a failure here never throws out of postinstall.mjs
|
|
* — it only warns, matching the other fix*Binary() steps. The runtime layer
|
|
* (perplexityTlsClient.ts and its 4 siblings) already surfaces a clear
|
|
* TlsClientUnavailableError pointing at the missing binary, so an operator
|
|
* who hits a still-empty bin/ after this repair gets an actionable message
|
|
* rather than an opaque crash.
|
|
*/
|
|
|
|
import { copyFileSync, existsSync, mkdirSync, readdirSync } from "node:fs";
|
|
import { join } from "node:path";
|
|
|
|
const DEFAULT_RETRY_DELAYS_MS = [1_000, 3_000, 8_000];
|
|
|
|
function hasAnyFile(dir) {
|
|
if (!existsSync(dir)) return false;
|
|
try {
|
|
return readdirSync(dir).length > 0;
|
|
} catch {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
function copyBinDir(sourceDir, destDir) {
|
|
mkdirSync(destDir, { recursive: true });
|
|
for (const file of readdirSync(sourceDir)) {
|
|
copyFileSync(join(sourceDir, file), join(destDir, file));
|
|
}
|
|
}
|
|
|
|
async function sleep(ms) {
|
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
}
|
|
|
|
/**
|
|
* Re-run tls-client-node's own postinstall.js in-process, retrying with
|
|
* backoff when the attempt leaves `bin/` empty (covers transient GitHub API
|
|
* rate-limiting — the upstream script itself never throws on failure, it
|
|
* only warns, so "still empty after running it" is the only failure signal
|
|
* available).
|
|
*/
|
|
async function downloadWithRetry(rootTlsClientDir, retryDelaysMs, log) {
|
|
const postinstallScript = join(rootTlsClientDir, "scripts", "postinstall.js");
|
|
const binDir = join(rootTlsClientDir, "bin");
|
|
if (!existsSync(postinstallScript)) return false;
|
|
|
|
for (let attempt = 0; attempt <= retryDelaysMs.length; attempt++) {
|
|
if (attempt > 0) {
|
|
log(
|
|
` ⏳ tls-client-node native binary still missing — retrying download ` +
|
|
`(attempt ${attempt + 1}/${retryDelaysMs.length + 1}) after rate-limit/backoff...`
|
|
);
|
|
await sleep(retryDelaysMs[attempt - 1]);
|
|
}
|
|
|
|
try {
|
|
const { execFileSync } = await import("node:child_process");
|
|
execFileSync(process.execPath, [postinstallScript], {
|
|
cwd: rootTlsClientDir,
|
|
stdio: "pipe",
|
|
timeout: 30_000,
|
|
});
|
|
} catch (err) {
|
|
log(` ⚠️ tls-client-node postinstall attempt failed: ${err.message.split("\n")[0]}`);
|
|
}
|
|
|
|
if (hasAnyFile(binDir)) return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* @param {object} opts
|
|
* @param {string} opts.rootDir - repo root
|
|
* @param {(msg: string) => void} [opts.log]
|
|
* @param {number[]} [opts.retryDelaysMs] - override for tests (avoid real sleeps)
|
|
*/
|
|
export async function fixTlsClientNodeBinary({
|
|
rootDir,
|
|
log = (m) => console.log(m),
|
|
retryDelaysMs = DEFAULT_RETRY_DELAYS_MS,
|
|
} = {}) {
|
|
const rootTlsClientDir = join(rootDir, "node_modules", "tls-client-node");
|
|
const rootBinDir = join(rootTlsClientDir, "bin");
|
|
const distTlsClientDir = join(rootDir, "dist", "node_modules", "tls-client-node");
|
|
|
|
if (!existsSync(rootTlsClientDir)) return;
|
|
|
|
if (!hasAnyFile(rootBinDir)) {
|
|
log(
|
|
"\n 🔧 tls-client-node native binary missing (blocked by --ignore-scripts or a " +
|
|
"failed fetch) — attempting repair...\n"
|
|
);
|
|
const recovered = await downloadWithRetry(rootTlsClientDir, retryDelaysMs, log);
|
|
if (!recovered) {
|
|
console.warn(
|
|
"\n ⚠️ Could not fetch tls-client-node's native binary " +
|
|
"(GitHub API rate-limited or unreachable after retries)."
|
|
);
|
|
console.warn(
|
|
" claude-web/grok-web/lmarena/perplexity-web will raise a clear " +
|
|
"TlsClientUnavailableError on first use until this is resolved."
|
|
);
|
|
console.warn(
|
|
` Manual fix: node ${join(rootTlsClientDir, "scripts", "postinstall.js")}\n`
|
|
);
|
|
return;
|
|
}
|
|
log(" ✅ tls-client-node native binary fetched successfully!\n");
|
|
}
|
|
|
|
if (!existsSync(distTlsClientDir) || !hasAnyFile(rootBinDir)) return;
|
|
|
|
const distBinDir = join(distTlsClientDir, "bin");
|
|
if (hasAnyFile(distBinDir)) return;
|
|
|
|
try {
|
|
copyBinDir(rootBinDir, distBinDir);
|
|
log(" ✅ tls-client-node native binary copied to standalone dist/node_modules.\n");
|
|
} catch (err) {
|
|
console.warn(` ⚠️ Could not copy tls-client-node binary into dist/: ${err.message}`);
|
|
}
|
|
}
|