diff --git a/listener/inbound/mux_test.go b/listener/inbound/mux_test.go new file mode 100644 index 00000000..32ba12c7 --- /dev/null +++ b/listener/inbound/mux_test.go @@ -0,0 +1,41 @@ +package inbound_test + +import ( + "testing" + + "github.com/metacubex/mihomo/adapter/outbound" + + "github.com/stretchr/testify/assert" +) + +var singMuxProtocolList = []string{"h2mux", "smux"} // don't test "yamux" because it has some confused bugs + +// notCloseProxyAdapter is a proxy adapter that does not close the underlying outbound.ProxyAdapter. +// The outbound.SingMux will close the underlying outbound.ProxyAdapter when it is closed, but we don't want to close it. +// The underlying outbound.ProxyAdapter should only be closed by the caller of testSingMux. +type notCloseProxyAdapter struct { + outbound.ProxyAdapter +} + +func (n *notCloseProxyAdapter) Close() error { + return nil +} + +func testSingMux(t *testing.T, tunnel *TestTunnel, out outbound.ProxyAdapter) { + t.Run("singmux", func(t *testing.T) { + for _, protocol := range singMuxProtocolList { + t.Run(protocol, func(t *testing.T) { + t.Parallel() + singMuxOption := outbound.SingMuxOption{ + Enabled: true, + Protocol: protocol, + } + out, err := outbound.NewSingMux(singMuxOption, ¬CloseProxyAdapter{out}) + assert.NoError(t, err) + defer out.Close() + + tunnel.DoTest(t, out) + }) + } + }) +} diff --git a/listener/inbound/shadowsocks_test.go b/listener/inbound/shadowsocks_test.go index 34772a21..a957886b 100644 --- a/listener/inbound/shadowsocks_test.go +++ b/listener/inbound/shadowsocks_test.go @@ -77,6 +77,8 @@ func testInboundShadowSocks0(t *testing.T, inboundOptions inbound.ShadowSocksOpt defer out.Close() tunnel.DoTest(t, out) + + testSingMux(t, tunnel, out) } func TestInboundShadowSocks_Basic(t *testing.T) { diff --git a/listener/inbound/trojan_test.go b/listener/inbound/trojan_test.go index 971a25c7..cfc4476d 100644 --- a/listener/inbound/trojan_test.go +++ b/listener/inbound/trojan_test.go @@ -42,6 +42,8 @@ func testInboundTrojan(t *testing.T, inboundOptions inbound.TrojanOption, outbou defer out.Close() tunnel.DoTest(t, out) + + testSingMux(t, tunnel, out) } func TestInboundTrojan_TLS(t *testing.T) { diff --git a/listener/inbound/vless_test.go b/listener/inbound/vless_test.go index f1e37ac5..a307753b 100644 --- a/listener/inbound/vless_test.go +++ b/listener/inbound/vless_test.go @@ -42,6 +42,8 @@ func testInboundVless(t *testing.T, inboundOptions inbound.VlessOption, outbound defer out.Close() tunnel.DoTest(t, out) + + testSingMux(t, tunnel, out) } func TestInboundVless_TLS(t *testing.T) { diff --git a/listener/inbound/vmess_test.go b/listener/inbound/vmess_test.go index aa877861..3456d1fd 100644 --- a/listener/inbound/vmess_test.go +++ b/listener/inbound/vmess_test.go @@ -44,6 +44,8 @@ func testInboundVMess(t *testing.T, inboundOptions inbound.VmessOption, outbound defer out.Close() tunnel.DoTest(t, out) + + testSingMux(t, tunnel, out) } func TestInboundVMess_Basic(t *testing.T) { diff --git a/listener/sing/sing.go b/listener/sing/sing.go index eb13e6c9..af7cdbc9 100644 --- a/listener/sing/sing.go +++ b/listener/sing/sing.go @@ -72,7 +72,7 @@ func NewListenerHandler(lc ListenerConfig) (h *ListenerHandler, err error) { NewStreamContext: func(ctx context.Context, conn net.Conn) context.Context { return ctx }, - Logger: log.SingLogger, + Logger: log.SingInfoToDebugLogger, // convert sing-mux info log to debug Handler: h, Padding: lc.MuxOption.Padding, Brutal: mux.BrutalOptions{ diff --git a/log/sing.go b/log/sing.go index 818acc79..7fdd3f12 100644 --- a/log/sing.go +++ b/log/sing.go @@ -65,4 +65,17 @@ func (l singLogger) Panic(args ...any) { Fatalln(fmt.Sprint(args...)) } +type singInfoToDebugLogger struct { + singLogger +} + +func (l singInfoToDebugLogger) InfoContext(ctx context.Context, args ...any) { + Debugln(fmt.Sprint(args...)) +} + +func (l singInfoToDebugLogger) Info(args ...any) { + Debugln(fmt.Sprint(args...)) +} + var SingLogger L.ContextLogger = singLogger{} +var SingInfoToDebugLogger L.ContextLogger = singInfoToDebugLogger{}