Skip to content

- Limit URLSession connections per host to 1 when enabled #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
patricioxavier8 merged 1 commit into from
Mar 23, 2026
Merged

- Limit URLSession connections per host to 1 when enabled #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Sources/InternxtSwiftCore/Services/Network/Download.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,16 @@ public class Download: NSObject {

private var progressHandlersByTaskID = [Int : ProgressHandler]()
private var urlSession: URLSession
init(networkAPI: NetworkAPI, urlSession: URLSession?) {
init(networkAPI: NetworkAPI, urlSession: URLSession?, reduceBandwidth: Bool = false) {
self.networkAPI = networkAPI
if let urlSession = urlSession {
self.urlSession = urlSession
} else {
self.urlSession = APIClient.ephemeralSession
let config = URLSessionConfiguration.ephemeral
if reduceBandwidth {
config.httpMaximumConnectionsPerHost = 1
}
self.urlSession = URLSession(configuration: config)
}

super.init()
Expand Down
141 changes: 53 additions & 88 deletions Sources/InternxtSwiftCore/Services/Network/NetworkFacade.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import CryptoKit
let MULTIPART_MIN_SIZE = 100 * 1024 * 1024;
let MULTIPART_CHUNK_SIZE = 50 * 1024 * 1024;
let MAX_WAIT_TIME: TimeInterval = 3600
let THROTTLE_BYTES_PER_SECOND = 10 * 1024 * 1024


@available(macOS 10.15, *)
Expand All @@ -27,9 +28,9 @@ public struct NetworkFacade {
public init(mnemonic: String, networkAPI: NetworkAPI, urlSession: URLSession? = nil, reduceBandwidth: Bool = false, debug: Bool = false){
self.mnemonic = mnemonic
self.reduceBandwidth = reduceBandwidth
self.upload = Upload(networkAPI: networkAPI, urlSession: urlSession)
self.uploadMultipart = UploadMultipart(networkAPI: networkAPI, urlSession: urlSession)
self.download = Download(networkAPI: networkAPI, urlSession: urlSession)
self.upload = Upload(networkAPI: networkAPI, urlSession: urlSession, reduceBandwidth: reduceBandwidth)
self.uploadMultipart = UploadMultipart(networkAPI: networkAPI, urlSession: urlSession, reduceBandwidth: reduceBandwidth)
self.download = Download(networkAPI: networkAPI, urlSession: urlSession, reduceBandwidth: reduceBandwidth)
}

public func uploadFile(
Expand All @@ -40,9 +41,6 @@ public struct NetworkFacade {
progressHandler: @escaping ProgressHandler,
debug: Bool = false
) async throws -> FinishUploadResponse {
await NetworkLimiter.shared.updateLimit(reduceBandwidth: self.reduceBandwidth)
await NetworkLimiter.shared.wait()

// Generate random index, IV and fileKey
guard let index = cryptoUtils.getRandomBytes(32) else {
throw UploadError.InvalidIndex
Expand All @@ -55,7 +53,7 @@ public struct NetworkFacade {
let shouldUseMultipart = fileSize >= MULTIPART_MIN_SIZE

if(shouldUseMultipart) {
let result = try await self.runMultipartUpload(
return try await self.runMultipartUpload(
input: input,
fileSize: fileSize,
index: index,
Expand All @@ -65,27 +63,18 @@ public struct NetworkFacade {
progressHandler: progressHandler,
debug: debug
)
await NetworkLimiter.shared.signal()
return result
}

do {
let result = try await self.runSingleFileUpload(
input: input,
encryptedOutput: encryptedOutput,
fileSize: fileSize,
index: index,
fileKey: fileKey,
iv: iv,
bucketId: bucketId,
progressHandler: progressHandler
)
await NetworkLimiter.shared.signal()
return result
} catch {
await NetworkLimiter.shared.signal()
throw error
}
return try await self.runSingleFileUpload(
input: input,
encryptedOutput: encryptedOutput,
fileSize: fileSize,
index: index,
fileKey: fileKey,
iv: iv,
bucketId: bucketId,
progressHandler: progressHandler
)
}

private func runSingleFileUpload(
Expand Down Expand Up @@ -113,7 +102,16 @@ public struct NetworkFacade {
throw NetworkFacadeError.EncryptedFileNotSameSizeAsOriginal
}

return try await upload.start(index: index, bucketId: bucketId, mnemonic: mnemonic, encryptedFileURL: encryptedOutput, progressHandler: progressHandler)
let result = try await upload.start(index: index, bucketId: bucketId, mnemonic: mnemonic, encryptedFileURL: encryptedOutput, progressHandler: progressHandler)


if reduceBandwidth {
let targetTime = Double(fileSize) / Double(THROTTLE_BYTES_PER_SECOND)
let delay = max(0, targetTime * 0.3) // 30% extra delay to bring speed down
try await Task.sleep(nanoseconds: UInt64(delay * 1_000_000_000))
}

return result
}


Expand Down Expand Up @@ -175,7 +173,8 @@ public struct NetworkFacade {
uploadState: uploadState,
maxProgressPerPart: maxProgressPerPart,
progressHandler: { _ in },
uploadedPartsActor: uploadedPartsActor
uploadedPartsActor: uploadedPartsActor,
targetBytesPerSecond: self.reduceBandwidth ? THROTTLE_BYTES_PER_SECOND : nil
)

operation.completionBlock = {
Expand Down Expand Up @@ -258,13 +257,12 @@ public struct NetworkFacade {
}

public func downloadFile(bucketId: String, fileId: String, encryptedFileDestination: URL, destinationURL: URL, progressHandler: @escaping ProgressHandler, debug: Bool = false) async throws -> URL {
await NetworkLimiter.shared.updateLimit(reduceBandwidth: self.reduceBandwidth)
await NetworkLimiter.shared.wait()

func downloadProgressHandler(downloadProgress: Double) {
let downloadMaxProgress = 0.9;
// We need to wait for the decryption, so download reachs downloadMaxProgress, and not 100%
progressHandler(downloadProgress * downloadMaxProgress)

}

let encryptedFileDownloadResult = try await download.start(
Expand All @@ -276,20 +274,15 @@ public struct NetworkFacade {
)


do {
let decryptedFileURL = try await decryptFile(
bucketId: bucketId,
destinationURL: destinationURL,
progressHandler: progressHandler,
encryptedFileDownloadResult: encryptedFileDownloadResult
)

await NetworkLimiter.shared.signal()
return decryptedFileURL
} catch {
await NetworkLimiter.shared.signal()
throw error
}
let decryptedFileURL = try await decryptFile(
bucketId: bucketId,
destinationURL: destinationURL,
progressHandler: progressHandler,
encryptedFileDownloadResult: encryptedFileDownloadResult
)


return decryptedFileURL
}

public func decryptFile(bucketId: String, destinationURL: URL, progressHandler: ProgressHandler, encryptedFileDownloadResult: DownloadResult, ignoreHashMissmatchCheck: Bool = false) async throws -> URL {
Expand Down Expand Up @@ -355,6 +348,7 @@ public struct NetworkFacade {
let maxProgressPerPart: Double
let progressHandler: (Double) -> Void
let uploadedPartsActor: UploadedPartsActor
let targetBytesPerSecond: Int?

init(
encryptedChunk: Data,
Expand All @@ -364,7 +358,8 @@ public struct NetworkFacade {
uploadState: UploadState,
maxProgressPerPart: Double,
progressHandler: @escaping (Double) -> Void,
uploadedPartsActor: UploadedPartsActor
uploadedPartsActor: UploadedPartsActor,
targetBytesPerSecond: Int? = nil
) {
self.encryptedChunk = encryptedChunk
self.partIndex = partIndex
Expand All @@ -374,12 +369,25 @@ public struct NetworkFacade {
self.maxProgressPerPart = maxProgressPerPart
self.progressHandler = progressHandler
self.uploadedPartsActor = uploadedPartsActor
self.targetBytesPerSecond = targetBytesPerSecond
}

override func main() {
Task {
do {
let chunkSize = encryptedChunk?.count ?? 0
let startTime = CFAbsoluteTimeGetCurrent()

try await uploadPartWithRetry()
if let target = targetBytesPerSecond, chunkSize > 0 {
let targetTime = Double(chunkSize) / Double(target)
let elapsed = CFAbsoluteTimeGetCurrent() - startTime
if elapsed < targetTime {
let delay = targetTime - elapsed
try await Task.sleep(nanoseconds: UInt64(delay * 1_000_000_000))
}
}

completeOperation()
} catch {
await uploadState.setAborted()
Expand Down Expand Up @@ -447,46 +455,3 @@ public struct NetworkFacade {
}

}



public actor NetworkLimiter {
public static let shared = NetworkLimiter()
private var maxCount: Int = 6
private var activeCount: Int = 0
private var waiters: [CheckedContinuation<Void, Never>] = []

public init() {}

public func updateLimit(reduceBandwidth: Bool) {
let newLimit = reduceBandwidth ? 1 : 6
if maxCount != newLimit {
self.maxCount = newLimit
}

while activeCount < maxCount, !waiters.isEmpty {
activeCount += 1
let next = waiters.removeFirst()
next.resume()
}
}

public func wait() async {
if activeCount < maxCount {
activeCount += 1
return
}
await withCheckedContinuation { continuation in
waiters.append(continuation)
}
}

public func signal() {
if !waiters.isEmpty {
let next = waiters.removeFirst()
next.resume()
} else {
activeCount -= 1
}
}
}
20 changes: 14 additions & 6 deletions Sources/InternxtSwiftCore/Services/Network/Upload.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,24 @@ public class Upload: NSObject {
private let cryptoUtils = CryptoUtils()
private let fileManager = FileManager.default
private let networkAPI: NetworkAPI
private lazy var urlSession = URLSession(
configuration: .default,
delegate: self,
delegateQueue: .main
)
private let reduceBandwidth: Bool
private lazy var urlSession: URLSession = {
let config = URLSessionConfiguration.default
if reduceBandwidth {
config.httpMaximumConnectionsPerHost = 1
}
return URLSession(
configuration: config,
delegate: self,
delegateQueue: .main
)
}()

private var progressHandlersByTaskID = [Int : ProgressHandler]()

init(networkAPI: NetworkAPI, urlSession: URLSession? = nil) {
init(networkAPI: NetworkAPI, urlSession: URLSession? = nil, reduceBandwidth: Bool = false) {
self.networkAPI = networkAPI
self.reduceBandwidth = reduceBandwidth
super.init()
if urlSession != nil {
self.urlSession = urlSession!
Expand Down
20 changes: 14 additions & 6 deletions Sources/InternxtSwiftCore/Services/Network/UploadMultipart.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,26 @@ public class UploadMultipart: NSObject {
private let cryptoUtils = CryptoUtils()
private let fileManager = FileManager.default
private let networkAPI: NetworkAPI
private lazy var urlSession = URLSession(
configuration: .default,
delegate: self,
delegateQueue: .main
)
private let reduceBandwidth: Bool
private lazy var urlSession: URLSession = {
let config = URLSessionConfiguration.default
if reduceBandwidth {
config.httpMaximumConnectionsPerHost = 1
}
return URLSession(
configuration: config,
delegate: self,
delegateQueue: .main
)
}()



private var progressHandlersByTaskID = [Int : ProgressHandler]()
private let progressHandlerStore = ProgressHandlerStore()
init(networkAPI: NetworkAPI, urlSession: URLSession? = nil) {
init(networkAPI: NetworkAPI, urlSession: URLSession? = nil, reduceBandwidth: Bool = false) {
self.networkAPI = networkAPI
self.reduceBandwidth = reduceBandwidth
super.init()
if urlSession != nil {
self.urlSession = urlSession!
Expand Down
Loading