GIF Animation Implementation

Dependencies/Sources/DownloadManager/Download/Download.swift

@@ -11,13 +11,13 @@ import Foundation
 /**
     The `Download` object describes a single file download.
  */
-public struct Download {
+public struct Download: Sendable {
 
     public var url: URL
 
     public var id: UUID
 
-    public enum Destination : Codable, Hashable {
+    public enum Destination : Codable, Hashable, Sendable {
 
         /// Download to a shared buffer in memory
         case inMemory
@@ -70,7 +70,7 @@ public struct Download {
 
     public var destination: Destination
 
-    public struct DownloadPolicy : OptionSet, Codable, Hashable {
+    public struct DownloadPolicy : OptionSet, Codable, Hashable, Sendable {
 
         public let rawValue: Int
 
@@ -84,7 +84,7 @@ public struct Download {
 
     public var downloadPolicy: DownloadPolicy
 
-    public struct URLRequestConfiguration : Hashable, Codable {
+    public struct URLRequestConfiguration : Hashable, Codable, Sendable {
 
         public var allHTTPHeaderFields: [String : String]?
 

Dependencies/Sources/DownloadManager/Download/DownloadPublisher.swift

@@ -21,82 +21,75 @@ public struct DownloadPublisher: Publisher {
                                                 DownloadPublisher.Failure == S.Failure,
                                                 DownloadPublisher.Output == S.Input
     {
-        let subscription = DownloadSubscription(subscriber: subscriber, download: download, manager: manager)
+        let subscription = DownloadSubscription(subscriber: subscriber, download: download, coordinator: coordinator)
         subscriber.receive(subscription: subscription)
     }
 
-    init(download: Download, manager: DownloadManager) {
+    init(download: Download, coordinator: URLSessionCoordinator) {
         self.download = download
-        self.manager = manager
+        self.coordinator = coordinator
     }
 
-    private let manager: DownloadManager
+    private let coordinator: URLSessionCoordinator
 }
 
 
 @available(macOS 11.0, iOS 14.0, tvOS 14.0, watchOS 7.0, *)
-final class DownloadSubscription<SubscriberType: Subscriber>: Subscription
-                                                        where SubscriberType.Input == DownloadInfo,
-                                                              SubscriberType.Failure == DownloadError
+final class DownloadSubscription<SubscriberType: Subscriber>: Subscription where SubscriberType.Input == DownloadInfo, SubscriberType.Failure == DownloadError
 {
     private var subscriber: SubscriberType?
 
     private let download: Download
 
-    private unowned let manager: DownloadManager
+    private unowned let coordinator: URLSessionCoordinator
 
-    init(subscriber: SubscriberType, download: Download, manager: DownloadManager) {
+    init(subscriber: SubscriberType, download: Download, coordinator: URLSessionCoordinator) {
         self.subscriber = subscriber
         self.download = download
-        self.manager = manager
+        self.coordinator = coordinator
     }
 
     func request(_ demand: Subscribers.Demand) {
         guard demand > 0 else { return }
 
         log_debug(self, #function, "download.id = \(download.id), download.url = \(self.download.url)", detail: log_detailed)
+        nonisolated(unsafe) let subscriber = subscriber
+        let download = download
+        let type = Self.self
 
-        manager.coordinator.startDownload(download,
+        coordinator.startDownload(download,
             receiveResponse: { _ in
             },
             receiveData: {  _, _ in
             },
-            reportProgress: { [weak self] _, progress in
-                guard let self = self else {
-                    return
-                }
-
-                let _ = self.subscriber?.receive(.progress(progress))
+            reportProgress: { _, progress in
+                let _ = subscriber?.receive(.progress(progress))
             },
-            completion: { [weak self] _, result in
-                guard let self = self else {
-                    return
-                }
-
+            completion: { _, result in
                 switch result {
                     case .success(let downloadResult):
                         switch downloadResult {
                             case .data(let data):
-                                log_debug(self, #function, "download.id = \(self.download.id), download.url = \(self.download.url), downloaded \(data.count) bytes", detail: log_detailed)
+                                log_debug(type, #function, "download.id = \(download.id), download.url = \(download.url), downloaded \(data.count) bytes", detail: log_detailed)
                             case .file(let path):
-                                log_debug(self, #function, "download.id = \(self.download.id), download.url = \(self.download.url), downloaded file to \(path)", detail: log_detailed)
+                                log_debug(type, #function, "download.id = \(download.id), download.url = \(download.url), downloaded file to \(path)", detail: log_detailed)
                         }
 
-                        let _ = self.subscriber?.receive(.completion(downloadResult))
-                        self.subscriber?.receive(completion: .finished)
+                        let _ = subscriber?.receive(.completion(downloadResult))
+                        subscriber?.receive(completion: .finished)
 
                     case .failure(let error):
-                        log_debug(self, #function, "download.id = \(self.download.id), download.url = \(self.download.url), downloaded failed \(error)", detail: log_detailed)
-                        self.subscriber?.receive(completion: .failure(error))
+                        log_debug(type, #function, "download.id = \(download.id), download.url = \(download.url), downloaded failed \(error)", detail: log_detailed)
+                        subscriber?.receive(completion: .failure(error))
                 }
 
-                self.manager.reset(download: self.download)
+//                self.manager.reset(download: self.download)
             })
     }
 
     func cancel() {
         log_debug(self, #function, "download.id = \(download.id), download.url = \(self.download.url)", detail: log_detailed)
-        manager.coordinator.cancelDownload(download)
-        manager.reset(download: download)
+        coordinator.cancelDownload(download)
+//        manager.reset(download: download)
     }
 }

Dependencies/Sources/DownloadManager/Download/DownloadTask.swift

@@ -9,9 +9,9 @@ import Foundation
 
 
 /// `DownloadTask` is a wrapper around `URLSessionTask` that accumulates received data in a memory buffer.
-final class DownloadTask {
+final class DownloadTask: @unchecked Sendable {
 
-    final class Observer {
+    final class Observer: @unchecked Sendable {
 
         private var receiveResponse: DownloadReceiveResponse?
 

Dependencies/Sources/DownloadManager/Download/DownloadTypes.swift

@@ -8,15 +8,15 @@
 import Foundation
 
 
-public enum DownloadResult {
+public enum DownloadResult: Sendable {
 
     case data(_ data: Data)
 
     case file(_ path: String)
 }
 
 
-public enum DownloadInfo {
+public enum DownloadInfo: Sendable {
 
     case progress(_ progress: Float?)
 
@@ -28,7 +28,7 @@ extension DownloadResult : Hashable {}
 
 public typealias DownloadError = Error
 
-public typealias DownloadReceiveResponse = (_ download: Download) -> Void
-public typealias DownloadReceiveData = (_ download: Download, _ data: Data) -> Void
-public typealias DownloadReportProgress = (_ download: Download, _ progress: Float?) -> Void
-public typealias DownloadCompletion = (_ download: Download, _ result: Result<DownloadResult, DownloadError>) -> Void
+public typealias DownloadReceiveResponse = @Sendable (_ download: Download) -> Void
+public typealias DownloadReceiveData = @Sendable (_ download: Download, _ data: Data) -> Void
+public typealias DownloadReportProgress = @Sendable (_ download: Download, _ progress: Float?) -> Void
+public typealias DownloadCompletion = @Sendable (_ download: Download, _ result: Result<DownloadResult, DownloadError>) -> Void