NeoAnd/evolution-api
1
0
Fork 0
mirror of https://github.com/EvolutionAPI/evolution-api.git synced 2026-01-07 04:27:31 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Proxy configuration improvements

Browse Source
This commit is contained in:
Davidson Gomes
2023-12-28 10:35:41 -03:00
parent dfc8330035
commit 7c2a8c0abb
10 changed files with 111 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/whatsapp/services/whatsapp.service.ts
View File

@@ -1369,8 +1369,8 @@ export class WAStartupService {
if (this.localProxy.enabled) {
this.logger.info('Proxy enabled: ' + this.localProxy.proxy);
if (this.localProxy.proxy.includes('proxyscrape')) {
const response = await axios.get(this.localProxy.proxy);
if (this.localProxy.proxy.host.includes('proxyscrape')) {
const response = await axios.get(this.localProxy.proxy.host);
const text = response.data;
const proxyUrls = text.split('\r\n');
const rand = Math.floor(Math.random() * Math.floor(proxyUrls.length));
@@ -1379,8 +1379,15 @@ export class WAStartupService {
agent: new ProxyAgent(proxyUrl as any),
};
} else {
let proxyUri =
this.localProxy.proxy.protocol + '://' + this.localProxy.proxy.host + ':' + this.localProxy.proxy.port;
if (this.localProxy.proxy.username && this.localProxy.proxy.password) {
proxyUri = `${this.localProxy.proxy.username}:${this.localProxy.proxy.password}@${proxyUri}`;
}
options = {
agent: new ProxyAgent(this.localProxy.proxy as any),
agent: new ProxyAgent(proxyUri as any),
};
}
}
@@ -1903,7 +1910,8 @@ export class WAStartupService {
this.logger.verbose('group ignored');
return;
}
if (key.remoteJid !== 'status@broadcast' && !key?.remoteJid?.match(/(:\d+)/)) {
// if (key.remoteJid !== 'status@broadcast' && !key?.remoteJid?.match(/(:\d+)/)) {
if (key.remoteJid !== 'status@broadcast') {
this.logger.verbose('Message update is valid');
let pollUpdates: any;