Skip to content
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

Apple HttpEngine: lock the handlers map #6348

Merged
merged 1 commit into from
Jan 10, 2025
Merged

Apple HttpEngine: lock the handlers map #6348

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
36 changes: 25 additions & 11 deletions ...ime/src/appleMain/kotlin/com/apollographql/apollo/network/http/DefaultHttpEngine.apple.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import com.apollographql.apollo.api.http.HttpRequest
import com.apollographql.apollo.api.http.HttpResponse
import com.apollographql.apollo.exception.ApolloNetworkException
import com.apollographql.apollo.network.toNSData
import kotlinx.atomicfu.locks.reentrantLock
import kotlinx.atomicfu.locks.withLock
import kotlinx.cinterop.alloc
import kotlinx.cinterop.nativeHeap
import kotlinx.cinterop.ptr
Expand Down Expand Up @@ -207,6 +209,8 @@ private class StreamingDataDelegate : NSObject(), NSURLSessionDataDelegateProtoc
fun onComplete(error: NSError?)
}

private val lock = reentrantLock()

private val handlers = mutableMapOf<NSURLSessionTask, Handler>()

override fun URLSession(
Expand All @@ -215,7 +219,9 @@ private class StreamingDataDelegate : NSObject(), NSURLSessionDataDelegateProtoc
didReceiveResponse: NSURLResponse,
completionHandler: (NSURLSessionResponseDisposition) -> Unit,
) {
handlers[dataTask]?.onResponse(didReceiveResponse as NSHTTPURLResponse)
lock.withLock {
handlers[dataTask]
}?.onResponse(didReceiveResponse as NSHTTPURLResponse)
completionHandler(NSURLSessionResponseAllow)
}

Expand All @@ -224,18 +230,22 @@ private class StreamingDataDelegate : NSObject(), NSURLSessionDataDelegateProtoc
dataTask: NSURLSessionDataTask,
didReceiveData: NSData,
) {
handlers[dataTask]?.onData(didReceiveData)
lock.withLock {
handlers[dataTask]
}?.onData(didReceiveData)
}

override fun URLSession(
session: NSURLSession,
task: NSURLSessionTask,
didCompleteWithError: NSError?,
) {
handlers[task]?.onComplete(didCompleteWithError)

// Cleanup
handlers.remove(task)
lock.withLock {
handlers[task].also {
// Cleanup
handlers.remove(task)
}
}?.onComplete(didCompleteWithError)
}

override fun URLSession(
Expand All @@ -244,16 +254,20 @@ private class StreamingDataDelegate : NSObject(), NSURLSessionDataDelegateProtoc
willCacheResponse: NSCachedURLResponse,
completionHandler: (NSCachedURLResponse?) -> Unit,
) {
handlers[dataTask]?.onComplete(null)

// Cleanup
handlers.remove(dataTask)
lock.withLock {
handlers[dataTask].also {
// Cleanup
handlers.remove(dataTask)
}
}?.onComplete(null)

completionHandler(willCacheResponse)
}

fun registerHandlerForTask(task: NSURLSessionTask, handler: Handler) {
handlers[task] = handler
lock.withLock {
handlers[task] = handler
}
}
}

Expand Down
Loading