Free fork of NotProton: Windows Steam games in Mac Steam, on CodeWeavers' Wine and Apple's Game Porting Toolkit
Swift apple-silicond3dmetaldxmtdxvkgame-porting-toolkitgptkmac-gamingmacosmetalfxrosetta-2steamsteam-playwinewinecx
fix(download): wait for the network to come back before resuming the engine download
raymondchinsa646c3085ec3
diff --git a/app/Sources/BridgeplayApp/Support/PinnedDownload.swift b/app/Sources/BridgeplayApp/Support/PinnedDownload.swiftindex 9d3b4d5..1232602 100644--- a/app/Sources/BridgeplayApp/Support/PinnedDownload.swift+++ b/app/Sources/BridgeplayApp/Support/PinnedDownload.swift@@ -2,6 +2,7 @@import BridgeplayUIimport Foundation+import Networkimport Observationenum PinnedDownload {@@ -87,6 +88,9 @@ enum PinnedDownload {} catch let error as URLError where attempt < 4 && error.downloadTaskResumeData != nil {resumeData = error.downloadTaskResumeDataAppLog.note("\(file) from \(host) interrupted (\(error.localizedDescription)), resuming")+ // #279: a Wi-Fi drop spent every try within one second.+ await networkBack(within: .seconds(120))+ try await Task.sleep(for: .seconds(2 * attempt))}}fatalError("unreachable")@@ -132,6 +136,27 @@ enum PinnedDownload {throw StepFailure(step: step, detail: reason(kinds, from: source))}+ /// Returns once macOS reports a usable network, or after `limit`.+ static func networkBack(within limit: Duration) async {+ let monitor = NWPathMonitor()+ defer { monitor.cancel() }+ let online = AsyncStream<Void> { stream in+ monitor.pathUpdateHandler = { path in+ if path.status == .satisfied { stream.yield(); stream.finish() }+ }+ monitor.start(queue: .global(qos: .utility))+ }+ await withTaskGroup(of: Void.self) { group in+ group.addTask { for await _ in online { return } }+ group.addTask { try? await Task.sleep(for: limit) }+ await group.next()+ group.cancelAll()+ }+ if monitor.currentPath.status != .satisfied {+ AppLog.note("network still down after \(limit), trying anyway")+ }+ }+private enum Refusal {case unreachablecase mismatch