From 82d4e4d4d8d0c8c5a9f1c561f4cc88b250e75f5e Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Wed, 18 Oct 2023 14:14:51 -0500 Subject: [PATCH] Logs AltJIT-related events with OSLog --- AltStore/Operations/EnableJITOperation.swift | 29 +++++++++++++------ AltStoreCore/Extensions/Logger+AltStore.swift | 1 + 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/AltStore/Operations/EnableJITOperation.swift b/AltStore/Operations/EnableJITOperation.swift index 713823ca..c75d75dd 100644 --- a/AltStore/Operations/EnableJITOperation.swift +++ b/AltStore/Operations/EnableJITOperation.swift @@ -43,6 +43,8 @@ class EnableJITOperation: ResultOperation guard let server = self.context.server, let installedApp = self.context.installedApp else { return self.finish(.failure(OperationError.invalidParameters)) } guard let udid = Bundle.main.object(forInfoDictionaryKey: Bundle.Info.deviceID) as? String else { return self.finish(.failure(OperationError.unknownUDID)) } + Logger.altjit.notice("Enabling JIT for app \(installedApp.bundleIdentifier, privacy: .public)...") + installedApp.managedObjectContext?.perform { guard let bundle = Bundle(url: installedApp.fileURL), let processName = bundle.executableURL?.lastPathComponent @@ -56,7 +58,7 @@ class EnableJITOperation: ResultOperation { case .failure(let error): self.finish(.failure(error)) case .success(let connection): - print("Sending enable JIT request...") + Logger.altjit.debug("Sending enable JIT request...") DispatchQueue.main.async { @@ -69,22 +71,31 @@ class EnableJITOperation: ResultOperation let result = Future, Never> { promise in let request = EnableUnsignedCodeExecutionRequest(udid: udid, processName: processName) connection.send(request) { result in - print("Sent enable JIT request!") + Logger.altjit.debug("Sent enable JIT request!") switch result { case .failure(let error): promise(.success(.failure(error))) case .success: - print("Waiting for enable JIT response...") + Logger.altjit.debug("Waiting for enable JIT response...") connection.receiveResponse() { result in - print("Received enable JIT response:", result) - switch result { - case .failure(let error): promise(.success(.failure(error))) - case .success(.error(let response)): promise(.success(.failure(response.error))) - case .success(.enableUnsignedCodeExecution): promise(.success(.success(()))) - case .success: promise(.success(.failure(ALTServerError(.unknownResponse)))) + case .failure(let error): + Logger.altjit.error("Failed to receive enable JIT response. \(error.localizedDescription, privacy: .public)") + promise(.success(.failure(error))) + + case .success(.error(let response)): + Logger.altjit.error("Failed to enable JIT. \(response.error.localizedDescription, privacy: .public)") + promise(.success(.failure(response.error))) + + case .success(.enableUnsignedCodeExecution): + Logger.altjit.notice("Successfully enabled JIT!") + promise(.success(.success(()))) + + case .success: + Logger.altjit.notice("Received unknown enable JIT response.") + promise(.success(.failure(ALTServerError(.unknownResponse)))) } } } diff --git a/AltStoreCore/Extensions/Logger+AltStore.swift b/AltStoreCore/Extensions/Logger+AltStore.swift index a6998c35..e96c4850 100644 --- a/AltStoreCore/Extensions/Logger+AltStore.swift +++ b/AltStoreCore/Extensions/Logger+AltStore.swift @@ -13,6 +13,7 @@ public extension Logger static let altstoreSubsystem = Bundle.main.bundleIdentifier! static let sideload = Logger(subsystem: altstoreSubsystem, category: "Sideload") + static let altjit = Logger(subsystem: altstoreSubsystem, category: "AltJIT") static let fugu14 = Logger(subsystem: altstoreSubsystem, category: "Fugu14") }