Skip to content

[pull] main from 6Kmfi6HP:main#8

Open
pull[bot] wants to merge 31 commits into
asdf243dsfa:mainfrom
6Kmfi6HP:main
Open

[pull] main from 6Kmfi6HP:main#8
pull[bot] wants to merge 31 commits into
asdf243dsfa:mainfrom
6Kmfi6HP:main

Conversation

@pull

@pull pull Bot commented Jul 27, 2025

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

github-actions Bot and others added 3 commits July 27, 2025 08:51
- Standardized indentation and formatting in the request configuration object.
- Enhanced comments for clarity in the ProtocolOverWSHandler and HandleTCPOutBound functions.
- Minor updates to README.md for better structure and clarity in usage examples and configuration notes.
@pull pull Bot locked and limited conversation to collaborators Jul 27, 2025
@pull pull Bot added ⤵️ pull merge-conflict Resolve conflicts manually labels Jul 27, 2025
6Kmfi6HP and others added 24 commits January 26, 2026 08:19
- Migrate from single index.js to modular src/ structure
- Update to ES modules (type: module) and bump to v2.0.0
- Add esbuild for bundling before obfuscation
- Upgrade Node.js to v22 and wrangler to v4.60.0
- Simplify CI workflow to use npm scripts
When generating config page or subscription, the code was directly
using the PROXYIP environment variable, ignoring the URL parameter.

Now the priority is: URL parameter > environment variable > default.

Fixes #265
Fix URL parameter 'proxyip' not overriding environment variable
The .gitignore rule 'socks5.js' was accidentally ignoring
src/proxy/socks5.js, preventing it from being committed.
Changed to '/socks5.js' to only ignore the root-level file.
Fix missing socks5.js module causing CI build failure
…on to v3

- Add Node.js 22 setup step using actions/setup-node@v3
- Upgrade cloudflare/wrangler-action from 2.0.0 to v3
- Fixes: Wrangler requires Node.js v20.0.0+ but action was using v16.20.2
Fix CF Worker CI failure by upgrading Node.js and wrangler-action
- Create README_CN.md for Chinese documentation
- Keep README.md for English documentation
- Both files contain complete project information
- Add cross-links between language versions
- Implement Trojan protocol handler with auto-detection alongside VLESS
- Add HTTP CONNECT proxy support as alternative to SOCKS5
- Support path-based proxy parameters (/socks5://, /http://, /proxyip=)
- Add global proxy mode for routing all traffic through proxy
- Generate Trojan subscription URLs and configuration pages
- Add TROJAN_PASSWORD environment variable (defaults to UUID)
Add support for rotating through multiple proxy addresses when establishing
TCP connections. This enhances reliability by attempting alternative
proxies or falling back to direct connections upon failure.

- Add `PROXY_TIMEOUT` and `PROXY_FALLBACK` configuration options
- Refactor TCP outbound handler to modularize connection strategies
- Implement retry mechanism using proxy rotation logic
- Add fallback to direct connection if proxy rotation fails
- Add VLESS outbound connection module (src/proxy/vless.js) for connecting
  to external VLESS servers via WebSocket
- Add UDP handler (src/proxy/udp-handler.js, src/proxy/udp.js) enabling full
  UDP proxy support when VLESS outbound is configured
- Add VLESS URL parser to support vless:// protocol URLs
- Support multiple configuration methods: URL path (/vless://, /gvless=),
  query parameters (?vless=), and environment variable (VLESS_OUTBOUND)
- Fix ArrayBuffer to Uint8Array conversion for rawClientData handling
- Add detailed logging throughout connection lifecycle for debugging
- Update TCP handler to support VLESS alongside SOCKS5 and HTTP proxies
feat(proxy): add VLESS outbound proxy support with full UDP capability
Add documentation for recently implemented features:
- Trojan protocol support with auto-detection
- HTTP CONNECT proxy as SOCKS5 alternative
- VLESS outbound proxy with full UDP capability
- Multi-proxy rotation and automatic failover
- Path-based proxy parameters (/socks5://, /http://, /vless://)
- New environment variables: TROJAN_PASSWORD, VLESS_OUTBOUND,
  PROXY_TIMEOUT, PROXY_FALLBACK
- Replace socks5_relay query param with globalproxy
The obfuscate workflow now appends the previous commit's message
to its own commit, making it easier to track which changes triggered
each obfuscation.
6Kmfi6HP and others added 4 commits January 26, 2026 17:07
Only trigger the obfuscate workflow when source code files change
(src/**, package.json, package-lock.json), skipping unnecessary runs
for documentation or other non-code changes.
Reflect the addition of Trojan protocol support, UDP handling, and
updated file structure in the project guide. Update configuration
options and request flow description to match current implementation.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

⤵️ pull merge-conflict Resolve conflicts manually

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants