v0.0.14 #19

Merged
timi merged 2 commits from dev into master 2026-08-07 07:45:34 +00:00
6 changed files with 85 additions and 23 deletions
+1 -1
View File
@@ -6,7 +6,7 @@
<groupId>com.imyeyu.network</groupId> <groupId>com.imyeyu.network</groupId>
<artifactId>timi-network</artifactId> <artifactId>timi-network</artifactId>
<version>0.0.13</version> <version>0.0.14</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
@@ -1,8 +1,12 @@
package com.imyeyu.network; package com.imyeyu.network;
import com.imyeyu.java.TimiJava; import com.imyeyu.java.TimiJava;
import com.imyeyu.java.bean.CallbackArg;
import org.apache.hc.client5.http.fluent.ContentResponseHandler;
import org.apache.hc.client5.http.fluent.Request; import org.apache.hc.client5.http.fluent.Request;
import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.io.HttpClientResponseHandler;
import org.apache.hc.core5.util.Timeout; import org.apache.hc.core5.util.Timeout;
import java.io.IOException; import java.io.IOException;
@@ -16,6 +20,9 @@ public class CommonRequest {
protected final Request request; protected final Request request;
/// 响应回调
protected CallbackArg<HttpResponse> responseCallback;
protected CommonRequest(Request request) { protected CommonRequest(Request request) {
this.request = request; this.request = request;
} }
@@ -54,13 +61,22 @@ public class CommonRequest {
return header("Accept-Language", langHeader); return header("Accept-Language", langHeader);
} }
/// 设置响应回调,回调在响应体读取前执行
///
/// @param callback 响应回调,传入 null 表示移除回调
/// @return 当前请求
public CommonRequest responseCallback(CallbackArg<HttpResponse> callback) {
this.responseCallback = callback;
return this;
}
public CommonRequest bodyEntity(HttpEntity entity) { public CommonRequest bodyEntity(HttpEntity entity) {
request.body(entity); request.body(entity);
return this; return this;
} }
public String asString() throws IOException { public String asString() throws IOException {
return request.execute().returnContent().asString(); return handleResponse(response -> new ContentResponseHandler().handleResponse(response).asString());
} }
public Number asNumber() throws IOException { public Number asNumber() throws IOException {
@@ -68,14 +84,29 @@ public class CommonRequest {
} }
public byte[] asBytes() throws IOException { public byte[] asBytes() throws IOException {
return request.execute().returnContent().asBytes(); return handleResponse(response -> new ContentResponseHandler().handleResponse(response).asBytes());
} }
public InputStream asStream() throws IOException { public InputStream asStream() throws IOException {
return request.execute().returnContent().asStream(); return handleResponse(response -> new ContentResponseHandler().handleResponse(response).asStream());
} }
public void execute() throws IOException { public void execute() throws IOException {
request.execute(); handleResponse(response -> null);
}
/// 使用统一入口处理响应,子类的自定义响应处理必须调用此方法
///
/// @param handler 响应处理器
/// @param <T> 返回值类型
/// @return 响应处理结果
/// @throws IOException 请求或响应处理失败
protected <T> T handleResponse(HttpClientResponseHandler<T> handler) throws IOException {
return request.execute().handleResponse(response -> {
if (responseCallback != null) {
responseCallback.handler(response);
}
return handler.handleResponse(response);
});
} }
} }
@@ -1,6 +1,7 @@
package com.imyeyu.network; package com.imyeyu.network;
import com.imyeyu.io.IO; import com.imyeyu.io.IO;
import com.imyeyu.java.bean.CallbackArg;
import org.apache.hc.client5.http.fluent.Request; import org.apache.hc.client5.http.fluent.Request;
import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpEntity;
@@ -59,6 +60,12 @@ public class FileRequest extends JacksonRequest {
return this; return this;
} }
@Override
public FileRequest responseCallback(CallbackArg<HttpResponse> callback) {
super.responseCallback(callback);
return this;
}
@Override @Override
public FileRequest body(Object object) { public FileRequest body(Object object) {
super.body(object); super.body(object);
@@ -84,15 +91,16 @@ public class FileRequest extends JacksonRequest {
} }
public long length() throws IOException, ProtocolException { public long length() throws IOException, ProtocolException {
HttpResponse response = request.execute().returnResponse(); return handleResponse(response -> {
final int status = response.getCode(); final int status = response.getCode();
if (status < 200 || 300 <= status) { if (status < 200 || 300 <= status) {
throw new IOException("HTTP error status: " + status); throw new IOException("HTTP error status: " + status);
} }
final Header contentLengthHeader = response.getHeader("Content-Length"); final Header contentLengthHeader = response.getHeader("Content-Length");
if (contentLengthHeader == null) { if (contentLengthHeader == null) {
throw new IOException("Content-Length header missing"); throw new IOException("Content-Length header missing");
} }
return Long.parseLong(contentLengthHeader.getValue()); return Long.parseLong(contentLengthHeader.getValue());
});
} }
} }
@@ -8,9 +8,11 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.ObjectNode;
import com.imyeyu.java.bean.CallbackArg;
import org.apache.hc.client5.http.fluent.Request; import org.apache.hc.client5.http.fluent.Request;
import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.ContentType;
import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpResponse;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Type; import java.lang.reflect.Type;
@@ -115,6 +117,12 @@ public class JacksonRequest extends CommonRequest {
return this; return this;
} }
@Override
public JacksonRequest responseCallback(CallbackArg<HttpResponse> callback) {
super.responseCallback(callback);
return this;
}
/** /**
* 设置 JSON 请求体 * 设置 JSON 请求体
* *
@@ -2,9 +2,10 @@ package com.imyeyu.network;
import com.imyeyu.io.IO; import com.imyeyu.io.IO;
import com.imyeyu.java.TimiJava; import com.imyeyu.java.TimiJava;
import com.imyeyu.java.bean.CallbackArg;
import org.apache.hc.client5.http.fluent.Request; import org.apache.hc.client5.http.fluent.Request;
import org.apache.hc.client5.http.fluent.Response;
import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.io.HttpClientResponseHandler; import org.apache.hc.core5.http.io.HttpClientResponseHandler;
import org.apache.hc.core5.http.io.entity.EntityUtils; import org.apache.hc.core5.http.io.entity.EntityUtils;
@@ -66,6 +67,12 @@ public class ProgressiveRequest extends FileRequest {
return this; return this;
} }
@Override
public ProgressiveRequest responseCallback(CallbackArg<HttpResponse> callback) {
super.responseCallback(callback);
return this;
}
@Override @Override
public ProgressiveRequest body(Object object) { public ProgressiveRequest body(Object object) {
super.body(object); super.body(object);
@@ -80,12 +87,12 @@ public class ProgressiveRequest extends FileRequest {
@Override @Override
public void toFile(Path outputPath) throws IOException, NoPermissionException { public void toFile(Path outputPath) throws IOException, NoPermissionException {
processResponse(request.execute(), IO.getOutputStream(outputPath.toFile())); processResponse(IO.getOutputStream(outputPath.toFile()));
} }
@Override @Override
public void toFile(File file) throws IOException, NoPermissionException { public void toFile(File file) throws IOException, NoPermissionException {
processResponse(request.execute(), IO.getOutputStream(file)); processResponse(IO.getOutputStream(file));
} }
@Override @Override
@@ -96,17 +103,17 @@ public class ProgressiveRequest extends FileRequest {
@Override @Override
public byte[] asBytes() throws IOException { public byte[] asBytes() throws IOException {
ByteArrayOutputStream os = new ByteArrayOutputStream(); ByteArrayOutputStream os = new ByteArrayOutputStream();
processResponse(request.execute(), os); processResponse(os);
return os.toByteArray(); return os.toByteArray();
} }
private void processResponse(Response response, OutputStream os) throws IOException { private void processResponse(OutputStream os) throws IOException {
response.handleResponse((HttpClientResponseHandler<Void>) resp -> { handleResponse((HttpClientResponseHandler<Void>) response -> {
HttpEntity entity = resp.getEntity(); HttpEntity entity = response.getEntity();
if (entity == null) { if (entity == null) {
throw new IOException("not found response entity"); throw new IOException("not found response entity");
} }
int code = resp.getCode(); int code = response.getCode();
if (400 <= code) { if (400 <= code) {
throw new IOException("response error: %s".formatted(code)); throw new IOException("response error: %s".formatted(code));
} }
@@ -2,9 +2,11 @@ package com.imyeyu.network;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.JavaType;
import com.imyeyu.java.bean.CallbackArg;
import com.imyeyu.java.bean.timi.TimiResponse; import com.imyeyu.java.bean.timi.TimiResponse;
import org.apache.hc.client5.http.fluent.Request; import org.apache.hc.client5.http.fluent.Request;
import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpResponse;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Type; import java.lang.reflect.Type;
@@ -55,6 +57,12 @@ public class TimiRequest extends JacksonRequest {
return this; return this;
} }
@Override
public TimiRequest responseCallback(CallbackArg<HttpResponse> callback) {
super.responseCallback(callback);
return this;
}
@Override @Override
public TimiRequest body(Object object) { public TimiRequest body(Object object) {
super.body(object); super.body(object);