From 440021275fceb9a70701feeede1beca572a766bb Mon Sep 17 00:00:00 2001
From: Chris Boddy <chris@boddy.im>
Date: Tue, 2 Oct 2018 17:40:21 +0100
Subject: [PATCH] [http_proxy_over_p2p] proxy async.

Simultaneously send request-body while reading response-body when
proxying requests.

License: MIT
Signed-off-by: Chris Boddy <chris@boddy.im>
---
 core/corehttp/proxy.go | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/core/corehttp/proxy.go b/core/corehttp/proxy.go
index 7a9946ff45a..66baf882698 100644
--- a/core/corehttp/proxy.go
+++ b/core/corehttp/proxy.go
@@ -15,7 +15,7 @@ import (
 	inet "gx/ipfs/QmfDPh144WGBqRxZb1TGDHerbMnZATrHZggAPw7putNnBq/go-libp2p-net"
 )
 
-// This adds an endpoint for proxying a HTTP request to another ipfs peer
+// ProxyOption is an endpoint for proxying a HTTP request to another ipfs peer
 func ProxyOption() ServeOption {
 	return func(ipfsNode *core.IpfsNode, _ net.Listener, mux *http.ServeMux) (*http.ServeMux, error) {
 		mux.HandleFunc("/proxy/http/", func(w http.ResponseWriter, request *http.Request) {
@@ -33,8 +33,8 @@ func ProxyOption() ServeOption {
 				handleError(w, msg, err, 500)
 				return
 			}
-
-			newReverseHttpProxy(parsedRequest, &stream).ServeHTTP(w, request)
+			//send proxy request and response to client
+			newReverseHTTPProxy(parsedRequest, &stream).ServeHTTP(w, request)
 		})
 		return mux, nil
 	}
@@ -71,7 +71,7 @@ func handleError(w http.ResponseWriter, msg string, err error, code int) {
 	log.Warningf("server error: %s: %s", err)
 }
 
-func newReverseHttpProxy(req *proxyRequest, streamToPeer *inet.Stream) *httputil.ReverseProxy {
+func newReverseHTTPProxy(req *proxyRequest, streamToPeer *inet.Stream) *httputil.ReverseProxy {
 	director := func(r *http.Request) {
 		r.URL.Path = req.httpPath //the scheme etc. doesn't matter
 	}
@@ -85,8 +85,19 @@ type roundTripper struct {
 	stream *inet.Stream
 }
 
-func (self *roundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
-	req.Write(*self.stream)
-	s := bufio.NewReader(*self.stream)
+func (rt *roundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
+
+	sendRequest := func() {
+		err := req.Write(*rt.stream)
+		if err != nil {
+			(*(rt.stream)).Close()
+		}
+		if req.Body != nil {
+			req.Body.Close()
+		}
+	}
+	//send request while reading response
+	go sendRequest()
+	s := bufio.NewReader(*rt.stream)
 	return http.ReadResponse(s, req)
 }