9ce345eb76
merge: sync upstream/master preserving local changes
2026-04-23 22:27:18 +08:00
fe62542b7c
fix: unify Trojan server_name/allow_insecure to tls_settings across all protocols
2026-04-18 21:00:21 +08:00
da8b5018ea
fix: Shadowrocket Trojan whitelist bug and xhttp support
2026-04-18 16:07:22 +08:00
1708b6564b
feat: add xhttp subscriptions, network monitoring, chart legend toggle and ticket sender labels
2026-04-18 02:02:06 +08:00
994819e8a0
fix(clashmeta): handle associative arrays in block yaml export
2026-04-18 01:50:45 +08:00
4a5091825c
t2
2026-04-18 01:30:24 +08:00
1282e802b5
t
2026-04-18 01:23:46 +08:00
9ca92430ee
fix(clashmeta): render block-style yaml for subscription export
2026-04-18 01:11:11 +08:00
cd5e00bbfb
Merge remote-tracking branch 'upstream/master'
...
# Conflicts:
# public/assets/admin
2026-04-18 00:35:04 +08:00
ecf0a268d3
fix(clashmeta): keep nested proxy objects in block style
2026-04-18 00:31:25 +08:00
e297b5fe9f
feat: machine mode, ECH subscriptions, batch ops & security hardening
2026-04-17 03:02:53 +08:00
edbd8de356
QuantumultX下发Anytls节点 ( #880 )
...
QuantumultX最新版本支持Anytls了，做适配
2026-04-16 19:31:24 +08:00
ec49ba3fd1
Loon和Surfboard适配anytls ( #854 )
...
* Loon适配anytls
* Surfboard适配anytls
Surfboard适配anytls
2026-04-02 15:47:41 +08:00
b7c8b31a91
Merge pull request #856 from NFamou/master
...
支持Surfboard下发SS2022
2026-04-02 15:46:55 +08:00
5f1afe4bdc
feat: add Vless Encryption support
2026-03-30 17:03:37 +08:00
5dd4cd4bc9
fix: replace raw array access with data_get() to prevent Undefined array key
...
- Migrate $protocol_settings['key'] to data_get($protocol_settings, 'key') across General, SingBox, Shadowrocket, Surfboard, QuantumultX
- Prevents PHP 8 Undefined array key fatal errors when optional protocol_settings fields are missing
- Same class of bug that caused #735
2026-03-27 13:51:28 +08:00
7dacb69275
feat: Trojan Reality support and protocol distribution optimizations
2026-03-23 14:56:41 +08:00
ee55d7fa72
fix: fix brutal-opts configure for clashMeta
2026-03-17 12:26:10 +08:00
b55091a066
feat: Refactor uTLS & Multiplex Support, Node Status Push Optimization
...
- Server/ServerSave/Server.php: Unified utls and multiplex schema, validation, and defaults for vmess/vless/trojan/mieru protocols, enabling more flexible protocol configuration.
- Protocols (SingBox/ClashMeta/Shadowrocket/Stash/General): All protocol generators now support utls (client-fingerprint/fp) and multiplex options. Removed getRandFingerprint, replaced with getTlsFingerprint supporting random/custom fingerprints.
- Helper.php: Refactored TLS fingerprint utility to support object/string/random input.
- ServerService: Abstracted updateMetrics method to unify HTTP/WS node status caching logic.
- NodeWebSocketServer: Improved node connection, status push, and full sync logic; adjusted log levels; clarified push logic.
- ServerController: Reused ServerService for node metrics handling, reducing code duplication.
- Docs: Improved aapanel installation docs, added fix for empty admin dashboard.
2026-03-16 23:09:56 +08:00
3d082853d7
feat(ClashMeta): enhance Shadowsocks plugin support
2026-03-15 11:36:43 +08:00
010275b09e
feat: introduce WebSocket sync for XBoard nodes
...
- Implement Workerman-based `xboard:ws-server` for real-time node synchronization.
- Support custom routes, outbounds, and certificate configurations via JSON.
- Optimize scheduled tasks with `lazyById` to minimize memory footprint.
- Enhance reactivity using Observers for `Plan`, `Server`, and `ServerRoute`.
- Expand protocol support for `httpupgrade`, `h2`, and `mieru`.
2026-03-15 09:49:11 +08:00
6efedcebd4
refactor: move subscribe templates to dedicated database table
2026-03-11 05:47:29 +08:00
90f84455d3
feat(surge): add SS2022, SOCKS5, HTTP support
2026-03-09 07:32:51 +08:00
15a7ef4015
fix: always set uTLS fingerprint for TLS connections in General protocol ( #673 )
2026-03-09 06:45:28 +08:00
96cb398315
fix(stash): correct TCP/HTTP network type handling in node generation
2026-03-09 05:39:51 +08:00
a90c5c41ea
Merge pull request #681 from superabbite1/master
...
Update General.php v2rayN新增tuic协议订阅，vless+ws+tls协议新增fingerprint指纹参数
2026-03-09 05:04:50 +08:00
7f5bd7e42b
Merge pull request #703 from kuizw9/master
...
Fix General.php for support AnyTLS and Shadowrocket.php for support Socks Node Name Display
2026-03-09 05:02:07 +08:00
b00b4358e0
Merge pull request #655 from JxQg/jxq_dev
...
Feat: Support VLESS node output for Loon protocol, improve buildVless method template
2026-03-09 04:59:20 +08:00
9c682af44a
feat: add AnyTLS protocol support for Surge
2026-03-09 02:37:32 +08:00
2d8ed35096
Update General.php
...
Add AnyTLS to General Client
2025-10-05 22:34:36 +08:00
ea6bd6fabe
Merge branch 'cedar2025:master' into master
2025-09-27 08:52:25 +08:00
35a9e02b8c
Update Shadowrocket.php
2025-09-24 19:14:34 +08:00
f289f68898
fix: resolve vmess http-opts headers null issue in subscription generation
2025-09-12 10:45:31 +08:00
fa4a84b3e2
Update Shadowrocket.php
...
新增Vless+ws+tls协议 Fingerprint指纹参数
2025-09-09 16:43:42 +08:00
3406448475
Update ClashMeta.php
...
新增vless+ws+tls协议Fingerprint指纹参数
2025-09-09 16:42:11 +08:00
cb07146657
Update General.php
...
vless+ws+tls协议新增fingerprint指纹参数；v2rayN新增tuic协议订阅
2025-09-09 11:35:44 +08:00
3238a83d4e
feat(shadowrocket): support VLESS transports httpupgrade/xhttp/kcp
...
- Add parsing for httpupgrade, xhttp, and kcp in Shadowrocket VLESS builder
- Ensure correct obfs/path/host/mode mapping for Shadowrocket compatibility
2025-09-05 15:22:46 +08:00
777bbb5ae3
feat(protocols): support VLESS node output, improve buildVless method template
...
- Added Server::TYPE_VLESS to Loon::$allowedProtocols
- handle() method now supports VLESS node output
- buildVless() method supports all mainstream VLESS parameter templates, including reality/xtls-rprx-vision
2025-08-26 12:27:38 +08:00
60f1fea356
fix(subscribe): fix vmess+tcp+http subscription in general and singbox
2025-08-24 18:39:00 +08:00
84d5a4f005
fix(subscribe): fix vmess+tcp+http subscription in Clash and Clash Meta
2025-08-24 18:07:36 +08:00
af747c61cc
refactor(singbox): use data_get for array access
2025-08-23 11:19:37 +08:00
7386ac26f5
Merge pull request #595 from swcoffee/master
...
fix: missing field 'version' when distributing tuic protocol in stash
2025-08-21 18:10:04 +08:00
d4cd3d4bb6
Merge pull request #638 from zytakeshi/fix/singbox-sni-domain-issue
...
fix: correct SNI domain configuration paths in SingBox protocol
2025-08-21 18:07:53 +08:00
c38fd1b7b7
fix: correct VMess TCP transport configuration in SingBox protocol
...
- Only add HTTP transport when network_settings.header.type is not 'none'
- Use pure TCP (null transport) when header type is 'none' or unset
- Align with General protocol implementation and VMess specification
This prevents unnecessary HTTP transport layer when using pure TCP.
2025-08-16 03:08:56 +09:00
f86dd89cdd
fix: correct SNI domain configuration paths in SingBox protocol
...
- Fix Trojan protocol to use 'server_name' instead of 'tls_settings.server_name'
- Fix Hysteria protocol to use 'tls.server_name' instead of 'tls_settings.server_name'
- Align with Server model configuration and General protocol implementation
- Resolves missing SNI domains in sing-box configuration generation
This fixes the inconsistency where SNI domains were missing for certain
protocols while working correctly in General protocol handler.
2025-08-16 02:44:17 +09:00
ca05b65638
fix(stash): fix Flow network and SNI issues
2025-08-02 02:07:29 +08:00
738b433041
fix: missing field 'version' when distributing tuic protocol in stash
...
stash下发tuic协议时缺少version字段，会导致订阅无法使用
2025-07-26 13:46:54 +08:00
508caebdcd
refactor: refactor subscription delivery logic, change payment return_url to origin_url concatenation
...
- Unify protocol filter configuration to client.type.field (dot-path, three-segment) format, support strict whitelist mode
- Refactor AbstractProtocol and all protocol classes for more flexible and maintainable subscription delivery
- Change payment callback logic: use origin_url concatenation instead of return_url for more accurate redirects
2025-07-18 15:42:58 +08:00
18de0e8a43
feat: add plugin update support + fix bugs
2025-07-13 08:53:00 +08:00
97788e3c8f
feat: Add client.subscribe.servers hook for plugin-based server extension
...
- Add HookManager::filter('client.subscribe.servers') hook in ClientController::subscribe()
- Allow plugins to inject custom servers into subscription responses
- Update protocol classes to support extended server configurations
- Enable dynamic server list modification before protocol processing
2025-07-11 21:19:23 +08:00
yinjianm