Version bumped to 3.3.1

transloadit · Nov 28, 2024 · c46c28d · c46c28d
1 parent 43fa6fc
commit c46c28d
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 12 deletions.
diff --git a/Sources/TransloaditKit/Transloadit.swift b/Sources/TransloaditKit/Transloadit.swift
@@ -60,9 +60,9 @@ public final class Transloadit {
         tusClient.remainingUploads
     }
 
+    private let tusSessionConfig: URLSessionConfiguration
     lazy var tusClient: TUSClient = {
-        let config = URLSessionConfiguration.background(withIdentifier: "com.transloadit.tus.background")
-        let tusClient = try! TUSClient(server: URL(string:"https://www.transloadit.com")!, sessionIdentifier: "TransloadIt", sessionConfiguration: config, storageDirectory: storageDir)
+        let tusClient = try! TUSClient(server: URL(string:"https://www.transloadit.com")!, sessionIdentifier: "TransloadIt", sessionConfiguration: tusSessionConfig, storageDirectory: storageDir)
         tusClient.delegate = self
         return tusClient
     }()
@@ -80,6 +80,7 @@ public final class Transloadit {
     public init(credentials: Transloadit.Credentials, session: URLSession, storageDir: URL? = nil) {
         self.api = TransloaditAPI(credentials: credentials, session: session)
         self.storageDir = storageDir
+        self.tusSessionConfig = session.configuration.copy(withIdentifier: "com.transloadit.tus.bg")
     }
 
     /// Initialize Transloadit
@@ -92,6 +93,7 @@ public final class Transloadit {
     public init(credentials: Transloadit.Credentials, sessionConfiguration: URLSessionConfiguration, storageDir: URL? = nil) {
         self.api = TransloaditAPI(credentials: credentials, sessionConfiguration: sessionConfiguration)
         self.storageDir = storageDir
+        self.tusSessionConfig = sessionConfiguration.copy(withIdentifier: "com.transloadit.tus.bg")
     }
 
     @discardableResult

diff --git a/Sources/TransloaditKit/TransloaditAPI+URLSessionDelegate.swift b/Sources/TransloaditKit/TransloaditAPI+URLSessionDelegate.swift
@@ -2,7 +2,6 @@ import Foundation
 
 extension TransloaditAPI: URLSessionDataDelegate {
     public func urlSession(_ session: URLSession, task: URLSessionTask, didCompleteWithError error: Error?) {
-        print(error)
         guard let completionHandler = callbacks[task] else {
             return
         }

diff --git a/Sources/TransloaditKit/TransloaditAPI.swift b/Sources/TransloaditKit/TransloaditAPI.swift
@@ -45,11 +45,7 @@ final class TransloaditAPI: NSObject {
 
     init(credentials: Transloadit.Credentials, session: URLSession) {
         self.credentials = credentials
-        if session.configuration.sessionSendsLaunchEvents {
-            self.configuration = .background(withIdentifier: "com.transloadit.bgurlsession")
-        } else {
-            self.configuration = session.configuration
-        }
+        self.configuration = session.configuration.copy(withIdentifier: "com.transloadit.bg")
         self.delegateQueue = session.delegateQueue
         super.init()
     }
@@ -121,7 +117,6 @@ final class TransloaditAPI: NSObject {
             return
         }
 
-        try! print(Data(contentsOf: request.httpBody))
         let task = session.uploadTask(with: request.request, fromFile: request.httpBody)
         callbacks[task] = URLSessionCompletionHandler(callback: { result in
             switch result {
@@ -308,7 +303,7 @@ final class TransloaditAPI: NSObject {
             return request
         }
 
-        let task = session.downloadTask(with: makeRequest())
+        let task = session.dataTask(with: makeRequest())
         callbacks[task] = URLSessionCompletionHandler(callback: { result in
             switch result {
             case .failure:
@@ -334,7 +329,7 @@ final class TransloaditAPI: NSObject {
             return request
         }
 
-        let task = session.downloadTask(with: makeRequest())
+        let task = session.dataTask(with: makeRequest())
         callbacks[task] = URLSessionCompletionHandler(callback: { result in
             switch result {
             case .failure:

diff --git a/Sources/TransloaditKit/URLSessionConfiguration+Copying.swift b/Sources/TransloaditKit/URLSessionConfiguration+Copying.swift
@@ -0,0 +1,36 @@
+//
+//  URLSessionConfiguration+Copying.swift
+//  TransloaditKit
+//
+//  Created by Donny Wals on 27/11/2024.
+//
+
+import Foundation
+
+extension URLSessionConfiguration {
+    func copy(withIdentifier newIdentifier: String) -> URLSessionConfiguration {
+        if let identifier = self.identifier {
+            let copy = URLSessionConfiguration.background(withIdentifier: newIdentifier)
+            copy.requestCachePolicy = requestCachePolicy
+            copy.timeoutIntervalForRequest = timeoutIntervalForRequest
+            copy.timeoutIntervalForResource = timeoutIntervalForResource
+            copy.networkServiceType = networkServiceType
+            copy.allowsCellularAccess = allowsCellularAccess
+            copy.isDiscretionary = isDiscretionary
+            copy.connectionProxyDictionary = connectionProxyDictionary
+            copy.httpShouldUsePipelining = httpShouldUsePipelining
+            copy.httpShouldSetCookies = httpShouldSetCookies
+            copy.httpCookieAcceptPolicy = httpCookieAcceptPolicy
+            copy.httpAdditionalHeaders = httpAdditionalHeaders
+            copy.httpMaximumConnectionsPerHost = httpMaximumConnectionsPerHost
+            copy.httpCookieStorage = httpCookieStorage
+            copy.urlCredentialStorage = urlCredentialStorage
+            copy.urlCache = urlCache
+            copy.shouldUseExtendedBackgroundIdleMode = shouldUseExtendedBackgroundIdleMode
+            copy.protocolClasses = protocolClasses
+            return copy
+        } else {
+            return self.copy() as! URLSessionConfiguration
+        }
+    }
+}
diff --git a/Transloadit.podspec b/Transloadit.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'Transloadit'
-  s.version          = '3.3.0'
+  s.version          = '3.3.1'
   s.summary          = 'Transloadit client in Swift'
   s.swift_version = '5.0'