Skip to content

new-extension-session #170

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 2 commits into from
Jul 21, 2025
Merged

new-extension-session #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d473011
cod
marinofaggiana Jul 21, 2025
ffbbb80
Merge branch 'main' into ext
marinofaggiana Jul 21, 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
78 changes: 34 additions & 44 deletions Sources/NextcloudKit/NKSession.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,43 @@ public struct NKSession: Sendable {
public let httpMaximumConnectionsPerHostInDownload: Int
public let httpMaximumConnectionsPerHostInUpload: Int
public let dav: String = "remote.php/dav"
public var sharedCookieStorage = ""
public let sessionData: Alamofire.Session
public let sessionDataNoCache: Alamofire.Session
public let sessionDownloadBackground: URLSession
public let sessionDownloadBackgroundExt: URLSession
public let backgroundSessionDelegate: URLSessionDelegate?
public let sessionUploadBackground: URLSession
public let sessionUploadBackgroundWWan: URLSession
public let sessionUploadBackgroundExt: URLSession

public lazy var sessionDownloadBackgroundExt: URLSession = {
let config = URLSessionConfiguration.background(withIdentifier: NKCommon().identifierSessionDownloadBackgroundExt)
config.sharedContainerIdentifier = groupIdentifier
config.sessionSendsLaunchEvents = true
config.isDiscretionary = false
config.allowsCellularAccess = true
config.requestCachePolicy = .useProtocolCachePolicy
config.httpMaximumConnectionsPerHost = httpMaximumConnectionsPerHostInDownload
config.httpCookieStorage = HTTPCookieStorage.sharedCookieStorage(forGroupContainerIdentifier: sharedCookieStorage)
#if os(iOS) || targetEnvironment(macCatalyst)
config.multipathServiceType = .handover
#endif
return URLSession(configuration: config, delegate: backgroundSessionDelegate, delegateQueue: .main)
}()

public lazy var sessionUploadBackgroundExt: URLSession = {
let config = URLSessionConfiguration.background(withIdentifier: NKCommon().identifierSessionUploadBackgroundExt)
config.sharedContainerIdentifier = groupIdentifier
config.sessionSendsLaunchEvents = true
config.isDiscretionary = false
config.allowsCellularAccess = true
config.requestCachePolicy = .useProtocolCachePolicy
config.httpMaximumConnectionsPerHost = httpMaximumConnectionsPerHostInUpload
config.httpCookieStorage = HTTPCookieStorage.sharedCookieStorage(forGroupContainerIdentifier: sharedCookieStorage)
#if os(iOS) || targetEnvironment(macCatalyst)
config.multipathServiceType = .handover
#endif
return URLSession(configuration: config, delegate: backgroundSessionDelegate, delegateQueue: .main)
}()

init(nkCommonInstance: NKCommon,
urlBase: String,
Expand All @@ -46,10 +76,10 @@ public struct NKSession: Sendable {
self.httpMaximumConnectionsPerHost = httpMaximumConnectionsPerHost
self.httpMaximumConnectionsPerHostInDownload = httpMaximumConnectionsPerHostInDownload
self.httpMaximumConnectionsPerHostInUpload = httpMaximumConnectionsPerHostInUpload
self.backgroundSessionDelegate = NKBackground(nkCommonInstance: nkCommonInstance)

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

// SessionData Alamofire
let configurationSessionData = URLSessionConfiguration.af.default
Expand Down Expand Up @@ -100,26 +130,6 @@ public struct NKSession: Sendable {
configurationDownloadBackground.httpCookieStorage = HTTPCookieStorage.sharedCookieStorage(forGroupContainerIdentifier: sharedCookieStorage)
sessionDownloadBackground = URLSession(configuration: configurationDownloadBackground, delegate: backgroundSessionDelegate, delegateQueue: OperationQueue.main)

// Session Download Background Extension
let configurationDownloadBackgroundExt = URLSessionConfiguration.background(withIdentifier: NKCommon().identifierSessionDownloadBackgroundExt + UUID().uuidString)
configurationDownloadBackgroundExt.allowsCellularAccess = true

if #available(macOS 11, *) {
configurationDownloadBackgroundExt.sessionSendsLaunchEvents = true
}

configurationDownloadBackgroundExt.isDiscretionary = false
configurationDownloadBackgroundExt.httpMaximumConnectionsPerHost = self.httpMaximumConnectionsPerHostInDownload
configurationDownloadBackgroundExt.requestCachePolicy = .useProtocolCachePolicy
configurationDownloadBackgroundExt.sharedContainerIdentifier = groupIdentifier

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

configurationDownloadBackgroundExt.httpCookieStorage = HTTPCookieStorage.sharedCookieStorage(forGroupContainerIdentifier: sharedCookieStorage)
sessionDownloadBackgroundExt = URLSession(configuration: configurationDownloadBackgroundExt, delegate: backgroundSessionDelegate, delegateQueue: OperationQueue.main)

// Session Upload Background
let configurationUploadBackground = URLSessionConfiguration.background(withIdentifier: NKCommon().getSessionConfigurationIdentifier(NKCommon().identifierSessionUploadBackground, account: account))
configurationUploadBackground.allowsCellularAccess = true
Expand Down Expand Up @@ -152,25 +162,5 @@ public struct NKSession: Sendable {
configurationUploadBackgroundWWan.requestCachePolicy = .useProtocolCachePolicy
configurationUploadBackgroundWWan.httpCookieStorage = HTTPCookieStorage.sharedCookieStorage(forGroupContainerIdentifier: sharedCookieStorage)
sessionUploadBackgroundWWan = URLSession(configuration: configurationUploadBackgroundWWan, delegate: backgroundSessionDelegate, delegateQueue: OperationQueue.main)

// Session Upload Background Extension
let configurationUploadBackgroundExt = URLSessionConfiguration.background(withIdentifier: NKCommon().identifierSessionUploadBackgroundExt + UUID().uuidString)
configurationUploadBackgroundExt.allowsCellularAccess = true

if #available(macOS 11, *) {
configurationUploadBackgroundExt.sessionSendsLaunchEvents = true
}

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

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

configurationUploadBackgroundExt.httpCookieStorage = HTTPCookieStorage.sharedCookieStorage(forGroupContainerIdentifier: sharedCookieStorage)
sessionUploadBackgroundExt = URLSession(configuration: configurationUploadBackgroundExt, delegate: backgroundSessionDelegate, delegateQueue: OperationQueue.main)
}
}
4 changes: 2 additions & 2 deletions Sources/NextcloudKit/NextcloudKitBackground.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public final class NKBackground: NSObject, URLSessionTaskDelegate, URLSessionDel
url = (serverUrlFileName as? String)?.encodedToUrl as? URL
}

guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
guard var nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let urlForRequest = url
else {
return (nil, .urlError)
Expand Down Expand Up @@ -161,7 +161,7 @@ public final class NKBackground: NSObject, URLSessionTaskDelegate, URLSessionDel
url = (serverUrlFileName as? String)?.encodedToUrl as? URL
}

guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
guard var nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let urlForRequest = url
else {
return (nil, .urlError)
Expand Down
Loading