Fix merge #2155
Merged
Fix merge #2155
+53
−3
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Updated subproject reference in evolution-manager-v2. - Replaced old JavaScript and CSS asset files with new versions for improved performance and styling. - Added new CSS file for consistent font styling across the application. - Updated the evolution logo image to the latest version.
- Added features for Chatwoot enhancements, participants data handling, and LID to phone number conversion. - Updated Docker configurations to include Kafka and frontend services. - Fixed PostgreSQL migration errors and improved message handling in Baileys and Chatwoot services. - Refactored TypeScript build process and implemented exponential backoff patterns.
- Updated the release date for version 2.3.5 to 2025-10-15. - Adjusted subproject reference in evolution-manager-v2 to the latest commit.
- Integrated telemetry logging for received messages in Evolution, WhatsApp Business, and Baileys services. - Enhanced message tracking by sending the message type to the telemetry system for better observability.
- Updated subproject reference in evolution-manager-v2 to the latest commit. - Enhanced the manager_install.sh script to include npm install and build steps for the evolution-manager-v2. - Replaced old JavaScript asset file with a new version for improved performance. - Added a new CSS file for consistent styling across the application.
…ici como implementação nativa de fetch(), e o Undici não aceita mais objetos agent tradicionais (como os criados por https-proxy-agent ou socks-proxy-agent). Ele espera objetos compatíveis com a interface moderna Dispatcher, que possuem o método dispatch(). Ou seja, o Baileys estava recebendo um tipo de agente incompatível com o novo sistema de rede do Node. Foi criada uma nova função makeProxyAgentUndici() para gerar agentes de proxy compatíveis com o Undici, mantendo a versão antiga (makeProxyAgent()) inalterada para compatibilidade com bibliotecas como Axios. A nova função substitui os antigos HttpsProxyAgent e SocksProxyAgent por ProxyAgent da biblioteca undici, garantindo compatibilidade total com o Baileys e com qualquer uso de fetch() moderno.
…upload-failed-on-all-hosts fix: "Media upload failed on all hosts" utilizando proxy
Contributor
Reviewer's GuideThis PR adds a new undici-based proxy agent factory, integrates it into the WhatsApp Baileys service for fetch requests, and updates project dependencies to include undici. Sequence diagram for proxy agent selection in BaileysStartupServicesequenceDiagram
participant BaileysStartupService
participant ProxyAgentFactory
participant UndiciProxyAgentFactory
BaileysStartupService->>ProxyAgentFactory: makeProxyAgent(proxyUrl)
BaileysStartupService->>UndiciProxyAgentFactory: makeProxyAgentUndici(proxyUrl)
Note over BaileysStartupService,UndiciProxyAgentFactory: fetchAgent now uses Undici-based proxy agent
Class diagram for new and updated proxy agent factoriesclassDiagram
class makeProxyAgent {
+makeProxyAgent(proxy: Proxy | string): HttpsProxyAgent<string>
}
class makeProxyAgentUndici {
+makeProxyAgentUndici(proxy: Proxy | string): ProxyAgent
}
class Proxy {
+host: string
+port: number
+protocol: string
+username: string
+password: string
}
makeProxyAgentUndici --> Proxy
makeProxyAgent --> Proxy
Class diagram for BaileysStartupService proxy agent usage updateclassDiagram
class BaileysStartupService {
+options: agent
+options: fetchAgent
+localProxy: enabled
+localProxy: host
+localProxy: port
+localProxy: protocol
+localProxy: username
+localProxy: password
}
class makeProxyAgent {
+makeProxyAgent(proxy: Proxy | string): HttpsProxyAgent<string>
}
class makeProxyAgentUndici {
+makeProxyAgentUndici(proxy: Proxy | string): ProxyAgent
}
BaileysStartupService --> makeProxyAgent : uses for agent
BaileysStartupService --> makeProxyAgentUndici : uses for fetchAgent
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Hey there - I've reviewed your changes and they look great!
Prompt for AI Agents
Please address the comments from this code review:
## Individual Comments
### Comment 1
<location> `src/utils/makeProxyAgent.ts:58-62` </location>
<code_context>
+ const { host, password, port, protocol: proto, username } = proxy
+ protocol = (proto || 'http').replace(':', '')
+
+ if (protocol === 'socks') {
+ protocol = 'socks5'
+ }
+
</code_context>
<issue_to_address>
**suggestion:** Protocol normalization for 'socks' is hardcoded to 'socks5'.
Some proxies use 'socks4', so please handle 'socks4' explicitly or document that 'socks' defaults to 'socks5'.
```suggestion
protocol = (proto || 'http').replace(':', '')
// Normalize SOCKS protocol: 'socks' defaults to 'socks5', but handle 'socks4' and 'socks5' explicitly
if (protocol === 'socks') {
// Default to socks5 if protocol is 'socks'
protocol = 'socks5'
} else if (protocol === 'socks4' || protocol === 'socks5') {
// Leave as is for explicit socks4/socks5
// No change needed
}
```
</issue_to_address>
### Comment 2
<location> `src/utils/makeProxyAgent.ts:80-81` </location>
<code_context>
+ return new ProxyAgent(proxyUrl)
+
+ default:
+ throw new Error(`Unsupported proxy protocol: ${protocol}`)
+ }
+}
</code_context>
<issue_to_address>
**suggestion:** Error message for unsupported protocol could be more informative.
Including the full proxy input in the error message will make it easier to trace issues when user input is involved.
```suggestion
default:
throw new Error(
`Unsupported proxy protocol: ${protocol}. Full proxy input: ${typeof proxy === 'string' ? proxy : JSON.stringify(proxy)}`
)
```
</issue_to_address>Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
Comment on lines
+58
to
+62
| protocol = (proto || 'http').replace(':', '') | ||
|
|
||
| if (protocol === 'socks') { | ||
| protocol = 'socks5' | ||
| } |
Contributor
There was a problem hiding this comment.
suggestion: Protocol normalization for 'socks' is hardcoded to 'socks5'.
Some proxies use 'socks4', so please handle 'socks4' explicitly or document that 'socks' defaults to 'socks5'.
Suggested change
| protocol = (proto || 'http').replace(':', '') | |
| if (protocol === 'socks') { | |
| protocol = 'socks5' | |
| } | |
| protocol = (proto || 'http').replace(':', '') | |
| // Normalize SOCKS protocol: 'socks' defaults to 'socks5', but handle 'socks4' and 'socks5' explicitly | |
| if (protocol === 'socks') { | |
| // Default to socks5 if protocol is 'socks' | |
| protocol = 'socks5' | |
| } else if (protocol === 'socks4' || protocol === 'socks5') { | |
| // Leave as is for explicit socks4/socks5 | |
| // No change needed | |
| } |
Comment on lines
+80
to
+81
| default: | ||
| throw new Error(`Unsupported proxy protocol: ${protocol}`) |
Contributor
There was a problem hiding this comment.
suggestion: Error message for unsupported protocol could be more informative.
Including the full proxy input in the error message will make it easier to trace issues when user input is involved.
Suggested change
| default: | |
| throw new Error(`Unsupported proxy protocol: ${protocol}`) | |
| default: | |
| throw new Error( | |
| `Unsupported proxy protocol: ${protocol}. Full proxy input: ${typeof proxy === 'string' ? proxy : JSON.stringify(proxy)}` | |
| ) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
📋 Description
🔗 Related Issue
Closes #(issue_number)
🧪 Type of Change
🧪 Testing
📸 Screenshots (if applicable)
✅ Checklist
📝 Additional Notes
Summary by Sourcery
Introduce an undici-based proxy agent utility and integrate it into the WhatsApp Baileys service for improved proxy handling
New Features:
Enhancements:
Build: