chore: switch to apernet sing-tun fork

app/internal/tun/log.go

@@ -1,6 +1,8 @@
 package tun
 
 import (
+	"runtime/debug"
+
 	"github.com/sagernet/sing/common/logger"
 	"go.uber.org/zap"
 )
@@ -12,10 +14,19 @@ type singLogger struct {
 	zapLogger *zap.Logger
 }
 
+func extractSingExceptions(args []any) {
+	for i, arg := range args {
+		if err, ok := arg.(error); ok {
+			args[i] = err.Error()
+		}
+	}
+}
+
 func (l *singLogger) Trace(args ...any) {
 	if l.zapLogger == nil {
 		return
 	}
+	extractSingExceptions(args)
 	l.zapLogger.Debug(l.tag, zap.Any("args", args))
 }
 
@@ -23,6 +34,7 @@ func (l *singLogger) Debug(args ...any) {
 	if l.zapLogger == nil {
 		return
 	}
+	extractSingExceptions(args)
 	l.zapLogger.Debug(l.tag, zap.Any("args", args))
 }
 
@@ -30,6 +42,7 @@ func (l *singLogger) Info(args ...any) {
 	if l.zapLogger == nil {
 		return
 	}
+	extractSingExceptions(args)
 	l.zapLogger.Info(l.tag, zap.Any("args", args))
 }
 
@@ -37,6 +50,7 @@ func (l *singLogger) Warn(args ...any) {
 	if l.zapLogger == nil {
 		return
 	}
+	extractSingExceptions(args)
 	l.zapLogger.Warn(l.tag, zap.Any("args", args))
 }
 
@@ -44,13 +58,16 @@ func (l *singLogger) Error(args ...any) {
 	if l.zapLogger == nil {
 		return
 	}
+	extractSingExceptions(args)
 	l.zapLogger.Error(l.tag, zap.Any("args", args))
+	debug.PrintStack()
 }
 
 func (l *singLogger) Fatal(args ...any) {
 	if l.zapLogger == nil {
 		return
 	}
+	extractSingExceptions(args)
 	l.zapLogger.Fatal(l.tag, zap.Any("args", args))
 }
 
@@ -58,5 +75,6 @@ func (l *singLogger) Panic(args ...any) {
 	if l.zapLogger == nil {
 		return
 	}
+	extractSingExceptions(args)
 	l.zapLogger.Panic(l.tag, zap.Any("args", args))
 }

app/internal/tun/server.go

@@ -2,14 +2,13 @@ package tun
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"io"
 	"net"
 	"net/netip"
 
 	"github.com/apernet/hysteria/core/client"
-	tun "github.com/sagernet/sing-tun"
+	tun "github.com/apernet/sing-tun"
 	"github.com/sagernet/sing/common/buf"
 	"github.com/sagernet/sing/common/metadata"
 	"github.com/sagernet/sing/common/network"
@@ -30,9 +29,6 @@ type Server struct {
 	// required by system stack
 	Inet4Address []netip.Prefix
 	Inet6Address []netip.Prefix
-
-	tunIf    tun.Tun
-	tunStack tun.Stack
 }
 
 type EventLogger interface {
@@ -42,7 +38,7 @@ type EventLogger interface {
 	UDPError(addr string, err error)
 }
 
-func (s *Server) Start() error {
+func (s *Server) Serve() error {
 	tunOpts := tun.Options{
 		Name:         s.IfName,
 		Inet4Address: s.Inet4Address,
@@ -58,9 +54,9 @@ func (s *Server) Start() error {
 	if err != nil {
 		return fmt.Errorf("failed to create tun interface: %w", err)
 	}
-	s.tunIf = tunIf
+	defer tunIf.Close()
 
-	tunStack, err := tun.NewStack("system", tun.StackOptions{
+	tunStack, err := tun.NewSystem(tun.StackOptions{
 		Context:    context.Background(),
 		Tun:        tunIf,
 		TunOptions: tunOpts,
@@ -74,23 +70,8 @@ func (s *Server) Start() error {
 	if err != nil {
 		return fmt.Errorf("failed to create tun stack: %w", err)
 	}
-	s.tunStack = tunStack
-	err = tunStack.Start()
-	if err != nil {
-		return fmt.Errorf("failed to start tun stack: %w", err)
-	}
-	return nil
-}
-
-func (s *Server) Close() error {
-	var ifErr, stackErr error
-	if s.tunIf != nil {
-		ifErr = s.tunIf.Close()
-	}
-	if s.tunStack != nil {
-		stackErr = s.tunStack.Close()
-	}
-	return errors.Join(ifErr, stackErr)
+	defer tunStack.Close()
+	return tunStack.(tun.StackRunner).Run()
 }
 
 type tunHandler struct {