NeoAnd/evolution-api
1
0
Fork 0
mirror of https://github.com/EvolutionAPI/evolution-api.git synced 2025-12-09 01:49:37 -06:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

refactor(utils): improve makeProxyAgent for Undici compatibility

Browse Source
This commit is contained in:
ricael 2025-10-30 10:55:47 -03:00
parent 503cbfb21c
commit a84faaa575
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/utils/makeProxyAgent.ts
View File

@ -1,7 +1,6 @@
import { HttpsProxyAgent } from 'https-proxy-agent'; import { HttpsProxyAgent } from 'https-proxy-agent';
import { SocksProxyAgent } from 'socks-proxy-agent'; import { SocksProxyAgent } from 'socks-proxy-agent';
import { ProxyAgent } from 'undici';
import { ProxyAgent } from 'undici'
type Proxy = { type Proxy = {
host: string; host: string;
@ -46,38 +45,38 @@ export function makeProxyAgent(proxy: Proxy | string): HttpsProxyAgent<string> |
} }
export function makeProxyAgentUndici(proxy: Proxy | string): ProxyAgent { export function makeProxyAgentUndici(proxy: Proxy | string): ProxyAgent {
let proxyUrl: string let proxyUrl: string;
let protocol: string let protocol: string;
if (typeof proxy === 'string') { if (typeof proxy === 'string') {
const url = new URL(proxy) const url = new URL(proxy);
protocol = url.protocol.replace(':', '') protocol = url.protocol.replace(':', '');
proxyUrl = proxy proxyUrl = proxy;
} else { } else {
const { host, password, port, protocol: proto, username } = proxy const { host, password, port, protocol: proto, username } = proxy;
protocol = (proto || 'http').replace(':', '') protocol = (proto || 'http').replace(':', '');
if (protocol === 'socks') { if (protocol === 'socks') {
protocol = 'socks5' protocol = 'socks5';
} }
const auth = username && password ? `${username}:${password}@` : '' const auth = username && password ? `${username}:${password}@` : '';
proxyUrl = `${protocol}://${auth}${host}:${port}` proxyUrl = `${protocol}://${auth}${host}:${port}`;
} }
const PROXY_HTTP_PROTOCOL = 'http' const PROXY_HTTP_PROTOCOL = 'http';
const PROXY_HTTPS_PROTOCOL = 'https' const PROXY_HTTPS_PROTOCOL = 'https';
const PROXY_SOCKS4_PROTOCOL = 'socks4' const PROXY_SOCKS4_PROTOCOL = 'socks4';
const PROXY_SOCKS5_PROTOCOL = 'socks5' const PROXY_SOCKS5_PROTOCOL = 'socks5';
switch (protocol) { switch (protocol) {
case PROXY_HTTP_PROTOCOL: case PROXY_HTTP_PROTOCOL:
case PROXY_HTTPS_PROTOCOL: case PROXY_HTTPS_PROTOCOL:
case PROXY_SOCKS4_PROTOCOL: case PROXY_SOCKS4_PROTOCOL:
case PROXY_SOCKS5_PROTOCOL: case PROXY_SOCKS5_PROTOCOL:
return new ProxyAgent(proxyUrl) return new ProxyAgent(proxyUrl);
default: default:
throw new Error(`Unsupported proxy protocol: ${protocol}`) throw new Error(`Unsupported proxy protocol: ${protocol}`);
} }
} }