icybear/sing-box-for-apple
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve On Demand Settings

Browse Source
This commit is contained in:
世界
2026-01-01 19:37:36 +08:00
parent e2c378d42b
commit 9b179fe5cd
2 changed files with 519 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibrary/Views/Setting/OnDemandRulesView.swift
+107 -54
View File
@@ -2,12 +2,35 @@ import Foundation
import Library
import SwiftUI
private enum OnDemandMode: String, CaseIterable, Identifiable {
case disabled
case alwaysOn
case enabled
var id: String { rawValue }
var name: String {
switch self {
case .disabled: "Disabled"
case .alwaysOn: "Always On"
case .enabled: "Enabled"
}
}
var description: String {
switch self {
case .disabled: "VPN will not connect automatically."
case .alwaysOn: "Automatically connect VPN on any network."
case .enabled: "Automatically connect or disconnect VPN based on rules."
}
}
}
public struct OnDemandRulesView: View {
@EnvironmentObject private var environments: ExtensionEnvironments
@State private var isLoading = true
@State private var alert: AlertState?
@State private var alwaysOn = false
@State private var onDemandEnabled = false
@State private var mode: OnDemandMode = .disabled
@State private var rules: [OnDemandRule] = []
@State private var editingRule: OnDemandRule?
@State private var isAddingRule = false
@@ -27,10 +50,9 @@ public struct OnDemandRulesView: View {
}
} else {
FormView {
alwaysOnToggle
enableToggle
modePicker
if !alwaysOn, onDemandEnabled {
if mode == .enabled {
rulesSection
}
@@ -53,6 +75,7 @@ public struct OnDemandRulesView: View {
}
.environment(\.editMode, $editMode)
#endif
#if !os(tvOS)
.platformSheet(isPresented: $isAddingRule) {
OnDemandRuleEditView(rule: OnDemandRule(), isNew: true) { newRule in
rules.append(newRule)
@@ -71,36 +94,31 @@ public struct OnDemandRulesView: View {
}
}
}
#endif
}
private var alwaysOnToggle: some View {
FormToggle("Always On", """
Automatically connect VPN on any network.
When enabled, VPN connects automatically when network is available. Custom rules below will be disabled.
""", $alwaysOn) { newValue in
await SharedPreferences.alwaysOn.set(newValue)
await updateService()
private var modePicker: some View {
Section {
Picker("Mode", selection: $mode) {
ForEach(OnDemandMode.allCases) { m in
Text(m.name).tag(m)
}
}
private var enableToggle: some View {
FormToggle("Custom Rules", """
Automatically connect or disconnect VPN based on custom rules.
When enabled, iOS manages VPN state automatically. You may need to use the in-app interface to stop the service.
""", $onDemandEnabled) { newValue in
await SharedPreferences.onDemandEnabled.set(newValue)
await updateService()
.onChange(of: mode) { newValue in
Task {
await saveMode(newValue)
}
}
} footer: {
Text(mode.description)
}
.disabled(alwaysOn)
}
@ViewBuilder
private var rulesSection: some View {
Section {
if rules.isEmpty {
Text("No rules configured. Add a rule to specify when VPN should connect or disconnect.")
Text("Empty rules")
.foregroundStyle(.secondary)
.font(.callout)
} else {
@@ -124,6 +142,18 @@ public struct OnDemandRulesView: View {
HStack {
Text("Rules")
Spacer()
#if os(tvOS)
FormNavigationLink {
OnDemandRuleEditView(rule: OnDemandRule(), isNew: true) { newRule in
rules.append(newRule)
Task {
await saveRules()
}
}
} label: {
Image(systemName: "plus.circle.fill")
}
#else
Button {
isAddingRule = true
} label: {
@@ -132,6 +162,7 @@ public struct OnDemandRulesView: View {
#if os(macOS)
.buttonStyle(.plain)
#endif
#endif
}
} footer: {
Text("Rules are evaluated in order from top to bottom. The first matching rule determines the action.")
@@ -140,26 +171,41 @@ public struct OnDemandRulesView: View {
@ViewBuilder
private func ruleRow(_ rule: OnDemandRule) -> some View {
#if os(tvOS)
FormNavigationLink {
OnDemandRuleEditView(rule: rule, isNew: false) { updatedRule in
if let index = rules.firstIndex(where: { $0.id == updatedRule.id }) {
rules[index] = updatedRule
Task {
await saveRules()
}
}
}
} label: {
VStack(alignment: .leading, spacing: 4) {
Text(rule.action.name)
.fontWeight(.medium)
Text(ruleDescription(rule))
.font(.caption)
.foregroundStyle(.secondary)
}
}
#else
Button {
editingRule = rule
} label: {
HStack {
VStack(alignment: .leading, spacing: 4) {
HStack {
actionIcon(rule.action)
Text(rule.action.name)
.fontWeight(.medium)
}
Text(ruleDescription(rule))
.font(.caption)
.foregroundStyle(.secondary)
}
Spacer()
#if !os(tvOS)
Image(systemName: "chevron.right")
.foregroundStyle(.secondary)
.font(.caption)
#endif
}
.contentShape(Rectangle())
}
@@ -168,24 +214,7 @@ public struct OnDemandRulesView: View {
#elseif os(iOS)
.foregroundStyle(.primary)
#endif
}
@ViewBuilder
private func actionIcon(_ action: OnDemandRuleAction) -> some View {
switch action {
case .connect:
Image(systemName: "arrow.up.circle.fill")
.foregroundStyle(.green)
case .disconnect:
Image(systemName: "arrow.down.circle.fill")
.foregroundStyle(.red)
case .evaluateConnection:
Image(systemName: "questionmark.circle.fill")
.foregroundStyle(.orange)
case .ignore:
Image(systemName: "minus.circle.fill")
.foregroundStyle(.gray)
}
#endif
}
private func ruleDescription(_ rule: OnDemandRule) -> String {
@@ -243,15 +272,21 @@ public struct OnDemandRulesView: View {
.foregroundStyle(.red)
}
private func saveMode(_ newMode: OnDemandMode) async {
let alwaysOn = newMode == .alwaysOn
let onDemandEnabled = newMode == .enabled
await SharedPreferences.alwaysOn.set(alwaysOn)
await SharedPreferences.onDemandEnabled.set(onDemandEnabled)
await updateService()
}
private func updateService() async {
guard let profile = environments.extensionProfile, profile.status.isConnected else {
return
}
do {
let alwaysOnValue = await SharedPreferences.alwaysOn.get()
let onDemandEnabledValue = await SharedPreferences.onDemandEnabled.get()
let enabled = alwaysOnValue || onDemandEnabledValue
try await profile.updateOnDemand(enabled: enabled, useDefaultRules: alwaysOnValue)
let enabled = mode != .disabled
try await profile.updateOnDemand(enabled: enabled, useDefaultRules: mode == .alwaysOn)
} catch {
alert = AlertState(error: error)
}
@@ -268,8 +303,15 @@ public struct OnDemandRulesView: View {
}
private func loadSettings() async {
alwaysOn = await SharedPreferences.alwaysOn.get()
onDemandEnabled = await SharedPreferences.onDemandEnabled.get()
let alwaysOn = await SharedPreferences.alwaysOn.get()
let onDemandEnabled = await SharedPreferences.onDemandEnabled.get()
if alwaysOn {
mode = .alwaysOn
} else if onDemandEnabled {
mode = .enabled
} else {
mode = .disabled
}
rules = await SharedPreferences.onDemandRules.get()
isLoading = false
}
@@ -305,11 +347,21 @@ private struct OnDemandRuleEditView: View {
if rule.action == .evaluateConnection {
connectionRulesSection
}
#if os(tvOS)
Section {
Button(isNew ? "Create" : "Save") {
onSave(rule)
dismiss()
}
.disabled(!isProbeURLValid)
}
#endif
}
.navigationTitle(isNew ? "New Rule" : "Edit Rule")
#if os(iOS)
.navigationBarTitleDisplayMode(.inline)
#endif
#if !os(tvOS)
.toolbar {
ToolbarItem(placement: .cancellationAction) {
Button("Cancel") {
@@ -317,13 +369,14 @@ private struct OnDemandRuleEditView: View {
}
}
ToolbarItem(placement: .confirmationAction) {
Button("Save") {
Button(isNew ? "Create" : "Save") {
onSave(rule)
dismiss()
}
.disabled(!isProbeURLValid)
}
}
#endif
#if os(macOS)
.formStyle(.grouped)
#endif
Localizable.xcstrings
+390 -58
View File
@@ -98,17 +98,55 @@
}
}
},
"Add" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "添加"
}
}
}
},
"Add DNS server IP" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "添加 DNS 服务器 IP"
}
}
}
},
"Add domain" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "添加域名"
}
}
}
},
"Add domain (e.g., example.com)" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "添加域名（例如 example.com）"
}
}
}
},
"Add SSID" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "添加 SSID"
}
}
}
},
"All" : {
"localizations" : {
@@ -121,7 +159,14 @@
}
},
"All specified conditions must match for the rule to apply. Leave empty to match any network." : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "所有指定条件必须匹配规则才会生效。留空则匹配任何网络。"
}
}
}
},
"Always On" : {
"localizations" : {
@@ -134,7 +179,14 @@
}
},
"Any" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "任意"
}
}
}
},
"App" : {
"localizations" : {
@@ -221,12 +273,6 @@
}
}
}
},
"Automatically connect or disconnect VPN based on custom rules.\n\nWhen enabled, iOS manages VPN state automatically. You may need to use the in-app interface to stop the service." : {
},
"Automatically connect VPN on any network.\n\nWhen enabled, VPN connects automatically when network is available. Custom rules below will be disabled." : {
},
"Browse" : {
"localizations" : {
@@ -248,6 +294,26 @@
}
}
},
"Camera" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "相机"
}
}
}
},
"Camera access denied" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "相机访问被拒绝"
}
}
}
},
"Camera Access Denied" : {
"localizations" : {
"zh-Hans" : {
@@ -258,6 +324,16 @@
}
}
},
"Camera is not available" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "相机不可用"
}
}
}
},
"Cancel" : {
"localizations" : {
"zh-Hans" : {
@@ -269,7 +345,14 @@
}
},
"Cellular" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "蜂窝网络"
}
}
}
},
"Chain" : {
"localizations" : {
@@ -363,7 +446,14 @@
}
},
"Conditions" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "条件"
}
}
}
},
"Configuration" : {
"localizations" : {
@@ -376,13 +466,34 @@
}
},
"Connect" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "连接"
}
}
}
},
"Connect If Needed" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "按需连接"
}
}
}
},
"Connect VPN if the destination is not directly accessible." : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "如果目标无法直接访问，则连接 VPN。"
}
}
}
},
"Connecting..." : {
"localizations" : {
@@ -405,10 +516,24 @@
}
},
"Connection Rule" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "连接规则"
}
}
}
},
"Connection Rules" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "连接规则"
}
}
}
},
"Connections" : {
"localizations" : {
@@ -490,9 +615,6 @@
}
}
}
},
"Custom Rules" : {
},
"Dashboard" : {
"localizations" : {
@@ -606,19 +728,54 @@
}
},
"Disconnect" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "断开连接"
}
}
}
},
"DNS Search Domain" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "DNS 搜索域"
}
}
}
},
"DNS Server Address" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "DNS 服务器地址"
}
}
}
},
"DNS Servers" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "DNS 服务器"
}
}
}
},
"DNS servers to use for resolving the destination. If resolution fails, VPN is started." : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "用于解析目标的 DNS 服务器。如果解析失败，则启动 VPN。"
}
}
}
},
"Do not enforce memory limits on sing-box. Will cause OOM on non-jailbroken iOS and tvOS devices." : {
"localizations" : {
@@ -671,7 +828,14 @@
}
},
"Domains that trigger this rule. The rule matches if the destination host shares a suffix with any domain in this list." : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "触发此规则的域名。如果目标主机与列表中任何域名后缀匹配，则规则生效。"
}
}
}
},
"Don't Save" : {
"localizations" : {
@@ -682,9 +846,6 @@
}
}
}
},
"Don't Switch" : {
},
"Done" : {
"localizations" : {
@@ -747,7 +908,14 @@
}
},
"Edit Rule" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "编辑规则"
}
}
}
},
"Empty connections" : {
"localizations" : {
@@ -799,6 +967,16 @@
}
}
},
"Empty rules" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "无规则"
}
}
}
},
"enforceRoutes" : {
"shouldTranslate" : false
},
@@ -813,13 +991,34 @@
}
},
"Ethernet" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "以太网"
}
}
}
},
"Evaluate Connection" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "评估连接"
}
}
}
},
"Evaluate the destination host before deciding to connect." : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "在决定连接之前评估目标主机。"
}
}
}
},
"Exclude APNs Route" : {
"localizations" : {
@@ -1012,7 +1211,14 @@
"shouldTranslate" : false
},
"If set, a request is sent to this URL. If it doesn't return HTTP 200, VPN is started." : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "如果设置，将向此 URL 发送请求。如果未返回 HTTP 200，则启动 VPN。"
}
}
}
},
"If this property is true when the **includeAllNetworks** property is false, the system scopes the included routes to the VPN and the excluded routes to the current primary network interface. This property supersedes the system routing table and scoping operations by apps.\n\nIf you set both the **enforceRoutes** and **excludeLocalNetworks** properties to true, the system excludes network connections to hosts on the local network.\n\n[Apple Documentation](https://developer.apple.com/documentation/networkextension/nevpnprotocol/3689459-enforceroutes)" : {
"shouldTranslate" : false
@@ -1030,7 +1236,14 @@
"shouldTranslate" : false
},
"Ignore" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "忽略"
}
}
}
},
"Ignore Memory Limit" : {
"localizations" : {
@@ -1157,7 +1370,24 @@
}
},
"Interface Type" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "接口类型"
}
}
}
},
"Invalid QR code" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "无效的二维码"
}
}
}
},
"Invalid QR Code" : {
"localizations" : {
@@ -1220,7 +1450,14 @@
}
},
"Leave the VPN connection in its current state." : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "保持 VPN 连接的当前状态。"
}
}
}
},
"Loading..." : {
"localizations" : {
@@ -1278,7 +1515,14 @@
}
},
"Match Domains" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "匹配域名"
}
}
}
},
"Match Rule" : {
"shouldTranslate" : false
@@ -1384,10 +1628,24 @@
}
},
"Never Connect" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "从不连接"
}
}
}
},
"Never connect VPN for matching domains." : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "对匹配的域名不连接 VPN。"
}
}
}
},
"New Profile" : {
"localizations" : {
@@ -1400,10 +1658,24 @@
}
},
"New Rule" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "新建规则"
}
}
}
},
"No connection rules. Add rules to specify which domains trigger VPN connection." : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "无连接规则。添加规则以指定哪些域名触发 VPN 连接。"
}
}
}
},
"No Default Route" : {
"localizations" : {
@@ -1414,9 +1686,6 @@
}
}
}
},
"No rules configured. Add a rule to specify when VPN should connect or disconnect." : {
},
"Ok" : {
"localizations" : {
@@ -1438,6 +1707,16 @@
}
}
},
"Only HTTP and HTTPS URLs are allowed" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "只允许 HTTP 和 HTTPS URL"
}
}
}
},
"Open" : {
"localizations" : {
"zh-Hans" : {
@@ -1561,7 +1840,14 @@
}
},
"Probe URL" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "探测 URL"
}
}
}
},
"Profile" : {
"localizations" : {
@@ -1688,10 +1974,24 @@
}
},
"Rules" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "规则"
}
}
}
},
"Rules are evaluated in order from top to bottom. The first matching rule determines the action." : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "规则从上到下依次评估。第一个匹配的规则决定操作。"
}
}
}
},
"Save" : {
"localizations" : {
@@ -1907,7 +2207,14 @@
}
},
"SSID Match" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "SSID 匹配"
}
}
}
},
"Start" : {
"localizations" : {
@@ -1930,7 +2237,14 @@
}
},
"Start the VPN connection when conditions match." : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "当条件匹配时启动 VPN 连接。"
}
}
}
},
"State" : {
"localizations" : {
@@ -1973,10 +2287,14 @@
}
},
"Stop the VPN connection when conditions match." : {
},
"Switch Profile" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "当条件匹配时停止 VPN 连接。"
}
}
}
},
"System Extension" : {
"localizations" : {
@@ -2225,10 +2543,24 @@
}
},
"When action is 'Evaluate Connection', these rules determine whether to connect based on the destination host." : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "当操作为「评估连接」时，这些规则根据目标主机决定是否连接。"
}
}
}
},
"Wi-Fi" : {
"localizations" : {
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "Wi-Fi"
}
}
}
},
"Working Directory" : {
"localizations" : {