mirror of
https://github.com/shadowsocks/ShadowsocksX-NG.git
synced 2026-11-22 13:34:00 +00:00
建立目录工作流深 module(App/CatalogWorkflow/),收窄主窗口与配置 UI 对 配置目录、凭据存储、订阅快照、Legacy 导入与运行时收敛的访问: - UI-facing interface:非敏感树/编辑面/订阅 projection、opaque NodeID 查询、 typed command(ServerEditDraft 等)、typed error 与 structured outcome (BatchImportOutcome 逐行点名、RemovalOutcome selection invalidation); 秘密值只在显式编辑/分享/订阅 URL 命令中出现。 - 服务器编辑:配置与凭据作为一个逻辑变更,CredentialWriteJournal 保证目录 持久化失败时旧配置与旧凭据都保持有效(story 12/13,含测试)。 - 提交与收敛分离:目录提交成功与 runtimeSync 收敛阶段是独立观察面,运行时 失败不回滚已提交目录(story 38/39,含测试)。 - 订阅:创建/刷新/换址/删除沿用原子快照、last-good 保留与凭据回滚;卡片 projection 只含 host,结构化刷新状态由呈现层本地化。 - Legacy 导入端到端编排:不驱动运行时收敛、不自动重复、显式再导入创建独立 分组;handoff 仍经组合根注入的独立边界。 - Deletion test:删除 CatalogViewModel/Types/+Subscriptions 旧 facade,全部 视图与状态菜单迁移到新 seam;选择、pane、sheet、alert 状态收归 UI 持有 (ErrorAlertPresenter)。导入失败行以行号点名,不再回显 ss:// 行内容。 测试经 module interface 观察(395 项全部通过):持久化失败凭据回滚、提交/ 收敛阶段分离、收敛失败不回滚、导入不触发运行时等新增场景;既有 Domain、 协调器与运行时测试保持不变。 Out of scope(spec #41):设置编辑、ProxyRuntimeController、Legacy handoff、 新视觉设计、独立编译 target。
140 lines
4.6 KiB
Swift
140 lines
4.6 KiB
Swift
import Foundation
|
||
|
||
/// 错误 → 用户可读文案(主窗口弹窗呈现)。领域拒绝逐条点名原因,与 spec #21
|
||
/// 的「无静默回退、点名失败」语义一致。
|
||
extension Error {
|
||
var presentableMessage: String {
|
||
switch self {
|
||
case let error as CatalogError:
|
||
return error.presentedMessage
|
||
case let error as ServerFormError:
|
||
switch error {
|
||
case .invalidAddress:
|
||
return "服务器地址不能为空"
|
||
case .invalidPort:
|
||
return "端口必须是 1–65535 之间的整数"
|
||
case .missingEncryptionMethod:
|
||
return "必须选择加密方法"
|
||
case .unsupportedEncryptionMethod(let method):
|
||
return "当前 sslocal 不支持加密方法「\(method)」"
|
||
case .invalidPassword:
|
||
return "密码不能为空"
|
||
case .emptyName:
|
||
return "名称不能为空"
|
||
case .pluginNotManaged(let program):
|
||
return "本版本未提供插件「\(program)」"
|
||
}
|
||
case let error as SsUriError:
|
||
switch error {
|
||
case .notSsUri:
|
||
return "不是 ss:// 链接"
|
||
case .malformed(let detail):
|
||
return "无法解析 ss:// 链接:\(detail)"
|
||
}
|
||
case let error as CredentialStoreError:
|
||
switch error {
|
||
case .keychainStatus(let status):
|
||
return "钥匙串操作失败(错误码 \(status))"
|
||
case .secretNotUTF8:
|
||
return "钥匙串中的凭据不是文本"
|
||
}
|
||
case let error as SubscriptionFormError:
|
||
switch error {
|
||
case .invalidURL:
|
||
return "订阅地址必须是有效的 HTTPS URL"
|
||
case .notFound:
|
||
return "订阅不存在(可能已被删除)"
|
||
}
|
||
case let error as SubscriptionFetchError:
|
||
return error.presentedMessage
|
||
case let error as SubscriptionParseError:
|
||
return error.presentedMessage
|
||
case let error as ImportLineFailureReason:
|
||
return error.presentableMessage
|
||
default:
|
||
return String(describing: self)
|
||
}
|
||
}
|
||
}
|
||
|
||
extension ImportLineFailureReason {
|
||
var presentableMessage: String {
|
||
switch self {
|
||
case .decode(let error):
|
||
return error.presentableMessage
|
||
case .credential(let error):
|
||
return error.presentableMessage
|
||
}
|
||
}
|
||
}
|
||
|
||
extension CatalogError {
|
||
var presentedMessage: String {
|
||
switch self {
|
||
case .nodeNotFound:
|
||
return "节点不存在(可能已被删除)"
|
||
case .parentNotFound:
|
||
return "目标分组不存在"
|
||
case .parentNotAGroup:
|
||
return "目标位置不是分组"
|
||
case .notAServer:
|
||
return "该节点不是服务器"
|
||
case .notAGroup:
|
||
return "该节点不是分组"
|
||
case .duplicateID:
|
||
return "节点身份冲突"
|
||
case .crossSourcePlacement(_, let container):
|
||
return container == .subscription
|
||
? "不能把手动节点移入订阅子树"
|
||
: "不能把订阅节点移入手动子树"
|
||
case .subscriptionNodeImmutable:
|
||
return "订阅节点由远端管理:结构、连接字段与名称只读"
|
||
case .subscriptionServerAtRoot:
|
||
return "订阅服务器不能移出其订阅分组"
|
||
case .cycleDetected:
|
||
return "不能把分组移动进它自己的子树"
|
||
case .indexOutOfRange:
|
||
return "插入位置超出范围"
|
||
case .invalidStructure:
|
||
return "配置目录结构不一致"
|
||
}
|
||
}
|
||
}
|
||
|
||
extension SubscriptionFetchError {
|
||
var presentedMessage: String {
|
||
switch self {
|
||
case .invalidURL:
|
||
return "订阅地址无效(缺少主机)"
|
||
case .unsupportedScheme:
|
||
return "订阅地址必须是 HTTPS"
|
||
case .insecureRedirect:
|
||
return "订阅地址重定向到了非 HTTPS 站点,已拒绝"
|
||
case .transport(let detail):
|
||
return "订阅获取失败(\(detail))"
|
||
case .httpStatus(let code):
|
||
return "订阅服务器返回 HTTP \(code)"
|
||
case .contentType(let received):
|
||
return received.map { "订阅响应类型不是 application/json; charset=utf-8(收到 \($0))" }
|
||
?? "订阅响应缺少 Content-Type: application/json; charset=utf-8"
|
||
}
|
||
}
|
||
}
|
||
|
||
extension SubscriptionParseError {
|
||
var presentedMessage: String {
|
||
switch self {
|
||
case .decodingFailure:
|
||
return "订阅内容不是合法的 SIP-008 JSON 文档"
|
||
case .unsupportedSchemaVersion:
|
||
return "订阅文档版本不受支持(需要 SIP-008 version 1)"
|
||
case .missingServers:
|
||
return "订阅文档缺少 servers 列表"
|
||
case .recordValidation(let index, let reason):
|
||
return "订阅第 \(index + 1) 条服务器记录无效:\(reason)"
|
||
case .duplicateServerID(let id):
|
||
return "订阅包含重复的服务器 ID:\(id)"
|
||
}
|
||
}
|
||
}
|