t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tabs->spaces etc

Browse Source
This commit is contained in:
Loporrit
2025-06-30 13:38:45 +00:00
parent 91e4b36571
commit 810bf78d9c
9 changed files with 80 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MareSynchronos/WebAPI/Files/FileDownloadManager.cs
View File

@@ -8,7 +8,6 @@ using MareSynchronos.PlayerData.Handlers;
using MareSynchronos.Services.Mediator;
using MareSynchronos.Utils;
using MareSynchronos.WebAPI.Files.Models;
using MareSynchronosStaticFilesServer.Utils;
using Microsoft.Extensions.Logging;
using System.Net;
using System.Net.Http.Json;
@@ -189,7 +188,7 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
{
throw;
}
catch (Exception ex)
catch (Exception)
{
try
{

38
MareSynchronos/WebAPI/SignalR/HubConnectionConfig.cs
View File

@@ -5,8 +5,8 @@ namespace MareSynchronos.WebAPI.SignalR;
public record HubConnectionConfig
{
[JsonPropertyName("hub_url")]
public string HubUrl { get; set; } = string.Empty;
[JsonPropertyName("hub_url")]
public string HubUrl { get; set; } = string.Empty;
private readonly bool? _skipNegotiation;
@@ -20,28 +20,28 @@ public record HubConnectionConfig
[JsonPropertyName("transports")]
public string[]? Transports { get; set; }
[JsonIgnore]
public HttpTransportType TransportType
{
get
{
if (Transports == null || Transports.Length == 0)
return HttpTransportType.WebSockets;
[JsonIgnore]
public HttpTransportType TransportType
{
get
{
if (Transports == null || Transports.Length == 0)
return HttpTransportType.WebSockets;
HttpTransportType result = HttpTransportType.None;
foreach (var transport in Transports)
{
result |= transport.ToLowerInvariant() switch
{
"websockets" => HttpTransportType.WebSockets,
"serversentevents" => HttpTransportType.ServerSentEvents,
"longpolling" => HttpTransportType.LongPolling,
_ => HttpTransportType.None
};
result |= transport.ToLowerInvariant() switch
{
"websockets" => HttpTransportType.WebSockets,
"serversentevents" => HttpTransportType.ServerSentEvents,
"longpolling" => HttpTransportType.LongPolling,
_ => HttpTransportType.None
};
};
return result;
}
}
return result;
}
}
}

1
MareSynchronos/WebAPI/SignalR/HubFactory.cs
View File

@@ -119,7 +119,6 @@ public class HubFactory : MediatorSubscriberBase
var ver = Assembly.GetExecutingAssembly().GetName().Version;
httpClient.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("MareSynchronos", ver!.Major + "." + ver!.Minor + "." + ver!.Build));
// Make a GET request to the loporrit endpoint
var response = await httpClient.GetAsync(wellKnownUrl).ConfigureAwait(false);
if (!response.IsSuccessStatusCode)

10
MareSynchronos/WebAPI/SignalR/TokenProvider.cs
View File

@@ -7,7 +7,7 @@ using MareSynchronos.Utils;
using MareSynchronos.API.Dto;
using Microsoft.Extensions.Logging;
using System.Collections.Concurrent;
using System.IdentityModel.Tokens.Jwt;
using System.Net;
using System.Net.Http.Headers;
using System.Net.Http.Json;
using System.Reflection;
@@ -76,7 +76,7 @@ public sealed class TokenProvider : IDisposable, IMediatorSubscriber
new KeyValuePair<string, string>("charaIdent", await _dalamudUtil.GetPlayerNameHashedAsync().ConfigureAwait(false)),
}), token).ConfigureAwait(false);
if (!result.IsSuccessStatusCode)
if (result.StatusCode == HttpStatusCode.NotFound)
{
tokenUri = MareAuth.AuthFullPath(new Uri(_serverManager.CurrentApiUrl
.Replace("wss://", "https://", StringComparison.OrdinalIgnoreCase)
@@ -87,14 +87,14 @@ public sealed class TokenProvider : IDisposable, IMediatorSubscriber
new KeyValuePair<string, string>("charaIdent", await _dalamudUtil.GetPlayerNameHashedAsync().ConfigureAwait(false)),
}), token).ConfigureAwait(false);
var textResponse = await result.Content.ReadAsStringAsync().ConfigureAwait(false) ?? string.Empty;
var textResponse = await result.Content.ReadAsStringAsync(token).ConfigureAwait(false) ?? string.Empty;
result.EnsureSuccessStatusCode();
_tokenCache[identifier] = textResponse;
_wellKnownCache[_serverManager.CurrentApiUrl] = null;
return textResponse;
}
var response = await result.Content.ReadFromJsonAsync<AuthReplyDto>().ConfigureAwait(false) ?? new();
var response = await result.Content.ReadFromJsonAsync<AuthReplyDto>(token).ConfigureAwait(false) ?? new();
result.EnsureSuccessStatusCode();
_tokenCache[identifier] = response.Token;
_wellKnownCache[_serverManager.CurrentApiUrl] = response.WellKnown;
@@ -107,7 +107,7 @@ public sealed class TokenProvider : IDisposable, IMediatorSubscriber
_logger.LogError(ex, "GetNewToken: Failure to get token");
if (ex.StatusCode == System.Net.HttpStatusCode.Unauthorized)
if (ex.StatusCode == HttpStatusCode.Unauthorized)
{
Mediator.Publish(new NotificationMessage("Error refreshing token", "Your authentication token could not be renewed. Try reconnecting manually.", NotificationType.Error));
Mediator.Publish(new DisconnectedMessage());