documentation: Update changelog

Update dependencies
urltest: Recheck after network change
2026-06-30 05:37:27 +03:00 · 2023-04-14 19:24:16 +08:00 · 2023-04-14 19:19:27 +08:00 · 2023-04-13 19:07:20 +08:00 · 2023-04-13 19:07:19 +08:00 · 2023-04-13 19:07:19 +08:00
7 changed files with 32 additions and 72 deletions
--- a/README.md
+++ b/README.md
@@ -8,10 +8,6 @@ The universal proxy platform.

 https://sing-box.sagernet.org

-## Support
-
-https://community.sagernet.org/c/sing-box/
-
 ## License

 ```
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,13 +1,3 @@
-#### 1.3-beta7
-
-* Add `path` and `headers` options for HTTP outbound
-* Add multi-user support for Shadowsocks legacy AEAD inbound
-* Fixes and improvements
-
-#### 1.2.4
-
-* Fixes and improvements
-
 #### 1.3-beta6

 * Fix WireGuard reconnect
--- a/go.mod
+++ b/go.mod
@@ -25,12 +25,12 @@ require (
 	github.com/sagernet/gomobile v0.0.0-20230413023804-244d7ff07035
 	github.com/sagernet/quic-go v0.0.0-20230202071646-a8c8afb18b32
 	github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691
-	github.com/sagernet/sing v0.2.3
-	github.com/sagernet/sing-dns v0.1.5-0.20230415085626-111ecf799dfc
-	github.com/sagernet/sing-shadowsocks v0.2.1
-	github.com/sagernet/sing-shadowtls v0.1.1
+	github.com/sagernet/sing v0.2.3-0.20230413105021-520dd58fb01d
+	github.com/sagernet/sing-dns v0.1.5-0.20230408004833-5adaf486d440
+	github.com/sagernet/sing-shadowsocks v0.2.1-0.20230412123110-1a7c32b4e2e7
+	github.com/sagernet/sing-shadowtls v0.1.1-0.20230409094821-9abef019436f
 	github.com/sagernet/sing-tun v0.1.4-0.20230326080954-8848c0e4cbab
-	github.com/sagernet/sing-vmess v0.1.4
+	github.com/sagernet/sing-vmess v0.1.4-0.20230412122845-9470e68f5e45
 	github.com/sagernet/smux v0.0.0-20230312102458-337ec2a5af37
 	github.com/sagernet/tfo-go v0.0.0-20230303015439-ffcfd8c41cf9
 	github.com/sagernet/utls v0.0.0-20230309024959-6732c2ab36f2
--- a/go.sum
+++ b/go.sum
@@ -111,18 +111,18 @@ github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691 h1:5Th31OC6yj8byL
 github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691/go.mod h1:B8lp4WkQ1PwNnrVMM6KyuFR20pU8jYBD+A4EhJovEXU=
 github.com/sagernet/sing v0.0.0-20220817130738-ce854cda8522/go.mod h1:QVsS5L/ZA2Q5UhQwLrn0Trw+msNd/NPGEhBKR/ioWiY=
 github.com/sagernet/sing v0.1.8/go.mod h1:jt1w2u7lJQFFSGLiRrRIs5YWmx4kAPfWuOejuDW9qMk=
-github.com/sagernet/sing v0.2.3 h1:V50MvZ4c3Iij2lYFWPlzL1PyipwSzjGeN9x+Ox89vpk=
-github.com/sagernet/sing v0.2.3/go.mod h1:Ta8nHnDLAwqySzKhGoKk4ZIB+vJ3GTKj7UPrWYvM+4w=
-github.com/sagernet/sing-dns v0.1.5-0.20230415085626-111ecf799dfc h1:hmbuqKv48SAjiKPoqtJGvS5pEHVPZjTHq9CPwQY2cZ4=
-github.com/sagernet/sing-dns v0.1.5-0.20230415085626-111ecf799dfc/go.mod h1:ZKuuqgsHRxDahYrzgSgy4vIAGGuKPlIf4hLcNzYzLkY=
-github.com/sagernet/sing-shadowsocks v0.2.1 h1:FvdLQOqpvxHBJUcUe4fvgiYP2XLLwH5i1DtXQviVEPw=
-github.com/sagernet/sing-shadowsocks v0.2.1/go.mod h1:T/OgurSjsAe+Ug3+6PprXjmgHFmJidjOvQcjXGTKb3I=
-github.com/sagernet/sing-shadowtls v0.1.1 h1:Gf8YD/4zCjfM9xxVzI0QVYAnjMCtsDHcIp84CUdY3VA=
-github.com/sagernet/sing-shadowtls v0.1.1/go.mod h1:espnHDPRQeG95ZoU3xfHDFnc6Nt4GvbbuPV2okN+x/E=
+github.com/sagernet/sing v0.2.3-0.20230413105021-520dd58fb01d h1:+hp4necjzOvjg9dQwqmTfH/jAgCCnguVNQzIRUOpO00=
+github.com/sagernet/sing v0.2.3-0.20230413105021-520dd58fb01d/go.mod h1:Ta8nHnDLAwqySzKhGoKk4ZIB+vJ3GTKj7UPrWYvM+4w=
+github.com/sagernet/sing-dns v0.1.5-0.20230408004833-5adaf486d440 h1:VH8/BcOVuApHtS+vKP+khxlGRcXH7KKhgkTDtNynqSQ=
+github.com/sagernet/sing-dns v0.1.5-0.20230408004833-5adaf486d440/go.mod h1:69PNSHyEmXdjf6C+bXBOdr2GQnPeEyWjIzo/MV8gmz8=
+github.com/sagernet/sing-shadowsocks v0.2.1-0.20230412123110-1a7c32b4e2e7 h1:3WDMIF1aE/twc5gJ+9PF2ZJqUxwZ80MPtNBKE3yBevU=
+github.com/sagernet/sing-shadowsocks v0.2.1-0.20230412123110-1a7c32b4e2e7/go.mod h1:WoVjGUvRqsx5yhYeDAB5CijCHpNDi0LUPHl3cf7u8Lc=
+github.com/sagernet/sing-shadowtls v0.1.1-0.20230409094821-9abef019436f h1:qzQvpcDm60zPW8UlZa8UEaBoFORFeGAnhDncPc3VWT4=
+github.com/sagernet/sing-shadowtls v0.1.1-0.20230409094821-9abef019436f/go.mod h1:MxB+Q9H0pAHcrlvNmwSs1crljRwHFFVhtXyOMBy44Nw=
 github.com/sagernet/sing-tun v0.1.4-0.20230326080954-8848c0e4cbab h1:a9oeWuPBuIZ70qMhIIH6RrYhp886xN9jJIwsuu4ZFUo=
 github.com/sagernet/sing-tun v0.1.4-0.20230326080954-8848c0e4cbab/go.mod h1:4YxIDEkkCjGXDOTMPw1SXpLmCQUFAWuaQN250oo+928=
-github.com/sagernet/sing-vmess v0.1.4 h1:aZ03KgmR9COPitVqo8NTPHeaHmbJYDZ8mkumnUV4oGQ=
-github.com/sagernet/sing-vmess v0.1.4/go.mod h1:NensKZJDgfPsUf3TzFD8kTuzI3CQfN1Tj3Eygti5Isg=
+github.com/sagernet/sing-vmess v0.1.4-0.20230412122845-9470e68f5e45 h1:QqYhWah3u+o2tvLRuTfEu3BwsGpf/wNnVK/VNQV2YBM=
+github.com/sagernet/sing-vmess v0.1.4-0.20230412122845-9470e68f5e45/go.mod h1:eULig3LgaeNiWSquSlzXF42Joypsj3fO1W+Qy93o6hk=
 github.com/sagernet/smux v0.0.0-20230312102458-337ec2a5af37 h1:HuE6xSwco/Xed8ajZ+coeYLmioq0Qp1/Z2zczFaV8as=
 github.com/sagernet/smux v0.0.0-20230312102458-337ec2a5af37/go.mod h1:3skNSftZDJWTGVtVaM2jfbce8qHnmH/AGDRe62iNOg0=
 github.com/sagernet/tfo-go v0.0.0-20230303015439-ffcfd8c41cf9 h1:2ItpW1nMNkPzmBTxV0/eClCklHrFSQMnUGcpUmJxVeE=
--- a/inbound/shadowsocks_multi.go
+++ b/inbound/shadowsocks_multi.go
@@ -9,8 +9,6 @@ import (
 	C "github.com/sagernet/sing-box/constant"
 	"github.com/sagernet/sing-box/log"
 	"github.com/sagernet/sing-box/option"
-	"github.com/sagernet/sing-shadowsocks"
-	"github.com/sagernet/sing-shadowsocks/shadowaead"
 	"github.com/sagernet/sing-shadowsocks/shadowaead_2022"
 	"github.com/sagernet/sing/common"
 	"github.com/sagernet/sing/common/auth"
@@ -27,7 +25,7 @@ var (

 type ShadowsocksMulti struct {
 	myInboundAdapter
-	service shadowsocks.MultiService[int]
+	service *shadowaead_2022.MultiService[int]
 	users   []option.ShadowsocksUser
 }

@@ -51,26 +49,16 @@ func newShadowsocksMulti(ctx context.Context, router adapter.Router, logger log.
 	} else {
 		udpTimeout = int64(C.UDPTimeout.Seconds())
 	}
-	var (
-		service shadowsocks.MultiService[int]
-		err     error
-	)
-	if common.Contains(shadowaead_2022.List, options.Method) {
-		service, err = shadowaead_2022.NewMultiServiceWithPassword[int](
-			options.Method,
-			options.Password,
-			udpTimeout,
-			adapter.NewUpstreamContextHandler(inbound.newConnection, inbound.newPacketConnection, inbound),
-			router.TimeFunc(),
-		)
-	} else if common.Contains(shadowaead.List, options.Method) {
-		service, err = shadowaead.NewMultiService[int](
-			options.Method,
-			udpTimeout,
-			adapter.NewUpstreamContextHandler(inbound.newConnection, inbound.newPacketConnection, inbound))
-	} else {
+	if !common.Contains(shadowaead_2022.List, options.Method) {
 		return nil, E.New("unsupported method: " + options.Method)
 	}
+	service, err := shadowaead_2022.NewMultiServiceWithPassword[int](
+		options.Method,
+		options.Password,
+		udpTimeout,
+		adapter.NewUpstreamContextHandler(inbound.newConnection, inbound.newPacketConnection, inbound),
+		router.TimeFunc(),
+	)
 	if err != nil {
 		return nil, err
 	}
--- a/option/shadowsocks.go
+++ b/option/shadowsocks.go
@@ -4,7 +4,7 @@ type ShadowsocksInboundOptions struct {
 	ListenOptions
 	Network      NetworkList              `json:"network,omitempty"`
 	Method       string                   `json:"method"`
-	Password     string                   `json:"password,omitempty"`
+	Password     string                   `json:"password"`
 	Users        []ShadowsocksUser        `json:"users,omitempty"`
 	Destinations []ShadowsocksDestination `json:"destinations,omitempty"`
 }
--- a/outbound/urltest.go
+++ b/outbound/urltest.go
@@ -72,8 +72,7 @@ func (s *URLTest) Start() error {
 		outbounds = append(outbounds, detour)
 	}
 	s.group = NewURLTestGroup(s.ctx, s.router, s.logger, outbounds, s.link, s.interval, s.tolerance)
-	go s.group.CheckOutbounds()
-	return nil
+	return s.group.Start()
 }

 func (s *URLTest) Close() error {
@@ -95,7 +94,6 @@ func (s *URLTest) URLTest(ctx context.Context, link string) (map[string]uint16,
 }

 func (s *URLTest) DialContext(ctx context.Context, network string, destination M.Socksaddr) (net.Conn, error) {
-	s.group.Start()
 	outbound := s.group.Select(network)
 	conn, err := outbound.DialContext(ctx, network, destination)
 	if err == nil {
@@ -107,7 +105,6 @@ func (s *URLTest) DialContext(ctx context.Context, network string, destination M
 }

 func (s *URLTest) ListenPacket(ctx context.Context, destination M.Socksaddr) (net.PacketConn, error) {
-	s.group.Start()
 	outbound := s.group.Select(N.NetworkUDP)
 	conn, err := outbound.ListenPacket(ctx, destination)
 	if err == nil {
@@ -127,7 +124,7 @@ func (s *URLTest) NewPacketConnection(ctx context.Context, conn N.PacketConn, me
 }

 func (s *URLTest) InterfaceUpdated() error {
-	go s.group.CheckOutbounds()
+	go s.group.checkOutbounds()
 	return nil
 }

@@ -141,7 +138,6 @@ type URLTestGroup struct {
 	tolerance uint16
 	history   *urltest.HistoryStorage

-	access sync.Mutex
 	ticker *time.Ticker
 	close  chan struct{}
 }
@@ -172,23 +168,13 @@ func NewURLTestGroup(ctx context.Context, router adapter.Router, logger log.Logg
 	}
 }

-func (g *URLTestGroup) Start() {
-	if g.ticker != nil {
-		return
-	}
-	g.access.Lock()
-	defer g.access.Unlock()
-	if g.ticker != nil {
-		return
-	}
+func (g *URLTestGroup) Start() error {
 	g.ticker = time.NewTicker(g.interval)
 	go g.loopCheck()
+	return nil
 }

 func (g *URLTestGroup) Close() error {
-	if g.ticker == nil {
-		return nil
-	}
 	g.ticker.Stop()
 	close(g.close)
 	return nil
@@ -248,18 +234,18 @@ func (g *URLTestGroup) Fallback(used adapter.Outbound) []adapter.Outbound {
 }

 func (g *URLTestGroup) loopCheck() {
-	go g.CheckOutbounds()
+	go g.checkOutbounds()
 	for {
 		select {
 		case <-g.close:
 			return
 		case <-g.ticker.C:
-			g.CheckOutbounds()
+			g.checkOutbounds()
 		}
 	}
 }

-func (g *URLTestGroup) CheckOutbounds() {
+func (g *URLTestGroup) checkOutbounds() {
 	_, _ = g.URLTest(g.ctx, g.link)
 }
Author	SHA1	Message	Date
世界	1b680d4748	documentation: Update changelog	2023-04-14 19:24:16 +08:00
世界	d407b35b49	Update dependencies	2023-04-14 19:19:27 +08:00
世界	7f49c45673	urltest: Recheck after network change	2023-04-13 19:07:20 +08:00
世界	221cce6e57	Fix wireguard reconnect	2023-04-13 19:07:19 +08:00
世界	95809dce11	Fix deadline race	2023-04-13 19:07:19 +08:00
世界	32875e7cbc	Fix conntrack return pointer	2023-04-13 13:23:04 +08:00
世界	3de56620ce	android: Remove Seq.Delete warning	2023-04-13 13:23:04 +08:00
世界	3651605d3b	Use HTTPS URLTest source	2023-04-13 11:02:00 +08:00
世界	7d1174e545	Print sniff result	2023-04-13 09:03:52 +08:00
世界	bd9e6e5cd9	Fix processing domain address in packet	2023-04-12 20:49:45 +08:00
世界	ed37cb858b	Update documentation	2023-04-12 16:17:01 +08:00
世界	62bcf22c26	Fix parsing query in http path	2023-04-12 15:58:03 +08:00
Xiaokang Wang (Shelikhoo)	84bd997742	Fix '?' at end of WebSocket path get escaped This fix align sing-box's behaviour with V2Ray when it comes to processing ? at the end of WebSocket's path.	2023-04-12 15:58:03 +08:00
H1JK	a548e45ad7	Add BaseContext to http servers	2023-04-11 18:00:43 +08:00
H1JK	5c1de2bb06	Fix gRPC service name escape	2023-04-11 18:00:43 +08:00
Hellojack	e5f0add1ab	Remove TLS requirement for gRPC client	2023-04-11 18:00:43 +08:00
PuerNya	70e47df295	Add headers option for HTTP outbound	2023-04-11 17:49:37 +08:00
世界	f20642d6fd	Fix workflows	2023-04-11 17:44:24 +08:00
世界	73fa926b48	clash-api: Add Clash.Meta APIs	2023-04-11 17:44:24 +08:00
世界	5d9dce8078	Fix find process user	2023-04-11 14:40:10 +08:00
世界	e20e2d57c9	Fix set HTTP TLS ALPN	2023-04-11 14:40:10 +08:00
世界	25f31890ed	deadline: Fix disable pipe	2023-04-11 14:13:22 +08:00
世界	194b36b987	Fix v2ray http transport server read request	2023-04-11 10:30:10 +08:00
世界	1e39196bc9	Update cancel context usage	2023-04-10 17:01:21 +08:00
世界	da82a41697	Fix write log to stderr	2023-04-10 08:48:58 +08:00
世界	aceb82a75e	Fix fallback packet conn	2023-04-09 22:53:06 +08:00
世界	f2749bc29d	platform: Add stderr redirect	2023-04-09 22:52:45 +08:00
世界	55afaa87da	Fix write http status after response sent	2023-04-09 22:52:45 +08:00
世界	d77940ab39	Fix deadline not initialized	2023-04-09 22:52:45 +08:00
世界	1eea446e45	documentation: Update external-ui download fields	2023-04-09 15:44:19 +08:00
世界	19c6241e10	Update dependencies	2023-04-09 15:37:06 +08:00
世界	b290d0ed32	documentation: Update changelog	2023-04-09 15:06:20 +08:00
世界	2afe662646	clash api: download clash-dashboard if external-ui directory is empty	2023-04-09 12:39:33 +08:00
世界	107a9a3b51	Fix read deadline implementation	2023-04-09 12:39:33 +08:00
世界	3d0c64f523	Replace usages of uber/atomic	2023-04-09 12:39:33 +08:00
世界	422ca34ac2	Fix timeout error check	2023-04-08 12:25:51 +08:00
世界	6d63f9255f	documentation: Update changelog	2023-04-08 09:37:58 +08:00
世界	6f2cc9761d	Add multi-peer support for wireguard outbound	2023-04-08 09:37:58 +08:00
世界	b484d9bca6	Add fakeip support	2023-04-08 09:37:58 +08:00
世界	58c4fd745a	Add L3 routing support	2023-04-08 09:17:12 +08:00
世界	7d1e6affb3	Add dns reverse mapping	2023-04-08 09:17:03 +08:00