feat(home): add target catalog and connectivity testing

This commit is contained in:
Qiu Yuzhou
2026-10-14 11:19:07 +08:00
parent a5206c78ff
commit 790e2a26fa
10 changed files with 979 additions and 4 deletions
@@ -352,6 +352,38 @@
}
}
}
},
"尚未测试": {
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "Not tested yet"
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "尚未测试"
}
}
}
},
"最快 %@": {
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "Fastest %@"
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "最快 %@"
}
}
}
}
},
"version": "1.0"
@@ -0,0 +1,342 @@
{
"sourceLanguage": "zh-Hans",
"strings": {
"定位当前": {
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "Locate Current"
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "定位当前"
}
}
}
},
"未选择活动目标": {
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "No active target"
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "未选择活动目标"
}
}
}
},
"目录视图": {
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "Catalog view"
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "目录视图"
}
}
}
},
"全部": {
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "All"
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "全部"
}
}
}
},
"收藏": {
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "Favorites"
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "收藏"
}
}
}
},
"名称": {
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "Name"
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "名称"
}
}
}
},
"测试整个目录中的服务器,不受折叠影响。": {
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "Test every server in the catalog, including collapsed groups."
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "测试整个目录中的服务器,不受折叠影响。"
}
}
}
},
"测试收藏节点及其全部后代服务器,重复项只测试一次。": {
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "Test favorites and all their descendant servers, once per server."
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "测试收藏节点及其全部后代服务器,重复项只测试一次。"
}
}
}
},
"目录为空,请到服务器页添加配置。": {
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "The catalog is empty. Add configurations on the Servers page."
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "目录为空,请到服务器页添加配置。"
}
}
}
},
"暂无收藏,请到服务器页收藏配置或分组。": {
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "No favorites. Favorite configurations or groups on the Servers page."
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "暂无收藏,请到服务器页收藏配置或分组。"
}
}
}
},
"前往服务器页": {
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "Go to Servers"
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "前往服务器页"
}
}
}
},
"可激活 %lld 个配置,将跳过 %lld 个已知无效配置。": {
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "%lld configurations can be activated; %lld known invalid configurations will be skipped."
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "可激活 %lld 个配置,将跳过 %lld 个已知无效配置。"
}
}
}
},
"请选择服务器或分组": {
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "Select a server or group"
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "请选择服务器或分组"
}
}
}
},
"激活中…": {
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "Activating…"
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "激活中…"
}
}
}
},
"激活": {
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "Activate"
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "激活"
}
}
}
},
"激活所选目标": {
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "Activate the selected target"
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "激活所选目标"
}
}
}
},
"尚未选择目标": {
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "No target selected"
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "尚未选择目标"
}
}
}
},
"当前项已激活": {
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "This target is already active"
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "当前项已激活"
}
}
}
},
"配置不满足本地激活条件": {
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "This configuration does not meet local activation requirements"
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "配置不满足本地激活条件"
}
}
}
},
"收起 %@": {
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "Collapse %@"
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "收起 %@"
}
}
}
},
"展开 %@": {
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "Expand %@"
}
},
"zh-Hans": {
"stringUnit": {
"state": "translated",
"value": "展开 %@"
}
}
}
}
},
"version": "1.0"
}
@@ -0,0 +1,101 @@
import Combine
import Foundation
/// 首页专用的窗口浏览状态。只持久化模式与展开身份,选择及首次定位属于窗口会话。
@MainActor
final class HomeTargetBrowser: ObservableObject {
enum Mode: String { case all, favorites }
@Published private(set) var selection: NodeID?
@Published private(set) var expandedGroupIDs: Set<NodeID>
@Published private(set) var mode: Mode
private var enteredHome = false
private let defaults: UserDefaults
private static let expansionKey = "homeTarget.expandedGroups"
private static let modeKey = "homeTarget.mode"
init(defaults: UserDefaults = .standard) {
self.defaults = defaults
expandedGroupIDs = Set(
(defaults.stringArray(forKey: Self.expansionKey) ?? []).map { NodeID(rawValue: $0) })
mode = Mode(rawValue: defaults.string(forKey: Self.modeKey) ?? "") ?? .all
}
func rows(in tree: CatalogTreeSnapshot, favorites: [CatalogTreeNode]) -> [CatalogTreeRow] {
if mode == .favorites {
return favorites.map { CatalogTreeRow(node: $0, depth: 0) }
}
let groups = Set(tree.visibleRows(collapsed: []).filter(\.node.isGroup).map(\.id))
return tree.visibleRows(collapsed: groups.subtracting(expandedGroupIDs))
}
func select(_ id: NodeID?) { selection = id }
func testTargets(in tree: CatalogTreeSnapshot, favorites: [CatalogTreeNode]) -> [NodeID] {
var seen = Set<NodeID>()
return (mode == .all ? tree.roots : favorites)
.flatMap(\.connectivityServerIDs).filter { seen.insert($0).inserted }
}
func reconcile(in tree: CatalogTreeSnapshot, favorites: [CatalogTreeNode]) {
let groups = Set(tree.visibleRows(collapsed: []).filter(\.node.isGroup).map(\.id))
expandedGroupIDs.formIntersection(groups)
persistExpansion()
clearHiddenSelection(in: tree, favorites: favorites)
}
func setMode(_ mode: Mode, in tree: CatalogTreeSnapshot, favorites: [CatalogTreeNode]) {
self.mode = mode
defaults.set(mode.rawValue, forKey: Self.modeKey)
clearHiddenSelection(in: tree, favorites: favorites)
}
func toggleGroup(_ id: NodeID, in tree: CatalogTreeSnapshot) {
guard let group = tree.node(withID: id), group.isGroup else { return }
if expandedGroupIDs.remove(id) == nil {
expandedGroupIDs.insert(id)
} else if let selection, selection != id, group.find(selection) != nil {
self.selection = id
}
persistExpansion()
}
/// 仅首次进入自动定位;返回滚动目标,后续切页不改变浏览位置。
@discardableResult
func enterHome(
current: NodeID?, in tree: CatalogTreeSnapshot, favorites: [CatalogTreeNode]
) -> NodeID? {
guard !enteredHome else { return nil }
enteredHome = true
return locate(current, in: tree, favorites: favorites)
}
@discardableResult
func locate(
_ current: NodeID?, in tree: CatalogTreeSnapshot, favorites: [CatalogTreeNode]
) -> NodeID? {
guard let current, tree.containsNode(current) else { return nil }
if mode == .favorites, !favorites.contains(where: { $0.id == current }) {
setMode(.all, in: tree, favorites: favorites)
}
selection = current
var parent = tree.node(withID: current)?.parentID
while let id = parent {
expandedGroupIDs.insert(id)
parent = tree.node(withID: id)?.parentID
}
persistExpansion()
return current
}
private func clearHiddenSelection(in tree: CatalogTreeSnapshot, favorites: [CatalogTreeNode]) {
if let selection, !rows(in: tree, favorites: favorites).contains(where: { $0.id == selection })
{
self.selection = nil
}
}
private func persistExpansion() {
defaults.set(expandedGroupIDs.map(\.rawValue).sorted(), forKey: Self.expansionKey)
}
}
@@ -0,0 +1,221 @@
import SwiftUI
/// 浏览操作留在首页,测试与激活始终经过两页共享的 module。
struct HomeTargetCard: View {
@ObservedObject var workflow: CatalogWorkflow
@ObservedObject var browser: HomeTargetBrowser
@ObservedObject var activation: ActivationFeedbackState
let activeTargetID: NodeID?
let showServers: () -> Void
@State private var revealID: NodeID?
@State private var revealRevision = 0
private var rows: [CatalogTreeRow] {
browser.rows(in: workflow.tree, favorites: workflow.favorites)
}
private var selected: CatalogTreeNode? {
browser.selection.flatMap { workflow.tree.node(withID: $0) }
}
var body: some View {
ScrollViewReader { proxy in
HomeCard(
title: activeName,
subtitle: activeTargetID.map { path(for: $0) },
trailing: {
Button(String(localized: "定位当前", table: "HomeTargets")) {
requestReveal(
browser.locate(activeTargetID, in: workflow.tree, favorites: workflow.favorites))
}
.disabled(activeTargetID == nil)
},
content: {
VStack(alignment: .leading, spacing: 12) {
toolbar
directory
Divider()
selectionSummary
actions
}
.padding(.top, 14)
}
)
.disabled(activation.isPending)
.onAppear {
browser.reconcile(in: workflow.tree, favorites: workflow.favorites)
requestReveal(
browser.enterHome(
current: activeTargetID, in: workflow.tree, favorites: workflow.favorites))
}
.task(id: revealRevision) {
guard let revealID else { return }
await Task.yield()
guard !Task.isCancelled else { return }
proxy.scrollTo(revealID, anchor: .center)
}
}
}
private var activeName: String {
activeTargetID.flatMap { workflow.tree.node(withID: $0)?.name }
?? String(localized: "未选择活动目标", table: "HomeTargets")
}
private var toolbar: some View {
HStack {
Picker(
String(localized: "目录视图", table: "HomeTargets"),
selection: Binding(
get: { browser.mode },
set: { browser.setMode($0, in: workflow.tree, favorites: workflow.favorites) })
) {
Text(String(localized: "全部", table: "HomeTargets")).tag(HomeTargetBrowser.Mode.all)
Text(String(localized: "收藏", table: "HomeTargets")).tag(HomeTargetBrowser.Mode.favorites)
}
.pickerStyle(.segmented)
.labelsHidden()
.frame(maxWidth: 180)
Spacer(minLength: 8)
if let module = workflow.connectivity {
ConnectivityBatchButton(
module: module,
targets: browser.testTargets(in: workflow.tree, favorites: workflow.favorites)
)
.help(
browser.mode == .all
? String(localized: "测试整个目录中的服务器,不受折叠影响。", table: "HomeTargets")
: String(localized: "测试收藏节点及其全部后代服务器,重复项只测试一次。", table: "HomeTargets"))
}
}
}
private var directory: some View {
VStack(spacing: 4) {
HStack {
Text(String(localized: "名称", table: "HomeTargets"))
Spacer()
Text(ConnectivityCopy.text("响应延迟"))
}
.font(.caption)
.foregroundStyle(.secondary)
.padding(.horizontal, 8)
if rows.isEmpty {
emptyDirectory
} else {
ScrollView {
LazyVStack(spacing: 0) {
ForEach(rows) { row in
HomeTargetRow(
row: row, workflow: workflow,
selected: browser.selection == row.id, active: activeTargetID == row.id,
expandable: browser.mode == .all && row.node.isGroup,
expanded: browser.expandedGroupIDs.contains(row.id),
path: path(for: row.id),
select: { browser.select(row.id) },
toggle: { browser.toggleGroup(row.id, in: workflow.tree) }
)
.id(row.id)
}
}
}
.frame(height: min(CGFloat(rows.count) * HomeTargetRow.height, 360))
}
}
}
private var emptyDirectory: some View {
VStack(alignment: .leading, spacing: 8) {
Text(
browser.mode == .all
? String(localized: "目录为空,请到服务器页添加配置。", table: "HomeTargets")
: String(localized: "暂无收藏,请到服务器页收藏配置或分组。", table: "HomeTargets")
)
.foregroundStyle(.secondary)
Button(String(localized: "前往服务器页", table: "HomeTargets"), action: showServers)
}
.font(.callout)
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.vertical, 12)
}
private var selectionSummary: some View {
VStack(alignment: .leading, spacing: 4) {
if let selected {
Text(selected.name).font(.callout.weight(.medium))
.lineLimit(1).help(path(for: selected.id))
Text(path(for: selected.id)).font(.caption).foregroundStyle(.secondary)
.lineLimit(2).help(path(for: selected.id))
if selected.isGroup, let eligibility = workflow.activationEligibility(for: selected.id) {
Text(
String(
localized:
"可激活 \(eligibility.candidateCount) 个配置,将跳过 \(eligibility.skippedInvalidCount) 个已知无效配置。",
table: "HomeTargets")
)
.font(.caption).foregroundStyle(.secondary)
}
} else {
Text(String(localized: "请选择服务器或分组", table: "HomeTargets"))
.font(.callout).foregroundStyle(.secondary)
}
}
.frame(maxWidth: .infinity, alignment: .leading)
}
private var actions: some View {
HStack(alignment: .center, spacing: 8) {
Text(activationDisabledReason ?? "")
.font(.caption).foregroundStyle(.secondary)
.fixedSize(horizontal: false, vertical: true)
Spacer(minLength: 0)
if let module = workflow.connectivity, let selected {
ConnectivityTestButton(module: module, node: selected)
} else {
Button(ConnectivityCopy.text("测试连通性")) {}.disabled(true)
}
Button(
activation.isPending
? String(localized: "激活中…", table: "HomeTargets")
: String(localized: "激活", table: "HomeTargets")
) {
guard let selected else { return }
Task { @MainActor in
// 现有运行状态卡片呈现失败;这里不重复弹窗或增加内联错误。
_ = try? await activation.activate(selected.id, via: workflow)
}
}
.disabled(activationDisabledReason != nil)
.help(activationDisabledReason ?? String(localized: "激活所选目标", table: "HomeTargets"))
}
}
private var activationDisabledReason: String? {
if activation.isPending { return String(localized: "激活中…", table: "HomeTargets") }
guard let selected else { return String(localized: "尚未选择目标", table: "HomeTargets") }
if selected.id == activeTargetID { return String(localized: "当前项已激活", table: "HomeTargets") }
guard let eligibility = workflow.activationEligibility(for: selected.id),
eligibility.canActivate
else {
if selected.isGroup {
return String(localized: "分组中没有可激活的有效服务器。", table: "ServerDetails")
}
return selected.invalidReasons.first.map {
AppPresentation.message(for: ActivationFailure.invalidLeaf(node: selected.id, reason: $0))
} ?? String(localized: "配置不满足本地激活条件", table: "HomeTargets")
}
return nil
}
private func path(for id: NodeID) -> String {
guard let node = workflow.tree.node(withID: id) else { return "" }
let source = node.isManual ? String(localized: "本地") : String(localized: "订阅")
return ([source] + (workflow.tree.pathComponents(for: id) ?? [])).joined(separator: " / ")
}
private func requestReveal(_ id: NodeID?) {
guard let id else { return }
revealID = id
revealRevision += 1
}
}
@@ -0,0 +1,66 @@
import SwiftUI
struct HomeTargetRow: View {
static let height: CGFloat = 34
let row: CatalogTreeRow
let workflow: CatalogWorkflow
let selected: Bool
let active: Bool
let expandable: Bool
let expanded: Bool
let path: String
let select: () -> Void
let toggle: () -> Void
var body: some View {
HStack(spacing: 0) {
if expandable {
Button(action: toggle) {
Image(systemName: expanded ? "chevron.down" : "chevron.right")
.font(.caption.weight(.semibold))
.frame(width: 22, height: Self.height)
.contentShape(Rectangle())
}
.buttonStyle(.plain)
.accessibilityLabel(
expanded
? String(localized: "收起 \(row.node.name)", table: "HomeTargets")
: String(localized: "展开 \(row.node.name)", table: "HomeTargets"))
} else {
Color.clear.frame(width: 22)
}
Button(action: select) {
HStack(spacing: 6) {
Image(systemName: row.node.isGroup ? "folder" : "server.rack")
Text(row.node.name).lineLimit(1).truncationMode(.tail)
if active {
Image(systemName: "bolt.fill")
.foregroundStyle(selected ? Color(nsColor: .selectedTextColor) : .orange)
.help(String(localized: "活动目标"))
}
Spacer(minLength: 4)
if let module = workflow.connectivity {
ConnectivityCell(module: module, node: row.node, workflow: workflow)
.monospacedDigit()
.frame(width: 130, alignment: .trailing)
}
}
.font(.callout)
.frame(maxWidth: .infinity)
.frame(height: Self.height)
.contentShape(Rectangle())
}
.buttonStyle(.plain)
.help(path)
.accessibilityAddTraits(selected ? .isSelected : [])
}
.padding(.leading, CGFloat(row.depth) * 16 + 2)
.padding(.trailing, 8)
.foregroundStyle(selected ? Color(nsColor: .selectedTextColor) : .primary)
.background(
selected ? Color(nsColor: .selectedContentBackgroundColor) : .clear,
in: RoundedRectangle(cornerRadius: 5)
)
.frame(height: Self.height)
}
}
@@ -7,6 +7,9 @@ import SwiftUI
struct HomeView: View {
@ObservedObject var workflow: CatalogWorkflow
@ObservedObject var control: ProxyControlWorkflow
let browser: HomeTargetBrowser
let activation: ActivationFeedbackState
let showServers: () -> Void
let clipboard: any TextClipboard
let errors: ErrorAlertPresenter
@@ -14,6 +17,9 @@ struct HomeView: View {
ScrollView {
HStack(alignment: .top, spacing: 20) {
VStack(spacing: 20) {
HomeTargetCard(
workflow: workflow, browser: browser, activation: activation,
activeTargetID: control.snapshot.activeTarget?.id, showServers: showServers)
ModeCard(control: control)
}
.frame(maxWidth: .infinity, alignment: .leading)
@@ -37,18 +37,20 @@ struct ConnectivityCell: View {
let summary = module.summary(for: node.connectivityServerIDs, at: date)
if node.isGroup {
record = summary.record
text = record.map { ConnectivityCopy.outcome($0.outcome) } ?? (summary.hasResults ? "—" : "")
text = record.map { ConnectivityCopy.fastest($0.outcome) } ?? "—"
if let id = summary.serverID { prefix = workflow.displayName(for: id) + " · " }
} else {
record = module.history(for: node.id).first
text = record.map { ConnectivityCopy.outcome($0.outcome) } ?? ""
text = record.map { ConnectivityCopy.outcome($0.outcome) } ?? "—"
}
let expired = record?.isExpired(at: date) ?? false
let help =
record.map {
prefix + $0.finishedAt.formatted(date: .numeric, time: .standard)
+ (expired ? " · " + ConnectivityCopy.text("已过期") : "")
} ?? (summary.hasResults && node.isGroup ? ConnectivityCopy.text("无成功结果") : "")
}
?? (summary.hasResults && node.isGroup
? ConnectivityCopy.text("无成功结果") : ConnectivityCopy.text("尚未测试"))
return Presentation(text: text, help: help, expired: expired, testing: summary.isTesting)
}
}
@@ -99,6 +101,9 @@ enum ConnectivityCopy {
case .http(let status): "HTTP \(status)"
}
}
static func fastest(_ value: ServerConnectivity.Outcome) -> String {
String.localizedStringWithFormat(text("最快 %@"), outcome(value))
}
}
struct ConnectivityDetailView: View {
@@ -30,8 +30,9 @@ struct MainWindowView: View {
let configurationGroupFileExporter: any ConfigurationGroupFileExporter
let qrImageSaver: any QrImageSaver
/// 激活反馈共享状态:侧栏右键与分组详情两个激活入口共用。
/// 激活反馈由首页、侧栏右键与分组详情共用。
@StateObject private var activationFeedback = ActivationFeedbackState()
@StateObject private var homeBrowser = HomeTargetBrowser()
/// 系统标签选择先落在 SwiftUI 自管状态,再同步到 route,避免在视图
/// 更新期间发布;外部导航反向同步,route 仍是导航位置的唯一来源。
@State private var tabSelection: WorkspaceDestination = WorkspaceRoute.initialDestination
@@ -65,6 +66,12 @@ struct MainWindowView: View {
tabSelection = destination
}
}
.onChange(of: workflow.tree) {
homeBrowser.reconcile(in: workflow.tree, favorites: workflow.favorites)
}
.onChange(of: workflow.favoriteIDs) {
homeBrowser.reconcile(in: workflow.tree, favorites: workflow.favorites)
}
.onChange(of: selection) {
guard let selection, let node = workflow.tree.node(withID: selection) else { return }
guard serverSection != .favorites else { return }
@@ -114,6 +121,9 @@ struct MainWindowView: View {
WorkspaceHomeView(
workflow: workflow,
control: control,
browser: homeBrowser,
activation: activationFeedback,
showServers: { route.navigate(to: .servers) },
clipboard: clipboard)
case .servers:
ServersView(
@@ -180,6 +190,9 @@ extension WorkspaceDestination {
private struct WorkspaceHomeView: View {
@ObservedObject var workflow: CatalogWorkflow
@ObservedObject var control: ProxyControlWorkflow
let browser: HomeTargetBrowser
let activation: ActivationFeedbackState
let showServers: () -> Void
let clipboard: any TextClipboard
@StateObject private var errors = ErrorAlertPresenter()
@@ -187,6 +200,9 @@ private struct WorkspaceHomeView: View {
HomeView(
workflow: workflow,
control: control,
browser: browser,
activation: activation,
showServers: showServers,
clipboard: clipboard,
errors: errors
)
@@ -0,0 +1,133 @@
import Foundation
import Testing
@testable import ShadowsocksX_NG2
@MainActor
struct HomeTargetBrowserTests {
@Test
func firstEntryRevealsCurrentTargetOnlyOnceAndPersistsAncestors() throws {
let domain = UUID().uuidString
let defaults = UserDefaults(suiteName: domain)!
defer { defaults.removePersistentDomain(forName: domain) }
let fixture = try CatalogFixtures.makeSubscriptionFixture()
let tree = CatalogTreeSnapshot.build(
from: fixture.catalog, credentials: InMemoryCredentialStore(),
plugins: NoManagedPluginProvider())
let browser = HomeTargetBrowser(defaults: defaults)
#expect(browser.rows(in: tree, favorites: []).map(\.id) == [fixture.groupID])
#expect(
browser.enterHome(current: fixture.serverIDs[1], in: tree, favorites: [])
== fixture.serverIDs[1])
#expect(browser.selection == fixture.serverIDs[1])
#expect(
browser.rows(in: tree, favorites: []).map(\.id)
== [fixture.groupID, fixture.nestedGroupID, fixture.serverIDs[1], fixture.serverIDs[0]])
browser.select(fixture.groupID)
#expect(browser.enterHome(current: fixture.serverIDs[0], in: tree, favorites: []) == nil)
#expect(browser.selection == fixture.groupID)
let restored = HomeTargetBrowser(defaults: defaults)
#expect(restored.selection == nil)
#expect(restored.rows(in: tree, favorites: []).count == 4)
}
@Test
func collapsingAncestorSelectsGroupWithoutChangingOtherGroups() throws {
let domain = UUID().uuidString
let defaults = UserDefaults(suiteName: domain)!
defer { defaults.removePersistentDomain(forName: domain) }
let fixture = try CatalogFixtures.makeSubscriptionFixture()
let tree = CatalogTreeSnapshot.build(
from: fixture.catalog, credentials: InMemoryCredentialStore(),
plugins: NoManagedPluginProvider())
let browser = HomeTargetBrowser(defaults: defaults)
browser.enterHome(current: fixture.serverIDs[1], in: tree, favorites: [])
browser.toggleGroup(fixture.groupID, in: tree)
#expect(browser.selection == fixture.groupID)
#expect(browser.rows(in: tree, favorites: []).map(\.id) == [fixture.groupID])
#expect(browser.expandedGroupIDs == [fixture.nestedGroupID])
browser.toggleGroup(fixture.groupID, in: tree)
#expect(browser.selection == fixture.groupID)
#expect(browser.rows(in: tree, favorites: []).count == 4)
}
@Test
func favoritesAreFlatAndSwitchingClearsHiddenSelectionWhileLocateRestoresAll() throws {
let domain = UUID().uuidString
let defaults = UserDefaults(suiteName: domain)!
defer { defaults.removePersistentDomain(forName: domain) }
let fixture = try CatalogFixtures.makeSubscriptionFixture()
let tree = CatalogTreeSnapshot.build(
from: fixture.catalog, credentials: InMemoryCredentialStore(),
plugins: NoManagedPluginProvider())
let favorites = [fixture.groupID, fixture.serverIDs[0]].compactMap { tree.node(withID: $0) }
let browser = HomeTargetBrowser(defaults: defaults)
browser.enterHome(current: fixture.serverIDs[1], in: tree, favorites: favorites)
browser.setMode(.favorites, in: tree, favorites: favorites)
#expect(browser.selection == nil)
#expect(
browser.rows(in: tree, favorites: favorites).map(\.id)
== [fixture.groupID, fixture.serverIDs[0]])
#expect(browser.rows(in: tree, favorites: favorites).allSatisfy { $0.depth == 0 })
#expect(HomeTargetBrowser(defaults: defaults).mode == .favorites)
browser.locate(fixture.serverIDs[1], in: tree, favorites: favorites)
#expect(browser.mode == .all)
#expect(browser.selection == fixture.serverIDs[1])
#expect(HomeTargetBrowser(defaults: defaults).mode == .all)
browser.setMode(.favorites, in: tree, favorites: favorites)
browser.locate(fixture.groupID, in: tree, favorites: favorites)
#expect(browser.mode == .favorites)
#expect(browser.selection == fixture.groupID)
}
@Test
func catalogChangesPruneRemovedExpansionAndHiddenSelection() throws {
let domain = UUID().uuidString
let defaults = UserDefaults(suiteName: domain)!
defer { defaults.removePersistentDomain(forName: domain) }
let fixture = try CatalogFixtures.makeSubscriptionFixture()
let tree = CatalogTreeSnapshot.build(
from: fixture.catalog, credentials: InMemoryCredentialStore(),
plugins: NoManagedPluginProvider())
let browser = HomeTargetBrowser(defaults: defaults)
browser.enterHome(current: fixture.serverIDs[1], in: tree, favorites: [])
let reduced = CatalogTreeSnapshot(roots: [])
browser.reconcile(in: reduced, favorites: [])
#expect(browser.selection == nil)
#expect(browser.expandedGroupIDs.isEmpty)
#expect(HomeTargetBrowser(defaults: defaults).expandedGroupIDs.isEmpty)
browser.select(fixture.groupID)
browser.setMode(.favorites, in: tree, favorites: [tree.roots[0]])
browser.reconcile(in: tree, favorites: [])
#expect(browser.selection == nil)
}
@Test
func batchTargetsIncludeCollapsedDescendantsAndDeduplicateOverlappingFavorites() throws {
let domain = UUID().uuidString
let defaults = UserDefaults(suiteName: domain)!
defer { defaults.removePersistentDomain(forName: domain) }
let fixture = try CatalogFixtures.makeSubscriptionFixture()
let tree = CatalogTreeSnapshot.build(
from: fixture.catalog, credentials: InMemoryCredentialStore(),
plugins: NoManagedPluginProvider())
let favorites = [fixture.serverIDs[1], fixture.groupID].compactMap { tree.node(withID: $0) }
let browser = HomeTargetBrowser(defaults: defaults)
#expect(
browser.testTargets(in: tree, favorites: favorites)
== [fixture.serverIDs[1], fixture.serverIDs[0]])
browser.setMode(.favorites, in: tree, favorites: favorites)
#expect(browser.rows(in: tree, favorites: favorites).count == 2)
#expect(
browser.testTargets(in: tree, favorites: favorites)
== [fixture.serverIDs[1], fixture.serverIDs[0]])
#expect(browser.testTargets(in: tree, favorites: []).isEmpty)
}
}
+53
View File
@@ -0,0 +1,53 @@
# 首页活动目标卡片
本文件记录 2026-10-14 确认的需求。当前实现以代码为准。
## 呈现与交互
- 卡片位于首页左栏、代理模式卡片上方。
- 头部显示活动目标名称、完整目录路径和「定位当前」。
- 工具栏提供「全部/收藏」和「测试全部」。
- 全部视图保留目录层级。收藏按已有顺序平铺,组不展开。
- 目录区最高 360 点,超出后内部滚动。底部操作区独立于内部滚动区。
- 行只显示名称,不额外显示连接地址或端口。悬停显示完整路径。
- 单击只选择。分组箭头只展开或收起。双击不激活。
- 浏览选择使用系统语义选中色。活动目标使用闪电标记,活动组只标记自身。
- 底部显示所选名称与路径。组显示可激活配置数和已知无效配置的跳过数。
- 没有选择、当前项已激活、本地激活条件不满足时,禁用激活并说明原因。
- 测试结果不参与激活资格判断。
- 激活期间显示「激活中…」,冻结当前卡片,页面导航保留,已有测试继续。
- 沿用现有激活语义,活动标记跟随活动目标。部署成功不作为标记更新条件。
- 不新增激活错误提示,沿用首页其他卡片的现有提示。
- 首页只提供查看、测试和激活,不增加管理、搜索和目录行键盘导航。
## 测试结果与范围
- 两页共享 ServerConnectivity、ConnectivityCell 与测试按钮行为,不新增缓存或调度器。
- 未测试显示「—」,悬停显示「尚未测试」。两页统一此规则。
- 服务器显示最近一次结果。组显示「最快 128 ms」,悬停显示服务器名称和测试时间。
- 组有结果但没有成功结果时显示「—」,悬停显示「无成功结果」。
- 测试时显示小型进度指示,保留此前结果。
- 沿用五分钟与网络变化失效规则。过期结果使用次要颜色,悬停注明「已过期」。
- 沿用现有组汇总规则:优先新鲜成功;仅有过期成功时显示过期最快值;每台服务器只取最近一次结果。
- 底部测试选择的服务器或组内全部后代服务器。
- 全部视图的批次覆盖全目录。收藏视图的批次覆盖收藏节点及全部后代。
- 批次按点击时的目标去重,不受折叠影响,沿用任务复用、冷却与进度。
- 只手动触发测试。测试期间仍可浏览、选择和激活。
- 不按延迟排序或切换目标,保持目录及收藏顺序。
## 浏览状态
- 主工作区为唯一窗口。窗口持有首页浏览 Module,切页保留状态。
- 首页独立持久化视图模式和展开分组;浏览选择只存于窗口会话。
- 无持久化记录时所有组收起。
- 本窗口首次进入首页时选择并定位当前目标。必要时切换全部、展开祖先。
- 之后仅「定位当前」主动定位。定位产生的模式和展开状态也落盘。
- 收起所选项的祖先组时选择该组。
- 切换视图后选择不可见时清空。目录更新时清理失效节点状态。
- 空目录与空收藏分别说明,并引导前往服务器页添加或收藏。
- 复用现有目录与激活 Interface,不修改领域 Interface。
## 验证 seam
- 首页浏览 Module 的 Interface:首次进入、定位、选择、折叠、切换视图、目录更新和测试范围。
- 既有 ServerConnectivity Interface:继续由现有测试验证调度、失效及汇总语义。