Merge pull request #76 from CedaryCat/develop

Develop

Author: CedaryCat

README.md

@@ -285,30 +285,36 @@ Startup precedence is:
 
 On interactive terminals, missing port/password prompts use semantic readline with ghost text, rotating suggestions, and live validation/status lines; non-interactive hosts fall back automatically.
 
-`launcher.consoleStatusThresholds` controls command-line status bar thresholding, and `launcher.colorfulConsoleStatus` toggles the vivid ANSI palette when the terminal supports it:
+`launcher.consoleStatus` controls command-line status rendering. `launcher.colorfulConsoleStatus` still toggles the vivid ANSI palette, while `launcher.consoleStatus.bandwidthUnit` selects `bytes` (`KB/s -> MB/s -> GB/s -> TB/s`, default) or `bits` (`Kbps -> Mbps -> Gbps -> Tbps`), and `launcher.consoleStatus.bandwidthRolloverThreshold` controls when the formatter promotes to the next unit family step (default: `500.0`).
 
 <details>
-<summary><strong>Default status-threshold values</strong></summary>
+<summary><strong>Default console-status values</strong></summary>
 
 | Key | Unit | Default | Description |
 |:--|:--|:--|:--|
 | `targetUps` | UPS | `60.0` | Target update rate used as the baseline for TPS health checks |
-| `healthyUpsDeviation` | UPS delta | `1.2` | Maximum absolute deviation from `targetUps` that still counts as healthy |
-| `warningUpsDeviation` | UPS delta | `4.0` | Maximum absolute deviation from `targetUps` that still counts as warning before turning bad |
-| `utilHealthyMax` | ratio (`0.0`-`1.0`) | `0.50` | Highest busy-utilization value that still counts as healthy |
+| `healthyUpsDeviation` | UPS delta | `2.0` | Maximum absolute deviation from `targetUps` that still counts as healthy |
+| `warningUpsDeviation` | UPS delta | `5.0` | Maximum absolute deviation from `targetUps` that still counts as warning before turning bad |
+| `utilHealthyMax` | ratio (`0.0`-`1.0`) | `0.55` | Highest busy-utilization value that still counts as healthy |
 | `utilWarningMax` | ratio (`0.0`-`1.0`) | `0.80` | Highest busy-utilization value that still counts as warning before turning bad |
 | `onlineWarnRemainingSlots` | slots | `5` | Remaining player slots at or below this value turn the online indicator to warning |
 | `onlineBadRemainingSlots` | slots | `0` | Remaining player slots at or below this value turn the online indicator to bad/full |
-| `upWarnKbps` | KB/s | `65.0` | Upstream bandwidth threshold that turns the network indicator to warning |
-| `upBadKbps` | KB/s | `75.0` | Upstream bandwidth threshold that turns the network indicator to bad |
-| `downWarnKbps` | KB/s | `85.0` | Downstream bandwidth threshold that turns the network indicator to warning |
-| `downBadKbps` | KB/s | `95.0` | Downstream bandwidth threshold that turns the network indicator to bad |
+| `bandwidthUnit` | enum | `bytes` | Bandwidth display family: `bytes` (`KB/s -> MB/s -> GB/s -> TB/s`) or `bits` (`Kbps -> Mbps -> Gbps -> Tbps`) |
+| `bandwidthRolloverThreshold` | current display unit | `500.0` | Value at or above this threshold promotes the formatter to the next bandwidth unit |
+| `upWarnKBps` | KB/s | `800.0` | Server upstream bandwidth threshold that turns the network indicator to warning |
+| `upBadKBps` | KB/s | `1600.0` | Server upstream bandwidth threshold that turns the network indicator to bad |
+| `downWarnKBps` | KB/s | `50.0` | Server downstream bandwidth threshold that turns the network indicator to warning |
+| `downBadKBps` | KB/s | `100.0` | Server downstream bandwidth threshold that turns the network indicator to bad |
+| `launcherUpWarnKBps` | KB/s | `2400.0` | Launcher upstream bandwidth threshold that turns the network indicator to warning |
+| `launcherUpBadKBps` | KB/s | `4800.0` | Launcher upstream bandwidth threshold that turns the network indicator to bad |
+| `launcherDownWarnKBps` | KB/s | `150.0` | Launcher downstream bandwidth threshold that turns the network indicator to warning |
+| `launcherDownBadKBps` | KB/s | `300.0` | Launcher downstream bandwidth threshold that turns the network indicator to bad |
 
 </details>
 
 After `UnifiedServerCoordinator.Launch(...)` succeeds, the launcher begins watching `config/config.json` for safe hot reloads:
 
-- Live-applied: `launcher.serverPassword`, `launcher.joinServer`, additive `launcher.autoStartServers`, `launcher.listenPort` (listener rebind), `launcher.colorfulConsoleStatus`, `launcher.consoleStatusThresholds`
+- Live-applied: `launcher.serverPassword`, `launcher.joinServer`, additive `launcher.autoStartServers`, `launcher.listenPort` (listener rebind), `launcher.colorfulConsoleStatus`, `launcher.consoleStatus`
 
 ### Server Definition Keys
 

docs/README.zh-cn.md

@@ -285,30 +285,36 @@ dotnet run --project src/UnifierTSL/UnifierTSL.csproj -- \
 
 在交互式终端中，缺失端口/密码的补全会使用语义化 readline，提供 ghost 文本、候选轮换和实时校验/状态行；非交互宿主会自动回退。
 
-`launcher.consoleStatusThresholds` 用于控制命令行状态栏阈值，而 `launcher.colorfulConsoleStatus` 用于在终端支持时启用鲜艳 ANSI 配色：
+`launcher.consoleStatus` 用于控制命令行状态栏渲染。`launcher.colorfulConsoleStatus` 仍然负责鲜艳 ANSI 配色，而 `launcher.consoleStatus.bandwidthUnit` 用于选择带宽显示单位族：`bytes` 显示 `KB/s -> MB/s -> GB/s -> TB/s`（默认），`bits` 显示 `Kbps -> Mbps -> Gbps -> Tbps`；`launcher.consoleStatus.bandwidthRolloverThreshold` 用于控制何时向上进位到下一个单位（默认 `500.0`）。
 
 <details>
-<summary><strong>默认状态阈值</strong></summary>
+<summary><strong>默认控制台状态值</strong></summary>
 
 | 键 | 单位 | 默认值 | 描述 |
 |:--|:--|:--|:--|
 | `targetUps` | UPS | `60.0` | 作为 TPS 健康判断基线的目标更新速率 |
-| `healthyUpsDeviation` | UPS 偏差 | `1.2` | 相对 `targetUps` 的绝对偏差不超过该值时仍视为健康 |
-| `warningUpsDeviation` | UPS 偏差 | `4.0` | 相对 `targetUps` 的绝对偏差不超过该值时视为警告，再高则转为异常 |
-| `utilHealthyMax` | 比例（`0.0`-`1.0`） | `0.50` | 忙碌利用率不高于该值时仍视为健康 |
+| `healthyUpsDeviation` | UPS 偏差 | `2.0` | 相对 `targetUps` 的绝对偏差不超过该值时仍视为健康 |
+| `warningUpsDeviation` | UPS 偏差 | `5.0` | 相对 `targetUps` 的绝对偏差不超过该值时视为警告，再高则转为异常 |
+| `utilHealthyMax` | 比例（`0.0`-`1.0`） | `0.55` | 忙碌利用率不高于该值时仍视为健康 |
 | `utilWarningMax` | 比例（`0.0`-`1.0`） | `0.80` | 忙碌利用率不高于该值时视为警告，再高则转为异常 |
 | `onlineWarnRemainingSlots` | 槽位数 | `5` | 剩余玩家槽位小于等于该值时，在线指标转为警告 |
 | `onlineBadRemainingSlots` | 槽位数 | `0` | 剩余玩家槽位小于等于该值时，在线指标转为异常/满员 |
-| `upWarnKbps` | KB/s | `65.0` | 上行带宽达到该阈值时，网络指标转为警告 |
-| `upBadKbps` | KB/s | `75.0` | 上行带宽达到该阈值时，网络指标转为异常 |
-| `downWarnKbps` | KB/s | `85.0` | 下行带宽达到该阈值时，网络指标转为警告 |
-| `downBadKbps` | KB/s | `95.0` | 下行带宽达到该阈值时，网络指标转为异常 |
+| `bandwidthUnit` | 枚举 | `bytes` | 带宽显示单位族：`bytes`（`KB/s -> MB/s -> GB/s -> TB/s`）或 `bits`（`Kbps -> Mbps -> Gbps -> Tbps`） |
+| `bandwidthRolloverThreshold` | 当前显示单位 | `500.0` | 数值达到或超过该阈值时，格式化器会进位到下一个带宽单位 |
+| `upWarnKBps` | KB/s | `800.0` | Server 上行带宽达到该阈值时，网络指标转为警告 |
+| `upBadKBps` | KB/s | `1600.0` | Server 上行带宽达到该阈值时，网络指标转为异常 |
+| `downWarnKBps` | KB/s | `50.0` | Server 下行带宽达到该阈值时，网络指标转为警告 |
+| `downBadKBps` | KB/s | `100.0` | Server 下行带宽达到该阈值时，网络指标转为异常 |
+| `launcherUpWarnKBps` | KB/s | `2400.0` | Launcher 上行带宽达到该阈值时，网络指标转为警告 |
+| `launcherUpBadKBps` | KB/s | `4800.0` | Launcher 上行带宽达到该阈值时，网络指标转为异常 |
+| `launcherDownWarnKBps` | KB/s | `150.0` | Launcher 下行带宽达到该阈值时，网络指标转为警告 |
+| `launcherDownBadKBps` | KB/s | `300.0` | Launcher 下行带宽达到该阈值时，网络指标转为异常 |
 
 </details>
 
 在 `UnifiedServerCoordinator.Launch(...)` 成功后，启动器会开始监视 `config/config.json`，只做安全范围内的热重载：
 
-- 立即生效：`launcher.serverPassword`、`launcher.joinServer`、追加式 `launcher.autoStartServers`、`launcher.listenPort`（监听器重绑）、`launcher.colorfulConsoleStatus`、`launcher.consoleStatusThresholds`
+- 立即生效：`launcher.serverPassword`、`launcher.joinServer`、追加式 `launcher.autoStartServers`、`launcher.listenPort`（监听器重绑）、`launcher.colorfulConsoleStatus`、`launcher.consoleStatus`
 
 ### 服务器定义键
 

docs/dev-overview.md

@@ -1493,7 +1493,7 @@ For more logging examples, see `src/Plugins/TShockAPI/TShock.cs` and `src/Unifie
 - You get back a `ConfigHandle<T>` that lets you `RequestAsync`, `Overwrite`, `ModifyInMemory`, and subscribe via `OnChangedAsync` for hot reload. File access is guarded by `FileLockManager` to prevent corruption.
 - Launcher root config is separate from plugin config: `LauncherConfigManager` owns `config/config.json`, creates it when missing, and intentionally ignores the legacy root-level `config.json`.
 - Startup precedence for launcher settings is `config/config.json` -> CLI overrides -> interactive fallback for missing port/password, and the effective startup snapshot is persisted back to `config/config.json`. After startup, edits to `config/config.json` apply to the launcher settings that support reload.
-- Root-config hot reload applies `launcher.serverPassword`, `launcher.joinServer`, additive `launcher.autoStartServers`, `launcher.listenPort` (via listener rebind), `launcher.colorfulConsoleStatus`, and `launcher.consoleStatusThresholds`.
+- Root-config hot reload applies `launcher.serverPassword`, `launcher.joinServer`, additive `launcher.autoStartServers`, `launcher.listenPort` (via listener rebind), `launcher.colorfulConsoleStatus`, and `launcher.consoleStatus`.
 
 ## 3. USP Integration Points
 
@@ -1561,7 +1561,7 @@ For more logging examples, see `src/Plugins/TShockAPI/TShock.cs` and `src/Unifie
 ### 5.2 Runtime Operations
 - Event handlers handle cross-cutting concerns — chat moderation, transfer control, packet filtering, etc.
 - Config handles react to file changes, so you can tweak settings without restarting.
-- The launcher root config watcher applies password changes, join-policy changes, additive auto-start worlds (hot-add only), `launcher.listenPort` listener rebinding, `launcher.colorfulConsoleStatus`, and `launcher.consoleStatusThresholds`.
+- The launcher root config watcher applies password changes, join-policy changes, additive auto-start worlds (hot-add only), `launcher.listenPort` listener rebinding, `launcher.colorfulConsoleStatus`, and `launcher.consoleStatus`.
 - The coordinator keeps window titles updated, maintains server lists, replays join/leave sequences, and can swap the active listener without tearing down the process.
 - Launcher and per-server consoles now exchange semantic prompt/render/status frames through `TerminalLauncherConsoleHost`, `RemoteConsoleService`, and the console-client protocol, so reconnects can replay cached state instead of dropping back to plain text.
 - Logging metadata and the bounded history ring let you trace any log entry back to its server, plugin, or subsystem, and attach new sinks without losing recent context.

docs/dev-overview.zh-cn.md

@@ -1504,7 +1504,7 @@ Output in Server1's console window with server-specific colors
 - 你得到一个 `ConfigHandle<T>` ，它可以让你 `RequestAsync` 、 `Overwrite` 、 `ModifyInMemory` ，并通过 `OnChangedAsync` 订阅热重载。文件访问由 `FileLockManager` 保护以防止损坏。
 - 启动器根配置与插件配置分离：`LauncherConfigManager` 专门管理 `config/config.json`，文件缺失时会自动创建，并且会明确忽略旧的根目录 `config.json`。
 - 启动器设置的启动优先级是 `config/config.json` -> CLI 覆盖 -> 缺失端口/密码时的交互式补全，并会把启动阶段生效快照回写到 `config/config.json`。启动完成后，对 `config/config.json` 的修改会应用到支持热重载的启动器设置。
-- 根配置热重载会应用 `launcher.serverPassword`、`launcher.joinServer`、追加式 `launcher.autoStartServers`、通过重绑监听器实现的 `launcher.listenPort`、`launcher.colorfulConsoleStatus`，以及 `launcher.consoleStatusThresholds`。
+- 根配置热重载会应用 `launcher.serverPassword`、`launcher.joinServer`、追加式 `launcher.autoStartServers`、通过重绑监听器实现的 `launcher.listenPort`、`launcher.colorfulConsoleStatus`，以及 `launcher.consoleStatus`。
 
 <a id="3-usp-integration-points"></a>
 ## 3. USP 集成点
@@ -1582,7 +1582,7 @@ Output in Server1's console window with server-specific colors
 ### 5.2 运行时操作
 - 事件处理程序处理横切问题——聊天审核、传输控制、数据包过滤等。
 - 配置处理对文件更改的反应，因此你可以调整设置而无需重新启动。
-- 启动器根配置监视会热应用密码变更、入服策略变更、追加式自动启动世界（仅热追加）、`launcher.listenPort` 的监听器重绑、`launcher.colorfulConsoleStatus`，以及 `launcher.consoleStatusThresholds`。
+- 启动器根配置监视会热应用密码变更、入服策略变更、追加式自动启动世界（仅热追加）、`launcher.listenPort` 的监听器重绑、`launcher.colorfulConsoleStatus`，以及 `launcher.consoleStatus`。
 - 协调器保持窗口标题更新，维护服务器列表，重放加入/离开序列，并且可以在不退出进程的前提下切换当前监听器。
 - 启动器和每服务器控制台现在会通过 `TerminalLauncherConsoleHost`、`RemoteConsoleService` 与控制台客户端协议交换语义化提示/渲染/状态帧，因此重连时可以回放缓存状态，而不必退回纯文本。
 - 日志元数据和有界历史环使你可以把任何日志条目追溯到其服务器、插件或子系统，并在不丢失最近上下文的前提下挂接新 sink。

i18n/UnifierTSL.template.pot

@@ -942,7 +942,7 @@ msgid "launcher.colorfulConsoleStatus changed from '{0}' to '{1}'. Status bar ap
 msgstr ""
 
 #: ..\..\..\src\UnifierTSL\LauncherRuntimeOps.cs:232
-msgid "launcher.consoleStatusThresholds changed. Command-line status thresholds are now using the reloaded values."
+msgid "launcher.consoleStatus changed. Command-line status settings are now using the reloaded values."
 msgstr ""
 
 #: ..\..\..\src\UnifierTSL\LauncherRuntimeOps.cs:975

i18n/zh_CN/UnifierTSL.po

@@ -967,8 +967,8 @@ msgid "launcher.colorfulConsoleStatus changed from '{0}' to '{1}'. Status bar ap
 msgstr "launcher.colorfulConsoleStatus 已从 '{0}' 更改为 '{1}'。状态栏外观已刷新。"
 
 #: ..\..\..\src\UnifierTSL\LauncherRuntimeOps.cs:232
-msgid "launcher.consoleStatusThresholds changed. Command-line status thresholds are now using the reloaded values."
-msgstr "launcher.consoleStatusThresholds 已更改。命令行状态阈值现已使用重载后的值。"
+msgid "launcher.consoleStatus changed. Command-line status settings are now using the reloaded values."
+msgstr "launcher.consoleStatus 已更改。命令行状态设置现已使用重载后的值。"
 
 #: ..\..\..\src\UnifierTSL\LauncherRuntimeOps.cs:975
 #, csharp-format

src/Plugins/TShockAPI/ConsolePrompting/AnnotatedConsolePromptProvider.cs

@@ -2,17 +2,11 @@
 using UnifierTSL.CLI;
 using UnifierTSL.CLI.Prompting;
 using UnifierTSL.Servers;
-using Terraria;
-using Terraria.ID;
-using Terraria.Localization;
-using TShockAPI.Localization;
 
 namespace TShockAPI.ConsolePrompting
 {
     internal static class TShockConsolePromptInstaller
     {
-        private static readonly Lazy<IReadOnlyList<string>> ItemCandidates = new(BuildItemCandidatesCore);
-
         public static void Install()
         {
             TShockConsoleParameterExplainers.RegisterDefaults();
@@ -24,9 +18,7 @@ private static ConsolePromptSpec BuildPromptSpec(ServerContext? server)
             AnnotatedConsolePromptOptions options = new() {
                 CommandPrefixResolver = BuildCommandPrefixes,
                 CommandSpecResolver = () => BuildCommandSpecs(server),
-                PlayerCandidateResolver = () => BuildPlayerCandidates(server),
-                ServerCandidateResolver = BuildServerCandidates,
-                ItemCandidateResolver = BuildItemCandidates,
+                PlayerCandidateResolver = () => ConsolePromptCommonObjects.GetPlayerCandidates(server),
                 ParameterExplainerResolver = TShockConsoleParameterExplainers.CreateSnapshot,
             };
 
@@ -105,50 +97,6 @@ private static List<ConsoleCommandSpec> BuildCommandSpecs(ServerContext? server)
             return merged;
         }
 
-        private static IReadOnlyList<string> BuildPlayerCandidates(ServerContext? server)
-        {
-            return [.. TShock.Players
-                .Where(static player => player is not null && player.Active)
-                .Where(player => server is null || player!.GetCurrentServer() == server)
-                .Select(player => player!.Name)
-                .Where(static name => !string.IsNullOrWhiteSpace(name))
-                .OrderBy(static name => name, StringComparer.OrdinalIgnoreCase)];
-        }
-
-        private static IReadOnlyList<string> BuildServerCandidates()
-        {
-            return [.. UnifiedServerCoordinator.Servers
-                .Where(static server => server.IsRunning)
-                .Select(static server => server.Name)
-                .Where(static name => !string.IsNullOrWhiteSpace(name))
-                .OrderBy(static name => name, StringComparer.OrdinalIgnoreCase)];
-        }
-
-        private static IReadOnlyList<string> BuildItemCandidates()
-        {
-            return ItemCandidates.Value;
-        }
-
-        private static IReadOnlyList<string> BuildItemCandidatesCore()
-        {
-            HashSet<string> names = new(StringComparer.OrdinalIgnoreCase);
-            for (int i = 1; i < ItemID.Count; i++) {
-                AddItemCandidateName(names, Lang.GetItemNameValue(i));
-                AddItemCandidateName(names, EnglishLanguage.GetItemNameById(i));
-            }
-
-            return [.. names.OrderBy(static name => name, StringComparer.OrdinalIgnoreCase)];
-        }
-
-        private static void AddItemCandidateName(HashSet<string> names, string? value)
-        {
-            if (string.IsNullOrWhiteSpace(value)) {
-                return;
-            }
-
-            names.Add(value.Trim());
-        }
-
         private static ConsoleCommandSpec Merge(ConsoleCommandSpec runtimeSpec, ConsoleCommandSpec? builtin)
         {
             if (builtin is null) {

src/Plugins/TShockAPI/ConsolePrompting/BuiltinConsoleCommandSpecs.cs

@@ -464,8 +464,8 @@ private static ConsoleCommandParameterSpec P(
         private static string? InferSemanticKey(Kind kind)
         {
             return kind switch {
-                Kind.Player => TShockConsoleParameterSemanticKeys.PlayerRef,
-                Kind.Item => TShockConsoleParameterSemanticKeys.ItemRef,
+                Kind.Player => ConsolePromptCommonParameterSemanticKeys.PlayerRef,
+                Kind.Item => ConsolePromptCommonParameterSemanticKeys.ItemRef,
                 _ => null,
             };
         }