Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixes the EventQueue - it sometimes randomly dies and never recovers.

Browse Source 
* I'm not a big fan of this code to be perfectly honest. It probably can be fixed better. There's possibly an error on the simulator side, or in this code, that I haven't managed to locate, when the EventQueue has an early return rather than long-polling as it should, and it's triggered by this code. Not sure if the official viewer suffers the same fault (possibly.)
This commit is contained in:
Adam Frisby
2024-08-02 03:15:20 +10:00
committed by Cinder Roxley
parent f9373fc523
commit 9569a1dea8
3 changed files with 347 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
LibreMetaverse/Capabilities/HttpCapsClient.cs
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022-2023, Sjofn, LLC.
* Copyright (c) 2022-2024, Sjofn, LLC.
* All rights reserved.
*
* - Redistribution and use in source and binary forms, with or without
@@ -30,6 +30,7 @@ using System.Net.Http;
using System.Net.Http.Headers;
using System.Threading;
using System.Threading.Tasks;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
namespace LibreMetaverse
@@ -95,9 +96,16 @@ namespace LibreMetaverse
SerializeData(format, payload, out var serialized, out var contentType);
using (var request = new HttpRequestMessage(HttpMethod.Post, uri))
{
request.Content = new ByteArrayContent(serialized);
request.Content.Headers.ContentType = contentType;
await SendRequestAsync(request, cancellationToken, completeHandler, progressHandler, connectedHandler);
try
{
request.Content = new ByteArrayContent(serialized);
request.Content.Headers.ContentType = contentType;
await SendRequestAsync(request, cancellationToken, completeHandler, progressHandler, connectedHandler);
}
catch (Exception e)
{
Logger.Log("Error in HTTP request; " + e, Helpers.LogLevel.Error, null, e);
}
}
}
@@ -237,13 +245,15 @@ namespace LibreMetaverse
try
{
using (var response = (cancellationToken.HasValue)
? await SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken.Value)
: await SendAsync(request, HttpCompletionOption.ResponseHeadersRead))
? await SendAsync(request, HttpCompletionOption.ResponseHeadersRead,
cancellationToken.Value)
: await SendAsync(request, HttpCompletionOption.ResponseHeadersRead))
{
if (!response.IsSuccessStatusCode)
{
completeHandler?.Invoke(response, null,
new HttpRequestException(response.StatusCode + " " + response.ReasonPhrase));
new HttpRequestException(response.StatusCode + " " +
response.ReasonPhrase));
}
connectedHandler?.Invoke(response);
@@ -251,9 +261,17 @@ namespace LibreMetaverse
await ProcessResponseAsync(response, cancellationToken, completeHandler, progressHandler);
}
}
catch (HttpRequestException ex)
catch (TaskCanceledException)
{
completeHandler?.Invoke(null, null, ex);
/* noop */
}
catch (HttpRequestException httpReqEx)
{
completeHandler?.Invoke(null, null, httpReqEx);
}
catch (IOException ioex)
{
completeHandler?.Invoke(null, null, ioex);
}
}