diff --git a/LightlessSync/Services/UiFactory.cs b/LightlessSync/Services/UiFactory.cs index 9b90830..33ab3ae 100644 --- a/LightlessSync/Services/UiFactory.cs +++ b/LightlessSync/Services/UiFactory.cs @@ -105,6 +105,7 @@ public class UiFactory groupData: groupData, isLightfinderContext: isLightfinderContext, lightfinderCid: lightfinderCid, - performanceCollector: _performanceCollectorService); + performanceCollector: _performanceCollectorService, + _apiController); } } diff --git a/LightlessSync/UI/SettingsUi.cs b/LightlessSync/UI/SettingsUi.cs index a0c1787..1c86580 100644 --- a/LightlessSync/UI/SettingsUi.cs +++ b/LightlessSync/UI/SettingsUi.cs @@ -84,6 +84,8 @@ public class SettingsUi : WindowMediatorSubscriberBase private bool _pairDiagnosticsEnabled; private string? _selectedPairDebugUid = null; private string _lightfinderIconInput = string.Empty; + private bool _showLightfinderRendererWarning = false; + private LightfinderLabelRenderer _pendingLightfinderRenderer = LightfinderLabelRenderer.Pictomancy; private bool _lightfinderIconInputInitialized = false; private int _lightfinderIconPresetIndex = -1; private static readonly LightlessConfig DefaultConfig = new(); @@ -2372,7 +2374,7 @@ public class SettingsUi : WindowMediatorSubscriberBase var labelRenderer = _configService.Current.LightfinderLabelRenderer; var labelRendererLabel = labelRenderer switch { - LightfinderLabelRenderer.SignatureHook => "Native nameplate (sig hook)", + LightfinderLabelRenderer.SignatureHook => "Native Nameplate Rendering", _ => "ImGui Overlay", }; @@ -2382,18 +2384,25 @@ public class SettingsUi : WindowMediatorSubscriberBase { var optionLabel = option switch { - LightfinderLabelRenderer.SignatureHook => "Native Nameplate (sig hook)", + LightfinderLabelRenderer.SignatureHook => "Native Nameplate Rendering", _ => "ImGui Overlay", }; var selected = option == labelRenderer; if (ImGui.Selectable(optionLabel, selected)) { - _configService.Current.LightfinderLabelRenderer = option; - _configService.Save(); - _nameplateService.RequestRedraw(); + if (option == LightfinderLabelRenderer.SignatureHook) + { + _pendingLightfinderRenderer = option; + _showLightfinderRendererWarning = true; + } + else + { + _configService.Current.LightfinderLabelRenderer = option; + _configService.Save(); + _nameplateService.RequestRedraw(); + } } - if (selected) ImGui.SetItemDefaultFocus(); } @@ -2401,6 +2410,34 @@ public class SettingsUi : WindowMediatorSubscriberBase ImGui.EndCombo(); } + if (_showLightfinderRendererWarning) + { + ImGui.SetNextWindowSize(new Vector2(450f, 0f), ImGuiCond.Appearing); + ImGui.OpenPopup("Nameplate Warning"); + } + + if (ImGui.BeginPopupModal("Nameplate Warning", ref _showLightfinderRendererWarning, ImGuiWindowFlags.AlwaysAutoResize)) + { + ImGui.TextColored(UIColors.Get("DimRed"), "USE AT YOUR RISK!"); + ImGui.Spacing(); + ImGui.TextWrapped("Writing on to the native Nameplates is known to be unstable and MAY cause crashes. DO NOT REPORT THOSE CRASHES TO DALAMUD. We will also not be supporting Nameplate crashes. You have been warned."); + ImGui.Spacing(); + ImGui.TextWrapped("By accepting this warning, you understand that you are using this feature at risk of crashing."); + ImGui.Spacing(); + + var buttonWidth = ImGui.GetContentRegionAvail().X; + if (ImGui.Button("I Understand", new Vector2(buttonWidth, 0))) + { + _configService.Current.LightfinderLabelRenderer = _pendingLightfinderRenderer; + _configService.Save(); + _nameplateService.RequestRedraw(); + _showLightfinderRendererWarning = false; + ImGui.CloseCurrentPopup(); + } + + ImGui.EndPopup(); + } + _uiShared.DrawHelpText("Choose how Lightfinder labels render: the default ImGui overlay or native nameplate nodes via signature hook."); UiSharedService.ColoredSeparator(UIColors.Get("LightlessPurpleDefault"), 1.5f); diff --git a/LightlessSync/UI/StandaloneProfileUi.cs b/LightlessSync/UI/StandaloneProfileUi.cs index d1ebdbe..c33c522 100644 --- a/LightlessSync/UI/StandaloneProfileUi.cs +++ b/LightlessSync/UI/StandaloneProfileUi.cs @@ -11,6 +11,7 @@ using LightlessSync.Services.ServerConfiguration; using LightlessSync.UI.Services; using LightlessSync.UI.Tags; using LightlessSync.Utils; +using LightlessSync.WebAPI; using Microsoft.Extensions.Logging; using System.Numerics; @@ -22,6 +23,7 @@ public class StandaloneProfileUi : WindowMediatorSubscriberBase private readonly PairUiService _pairUiService; private readonly ServerConfigurationManager _serverManager; private readonly ProfileTagService _profileTagService; + private readonly ApiController _apiController; private readonly UiSharedService _uiSharedService; private readonly UserData? _userData; private readonly GroupData? _groupData; @@ -60,7 +62,8 @@ public class StandaloneProfileUi : WindowMediatorSubscriberBase GroupData? groupData, bool isLightfinderContext, string? lightfinderCid, - PerformanceCollectorService performanceCollector) + PerformanceCollectorService performanceCollector, + ApiController apiController) : base(logger, mediator, BuildWindowTitle( userData, groupData, @@ -94,6 +97,7 @@ public class StandaloneProfileUi : WindowMediatorSubscriberBase .Apply(); IsOpen = true; + _apiController = apiController; } public Pair? Pair { get; } @@ -248,19 +252,33 @@ public class StandaloneProfileUi : WindowMediatorSubscriberBase ResetBannerTexture(); _lastBannerPicture = bannerBytes; } - string? noteText = null; - string statusLabel = _isLightfinderContext ? "Exploring" : "Offline"; + + var isSelfProfile = !_isLightfinderContext + && _userData is not null + && !string.IsNullOrEmpty(_apiController.UID) + && string.Equals(_userData.UID, _apiController.UID, StringComparison.Ordinal); + + string statusLabel = _isLightfinderContext + ? "Exploring" + : isSelfProfile ? "Online" : "Offline"; + string? visiblePlayerName = null; bool directPair = false; bool youPaused = false; bool theyPaused = false; List syncshellLines = []; + if (!_isLightfinderContext) + { + noteText = _serverManager.GetNoteForUid(_userData!.UID); + } + if (!_isLightfinderContext && Pair != null) { var snapshot = _pairUiService.GetSnapshot(); noteText = _serverManager.GetNoteForUid(Pair.UserData.UID); + statusLabel = Pair.IsVisible ? "Visible" : (Pair.IsOnline ? "Online" : "Offline"); visiblePlayerName = Pair.IsVisible ? Pair.PlayerName : null; @@ -282,11 +300,15 @@ public class StandaloneProfileUi : WindowMediatorSubscriberBase var groupLabel = snapshot.GroupsByGid.TryGetValue(gid, out var groupInfo) ? groupInfo.GroupAliasOrGID : gid; + var groupNote = _serverManager.GetNoteForGid(gid); syncshellLines.Add(string.IsNullOrEmpty(groupNote) ? groupLabel : $"{groupNote} ({groupLabel})"); } } } + + if (isSelfProfile) + statusLabel = "Online"; } var presenceTokens = new List diff --git a/LightlessSync/WebAPI/Files/FileDownloadManager.cs b/LightlessSync/WebAPI/Files/FileDownloadManager.cs index 47774f7..2731619 100644 --- a/LightlessSync/WebAPI/Files/FileDownloadManager.cs +++ b/LightlessSync/WebAPI/Files/FileDownloadManager.cs @@ -28,6 +28,8 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase private readonly TextureMetadataHelper _textureMetadataHelper; private readonly ConcurrentDictionary _activeDownloadStreams; + private readonly SemaphoreSlim _decompressGate = + new(Math.Max(1, Environment.ProcessorCount / 2), Math.Max(1, Environment.ProcessorCount / 2)); private volatile bool _disableDirectDownloads; private int _consecutiveDirectDownloadFailures; @@ -522,32 +524,57 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase try { + // sanity check length if (fileLengthBytes < 0 || fileLengthBytes > int.MaxValue) throw new InvalidDataException($"Invalid block entry length: {fileLengthBytes}"); + // safe cast after check + var len = checked((int)fileLengthBytes); + if (!replacementLookup.TryGetValue(fileHash, out var repl)) { Logger.LogWarning("{dlName}: No replacement mapping for {fileHash}", downloadLabel, fileHash); - // still need to skip bytes: - var skip = checked((int)fileLengthBytes); - fileBlockStream.Position += skip; + fileBlockStream.Seek(len, SeekOrigin.Current); continue; } + // decompress var filePath = _fileDbManager.GetCacheFilePath(fileHash, repl.Extension); + Logger.LogTrace("{dlName}: Decompressing {file}:{len} => {dest}", downloadLabel, fileHash, fileLengthBytes, filePath); - Logger.LogDebug("{dlName}: Decompressing {file}:{len} => {dest}", downloadLabel, fileHash, fileLengthBytes, filePath); - - var len = checked((int)fileLengthBytes); + // read compressed data var compressed = new byte[len]; - await ReadExactlyAsync(fileBlockStream, compressed.AsMemory(0, len), ct).ConfigureAwait(false); - MungeBuffer(compressed); - var decompressed = LZ4Wrapper.Unwrap(compressed); + if (len == 0) + { + await _fileCompactor.WriteAllBytesAsync(filePath, Array.Empty(), ct).ConfigureAwait(false); + PersistFileToStorage(fileHash, filePath, repl.GamePath, skipDownscale); + continue; + } - await _fileCompactor.WriteAllBytesAsync(filePath, decompressed, ct).ConfigureAwait(false); - PersistFileToStorage(fileHash, filePath, repl.GamePath, skipDownscale); + MungeBuffer(compressed); + + // limit concurrent decompressions + await _decompressGate.WaitAsync(ct).ConfigureAwait(false); + try + { + var sw = System.Diagnostics.Stopwatch.StartNew(); + + // decompress + var decompressed = LZ4Wrapper.Unwrap(compressed); + + Logger.LogTrace("{dlName}: Unwrap {fileHash} took {ms}ms (compressed {c} bytes, decompressed {d} bytes)", + downloadLabel, fileHash, sw.ElapsedMilliseconds, compressed.Length, decompressed?.Length ?? -1); + + // write to file + await _fileCompactor.WriteAllBytesAsync(filePath, decompressed, ct).ConfigureAwait(false); + PersistFileToStorage(fileHash, filePath, repl.GamePath, skipDownscale); + } + finally + { + _decompressGate.Release(); + } } catch (EndOfStreamException) { @@ -605,20 +632,16 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase .. await FilesGetSizes(hashes, ct).ConfigureAwait(false), ]; - Logger.LogDebug("Files with size 0 or less: {files}", - string.Join(", ", downloadFileInfoFromService.Where(f => f.Size <= 0).Select(f => f.Hash))); - foreach (var dto in downloadFileInfoFromService.Where(c => c.IsForbidden)) { if (!_orchestrator.ForbiddenTransfers.Exists(f => string.Equals(f.Hash, dto.Hash, StringComparison.Ordinal))) _orchestrator.ForbiddenTransfers.Add(new DownloadFileTransfer(dto)); } - CurrentDownloads = downloadFileInfoFromService + CurrentDownloads = [.. downloadFileInfoFromService .Distinct() .Select(d => new DownloadFileTransfer(d)) - .Where(d => d.CanBeTransferred) - .ToList(); + .Where(d => d.CanBeTransferred)]; return CurrentDownloads; }