timeout when response body is not fully received

Author: dernasherbrezon

src/main/java/ru/r2cloud/cloud/SatnogsClient.java

@@ -18,6 +18,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -57,12 +61,14 @@ public class SatnogsClient {
 	private final HttpClient httpclient;
 	private final String hostname;
 	private final Duration timeout;
+	private final long timeoutMillis;
 	private final Clock clock;
 
 	public SatnogsClient(Configuration config, Clock clock) {
 		this.hostname = config.getProperty("satnogs.hostname");
 		this.clock = clock;
-		this.timeout = Duration.ofMillis(config.getInteger("satnogs.connectionTimeout"));
+		this.timeoutMillis = config.getInteger("satnogs.connectionTimeout");
+		this.timeout = Duration.ofMillis(timeoutMillis);
 		this.httpclient = HttpClient.newBuilder().version(Version.HTTP_2).followRedirects(Redirect.NORMAL).connectTimeout(timeout).build();
 	}
 
@@ -491,7 +497,8 @@ private HttpResponse<String> sendWithRetry(HttpRequest request, HttpResponse.Bod
 		int currentRetry = 0;
 		while (true) {
 			try {
-				HttpResponse<String> result = httpclient.send(request, responseBodyHandler);
+				CompletableFuture<HttpResponse<String>> response = httpclient.sendAsync(request, responseBodyHandler);
+				HttpResponse<String> result = response.get(timeoutMillis, TimeUnit.MILLISECONDS);
 				// retry for any server-side errors
 				// can happen during server upgrade
 				if (result.statusCode() < 500) {
@@ -502,10 +509,10 @@ private HttpResponse<String> sendWithRetry(HttpRequest request, HttpResponse.Bod
 					return result;
 				}
 				LOG.info("unable to send. status code: {}. retry {}", result.statusCode(), currentRetry);
-			} catch (IOException e) {
+			} catch (ExecutionException | TimeoutException e) {
 				currentRetry++;
 				if (currentRetry > MAX_RETRIES) {
-					throw e;
+					throw new IOException(e);
 				}
 				Util.logIOException(LOG, false, "unable to send. retry " + currentRetry, e);
 			}

src/test/java/ru/r2cloud/SatnogsServerMock.java

@@ -21,7 +21,7 @@ public class SatnogsServerMock {
 	private HttpServer server;
 	private Set<String> pathsConfigured = new HashSet<>();
 	private String tleBase;
-	
+
 	public SatnogsServerMock() throws IOException {
 		server = HttpServer.create(new InetSocketAddress("localhost", 8007), 0);
 	}
@@ -31,15 +31,21 @@ public void setTleMockDirectory(String base) {
 	}
 
 	public void setSatellitesMock(String message, int code) {
+		setSatellitesMock(message, message.length(), code);
+	}
+
+	public void setSatellitesMock(String message, int messageLength, int code) {
 		HttpHandler mock = new HttpHandler() {
 
 			@Override
 			public void handle(HttpExchange exchange) throws IOException {
 				exchange.getResponseHeaders().add("Content-Type", "application/json");
-				exchange.sendResponseHeaders(code, message.length());
+				exchange.sendResponseHeaders(code, messageLength);
 				OutputStream os = exchange.getResponseBody();
 				os.write(message.getBytes(StandardCharsets.UTF_8));
-				os.close();
+				if (messageLength == message.length()) {
+					os.close();
+				}
 			}
 		};
 		addHandler(mock, "/api/satellites/");

src/test/java/ru/r2cloud/cloud/SatnogsClientTest.java

@@ -29,6 +29,15 @@ public class SatnogsClientTest {
 	@Rule
 	public TemporaryFolder tempFolder = new TemporaryFolder();
 
+	@Test
+	public void testPartialDownload() throws Exception {
+		String message = "{ \"test\": 1 }";
+		server.setSatellitesMock(message, message.length() * 2, 200);
+		server.setTransmittersMock(new JsonHttpResponse("satnogs/transmitters.json", 200));
+		server.setTleMockDirectory("satnogs");
+		assertTrue(client.loadSatellites().isEmpty());
+	}
+
 	@Test
 	public void testInvalidResponse() throws Exception {
 		server.setSatellitesMock(new JsonHttpResponse("satnogs/empty-response.json", 404));