Files
ShadowsocksX-NG/ShadowsocksX-NG2/App/Application/ProxyRuntime/ProxyRuntimeFacts.swift
T
Qiu Yuzhou fb428f12bc refactor(app): 按分层重组 App/ 源码目录
App/ 根目录原有 73 个散落源文件,已无法从目录读出任何分组信息。

按「目录即分层」重组为 Composition / Application / Presentation / UI /
PlatformEffects / Resources 六个目录,UI 层再按子视图分目录(Workspace、
Home、Servers(含 Plugin)、Subscriptions、Rules、Settings、Diagnostics、
StatusMenu)。纯移动:类型名、模块名与 import 均未改动,App/ 根层不再有
散落文件。

配套改动:

- project.yml:Core 测试镜像的 excludes 由裸文件名改为 `**/` 递归形式。
  XcodeGen 的 exclude 不跨 `/`,裸名只匹配 App 根层;MainApp.swift 下移后
  旧写法会静默失效,把 @main 组合根编进测试镜像。info.path 与
  entitlements.path 指向 App/Resources/;并排除 `**/*.md`——App/ 下任何
  非源码文件都会被 XcodeGen 收进 Resources 阶段并封进签名后的 bundle。
- SkeletonTests 的架构守卫由「默认扫描全部 App/ + 7 个豁免文件 + 1 个豁免
  前缀 + 4 个豁免目录」改为正面圈定 App/UI/,豁免登记全部删除;新增运行时
  适配器放进 Application/ 即自动落在扫描范围外,无需再登记。
- README 工程结构说明同步;根 .gitignore 的生成物路径随 Resources/ 归位。

验证:clean build 0 error;task test 1022 用例全通过(含两个架构守卫);
task format 无改动(证明纯移动);task lint 与移动前同为 21 条内容型
warning;packaging-gate.sh ALL CHECKS PASSED,确认 plist/entitlements 归位
后签名与 entitlements 语义不变。

注意:迁移时须先删旧的生成物再 xcodegen generate,否则遗留的 App/Info.plist
会被当作普通资源扫进 Resources 阶段。
2026-10-05 19:56:18 +08:00

189 lines
5.9 KiB
Swift
Raw Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
import Foundation
/// Stable runtime status categories exposed to app presentation surfaces.
/// 系统代理结果不在此列:它有独立的 `SystemProxyApplicationFacts`
/// (issue #60 拆分两个状态面)。
enum ProxyRuntimeStatus: Equatable, Sendable {
case off
case starting
case running
case firewallBlocked
case launchFailed
case requiresApproval
case serviceFailed
}
/// Domain-neutral runtime projection for status-menu presentation. The
/// controller's state representation stays behind the adapter below.
struct ProxyRuntimeFacts: Equatable, Sendable {
let status: ProxyRuntimeStatus
let isOn: Bool
let failure: RuntimeFailureFacts?
init(
status: ProxyRuntimeStatus,
isOn: Bool,
failure: RuntimeFailureFacts? = nil
) {
self.status = status
self.isOn = isOn
self.failure = failure
}
}
/// 系统代理实际作用的固定类别(issue #60):意图持久化为开关事实,这里
/// 呈现 NG2 对系统设置的真实作用,与 agent 运行状态互不代替。
enum SystemProxyApplicationFacts: Equatable, Sendable {
/// 意图关闭:系统代理清理完成。
case idle
/// 意图开启,等待 agent 健康或可用出口;条件恢复后自动收敛。
case pending
/// 已应用系统代理配置。
case applied
/// 写入或恢复失败(typed)。
case failed(SystemProxyFailureFacts)
case changed
case applying
case repairing
case repairFailed(SystemProxyFailureFacts)
case clearFailed(SystemProxyFailureFacts)
case paused
case unreadable(SystemProxyFailureFacts)
}
struct SystemProxyDifference: Equatable, Sendable, Identifiable {
enum Kind: Equatable, Sendable { case changed, notApplied, remaining }
let identifier: SystemProxyServiceIdentifier
let name: String
let kind: Kind
var id: SystemProxyServiceIdentifier { identifier }
}
/// Current observation and action availability, independent of the last operation result.
struct SystemProxyInspectionFacts: Equatable, Sendable {
var differences: [SystemProxyDifference] = []
var readFailure: SystemProxyFailureFacts?
var canRepair = false
var canRetryClear = false
var isBusy = false
var backgroundUnavailable = false
}
/// Safe endpoint health categories used by runtime state and presentation.
enum RuntimeEndpointFailure: Equatable, Sendable {
case refused
case timedOut
case invalidResponse
case unknown
}
struct FirewallBlockedFacts: Equatable, Sendable {
let executableName: String
}
enum LaunchFailureFacts: Equatable, Sendable {
case missingRuntimeDocument
case localEndpoint(
endpoint: String, host: String, port: Int, cause: RuntimeEndpointFailure)
case unreadableSettings
}
enum ServiceFailureFacts: Equatable, Sendable {
case runtimeFile
case agent
case missingDocument
case persistence
case unknown
}
enum SystemProxyOperationFailure: Equatable, Sendable {
case preferencesUnavailable
case preferencesBusy
case noCurrentNetworkSet
case noNetworkLocations
case noProxyServices
case unreadableService
case invalidStoredConfiguration
case cannotWriteService
case commitFailed
case applyFailed
case invalidRequest
case helperUnavailable
}
extension SystemProxyOperationFailure {
/// `SystemProxyError` 的呈现类别投影:稳定事实只保留操作类别;Domain 错误
/// 的关联值(排查细节)不出现在运行时事实里。
init(_ error: SystemProxyError) {
switch error {
case .preferencesUnavailable: self = .preferencesUnavailable
case .preferencesBusy: self = .preferencesBusy
case .noCurrentNetworkSet: self = .noCurrentNetworkSet
case .noNetworkLocations: self = .noNetworkLocations
case .noProxyServices: self = .noProxyServices
case .unreadableService: self = .unreadableService
case .invalidStoredConfiguration: self = .invalidStoredConfiguration
case .cannotWriteService: self = .cannotWriteService
case .commitFailed: self = .commitFailed
case .applyFailed: self = .applyFailed
case .invalidRequest: self = .invalidRequest
case .helperUnavailable: self = .helperUnavailable
}
}
}
enum SystemProxyFailureFacts: Equatable, Sendable {
case operation(SystemProxyOperationFailure)
case mode(ProxyModeError)
case unknown
}
/// Structured runtime failure projection used by runtime synchronization and
/// app presentation. No arbitrary platform detail is carried into this state.
/// `.systemProxy` 只用于把系统代理失败携带进结构化 outcome(设置工作流与
/// 目录收敛结果);呈现面走 `SystemProxyApplicationFacts.failed`。
enum RuntimeFailureFacts: Error, Equatable, Sendable {
case firewallBlocked(FirewallBlockedFacts)
case launch(LaunchFailureFacts)
case service(ServiceFailureFacts)
case activation(ActivationFailure)
case requiresApproval
case systemProxy(SystemProxyFailureFacts)
}
extension ProxyRuntimeFacts {
init(state: ProxyRuntimeController.AgentRunState) {
switch state {
case .off:
self.init(status: .off, isOn: false)
case .starting:
self.init(status: .starting, isOn: true)
case .running:
self.init(status: .running, isOn: true)
case .firewallBlocked(let facts):
self.init(
status: .firewallBlocked, isOn: true, failure: .firewallBlocked(facts))
case .launchFailed(let facts):
self.init(status: .launchFailed, isOn: false, failure: .launch(facts))
case .requiresApproval:
self.init(status: .requiresApproval, isOn: true, failure: .requiresApproval)
case .serviceFailed(let facts):
self.init(status: .serviceFailed, isOn: false, failure: .service(facts))
}
}
}
extension SystemProxyApplicationFacts {
var hasOperationFailure: Bool { isApplyFailure || isClearFailure }
var isApplyFailure: Bool {
switch self {
case .failed, .repairFailed: true
default: false
}
}
var isClearFailure: Bool {
if case .clearFailed = self { return true }
return false
}
}