mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-09-13 18:32:12 +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.
193 lines
6.4 KiB
TypeScript
193 lines
6.4 KiB
TypeScript
import { sanitizePII } from "./piiSanitizer";
|
|
|
|
const SENSITIVE_KEYS = new Set([
|
|
"api_key",
|
|
"apiKey",
|
|
"api-key",
|
|
"authorization",
|
|
"Authorization",
|
|
"x-api-key",
|
|
"X-Api-Key",
|
|
"x-goog-api-key",
|
|
"access_token",
|
|
"accessToken",
|
|
"refresh_token",
|
|
"refreshToken",
|
|
"password",
|
|
"secret",
|
|
"token",
|
|
// secret-leak hardening: session cookies + browser-storage credentials that
|
|
// some web-impersonation providers (Meta AI ecto_1_sess, Perplexity Web
|
|
// storageState / runtimeKey) can surface into a request/response BODY field
|
|
// rather than a header. Header-borne values are already masked by
|
|
// maskSensitiveHeaders; this covers the body path into the on-disk call-log
|
|
// artifact. Scoped to the actual credential field names only — the generic
|
|
// word "capability" was intentionally NOT included: it is a common non-secret
|
|
// field (model catalogs' `capabilities`, degradation/provider-discovery
|
|
// `capability` strings, MCP tool schemas) and matching it here would broadly
|
|
// redact useful diagnostics from call-log artifacts. The real Meta AI secret
|
|
// is the ecto_1_sess cookie / ecto1: WS token, already covered by
|
|
// cookie/authorization/storageState above.
|
|
"cookie",
|
|
"Cookie",
|
|
"storageState",
|
|
"storage-state",
|
|
"runtimeKey",
|
|
]);
|
|
|
|
type JsonRecord = Record<string, unknown>;
|
|
|
|
const ENCRYPTED_REASONING_KEY = "encrypted_content";
|
|
|
|
function encryptedReasoningOmissionMarker(length?: number): string {
|
|
return length === undefined
|
|
? "[omitted: encrypted reasoning]"
|
|
: `[omitted: encrypted reasoning, ${length} chars]`;
|
|
}
|
|
|
|
// Matches a JSON string field in captured SSE text. Alternatives inside the value are disjoint,
|
|
// keeping the scan linear even for large encrypted blobs.
|
|
const SERIALIZED_ENCRYPTED_REASONING_RE = /(\"encrypted_content\"\s*:\s*\")((?:\\.|[^\"\\])*)\"/g;
|
|
const STREAM_CHUNK_TIMESTAMP_RE = /^\[\d{2}:\d{2}:\d{2}\.\d{3}\] /;
|
|
|
|
export function omitEncryptedReasoningFromLogChunks(chunks: string[]): string[] {
|
|
const combined = chunks.map((chunk) => chunk.replace(STREAM_CHUNK_TIMESTAMP_RE, "")).join("");
|
|
let found = false;
|
|
const omitted = combined.replace(SERIALIZED_ENCRYPTED_REASONING_RE, (_match, prefix: string) => {
|
|
found = true;
|
|
return `${prefix}${encryptedReasoningOmissionMarker()}\"`;
|
|
});
|
|
return found ? [omitted] : chunks;
|
|
}
|
|
|
|
/**
|
|
* True for any binary/opaque byte view (Uint8Array, Buffer, DataView, other
|
|
* typed arrays). `Array.isArray()` returns false for these, so callers that
|
|
* branch on it before recursing would otherwise fall into the generic-object
|
|
* branch and enumerate one JS property key per decoded byte (#7297).
|
|
*/
|
|
function isOpaqueBinary(value: unknown): value is ArrayBufferView {
|
|
return ArrayBuffer.isView(value);
|
|
}
|
|
|
|
function describeOpaqueBinary(value: ArrayBufferView): string {
|
|
const byteLength = value.byteLength;
|
|
return `[binary ${byteLength} bytes]`;
|
|
}
|
|
|
|
export function cloneLogPayload<T>(value: T): T {
|
|
if (value === null || value === undefined) return value;
|
|
if (typeof globalThis.structuredClone === "function") {
|
|
return globalThis.structuredClone(value);
|
|
}
|
|
return JSON.parse(JSON.stringify(value)) as T;
|
|
}
|
|
|
|
export function normalizePayloadForLog(payload: unknown): unknown {
|
|
if (typeof payload !== "string") return payload;
|
|
|
|
const trimmed = payload.trim();
|
|
if (!trimmed) return "";
|
|
|
|
try {
|
|
return JSON.parse(trimmed);
|
|
} catch {
|
|
return { _rawText: payload };
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Remove opaque encrypted reasoning from log copies. The value is replayable by clients but
|
|
* provides no useful diagnostics, so retaining its size is sufficient for observability.
|
|
*/
|
|
export function omitEncryptedReasoningForLog(payload: unknown): unknown {
|
|
if (!payload || typeof payload !== "object") return payload;
|
|
if (isOpaqueBinary(payload)) return describeOpaqueBinary(payload);
|
|
if (Array.isArray(payload)) return payload.map(omitEncryptedReasoningForLog);
|
|
|
|
const omitted: JsonRecord = {};
|
|
for (const [key, value] of Object.entries(payload)) {
|
|
if (key === ENCRYPTED_REASONING_KEY && typeof value === "string" && value.length > 0) {
|
|
omitted[key] = encryptedReasoningOmissionMarker(value.length);
|
|
} else if (typeof value === "object" && value !== null) {
|
|
omitted[key] = omitEncryptedReasoningForLog(value);
|
|
} else {
|
|
omitted[key] = value;
|
|
}
|
|
}
|
|
return omitted;
|
|
}
|
|
|
|
export function redactPayload(payload: unknown): unknown {
|
|
if (!payload || typeof payload !== "object") return payload;
|
|
if (isOpaqueBinary(payload)) return describeOpaqueBinary(payload);
|
|
if (Array.isArray(payload)) return payload.map(redactPayload);
|
|
|
|
const redacted: JsonRecord = {};
|
|
for (const [key, value] of Object.entries(payload)) {
|
|
if (SENSITIVE_KEYS.has(key)) {
|
|
redacted[key] = "[REDACTED]";
|
|
} else if (typeof value === "string" && value.startsWith("Bearer ")) {
|
|
redacted[key] = "Bearer [REDACTED]";
|
|
} else if (typeof value === "object" && value !== null) {
|
|
redacted[key] = redactPayload(value);
|
|
} else {
|
|
redacted[key] = value;
|
|
}
|
|
}
|
|
return redacted;
|
|
}
|
|
|
|
export function sanitizePayloadPII(payload: unknown): unknown {
|
|
if (typeof payload === "string") {
|
|
return sanitizePII(payload).text;
|
|
}
|
|
if (!payload || typeof payload !== "object") {
|
|
return payload;
|
|
}
|
|
if (isOpaqueBinary(payload)) {
|
|
return describeOpaqueBinary(payload);
|
|
}
|
|
if (Array.isArray(payload)) {
|
|
return payload.map(sanitizePayloadPII);
|
|
}
|
|
|
|
const sanitized: JsonRecord = {};
|
|
for (const [key, value] of Object.entries(payload)) {
|
|
sanitized[key] = sanitizePayloadPII(value);
|
|
}
|
|
return sanitized;
|
|
}
|
|
|
|
export function protectPayloadForLog(payload: unknown): unknown {
|
|
if (payload === null || payload === undefined) return null;
|
|
const normalized = normalizePayloadForLog(payload);
|
|
const reasoningOmitted = omitEncryptedReasoningForLog(normalized);
|
|
const piiSanitized = sanitizePayloadPII(reasoningOmitted);
|
|
return redactPayload(piiSanitized);
|
|
}
|
|
|
|
export function serializePayloadForStorage(payload: unknown, maxLength = 65536): string | null {
|
|
if (payload === null || payload === undefined) return null;
|
|
|
|
const exact = JSON.stringify(payload);
|
|
if (exact.length <= maxLength) {
|
|
return exact;
|
|
}
|
|
|
|
return JSON.stringify({
|
|
_truncated: true,
|
|
_originalSize: exact.length,
|
|
_preview: exact.slice(0, maxLength),
|
|
});
|
|
}
|
|
|
|
export function parseStoredPayload(value: unknown): unknown | null {
|
|
if (typeof value !== "string" || value.trim().length === 0) return null;
|
|
try {
|
|
return JSON.parse(value);
|
|
} catch {
|
|
return { _rawText: value };
|
|
}
|
|
}
|