zhangyuheng/ClashX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

misc: simplify proxy helper creation

Browse Source
This commit is contained in:
yicheng 2022-06-18 12:17:59 +08:00
parent 471b3e0415
commit 91a02b020e
1 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ClashX/General/Managers/PrivilegedHelperManager.swift
View File

@ -112,39 +112,24 @@ class PrivilegedHelperManager {
return .success return .success
} }
private func helperConnection() -> NSXPCConnection? {
// Check that the connection is valid before trying to do an inter process call to helper
if connection == nil {
connection = NSXPCConnection(machServiceName: PrivilegedHelperManager.machServiceName, options: NSXPCConnection.Options.privileged)
connection?.remoteObjectInterface = NSXPCInterface(with: ProxyConfigRemoteProcessProtocol.self)
connection?.invalidationHandler = {
[weak self] in
guard let self = self else { return }
self.connection?.invalidationHandler = nil
OperationQueue.main.addOperation {
self.connection = nil
self._helper = nil
Logger.log("XPC Connection Invalidated")
}
}
connection?.resume()
}
return connection
}
func helper(failture: (() -> Void)? = nil) -> ProxyConfigRemoteProcessProtocol? { func helper(failture: (() -> Void)? = nil) -> ProxyConfigRemoteProcessProtocol? {
if _helper == nil { connection = NSXPCConnection(machServiceName: PrivilegedHelperManager.machServiceName, options: NSXPCConnection.Options.privileged)
guard let newHelper = helperConnection()?.remoteObjectProxyWithErrorHandler({ error in connection?.remoteObjectInterface = NSXPCInterface(with: ProxyConfigRemoteProcessProtocol.self)
Logger.log("Helper connection was closed with error: \(error)") connection?.invalidationHandler = {
failture?() Logger.log("XPC Connection Invalidated")
}) as? ProxyConfigRemoteProcessProtocol else { return nil }
_helper = newHelper
} }
return _helper connection?.resume()
guard let helper = connection?.remoteObjectProxyWithErrorHandler({ error in
Logger.log("Helper connection was closed with error: \(error)")
failture?()
}) as? ProxyConfigRemoteProcessProtocol else { return nil }
return helper
} }
var timer: Timer? var timer: Timer?
private func getHelperStatus(callback:@escaping ((Bool)->Void)) { private func getHelperStatus(callback:@escaping ((Bool)->Void)) {
var called = false var called = false
let reply:((Bool)->Void) = { let reply:((Bool)->Void) = {
installed in installed in