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

Remove unused dependencies and refactor proxy handling

Browse Source 
In some tests made on the testProxy function, the `new ProxyAgent()` was not working, even adding it the IP result was the same.

I've change it to the `new HttpsProxyAgent()` and it worked.

Refactored the proxy agent to center the same function/creation the same where it is used
This commit is contained in:
Judson Junior
2024-01-21 13:54:42 -03:00
parent 82e111f1be
commit 5292e569d9
4 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/whatsapp/controllers/proxy.controller.ts
View File

@@ -1,8 +1,8 @@
import axios from 'axios';
import { HttpsProxyAgent } from 'https-proxy-agent';
import { Logger } from '../../config/logger.config';
import { BadRequestException, NotFoundException } from '../../exceptions';
import { makeProxyAgent } from '../../utils/makeProxyAgent';
import { InstanceDto } from '../dto/instance.dto';
import { ProxyDto } from '../dto/proxy.dto';
import { WAMonitoringService } from '../services/monitor.service';
@@ -27,8 +27,7 @@ export class ProxyController {
if (data.proxy) {
logger.verbose('proxy enabled');
const { host, port, protocol, username, password } = data.proxy;
const testProxy = await this.testProxy(host, port, protocol, username, password);
const testProxy = await this.testProxy(data.proxy);
if (!testProxy) {
throw new BadRequestException('Invalid proxy');
}
@@ -47,18 +46,12 @@ export class ProxyController {
return this.proxyService.find(instance);
}
private async testProxy(host: string, port: string, protocol: string, username?: string, password?: string) {
private async testProxy(proxy: ProxyDto['proxy']) {
logger.verbose('requested testProxy');
try {
let proxyUrl = `${protocol}://${host}:${port}`;
if (username && password) {
proxyUrl = `${protocol}://${username}:${password}@${host}:${port}`;
}
const serverIp = await axios.get('https://icanhazip.com/');
const response = await axios.get('https://icanhazip.com/', {
httpsAgent: new HttpsProxyAgent(proxyUrl),
httpsAgent: makeProxyAgent(proxy),
});
logger.verbose('testProxy response: ' + response.data);