mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-09-14 02:42:24 +03:00
Production (open-sse/utils/socksConnectorWithFamily.ts, 4 sites): every cast was redundant — undici's buildConnector.BuildOptions already has `timeout?: number | null`, socks' SocksClientOptions has `timeout?: number`, and Agent.Options' `connect` / `connectTimeout` narrow to the connector's parameter types on their own. Behaviour unchanged; check:open-sse-typecheck stays at the frozen 5. Tests (51 sites): the socks-timeout mocks now carry the real types — the patched SocksClient.createConnection is typed as the static it replaces, the fake buildConnector returns buildConnector.connector, the proxy is a SocksProxy, the dynamic import is typed as the module it loads; the e2e suite passes a SocksProxy and Agent.Options and no longer casts undici's fetch init (its RequestInit already has `dispatcher`); the isFree suites narrow getCustomModels()' JSON to a declared row shape, feed deliberately-wrong values through `unknown`, and stop casting for zod's safeParse, which takes unknown. The six files' suppression entries are removed: 1238 → 1232 files, 5487 → 5432 suppressed. ESLint without the suppressions file reports 0 problems on all six; with it, no stale entry is left. The five suites pass (4, 2, 5, 4, 4).
105 lines
4.2 KiB
TypeScript
105 lines
4.2 KiB
TypeScript
import { Agent, buildConnector, type Dispatcher } from "undici";
|
|
import { SocksClient, type SocksProxy } from "socks";
|
|
|
|
const DEFAULT_SOCKS_HANDSHAKE_TIMEOUT_MS = 10_000;
|
|
const MAX_SOCKS_HANDSHAKE_TIMEOUT_MS = 120_000;
|
|
|
|
/**
|
|
* Resolve the SOCKS5 handshake (connect) timeout, operator-tunable via
|
|
* `SOCKS_HANDSHAKE_TIMEOUT_MS` (#5109). Under a saturated per-host pool the real
|
|
* handshake to a residential gateway can exceed the 10s default even though the
|
|
* proxy is reachable, so high-concurrency deployments can raise it without a
|
|
* code change. Invalid / non-positive values fall back to the default; values
|
|
* above the ceiling are clamped.
|
|
*/
|
|
export function resolveSocksHandshakeTimeoutMs(
|
|
env: Record<string, string | undefined> = process.env
|
|
): number {
|
|
const raw = env.SOCKS_HANDSHAKE_TIMEOUT_MS;
|
|
if (raw == null || raw.trim() === "") return DEFAULT_SOCKS_HANDSHAKE_TIMEOUT_MS;
|
|
const parsed = Number(raw);
|
|
if (!Number.isFinite(parsed) || parsed < 1) return DEFAULT_SOCKS_HANDSHAKE_TIMEOUT_MS;
|
|
return Math.min(Math.floor(parsed), MAX_SOCKS_HANDSHAKE_TIMEOUT_MS);
|
|
}
|
|
|
|
/** The net.connect family options pinned for the SOCKS proxy hop. */
|
|
export function buildSocksFamilySocketOptions(family: 4 | 6 | null): Record<string, unknown> {
|
|
if (family === 6) return { family: 6, autoSelectFamily: false };
|
|
if (family === 4) return { family: 4, autoSelectFamily: false };
|
|
return {};
|
|
}
|
|
|
|
function resolvePort(protocol: string, port: string): number {
|
|
return port ? Number.parseInt(port, 10) : protocol === "http:" ? 80 : 443;
|
|
}
|
|
|
|
/**
|
|
* Undici connector that tunnels through a single SOCKS5 proxy, pinning the family
|
|
* of the TCP connection to the proxy host when `family` is set. Mirrors fetch-socks'
|
|
* socksConnector but threads `socket_options` (which fetch-socks does not expose)
|
|
* into SocksClient so Happy Eyeballs cannot pick IPv4 for an IPv6-only egress policy.
|
|
*/
|
|
export function socksConnectorWithFamily(
|
|
proxy: SocksProxy,
|
|
family: 4 | 6 | null,
|
|
tlsOpts: buildConnector.BuildOptions = {},
|
|
connectTimeout?: number,
|
|
_buildConnectorForTest?: typeof buildConnector
|
|
): buildConnector.connector {
|
|
const isDisabled = connectTimeout === 0;
|
|
// SOCKS lib: 0 throws (isValidTimeoutValue: value>0) and undefined → DEFAULT_TIMEOUT 30s;
|
|
// undici: 0 disables (core/util.js: if (!opts.timeout) return noop), undefined → 10s. Divergence intentional.
|
|
const handshakeTimeout = isDisabled
|
|
? undefined
|
|
: (connectTimeout ?? resolveSocksHandshakeTimeoutMs());
|
|
const tlsTimeout = connectTimeout;
|
|
// Sequential budget: both phases bounded by the same connectTimeout → wall-time up to 60s for https
|
|
// (vs 30s direct). Shared-deadline alternative rejected as unjustified complexity.
|
|
const build = _buildConnectorForTest ?? buildConnector;
|
|
const undiciConnect = build(
|
|
tlsTimeout !== undefined ? { ...tlsOpts, timeout: tlsTimeout } : tlsOpts
|
|
);
|
|
const socketOptions = buildSocksFamilySocketOptions(family);
|
|
return async (options, callback) => {
|
|
const { protocol, hostname, port, httpSocket } = options as unknown as {
|
|
protocol: string;
|
|
hostname: string;
|
|
port: string;
|
|
httpSocket?: unknown;
|
|
};
|
|
try {
|
|
const r = await SocksClient.createConnection({
|
|
command: "connect",
|
|
proxy,
|
|
timeout: handshakeTimeout,
|
|
destination: { host: hostname, port: resolvePort(protocol, port) },
|
|
existing_socket: httpSocket as never,
|
|
socket_options: socketOptions as never,
|
|
});
|
|
const sock = r.socket;
|
|
if (protocol !== "https:") {
|
|
return callback(null, (sock as { setNoDelay: () => unknown }).setNoDelay() as never);
|
|
}
|
|
return undiciConnect({ ...options, httpSocket: sock } as never, callback);
|
|
} catch (error) {
|
|
return callback(error as Error, null);
|
|
}
|
|
};
|
|
}
|
|
|
|
/** Build an undici Agent dispatcher that SOCKS5-tunnels with a pinned proxy-hop family. */
|
|
export function createSocksDispatcherWithFamily(
|
|
proxy: SocksProxy,
|
|
family: 4 | 6 | null,
|
|
agentOptions: Agent.Options = {}
|
|
): Dispatcher {
|
|
const { connect, connectTimeout, ...rest } = agentOptions as Agent.Options & {
|
|
connectTimeout?: number;
|
|
connect?: buildConnector.BuildOptions;
|
|
};
|
|
return new Agent({
|
|
...rest,
|
|
connect: socksConnectorWithFamily(proxy, family, connect, connectTimeout),
|
|
});
|
|
}
|