Commit Graph

1152 Commits

Author SHA1 Message Date
Shtorm
93e34d124b Merge tag 'v1.13.14' into extended
Integrate upstream sing-box v1.13.14 (18 commits, v1.13.12..v1.13.14).

Conflict resolutions:
- Makefile: keep fork's upload_android (no otherLegacy, codeberg-release.sh),
  add upstream's SFA-version-metadata.json step.
- go.sum: regenerated via go mod tidy from merged go.mod.
- transport/wireguard/endpoint_options.go: keep fork fields, add ICMPTimeout.
- clients/android, clients/apple: keep fork's submodule pointers.
2026-06-26 01:28:40 +03:00
世界
25a600db24 Bump version 2026-06-25 16:36:07 +08:00
Shtorm
e363c2ff78 Add Mieru inbound, refactor sudoku. Fixes 2026-06-04 07:54:26 +03:00
世界
78b2e12fbd Bump version 2026-06-03 16:33:44 +08:00
Shtorm
b953954b60 Update sing-box core, refactor MASQUE, update XHTTP 2026-05-29 01:31:57 +03:00
世界
1086ab2563 Bump version 1.13.12 2026-05-14 15:11:09 +08:00
Shtorm
0487a96b04 Resolve conflicts 2026-04-29 22:14:30 +03:00
Shtorm
c307b8dc2d Add MTProxy, MASQUE, VPN, Link parser. Update AmneziaWG. Remove Tunneling 2026-04-29 22:11:30 +03:00
Shtorm
7c3a19c2fe Update sing-box core 2026-04-26 21:11:31 +03:00
世界
553cfa1f9f Bump version 2026-04-23 07:30:34 +08:00
世界
74cbcd3723 Bump version 2026-04-23 07:30:34 +08:00
Shtorm
614af37bc4 Update sing-box core 2026-04-22 19:23:23 +03:00
世界
a3fc14f35f Bump version 2026-04-22 13:40:36 +08:00
世界
65dedd3a6f Bump version 2026-04-22 13:40:36 +08:00
世界
d942ecc904 Bump version 1.13.9 2026-04-20 09:49:39 +08:00
世界
94a3e293fd Bump version 1.13.9 2026-04-20 09:49:39 +08:00
世界
c3de6a25fb documentation: Remove warp ads 2026-04-20 09:49:39 +08:00
世界
24610b61c5 documentation: Remove warp ads 2026-04-20 09:49:39 +08:00
Shtorm
55a3a1e594 Update sing-box core 2026-04-17 01:10:31 +03:00
世界
bb3ad9c694 documentation: Fix typo 2026-04-14 16:00:47 +08:00
世界
7f44f908d9 documentation: Fix typo 2026-04-14 16:00:47 +08:00
世界
39bfb37b83 Bump version 2026-04-14 14:33:19 +08:00
世界
d5adb54bc6 Bump version 2026-04-14 14:33:19 +08:00
世界
41b2d51390 Bump version 2026-04-10 16:23:45 +08:00
世界
025b947a24 Bump version 2026-04-10 16:23:45 +08:00
Shtorm
9bb1b847be Update sing-box core 2026-04-06 20:54:24 +03:00
世界
0b42a02292 Bump version 2026-04-06 23:09:11 +08:00
世界
813b634d08 Bump version 2026-04-06 23:09:11 +08:00
世界
c782f63849 Bump version 2026-03-30 23:03:43 +08:00
世界
7ffdc48b49 Bump version 2026-03-30 23:03:43 +08:00
世界
a8064cf7cd Bump version 2026-03-26 13:28:33 +08:00
世界
d09182614c Bump version 2026-03-26 13:28:33 +08:00
世界
fdfd0ffb07 route: merge rule_set branches into outer rules
Treat rule_set items as merged branches instead of standalone boolean
sub-items.

Evaluate each branch inside a referenced rule-set as if it were merged
into the outer rule and keep OR semantics between branches. This lets
outer grouped fields satisfy matching groups inside a branch without
introducing a standalone outer fallback or cross-branch state union.

Keep inherited grouped state outside inverted default and logical
branches. Negated rule-set branches now evaluate !(...) against their
own conditions and only reapply the outer grouped match after negation
succeeds, so configs like outer-group && !inner-condition continue to
work.

Add regression tests for same-group merged matches, cross-group and
extra-AND failures, DNS merged-branch behaviour, and inverted merged
branches. Update the route and DNS rule docs to clarify that rule-set
branches merge into the outer rule while keeping OR semantics between
branches.
2026-03-25 14:00:29 +08:00
世界
b0c6762bc1 route: merge rule_set branches into outer rules
Treat rule_set items as merged branches instead of standalone boolean
sub-items.

Evaluate each branch inside a referenced rule-set as if it were merged
into the outer rule and keep OR semantics between branches. This lets
outer grouped fields satisfy matching groups inside a branch without
introducing a standalone outer fallback or cross-branch state union.

Keep inherited grouped state outside inverted default and logical
branches. Negated rule-set branches now evaluate !(...) against their
own conditions and only reapply the outer grouped match after negation
succeeds, so configs like outer-group && !inner-condition continue to
work.

Add regression tests for same-group merged matches, cross-group and
extra-AND failures, DNS merged-branch behaviour, and inverted merged
branches. Update the route and DNS rule docs to clarify that rule-set
branches merge into the outer rule while keeping OR semantics between
branches.
2026-03-25 14:00:29 +08:00
世界
53850e99d4 documentation: Fix Chinese link anchors 2026-03-16 12:24:10 +08:00
世界
686cf1f304 documentation: Fix Chinese link anchors 2026-03-16 12:24:10 +08:00
世界
ecbdba3e1e Bump version 2026-03-15 17:56:37 +08:00
世界
d3768cca36 Bump version 2026-03-15 17:56:37 +08:00
深鸣
acf3dd8056 documentation: Minor fixes 2026-03-15 17:56:37 +08:00
深鸣
f46fbf188a documentation: Minor fixes 2026-03-15 17:56:37 +08:00
世界
0b388be33c Bump version 2026-03-14 21:38:38 +08:00
世界
fe585157d2 Bump version 2026-03-14 21:38:38 +08:00
世界
5b27caa338 Add Alpine APK packaging to CI build
Add fpm-based Alpine APK packaging alongside existing DEB/RPM/Pacman
packages. Alpine APKs use `linux` in the filename to distinguish from
OpenWrt APKs which use the `openwrt` prefix.
2026-03-11 20:41:29 +08:00
世界
8289bbd846 Add Alpine APK packaging to CI build
Add fpm-based Alpine APK packaging alongside existing DEB/RPM/Pacman
packages. Alpine APKs use `linux` in the filename to distinguish from
OpenWrt APKs which use the `openwrt` prefix.
2026-03-11 20:41:29 +08:00
世界
ab1fb1dce0 documentation: Update ocm/ccm examples 2026-03-10 22:04:12 +08:00
世界
8bb4c4dd32 documentation: Update ocm/ccm examples 2026-03-10 22:04:12 +08:00
世界
7388824759 ocm: Add Responses WebSocket API proxy and fix client config docs
Support the OpenAI Responses WebSocket API (`wss://.../v1/responses`)
for bidirectional frame proxying with usage tracking.
Fix Codex CLI client config examples to use profiles and correct flags.

Update openai-go v3.24.0 → v3.26.0.
2026-03-10 22:04:11 +08:00
世界
e0be8743f6 ocm: Add Responses WebSocket API proxy and fix client config docs
Support the OpenAI Responses WebSocket API (`wss://.../v1/responses`)
for bidirectional frame proxying with usage tracking.
Fix Codex CLI client config examples to use profiles and correct flags.

Update openai-go v3.24.0 → v3.26.0.
2026-03-10 22:04:11 +08:00
Shtorm
494fa5a9da Update sing-box core 2026-03-10 04:25:01 +03:00
世界
bcd9bfa614 release: Add openwrt apk build 2026-03-09 20:18:40 +08:00