Merge branch 'main' into feat-proxy-config

Author: weiiwang01

aproxy.go

@@ -246,8 +246,8 @@ func main() {
 		httpsProxy: httpsProxy,
 	}
 	listenAddr := *listenFlag
-	ctx := context.Background()
-	signal.NotifyContext(ctx, os.Interrupt)
+	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt)
+	defer stop()
 	listenConfig := new(net.ListenConfig)
 	listener, err := listenConfig.Listen(ctx, "tcp", listenAddr)
 	if err != nil {
@@ -264,12 +264,16 @@ func main() {
 	} else {
 		logger.InfoContext(ctx, "start passthrough HTTPS connection")
 	}
-	for {
-		conn, err := listener.Accept()
-		if err != nil {
-			logger.ErrorContext(ctx, "failed to accept connection", "error", err)
-			continue
+	go func() {
+		for {
+			conn, err := listener.Accept()
+			if err != nil {
+			  logger.ErrorContext(ctx, "failed to accept connection", "error", err)
+				continue
+			}
+			go HandleConn(conn, proxy)
 		}
-		go HandleConn(ctx, conn.(*net.TCPConn), forwarder)
-	}
+	}()
+	<-ctx.Done()
+	stop()
 }

go.mod

@@ -2,4 +2,4 @@ module aproxy
 
 go 1.21
 
-require golang.org/x/crypto v0.14.0 // indirect
+require golang.org/x/crypto v0.17.0

go.sum

@@ -1,2 +1,2 @@
-golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
-golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
+golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=