mirror of
https://github.com/shadowsocks/ShadowsocksX-NG.git
synced 2026-11-22 13:34:00 +00:00
Domain/ 根目录原有 62 个平铺源文件,无法从目录读出主题划分。 按「目录即主题」重组为 11 个目录(Rules/Custom 为嵌套子目录):Catalog / Subscription / Rules / Runtime / Activation / Settings / SystemProxy / Plugin / Credentials / LegacyImport / Diagnostics。纯移动:类型名、模块名 与 import 均未改动,Domain/ 根下不再有散落文件。目录口径取自 GLOSSARY.md 的章节划分(配置与订阅、代理规则、代理控制与网络、设置、 凭据与诊断),而非新造分类。 配套改动: - project.yml:wrapper 与 helper 两个 target 按文件引用的 15 条显式路径 随目录改名,并补注释固定这一约定——这 15 条指向不存在的文件时, xcodegen generate 以 "missing source directory" 直接失败(实测,不静默)。 - SkeletonTests 新增 DomainLayoutTests:断言 Domain/ 根下无平铺 .swift、 树下只有 .swift。后者防的是与 App/ 同源的坑——Domain/ 整目录是 app 与 Core 的 source path,任何非源码文件都会被 XcodeGen 收进 Resources 阶段 并封进签名后的 bundle。 - README 工程结构说明同步;docs/design 与 docs/research 属历史文档不改。 验证:xcodegen generate 后 app 164 / Core 163 源文件数与整理前一致;Agent 恰好 9 个、Helper 恰好 6 个 Domain 文件(无缺失无多出);app 与 Core 各覆盖 全部 62 个。clean build 0 error;task test 1024 用例全通过(整理前 1022, +2 为新增守卫);task format 未改写任何被移动文件(证明纯移动);task lint 与整理前同为 21 条内容型 warning;packaging-gate.sh ALL CHECKS PASSED。 布局守卫已做变异验证:临时投放松散 .swift 与非 .swift 文件时两个用例均 失败并点名违规文件,清理后复验为绿。
94 lines
2.8 KiB
Swift
94 lines
2.8 KiB
Swift
import Foundation
|
|
|
|
/// 自定义规则持久化(issue #66):独立 JSON 文档,原子写盘。
|
|
/// Saving intent is independent of subsequent ACL application and runtime recovery.
|
|
struct CustomRuleStore {
|
|
let fileURL: URL
|
|
|
|
init(fileURL: URL = CustomRuleStore.defaultFileURL()) {
|
|
self.fileURL = fileURL
|
|
}
|
|
|
|
static func defaultFileURL() -> URL {
|
|
RuntimePaths.customRulesFileURL()
|
|
}
|
|
|
|
/// 读取规则集合;文件不存在视为无自定义规则。
|
|
func load() throws -> [CustomRule] { try loadDocument().rules }
|
|
|
|
func loadDocument() throws -> CustomRuleDocument {
|
|
let data: Data
|
|
do {
|
|
data = try Data(contentsOf: fileURL)
|
|
} catch let error as CocoaError where error.code == .fileReadNoSuchFile {
|
|
return CustomRuleDocument(rules: [])
|
|
} catch {
|
|
throw CustomRuleStoreError.ioFailure(detail: String(describing: error))
|
|
}
|
|
let document: CustomRuleDocument
|
|
do {
|
|
document = try Self.decode(data)
|
|
} catch let error as CustomRuleStoreError {
|
|
throw error
|
|
} catch {
|
|
throw CustomRuleStoreError.corrupt(detail: String(describing: error))
|
|
}
|
|
return document
|
|
}
|
|
|
|
/// 原子写入完整规则集合。
|
|
func save(_ rules: [CustomRule]) throws {
|
|
let old = try loadDocument()
|
|
try saveDocument(CustomRuleDocument(rules: rules, disabledIdentities: old.disabledIdentities))
|
|
}
|
|
|
|
func saveDocument(_ document: CustomRuleDocument) throws {
|
|
let data = try Self.encode(document)
|
|
_ = try Self.decode(data)
|
|
do {
|
|
try AtomicFileWriter.write(data, to: fileURL)
|
|
} catch {
|
|
throw CustomRuleStoreError.ioFailure(detail: String(describing: error))
|
|
}
|
|
}
|
|
|
|
/// 安全摘要:数量 + 内容版本(issue #66 AC5)。
|
|
func summary() throws -> CustomRuleSummary {
|
|
CustomRuleSummary.summarizing(try loadDocument())
|
|
}
|
|
|
|
static func decode(_ data: Data) throws -> CustomRuleDocument {
|
|
try JSONDecoder().decode(CustomRuleDocument.self, from: data)
|
|
}
|
|
|
|
static func encode(_ document: CustomRuleDocument) throws -> Data {
|
|
let encoder = JSONEncoder()
|
|
encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
|
|
return try encoder.encode(document)
|
|
}
|
|
}
|
|
|
|
/// One saved-document owner per app process. Only successful atomic saves update
|
|
/// this fact; runtime recovery never restores an older rule document.
|
|
@MainActor
|
|
final class RuleDocumentSession {
|
|
private let store: CustomRuleStore
|
|
private(set) var current: CustomRuleDocument?
|
|
private(set) var revision = 0
|
|
|
|
init(store: CustomRuleStore) { self.store = store }
|
|
|
|
func load() throws -> CustomRuleDocument {
|
|
if let current { return current }
|
|
let loaded = try store.loadDocument()
|
|
current = loaded
|
|
return loaded
|
|
}
|
|
|
|
func save(_ document: CustomRuleDocument) throws {
|
|
try store.saveDocument(document)
|
|
if current != document { revision += 1 }
|
|
current = document
|
|
}
|
|
}
|