chore(release): merge dev into main for v0.4.7

Author: BAKAOLC

Combat/Ui/ExtraCornerAmountLabels/ExtraCornerAmountLabelsRuntime.cs

@@ -232,7 +232,13 @@ private static void SyncAnchoredSlotHosts(
                     pool.Add(new());
 
                 var entry = pool[writeIndex];
-                var live = GetOrCreateSlotLabel(host, entry, slotNamePrefix, writeIndex, slot.TextMode);
+                var live = GetOrCreateSlotLabel(
+                    host,
+                    entry,
+                    slotNamePrefix,
+                    writeIndex,
+                    slot.TextMode,
+                    applyHostStyle);
                 applyHostStyle(live);
                 ApplySlotColorOverrides(live, in slot);
 
@@ -253,7 +259,8 @@ private static Control GetOrCreateSlotLabel(
             AnchoredSlotHost entry,
             string slotNamePrefix,
             int slotIndex,
-            ExtraIconAmountLabelTextMode textMode)
+            ExtraIconAmountLabelTextMode textMode,
+            Action<Control> applyHostStyle)
         {
             if (GodotObject.IsInstanceValid(entry.Label) && entry.TextMode == textMode &&
                 LabelMatchesTextMode(entry.Label, textMode))
@@ -263,6 +270,7 @@ private static Control GetOrCreateSlotLabel(
                 entry.Label!.QueueFree();
 
             var label = CreateSlotLabel($"{slotNamePrefix}{slotIndex}", textMode);
+            applyHostStyle(label);
             host.AddChild(label);
             host.MoveChild(label, host.GetChildCount() - 1);
             entry.Label = label;

Const.cs

@@ -22,7 +22,7 @@ public static class Const
         ///     Assembly / manifest version string.
         ///     程序集/清单版本字符串。
         /// </summary>
-        public const string Version = "0.4.6";
+        public const string Version = "0.4.7";
 
         /// <summary>
         ///     Root key for RitsuLib JSON settings under the mod’s user folder.

Data/Models/RitsuLibSettings.cs

@@ -70,8 +70,8 @@ public sealed class RitsuLibSettings
         public bool DebugCompatAncientArchitect { get; set; } = true;
 
         /// <summary>
-        ///     Starts the loopback-only browser debug log viewer for this session.
-        ///     为本会话启动仅监听 loopback 的浏览器调试日志查看器。
+        ///     Starts the browser debug log viewer for this session. It listens on loopback unless LAN access is enabled.
+        ///     为本会话启动浏览器调试日志查看器；除非启用局域网访问，否则仅监听 loopback。
         /// </summary>
         [JsonPropertyName("debug_log_viewer_enabled")]
         public bool DebugLogViewerEnabled { get; set; } = true;
@@ -91,8 +91,15 @@ public sealed class RitsuLibSettings
         public bool DebugLogViewerAutoOpen { get; set; }
 
         /// <summary>
-        ///     Loopback HTTP port for the debug log viewer.
-        ///     调试日志查看器的 loopback HTTP 端口。
+        ///     When true, binds the debug log viewer to all network interfaces so devices on the same LAN can connect.
+        ///     为 true 时，调试日志查看器会监听所有网络接口，使同一局域网设备可以连接。
+        /// </summary>
+        [JsonPropertyName("debug_log_viewer_lan_access_enabled")]
+        public bool DebugLogViewerLanAccessEnabled { get; set; }
+
+        /// <summary>
+        ///     HTTP port for the debug log viewer.
+        ///     调试日志查看器的 HTTP 端口。
         /// </summary>
         [JsonPropertyName("debug_log_viewer_port")]
         public int DebugLogViewerPort { get; set; } = 18742;
@@ -105,8 +112,8 @@ public sealed class RitsuLibSettings
         public int DebugLogViewerPortFallbackCount { get; set; } = 20;
 
         /// <summary>
-        ///     Stable browser access token for the loopback debug log viewer.
-        ///     本机调试日志查看器使用的稳定浏览器访问 token。
+        ///     Stable browser access token for the debug log viewer.
+        ///     调试日志查看器使用的稳定浏览器访问 token。
         /// </summary>
         [JsonPropertyName("debug_log_viewer_access_token")]
         public string DebugLogViewerAccessToken { get; set; } = "";

Data/RitsuLibSettingsStore.cs

@@ -224,6 +224,7 @@ internal static RitsuDebugLogViewerOptions GetDebugLogViewerOptions()
                 s.DebugLogViewerEnabled,
                 s.DebugLogViewerMirrorGameLogs,
                 s.DebugLogViewerAutoOpen,
+                s.DebugLogViewerLanAccessEnabled,
                 Math.Clamp(s.DebugLogViewerPort, 1, 65535),
                 Math.Clamp(s.DebugLogViewerPortFallbackCount, 0, 100),
                 s.DebugLogViewerAccessToken,

Diagnostics/Logging/RitsuDebugLogPipeline.cs

@@ -2,6 +2,8 @@
 using System.Reflection;
 using Godot;
 using MegaCrit.Sts2.Core.Logging;
+using STS2RitsuLib.Utils;
+using Environment = System.Environment;
 
 namespace STS2RitsuLib.Diagnostics.Logging
 {
@@ -12,6 +14,8 @@ internal static class RitsuDebugLogPipeline
         private static readonly SemaphoreSlim QueueSignal = new(0);
         private static readonly TimeSpan InternalWarningInterval = TimeSpan.FromSeconds(30);
         private static readonly TimeSpan AutoOpenDelay = TimeSpan.FromSeconds(3);
+        private static readonly string SessionId = Guid.NewGuid().ToString("N");
+        private static readonly DateTimeOffset SessionStartedAtUtc = DateTimeOffset.UtcNow;
 
         private static CancellationTokenSource? _cts;
         private static RitsuDebugLogRingBuffer? _ring;
@@ -43,7 +47,12 @@ public static void Initialize(RitsuDebugLogViewerOptions options)
                     _ring = new(Math.Clamp(options.RingBufferCapacity, 512, 100000));
                     _cts = new();
 
-                    _server = new(options.AccessToken, Snapshot, BuildStatus, ResolveViewerAssetRoot());
+                    _server = new(
+                        options.AccessToken,
+                        options.LanAccessEnabled,
+                        Snapshot,
+                        BuildStatus,
+                        ResolveViewerAssetRoot());
                     _server.Start(options.Port, options.PortFallbackCount);
 
                     _worker = Task.Run(WorkerLoopAsync);
@@ -59,13 +68,12 @@ public static void Initialize(RitsuDebugLogViewerOptions options)
                     _initialized = true;
                     AppDomain.CurrentDomain.ProcessExit += OnProcessExit;
 
-                    RitsuLibFramework.Logger.Info(
-                        $"[DebugLogViewer] Local debug log viewer listening at {_server.Url}");
+                    RitsuLibFramework.Logger.Info(CreateViewerStartMessage(_server));
                 }
                 catch (Exception ex)
                 {
                     CleanupAfterFailedStart();
-                    RitsuLibFramework.Logger.Warn($"[DebugLogViewer] Failed to start local viewer: {ex.Message}");
+                    RitsuLibFramework.Logger.Warn($"[DebugLogViewer] Failed to start viewer: {ex.Message}");
                 }
             }
         }
@@ -96,7 +104,13 @@ public static object BuildStatus()
             return new
             {
                 enabled = _initialized,
+                sessionId = SessionId,
+                sessionStartedAtUtc = SessionStartedAtUtc,
+                processId = Environment.ProcessId,
                 url = ViewerUrl,
+                accessMode = _server?.AccessMode ?? "loopback",
+                lanAccessEnabled = _server?.LanAccessEnabled ?? false,
+                lanUrls = _server?.LanUrls ?? [],
                 clients = _server?.ClientCount ?? 0,
                 bufferCount = _ring?.Count ?? 0,
                 bufferCapacity = _ring?.Capacity ?? 0,
@@ -128,6 +142,17 @@ public static (bool Success, string Message) TryOpenViewerInBrowser()
                 : (false, $"Error {error}: Could not open browser. URL: {url}");
         }
 
+        private static string CreateViewerStartMessage(RitsuDebugLogViewerServer server)
+        {
+            if (!server.LanAccessEnabled)
+                return $"[DebugLogViewer] Local debug log viewer listening at {server.Url}";
+
+            var lanUrls = server.LanUrls;
+            return lanUrls.Count == 0
+                ? $"[DebugLogViewer] LAN debug log viewer listening at {server.Url}; no LAN IPv4 address was found."
+                : $"[DebugLogViewer] LAN debug log viewer listening at {server.Url}; LAN URLs: {string.Join(", ", lanUrls)}";
+        }
+
         private static async Task WorkerLoopAsync()
         {
             var token = _cts!.Token;
@@ -212,15 +237,22 @@ internal static void EmitGodotLogError(
 
         private static RitsuDebugLogRecord CreateFromGodotLog(string text, bool error)
         {
-            var (logLevel, unwrappedText) = ParseLevelPrefix(text, error);
-            var (source, category, body) = ParseFormattedLogText(unwrappedText);
+            var plainText = RitsuAnsiText.StripControlSequences(text);
+            var (logLevel, unwrappedText, unwrappedTextStart) = ParseLevelPrefix(plainText, error);
+            var (source, category, body, bodyStartInUnwrappedText) = ParseFormattedLogText(unwrappedText);
             var severityText = logLevel.ToString().ToUpperInvariant();
             var severityNumber = MapSeverityNumber(logLevel);
+            var bodyStart = unwrappedTextStart + bodyStartInUnwrappedText;
             var attributes = new Dictionary<string, object?>
             {
                 ["log.record.original"] = text,
                 ["ritsulib.log.mirrored_from_godot"] = true,
             };
+            if (!string.Equals(plainText, text, StringComparison.Ordinal))
+            {
+                attributes["ritsulib.log.ansi_stripped"] = true;
+                attributes["ritsulib.log.plain_text"] = plainText;
+            }
 
             if (!string.IsNullOrWhiteSpace(source))
                 attributes["ritsulib.log.source"] = source;
@@ -234,6 +266,7 @@ private static RitsuDebugLogRecord CreateFromGodotLog(string text, bool error)
                 SeverityText = severityText,
                 SeverityNumber = severityNumber,
                 Body = body,
+                BodySegments = BuildBodySegments(text, body, bodyStart),
                 Source = source,
                 Category = category,
                 LoggerName = source,
@@ -258,6 +291,9 @@ private static RitsuDebugLogRecord Normalize(RitsuDebugLogRecord record)
                 Id = id,
                 Timestamp = timestamp,
                 TimeUnixNano = ToUnixNanoString(timestamp),
+                BodySegments = record.BodySegments is { Count: > 0 }
+                    ? record.BodySegments
+                    : BuildPlainBodySegments(record.Body),
                 Resource = new Dictionary<string, object?>
                 {
                     ["service.name"] = Const.ModId,
@@ -272,49 +308,118 @@ private static RitsuDebugLogRecord Normalize(RitsuDebugLogRecord record)
             };
         }
 
-        private static (string? Source, string? Category, string Body) ParseFormattedLogText(string text)
+        private static (string? Source, string? Category, string Body, int BodyStart) ParseFormattedLogText(string text)
         {
             var remaining = text.TrimStart();
+            var remainingStart = text.Length - remaining.Length;
             if (!TryReadBracketPrefix(remaining, out var first, out remaining))
-                return (null, null, text);
+                return (null, null, text, 0);
 
             var source = first;
+            remainingStart += text[remainingStart..].Length - remaining.Length;
             remaining = remaining.TrimStart();
+            remainingStart += text[remainingStart..].Length - remaining.Length;
             string? category = null;
             if (!TryReadBracketPrefix(remaining, out var second, out var afterSecond))
-                return (source, category, remaining.Length == 0 ? text : remaining);
+                return remaining.Length == 0
+                    ? (source, category, text, 0)
+                    : (source, category, remaining, remainingStart);
+
             category = second;
+            remainingStart += remaining.Length - afterSecond.Length;
             remaining = afterSecond.TrimStart();
+            remainingStart += afterSecond.Length - remaining.Length;
 
-            return (source, category, remaining.Length == 0 ? text : remaining);
+            return remaining.Length == 0
+                ? (source, category, text, 0)
+                : (source, category, remaining, remainingStart);
         }
 
-        private static (LogLevel Level, string Text) ParseLevelPrefix(string text, bool error)
+        private static IReadOnlyList<RitsuTextSegment> BuildBodySegments(string rawText, string body, int bodyStart)
+        {
+            if (string.IsNullOrEmpty(body))
+                return [];
+
+            var segments = SliceVisibleSegments(RitsuAnsiText.ParseSegments(rawText), bodyStart, body.Length);
+            return segments.Count == 0 ? BuildPlainBodySegments(body) : segments;
+        }
+
+        private static IReadOnlyList<RitsuTextSegment> BuildPlainBodySegments(string body)
+        {
+            return string.IsNullOrEmpty(body) ? [] : [new() { Text = body }];
+        }
+
+        private static IReadOnlyList<RitsuTextSegment> SliceVisibleSegments(
+            IReadOnlyList<RitsuTextSegment> segments,
+            int start,
+            int length)
+        {
+            if (segments.Count == 0 || start < 0 || length <= 0)
+                return [];
+
+            var result = new List<RitsuTextSegment>();
+            var end = start + length;
+            var position = 0;
+            foreach (var segment in segments)
+            {
+                var nextPosition = position + segment.Text.Length;
+                if (nextPosition <= start)
+                {
+                    position = nextPosition;
+                    continue;
+                }
+
+                if (position >= end)
+                    break;
+
+                var segmentStart = Math.Max(0, start - position);
+                var segmentEnd = Math.Min(segment.Text.Length, end - position);
+                if (segmentEnd > segmentStart)
+                    result.Add(segment with { Text = segment.Text[segmentStart..segmentEnd] });
+
+                position = nextPosition;
+            }
+
+            return result;
+        }
+
+        private static (LogLevel Level, string Text, int TextStart) ParseLevelPrefix(string text, bool error)
         {
             if (error)
-                return (LogLevel.Error, StripKnownLevelPrefix(text));
+            {
+                var (strippedText, strippedTextStart) = StripKnownLevelPrefix(text);
+                return (LogLevel.Error, strippedText, strippedTextStart);
+            }
 
             var trimmed = text.TrimStart();
+            var trimmedStart = text.Length - trimmed.Length;
             if (TryReadBracketPrefix(trimmed, out var bracketLevel, out var afterBracket) &&
                 TryParseLogLevel(bracketLevel, out var level))
-                return (level, afterBracket.TrimStart());
+            {
+                var afterBracketStart = trimmedStart + trimmed.Length - afterBracket.Length;
+                var afterBracketTrimmed = afterBracket.TrimStart();
+                var afterBracketTrimmedStart = afterBracketStart + afterBracket.Length - afterBracketTrimmed.Length;
+                return (level, afterBracketTrimmed, afterBracketTrimmedStart);
+            }
 
             var colon = trimmed.IndexOf(':');
-            if (colon is > 0 and <= 10 &&
-                TryParseLogLevel(trimmed[..colon], out level))
-                return (level, trimmed[(colon + 1)..].TrimStart());
-
-            return (LogLevel.Info, text);
+            if (colon is <= 0 or > 10 ||
+                !TryParseLogLevel(trimmed[..colon], out level)) return (LogLevel.Info, text, 0);
+            var afterColon = trimmed[(colon + 1)..];
+            var afterColonTrimmed = afterColon.TrimStart();
+            var afterColonTrimmedStart = trimmedStart + colon + 1 + afterColon.Length - afterColonTrimmed.Length;
+            return (level, afterColonTrimmed, afterColonTrimmedStart);
         }
 
-        private static string StripKnownLevelPrefix(string text)
+        private static (string Text, int TextStart) StripKnownLevelPrefix(string text)
         {
             var trimmed = text.TrimStart();
-            if (TryReadBracketPrefix(trimmed, out var bracketLevel, out var afterBracket) &&
-                TryParseLogLevel(bracketLevel, out _))
-                return afterBracket.TrimStart();
-
-            return text;
+            var trimmedStart = text.Length - trimmed.Length;
+            if (!TryReadBracketPrefix(trimmed, out var bracketLevel, out var afterBracket) ||
+                !TryParseLogLevel(bracketLevel, out _)) return (text, 0);
+            var afterBracketStart = trimmedStart + trimmed.Length - afterBracket.Length;
+            var afterBracketTrimmed = afterBracket.TrimStart();
+            return (afterBracketTrimmed, afterBracketStart + afterBracket.Length - afterBracketTrimmed.Length);
         }
 
         private static bool TryParseLogLevel(string value, out LogLevel level)
@@ -339,7 +444,7 @@ private static bool TryReadBracketPrefix(string text, out string value, out stri
             value = "";
             remaining = text;
 
-            if (!text.StartsWith("[", StringComparison.Ordinal))
+            if (!text.StartsWith('['))
                 return false;
 
             var end = text.IndexOf(']', 1);

Diagnostics/Logging/RitsuDebugLogRecord.cs

@@ -1,4 +1,5 @@
 using System.Text.Json.Serialization;
+using STS2RitsuLib.Utils;
 
 namespace STS2RitsuLib.Diagnostics.Logging
 {
@@ -20,6 +21,8 @@ internal sealed record RitsuDebugLogRecord
 
         [JsonPropertyName("body")] public string Body { get; init; } = "";
 
+        [JsonPropertyName("bodySegments")] public IReadOnlyList<RitsuTextSegment>? BodySegments { get; init; }
+
         [JsonPropertyName("source")] public string? Source { get; init; }
 
         [JsonPropertyName("category")] public string? Category { get; init; }

Diagnostics/Logging/RitsuDebugLogViewerOptions.cs

@@ -4,6 +4,7 @@ internal sealed record RitsuDebugLogViewerOptions(
         bool Enabled,
         bool MirrorGameLogs,
         bool AutoOpen,
+        bool LanAccessEnabled,
         int Port,
         int PortFallbackCount,
         string AccessToken,