-
Notifications
You must be signed in to change notification settings - Fork 302
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #448 from XcodesOrg/matt/runtimeDownload
Support Runtime/Platforms Downloading and Install 🚀
- Loading branch information
Showing
40 changed files
with
1,187 additions
and
85 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,183 @@ | ||
| import Foundation | ||
| import XcodesKit | ||
| import OSLog | ||
| import Combine | ||
| import Path | ||
| import AppleAPI | ||
|
|
||
| extension AppState { | ||
| func updateDownloadableRuntimes() { | ||
| Task { | ||
| do { | ||
|
|
||
| let downloadableRuntimes = try await self.runtimeService.downloadableRuntimes() | ||
| let runtimes = downloadableRuntimes.downloadables.map { runtime in | ||
| var updatedRuntime = runtime | ||
|
|
||
| // This loops through and matches up the simulatorVersion to the mappings | ||
| let simulatorBuildUpdate = downloadableRuntimes.sdkToSimulatorMappings.first { SDKToSimulatorMapping in | ||
| SDKToSimulatorMapping.simulatorBuildUpdate == runtime.simulatorVersion.buildUpdate | ||
| } | ||
| updatedRuntime.sdkBuildUpdate = simulatorBuildUpdate?.sdkBuildUpdate | ||
| return updatedRuntime | ||
| } | ||
|
|
||
| DispatchQueue.main.async { | ||
| self.downloadableRuntimes = runtimes | ||
| } | ||
| try? cacheDownloadableRuntimes(runtimes) | ||
| } catch { | ||
| Logger.appState.error("Error downloading runtimes: \(error.localizedDescription)") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func updateInstalledRuntimes() { | ||
| Task { | ||
| do { | ||
| let runtimes = try await self.runtimeService.localInstalledRuntimes() | ||
| DispatchQueue.main.async { | ||
| self.installedRuntimes = runtimes | ||
| } | ||
| } catch { | ||
| Logger.appState.error("Error loading installed runtimes: \(error.localizedDescription)") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func downloadRuntime(runtime: DownloadableRuntime) { | ||
| Task { | ||
| do { | ||
| try await downloadRunTimeFull(runtime: runtime) | ||
|
|
||
| DispatchQueue.main.async { | ||
| guard let index = self.downloadableRuntimes.firstIndex(where: { $0.identifier == runtime.identifier }) else { return } | ||
| self.downloadableRuntimes[index].installState = .installed | ||
| } | ||
|
|
||
| updateInstalledRuntimes() | ||
| } | ||
| catch { | ||
| Logger.appState.error("Error downloading runtime: \(error.localizedDescription)") | ||
| DispatchQueue.main.async { | ||
| self.error = error | ||
| self.presentedAlert = .generic(title: localizeString("Alert.Install.Error.Title"), message: error.legibleLocalizedDescription) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func downloadRunTimeFull(runtime: DownloadableRuntime) async throws { | ||
| // sets a proper cookie for runtimes | ||
| try await validateADCSession(path: runtime.downloadPath) | ||
|
|
||
| let downloader = Downloader(rawValue: UserDefaults.standard.string(forKey: "downloader") ?? "aria2") ?? .aria2 | ||
| Logger.appState.info("Downloading \(runtime.visibleIdentifier) with \(downloader)") | ||
|
|
||
|
|
||
| let url = try await self.downloadRuntime(for: runtime, downloader: downloader, progressChanged: { [unowned self] progress in | ||
| DispatchQueue.main.async { | ||
| self.setInstallationStep(of: runtime, to: .downloading(progress: progress)) | ||
| } | ||
| }).async() | ||
|
|
||
| Logger.appState.debug("Done downloading: \(url)") | ||
| DispatchQueue.main.async { | ||
| self.setInstallationStep(of: runtime, to: .installing) | ||
| } | ||
| switch runtime.contentType { | ||
| case .package: | ||
| // not supported yet (do we need to for old packages?) | ||
| throw "Installing via package not support - please install manually from \(url.description)" | ||
| case .diskImage: | ||
| try await self.installFromImage(dmgURL: url) | ||
| DispatchQueue.main.async { | ||
| self.setInstallationStep(of: runtime, to: .trashingArchive) | ||
| } | ||
| try Current.files.removeItem(at: url) | ||
| } | ||
| } | ||
|
|
||
| @MainActor | ||
| func downloadRuntime(for runtime: DownloadableRuntime, downloader: Downloader, progressChanged: @escaping (Progress) -> Void) -> AnyPublisher<URL, Error> { | ||
| // Check to see if the dmg is in the expected path in case it was downloaded but failed to install | ||
|
|
||
| // call https://developerservices2.apple.com/services/download?path=/Developer_Tools/watchOS_10_beta/watchOS_10_beta_Simulator_Runtime.dmg 1st to get cookie | ||
| // use runtime.url for final with cookies | ||
|
|
||
| // Check to see if the archive is in the expected path in case it was downloaded but failed to install | ||
| let url = URL(string: runtime.source)! | ||
| let expectedRuntimePath = Path.xcodesApplicationSupport/"\(url.lastPathComponent)" | ||
| // aria2 downloads directly to the destination (instead of into /tmp first) so we need to make sure that the download isn't incomplete | ||
| let aria2DownloadMetadataPath = expectedRuntimePath.parent/(expectedRuntimePath.basename() + ".aria2") | ||
| var aria2DownloadIsIncomplete = false | ||
| if case .aria2 = downloader, aria2DownloadMetadataPath.exists { | ||
| aria2DownloadIsIncomplete = true | ||
| } | ||
| if Current.files.fileExistsAtPath(expectedRuntimePath.string), aria2DownloadIsIncomplete == false { | ||
| Logger.appState.info("Found existing runtime that will be used for installation at \(expectedRuntimePath).") | ||
| return Just(expectedRuntimePath.url) | ||
| .setFailureType(to: Error.self) | ||
| .eraseToAnyPublisher() | ||
| } | ||
| else { | ||
|
|
||
| Logger.appState.info("Downloading runtime: \(url.lastPathComponent)") | ||
| switch downloader { | ||
| case .aria2: | ||
| let aria2Path = Path(url: Bundle.main.url(forAuxiliaryExecutable: "aria2c")!)! | ||
| return downloadRuntimeWithAria2( | ||
| runtime, | ||
| to: expectedRuntimePath, | ||
| aria2Path: aria2Path, | ||
| progressChanged: progressChanged) | ||
|
|
||
| case .urlSession: | ||
| // TODO: Support runtime download via URL Session | ||
| return Just(runtime.url) | ||
| .setFailureType(to: Error.self) | ||
| .eraseToAnyPublisher() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public func downloadRuntimeWithAria2(_ runtime: DownloadableRuntime, to destination: Path, aria2Path: Path, progressChanged: @escaping (Progress) -> Void) -> AnyPublisher<URL, Error> { | ||
| let cookies = AppleAPI.Current.network.session.configuration.httpCookieStorage?.cookies(for: runtime.url) ?? [] | ||
|
|
||
| let (progress, publisher) = Current.shell.downloadWithAria2( | ||
| aria2Path, | ||
| runtime.url, | ||
| destination, | ||
| cookies | ||
| ) | ||
| progressChanged(progress) | ||
| return publisher | ||
| .map { _ in destination.url } | ||
| .eraseToAnyPublisher() | ||
| } | ||
|
|
||
| public func installFromImage(dmgURL: URL) async throws { | ||
| try await self.runtimeService.installRuntimeImage(dmgURL: dmgURL) | ||
| } | ||
| } | ||
|
|
||
| extension AnyPublisher { | ||
| func async() async throws -> Output { | ||
| try await withCheckedThrowingContinuation { continuation in | ||
| var cancellable: AnyCancellable? | ||
|
|
||
| cancellable = first() | ||
| .sink { result in | ||
| switch result { | ||
| case .finished: | ||
| break | ||
| case let .failure(error): | ||
| continuation.resume(throwing: error) | ||
| } | ||
| cancellable?.cancel() | ||
| } receiveValue: { value in | ||
| continuation.resume(with: .success(value)) | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.