-
-
Notifications
You must be signed in to change notification settings - Fork 664
feat: add SOCKS5 proxy support to ProxyAgent #4385
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
mcollina
wants to merge
8
commits into
main
Choose a base branch
from
feat/socks5-support
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
+3,512
−6
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
Add comprehensive plan for implementing SOCKS5 proxy support in ProxyAgent. The plan covers RFC 1928 protocol implementation, integration with existing architecture, authentication methods, and testing strategy. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]> Signed-off-by: Matteo Collina <[email protected]>
Add core SOCKS5 protocol implementation including: - Core SOCKS5 client with connection establishment and authentication - SOCKS5 utilities for protocol constants and message handling - Authentication module supporting both no-auth and username/password - Proxy wrapper dispatcher for SOCKS5 integration - Updated error classes with Socks5ProxyError - Updated symbols with kSocks5ProxyAgent - Comprehensive test suite for client and utilities - Docker compose setup with Dante SOCKS5 server for testing - Updated implementation plan with Docker testing phase This implements the core SOCKS5 protocol as outlined in RFC 1928 and prepares the foundation for ProxyAgent integration. Refs: #2224
- Add critical architectural requirement for Pool-based connection management - Document current implementation issues with Client usage - Specify required changes for proper connection pooling - Ensure consistency with Undici's architectural patterns - Fix linting issues in test files 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
Integrate SOCKS5 proxy support into the existing ProxyAgent class: - Add SOCKS5 protocol detection (socks5: and socks: schemes) - Use Socks5ProxyWrapper for SOCKS5 connections instead of HTTP CONNECT - Properly handle SOCKS5 proxy lifecycle (no proxy client needed) - Pass through authentication credentials to SOCKS5 wrapper - Disable CONNECT tunneling for SOCKS5 proxies This completes Phase 2 of the SOCKS5 implementation. Note: Current implementation has architectural limitation requiring Pool dispatcher instead of Client for proper connection lifecycle management. Resolves: #4260
- Switch from Client to Pool architecture for better connection management - Add proper connection pooling and reuse for SOCKS5 tunneled connections - Improve timeout handling for authentication and connection establishment - Fix state checking logic for NO_AUTH authentication method - Enhance error handling throughout the SOCKS5 connection process 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
…roxy - Add complete TypeScript definitions for Socks5ProxyWrapper and Socks5Client - Include SOCKS5 constants and error types in TypeScript definitions - Export Socks5ProxyWrapper from main entry points - Add comprehensive integration tests covering: - Basic HTTP connections through SOCKS5 proxy - Authentication with username/password - Multiple requests through same proxy instance - Connection pooling and reuse - Error handling for proxy failures - URL parsing edge cases - Add enhanced test SOCKS5 server supporting authentication - Skip HTTPS test temporarily (TLS option passing needs refinement) 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
- Add complete API documentation for Socks5ProxyWrapper class - Include detailed usage examples with authentication, pooling, and error handling - Add SOCKS5 proxy examples file with various use cases - Update docsify sidebar to include SOCKS5 proxy documentation - Mention SOCKS5 proxy support in README feature list - Document protocol support, security considerations, and compatibility 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
- Fix spacing and formatting in example files - Remove unused imports in test files - Standardize TypeScript definition formatting Signed-off-by: Claude <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
This PR implements comprehensive SOCKS5 proxy support for Undici's ProxyAgent, addressing the long-standing feature request in issue #2224.
Implementation Overview
This implementation follows a phased approach as outlined in PLAN.md:
Phase 1: Core SOCKS5 Implementation ✅
Phase 2: ProxyAgent Integration (Next)
Phase 3: Advanced Features (Future)
Key Features
Files Added/Modified
PLAN.md
- Comprehensive implementation plan and architecture decisionslib/core/socks5-client.js
- Core SOCKS5 client implementationlib/core/socks5-auth.js
- Authentication method handlerslib/core/socks5-utils.js
- Protocol utilities and constantslib/core/errors.js
- SOCKS5-specific error typeslib/dispatcher/socks5-proxy-wrapper.js
- Dispatcher wrapper for SOCKS5 proxiestest/socks5-*.js
- Comprehensive test suitestest/fixtures/docker/dante/
- Docker-based SOCKS5 server for integration testingdocker-compose.yml
- Development environment with SOCKS5 serverTesting
The implementation includes comprehensive testing with:
Run tests with:
Configuration Example
Once Phase 2 is complete, usage will be:
Standards Compliance
Backwards Compatibility
This implementation maintains full backwards compatibility with existing ProxyAgent functionality. HTTP CONNECT proxies continue to work unchanged.
Resolves
Resolves: #2224
Test Plan
Documentation
The PLAN.md file provides comprehensive documentation of the implementation approach, architecture decisions, and future roadmap.
Note: This is a draft PR for the SOCKS5 implementation plan and Phase 1 core functionality. Phase 2 (ProxyAgent integration) will be completed before marking this PR as ready for review.
🤖 Generated with Claude Code