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

10
MareSynchronos/MareConfiguration/Models/TextureShrinkMode.cs
View File

@@ -2,9 +2,9 @@
public enum TextureShrinkMode
{
Never,
Default,
DefaultHiRes,
Always,
AlwaysHiRes
Never,
Default,
DefaultHiRes,
Always,
AlwaysHiRes
}

14
MareSynchronos/MareSynchronos.json
View File

@@ -1,14 +0,0 @@
{
"Author": "darkarchon",
"Name": "Mare Synchronos",
"Punchline": "Let others see you as you see yourself.",
"Description": "This plugin will synchronize your Penumbra mods and current Glamourer state with other paired clients automatically.",
"InternalName": "mareSynchronos",
"ApplicableVersion": "any",
"Tags": [
"customization"
],
"IconUrl": "https://raw.githubusercontent.com/Penumbra-Sync/client/main/MareSynchronos/images/logo.png",
"RepoUrl": "https://github.com/Penumbra-Sync/client",
"CanUnloadAsync": true
}

42
MareSynchronos/Utils/ChatUtils.cs
View File

@@ -6,29 +6,29 @@ namespace MareSynchronos.Utils;
public static class ChatUtils
{
// Based on https://git.anna.lgbt/anna/ExtraChat/src/branch/main/client/ExtraChat/Util/PayloadUtil.cs
// This must store a Guid (16 bytes), as Chat 2 converts the data back to one
// Based on https://git.anna.lgbt/anna/ExtraChat/src/branch/main/client/ExtraChat/Util/PayloadUtil.cs
// This must store a Guid (16 bytes), as Chat 2 converts the data back to one
public static RawPayload CreateExtraChatTagPayload(Guid guid)
{
var header = (byte[])[
0x02, // Payload.START_BYTE
0x27, // SeStringChunkType.Interactable
2 + 16, // remaining length: ExtraChat sends 19 here but I think its an error
0x20 // Custom ExtraChat InfoType
];
public static RawPayload CreateExtraChatTagPayload(Guid guid)
{
var header = (byte[])[
0x02, // Payload.START_BYTE
0x27, // SeStringChunkType.Interactable
2 + 16, // remaining length: ExtraChat sends 19 here but I think its an error
0x20 // Custom ExtraChat InfoType
];
var footer = (byte)0x03; // Payload.END_BYTE
var footer = (byte)0x03; // Payload.END_BYTE
return new RawPayload([..header, ..guid.ToByteArray(), footer]);
}
return new RawPayload([..header, ..guid.ToByteArray(), footer]);
}
// We have a unique identifier in the form of a GID, which can be consistently mapped to the same GUID
public static RawPayload CreateExtraChatTagPayload(string gid)
{
var gidBytes = UTF8Encoding.UTF8.GetBytes(gid);
var hashedBytes = MD5.HashData(gidBytes);
var guid = new Guid(hashedBytes);
return CreateExtraChatTagPayload(guid);
}
// We have a unique identifier in the form of a GID, which can be consistently mapped to the same GUID
public static RawPayload CreateExtraChatTagPayload(string gid)
{
var gidBytes = UTF8Encoding.UTF8.GetBytes(gid);
var hashedBytes = MD5.HashData(gidBytes);
var guid = new Guid(hashedBytes);
return CreateExtraChatTagPayload(guid);
}
}

2
MareSynchronos/Utils/HashingStream.cs
View File

@@ -1,6 +1,6 @@
using System.Security.Cryptography;
namespace MareSynchronosStaticFilesServer.Utils;
namespace MareSynchronos.Utils;
// Calculates the hash of content read or written to a stream
public class HashingStream : Stream

56
MareSynchronos/Utils/LimitedStream.cs
View File

@@ -4,8 +4,8 @@ namespace MareSynchronos.Utils;
public class LimitedStream : Stream
{
private readonly Stream _stream;
public long _estimatedPosition = 0;
public long MaxPosition { get; private init; }
public long _estimatedPosition = 0;
public long MaxPosition { get; private init; }
public bool DisposeUnderlying = true;
public Stream UnderlyingStream { get => _stream; }
@@ -13,12 +13,12 @@ public class LimitedStream : Stream
public LimitedStream(Stream underlyingStream, long byteLimit)
{
_stream = underlyingStream;
try
{
_estimatedPosition = Position;
}
catch { }
MaxPosition = _estimatedPosition + byteLimit;
try
{
_estimatedPosition = Position;
}
catch { }
MaxPosition = _estimatedPosition + byteLimit;
}
protected override void Dispose(bool disposing)
@@ -42,33 +42,33 @@ public class LimitedStream : Stream
public override int Read(byte[] buffer, int offset, int count)
{
int remainder = (int)long.Clamp(MaxPosition - _estimatedPosition, 0, int.MaxValue);
int remainder = (int)long.Clamp(MaxPosition - _estimatedPosition, 0, int.MaxValue);
if (count > remainder)
count = remainder;
if (count > remainder)
count = remainder;
int n = _stream.Read(buffer, offset, count);
_estimatedPosition += n;
return n;
_estimatedPosition += n;
return n;
}
public async override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
{
int remainder = (int)long.Clamp(MaxPosition - _estimatedPosition, 0, int.MaxValue);
int remainder = (int)long.Clamp(MaxPosition - _estimatedPosition, 0, int.MaxValue);
if (count > remainder)
count = remainder;
if (count > remainder)
count = remainder;
int n = await _stream.ReadAsync(buffer, offset, count, cancellationToken);
_estimatedPosition += n;
return n;
_estimatedPosition += n;
return n;
}
public override long Seek(long offset, SeekOrigin origin)
{
long result = _stream.Seek(offset, origin);
_estimatedPosition = result;
return result;
_estimatedPosition = result;
return result;
}
public override void SetLength(long value)
@@ -78,23 +78,23 @@ public class LimitedStream : Stream
public override void Write(byte[] buffer, int offset, int count)
{
int remainder = (int)long.Clamp(MaxPosition - _estimatedPosition, 0, int.MaxValue);
int remainder = (int)long.Clamp(MaxPosition - _estimatedPosition, 0, int.MaxValue);
if (count > remainder)
count = remainder;
if (count > remainder)
count = remainder;
_stream.Write(buffer, offset, count);
_estimatedPosition += count;
_estimatedPosition += count;
}
public async override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
{
int remainder = (int)long.Clamp(MaxPosition - _estimatedPosition, 0, int.MaxValue);
int remainder = (int)long.Clamp(MaxPosition - _estimatedPosition, 0, int.MaxValue);
if (count > remainder)
count = remainder;
if (count > remainder)
count = remainder;
await _stream.WriteAsync(buffer, offset, count, cancellationToken);
_estimatedPosition += count;
_estimatedPosition += count;
}
}

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());