mirror of
https://github.com/shadowsocks/ShadowsocksX-NG.git
synced 2026-11-19 09:44:59 +00:00
与导入分离的「切换到 2.0」确认流程(spec #21 D12): - Domain/LegacyHandoff:硬编码白名单三个 Legacy label(.local/.http/.kcptun), bootout 按 service target(覆盖 plist 缺失错位形态),print 退出码验证 (0/113),`launchctl kill SIGTERM` 有文档后备,绝不泛匹配、不 pkill; 残留 plist(含 KeepAlive 形态)读内容判活跃性后 disable,阻止下次登录复活; 系统代理按特征值判定归属(Legacy 自身 off 模式的判定镜像:本地 PAC URL http://localhost:<port>/proxy.pac、SOCKS/HTTP 地址端口),仅清理归属为 Legacy 的服务,未知所有者点名保留;端口释放门禁用无复用选项的 bind 探测 (Legacy ss-local 带 --reuse-port),未释放不启动 2.0;Legacy 数据零删除。 - App 层:SystemConfigurationLegacyProxyCleaner(授权在最前、失败零影响、 事务回滚);WorkspaceLegacyAppController(共享 bundle id 需排除自身进程); LegacyHandoffSheet 确认/进度/报告呈现,含旧登录项人工指引与残留提示; 主窗口工具栏入口 + 导入完成后「切换到 2.0」入口;交接成功经正常启停入口 启动 2.0(健康门禁走 #29 路径)。 - bootout 实弹验证(Further Notes #5)闭环:docs/research/ legacy-handoff-bootout-live-fire.md——bootout 未加载 label 退出码为 3 (非 print 的 113),KeepAlive 残留 kill 后复活、bootout 后不再加载, 结论已回写产品代码与测试。
395 lines
13 KiB
Swift
395 lines
13 KiB
Swift
import SwiftUI
|
||
|
||
/// 主窗口(spec #21 D11,issue #32/#34/#35):NavigationSplitView 分区。侧栏
|
||
/// 顶部分区切换「服务器 / 订阅 / 诊断」;服务器分区是配置目录分组树(订阅子
|
||
/// 树只读、仅启用开关)与详情编辑;订阅分区是订阅卡片与刷新/编辑/删除;诊断
|
||
/// 分区是日志查看与脱敏导出(D11「诊断收进主窗口」)。编辑类操作只在主窗口
|
||
/// (菜单栏仅保留 D11 白名单内的「立即更新全部订阅」快速动作)。
|
||
struct MainWindowView: View {
|
||
enum Pane: Hashable {
|
||
case servers
|
||
case subscriptions
|
||
case diagnostics
|
||
}
|
||
|
||
@ObservedObject var viewModel: CatalogViewModel
|
||
@ObservedObject var proxyController: ProxyRuntimeController
|
||
let eventStore: RuntimeEventStore
|
||
|
||
@StateObject private var legacyHandoffModel = LegacyHandoffViewModel()
|
||
|
||
@State private var pane: Pane = .servers
|
||
@State private var renameTarget: NodeID?
|
||
@State private var renameText = ""
|
||
@State private var newGroupParent: NodeID?
|
||
@State private var newGroupName = ""
|
||
@State private var deleteTarget: NodeID?
|
||
@State private var moveTarget: NodeID?
|
||
@State private var showImportURLSheet = false
|
||
@State private var showQRImportSheet = false
|
||
@State private var showLegacyImportSheet = false
|
||
@State private var showLegacyHandoffSheet = false
|
||
@State private var didOfferLegacyImport = false
|
||
@State private var rootDropHovering = false
|
||
|
||
var body: some View {
|
||
NavigationSplitView {
|
||
sidebar
|
||
} detail: {
|
||
detailPane
|
||
}
|
||
.frame(minWidth: 720, minHeight: 420)
|
||
.alert(
|
||
"重命名分组",
|
||
isPresented: Binding(
|
||
get: { renameTarget != nil },
|
||
set: { if !$0 { renameTarget = nil } })
|
||
) {
|
||
TextField("名称", text: $renameText)
|
||
Button("确定") { commitRename() }
|
||
Button("取消", role: .cancel) { renameTarget = nil }
|
||
}
|
||
.alert(
|
||
"新建分组",
|
||
isPresented: Binding(
|
||
get: { newGroupParent != nil },
|
||
set: { if !$0 { newGroupParent = nil } })
|
||
) {
|
||
TextField("名称", text: $newGroupName)
|
||
Button("创建") { commitNewGroup() }
|
||
Button("取消", role: .cancel) { newGroupParent = nil }
|
||
}
|
||
.alert(
|
||
"操作失败",
|
||
isPresented: Binding(
|
||
get: { viewModel.presentedError != nil },
|
||
set: { if !$0 { viewModel.presentedError = nil } })
|
||
) {
|
||
Button("好", role: .cancel) {}
|
||
} message: {
|
||
Text(viewModel.presentedError ?? "")
|
||
}
|
||
.confirmationDialog(
|
||
deleteTitle,
|
||
isPresented: Binding(
|
||
get: { deleteTarget != nil },
|
||
set: { if !$0 { deleteTarget = nil } }),
|
||
titleVisibility: .visible
|
||
) {
|
||
Button("删除", role: .destructive) { commitDelete() }
|
||
Button("取消", role: .cancel) { deleteTarget = nil }
|
||
} message: {
|
||
Text(deleteMessage)
|
||
}
|
||
.sheet(isPresented: $showImportURLSheet) {
|
||
ImportURLSheet(viewModel: viewModel)
|
||
}
|
||
.sheet(isPresented: $showQRImportSheet) {
|
||
QRImportSheet(viewModel: viewModel)
|
||
}
|
||
.sheet(isPresented: $showLegacyImportSheet) {
|
||
LegacyImportSheet(
|
||
viewModel: viewModel,
|
||
onHandoffRequested: {
|
||
showLegacyImportSheet = false
|
||
showLegacyHandoffSheet = true
|
||
})
|
||
}
|
||
.sheet(isPresented: $showLegacyHandoffSheet) {
|
||
LegacyHandoffSheet(viewModel: legacyHandoffModel)
|
||
.task {
|
||
// 交接成功后经正常启停入口启动 2.0(健康门禁、系统代理授权写入
|
||
// 全部走 #29 路径);重跑交接前先停 2.0 以释放端口。
|
||
legacyHandoffModel.stopProxy = { await proxyController.setProxyEnabled(false) }
|
||
legacyHandoffModel.startProxy = { await proxyController.setProxyEnabled(true) }
|
||
await legacyHandoffModel.refresh()
|
||
}
|
||
}
|
||
.sheet(
|
||
item: Binding(
|
||
get: { moveTarget.map(MoveContext.init) },
|
||
set: { moveTarget = $0?.nodeID })
|
||
) { context in
|
||
MoveNodeSheet(viewModel: viewModel, nodeID: context.nodeID)
|
||
}
|
||
.onAppear {
|
||
guard !didOfferLegacyImport, viewModel.shouldOfferLegacyImport else { return }
|
||
didOfferLegacyImport = true
|
||
showLegacyImportSheet = true
|
||
}
|
||
.task {
|
||
// 交接入口可见性依赖交接完成标记(issue #37)。
|
||
await legacyHandoffModel.refresh()
|
||
}
|
||
}
|
||
|
||
// MARK: - 侧栏(分区切换 + 树 / 诊断摘要)
|
||
|
||
private var sidebar: some View {
|
||
VStack(spacing: 0) {
|
||
Picker("分区", selection: $pane) {
|
||
Text("服务器").tag(Pane.servers)
|
||
Text("订阅").tag(Pane.subscriptions)
|
||
Text("诊断").tag(Pane.diagnostics)
|
||
}
|
||
.pickerStyle(.segmented)
|
||
.labelsHidden()
|
||
.padding(.horizontal, 8)
|
||
.padding(.vertical, 6)
|
||
switch pane {
|
||
case .servers:
|
||
serverSidebar
|
||
case .subscriptions:
|
||
subscriptionsSidebar
|
||
case .diagnostics:
|
||
diagnosticsSidebar
|
||
}
|
||
}
|
||
}
|
||
|
||
/// 诊断分区侧栏:代理状态摘要与脱敏说明(详情与导出入口在右侧日志区)。
|
||
private var diagnosticsSidebar: some View {
|
||
DiagnosticsSummarySidebar(proxyController: proxyController)
|
||
}
|
||
|
||
/// 订阅分区侧栏:订阅摘要说明(卡片与操作全在右侧详情区)。
|
||
private var subscriptionsSidebar: some View {
|
||
VStack(alignment: .leading, spacing: 8) {
|
||
Text("订阅")
|
||
.font(.headline)
|
||
Text("每个订阅是一张卡片:远端 SIP-008 文档经解析校验后原子提交;刷新失败保留最后一次成功内容。远端名称、结构与成员权威,本地仅保留启用开关。")
|
||
.font(.callout)
|
||
.foregroundStyle(.secondary)
|
||
Spacer()
|
||
}
|
||
.padding(12)
|
||
.frame(maxWidth: .infinity, alignment: .leading)
|
||
}
|
||
|
||
private var serverSidebar: some View {
|
||
List(selection: $viewModel.selectedNodeID) {
|
||
OutlineGroup(viewModel.sidebarNodes(), children: \.children) { node in
|
||
SidebarRow(
|
||
node: node,
|
||
viewModel: viewModel,
|
||
proxyController: proxyController,
|
||
onRename: { id in
|
||
renameTarget = id
|
||
renameText = viewModel.displayName(for: id)
|
||
},
|
||
onNewGroup: { parent in
|
||
newGroupParent = parent
|
||
newGroupName = ""
|
||
},
|
||
onMove: { moveTarget = $0 },
|
||
onDelete: { deleteTarget = $0 }
|
||
)
|
||
.onDrag {
|
||
// 订阅节点结构只读:携带空负载,落点校验节点存在性后自动忽略。
|
||
node.source == .manual
|
||
? NSItemProvider(object: node.id.rawValue as NSString)
|
||
: NSItemProvider()
|
||
}
|
||
.dropDestination(for: String.self) { payload, _ in
|
||
handleDrop(payload, onto: node.id)
|
||
} isTargeted: { _ in
|
||
}
|
||
}
|
||
}
|
||
.listStyle(.sidebar)
|
||
.overlay(alignment: .center) {
|
||
if viewModel.catalog.isEmpty {
|
||
ContentUnavailableView(
|
||
"暂无服务器", systemImage: "server.rack",
|
||
description: Text("用工具栏「添加」导入 ss:// 链接或新建分组")
|
||
)
|
||
.allowsHitTesting(false)
|
||
}
|
||
}
|
||
.dropDestination(for: String.self) { payload, _ in
|
||
handleDrop(payload, onto: nil)
|
||
} isTargeted: { hovering in
|
||
rootDropHovering = hovering
|
||
}
|
||
.toolbar { toolbarContent }
|
||
}
|
||
|
||
/// 落点语义:拖到分组行 = 移入该组(仅手动组接受),拖到列表空白/根 = 移到根。
|
||
/// 跨来源由视图过滤 + 领域拒绝双重保证;无效负载不接收。
|
||
private func handleDrop(_ payload: [String], onto target: NodeID?) -> Bool {
|
||
guard let raw = payload.first else { return false }
|
||
let dragged = NodeID(rawValue: raw)
|
||
guard dragged != target, viewModel.catalog.contains(dragged) else { return false }
|
||
Task {
|
||
do {
|
||
try await viewModel.move(dragged, to: target)
|
||
} catch {
|
||
viewModel.presentedError = error.presentableMessage
|
||
}
|
||
}
|
||
return true
|
||
}
|
||
|
||
// MARK: - 详情区
|
||
|
||
@ViewBuilder
|
||
private var detailPane: some View {
|
||
switch pane {
|
||
case .diagnostics:
|
||
DiagnosticsView(
|
||
viewModel: viewModel, proxyController: proxyController, eventStore: eventStore)
|
||
case .subscriptions:
|
||
SubscriptionsView(viewModel: viewModel)
|
||
case .servers:
|
||
if let id = viewModel.selectedNodeID, let entry = viewModel.entry(for: id) {
|
||
switch entry.kind {
|
||
case .server:
|
||
ServerDetailView(
|
||
viewModel: viewModel, serverID: id, proxyController: proxyController)
|
||
case .group:
|
||
GroupDetailView(viewModel: viewModel, groupID: id, proxyController: proxyController)
|
||
}
|
||
} else {
|
||
ContentUnavailableView(
|
||
"未选择节点", systemImage: "sidebar.left",
|
||
description: Text("在左侧选择服务器或分组查看与编辑详情"))
|
||
}
|
||
}
|
||
}
|
||
|
||
// MARK: - 工具栏(添加三入口 + 新建分组)
|
||
|
||
@ToolbarContentBuilder
|
||
private var toolbarContent: some ToolbarContent {
|
||
ToolbarItem(placement: .primaryAction) {
|
||
Menu {
|
||
Button("从剪贴板导入 ss://") { importFromClipboard() }
|
||
Button("通过 URL 导入…") { showImportURLSheet = true }
|
||
Button("从二维码图片导入…") { showQRImportSheet = true }
|
||
if viewModel.legacyImportAvailable {
|
||
Divider()
|
||
Button(
|
||
viewModel.legacyImportCompleted ? "再次导入 Legacy 配置…" : "导入 Legacy 配置…"
|
||
) {
|
||
showLegacyImportSheet = true
|
||
}
|
||
}
|
||
if viewModel.legacyImportAvailable || !legacyHandoffModel.handoffCompleted
|
||
|| legacyHandoffModel.hasLegacyEvidence
|
||
{
|
||
Button(
|
||
legacyHandoffModel.handoffCompleted
|
||
? "Legacy 交接与残留…" : "切换到 2.0(交接旧版服务)…"
|
||
) {
|
||
showLegacyHandoffSheet = true
|
||
}
|
||
}
|
||
Divider()
|
||
Button("新建分组…") {
|
||
newGroupParent = viewModel.importTargetParent(for: viewModel.selectedNodeID)
|
||
newGroupName = ""
|
||
}
|
||
} label: {
|
||
Label("添加", systemImage: "plus")
|
||
}
|
||
}
|
||
}
|
||
|
||
/// 剪贴板入口:整段剪贴板文本按行解析导入当前落点。
|
||
private func importFromClipboard() {
|
||
let text = NSPasteboard.general.string(forType: .string) ?? ""
|
||
performImport(text)
|
||
}
|
||
|
||
private func performImport(_ text: String) {
|
||
Task {
|
||
do {
|
||
let parent = viewModel.importTargetParent(for: viewModel.selectedNodeID)
|
||
let outcome = try await viewModel.addServers(fromURIs: text, into: parent)
|
||
if outcome.added == 0 && outcome.failures.isEmpty {
|
||
viewModel.presentedError = "剪贴板没有可导入的文本"
|
||
} else if !outcome.failures.isEmpty {
|
||
viewModel.presentedError =
|
||
"已添加 \(outcome.added) 台服务器;以下条目无法解析:\n"
|
||
+ outcome.failures.joined(separator: "\n")
|
||
}
|
||
} catch {
|
||
viewModel.presentedError = error.presentableMessage
|
||
}
|
||
}
|
||
}
|
||
|
||
// MARK: - 告警动作
|
||
|
||
private func commitRename() {
|
||
guard let id = renameTarget else { return }
|
||
renameTarget = nil
|
||
Task {
|
||
do {
|
||
try await viewModel.renameGroup(id, to: renameText)
|
||
} catch {
|
||
viewModel.presentedError = error.presentableMessage
|
||
}
|
||
}
|
||
}
|
||
|
||
private func commitNewGroup() {
|
||
guard let parent = newGroupParent else { return }
|
||
newGroupParent = nil
|
||
Task {
|
||
do {
|
||
_ = try await viewModel.addGroup(named: newGroupName, into: parent)
|
||
} catch {
|
||
viewModel.presentedError = error.presentableMessage
|
||
}
|
||
}
|
||
}
|
||
|
||
private var deleteTargetName: String {
|
||
deleteTarget.map { viewModel.displayName(for: $0) } ?? ""
|
||
}
|
||
|
||
/// 删除语义:非空手动组点名子树规模(二次确认),空组与服务器单次确认。
|
||
private var deleteTitle: String {
|
||
guard let id = deleteTarget,
|
||
let entry = viewModel.entry(for: id),
|
||
case .group = entry.kind,
|
||
entry.source == .manual
|
||
else { return "删除「\(deleteTargetName)」?" }
|
||
return "删除分组「\(deleteTargetName)」及其整棵子树?"
|
||
}
|
||
|
||
private var deleteMessage: String {
|
||
guard let id = deleteTarget, let entry = viewModel.entry(for: id),
|
||
case .group(let fields) = entry.kind, entry.source == .manual
|
||
else { return "此操作不可撤销。" }
|
||
let count = subtreeCount(fields.children)
|
||
return "将递归删除 \(count) 个节点(含其中的服务器与凭据),此操作不可撤销。"
|
||
}
|
||
|
||
private func subtreeCount(_ children: [NodeID]) -> Int {
|
||
children.reduce(0) { total, child in
|
||
let grandchildren = (try? viewModel.catalog.children(of: child)) ?? []
|
||
return total + 1 + subtreeCount(grandchildren)
|
||
}
|
||
}
|
||
|
||
private func commitDelete() {
|
||
guard let id = deleteTarget else { return }
|
||
deleteTarget = nil
|
||
Task {
|
||
do {
|
||
try await viewModel.remove(id)
|
||
} catch {
|
||
viewModel.presentedError = error.presentableMessage
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
/// moveTarget 的 sheet(item:) 适配壳。
|
||
private struct MoveContext: Identifiable {
|
||
let nodeID: NodeID
|
||
var id: NodeID { nodeID }
|
||
}
|