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 文件时两个用例均 失败并点名违规文件,清理后复验为绿。
104 lines
3.1 KiB
Swift
104 lines
3.1 KiB
Swift
import Foundation
|
||
|
||
/// Persisted identity of a proxy mode. PAC is gone (issue #67): the product
|
||
/// exposes rule / global / direct only.
|
||
enum ProxyModeKind: String, Codable, CaseIterable, Equatable, Hashable, Sendable {
|
||
case rule
|
||
case global
|
||
case direct
|
||
}
|
||
|
||
/// The mutually exclusive ways in which 2.0 exposes the local proxy to macOS.
|
||
/// Hashable 供菜单栏模式选择的勾选态 Picker 使用(issue #31)。
|
||
/// 规则模式(issue #63)另持久化 `RuleDefaultAction` 子选项。
|
||
enum ProxyMode: Codable, Equatable, Hashable, Sendable {
|
||
case rule
|
||
case global
|
||
case direct
|
||
|
||
private enum CodingKeys: String, CodingKey {
|
||
case kind
|
||
}
|
||
|
||
private enum Kind: String, Codable {
|
||
case rule
|
||
case global
|
||
case direct
|
||
}
|
||
|
||
init(from decoder: Decoder) throws {
|
||
let container = try decoder.container(keyedBy: CodingKeys.self)
|
||
switch try container.decode(Kind.self, forKey: .kind) {
|
||
case .rule:
|
||
self = .rule
|
||
case .global:
|
||
self = .global
|
||
case .direct:
|
||
self = .direct
|
||
}
|
||
}
|
||
|
||
func encode(to encoder: Encoder) throws {
|
||
var container = encoder.container(keyedBy: CodingKeys.self)
|
||
switch self {
|
||
case .rule:
|
||
try container.encode(Kind.rule, forKey: .kind)
|
||
case .global:
|
||
try container.encode(Kind.global, forKey: .kind)
|
||
case .direct:
|
||
try container.encode(Kind.direct, forKey: .kind)
|
||
}
|
||
}
|
||
|
||
var label: String {
|
||
switch self {
|
||
case .rule:
|
||
"规则"
|
||
case .global:
|
||
"全局"
|
||
case .direct:
|
||
"直连"
|
||
}
|
||
}
|
||
|
||
var kind: ProxyModeKind {
|
||
switch self {
|
||
case .rule: .rule
|
||
case .global: .global
|
||
case .direct: .direct
|
||
}
|
||
}
|
||
|
||
/// Returns every mode supported by the product in stable selector order.
|
||
static var availableModes: [ProxyMode] { [.rule, .global, .direct] }
|
||
|
||
/// Derives the only system-proxy state that this mode is allowed to own.
|
||
/// All three modes are projected as the local SOCKS and HTTP inbounds
|
||
/// (issue #59/#67):SOCKS 之外,系统 HTTP/HTTPS 代理指向恒开启的 HTTP 入站。
|
||
/// 投影即 closed typed 配置(issue #71):HTTPS 显式赋值、PAC/自动发现显式
|
||
/// 关闭、简单主机名排除显式开启、例外列表全量给出。
|
||
func systemProxyConfiguration(
|
||
for document: SslocalRuntimeDocument,
|
||
exceptions: [String] = []
|
||
) throws -> SystemProxyConfiguration {
|
||
guard ProxyPortRange.valid.contains(document.socksPort) else {
|
||
throw ProxyModeError.invalidSOCKSPort(document.socksPort)
|
||
}
|
||
guard ProxyPortRange.valid.contains(document.httpPort) else {
|
||
throw ProxyModeError.invalidHTTPPort(document.httpPort)
|
||
}
|
||
let loopback = document.listen.listenerMode.proxyLoopbackAddress
|
||
return SystemProxyConfiguration(
|
||
socks: .init(host: loopback, port: document.socksPort),
|
||
http: .init(host: loopback, port: document.httpPort),
|
||
https: .init(host: loopback, port: document.httpPort),
|
||
excludeSimpleHostnames: true,
|
||
exceptions: FixedLocalProxyRanges.systemProxyExceptions(including: exceptions))
|
||
}
|
||
}
|
||
|
||
enum ProxyModeError: Error, Equatable, Sendable {
|
||
case invalidSOCKSPort(Int)
|
||
case invalidHTTPPort(Int)
|
||
}
|