Files
ShadowsocksX-NG/ShadowsocksX-NG2/App/ProxyControlWorkflow/ProxyControlAdapters.swift
T
Qiu Yuzhou eac30c4abd refactor(sysproxy): 系统代理策略机抽为 SystemProxyObserver 模块
ADR-0022 的观察/修复/挂起策略此前溶解在控制器 15 个可变字段里、由
Gate/Inspection/Commands/Health/Mode 五个文件交叉读写。现在策略机独立为
SystemProxyObserver:意图开关、出口可用性、期望配置与健康循环调度以
@MainActor 闭包注入,模块不反向依赖控制器;底层继续只依赖
SystemProxyControlling / helper 注册缝 / 网络变化监视三条既有缝。

- 3 个 @Published 呈现事实随迁,控制器留同名只读门面(测试与诊断面零改动);
  adapter 再发布链 merge 观察机 objectWillChange,主队列 hop 语义不变
- 健康循环留在控制器(循环体含运行时健康呈现),任务柄归观察机;
  cleanup-until-quiet、网络变化 inspection 调度与操作互斥全部内聚
- 方法体逐字搬运(settings.systemProxyEnabled→isIntentEnabled() 等机械替换),
  语义零改动;既有 777 测试全绿
2026-10-03 12:44:20 +08:00

147 lines
5.4 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 Combine
import Foundation
/// 生产运行时 adapter(issue #47):现有 `ProxyRuntimeController` 与其系统代理
/// 观察机(`SystemProxyObserver`,ADR-0022 策略机)的唯一包装,由应用组合根
/// 接线。只把既有能力与观察投影到 workflow 缝上,不复制状态机、generation、
/// 健康门禁与系统代理生命周期语义。
@MainActor
final class ControllerProxyRuntimeAdapter: ProxyRuntimeAdapting {
private let controller: ProxyRuntimeController
init(controller: ProxyRuntimeController) {
self.controller = controller
}
var runtimeFacts: ProxyRuntimeFacts { controller.runtimeFacts }
var agentIntentEnabled: Bool { controller.agentIntentEnabled }
var activationFailure: ActivationFailure? { controller.lastActivationFailure }
var systemProxyIntentEnabled: Bool { controller.systemProxyIntentEnabled }
var systemProxyApplication: SystemProxyApplicationFacts {
controller.systemProxyState
}
var systemProxyInspection: SystemProxyInspectionFacts { controller.systemProxyInspection }
var systemProxyApprovalRequired: Bool { controller.systemProxyApprovalRequired }
var proxyMode: ProxyMode { controller.proxyMode }
var ruleDefaultAction: RuleDefaultAction { controller.ruleDefaultAction }
var skippedInvalidServerCount: Int { controller.skippedServers.count }
var activeTargetID: NodeID? { controller.activeTargetID }
var httpExportCapability: HTTPExportCapability {
HTTPExportCapability(listen: controller.listenSettings)
}
var listenFacts: RuntimeListenFacts {
RuntimeListenFacts(listen: controller.listenSettings)
}
/// 控制器与系统代理观察机的 `objectWillChange` 都是 willChange 语义;主队列
/// hop 落地时被发布的新值已可读,workflow 重观察不会读到半程状态。系统代理
/// 呈现事实的存储与发布在观察机上,其发布并入同一再发布链。
var changes: AnyPublisher<Void, Never> {
Publishers.Merge(
controller.objectWillChange.map { _ in () },
controller.systemProxyObserver.objectWillChange.map { _ in () }
)
.receive(on: DispatchQueue.main)
.eraseToAnyPublisher()
}
func resyncOnLaunch() async {
await controller.resyncOnLaunch()
}
func setAgentEnabled(_ enabled: Bool) async {
await controller.setAgentEnabled(enabled)
}
func setSystemProxyEnabled(_ enabled: Bool) async {
await controller.setSystemProxyEnabled(enabled)
}
func openSystemProxyHelperApproval() async {
await controller.systemProxyObserver.openSystemProxyHelperApproval()
}
func repairSystemProxy() async { await controller.systemProxyObserver.repairSystemProxy() }
func retrySystemProxyClear() async {
await controller.systemProxyObserver.retrySystemProxyClear()
}
func recheckSystemProxy() async { await controller.systemProxyObserver.recheckSystemProxy() }
func setProxyMode(_ mode: ProxyMode) async {
await controller.setProxyMode(mode)
}
func setRuleDefaultAction(_ action: RuleDefaultAction) async {
await controller.setRuleDefaultAction(action)
}
}
/// HTTP 导出能力的唯一派生点:监听设置 → 可复制的 http/https 双导出行。
/// 此导出行始终指向回环地址(与首页完整命令的命令地址选择无关,issue #72)。
extension HTTPExportCapability {
init(listen: SslocalListenSettings) {
let urlHost = listen.proxyLoopbackURLHost
let endpoint = "http://\(urlHost):\(listen.httpPort)"
self.init(copyableLine: "export http_proxy=\(endpoint);export https_proxy=\(endpoint);")
}
}
/// 终端代理环境变量命令的唯一派生点(issue #72):已保存监听事实 + 生效
/// 命令地址 → 两种 shell 的可复制命令。HTTP/HTTPS 用已保存 HTTP 端口,
/// SOCKS 用已保存 SOCKS 端口;变量集合、小写变量名、单引号转义、socks5
/// 协议与 no_proxy 内容保持不变;IPv6 URL 使用方括号。
extension TerminalProxyEnvironmentCommands {
init(listen: RuntimeListenFacts, commandAddress: TerminalCommandAddress) {
let host = commandAddress.address
let urlHost = host.contains(":") ? "[\(host)]" : host
let httpEndpoint = "'http://\(urlHost):\(listen.httpPort)'"
let socksEndpoint = "'socks5://\(urlHost):\(listen.socksPort)'"
let noProxy = "'localhost,127.0.0.1,::1,.local'"
let zshBash =
[
"export http_proxy=\(httpEndpoint)",
"export https_proxy=\(httpEndpoint)",
"export all_proxy=\(socksEndpoint)",
"export no_proxy=\(noProxy)",
].joined(separator: "; ") + ";"
let fish =
[
"set -gx http_proxy \(httpEndpoint)",
"set -gx https_proxy \(httpEndpoint)",
"set -gx all_proxy \(socksEndpoint)",
"set -gx no_proxy \(noProxy)",
].joined(separator: "; ") + ";"
self.init(
zshBash: zshBash,
fish: fish)
}
}
extension SslocalListenSettings {
fileprivate var proxyLoopbackURLHost: String {
let host = listenerMode.proxyLoopbackAddress
return host.contains(":") ? "[\(host)]" : host
}
}
/// 目录侧唯一的目标事实出口(窄缝,story 28):存在性 + 显示名路径摘要;
/// 完整目录树、订阅对象与凭据不出此接口。
extension CatalogWorkflow: ProxyTargetFactsReading {
func activeTargetFacts(for targetID: NodeID?) -> ProxyActiveTargetFacts? {
guard let targetID else { return nil }
return ProxyActiveTargetFacts(id: targetID, pathSummary: tree.pathSummary(for: targetID))
}
}