mirror of
https://github.com/shadowsocks/ShadowsocksX-NG.git
synced 2026-11-22 05:25:41 +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 文件时两个用例均 失败并点名违规文件,清理后复验为绿。
56 lines
1.9 KiB
Swift
56 lines
1.9 KiB
Swift
import Foundation
|
|
|
|
/// Prefix trees restrict explanatory analysis to intersecting rules. Domain
|
|
/// labels and IP bits share the same tree mechanics; RuleCoverage remains the
|
|
/// authority for intersection, containment, and mapped-address semantics.
|
|
struct RulesOverlapIndex {
|
|
private final class Node {
|
|
var rules: [ProxyRule] = []
|
|
var children: [String: Node] = [:]
|
|
func descendants() -> [ProxyRule] { rules + children.values.flatMap { $0.descendants() } }
|
|
}
|
|
private let root = Node()
|
|
|
|
init(rules: [ProxyRule]) {
|
|
for rule in rules {
|
|
var node = root
|
|
for component in Self.path(rule.identity.match) {
|
|
if node.children[component] == nil { node.children[component] = Node() }
|
|
node = node.children[component]!
|
|
}
|
|
node.rules.append(rule)
|
|
}
|
|
}
|
|
|
|
func overlapping(_ match: RuleMatch) -> [ProxyRule] {
|
|
var node = root
|
|
var candidates = node.rules
|
|
for component in Self.path(match) {
|
|
guard let next = node.children[component] else {
|
|
return candidates.filter { RuleCoverage.intersects($0.identity.match, match) }
|
|
}
|
|
node = next
|
|
candidates += node.rules
|
|
}
|
|
candidates += node.children.values.flatMap { $0.descendants() }
|
|
return candidates.filter { RuleCoverage.intersects($0.identity.match, match) }
|
|
}
|
|
|
|
private static func path(_ match: RuleMatch) -> [String] {
|
|
switch match {
|
|
case .domainExact(let value), .domainSuffix(let value):
|
|
return ["domain"] + value.split(separator: ".").reversed().map(String.init)
|
|
case .ipv4CIDR, .ipv6CIDR:
|
|
guard let cidr = RuleCoverage.parseCIDR(match) else { return [] }
|
|
let bytes =
|
|
cidr.family == .ipv4
|
|
? Array(repeating: UInt8(0), count: 10) + [255, 255] + cidr.bytes : cidr.bytes
|
|
let prefix = cidr.prefixLength + (cidr.family == .ipv4 ? 96 : 0)
|
|
return ["ip"]
|
|
+ (0..<prefix).map { bit in
|
|
bytes[bit / 8] & (UInt8(1) << (7 - bit % 8)) == 0 ? "0" : "1"
|
|
}
|
|
}
|
|
}
|
|
}
|