Logs sideloading-related events with OSLog

This commit is contained in:
Riley Testut
2023-10-18 14:06:10 -05:00
parent 74dc2d4c71
commit 2133b6240d
19 changed files with 245 additions and 72 deletions

View File

@@ -48,6 +48,8 @@ class FindServerOperation: ResultOperation<Server>
return
}
Logger.sideload.notice("Discovering AltServers...")
let notificationCenter = CFNotificationCenterGetDarwinNotifyCenter()
let observer = Unmanaged.passUnretained(self).toOpaque()
@@ -63,22 +65,30 @@ class FindServerOperation: ResultOperation<Server>
DispatchQueue.global().asyncAfter(deadline: .now() + 1.0) {
if let machServiceName = self.localServerMachServiceName
{
Logger.sideload.notice("Found AltDaemon!")
// Prefer background daemon, if it exists and is running.
let server = Server(connectionType: .local, machServiceName: machServiceName)
self.finish(.success(server))
}
else if self.isWiredServerConnectionAvailable
{
Logger.sideload.notice("Found AltServer connected via USB!")
let server = Server(connectionType: .wired)
self.finish(.success(server))
}
else if let server = ServerManager.shared.discoveredServers.first(where: { $0.isPreferred })
{
Logger.sideload.notice("Found preferred AltServer! \(server.localizedName ?? "nil", privacy: .public)")
// Preferred server.
self.finish(.success(server))
}
else if let server = ServerManager.shared.discoveredServers.first
{
Logger.sideload.notice("Found AltServer! \(server.localizedName ?? "nil", privacy: .public)")
// Any available server.
self.finish(.success(server))
}
@@ -113,7 +123,7 @@ fileprivate extension FindServerOperation
connection.connect { (result) in
switch result
{
case .failure(let error): print("Could not connect to AltDaemon XPC service \(machServiceName).", error)
case .failure(let error): Logger.sideload.notice("Could not connect to AltDaemon XPC service \(machServiceName, privacy: .public). \(error.localizedDescription, privacy: .public)")
case .success: self.localServerMachServiceName = machServiceName
}
}