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 文件时两个用例均 失败并点名违规文件,清理后复验为绿。
114 lines
4.3 KiB
Swift
114 lines
4.3 KiB
Swift
import Foundation
|
|
|
|
/// A full saved collection is the only context: no runtime, default action, or network dependencies.
|
|
enum OfflineRuleMatcher {
|
|
enum Outcome: Equatable, Sendable { case proxy, direct, unmatched }
|
|
enum Explanation: Equatable, Sendable {
|
|
case fixedLocal, domainProxy, ipDirect, singleAction, noMatch
|
|
}
|
|
enum Failure: Error, Equatable, Sendable { case invalidTarget, incompleteCollection }
|
|
|
|
struct Result: Equatable, Sendable {
|
|
let version: String
|
|
let target: String
|
|
let outcome: Outcome
|
|
let domainWithoutDNS: Bool
|
|
let deciding: [RulesRow]
|
|
let otherMatches: [RulesRow]
|
|
let explanation: Explanation
|
|
}
|
|
|
|
static func test(collection: RulesCollection, address: String) throws -> Result {
|
|
guard collection.issues.isEmpty else { throw Failure.incompleteCollection }
|
|
let target = try OfflineRuleTarget(address)
|
|
let matches = collection.rows.filter { row in
|
|
guard row.isEnabled else { return false }
|
|
guard let identity = row.identity else { return target.isSimpleHostname }
|
|
return RuleCoverage.domainCovers(identity.match, target.match)
|
|
|| RuleCoverage.ipCovers(identity.match, target.match)
|
|
}
|
|
let fixed = matches.filter(\.isFixed)
|
|
let action: RuleAction?
|
|
let explanation: Explanation
|
|
if !fixed.isEmpty {
|
|
action = .direct
|
|
explanation = .fixedLocal
|
|
} else if Set(matches.map(\.action)).count > 1 {
|
|
action = RuleCoverage.winningAction(for: target.match)
|
|
explanation = target.isDomain ? .domainProxy : .ipDirect
|
|
} else {
|
|
action = matches.first?.action
|
|
explanation = action == nil ? .noMatch : .singleAction
|
|
}
|
|
let deciding = matches.filter {
|
|
fixed.isEmpty ? $0.action == action : $0.isFixed
|
|
}
|
|
let decidingIDs = Set(deciding.map(\.id))
|
|
return Result(
|
|
version: collection.version, target: target.display,
|
|
outcome: action.map { $0 == .proxy ? .proxy : .direct } ?? .unmatched,
|
|
domainWithoutDNS: target.isDomain, deciding: deciding,
|
|
otherMatches: matches.filter { !decidingIDs.contains($0.id) }, explanation: explanation)
|
|
}
|
|
}
|
|
|
|
private struct OfflineRuleTarget {
|
|
let match: RuleMatch
|
|
let display: String
|
|
var isDomain: Bool {
|
|
if case .domainExact = match { return true }
|
|
return false
|
|
}
|
|
var isSimpleHostname: Bool { isDomain && !display.contains(".") }
|
|
|
|
init(_ address: String) throws {
|
|
let raw = address.trimmingCharacters(in: .whitespacesAndNewlines)
|
|
guard !raw.isEmpty else { throw OfflineRuleMatcher.Failure.invalidTarget }
|
|
var host = raw
|
|
if raw.contains("://") {
|
|
guard let url = URL(string: raw, encodingInvalidCharacters: false),
|
|
let components = URLComponents(url: url, resolvingAgainstBaseURL: false),
|
|
components.scheme != nil, let value = components.host, !value.isEmpty,
|
|
components.percentEncodedHost?.contains("%") == false,
|
|
components.port.map({ (0...65535).contains($0) }) ?? true
|
|
else { throw OfflineRuleMatcher.Failure.invalidTarget }
|
|
host = value
|
|
if host.hasPrefix("["), host.hasSuffix("]") {
|
|
host = String(host.dropFirst().dropLast())
|
|
}
|
|
}
|
|
if let addressMatch = try? RuleMatch(ipv4CIDR: host), !host.contains("/") {
|
|
match = addressMatch
|
|
display = String(addressMatch.browsingContent.split(separator: "/")[0])
|
|
return
|
|
}
|
|
if let addressMatch = try? RuleMatch(ipv6CIDR: host), !host.contains("/") {
|
|
match = addressMatch
|
|
display = String(addressMatch.browsingContent.split(separator: "/")[0])
|
|
return
|
|
}
|
|
host = host.lowercased()
|
|
if host.hasSuffix(".") { host.removeLast() }
|
|
let labels = host.split(separator: ".", omittingEmptySubsequences: false)
|
|
guard !host.isEmpty, host.utf8.count <= 253,
|
|
!host.allSatisfy({ $0.isNumber || $0 == "." }),
|
|
labels.allSatisfy({ label in
|
|
!label.isEmpty && label.utf8.count <= 63
|
|
&& label.first != "-" && label.last != "-"
|
|
&& label.utf8.allSatisfy { byte in
|
|
(97...122).contains(byte) || (48...57).contains(byte) || byte == 45
|
|
}
|
|
})
|
|
else { throw OfflineRuleMatcher.Failure.invalidTarget }
|
|
match = .domainExact(host)
|
|
display = host
|
|
}
|
|
}
|
|
|
|
struct RulesAddressTest: Equatable, Sendable {
|
|
var target = ""
|
|
var isTesting = false
|
|
var result: OfflineRuleMatcher.Result?
|
|
var failure: OfflineRuleMatcher.Failure?
|
|
}
|