Adapt server to the updarted proxy logic

Author: ilia-db

cmd/ssh/server.go

@@ -49,7 +49,11 @@ and proxies them to local SSH daemon processes.
 			DefaultPort:          7772,
 			PortRange:            100,
 		}
-		return ssh.RunServer(ctx, client, opts)
+		err := ssh.RunServer(ctx, client, opts)
+		if err != nil && ssh.IsNormalClosure(err) {
+			return nil
+		}
+		return err
 	}
 
 	return cmd

libs/ssh/server.go

@@ -137,7 +137,7 @@ func (handler *sshHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	proxy := newProxyConnection()
+	proxy := newProxyConnection(nil)
 	err := proxy.Accept(w, r)
 	if err != nil {
 		cmdio.LogError(ctx, fmt.Errorf("failed to upgrade to websockets: %v", err))
@@ -189,11 +189,7 @@ func (handler *sshHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	})
 
 	g.Go(func() error {
-		return proxy.RunReceivingLoop(gCtx, sshdStdin)
-	})
-
-	g.Go(func() error {
-		return proxy.RunSendingLoop(gCtx, sshdStdout)
+		return proxy.Start(gCtx, sshdStdout, sshdStdin)
 	})
 
 	if err := g.Wait(); err != nil {