mirror of
https://github.com/shadowsocks/ShadowsocksX-NG.git
synced 2026-11-19 12:14:59 +00:00
单测不再以 app 可执行为宿主:新增 ShadowsocksX-NG2Core 静态库 target 同源 编译 App/(除 @main)与 Domain/,模块名沿用 ShadowsocksX_NG2 使全部测试的 @testable import 零改动;app target 模块改名 ShadowsocksX_NG2App 避免共享 Products 目录 swiftmodule 撞名。两个测试 target 改链 Core 后 xcodegen 不再 生成 TEST_HOST,xcodebuild test 只构建不启动 app——与安装版运行实例零接触 (pgrep 全程验证无 app 进程)。同源双编译沿用 Agent/Helper 共享 Domain 文件 的既定模式,Core 只被测试 target 依赖,发布链不编译它。 随之删除 MainApp.swift 的整套测试宿主脚手架(isUnitTesting/makeTesting/ Noop 服务/Ephemeral 存储,-142 行),app 在测试下不再启动,守卫失去存在 理由。宿主移除暴露三处 Bundle.main 依赖,改为显式缝:控制器新增 appBundle 注入(内置规则快照 BuiltinRuleCatalog 与 LaunchDaemon 清单指纹 launchDaemonPlistData(in:) 均按 bundle 读取,生产默认 .main 不变);XPC listener delegate 期望客户端身份改为可注入(测试按本进程 SecCode 自查)。 测试经 AppArtifact.bundle(沿测试包落盘位置向上查找 app 产物,兼容 TEST_HOST 内嵌与平级两种布局)统一取产物。 665 单测 + 11 冒烟全绿,task build 生产构建不受影响。
246 lines
12 KiB
Swift
246 lines
12 KiB
Swift
import AppKit
|
||
import SwiftUI
|
||
|
||
@main
|
||
struct ShadowsocksXNG2App: App {
|
||
@StateObject private var proxyController: ProxyRuntimeController
|
||
@StateObject private var catalogWorkflow: CatalogWorkflow
|
||
@StateObject private var proxyControl: ProxyControlWorkflow
|
||
@StateObject private var loginController: LaunchAtLoginController
|
||
@StateObject private var settingsWorkflow: SettingsWorkflow
|
||
@StateObject private var diagnosticsWorkflow: DiagnosticsWorkflow
|
||
@StateObject private var workspaceRoute: WorkspaceRoute
|
||
@StateObject private var silentLaunch: SilentLaunchController
|
||
private let textClipboard: any TextClipboard
|
||
private let workspaceContent: MainWindowView
|
||
/// 启动呈现行为在进程内一次性定格(ADR 0017):静默启动偏好关闭(默认)
|
||
/// 时 presented,开启时 suppressed。切换偏好当次会话无影响,下次启动生效。
|
||
private let launchPresentation: SceneLaunchBehavior
|
||
|
||
init() {
|
||
let composition = AppComposition.make()
|
||
_proxyController = StateObject(wrappedValue: composition.controller)
|
||
_catalogWorkflow = StateObject(wrappedValue: composition.catalogWorkflow)
|
||
_proxyControl = StateObject(wrappedValue: composition.proxyControl)
|
||
_loginController = StateObject(wrappedValue: composition.loginController)
|
||
_settingsWorkflow = StateObject(wrappedValue: composition.settingsWorkflow)
|
||
_diagnosticsWorkflow = StateObject(wrappedValue: composition.diagnosticsWorkflow)
|
||
_workspaceRoute = StateObject(wrappedValue: composition.workspaceRoute)
|
||
_silentLaunch = StateObject(wrappedValue: composition.silentLaunch)
|
||
textClipboard = composition.textClipboard
|
||
workspaceContent = composition.workspaceContent
|
||
launchPresentation = composition.silentLaunch.isEnabled ? .suppressed : .presented
|
||
// GUI 事件接入内存环形缓冲(spec #21 D5,issue #34):主窗口日志查看器与
|
||
// 诊断导出的来源;wrapper 侧不注册,仍走 stderr → agent.log 收敛。
|
||
RuntimeLog.setSink(RuntimeEventStore.shared)
|
||
}
|
||
|
||
var body: some Scene {
|
||
MenuBarExtra {
|
||
ProxyStatusMenu(
|
||
control: proxyControl,
|
||
catalogWorkflow: catalogWorkflow,
|
||
clipboard: textClipboard)
|
||
} label: {
|
||
StatusMenuLabel(control: proxyControl)
|
||
}
|
||
.menuBarExtraStyle(.menu)
|
||
|
||
// 主 workspace 窗口(ADR 0016/0017):SwiftUI `Window` scene。启动呈现由
|
||
// defaultLaunchBehavior 决定:静默启动关闭(默认)时 presented 启动即呈现
|
||
// (scene 方式启动开窗,LSUIElement 下实测生效),开启时 suppressed 直接
|
||
// 进菜单栏形态。窗口开着期间 app 为 regular(Dock 图标/Cmd-Tab/默认菜单
|
||
// 栏),关窗回 accessory 菜单栏形态——随窗激活策略由窗口 NSWindow 生命
|
||
// 周期通知驱动(WindowActivationPolicy,scenePhase 在 macOS 跟随应用而非
|
||
// 窗口、关窗无事件,实测不可用);关窗后由状态菜单 ⑦ 经 openWindow 重开。
|
||
// 关窗不退进程(MenuBarExtra 持进程)。
|
||
Window("ShadowsocksX-NG2", id: WorkspaceRoute.workspaceSceneID) {
|
||
workspaceContent
|
||
.modifier(WindowActivationPolicy(applying: NSAppWindowActivationApplier()))
|
||
}
|
||
.defaultLaunchBehavior(launchPresentation)
|
||
.defaultSize(width: 960, height: 640)
|
||
}
|
||
}
|
||
|
||
/// 随窗激活策略的真实 NSApp 落点。
|
||
@MainActor
|
||
private final class NSAppWindowActivationApplier: WindowActivationPolicyApplying {
|
||
func apply(_ policy: NSApplication.ActivationPolicy) {
|
||
NSApp.setActivationPolicy(policy)
|
||
}
|
||
}
|
||
|
||
/// 状态菜单的标签视图(状态栏图标)。挂载时机与菜单内容视图不同:内容视图
|
||
/// 首次点开才创建,而标签在启动时即挂载——启动 resync 只能挂在这里,挂在
|
||
/// 菜单内容上等于从不执行。主窗口的启动呈现由 Window scene 的
|
||
/// defaultLaunchBehavior 负责,与本任务无时序耦合。
|
||
private struct StatusMenuLabel: View {
|
||
@ObservedObject var control: ProxyControlWorkflow
|
||
|
||
var body: some View {
|
||
Image(systemName: "network")
|
||
.accessibilityLabel("ShadowsocksX-NG2")
|
||
.task {
|
||
await control.resyncOnLaunch()
|
||
}
|
||
}
|
||
}
|
||
|
||
/// 组合根装配:目录提交协调器与全部生产运行时适配器只在此接线一次,各 scene
|
||
/// 不再重复设置提交回调;目录工作流的实现依赖经 CatalogWorkflowDependencies
|
||
/// 显式装配(workflow 不自行创建生产默认实现);Legacy 导入后的 2.0 运行时
|
||
/// 边界同为一次性注入。主窗口是 SwiftUI `Window` scene(MainApp body 声明),
|
||
/// 内容视图在组合根构造一次;MainWindowView 值廉价且只捕获工作流对象,其
|
||
/// StateObject 状态与 onAppear 副作用在窗口首次打开时才发生。
|
||
@MainActor
|
||
private struct AppComposition {
|
||
let controller: ProxyRuntimeController
|
||
let catalogWorkflow: CatalogWorkflow
|
||
let proxyControl: ProxyControlWorkflow
|
||
let loginController: LaunchAtLoginController
|
||
let settingsWorkflow: SettingsWorkflow
|
||
let diagnosticsWorkflow: DiagnosticsWorkflow
|
||
let workspaceRoute: WorkspaceRoute
|
||
let silentLaunch: SilentLaunchController
|
||
let textClipboard: any TextClipboard
|
||
let workspaceContent: MainWindowView
|
||
|
||
static func make() -> AppComposition {
|
||
let dependencies = ApplicationDependencies.make()
|
||
let textClipboard = dependencies.textClipboard
|
||
// The catalog document is read exactly once at startup. The coordinator
|
||
// publishes later committed snapshots; the controller receives read-only
|
||
// access to this same in-process source.
|
||
let catalogBootstrap = CatalogCommitCoordinator.bootstrap(
|
||
fileStore: dependencies.catalogFileStore)
|
||
let controller = ProxyRuntimeController(
|
||
catalogSnapshotReader: catalogBootstrap.catalogSnapshotReader,
|
||
activationFileStore: dependencies.activationFileStore,
|
||
runtimeFileStore: dependencies.runtimeFileStore,
|
||
credentials: dependencies.credentials,
|
||
listenRestore: dependencies.listenRestore,
|
||
settingsStore: dependencies.settingsStore,
|
||
settingsRestore: dependencies.settingsRestore,
|
||
agent: dependencies.launchAgent,
|
||
systemProxyNetworkChangeMonitor: SystemProxyNetworkChangeMonitor())
|
||
let loginController = LaunchAtLoginController(service: dependencies.loginService)
|
||
let catalogWorkflow = makeCatalogWorkflow(
|
||
dependencies: dependencies,
|
||
controller: controller,
|
||
bootstrap: catalogBootstrap)
|
||
// 代理控制工作流 module(issue #47):状态菜单等 UI 表面的唯一代理控制
|
||
// seam,组合根接线一次。生产 runtime adapter 包装既有控制器(不复制运行
|
||
// 时语义);目录目标事实经窄缝从目录工作流读取。
|
||
let proxyControl = ProxyControlWorkflow(
|
||
runtime: ControllerProxyRuntimeAdapter(controller: controller), targetFacts: catalogWorkflow)
|
||
// 设置工作流 module(Candidate 02):设置窗口的唯一 seam,组合根接线一次;
|
||
// 写入侧经窄缝 SettingsCommitting(issue #44),运行时控制器薄扩展即生产实现。
|
||
let settingsWorkflow = SettingsWorkflow(committing: controller)
|
||
// 诊断工作流 module(issue #43):诊断区唯一 seam,组合根接线一次;共享
|
||
// 实例供诊断侧栏与详情共同使用。
|
||
let diagnosticsWorkflow = DiagnosticsWorkflow(
|
||
runtimeFacts: controller,
|
||
catalogFacts: { catalogWorkflow.diagnosticCatalogFacts })
|
||
let workspaceRoute = WorkspaceRoute()
|
||
let silentLaunch = SilentLaunchController(store: dependencies.silentLaunchStore)
|
||
let workspaceContent = MainWindowView(
|
||
route: workspaceRoute,
|
||
workflow: catalogWorkflow,
|
||
control: proxyControl,
|
||
proxyController: controller,
|
||
diagnostics: diagnosticsWorkflow,
|
||
settingsWorkflow: settingsWorkflow,
|
||
loginController: loginController,
|
||
silentLaunch: silentLaunch,
|
||
clipboard: textClipboard,
|
||
diagnosticReportExporter: dependencies.diagnosticReportExporter,
|
||
configurationGroupFileExporter: dependencies.configurationGroupFileExporter)
|
||
return AppComposition(
|
||
controller: controller,
|
||
catalogWorkflow: catalogWorkflow,
|
||
proxyControl: proxyControl,
|
||
loginController: loginController,
|
||
settingsWorkflow: settingsWorkflow,
|
||
diagnosticsWorkflow: diagnosticsWorkflow,
|
||
workspaceRoute: workspaceRoute,
|
||
silentLaunch: silentLaunch,
|
||
textClipboard: textClipboard,
|
||
workspaceContent: workspaceContent)
|
||
}
|
||
|
||
/// 目录工作流接线(issue #40/#41/#49):提交协调器与生产运行时适配器在此
|
||
/// 一次性装配;Legacy 导入后的 2.0 运行时边界同为一次性注入。
|
||
private static func makeCatalogWorkflow(
|
||
dependencies: ApplicationDependencies,
|
||
controller: ProxyRuntimeController,
|
||
bootstrap: CatalogCommitBootstrap
|
||
) -> CatalogWorkflow {
|
||
let coordinator = CatalogCommitCoordinator(
|
||
fileStore: dependencies.catalogFileStore,
|
||
runtime: ProxyRuntimeSyncAdapter(controller: controller),
|
||
bootstrap: bootstrap)
|
||
return CatalogWorkflow(
|
||
dependencies: CatalogWorkflowDependencies(
|
||
coordinator: coordinator,
|
||
credentials: dependencies.credentials,
|
||
plugins: BundleManagedPluginProvider(),
|
||
subscriptionFetcher: HTTPSSubscriptionFetcher(),
|
||
legacyImportService: dependencies.legacyImportService,
|
||
postLegacyImport: { _ in
|
||
await controller.legacyImportDidCommit()
|
||
},
|
||
activator: controller))
|
||
}
|
||
}
|
||
|
||
/// 组合根依赖集(仅生产形态):单测不再以本 app 为宿主(去宿主化,ADR 0021),
|
||
/// 装配永远面向真实存储、系统服务与用户默认域。
|
||
@MainActor
|
||
private struct ApplicationDependencies {
|
||
let credentials: CredentialStoring
|
||
let catalogFileStore: CatalogFileStore
|
||
let activationFileStore: ActivationStateFileStore
|
||
let runtimeFileStore: RuntimeFileStore
|
||
let settingsStore: ProxySettingsFileStore
|
||
let settingsRestore: RestoredProxySettings
|
||
let listenRestore: RestoredListenSettings
|
||
let legacyImportService: LegacyImportService
|
||
let launchAgent: LaunchAgentControlling
|
||
let loginService: LaunchAtLoginControlling
|
||
let silentLaunchStore: SilentLaunchStore
|
||
let textClipboard: any TextClipboard
|
||
let diagnosticReportExporter: any DiagnosticReportExporter
|
||
let configurationGroupFileExporter: any ConfigurationGroupFileExporter
|
||
|
||
static func make() -> ApplicationDependencies {
|
||
// ADR 0017 初版文件形态的迁移(发布链从未包含,仅存量开发机):文件不存在
|
||
// 即空操作,随每次启动调用无害。
|
||
SilentLaunchStore.migrateLegacyFileIfPresent(
|
||
at: SilentLaunchStore.legacyFileURL, into: .standard)
|
||
let credentials = KeychainCredentialStore()
|
||
let catalogFileStore = CatalogFileStore(fileURL: CatalogFileStore.defaultFileURL())
|
||
let settingsStore = ProxySettingsFileStore()
|
||
let restoredSettings = ProxySettingsFileStore.restored(store: settingsStore)
|
||
return ApplicationDependencies(
|
||
credentials: credentials,
|
||
catalogFileStore: catalogFileStore,
|
||
activationFileStore: ActivationStateFileStore(
|
||
fileURL: ActivationStateFileStore.defaultFileURL()),
|
||
runtimeFileStore: RuntimeFileStore(),
|
||
settingsStore: settingsStore,
|
||
settingsRestore: restoredSettings,
|
||
listenRestore: RestoredListenSettings(
|
||
settings: restoredSettings.settings.listen, unreadableError: nil),
|
||
legacyImportService: LegacyImportService(
|
||
catalogStore: catalogFileStore, credentials: credentials),
|
||
launchAgent: SMAppLaunchAgentService(),
|
||
loginService: SMAppLaunchAtLoginService(),
|
||
silentLaunchStore: SilentLaunchStore(),
|
||
textClipboard: AppKitTextClipboard(),
|
||
diagnosticReportExporter: AppKitDiagnosticReportExporter(),
|
||
configurationGroupFileExporter: AppKitConfigurationGroupFileExporter())
|
||
}
|
||
|
||
}
|