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

refactor: Fix macOS standalone application

Browse Source
This commit is contained in:
世界
2026-01-05 01:21:24 +08:00
parent ef1c924c64
commit 59317f3c79
66 changed files with 2799 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IntentsExtension/Intents.swift
+7 -8
View File
@@ -1,6 +1,5 @@
import AppIntents
import Foundation
import Libbox
import Library
struct StartServiceIntent: AppIntent {
@@ -18,7 +17,7 @@ struct StartServiceIntent: AppIntent {
func perform() async throws -> some IntentResult & ProvidesDialog {
guard let extensionProfile = try await (ExtensionProfile.load()) else {
throw NSError(domain: "NetworkExtension not installed", code: 0)
throw NSError(domain: "IntentsExtension", code: 0, userInfo: [NSLocalizedDescriptionKey: String(localized: "NetworkExtension not installed")])
}
let profileList = try await ProfileManager.list()
let specifiedProfile = profileList.first { $0.name == profile }
@@ -30,13 +29,13 @@ struct StartServiceIntent: AppIntent {
profileChanged = true
}
} else if profile != "default" {
throw NSError(domain: "Specified profile not found: \(profile)", code: 0)
throw NSError(domain: "IntentsExtension", code: 0, userInfo: [NSLocalizedDescriptionKey: String(localized: "Specified profile not found: \(profile)")])
}
if await extensionProfile.status == .connected {
if !profileChanged {
return .result(dialog: "Service is already running")
}
try LibboxNewStandaloneCommandClient()!.serviceReload()
try await extensionProfile.reloadService()
} else if await extensionProfile.status.isConnected {
try await extensionProfile.restart()
} else {
@@ -61,7 +60,7 @@ struct RestartServiceIntent: AppIntent {
return .result(dialog: "Service is not installed")
}
if await extensionProfile.status == .connected {
try LibboxNewStandaloneCommandClient()!.serviceReload()
try await extensionProfile.reloadService()
} else if await extensionProfile.status.isConnected {
try await extensionProfile.restart()
} else {
@@ -145,7 +144,7 @@ struct GetCurrentProfile: AppIntent {
func perform() async throws -> some IntentResult & ReturnsValue<String> {
guard let profile = try await ProfileManager.get(SharedPreferences.selectedProfileID.get()) else {
throw NSError(domain: "No profile selected", code: 0)
throw NSError(domain: "IntentsExtension", code: 0, userInfo: [NSLocalizedDescriptionKey: String(localized: "No profile selected")])
}
return .result(value: profile.name)
}
@@ -167,10 +166,10 @@ struct UpdateProfileIntent: AppIntent {
init() {}
func perform() async throws -> some IntentResult & ProvidesDialog {
guard let profile = try await ProfileManager.get(by: profile) else {
throw NSError(domain: "Specified profile not found: \(profile)", code: 0)
throw NSError(domain: "IntentsExtension", code: 0, userInfo: [NSLocalizedDescriptionKey: String(localized: "Specified profile not found: \(profile)")])
}
if profile.type != .remote {
throw NSError(domain: "Specified profile is not a remote profile", code: 0)
throw NSError(domain: "IntentsExtension", code: 0, userInfo: [NSLocalizedDescriptionKey: String(localized: "Specified profile is not a remote profile")])
}
try await profile.updateRemoteProfile()
return .result(dialog: "Profile updated")