修复SimpleServer在添加的HttpFilter中有获取请求参数时报错问题

CHANGELOG.md

@@ -2,7 +2,7 @@
 # 🚀Changelog
 
 -------------------------------------------------------------------------------------------------------------
-# 5.8.23(2023-10-18)
+# 5.8.23(2023-10-25)
 
 ### 🐣新特性
 * 【json  】      改进TemporalAccessorSerializer支持dayOfMonth和month枚举名（issue#I82AM8@Gitee）
@@ -18,6 +18,7 @@
 * 【core  】      修复aop的afterException无法生效问题（issue#3329@Github）
 * 【core  】      修复TypeUtil.getClass方法强转报错问题（pr#1092@Github）
 * 【core  】      修复DataSize.parse(size)不支持空格问题（issue#I88Z4Z@Gitee）
+* 【http  】      修复SimpleServer在添加的HttpFilter中有获取请求参数时报错问题（issue#3343@Github）
 
 -------------------------------------------------------------------------------------------------------------
 # 5.8.22(2023-09-13)

hutool-http/src/main/java/cn/hutool/http/server/HttpExchangeWrapper.java

@@ -0,0 +1,148 @@
+package cn.hutool.http.server;
+
+import com.sun.net.httpserver.Headers;
+import com.sun.net.httpserver.HttpContext;
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpPrincipal;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+import java.net.URI;
+
+/**
+ * {@link HttpExchange}包装类，提供增强方法和缓存
+ *
+ * @author looly
+ */
+public class HttpExchangeWrapper extends HttpExchange {
+
+	private final HttpExchange raw;
+	private final HttpServerRequest request;
+	private final HttpServerResponse response;
+
+	/**
+	 * 构造
+	 *
+	 * @param raw {@link HttpExchange}
+	 */
+	public HttpExchangeWrapper(final HttpExchange raw) {
+		this.raw = raw;
+		this.request = new HttpServerRequest(this);
+		this.response = new HttpServerResponse(this);
+	}
+
+	/**
+	 * 获取原始对象
+	 * @return 对象
+	 */
+	public HttpExchange getRaw() {
+		return this.raw;
+	}
+
+	/**
+	 * 获取请求
+	 *
+	 * @return 请求
+	 */
+	public HttpServerRequest getRequest() {
+		return request;
+	}
+
+	/**
+	 * 获取响应
+	 *
+	 * @return 响应
+	 */
+	public HttpServerResponse getResponse() {
+		return response;
+	}
+
+	// region ----- HttpExchange methods
+	@Override
+	public Headers getRequestHeaders() {
+		return this.raw.getRequestHeaders();
+	}
+
+	@Override
+	public Headers getResponseHeaders() {
+		return this.raw.getResponseHeaders();
+	}
+
+	@Override
+	public URI getRequestURI() {
+		return this.raw.getRequestURI();
+	}
+
+	@Override
+	public String getRequestMethod() {
+		return this.raw.getRequestMethod();
+	}
+
+	@Override
+	public HttpContext getHttpContext() {
+		return this.raw.getHttpContext();
+	}
+
+	@Override
+	public void close() {
+		this.raw.close();
+	}
+
+	@Override
+	public InputStream getRequestBody() {
+		return this.raw.getRequestBody();
+	}
+
+	@Override
+	public OutputStream getResponseBody() {
+		return this.raw.getResponseBody();
+	}
+
+	@Override
+	public void sendResponseHeaders(final int rCode, final long responseLength) throws IOException {
+		this.raw.sendResponseHeaders(rCode, responseLength);
+	}
+
+	@Override
+	public InetSocketAddress getRemoteAddress() {
+		return this.raw.getRemoteAddress();
+	}
+
+	@Override
+	public int getResponseCode() {
+		return this.raw.getResponseCode();
+	}
+
+	@Override
+	public InetSocketAddress getLocalAddress() {
+		return this.raw.getLocalAddress();
+	}
+
+	@Override
+	public String getProtocol() {
+		return this.raw.getProtocol();
+	}
+
+	@Override
+	public Object getAttribute(final String name) {
+		return this.raw.getAttribute(name);
+	}
+
+	@Override
+	public void setAttribute(final String name, final Object value) {
+		this.raw.setAttribute(name, value);
+	}
+
+	@Override
+	public void setStreams(final InputStream i, final OutputStream o) {
+		this.raw.setStreams(i, o);
+	}
+
+	@Override
+	public HttpPrincipal getPrincipal() {
+		return this.raw.getPrincipal();
+	}
+	// endregion
+}

hutool-http/src/main/java/cn/hutool/http/server/SimpleServer.java

@@ -126,7 +126,8 @@ public class SimpleServer {
 		return addFilter(new SimpleFilter() {
 			@Override
 			public void doFilter(HttpExchange httpExchange, Chain chain) throws IOException {
-				filter.doFilter(new HttpServerRequest(httpExchange), new HttpServerResponse(httpExchange), chain);
+				final HttpExchangeWrapper httpExchangeWrapper = new HttpExchangeWrapper(httpExchange);
+				filter.doFilter(httpExchangeWrapper.getRequest(), httpExchangeWrapper.getResponse(), chain);
 			}
 		});
 	}

hutool-http/src/main/java/cn/hutool/http/server/handler/ActionHandler.java

@@ -1,5 +1,6 @@
 package cn.hutool.http.server.handler;
 
+import cn.hutool.http.server.HttpExchangeWrapper;
 import cn.hutool.http.server.HttpServerRequest;
 import cn.hutool.http.server.HttpServerResponse;
 import cn.hutool.http.server.action.Action;
@@ -29,10 +30,18 @@ public class ActionHandler implements HttpHandler {
 
 	@Override
 	public void handle(HttpExchange httpExchange) throws IOException {
-		action.doAction(
-				new HttpServerRequest(httpExchange),
-				new HttpServerResponse(httpExchange)
-		);
+		final HttpServerRequest request;
+		final HttpServerResponse response;
+		if (httpExchange instanceof HttpExchangeWrapper) {
+			// issue#3343 当使用Filter时，可能读取了请求参数，此时使用共享的req和res，可复用缓存
+			final HttpExchangeWrapper wrapper = (HttpExchangeWrapper) httpExchange;
+			request = wrapper.getRequest();
+			response = wrapper.getResponse();
+		} else {
+			request = new HttpServerRequest(httpExchange);
+			response = new HttpServerResponse(httpExchange);
+		}
+		action.doAction(request, response);
 		httpExchange.close();
 	}
 }

hutool-http/src/test/java/cn/hutool/http/server/Issue3343Test.java

@@ -0,0 +1,33 @@
+package cn.hutool.http.server;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Console;
+import cn.hutool.core.map.multi.ListValueMap;
+import cn.hutool.http.HttpUtil;
+
+/**
+ * http://localhost:8888/?name=hutool
+ */
+public class Issue3343Test {
+	public static void main(final String[] args) {
+		final SimpleServer server = HttpUtil.createServer(8888)
+			.addFilter((req, res, chain) -> {
+				Console.log(DateUtil.now() + " got request: " + req.getPath());
+				Console.log(" >   from : " + req.getClientIP());
+				// 过滤器中获取请求参数
+				Console.log(" > params : " + req.getParams());
+				chain.doFilter(req.getHttpExchange());
+			});
+
+		server.addAction("/", Issue3343Test::index);
+
+		server.start();
+	}
+
+	private static void index(HttpServerRequest request, HttpServerResponse response) {
+		// 具体逻辑中再次获取请求参数
+		ListValueMap<String, String> params = request.getParams();
+		Console.log("index params: " + params);
+		response.getWriter().write("GOT: " + params);
+	}
+}