cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-10-04 03:17:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Escl: Time out client if no data read after 10s

Browse Source
This commit is contained in:
Ben Olden-Cooligan 2024-04-13 13:05:22 -07:00
parent c974edcdac
commit 7603013ed7
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
NAPS2.Escl/Client/EsclClient.cs
View File

@ -172,7 +172,7 @@ public class EsclClient
url =>
{
Logger.LogDebug("ESCL GET {Url}", url);
return HttpClient.GetAsync(url);
return HttpClient.GetAsync(url, HttpCompletionOption.ResponseHeadersRead);
});
if (response.StatusCode == HttpStatusCode.ServiceUnavailable)
{
@ -190,9 +190,10 @@ public class EsclClient
response.EnsureSuccessStatusCode();
break;
}
var data = await ReadStreamWithPerReadTimeout(await response.Content.ReadAsStreamAsync(), 10_000);
var doc = new RawDocument
{
Data = await response.Content.ReadAsByteArrayAsync(),
Data = data,
ContentType = response.Content.Headers.ContentType?.MediaType,
ContentLocation = response.Content.Headers.ContentLocation?.ToString()
};
@ -210,6 +211,23 @@ public class EsclClient
}
}
private static async Task<byte[]> ReadStreamWithPerReadTimeout(Stream stream, int timeout)
{
// We expect the server to be continuously sending some kind of data - if reads take longer than the timeout,
// we assume that the connection has been disrupted.
MemoryStream tempStream = new MemoryStream();
byte[] buffer = new byte[4096];
while (true)
{
var cts = new CancellationTokenSource();
cts.CancelAfter(timeout);
int bytesRead = await stream.ReadAsync(buffer, 0, buffer.Length, cts.Token);
if (bytesRead == 0) break;
tempStream.Write(buffer, 0, bytesRead);
}
return tempStream.ToArray();
}
public async Task<string> ErrorDetails(EsclJob job)
{
var response = await WithHttpFallback(