@fudrouter/fsrouter 0.6.58 → 0.6.60

package/open-sse/utils/providerRequestLogging.js

@@ -1,219 +0,0 @@
-import { AsyncLocalStorage } from "node:async_hooks";
-
-import { updatePendingScope } from '../../dist/lib/usage/pendingRequestScope.js';
-
-const CAPTURE_STATE_KEY = Symbol.for("omniroute.providerRequestCapture.state");
-
-function getCaptureState() {
-  const scopedGlobal = globalThis;
-
-  if (!scopedGlobal[CAPTURE_STATE_KEY]) {
-    scopedGlobal[CAPTURE_STATE_KEY] = {
-      context: new AsyncLocalStorage(),
-      wrappedFetch: null,
-      wrappedInnerFetch: null,
-    };
-  }
-  return scopedGlobal[CAPTURE_STATE_KEY];
-}
-
-const captureState = getCaptureState();
-const BODY_METHODS = new Set(["POST", "PUT", "PATCH"]);
-const AUTH_BODY_KEYS = new Set([
-  "access_token",
-  "client_secret",
-  "grant_type",
-  "id_token",
-  "refresh_token",
-]);
-const REQUEST_BODY_KEYS = new Set([
-  "conversationId",
-  "conversation_id",
-  "contents",
-  "input",
-  "messages",
-  "model",
-  "prompt",
-  "request",
-  "tools",
-  "userSelectedModel",
-]);
-
-export function parseBody(bodyString) {
-  try {
-    return JSON.parse(bodyString);
-  } catch {
-    return bodyString;
-  }
-}
-
-async function capturePreparedRequest(requestCapture, url, headers, body, bodyString, log) {
-  if (!requestCapture) return;
-  const latest = requestCapture.latest?.();
-  if (latest?.url === url && latest.bodyString === bodyString) return;
-
-  try {
-    await requestCapture.capture({ url, headers, body, bodyString });
-  } catch (error) {
-    log?.warn?.(
-      "REQUEST_LOG",
-      `Provider request logging hook failed: ${error instanceof Error ? error.message : String(error)}`
-    );
-  }
-}
-
-export function captureCurrentProviderRequest(url, headers, body, bodyString, log) {
-  return capturePreparedRequest(
-    captureState.context.getStore(),
-    url,
-    headers,
-    body,
-    bodyString,
-    log
-  );
-}
-
-export function captureCurrentProviderBody(url, headers, bodyString, log) {
-  return captureCurrentProviderRequest(url, headers, parseBody(bodyString), bodyString, log);
-}
-
-export function runWithCapture(requestCapture, fn) {
-  installFetchCapture();
-  return captureState.context.run(requestCapture, fn);
-}
-
-function installFetchCapture() {
-  if (globalThis.fetch === captureState.wrappedFetch) return;
-
-  captureState.wrappedInnerFetch = globalThis.fetch.bind(globalThis);
-  captureState.wrappedFetch = async (input, init) => {
-    const activeCapture = captureState.context.getStore();
-    if (activeCapture) {
-      await captureFetchRequest(activeCapture, input, init);
-    }
-    return captureState.wrappedInnerFetch(input, init);
-  };
-  globalThis.fetch = captureState.wrappedFetch;
-}
-
-async function captureFetchRequest(requestCapture, input, init) {
-  const method = getFetchMethod(input, init);
-  if (!BODY_METHODS.has(method)) return;
-
-  const bodyString = bodyToString(init?.body);
-  if (!bodyString) return;
-
-  const body = parseBody(bodyString);
-  if (!looksLikeProviderRequestBody(body)) return;
-
-  await capturePreparedRequest(
-    requestCapture,
-    getFetchUrl(input),
-    getFetchHeaders(input, init),
-    body,
-    bodyString
-  );
-}
-
-function getFetchMethod(input, init) {
-  const method = init?.method || (isRequest(input) ? input.method : "GET");
-  return String(method || "GET").toUpperCase();
-}
-
-function getFetchUrl(input) {
-  if (typeof input === "string") return input;
-  if (input instanceof URL) return input.toString();
-  if (isRequest(input)) return input.url;
-  return String(input);
-}
-
-function getFetchHeaders(input, init) {
-  const headers = new Headers(isRequest(input) ? input.headers : undefined);
-  if (init?.headers) {
-    new Headers(init.headers).forEach((value, key) => headers.set(key, value));
-  }
-
-  const result = {};
-  headers.forEach((value, key) => {
-    result[key] = value;
-  });
-  return result;
-}
-
-function bodyToString(body) {
-  if (typeof body === "string") return body;
-  if (body instanceof URLSearchParams) return body.toString();
-  if (body instanceof ArrayBuffer) return new TextDecoder().decode(body);
-  if (ArrayBuffer.isView(body)) {
-    return new TextDecoder().decode(
-      body.buffer.slice(body.byteOffset, body.byteOffset + body.byteLength)
-    );
-  }
-  return null;
-}
-
-function isRequest(input) {
-  return typeof Request !== "undefined" && input instanceof Request;
-}
-
-function looksLikeProviderRequestBody(body) {
-  if (!body || typeof body !== "object" || Array.isArray(body)) return false;
-  const record = body;
-
-  if (Object.keys(record).some((key) => AUTH_BODY_KEYS.has(key))) return false;
-  if (Object.keys(record).some((key) => REQUEST_BODY_KEYS.has(key))) return true;
-
-  return (
-    typeof record.query === "string" && !!record.variables && typeof record.variables === "object"
-  );
-}
-
-export function createPreparedRequestLogger(reqLogger, scope) {
-  let latest = null;
-  return {
-    capture(request) {
-      latest = request;
-      reqLogger.logTargetRequest(request.url, request.headers, request.body);
-      updatePendingScope(scope, {
-        providerRequest: request.body,
-        providerUrl: request.url,
-        stage: "sending_to_provider",
-      });
-    },
-    body(fallback) {
-      const resolved = latest?.body ?? fallback;
-      // #4091: the captured body is rebuilt from the serialized upstream payload
-      // (the fetch-capture does `JSON.parse(JSON.stringify(...))`), which drops
-      // non-enumerable properties. The native-Claude tool-name cloak stashes its
-      // per-request alias→original map as a NON-ENUMERABLE `_toolNameMap` on the
-      // real (fallback) transformed body; without it the response-side un-cloak
-      // (`mergeResponseToolNameMap` → `remapToolNamesInResponse`) can't restore
-      // MCP / snake_case tool names, so Claude Code receives the cloaked
-      // PascalCase name and rejects every call with "No such tool available".
-      // Re-attach the map onto the resolved (captured) body — kept non-enumerable
-      // so it still never re-serializes into an upstream request.
-      if (
-        resolved !== fallback &&
-        resolved &&
-        typeof resolved === "object" &&
-        fallback &&
-        typeof fallback === "object"
-      ) {
-        const map = fallback._toolNameMap;
-        const target = resolved;
-        if (map instanceof Map && !(target._toolNameMap instanceof Map)) {
-          Object.defineProperty(target, "_toolNameMap", {
-            value: map,
-            enumerable: false,
-            configurable: true,
-            writable: true,
-          });
-        }
-      }
-      return resolved;
-    },
-    latest() {
-      return latest;
-    },
-  };
-}

package/open-sse/utils/proxyFetch.js

@@ -1,369 +0,0 @@
-import { Readable } from "stream";
-import { MEMORY_CONFIG } from "../config/runtimeConfig.js";
-import { dbg } from "./debugLog.js";
-
-const originalFetch = globalThis.fetch;
-const proxyDispatchers = new Map();
-
-// ─── TLS fingerprinting via got-scraping (browser-like JA3) ───────────────
-// Disabled: not in use. Kept commented for future re-enable.
-// Restore the original block to re-enable per-host JA3 spoofing.
-/*
-let _gotScraping = null;
-let _gotScrapingChecked = false;
-const _gotScrapingLoggedHosts = new Set();
-
-async function getGotScraping() {
-  if (_gotScrapingChecked) return _gotScraping;
-  _gotScrapingChecked = true;
-  try {
-    const mod = await import("got-scraping");
-    _gotScraping = typeof mod.gotScraping === "function" ? mod.gotScraping : null;
-    if (_gotScraping) dbg("TLS", "got-scraping loaded (browser-like JA3 enabled)");
-  } catch (e) {
-    console.warn(`[ProxyFetch] got-scraping unavailable, falling back to native fetch: ${e.message}`);
-    _gotScraping = null;
-  }
-  return _gotScraping;
-}
-
-async function gotScrapingFetch(url, options) {
-  const gs = await getGotScraping();
-  if (!gs) return null;
-
-  const method = (options.method || "GET").toUpperCase();
-  const headersInit = options.headers || {};
-  const headers = headersInit instanceof Headers
-    ? Object.fromEntries(headersInit.entries())
-    : { ...headersInit };
-
-  return new Promise((resolve, reject) => {
-    let settled = false;
-    const stream = gs.stream({
-      url,
-      method,
-      headers,
-      body: method === "GET" || method === "HEAD" ? undefined : options.body,
-      throwHttpErrors: false,
-      retry: { limit: 0 },
-      timeout: { request: undefined },
-      followRedirect: false,
-      decompress: true,
-    });
-
-    if (options.signal) {
-      const onAbort = () => { try { stream.destroy(new Error("aborted")); } catch { } };
-      if (options.signal.aborted) onAbort();
-      else options.signal.addEventListener("abort", onAbort, { once: true });
-    }
-
-    stream.once("response", (res) => {
-      if (settled) return;
-      settled = true;
-      const resHeaders = new Headers();
-      for (const [k, v] of Object.entries(res.headers || {})) {
-        if (Array.isArray(v)) v.forEach((x) => resHeaders.append(k, String(x)));
-        else if (v != null) resHeaders.set(k, String(v));
-      }
-      const body = Readable.toWeb(stream);
-      resolve(new Response(body, { status: res.statusCode, statusText: res.statusMessage || "", headers: resHeaders }));
-    });
-
-    stream.once("error", (err) => {
-      if (settled) return;
-      settled = true;
-      reject(err);
-    });
-  });
-}
-
-async function tryGotScrapingFetch(url, options) {
-  try {
-    const res = await gotScrapingFetch(url, options);
-    if (res) {
-      try {
-        const host = new URL(typeof url === "string" ? url : url.toString()).hostname;
-        if (!_gotScrapingLoggedHosts.has(host)) {
-          _gotScrapingLoggedHosts.add(host);
-          dbg("TLS", `using got-scraping for ${host}`);
-        }
-      } catch { }
-    }
-    return res;
-  } catch (e) {
-    console.warn(`[ProxyFetch] got-scraping request failed, fallback to native fetch: ${e.message}`);
-    return null;
-  }
-}
-*/
-
-// DNS cache — use Map to avoid prototype pollution via malformed hostnames
-const DNS_CACHE = new Map();
-const MITM_BYPASS_HOSTS = [
-  "cloudcode-pa.googleapis.com",
-  "daily-cloudcode-pa.googleapis.com",
-  "api.individual.githubcopilot.com",
-  "q.us-east-1.amazonaws.com",
-  "codewhisperer.us-east-1.amazonaws.com",
-  "api2.cursor.sh",
-  "leonardo.ai",
-];
-const GOOGLE_DNS_SERVERS = ["8.8.8.8", "8.8.4.4"];
-const HTTPS_PORT = 443;
-const HTTP_SUCCESS_MIN = 200;
-const HTTP_SUCCESS_MAX = 300;
-
-function normalizeString(value) {
-  if (value === undefined || value === null) return "";
-  return String(value).trim();
-}
-
-/**
- * Resolve real IP using Google DNS (bypass system DNS)
- */
-async function resolveRealIP(hostname) {
-  const cached = DNS_CACHE.get(hostname);
-  if (cached && Date.now() < cached.expiry) return cached.ip;
-
-  try {
-    const dns = await import("dns");
-    const { promisify } = await import("util");
-    const resolver = new dns.Resolver();
-    resolver.setServers(GOOGLE_DNS_SERVERS);
-    const resolve4 = promisify(resolver.resolve4.bind(resolver));
-    const addresses = await resolve4(hostname);
-    DNS_CACHE.set(hostname, { ip: addresses[0], expiry: Date.now() + MEMORY_CONFIG.dnsCacheTtlMs });
-    return addresses[0];
-  } catch (error) {
-    console.warn(`[ProxyFetch] DNS resolve failed for ${hostname}:`, error.message);
-    return null;
-  }
-}
-
-/**
- * Check if request should bypass MITM DNS redirect
- */
-function shouldBypassMitmDns(url) {
-  try {
-    const hostname = new URL(url).hostname;
-    return MITM_BYPASS_HOSTS.some(host => hostname.includes(host));
-  } catch { return false; }
-}
-
-function shouldBypassByNoProxy(targetUrl, noProxyValue) {
-  const noProxy = normalizeString(noProxyValue);
-  if (!noProxy) return false;
-
-  let hostname;
-  try { hostname = new URL(targetUrl).hostname.toLowerCase(); } catch { return false; }
-  const patterns = noProxy.split(",").map((p) => p.trim().toLowerCase()).filter(Boolean);
-
-  return patterns.some((pattern) => {
-    if (pattern === "*") return true;
-    if (pattern.startsWith(".")) return hostname.endsWith(pattern) || hostname === pattern.slice(1);
-    return hostname === pattern || hostname.endsWith(`.${pattern}`);
-  });
-}
-
-/**
- * Get proxy URL from environment
- */
-function getEnvProxyUrl(targetUrl) {
-  const noProxy = process.env.NO_PROXY || process.env.no_proxy;
-  if (shouldBypassByNoProxy(targetUrl, noProxy)) return null;
-
-  let protocol;
-  try { protocol = new URL(targetUrl).protocol; } catch { return null; }
-
-  if (protocol === "https:") {
-    return process.env.HTTPS_PROXY || process.env.https_proxy ||
-      process.env.ALL_PROXY || process.env.all_proxy;
-  }
-
-  return process.env.HTTP_PROXY || process.env.http_proxy ||
-    process.env.ALL_PROXY || process.env.all_proxy;
-}
-
-/**
- * Normalize proxy URL (allow host:port)
- */
-function normalizeProxyUrl(proxyUrl) {
-  const normalizedInput = normalizeString(proxyUrl);
-  if (!normalizedInput) return null;
-
-  try {
-
-    new URL(normalizedInput);
-    return normalizedInput;
-  } catch {
-    // Allow "127.0.0.1:7890" style values
-    return `http://${normalizedInput}`;
-  }
-}
-
-function resolveConnectionProxyUrl(targetUrl, proxyOptions) {
-  const enabled = proxyOptions?.enabled === true || proxyOptions?.connectionProxyEnabled === true;
-  if (!enabled) return null;
-
-  const proxyUrlRaw = normalizeString(proxyOptions?.url ?? proxyOptions?.connectionProxyUrl);
-  if (!proxyUrlRaw) return null;
-
-  const noProxy = normalizeString(proxyOptions?.noProxy ?? proxyOptions?.connectionNoProxy);
-  if (noProxy && shouldBypassByNoProxy(targetUrl, noProxy)) return null;
-
-  return normalizeProxyUrl(proxyUrlRaw);
-}
-
-/**
- * Create proxy dispatcher lazily (undici-compatible)
- */
-async function getDispatcher(proxyUrl) {
-  const normalized = normalizeProxyUrl(proxyUrl);
-  if (!normalized) return null;
-
-  if (!proxyDispatchers.has(normalized)) {
-    // Evict oldest entry if max size reached
-    if (proxyDispatchers.size >= MEMORY_CONFIG.proxyDispatchersMaxSize) {
-      proxyDispatchers.delete(proxyDispatchers.keys().next().value);
-    }
-    const { ProxyAgent } = await import("undici");
-    proxyDispatchers.set(normalized, new ProxyAgent({ uri: normalized }));
-  }
-
-  return proxyDispatchers.get(normalized);
-}
-
-/**
- * Create HTTPS request with manual socket connection (bypass DNS)
- */
-async function createBypassRequest(parsedUrl, realIP, options) {
-  const httpsModule = await import("https");
-  const netModule = await import("net");
-  // CJS modules expose exports via .default in ESM dynamic import context
-  const https = httpsModule.default ?? httpsModule;
-  const net = netModule.default ?? netModule;
-
-  return new Promise((resolve, reject) => {
-    const socket = new net.Socket();
-
-    socket.connect(HTTPS_PORT, realIP, () => {
-      const reqOptions = {
-        socket,
-        // SNI + cert hostname are validated against the hostname the caller
-        // asked for, not the IP we connected to. This keeps the DNS-bypass
-        // (avoiding /etc/hosts MITM) while still rejecting on-path attackers
-        // that present a different cert. The MITM_BYPASS_HOSTS targets are
-        // all public-CA-issued (Google / GitHub / AWS / Cursor) so default
-        // verification works without any extra trust store.
-        servername: parsedUrl.hostname,
-        path: parsedUrl.pathname + parsedUrl.search,
-        method: options.method || "POST",
-        headers: {
-          ...options.headers,
-          Host: parsedUrl.hostname,
-        },
-      };
-
-      const req = https.request(reqOptions, (res) => {
-        const response = {
-          ok: res.statusCode >= HTTP_SUCCESS_MIN && res.statusCode < HTTP_SUCCESS_MAX,
-          status: res.statusCode,
-          statusText: res.statusMessage,
-          headers: new Map(Object.entries(res.headers)),
-          body: Readable.toWeb(res),
-          text: async () => {
-            const chunks = [];
-            for await (const chunk of res) chunks.push(chunk);
-            return Buffer.concat(chunks).toString();
-          },
-          json: async () => JSON.parse(await response.text()),
-        };
-        resolve(response);
-      });
-
-      req.on("error", reject);
-      if (options.body) {
-        req.write(typeof options.body === "string" ? options.body : JSON.stringify(options.body));
-      }
-      req.end();
-    });
-
-    socket.on("error", reject);
-  });
-}
-
-export async function proxyAwareFetch(url, options = {}, proxyOptions = null) {
-  const targetUrl = typeof url === "string" ? url : url.toString();
-
-  // Vercel relay: forward request via relay headers
-  const vercelRelayUrl = normalizeString(proxyOptions?.vercelRelayUrl);
-  if (vercelRelayUrl) {
-    const parsed = new URL(targetUrl);
-    const relayHeaders = {
-      ...options.headers,
-      "x-relay-target": `${parsed.protocol}//${parsed.host}`,
-      "x-relay-path": `${parsed.pathname}${parsed.search}`,
-    };
-    return originalFetch(vercelRelayUrl, { ...options, headers: relayHeaders });
-  }
-
-  const connectionProxyUrl = resolveConnectionProxyUrl(targetUrl, proxyOptions);
-  const envProxyUrl = connectionProxyUrl ? null : normalizeProxyUrl(getEnvProxyUrl(targetUrl));
-  const proxyUrl = connectionProxyUrl || envProxyUrl;
-
-  // MITM DNS bypass: for known MITM-intercepted hosts, resolve real IP to avoid DNS spoof
-  if (shouldBypassMitmDns(targetUrl)) {
-    if (proxyUrl) {
-      // Proxy resolves DNS externally (not affected by /etc/hosts) — use proxy directly
-      try {
-        const dispatcher = await getDispatcher(proxyUrl);
-        return await originalFetch(url, { ...options, dispatcher });
-      } catch (proxyError) {
-        if (proxyOptions?.strictProxy === true) {
-          throw new Error(`[ProxyFetch] Proxy required but failed (strictProxy=true): ${proxyError.message}`);
-        }
-        console.warn(`[ProxyFetch] Proxy failed, falling back to direct bypass: ${proxyError.message}`);
-      }
-    }
-    // No proxy — manually resolve real IP to bypass DNS spoof
-    try {
-      const parsedUrl = new URL(targetUrl);
-      const realIP = await resolveRealIP(parsedUrl.hostname);
-      if (realIP) return await createBypassRequest(parsedUrl, realIP, options);
-    } catch (error) {
-      console.warn(`[ProxyFetch] MITM bypass failed: ${error.message}`);
-    }
-  }
-
-  if (proxyUrl) {
-    try {
-      const dispatcher = await getDispatcher(proxyUrl);
-      return await originalFetch(url, { ...options, dispatcher });
-    } catch (proxyError) {
-      // If strictProxy is enabled, fail hard instead of falling back to direct
-      if (proxyOptions?.strictProxy === true) {
-        throw new Error(`[ProxyFetch] Proxy required but failed (strictProxy=true): ${proxyError.message}`);
-      }
-      console.warn(`[ProxyFetch] Proxy failed, falling back to direct: ${proxyError.message}`);
-      return originalFetch(url, options);
-    }
-  }
-
-  // got-scraping disabled — use native fetch directly
-  // (Re-enable per-host by wrapping with tryGotScrapingFetch when needed)
-  return originalFetch(url, options);
-}
-
-/**
- * Patched global fetch with env-proxy support and MITM DNS bypass
- */
-async function patchedFetch(url, options = {}) {
-  return proxyAwareFetch(url, options, null);
-}
-
-// Idempotency guard — only patch once to avoid wrapping multiple times
-if (globalThis.fetch !== patchedFetch) {
-  globalThis.fetch = patchedFetch;
-}
-
-export default patchedFetch;

package/open-sse/utils/reasoningContentInjector.js

@@ -1,79 +0,0 @@
-// Some thinking-mode providers (DeepSeek, Kimi, MiniMax, ...) require reasoning_content
-// to be echoed back on assistant messages. Clients in OpenAI format don't send it,
-// so we inject a non-empty placeholder to satisfy upstream validation.
-
-const PLACEHOLDER = " ";
-
-// Provider-level rules: keyed by executor.provider
-const PROVIDER_RULES = {
-  deepseek: { scope: "all" },
-  minimax: { scope: "all" },
-  "minimax-cn": { scope: "all" }
-};
-
-// Model-level rules: matched by predicate against model id
-const MODEL_RULES = [
-  { match: m => /^kimi-/i.test(m || ""), scope: "toolCalls" },
-  { match: m => /deepseek/i.test(m || ""), scope: "all" }
-];
-
-const DEEPSEEK_V4_PRO = "deepseek-v4-pro";
-const DEEPSEEK_V4_PRO_ALIASES = {
-  [`${DEEPSEEK_V4_PRO}-max`]: {
-    thinkingType: "enabled",
-    reasoningEffort: "max"
-  },
-  [`${DEEPSEEK_V4_PRO}-none`]: {
-    thinkingType: "disabled",
-    reasoningEffort: null
-  }
-};
-
-function shouldInject(message, scope) {
-  if (message?.role !== "assistant") return false;
-  const rc = message.reasoning_content;
-  if (typeof rc === "string" && rc.length > 0) return false;
-  if (scope === "toolCalls") return Array.isArray(message.tool_calls) && message.tool_calls.length > 0;
-  return true;
-}
-
-function applyRule(body, rule) {
-  if (!rule || !body?.messages) return body;
-  const messages = body.messages.map(m =>
-    shouldInject(m, rule.scope) ? { ...m, reasoning_content: PLACEHOLDER } : m
-  );
-  return { ...body, messages };
-}
-
-function applyDeepSeekV4ProAlias({ provider, model, body }) {
-  const alias = DEEPSEEK_V4_PRO_ALIASES[model];
-  if (provider !== "deepseek" || !alias || !body) return body;
-
-  const nextBody = {
-    ...body,
-    model: DEEPSEEK_V4_PRO,
-    extra_body: {
-      ...(body.extra_body || {}),
-      thinking: {
-        ...(body.extra_body?.thinking || {}),
-        type: alias.thinkingType
-      }
-    }
-  };
-
-  if (alias.reasoningEffort) {
-    nextBody.reasoning_effort = alias.reasoningEffort;
-  } else {
-    delete nextBody.reasoning_effort;
-  }
-
-  return nextBody;
-}
-
-export function injectReasoningContent({ provider, model, body }) {
-  const providerRule = PROVIDER_RULES[provider];
-  const modelRule = MODEL_RULES.find(r => r.match(model));
-  const rule = providerRule || modelRule;
-  const nextBody = applyDeepSeekV4ProAlias({ provider, model, body });
-  return applyRule(nextBody, rule);
-}