Skip to content

new session without cache #134

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
marinofaggiana merged 4 commits into from
Apr 24, 2025
Merged

new session without cache #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bcc6a42
Version 6.0.4 (#131)
marinofaggiana Mar 18, 2025
7c972af
cod
marinofaggiana Apr 24, 2025
b7f0fdd
remove unused parameter
marinofaggiana Apr 24, 2025
a32d4bd
Merge branch 'develop' into test-marino
marinofaggiana Apr 24, 2025
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
40 changes: 25 additions & 15 deletions Sources/NextcloudKit/NKSession.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ public struct NKSession: Sendable {
public let httpMaximumConnectionsPerHost: Int
public let httpMaximumConnectionsPerHostInDownload: Int
public let httpMaximumConnectionsPerHostInUpload: Int
public let requestCachePolicy: URLRequest.CachePolicy
public let dav: String = "remote.php/dav"
public var internalTypeIdentifiers: [NKCommon.UTTypeConformsToServer] = []
public let sessionData: Alamofire.Session
public let sessionDataNoCache: Alamofire.Session
public let sessionDownloadBackground: URLSession
public let sessionUploadBackground: URLSession
public let sessionUploadBackgroundWWan: URLSession
Expand All @@ -37,8 +37,7 @@ public struct NKSession: Sendable {
groupIdentifier: String,
httpMaximumConnectionsPerHost: Int,
httpMaximumConnectionsPerHostInDownload: Int,
httpMaximumConnectionsPerHostInUpload: Int,
requestCachePolicy: URLRequest.CachePolicy = .useProtocolCachePolicy) {
httpMaximumConnectionsPerHostInUpload: Int) {
self.urlBase = urlBase
self.user = user
self.userId = userId
Expand All @@ -50,29 +49,40 @@ public struct NKSession: Sendable {
self.httpMaximumConnectionsPerHost = httpMaximumConnectionsPerHost
self.httpMaximumConnectionsPerHostInDownload = httpMaximumConnectionsPerHostInDownload
self.httpMaximumConnectionsPerHostInUpload = httpMaximumConnectionsPerHostInUpload
self.requestCachePolicy = requestCachePolicy

let backgroundSessionDelegate = NKBackground(nkCommonInstance: nkCommonInstance)
/// Strange but works ?!?!
let sharedCookieStorage = user + "@" + urlBase

/// Session Alamofire
let configuration = URLSessionConfiguration.af.default
configuration.requestCachePolicy = requestCachePolicy
configuration.httpMaximumConnectionsPerHost = httpMaximumConnectionsPerHost
/// SessionData Alamofire
let configurationSessionData = URLSessionConfiguration.af.default
configurationSessionData.requestCachePolicy = .useProtocolCachePolicy
configurationSessionData.httpMaximumConnectionsPerHost = httpMaximumConnectionsPerHost

#if os(iOS) || targetEnvironment(macCatalyst)
configuration.multipathServiceType = .handover
configurationSessionData.multipathServiceType = .handover
#endif

configuration.httpCookieStorage = HTTPCookieStorage.sharedCookieStorage(forGroupContainerIdentifier: sharedCookieStorage)
sessionData = Alamofire.Session(configuration: configuration,
configurationSessionData.httpCookieStorage = HTTPCookieStorage.sharedCookieStorage(forGroupContainerIdentifier: sharedCookieStorage)
sessionData = Alamofire.Session(configuration: configurationSessionData,
delegate: NextcloudKitSessionDelegate(nkCommonInstance: nkCommonInstance),
rootQueue: nkCommonInstance.rootQueue,
requestQueue: nkCommonInstance.requestQueue,
serializationQueue: nkCommonInstance.serializationQueue,
eventMonitors: [NKMonitor(nkCommonInstance: nkCommonInstance)])

/// SessionDataNoCache Alamofire
let configurationSessionDataNoCache = URLSessionConfiguration.af.default
configurationSessionDataNoCache.requestCachePolicy = .reloadIgnoringLocalAndRemoteCacheData
configurationSessionDataNoCache.httpMaximumConnectionsPerHost = httpMaximumConnectionsPerHost

sessionDataNoCache = Alamofire.Session(configuration: configurationSessionDataNoCache,
delegate: NextcloudKitSessionDelegate(nkCommonInstance: nkCommonInstance),
rootQueue: nkCommonInstance.rootQueue,
requestQueue: nkCommonInstance.requestQueue,
serializationQueue: nkCommonInstance.serializationQueue,
eventMonitors: [NKMonitor(nkCommonInstance: nkCommonInstance)])

/// Session Download Background
let configurationDownloadBackground = URLSessionConfiguration.background(withIdentifier: NKCommon().getSessionConfigurationIdentifier(NKCommon().identifierSessionDownloadBackground, account: account))
configurationDownloadBackground.allowsCellularAccess = true
Expand All @@ -83,7 +93,7 @@ public struct NKSession: Sendable {

configurationDownloadBackground.isDiscretionary = false
configurationDownloadBackground.httpMaximumConnectionsPerHost = self.httpMaximumConnectionsPerHostInDownload
configurationDownloadBackground.requestCachePolicy = requestCachePolicy
configurationDownloadBackground.requestCachePolicy = .useProtocolCachePolicy

#if os(iOS) || targetEnvironment(macCatalyst)
configurationDownloadBackground.multipathServiceType = .handover
Expand All @@ -102,7 +112,7 @@ public struct NKSession: Sendable {

configurationUploadBackground.isDiscretionary = false
configurationUploadBackground.httpMaximumConnectionsPerHost = self.httpMaximumConnectionsPerHostInUpload
configurationUploadBackground.requestCachePolicy = requestCachePolicy
configurationUploadBackground.requestCachePolicy = .useProtocolCachePolicy

#if os(iOS) || targetEnvironment(macCatalyst)
configurationUploadBackground.multipathServiceType = .handover
Expand All @@ -121,7 +131,7 @@ public struct NKSession: Sendable {

configurationUploadBackgroundWWan.isDiscretionary = false
configurationUploadBackgroundWWan.httpMaximumConnectionsPerHost = self.httpMaximumConnectionsPerHostInUpload
configurationUploadBackgroundWWan.requestCachePolicy = requestCachePolicy
configurationUploadBackgroundWWan.requestCachePolicy = .useProtocolCachePolicy
configurationUploadBackgroundWWan.httpCookieStorage = HTTPCookieStorage.sharedCookieStorage(forGroupContainerIdentifier: sharedCookieStorage)
sessionUploadBackgroundWWan = URLSession(configuration: configurationUploadBackgroundWWan, delegate: backgroundSessionDelegate, delegateQueue: OperationQueue.main)

Expand All @@ -135,7 +145,7 @@ public struct NKSession: Sendable {

configurationUploadBackgroundExt.isDiscretionary = false
configurationUploadBackgroundExt.httpMaximumConnectionsPerHost = self.httpMaximumConnectionsPerHostInUpload
configurationUploadBackgroundExt.requestCachePolicy = requestCachePolicy
configurationUploadBackgroundExt.requestCachePolicy = .useProtocolCachePolicy
configurationUploadBackgroundExt.sharedContainerIdentifier = groupIdentifier

#if os(iOS) || targetEnvironment(macCatalyst)
Expand Down
2 changes: 1 addition & 1 deletion Sources/NextcloudKit/NextcloudKit+API.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ public extension NextcloudKit {
return options.queue.async { completion(account, nil, nil, .urlError) }
}

nkSession.sessionData.request(url, method: .get, encoding: URLEncoding.default, headers: headers, interceptor: NKInterceptor(nkCommonInstance: nkCommonInstance)).validate(statusCode: 200..<300).onURLSessionTaskCreation { task in
nkSession.sessionDataNoCache.request(url, method: .get, encoding: URLEncoding.default, headers: headers, interceptor: NKInterceptor(nkCommonInstance: nkCommonInstance)).validate(statusCode: 200..<300).onURLSessionTaskCreation { task in
task.taskDescription = options.taskDescription
taskHandler(task)
}.responseData(queue: self.nkCommonInstance.backgroundQueue) { response in
Expand Down
Loading