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
Add a timeout to files downloaded from Valve
NotProtonNot48f3ca4ed741
diff --git a/app/Sources/NotProtonApp/Support/PinnedDownload.swift b/app/Sources/NotProtonApp/Support/PinnedDownload.swiftindex bdf461b..c37835f 100644--- a/app/Sources/NotProtonApp/Support/PinnedDownload.swift+++ b/app/Sources/NotProtonApp/Support/PinnedDownload.swift@@ -16,6 +16,15 @@ enum PinnedDownload {}}+ static let session = session(deadline: 30 * 60)++ static func session(deadline: TimeInterval, protocols: [AnyClass] = []) -> URLSession {+ let config = URLSessionConfiguration.default+ config.timeoutIntervalForResource = deadline+ config.protocolClasses = protocols + (config.protocolClasses ?? [])+ return URLSession(configuration: config)+ }+static func obtain(file: String,sha256: String,@@ -23,6 +32,7 @@ enum PinnedDownload {into downloads: URL,step: String,from source: String = "Valve",+ session: URLSession = PinnedDownload.session,report: @Sendable (Progress) -> Void = { _ in }) async throws -> URL {let archive = downloads.appending(path: file)@@ -38,7 +48,7 @@ enum PinnedDownload {report(.fetching(host: host))let body: URL, response: URLResponsedo {- (body, response) = try await URLSession.shared.download(from: base.appending(path: file))+ (body, response) = try await session.download(from: base.appending(path: file))} catch {refusals.append("\(host): \(error.localizedDescription)")kinds.insert(.unreachable)diff --git a/app/Tests/NotProtonAppTests/PinnedDownloadTests.swift b/app/Tests/NotProtonAppTests/PinnedDownloadTests.swiftindex 1a719ad..82dcaf4 100644--- a/app/Tests/NotProtonAppTests/PinnedDownloadTests.swift+++ b/app/Tests/NotProtonAppTests/PinnedDownloadTests.swift@@ -112,6 +112,50 @@ struct PinnedDownloadTests {#expect(reported.all.count == 1)}+ @Test("A download has an overall deadline, not only an idle one")+ func downloadsHaveADeadline() {+ #expect(PinnedDownload.session.configuration.timeoutIntervalForResource <= 60 * 60)+ }++ private final class Trickle: URLProtocol, @unchecked Sendable {+ private var timer: DispatchSourceTimer?++ override class func canInit(with request: URLRequest) -> Bool { request.url?.host() == "trickle.invalid" }+ override class func canonicalRequest(for request: URLRequest) -> URLRequest { request }++ override func startLoading() {+ let response = HTTPURLResponse(+ url: request.url!, statusCode: 200, httpVersion: nil, headerFields: nil)!+ client?.urlProtocol(self, didReceive: response, cacheStoragePolicy: .notAllowed)+ let timer = DispatchSource.makeTimerSource()+ timer.schedule(deadline: .now(), repeating: .milliseconds(100))+ timer.setEventHandler { [weak self] in+ guard let self else { return }+ self.client?.urlProtocol(self, didLoad: Data("x".utf8))+ }+ timer.resume()+ self.timer = timer+ }++ override func stopLoading() { timer?.cancel() }+ }++ @Test("A host that never finishes is given up on for the next one")+ func stalledHostIsPassedOver() async throws {+ let work = try scratchDirectory("pinned")+ defer { try? FileManager.default.removeItem(at: work) }++ let body = "the real package"+ let honest = try host(work, named: "package.tar", serving: body)+ let got = try await PinnedDownload.obtain(+ file: "package.tar", sha256: Digest.sha256(of: Data(body.utf8)),+ bases: [URL(string: "https://trickle.invalid/")!, honest],+ into: work.appending(path: "downloads"), step: "test",+ session: PinnedDownload.session(deadline: 1, protocols: [Trickle.self]))++ #expect(try String(contentsOf: got, encoding: .utf8) == body)+ }+@Test("An archive already on disk that matches is not fetched again")func reusesMatchingArchive() async throws {let work = try scratchDirectory("pinned")