Skip to content

Commit 3f72481

Browse files
hiddify-comhiddify-com
committed
Merge branch '1.9.3'
2 parents 3d21ef6 + 085f603 commit 3f72481

File tree

16 files changed

+209
-196
lines changed

16 files changed

+209
-196
lines changed

‎.github/workflows/debug.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
27+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
2828
with:
2929
fetch-depth: 0
3030
- name: Setup Go
@@ -60,7 +60,7 @@ jobs:
6060
runs-on: ubuntu-latest
6161
steps:
6262
- name: Checkout
63-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
63+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
6464
with:
6565
fetch-depth: 0
6666
- name: Setup Go
@@ -80,7 +80,7 @@ jobs:
8080
runs-on: ubuntu-latest
8181
steps:
8282
- name: Checkout
83-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
83+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
8484
with:
8585
fetch-depth: 0
8686
- name: Setup Go
@@ -210,7 +210,7 @@ jobs:
210210
TAGS: with_gvisor,with_quic,with_wireguard,with_ech,with_utls,with_clash_api,with_grpc
211211
steps:
212212
- name: Checkout
213-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
213+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
214214
with:
215215
fetch-depth: 0
216216
- name: Setup Go

‎.github/workflows/linux.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
13+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
1414
with:
1515
fetch-depth: 0
1616
- name: Setup Go
@@ -26,7 +26,7 @@ jobs:
2626
EOF
2727
echo "HOME=$HOME" >> "$GITHUB_ENV"
2828
- name: Publish release
29-
uses: goreleaser/goreleaser-action@v5
29+
uses: goreleaser/goreleaser-action@v6
3030
with:
3131
distribution: goreleaser-pro
3232
version: latest

‎.goreleaser.fury.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ nfpms:
3636
file_name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
3737
builds:
3838
- main
39-
vendor: sagernet
4039
homepage: https://sing-box.sagernet.org/
4140
maintainer: nekohasekai <contact-git@sekai.icu>
4241
description: The universal proxy platform.

‎.goreleaser.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ nfpms:
113113
file_name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
114114
builds:
115115
- main
116-
vendor: sagernet
117116
homepage: https://sing-box.sagernet.org/
118117
maintainer: nekohasekai <contact-git@sekai.icu>
119118
description: The universal proxy platform.

‎adapter/router.go

-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ type DNSRule interface {
9494

9595
type RuleSet interface {
9696
StartContext(ctx context.Context, startContext RuleSetStartContext) error
97-
PostStart() error
9897
Metadata() RuleSetMetadata
9998
Close() error
10099
HeadlessRule

‎clients/android

‎common/settings/proxy_linux.go

+29-19
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,40 @@ import (
1616
)
1717

1818
type LinuxSystemProxy struct {
19-
hasGSettings bool
20-
hasKWriteConfig5 bool
21-
sudoUser string
22-
serverAddr M.Socksaddr
23-
supportSOCKS bool
24-
isEnabled bool
19+
hasGSettings bool
20+
kWriteConfigCmd string
21+
sudoUser string
22+
serverAddr M.Socksaddr
23+
supportSOCKS bool
24+
isEnabled bool
2525
}
2626

2727
func NewSystemProxy(ctx context.Context, serverAddr M.Socksaddr, supportSOCKS bool) (*LinuxSystemProxy, error) {
2828
hasGSettings := common.Error(exec.LookPath("gsettings")) == nil
29-
hasKWriteConfig5 := common.Error(exec.LookPath("kwriteconfig5")) == nil
29+
kWriteConfigCmds := []string{
30+
"kwriteconfig5",
31+
"kwriteconfig6",
32+
}
33+
var kWriteConfigCmd string
34+
for _, cmd := range kWriteConfigCmds {
35+
if common.Error(exec.LookPath(cmd)) == nil {
36+
kWriteConfigCmd = cmd
37+
break
38+
}
39+
}
3040
var sudoUser string
3141
if os.Getuid() == 0 {
3242
sudoUser = os.Getenv("SUDO_USER")
3343
}
34-
if !hasGSettings && !hasKWriteConfig5 {
44+
if !hasGSettings && kWriteConfigCmd == "" {
3545
return nil, E.New("unsupported desktop environment")
3646
}
3747
return &LinuxSystemProxy{
38-
hasGSettings: hasGSettings,
39-
hasKWriteConfig5: hasKWriteConfig5,
40-
sudoUser: sudoUser,
41-
serverAddr: serverAddr,
42-
supportSOCKS: supportSOCKS,
48+
hasGSettings: hasGSettings,
49+
kWriteConfigCmd: kWriteConfigCmd,
50+
sudoUser: sudoUser,
51+
serverAddr: serverAddr,
52+
supportSOCKS: supportSOCKS,
4353
}, nil
4454
}
4555

@@ -70,8 +80,8 @@ func (p *LinuxSystemProxy) Enable() error {
7080
return err
7181
}
7282
}
73-
if p.hasKWriteConfig5 {
74-
err := p.runAsUser("kwriteconfig5", "--file", "kioslaverc", "--group", "Proxy Settings", "--key", "ProxyType", "1")
83+
if p.kWriteConfigCmd != "" {
84+
err := p.runAsUser(p.kWriteConfigCmd, "--file", "kioslaverc", "--group", "Proxy Settings", "--key", "ProxyType", "1")
7585
if err != nil {
7686
return err
7787
}
@@ -83,7 +93,7 @@ func (p *LinuxSystemProxy) Enable() error {
8393
if err != nil {
8494
return err
8595
}
86-
err = p.runAsUser("kwriteconfig5", "--file", "kioslaverc", "--group", "Proxy Settings", "--key", "Authmode", "0")
96+
err = p.runAsUser(p.kWriteConfigCmd, "--file", "kioslaverc", "--group", "Proxy Settings", "--key", "Authmode", "0")
8797
if err != nil {
8898
return err
8999
}
@@ -103,8 +113,8 @@ func (p *LinuxSystemProxy) Disable() error {
103113
return err
104114
}
105115
}
106-
if p.hasKWriteConfig5 {
107-
err := p.runAsUser("kwriteconfig5", "--file", "kioslaverc", "--group", "Proxy Settings", "--key", "ProxyType", "0")
116+
if p.kWriteConfigCmd != "" {
117+
err := p.runAsUser(p.kWriteConfigCmd, "--file", "kioslaverc", "--group", "Proxy Settings", "--key", "ProxyType", "0")
108118
if err != nil {
109119
return err
110120
}
@@ -150,7 +160,7 @@ func (p *LinuxSystemProxy) setKDEProxy(proxyTypes ...string) error {
150160
proxyUrl = "http://" + p.serverAddr.String()
151161
}
152162
err := p.runAsUser(
153-
"kwriteconfig5",
163+
p.kWriteConfigCmd,
154164
"--file",
155165
"kioslaverc",
156166
"--group",

‎docs/changelog.md

+13
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22
icon: material/alert-decagram
33
---
44

5+
6+
### 1.9.3
7+
8+
* Fixes and improvements
9+
10+
### 1.9.2
11+
12+
* Fixes and improvements
13+
14+
### 1.9.1
15+
16+
* Fixes and improvements
17+
518
### 1.9.0
619

720
* Fixes and improvements

‎experimental/libbox/service_pause.go

+6-13
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,18 @@ func (s *BoxService) Pause() {
1616
if s.pauseTimer != nil {
1717
s.pauseTimer.Stop()
1818
}
19-
s.pauseTimer = time.AfterFunc(time.Minute, s.pause)
20-
}
21-
22-
func (s *BoxService) pause() {
23-
s.pauseAccess.Lock()
24-
defer s.pauseAccess.Unlock()
25-
s.pauseManager.DevicePause()
26-
_ = s.instance.Router().ResetNetwork()
27-
s.pauseTimer = nil
19+
s.pauseTimer = time.AfterFunc(3*time.Second, s.ResetNetwork)
2820
}
2921

3022
func (s *BoxService) Wake() {
31-
_ = s.instance.Router().ResetNetwork()
3223
s.pauseAccess.Lock()
3324
defer s.pauseAccess.Unlock()
3425
if s.pauseTimer != nil {
3526
s.pauseTimer.Stop()
36-
s.pauseTimer = nil
37-
return
3827
}
39-
s.pauseManager.DeviceWake()
28+
s.pauseTimer = time.AfterFunc(3*time.Minute, s.ResetNetwork)
29+
}
30+
31+
func (s *BoxService) ResetNetwork() {
32+
_ = s.instance.Router().ResetNetwork()
4033
}

‎go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ require (
2828
github.com/sagernet/cloudflare-tls v0.0.0-20231208171750-a4483c1b7cd1
2929
github.com/sagernet/gomobile v0.1.3
3030
github.com/sagernet/gvisor v0.0.0-20240428053021-e691de28565f
31-
github.com/sagernet/quic-go v0.43.1-beta.1
31+
github.com/sagernet/quic-go v0.43.1-beta.2
3232
github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691
33-
github.com/sagernet/sing v0.4.0-beta.20
34-
github.com/sagernet/sing-dns v0.2.0-beta.18
33+
github.com/sagernet/sing v0.4.1
34+
github.com/sagernet/sing-dns v0.2.0
3535
github.com/sagernet/sing-mux v0.2.0
3636
github.com/sagernet/sing-quic v0.2.0-beta.5
3737
github.com/sagernet/sing-shadowsocks v0.2.6
3838
github.com/sagernet/sing-shadowsocks2 v0.2.0
3939
github.com/sagernet/sing-shadowtls v0.1.4
40-
github.com/sagernet/sing-tun v0.3.0-beta.6
40+
github.com/sagernet/sing-tun v0.3.2
4141
github.com/sagernet/sing-vmess v0.1.8
4242
github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7
4343
github.com/sagernet/tfo-go v0.0.0-20231209031829-7b5343ac1dc6
@@ -49,7 +49,7 @@ require (
4949
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
5050
golang.org/x/crypto v0.23.0
5151
golang.org/x/net v0.25.0
52-
golang.org/x/sys v0.20.0
52+
golang.org/x/sys v0.21.0
5353
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6
5454
google.golang.org/grpc v1.63.2
5555
google.golang.org/protobuf v1.33.0

‎go.sum

+10-10
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,15 @@ github.com/sagernet/gvisor v0.0.0-20240428053021-e691de28565f h1:NkhuupzH5ch7b/Y
121121
github.com/sagernet/gvisor v0.0.0-20240428053021-e691de28565f/go.mod h1:KXmw+ouSJNOsuRpg4wgwwCQuunrGz4yoAqQjsLjc6N0=
122122
github.com/sagernet/netlink v0.0.0-20240523065131-45e60152f9ba h1:EY5AS7CCtfmARNv2zXUOrsEMPFDGYxaw65JzA2p51Vk=
123123
github.com/sagernet/netlink v0.0.0-20240523065131-45e60152f9ba/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM=
124-
github.com/sagernet/quic-go v0.43.1-beta.1 h1:alizUjpvWYcz08dBCQsULOd+1xu0o7UtlyYf6SLbRNg=
125-
github.com/sagernet/quic-go v0.43.1-beta.1/go.mod h1:BkrQYeop7Jx3hN3TW8/76CXcdhYiNPyYEBL/BVJ1ifc=
124+
github.com/sagernet/quic-go v0.43.1-beta.2 h1:6YRCE9t1Q3UbNX1/dJGqpwFQbh6DXC6XBrQr2xp6hXY=
125+
github.com/sagernet/quic-go v0.43.1-beta.2/go.mod h1:BkrQYeop7Jx3hN3TW8/76CXcdhYiNPyYEBL/BVJ1ifc=
126126
github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691 h1:5Th31OC6yj8byLGkEnIYp6grlXfo1QYUfiYFGjewIdc=
127127
github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691/go.mod h1:B8lp4WkQ1PwNnrVMM6KyuFR20pU8jYBD+A4EhJovEXU=
128128
github.com/sagernet/sing v0.2.18/go.mod h1:OL6k2F0vHmEzXz2KW19qQzu172FDgSbUSODylighuVo=
129-
github.com/sagernet/sing v0.4.0-beta.20 h1:8rEepj4LMcR0Wd389fJIziv/jr3MBtX5qXBHsfxJ+dY=
130-
github.com/sagernet/sing v0.4.0-beta.20/go.mod h1:PFQKbElc2Pke7faBLv8oEba5ehtKO21Ho+TkYemTI3Y=
131-
github.com/sagernet/sing-dns v0.2.0-beta.18 h1:6vzXZThRdA7YUzBOpSbUT48XRumtl/KIpIHFSOP0za8=
132-
github.com/sagernet/sing-dns v0.2.0-beta.18/go.mod h1:k/dmFcQpg6+m08gC1yQBy+13+QkuLqpKr4bIreq4U24=
129+
github.com/sagernet/sing v0.4.1 h1:zVlpE+7k7AFoC2pv6ReqLf0PIHjihL/jsBl5k05PQFk=
130+
github.com/sagernet/sing v0.4.1/go.mod h1:ieZHA/+Y9YZfXs2I3WtuwgyCZ6GPsIR7HdKb1SdEnls=
131+
github.com/sagernet/sing-dns v0.2.0 h1:dka3weRX6+CrYO3v+hrTy2z68rCOCZXNBiNXpLZ6JNs=
132+
github.com/sagernet/sing-dns v0.2.0/go.mod h1:BJpJv6XLnrUbSyIntOT6DG9FW0f4fETmPAHvNjOprLg=
133133
github.com/sagernet/sing-mux v0.2.0 h1:4C+vd8HztJCWNYfufvgL49xaOoOHXty2+EAjnzN3IYo=
134134
github.com/sagernet/sing-mux v0.2.0/go.mod h1:khzr9AOPocLa+g53dBplwNDz4gdsyx/YM3swtAhlkHQ=
135135
github.com/sagernet/sing-quic v0.2.0-beta.5 h1:ceKFLd1iS5AtM+pScKmcDp5k7R6WgYIe8vl6nB0aVsE=
@@ -140,8 +140,8 @@ github.com/sagernet/sing-shadowsocks2 v0.2.0 h1:wpZNs6wKnR7mh1wV9OHwOyUr21VkS3wK
140140
github.com/sagernet/sing-shadowsocks2 v0.2.0/go.mod h1:RnXS0lExcDAovvDeniJ4IKa2IuChrdipolPYWBv9hWQ=
141141
github.com/sagernet/sing-shadowtls v0.1.4 h1:aTgBSJEgnumzFenPvc+kbD9/W0PywzWevnVpEx6Tw3k=
142142
github.com/sagernet/sing-shadowtls v0.1.4/go.mod h1:F8NBgsY5YN2beQavdgdm1DPlhaKQlaL6lpDdcBglGK4=
143-
github.com/sagernet/sing-tun v0.3.0-beta.6 h1:L11kMrM7UfUW0pzQiU66Fffh4o86KZc1SFGbkYi8Ma8=
144-
github.com/sagernet/sing-tun v0.3.0-beta.6/go.mod h1:DxLIyhjWU/HwGYoX0vNGg2c5QgTQIakphU1MuERR5tQ=
143+
github.com/sagernet/sing-tun v0.3.2 h1:z0bLUT/YXH9RrJS9DsIpB0Bb9afl2hVJOmHd0zA3HJY=
144+
github.com/sagernet/sing-tun v0.3.2/go.mod h1:DxLIyhjWU/HwGYoX0vNGg2c5QgTQIakphU1MuERR5tQ=
145145
github.com/sagernet/sing-vmess v0.1.8 h1:XVWad1RpTy9b5tPxdm5MCU8cGfrTGdR8qCq6HV2aCNc=
146146
github.com/sagernet/sing-vmess v0.1.8/go.mod h1:vhx32UNzTDUkNwOyIjcZQohre1CaytquC5mPplId8uA=
147147
github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 h1:DImB4lELfQhplLTxeq2z31Fpv8CQqqrUwTbrIRumZqQ=
@@ -216,8 +216,8 @@ golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
216216
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
217217
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
218218
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
219-
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
220-
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
219+
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
220+
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
221221
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
222222
golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
223223
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

‎outbound/wireguard.go

+22-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ import (
2020
"github.com/sagernet/sing-box/option"
2121
"github.com/sagernet/sing-box/outbound/houtbound"
2222
"github.com/sagernet/sing-box/transport/wireguard"
23-
dns "github.com/sagernet/sing-dns"
24-
tun "github.com/sagernet/sing-tun"
23+
"github.com/sagernet/sing-dns"
24+
"github.com/sagernet/sing-tun"
25+
"github.com/sagernet/sing/common"
2526
E "github.com/sagernet/sing/common/exceptions"
2627
M "github.com/sagernet/sing/common/metadata"
2728
N "github.com/sagernet/sing/common/network"
@@ -151,6 +152,25 @@ func NewWireGuard(ctx context.Context, router adapter.Router, logger log.Context
151152
}
152153

153154
func (w *WireGuard) Start() error {
155+
if common.Any(w.peers, func(peer wireguard.PeerConfig) bool {
156+
return !peer.Endpoint.IsValid()
157+
}) {
158+
// wait for all outbounds to be started and continue in PortStart
159+
return nil
160+
}
161+
return w.start()
162+
}
163+
164+
func (w *WireGuard) PostStart() error {
165+
if common.All(w.peers, func(peer wireguard.PeerConfig) bool {
166+
return peer.Endpoint.IsValid()
167+
}) {
168+
return nil
169+
}
170+
return w.start()
171+
}
172+
173+
func (w *WireGuard) start() error {
154174
err := wireguard.ResolvePeers(w.ctx, w.router, w.peers)
155175
if err != nil {
156176
return err

0 commit comments

Comments
 (0)