fix: client error && websocket compress error (#48)

DVKunion · Jan 25, 2024 · 65ecb61 · 65ecb61
1 parent 7cb82c8
commit 65ecb61
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/cmd/client/control.go b/cmd/client/control.go
@@ -22,11 +22,9 @@ func Control(ctx context.Context, sg *SigGroup) {
 		case t := <-sg.StartChannel:
 			slog.Info(consts.LISTEN_START, "type", t)
 			sg.wg.Add(1)
-			go func() {
-				if err := doListen(c, t); err != nil {
-					slog.Error(consts.LISTEN_ERROR, "type", t, "err", err)
-				}
-			}()
+			if err := doListen(c, t); err != nil {
+				slog.Error(consts.LISTEN_ERROR, "type", t, "err", err)
+			}
 			sg.wg.Done()
 		case t := <-sg.StopChannel:
 			slog.Info(consts.LISTEN_STOP, "type", t)
@@ -40,6 +38,7 @@ func doListen(ctx context.Context, t transfer.Type) error {
 	if err != nil {
 		return err
 	}
+	defer server.Close()
 	var proxyAddr string
 	var proxyType tunnel.Type
 	for _, p := range Config().ProxyAddr {
@@ -63,7 +62,6 @@ func doListen(ctx context.Context, t transfer.Type) error {
 }
 
 func listen(ctx context.Context, server net.Listener, pa string, pt tunnel.Type, t transfer.Type) {
-	defer server.Close()
 	for {
 		conn, err := server.Accept()
 		if err != nil {
@@ -75,9 +73,11 @@ func listen(ctx context.Context, server net.Listener, pa string, pt tunnel.Type,
 				slog.Error(consts.CONNECT_RMOET_ERROR, "err", err)
 				continue
 			}
-			if err := network.Transport(conn, destConn); err != nil {
-				slog.Error(consts.CONNECT_TRANS_ERROR, "err", err)
-			}
+			go func() {
+				if err := network.Transport(conn, destConn); err != nil {
+					slog.Error(consts.CONNECT_TRANS_ERROR, "err", err)
+				}
+			}()
 		}
 	}
 }
diff --git a/pkg/service/websocket.go b/pkg/service/websocket.go
@@ -42,7 +42,7 @@ func (s *WSService) Conn(ctx context.Context, t transfer.Type, sOpts ...Option)
 		HandshakeTimeout:  defaultTimeout,
 		ReadBufferSize:    defaultReadBufferSize,
 		WriteBufferSize:   defaultReadBufferSize,
-		EnableCompression: true,
+		EnableCompression: false,
 	}
 
 	if srvOpts.buffers != nil {
@@ -72,7 +72,7 @@ func (s *WSService) Serve(ln net.Listener, sOpts ...Option) error {
 		HandshakeTimeout:  defaultTimeout,
 		ReadBufferSize:    defaultReadBufferSize,
 		WriteBufferSize:   defaultReadBufferSize,
-		EnableCompression: true,
+		EnableCompression: false,
 		CheckOrigin:       func(r *http.Request) bool { return true },
 	}