Skip to content

Fix visionOS availability error for split(by:) method #45

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 19, 2026
Merged

Fix visionOS availability error for split(by:) method #45

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
20 changes: 14 additions & 6 deletions Sources/EventSource/EventParser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,25 @@ struct ServerEventParser: EventParser {
// chop everything before the last separator, going forward, O(n) complexity
let bufferRange = data.startIndex ..< lastSeparator.upperBound
let remainingRange = lastSeparator.upperBound ..< data.endIndex
let rawMessages: [Data] = if #available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, visionOS 1.0, *) {
data[bufferRange].split(separator: separator)
} else {
data[bufferRange].split(by: separator)
}
let rawMessages: [Data] = splitData(data[bufferRange], separator: separator)

// now clean up the messages and return
let cleanedMessages = rawMessages.map { cleanMessageData($0) }
return (cleanedMessages, data[remainingRange])
}

private func splitData(_ data: Data, separator: [UInt8]) -> [Data] {
#if os(visionOS)
return data.split(separator: separator)
#else
if #available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *) {
return data.split(separator: separator)
} else {
return data.split(by: separator)
}
#endif
}

private func findLastSeparator(in data: Data, separators: [[UInt8]]) -> ([UInt8]?, Range<Data.Index>?) {
var chosenSeparator: [UInt8]?
var lastSeparatorRange: Range<Data.Index>?
Expand Down Expand Up @@ -97,7 +105,7 @@ fileprivate extension Data {
@available(iOS, deprecated: 16.0, obsoleted: 16.0, message: "This method is not recommended on iOS 16.0+")
@available(watchOS, deprecated: 9.0, obsoleted: 9.0, message: "This method is not recommended on watchOS 9.0+")
@available(tvOS, deprecated: 16.0, obsoleted: 16.0, message: "This method is not recommended on tvOS 16.0+")
@available(visionOS, deprecated: 1.0, obsoleted: 1.1, message: "This method is not recommended on visionOS 1.0+")
@available(visionOS, unavailable, message: "Use split(separator:) instead")
func split(by separator: [UInt8]) -> [Data] {
var chunks: [Data] = []
var pos = startIndex
Expand Down