add contextual request

Author: wzy1935

src/main/java/io/vertx/httpproxy/ContextedHttpServerRequest.java

@@ -0,0 +1,17 @@
+package io.vertx.httpproxy;
+
+import io.vertx.codegen.annotations.VertxGen;
+import io.vertx.core.http.*;
+import io.vertx.httpproxy.impl.ContextedHttpServerRequestImpl;
+
+@VertxGen
+public interface ContextedHttpServerRequest extends HttpServerRequest {
+
+  public void set(String name, Object value);
+
+  public <T> T get(String name, Class<T> type);
+
+  static ContextedHttpServerRequest from(HttpServerRequest httpServerRequest) {
+    return new ContextedHttpServerRequestImpl(httpServerRequest);
+  }
+}

src/main/java/io/vertx/httpproxy/HttpProxy.java

@@ -98,7 +98,7 @@ default HttpProxy originSelector(Function<HttpServerRequest, Future<SocketAddres
    */
   @GenIgnore()
   @Fluent
-  HttpProxy originRequestProvider(BiFunction<HttpServerRequest, HttpClient, Future<HttpClientRequest>> provider);
+  HttpProxy originRequestProvider(BiFunction<ContextedHttpServerRequest, HttpClient, Future<HttpClientRequest>> provider);
 
   /**
    * Add an interceptor to the interceptor chain.

src/main/java/io/vertx/httpproxy/ProxyRequest.java

@@ -38,8 +38,14 @@ public interface ProxyRequest {
    * @return a reference to this, so the API can be used fluently
    */
   static ProxyRequest reverseProxy(HttpServerRequest proxiedRequest) {
+    ContextedHttpServerRequest contextedHttpServerRequest;
+    if (proxiedRequest instanceof ContextedHttpServerRequest) {
+      contextedHttpServerRequest = (ContextedHttpServerRequest) proxiedRequest;
+    } else {
+      contextedHttpServerRequest = ContextedHttpServerRequest.from(proxiedRequest);
+    }
     proxiedRequest.pause();
-    return new ProxiedRequest(proxiedRequest);
+    return new ProxiedRequest(contextedHttpServerRequest);
   }
 
   /**
@@ -169,7 +175,7 @@ default Future<Void> proxy(HttpClientRequest request) {
   /**
    * @return the proxied HTTP server request
    */
-  HttpServerRequest proxiedRequest();
+  ContextedHttpServerRequest proxiedRequest();
 
   /**
    * Create and return the proxy response.

src/main/java/io/vertx/httpproxy/impl/ContextedHttpServerRequestImpl.java

@@ -0,0 +1,26 @@
+package io.vertx.httpproxy.impl;
+
+import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.internal.http.HttpServerRequestInternal;
+import io.vertx.core.internal.http.HttpServerRequestWrapper;
+import io.vertx.httpproxy.ContextedHttpServerRequest;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ContextedHttpServerRequestImpl extends HttpServerRequestWrapper implements ContextedHttpServerRequest {
+  private final Map<String, Object> attachments = new HashMap<>();
+
+  public ContextedHttpServerRequestImpl(HttpServerRequest request) {
+    super((HttpServerRequestInternal) request);
+  }
+
+  public void set(String name, Object value) {
+    attachments.put(name, value);
+  }
+
+  public <T> T get(String name, Class<T> type) {
+    Object o = attachments.get(name);
+    return type.isInstance(o) ? type.cast(o) : null;
+  }
+}

src/main/java/io/vertx/httpproxy/impl/ProxiedRequest.java

@@ -20,6 +20,7 @@
 import io.vertx.core.net.HostAndPort;
 import io.vertx.core.streams.Pipe;
 import io.vertx.httpproxy.Body;
+import io.vertx.httpproxy.ContextedHttpServerRequest;
 import io.vertx.httpproxy.ProxyRequest;
 import io.vertx.httpproxy.ProxyResponse;
 
@@ -50,9 +51,9 @@ public class ProxiedRequest implements ProxyRequest {
   private HostAndPort authority;
   private final MultiMap headers;
   HttpClientRequest request;
-  private final HttpServerRequest proxiedRequest;
+  private final ContextedHttpServerRequest proxiedRequest;
 
-  public ProxiedRequest(HttpServerRequest proxiedRequest) {
+  public ProxiedRequest(ContextedHttpServerRequest proxiedRequest) {
 
     // Determine content length
     long contentLength = -1L;
@@ -132,7 +133,7 @@ public ProxyRequest setMethod(HttpMethod method) {
   }
 
   @Override
-  public HttpServerRequest proxiedRequest() {
+  public ContextedHttpServerRequest proxiedRequest() {
     return proxiedRequest;
   }
 

src/main/java/io/vertx/httpproxy/impl/ReverseProxy.java

@@ -27,7 +27,7 @@ public class ReverseProxy implements HttpProxy {
   private final static Logger log = LoggerFactory.getLogger(ReverseProxy.class);
   private final HttpClient client;
   private final boolean supportWebSocket;
-  private BiFunction<HttpServerRequest, HttpClient, Future<HttpClientRequest>> selector = (req, client) -> Future.failedFuture("No origin available");
+  private BiFunction<ContextedHttpServerRequest, HttpClient, Future<HttpClientRequest>> selector = (req, client) -> Future.failedFuture("No origin available");
   private final List<ProxyInterceptor> interceptors = new ArrayList<>();
 
   public ReverseProxy(ProxyOptions options, HttpClient client) {
@@ -41,7 +41,7 @@ public ReverseProxy(ProxyOptions options, HttpClient client) {
   }
 
   @Override
-  public HttpProxy originRequestProvider(BiFunction<HttpServerRequest, HttpClient, Future<HttpClientRequest>> provider) {
+  public HttpProxy originRequestProvider(BiFunction<ContextedHttpServerRequest, HttpClient, Future<HttpClientRequest>> provider) {
     selector = provider;
     return this;
   }
@@ -85,7 +85,7 @@ public void handle(HttpServerRequest request) {
   }
 
   private void handleWebSocketUpgrade(ProxyRequest proxyRequest) {
-    HttpServerRequest proxiedRequest = proxyRequest.proxiedRequest();
+    ContextedHttpServerRequest proxiedRequest = proxyRequest.proxiedRequest();
     resolveOrigin(proxiedRequest).onComplete(ar -> {
       if (ar.succeeded()) {
         HttpClientRequest request = ar.result();
@@ -145,15 +145,14 @@ private void end(ProxyRequest proxyRequest, int sc) {
       .send();
   }
 
-  private Future<HttpClientRequest> resolveOrigin(HttpServerRequest proxiedRequest) {
+  private Future<HttpClientRequest> resolveOrigin(ContextedHttpServerRequest proxiedRequest) {
     return selector.apply(proxiedRequest, client);
   }
 
   private class Proxy implements ProxyContext {
 
     private final ProxyRequest request;
     private ProxyResponse response;
-    private final Map<String, Object> attachments = new HashMap<>();
     private ListIterator<ProxyInterceptor> filters;
 
     private Proxy(ProxyRequest request) {
@@ -162,13 +161,12 @@ private Proxy(ProxyRequest request) {
 
     @Override
     public void set(String name, Object value) {
-      attachments.put(name, value);
+      request.proxiedRequest().set(name, value);
     }
 
     @Override
     public <T> T get(String name, Class<T> type) {
-      Object o = attachments.get(name);
-      return type.isInstance(o) ? type.cast(o) : null;
+      return request.proxiedRequest().get(name, type);
     }
 
     @Override

src/main/java/module-info.java

@@ -4,6 +4,7 @@
   requires static io.vertx.codegen.api;
   requires static io.vertx.codegen.json;
   requires static vertx.docgen;
+  requires io.netty.codec;
   exports io.vertx.httpproxy;
   exports io.vertx.httpproxy.cache;
   exports io.vertx.httpproxy.interceptors;