Creepso/webstreamr-github
1
0
Fork 0
Code Issues 27 Pull requests 7 Projects Releases 240 Packages Wiki Activity Actions

fix: use axios proxy config properly

Browse source
This commit is contained in:
WebStreamr 2025-11-29 12:31:31 +00:00
parent 67d0508fd7
commit b7930014ab
No known key found for this signature in database
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/utils/Fetcher.ts
View file

@ -37,6 +37,8 @@ interface FlareSolverrResult {
version: string;
}
type ProxyConfig = Pick<AxiosRequestConfig, 'httpAgent' | 'httpsAgent' | 'proxy'>;
export type CustomRequestConfig = AxiosRequestConfig & {
minCacheTtl?: number;
queueLimit?: number;
@ -56,8 +58,7 @@ export class Fetcher {
private readonly axios: AxiosInstance;
private readonly logger: winston.Logger;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
private readonly proxyAgents = new Map<string, Record<'httpAgent' | 'httpsAgent', any>>();
private readonly proxyConfig = new Map<string, ProxyConfig>();
private readonly rateLimitedCache = new Cacheable({ primary: new Keyv({ store: new CacheableMemory({ lruSize: 1024 }) }) });
private readonly semaphores = new Map<string, SemaphoreInterface>();
private readonly hostUserAgentMap = new Map<string, string>();
@ -166,9 +167,9 @@ export class Fetcher {
'X-Forwarded-Proto': forwardedProto,
'X-Real-IP': ctx.ip,
}),
...(proxyUrl && this.getProxyAgents(proxyUrl)),
...requestConfig?.headers,
},
...(proxyUrl && this.getProxyConfig(proxyUrl)),
url: finalUrl.href,
timeout: this.DEFAULT_TIMEOUT,
transformResponse: [data => data],
@ -344,19 +345,19 @@ export class Fetcher {
return undefined;
}
// eslint-disable-next-line @typescript-eslint/no-explicit-any
private getProxyAgents(proxyUrl: URL): Record<'httpAgent' | 'httpsAgent', any> {
let proxyAgents = this.proxyAgents.get(proxyUrl.href);
private getProxyConfig(proxyUrl: URL): ProxyConfig {
let proxyConfig = this.proxyConfig.get(proxyUrl.href);
if (!proxyAgents) {
proxyAgents = {
if (!proxyConfig) {
proxyConfig = {
httpAgent: proxyUrl.protocol === 'socks5:' ? new SocksProxyAgent(proxyUrl) : new HttpProxyAgent(proxyUrl),
httpsAgent: proxyUrl.protocol === 'socks5:' ? new SocksProxyAgent(proxyUrl) : new HttpsProxyAgent(proxyUrl),
proxy: false,
};
this.proxyAgents.set(proxyUrl.href, proxyAgents);
this.proxyConfig.set(proxyUrl.href, proxyConfig);
}
return proxyAgents;
return proxyConfig;
}
}