Files
ShadowsocksX-NG/ShadowsocksX-NG2/App/Application/ProxyControlWorkflow/ProxyControlAdapters.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

146 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)
}
/// 控制器与系统代理观察机各持一条 didChange 事实通道(同一主队列轮内多次
/// 写合并为一次,冲洗晚于同步轮):合并后交 workflow 整体重观察,不会读到
/// 半程状态。系统代理呈现事实的存储与发布在观察机上,其通道并入同一链。
var changes: AnyPublisher<Void, Never> {
Publishers.Merge(
controller.factChanges.changes,
controller.systemProxyObserver.factChanges.changes
)
.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))
}
}