Skip to content

Separate timeout interval values for request and resource #46

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
Recouse merged 1 commit into from
Feb 20, 2026
Merged

Separate timeout interval values for request and resource #46

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
40 changes: 29 additions & 11 deletions Sources/EventSource/EventSource.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,27 +42,41 @@ public struct EventSource: Sendable {

private let eventParser: @Sendable () -> EventParser

public var timeoutInterval: TimeInterval
public var timeoutIntervalForRequest: TimeInterval

public init(mode: Mode = .default, timeoutInterval: TimeInterval = 300) {
self.init(mode: mode, eventParser: ServerEventParser(mode: mode), timeoutInterval: timeoutInterval)
public var timeoutIntervalForResource: TimeInterval

public init(
mode: Mode = .default,
timeoutIntervalForRequest: TimeInterval = 60,
timeoutIntervalForResource: TimeInterval = 300
) {
self.init(
mode: mode,
eventParser: ServerEventParser(mode: mode),
timeoutIntervalForRequest: timeoutIntervalForRequest,
timeoutIntervalForResource: timeoutIntervalForResource
)
}

public init(
mode: Mode = .default,
eventParser: @autoclosure @escaping @Sendable () -> EventParser,
timeoutInterval: TimeInterval = 300
timeoutIntervalForRequest: TimeInterval = 60,
timeoutIntervalForResource: TimeInterval = 300
) {
self.mode = mode
self.eventParser = eventParser
self.timeoutInterval = timeoutInterval
self.timeoutIntervalForRequest = timeoutIntervalForRequest
self.timeoutIntervalForResource = timeoutIntervalForResource
}

public func dataTask(for urlRequest: URLRequest) -> DataTask {
DataTask(
urlRequest: urlRequest,
eventParser: eventParser(),
timeoutInterval: timeoutInterval
timeoutIntervalForRequest: timeoutIntervalForRequest,
timeoutIntervalForResource: timeoutIntervalForResource
)
}
}
Expand Down Expand Up @@ -114,7 +128,9 @@ public extension EventSource {
}
}

private let timeoutInterval: TimeInterval
private let timeoutIntervalForRequest: TimeInterval

private let timeoutIntervalForResource: TimeInterval

private let _httpResponseErrorStatusCode: Mutex<Int?> = Mutex(nil)

Expand Down Expand Up @@ -145,19 +161,21 @@ public extension EventSource {
HTTPHeaderField.cacheControl: CacheControl.noStore,
HTTPHeaderField.lastEventID: lastMessageId
]
configuration.timeoutIntervalForRequest = self.timeoutInterval
configuration.timeoutIntervalForResource = self.timeoutInterval
configuration.timeoutIntervalForRequest = self.timeoutIntervalForRequest
configuration.timeoutIntervalForResource = self.timeoutIntervalForResource
return configuration
}

internal init(
urlRequest: URLRequest,
eventParser: EventParser,
timeoutInterval: TimeInterval
timeoutIntervalForRequest: TimeInterval,
timeoutIntervalForResource: TimeInterval
) {
self.urlRequest = urlRequest
self._eventParser = Mutex(eventParser)
self.timeoutInterval = timeoutInterval
self.timeoutIntervalForRequest = timeoutIntervalForRequest
self.timeoutIntervalForResource = timeoutIntervalForResource
}

/// Creates and returns event stream.
Expand Down