Fix: issue #3

tunnel/connection.go

@@ -2,47 +2,22 @@ package tunnel
 
 import (
 	"io"
-	"net"
-	"net/http"
-	"time"
 
 	"github.com/Dreamacro/clash/adapters/local"
 	C "github.com/Dreamacro/clash/constant"
 )
 
 func (t *Tunnel) handleHTTP(request *adapters.HttpAdapter, proxy C.ProxyAdapter) {
-	req := http.Transport{
-		Dial: func(string, string) (net.Conn, error) {
-			conn := newTrafficTrack(proxy.Conn(), t.traffic)
-			return conn, nil
-		},
-		// from http.DefaultTransport
-		MaxIdleConns:          100,
-		IdleConnTimeout:       90 * time.Second,
-		ExpectContinueTimeout: 1 * time.Second,
-	}
-	resp, err := req.RoundTrip(request.R)
-	if err != nil {
-		return
-	}
-	defer resp.Body.Close()
-
-	header := request.W.Header()
-	for k, vv := range resp.Header {
-		for _, v := range vv {
-			header.Add(k, v)
-		}
-	}
-	request.W.WriteHeader(resp.StatusCode)
-	var writer io.Writer = request.W
-	if len(resp.TransferEncoding) > 0 && resp.TransferEncoding[0] == "chunked" {
-		writer = ChunkWriter{Writer: request.W}
-	}
-	io.Copy(writer, resp.Body)
-}
-
-func (t *Tunnel) handleHTTPS(request *adapters.HttpsAdapter, proxy C.ProxyAdapter) {
 	conn := newTrafficTrack(proxy.Conn(), t.traffic)
+
+	// Before we unwrap src and/or dst, copy any buffered data.
+	if wc, ok := request.Conn().(*adapters.PeekedConn); ok && len(wc.Peeked) > 0 {
+		if _, err := conn.Write(wc.Peeked); err != nil {
+			return
+		}
+		wc.Peeked = nil
+	}
+
 	go io.Copy(request.Conn(), conn)
 	io.Copy(conn, request.Conn())
 }
@@ -52,16 +27,3 @@ func (t *Tunnel) handleSOCKS(request *adapters.SocksAdapter, proxy C.ProxyAdapte
 	go io.Copy(request.Conn(), conn)
 	io.Copy(conn, request.Conn())
 }
-
-// ChunkWriter is a writer wrapper and used when TransferEncoding is chunked
-type ChunkWriter struct {
-	io.Writer
-}
-
-func (cw ChunkWriter) Write(b []byte) (int, error) {
-	n, err := cw.Writer.Write(b)
-	if err == nil {
-		cw.Writer.(http.Flusher).Flush()
-	}
-	return n, err
-}

tunnel/tunnel.go

@@ -107,9 +107,6 @@ func (t *Tunnel) handleConn(localConn C.ServerAdapter) {
 	case *LocalAdapter.HttpAdapter:
 		t.handleHTTP(adapter, remoConn)
 		break
-	case *LocalAdapter.HttpsAdapter:
-		t.handleHTTPS(adapter, remoConn)
-		break
 	case *LocalAdapter.SocksAdapter:
 		t.handleSOCKS(adapter, remoConn)
 		break