mirror of
https://github.com/shadowsocks/ShadowsocksX-NG.git
synced 2026-10-30 14:13:50 +00:00
Qiu Yuzhou
374f0da4d7
Add an application-layer CatalogCommitCoordinator as the single commit entry for normal configuration changes: copy -> mutate -> atomic persist -> publish committed state -> async runtime convergence toward the just committed in-memory snapshot. Commits complete at persist; convergence reports structured outcomes (converged / revalidated / failed / clearedAndStopped) and never blocks or rolls back the commit. Each commit bumps a generation; superseded syncs end before starting or have their late results discarded, so only the latest snapshot can win. No automatic retry. CatalogRuntimeSyncing is the one new replacement seam: the production ProxyRuntimeSyncAdapter drives the existing ProxyRuntimeController via a snapshot-based catalogDidCommit; tests use a deterministic fake. When no active target exists a commit no longer touches the runtime at all. CatalogViewModel stays as a compatibility facade with unchanged published state; the optional postCommit callback and the per-scene callback wiring in MainApp are removed - the composition root wires the coordinator, adapter and the (independent) Legacy import boundary exactly once.
ShadowsocksX-NG
🚧 重新实现进行中 —— 本仓库正在使用现代技术栈重写 ShadowsocksX-NG macOS 客户端。
新工程不再通过 git 子模块在仓库内构建依赖，而是直接复制上游项目发布好的可执行文件，以简化构建流程。
目录结构
.
├── ShadowsocksX-NG2/ # 新工程：现代化重写版本（开发中）
└── Legacy/ # 旧版工程完整源码，仅供参考，不保证可构建
旧版工程的功能说明与使用文档见 Legacy/README.md。
开发钩子
新 clone 后，在仓库根目录启用 Git hooks：
git config core.hooksPath .githooks
启用后，pre-commit 只检查暂存区中 ShadowsocksX-NG2/ 下的 .swift 文件：swift format 的结果写回暂存区、不修改工作区；SwiftLint 的 error 级违规拒绝提交，warning 仅提示。Legacy/ 和其他文件跳过；没有 NG2 Swift 文件时直接放行。含有 NG2 Swift 文件但缺少工具时，提交检查失败。工具安装与版本见 ShadowsocksX-NG2/README.md。